Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.25 grimoire by Jaka Kranjc (81416139a0b567ff664d319b5b2daaeeefd7d192)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.25 grimoire by Jaka Kranjc (81416139a0b567ff664d319b5b2daaeeefd7d192)
  • Date: Wed, 1 Oct 2008 05:04:36 -0500
GIT changes to stable-0.25 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

ftp/gtk-gnutella/BUILD | 17 ++++++++++++++---
ftp/gtk-gnutella/CONFIGURE | 2 ++
ftp/gtk-gnutella/DEPENDS | 5 +++--
ftp/gtk-gnutella/HISTORY | 3 +++
mail/thunderbird/DETAILS | 6 +++---
mail/thunderbird/HISTORY | 5 +++++
video/mplayer/DETAILS | 2 +-
video/mplayer/HISTORY | 5 +++++
video/mplayer/PRE_BUILD | 3 ++-
video/mplayer/mplayer_demux_real.patch | 28 ++++++++++++++++++++++++++++
10 files changed, 66 insertions(+), 10 deletions(-)

New commits:
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)

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/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/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-0.25 grimoire by Jaka Kranjc (81416139a0b567ff664d319b5b2daaeeefd7d192), Jaka Kranjc, 10/01/2008

Archive powered by MHonArc 2.6.24.

Top of Page