Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.25 grimoire by Jaka Kranjc (af41ec58f30d6ee8c574acb4e9e8bc91b8d0516c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.25 grimoire by Jaka Kranjc (af41ec58f30d6ee8c574acb4e9e8bc91b8d0516c)
  • Date: Tue, 7 Oct 2008 15:31:06 -0500

GIT changes to stable-rc-0.25 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

VERSION | 2 +-
archive/unzip/DETAILS | 2 +-
archive/unzip/HISTORY | 4 ++++
chat-irc/bitlbee/DETAILS | 3 ++-
chat-irc/bitlbee/HISTORY | 7 +++++++
chat-irc/bitlbee/bitlbee-1.2.3.tar.gz.sig |binary
chat-irc/bitlbee/bitlbee-1.2.tar.gz.sig | 0
dev/null |binary
ftp/gtk-gnutella/BUILD | 17 ++++++++++++++---
ftp/gtk-gnutella/CONFIGURE | 2 ++
ftp/gtk-gnutella/DEPENDS | 5 +++--
ftp/gtk-gnutella/HISTORY | 3 +++
graphics-libs/libpng/DETAILS | 4 ++--
graphics-libs/libpng/HISTORY | 3 +++
http/firefox/DETAILS | 6 +++---
http/firefox/HISTORY | 4 ++++
http/seamonkey/DETAILS | 6 +++---
http/seamonkey/HISTORY | 4 ++++
mail/thunderbird/DETAILS | 6 +++---
mail/thunderbird/HISTORY | 5 +++++
utils/dbus/DETAILS | 6 +++---
utils/dbus/HISTORY | 3 +++
video/mplayer/DETAILS | 2 +-
video/mplayer/HISTORY | 5 +++++
video/mplayer/PRE_BUILD | 3 ++-
video/mplayer/mplayer_demux_real.patch | 28 ++++++++++++++++++++++++++++
26 files changed, 106 insertions(+), 24 deletions(-)

New commits:
commit af41ec58f30d6ee8c574acb4e9e8bc91b8d0516c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

dbus 1.2.4, SECURITY_PATCH=3, CVE-2008-3834

(cherry-picked from commit 2a12860cea0f2948318c3fbc0902b48cbbf5b7f8)

commit 81416139a0b567ff664d319b5b2daaeeefd7d192
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gtk-gnutella: deps reworked, bug 13130 fixed

(cherry-picked from commit 5c4a7eb5f5befa62ac2e9d0ed3292e3bfdc9e886)

commit 4e33bdf8f6bc35d4424f5aec39a945b325ec08c0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

video/mplayer: added security patch, fixes
http://www.ocert.org/advisories/ocert-2008-013.html

(cherry-picked from commit 273b25c4bd43328950fcaf43d518134ec23f2aca)

commit 78918bbd58d16a80ae60aa0ec70dfecd5465a527
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

thunderbird: Updated to version 2.0.0.17. SECURITY_PATCH++

(cherry-picked from commit 3ca994ed732b4536ef57159a24061f0f8cfa64db)

commit f254fab3d85d3f885a05486436c26be5b7962c99
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

firefox: security update
(http://www.mozilla.org/security/known-vulnerabilities/firefox30.html#firefox3.0.2)

(cherry-picked from commit 3bfe46076fbc50251c8813f53961db45d2c520fe)

commit 329b1802324d021c6cf1ef1189cb852848196793
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

firefox: => 3.0.2

(cherry-picked from commit f6719306f6ef0e9ce27d5cf1a496b00941c6745f)

commit 7a69cdde9e1725aa5a56ad5e433653c6bd946459
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

unzip: DETAILS: changed filename to unzip552.tgz
fix bug 17479

(cherry-picked from commit 369898cf06c4f729c0bebc3b32cd33b2dc94b53c)

commit 0c64a9881476bd2e5263fa93058b83e5a361b381
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

seamonkey: Updated to version 1.1.12. SECURITY_PATCH++

(cherry-picked from commit 73128243e8359a9fbb1dca4977756c95fd1e5d2c)

commit 678b4b9c4a2be092af53a69cb876e30a28da6554
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

bitlbee: SECURITY_PATCH++. Updates to 1.2.2 and 1.2.3 fixed several
security issues.

(cherry-picked from commit b7bd2a87d3d0a5057e534d010e7acc53a8b3ce0e)

commit 754a104f88628e0841c969bb8257798a6b9b454d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

bitlbee: Updated to version 1.2.3

(cherry-picked from commit ef6ac4e2f49a76255fce231ac2cb916ec0097608)

commit c6edc037d31f7f63042dfb84f3c8cc68af736690
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libpng: => 1.2.32, apng patch from .31 OK

(cherry-picked from commit ba20e6ace431938660dddc615fdcba5042f10e09)

commit 5f742020c09ebaab046039d01d10ac70bf0e2673
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

VERSION: 0.25-0

diff --git a/VERSION b/VERSION
index 8f1ac51..774c59b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.25-rc
+0.25-0
diff --git a/archive/unzip/DETAILS b/archive/unzip/DETAILS
index 9a4f328..ba2a137 100755
--- a/archive/unzip/DETAILS
+++ b/archive/unzip/DETAILS
@@ -1,6 +1,6 @@
SPELL=unzip
VERSION=5.52
- SOURCE=${SPELL}${VERSION/./}.tar.gz
+ SOURCE=${SPELL}${VERSION/./}.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.info-zip.org/pub/infozip/src/$SOURCE

WEB_SITE=http://www.ctan.org/tex-archive/tools/zip/info-zip/UnZip.html
diff --git a/archive/unzip/HISTORY b/archive/unzip/HISTORY
index 844f5e6..f047077 100644
--- a/archive/unzip/HISTORY
+++ b/archive/unzip/HISTORY
@@ -1,3 +1,7 @@
+2008-09-22 Tommy Boatman <tboatman2 AT sourcemage.org>
+ * DETAILS: changed filename to unzip552.tgz
+ * no change in sha512sum
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/chat-irc/bitlbee/DETAILS b/chat-irc/bitlbee/DETAILS
index bfa9122..635afad 100755
--- a/chat-irc/bitlbee/DETAILS
+++ b/chat-irc/bitlbee/DETAILS
@@ -1,10 +1,11 @@
SPELL=bitlbee
- VERSION=1.2
+ VERSION=1.2.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://get.bitlbee.org/src/$SOURCE
WEB_SITE=http://www.bitlbee.org
ENTERED=20031024
+ SECURITY_PATCH=1
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
KEYWORDS="irc chat"
diff --git a/chat-irc/bitlbee/HISTORY b/chat-irc/bitlbee/HISTORY
index 70907e7..0e47b2f 100644
--- a/chat-irc/bitlbee/HISTORY
+++ b/chat-irc/bitlbee/HISTORY
@@ -1,3 +1,10 @@
+2008-09-25 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ http://www.bitlbee.org/main.php/news.r.html
+
+2008-09-24 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.2.3
+
2008-05-01 Colin Childs <phoul AT sourcemage.org>
* DETAILS: Removed option for "dev" version which no longer exists
* PREPARE: Removed
diff --git a/chat-irc/bitlbee/bitlbee-1.2.3.tar.gz.sig
b/chat-irc/bitlbee/bitlbee-1.2.3.tar.gz.sig
new file mode 100755
index 0000000..2f0ea66
Binary files /dev/null and b/chat-irc/bitlbee/bitlbee-1.2.3.tar.gz.sig differ
diff --git a/chat-irc/bitlbee/bitlbee-1.2.tar.gz.sig
b/chat-irc/bitlbee/bitlbee-1.2.tar.gz.sig
deleted file mode 100644
index 57f8ea4..0000000
Binary files a/chat-irc/bitlbee/bitlbee-1.2.tar.gz.sig and /dev/null differ
diff --git a/ftp/gtk-gnutella/BUILD b/ftp/gtk-gnutella/BUILD
index 01e0730..5d0d8b1 100755
--- a/ftp/gtk-gnutella/BUILD
+++ b/ftp/gtk-gnutella/BUILD
@@ -1,7 +1,19 @@
if [ "$GNUTELLA_GTK_IP6" == "y" ]; then
- OPTS="-D ipv6='true' ${OPTS}"
+ OPTS="-Dd_ipv6='true' ${OPTS}"
else
- OPTS="-D ipv6='false' ${OPTS}"
+ OPTS="-Dd_ipv6=undef ${OPTS}"
+fi &&
+
+if [ "$GNUTELLA_GTK_FAST_ASSERT" == "y" ]; then
+ OPTS="-Dd_fast_assert='yes' ${OPTS}"
+else
+ OPTS="-Dd_fast_assert=undef ${OPTS}"
+fi &&
+
+if [ "$GNUTELLA_GTK_NLS" == "y" ]; then
+ OPTS="-Dd_nls='yes' ${OPTS}"
+else
+ OPTS="-Dd_nls=undef ${OPTS}"
fi &&

if [ "$GNUTELLA_GTK_RMTCTRL" == "y" ]; then
@@ -15,6 +27,5 @@ fi &&
-Dsysconfdir=${INSTALL_ROOT}/etc \
-Dlocalstatedir=${INSTALL_ROOT}/var \
-Dcc=/usr/bin/gcc \
- -Dd_nls=undef \
$OPTS &&
make
diff --git a/ftp/gtk-gnutella/CONFIGURE b/ftp/gtk-gnutella/CONFIGURE
index d7035d0..86b3046 100755
--- a/ftp/gtk-gnutella/CONFIGURE
+++ b/ftp/gtk-gnutella/CONFIGURE
@@ -2,4 +2,6 @@ message "${MESSAGE_COLOR}GTK+2 interface is
slower${DEFAULT_COLOR}" &&
config_query_list GNUTELLA_GTK "Which gtk+ interface do you want?" \
1.x 2.x &&
config_query GNUTELLA_GTK_IP6 "Use IPv6?" y &&
+config_query GNUTELLA_GTK_FAST_ASSERT "Enable fast assertions?" y &&
+config_query GNUTELLA_GTK_NLS "Enable NLS support?" y &&
config_query GNUTELLA_GTK_RMTCTRL "Experimental remote control?" n
diff --git a/ftp/gtk-gnutella/DEPENDS b/ftp/gtk-gnutella/DEPENDS
index 9ce07e1..a67ef3e 100755
--- a/ftp/gtk-gnutella/DEPENDS
+++ b/ftp/gtk-gnutella/DEPENDS
@@ -1,5 +1,6 @@
-depends libxml2 &&
-optional_depends "dbus" "-D dbus='true'" "-D dbus='false'" &&
+depends libxml2 &&
+optional_depends "dbus" "-Dd_dbus='true'" "-Dd_dbus=undef" &&
+optional_depends "gnutls" "-Dd_gnutls='true'" "-Dd_gnutls=undef" &&
if [ "$GNUTELLA_GTK" = "1.x" ]; then
depends gtk+ "-Dgtkversion=1"
else
diff --git a/ftp/gtk-gnutella/HISTORY b/ftp/gtk-gnutella/HISTORY
index 792ae99..03871a6 100644
--- a/ftp/gtk-gnutella/HISTORY
+++ b/ftp/gtk-gnutella/HISTORY
@@ -1,3 +1,6 @@
+2008-09-28 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DEPENDS, CONFIGURE, BUILD: reworks the deps, fixes bug 13130
+
2008-04-02 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.96.5

diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index 0838293..52ebff6 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,6 +1,6 @@
SPELL=libpng
- VERSION=1.2.31
-
SOURCE_HASH=sha512:e7d685f26b082b7193caa0aec2da00d5a93fdfda5264e124f4dc3486ce9b6296b9f3167eabfcc601863c90f5fefb6f70cc20e5ad4bd5a29937a8be3ef060e621
+ VERSION=1.2.32
+
SOURCE_HASH=sha512:db237ecdde3d1a8420761ae6c99281b0ba1c6ca15db0c3747c517eae4a3b2795d41e3c16f318598ec032c31652fce91d50e6b08425ceb9031d742c5413125abf
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index c5f32aa..0a7127a 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,6 @@
+2008-09-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.32
+
2008-08-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.31, fixed the desc, cleaned up
* PRE_BUILD: cleaned up, quoting the paths!
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 8d7cdfa..b97f15e 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=3.0.1
+ VERSION=3.0.2
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.0.1
+ VERSION=3.0.2
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -16,7 +16,7 @@ else

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=18
+ SECURITY_PATCH=19
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index ac99022..dd9e24b 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2008-09-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.2 (security, according to
+
http://www.mozilla.org/security/known-vulnerabilities/firefox30.html)
+
2008-07-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.1, fixed source urls, quoting paths!
* BUILD, INSTALL: quoting paths!
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 928d23b..fedaa8d 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,12 +1,12 @@
SPELL=seamonkey
- VERSION=1.1.11
+ VERSION=1.1.12
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:e3a7da2e726f01c7d8239f6b51113c907038dc2a557fe160907b3f15460bba746c477df9539a4e06728d100067ab0bb7c797438402b025b730317a8288bb02b2
+
SOURCE_HASH=sha512:95f14ac5c04c36b938f8a8d483aea8c194e2fb19a73592d16f3dc1b4d14a1f65450b197d0f2e40ab9f41440297708ec5ad1bf0c0d6cad60358d097a248afe222
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=seamonkey/releases/$VERSION/$SOURCE
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.mozilla.org/
- SECURITY_PATCH=13
+ SECURITY_PATCH=14
ENTERED=20010922
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 59d71e2..638bd50 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2008-09-23 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to vesion 1.1.12. SECURITY_PATCH++
+
http://www.mozilla.org/security/known-vulnerabilities/seamonkey11.html
+
2008-07-15 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.1.11. SECURITY_PATCH++

http://www.mozilla.org/security/known-vulnerabilities/seamonkey11.html#seamonkey1.1.11
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 31c9f42..f627930 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,11 +1,12 @@
SPELL=thunderbird
- VERSION=2.0.0.16
+ VERSION=2.0.0.17
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE

SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
+ SOURCE2_IGNORE=signature
if [ "$BUILD_ENIGMAIL" = "y" ]; then
ENIGMAIL_VERSION=0.95.7
PATCHLEVEL=1
@@ -18,8 +19,7 @@ ENIGMAIL_VERSION=0.95.7
LICENSE[1]=MPL
LICENSE[2]=MPL
fi
- SECURITY_PATCH=13
- PATCHLEVEL=0
+ SECURITY_PATCH=14
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index d6bbc41..ec114d8 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,8 @@
+2008-09-26 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 2.0.0.17. SECURITY_PATCH++
+
http://www.mozilla.org/security/known-vulnerabilities/thunderbird20.html#thunderbird2.0.0.17
+ Added SOURCE2_IGNORE=signature
+
2008-08-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: ENIGMAIL 0.95.7, sig -> asc
* INSTALL, enigmail.patch: removed patch
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index ff58245..8d00094 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,7 +1,7 @@
SPELL=dbus
- VERSION=1.2.3
-
SOURCE_HASH=sha512:26da1161e8f8fb7d929f180c30dd335c71c2eaff262e10f875c207fff78bbd22aad396ce4de56e6e7fa936ef570f320f9f23ab862b58f23708309988e067a6bb
- SECURITY_PATCH=2
+ VERSION=1.2.4
+
SOURCE_HASH=sha512:8e064de907114ed55a14c7150cd6152ec2af41ce9c3cbc015596cccfe936b86d2b5da33af8b8641fb3a3f3799bf945a93de81c9c615ff6e23c73d8976e1dc918
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dbus.freedesktop.org/releases/dbus/$SOURCE
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 027f266..e7eb5c9 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2008-10-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.4, SECURITY_PATCH=3, CVE-2008-3834
+
2008-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.3

diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 6b7da33..3c68d31 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -18,7 +18,7 @@ else
SOURCE_URL[2]=ftp://ftp5.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MPlayer-$VERSION
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
fi
PATCHLEVEL=1
WEB_SITE=http://www.mplayerhq.hu
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
old mode 100644
new mode 100755
index 9f091dc..267ab6c
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,8 @@
+2008-09-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, mplayer_demux_real.patch: added security relevant
+ patch, fixes http://www.ocert.org/advisories/ocert-2008-013.html
+ * DETAILS: SECURITY_PATCH++
+
2008-07-14 Remko van der Vossen <wich AT sourcemage.org>
* INSTALL: Create /usr/share/pixmaps before installing icon, otherwise
/usr/share/pixmaps will be a file
diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
index e1581bc..4a7ebed 100755
--- a/video/mplayer/PRE_BUILD
+++ b/video/mplayer/PRE_BUILD
@@ -4,7 +4,8 @@ if [[ ! $MPLAYER_SVN = y ]]; then
for i in demux_audio_fix_20080129.diff \
demux_mov_fix_20080129.diff \
stream_cddb_fix_20080120.diff \
- url_fix_20080120.diff; do
+ url_fix_20080120.diff \
+ mplayer_demux_real.patch; do
patch -p0 < $SCRIPT_DIRECTORY/$i
done
fi
diff --git a/video/mplayer/mplayer_demux_real.patch
b/video/mplayer/mplayer_demux_real.patch
new file mode 100755
index 0000000..88566fe
--- /dev/null
+++ b/video/mplayer/mplayer_demux_real.patch
@@ -0,0 +1,28 @@
+Index: libmpdemux/demux_real.c
+===================================================================
+--- libmpdemux/demux_real.c (revision 27605)
++++ libmpdemux/demux_real.c (working copy)
+@@ -947,6 +947,7 @@
+ // last fragment!
+ if(dp_hdr->len!=vpkg_length-vpkg_offset)
+ mp_msg(MSGT_DEMUX,MSGL_V,"warning!
assembled.len=%d frag.len=%d total.len=%d
\n",dp->len,vpkg_offset,vpkg_length-vpkg_offset);
++ if (vpkg_offset > dp->len - sizeof(dp_hdr_t) -
dp_hdr->len) vpkg_offset = dp->len - sizeof(dp_hdr_t) - dp_hdr->len;
+ stream_read(demuxer->stream, dp_data+dp_hdr->len,
vpkg_offset);
+ if((dp_data[dp_hdr->len]&0x20) &&
(sh_video->format==0x30335652)) --dp_hdr->chunks; else
+ dp_hdr->len+=vpkg_offset;
+@@ -970,6 +971,7 @@
+ // non-last fragment:
+ if(dp_hdr->len!=vpkg_offset)
+ mp_msg(MSGT_DEMUX,MSGL_V,"warning!
assembled.len=%d offset=%d frag.len=%d total.len=%d
\n",dp->len,vpkg_offset,len,vpkg_length);
++ if (len > dp->len - sizeof(dp_hdr_t) - dp_hdr->len)
len = dp->len - sizeof(dp_hdr_t) - dp_hdr->len;
+ stream_read(demuxer->stream, dp_data+dp_hdr->len,
len);
+ if((dp_data[dp_hdr->len]&0x20) &&
(sh_video->format==0x30335652)) --dp_hdr->chunks; else
+ dp_hdr->len+=len;
+@@ -992,6 +994,7 @@
+ extra[0]=1; extra[1]=0; // offset of the first chunk
+ if(0x00==(vpkg_header&0xc0)){
+ // first fragment:
++ if (len > dp->len - sizeof(dp_hdr_t)) len = dp->len -
sizeof(dp_hdr_t);
+ dp_hdr->len=len;
+ stream_read(demuxer->stream, dp_data, len);
+ ds->asf_packet=dp;



  • [SM-Commit] GIT changes to stable-rc-0.25 grimoire by Jaka Kranjc (af41ec58f30d6ee8c574acb4e9e8bc91b8d0516c), Jaka Kranjc, 10/07/2008

Archive powered by MHonArc 2.6.24.

Top of Page