Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.18 grimoire by Eric Sandall (c393f4320c77963c0515c1b19caf9296085198c8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.18 grimoire by Eric Sandall (c393f4320c77963c0515c1b19caf9296085198c8)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.18 grimoire by Eric Sandall (c393f4320c77963c0515c1b19caf9296085198c8)
  • Date: Wed, 5 Mar 2008 18:51:55 -0600
GIT changes to stable-0.18 grimoire by Eric Sandall <sandalle AT sourcemage.org>:

collab/phpgroupware/DETAILS | 4
collab/phpgroupware/HISTORY | 4
collab/phpgroupware/phpgroupware-0.9.16.009.tar.gz.sig | 0
collab/phpgroupware/phpgroupware-0.9.16.012.tar.gz.sig |binary
dev/null |binary
libs/sip/DETAILS | 4
libs/sip/HISTORY | 3
mail/thunderbird/HISTORY | 5 +
mail/thunderbird/INSTALL | 8 +
mail/thunderbird/enigmail.patch | 77
+++++++++++++++++
net/xinetd/HISTORY | 3
net/xinetd/xinetd.conf | 2
security/wireshark/DETAILS | 6 -
security/wireshark/HISTORY | 4
utils/dbus/DETAILS | 6 -
utils/dbus/HISTORY | 3
utils/qemu/DEPENDS | 4
utils/qemu/HISTORY | 3
video/vlc/DETAILS | 6 -
video/vlc/HISTORY | 6 +
video/vlc/PRE_BUILD | 7 -
video/vlc/ffmpeg-api.patch | 14 ---
video/vlc/old-faad2.patch | 18 ---
video/vobcopy/HISTORY | 4
video/vobcopy/vobcopy-1.1.0.tar.bz2.sig |binary
25 files changed, 135 insertions(+), 56 deletions(-)

New commits:
commit c393f4320c77963c0515c1b19caf9296085198c8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sip-4.7.4
(cherry picked from commit a5f4ae1c456d67d544c078bac46f43a9f965a4a6)

commit 6e20f71435adeafd52767e3c7363d754a0e3e399
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

vlc 0.8.6e, SECURITY_PATCH=4

commit 495c315f0868af4c3776a7362585cf5075a1a216
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wireshark 0.99.8, SECURITY_PATCH=7
(cherry picked from commit 6ceab3421e97bc8310dd9b76529806df2ed655bd)

commit 5adeed87a1b679620cb82f02840ef4cc9efd845c
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

dbus 1.0.3, SECURITY_PATCH=2, CVE-2008-0595
(cherry picked from commit 7ccf73767036c9fe820b1ec2cd4e2ced85c9c3bd)

commit 5c977210c6dc71e60c57a0860c1f2fecab1b11fb
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xinetd: corrected broken default xinetd.conf
(cherry picked from commit 0efb1ee972d175cb620041dc93206b62c6b8050a)

commit 1c4bc28f4425029967f18972ebc81a32b6cff324
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

vobcopy: updated signature
(cherry picked from commit 911228a1cb186da2effa07c10efd3ea3e11b8d8e)

commit 466efea1ecc1db79385eeee16799f0b5344a5287
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

phpgroupware: 0.9.16.012 #14324
(cherry picked from commit 36a236caa31061759164ce3ea21f7449d5ca6c9e)

commit e57dd8434c47049e5f70fe32ce75a5290747d599
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qemu: fix build with kqemu (prevent bad configure option)
(cherry picked from commit 370ee38fe64e61ed553a355942206df9184e7062)

commit 8dd720886658fea7f9d94d47697d4d1fabac0895
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird: Enable Enigmail without running as root first (Bug #10720)

diff --git a/collab/phpgroupware/DETAILS b/collab/phpgroupware/DETAILS
index b2a0e36..994b0c3 100755
--- a/collab/phpgroupware/DETAILS
+++ b/collab/phpgroupware/DETAILS
@@ -1,8 +1,8 @@
SPELL=phpgroupware
- VERSION=0.9.16.009
+ VERSION=0.9.16.012
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
- SOURCE_URL[0]=$SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://www.phpgroupware.org/
LICENSE[0]=GPL
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/collab/phpgroupware/HISTORY b/collab/phpgroupware/HISTORY
index d6e3017..79aefa0 100644
--- a/collab/phpgroupware/HISTORY
+++ b/collab/phpgroupware/HISTORY
@@ -1,3 +1,7 @@
+2008-02-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 0.9.16.012, fixes #14324
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/collab/phpgroupware/phpgroupware-0.9.16.009.tar.gz.sig
b/collab/phpgroupware/phpgroupware-0.9.16.009.tar.gz.sig
deleted file mode 100644
index 5379b46..0000000
Binary files a/collab/phpgroupware/phpgroupware-0.9.16.009.tar.gz.sig and
/dev/null differ
diff --git a/collab/phpgroupware/phpgroupware-0.9.16.012.tar.gz.sig
b/collab/phpgroupware/phpgroupware-0.9.16.012.tar.gz.sig
new file mode 100644
index 0000000..5f74860
Binary files /dev/null and
b/collab/phpgroupware/phpgroupware-0.9.16.012.tar.gz.sig differ
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index be74baa..881b092 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -4,8 +4,8 @@ if [ ${SIP_SNAP}x = yx ];then

SOURCE_HASH=sha512:9553b48af080241573ff20571602368bfdfe7f2d7c6184b8bc3fa6722db6daccf3a87e4b0f073c7d02d87406ae5e03daa2b7d1af9016dfbbf2b25c293b1622ae
URI=Snapshots/sip4
else
- VERSION=4.7.3
-
SOURCE_HASH=sha512:e8a98b4556588330ed36e10634c7fb27d121401181529405fe3c9dadf9763213ffbff68b5a63d712874714983ffc90ef28e4eb6888e47878eb4dc54b87c908b7
+ VERSION=4.7.4
+
SOURCE_HASH=sha512:896776c6ba0f0470098ba703b9ce028e8ca5043987fc43f87414ed16a5b8374ae3a9cdd3c8f5480b64197c5037ed216af151ebda49eaaf79381acbe531c084e4
URI=sip4
fi
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index 54e9136..f60bf64 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2008-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.7.4
+
2007-12-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.7.3

diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index fa43cce..4845031 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,8 @@
+2008-02-12 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Apply enigmail.patch if Enigmail is enabled
+ * enigmail.patch: Patch for Engimail to be registered (Bug #10720)
+ Probably a better way, but this is the quick fix
+
2007-11-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.0.9, SECURITY_PATCH=10
* mozilla.gpg: updated "Mozilla Software Releases" key
diff --git a/mail/thunderbird/INSTALL b/mail/thunderbird/INSTALL
index 9e976ee..ab35c19 100755
--- a/mail/thunderbird/INSTALL
+++ b/mail/thunderbird/INSTALL
@@ -5,7 +5,12 @@ ln -s $THUNDERBIRD_HOME $THUNDERBIRD_HOME-$VERSION &&
make install &&

if [ "$BUILD_ENIGMAIL" == "y" ]; then
- make -C mailnews/extensions/enigmail install
+ make -C mailnews/extensions/enigmail install &&
+ #
+ # Register Enigmail if it is installed
+ #
+ patch $INSTALL_ROOT/usr/lib/thunderbird/chrome/app-chrome.manifest \
+ $SCRIPT_DIRECTORY/enigmail.patch
fi &&

cd ${INSTALL_ROOT}/usr/lib/thunderbird &&
@@ -14,6 +19,7 @@ export MOZILLA_FIVE_HOME="$THUNDERBIRD_HOME" &&
./regxpcom &&
touch `find . -name *.rdf` &&

+
#
# Create symlink from NSS Root CA store, if it exists. NSS requires this
# to be in the same directory as the current application binary. See:
diff --git a/mail/thunderbird/enigmail.patch b/mail/thunderbird/enigmail.patch
new file mode 100644
index 0000000..08aaffd
--- /dev/null
+++ b/mail/thunderbird/enigmail.patch
@@ -0,0 +1,77 @@
+diff -Naur thunderbird.orig/chrome/app-chrome.manifest
thunderbird/chrome/app-chrome.manifest
+--- thunderbird.orig/chrome/app-chrome.manifest 1969-12-31
16:00:00.000000000 -0800
++++ thunderbird/chrome/app-chrome.manifest 2008-02-12 09:12:43.594567541
-0800
+@@ -0,0 +1,73 @@
++
++locale wallet en-US jar:en-US.jar!/locale/en-US/wallet/
++
++content enigmime jar:enigmime.jar!/content/enigmime/
++
++skin enigmail classic/1.0
jar:enigmail-skin-tbird.jar!/skin/classic/enigmail/
++
++overlay
chrome://messenger/content/messengercompose/messengercompose.xul
chrome://enigmail/content/enigmailCheckLanguage.xul
++overlay
chrome://messenger/content/messengercompose/messengercompose.xul
chrome://enigmail/content/enigmailMsgComposeOverlay.xul
++overlay chrome://messenger/content/mailWindowOverlay.xul
chrome://enigmail/content/enigmailCheckLanguage.xul
++overlay chrome://messenger/content/mailWindowOverlay.xul
chrome://enigmail/content/enigmailMessengerOverlay.xul
++overlay chrome://messenger/content/msgHdrViewOverlay.xul
chrome://enigmail/content/enigmailMsgHdrViewOverlay.xul
++overlay chrome://messenger/content/msgPrintEngine.xul
chrome://enigmail/content/enigmailMsgPrintOverlay.xul
++overlay chrome://messenger/content/am-identity-edit.xul
chrome://enigmail/content/enigmailAmIdEditOverlay.xul
++overlay chrome://messenger/content/am-identity-edit.xul
chrome://enigmail/content/enigmailEditIdentity.xul
++overlay chrome://messenger/content/addressbook/addressbook.xul
chrome://enigmail/content/enigmailAbCardViewOverlay.xul
++overlay chrome://messenger/content/addressbook/abContactsPanel.xul
chrome://enigmail/content/enigmailAbContactsPanel.xul
++overlay chrome://global/content/customizeToolbar.xul
chrome://enigmail/content/enigmailCustToolOverlay.xul
++overlay chrome://communicator/content/pref/preftree.xul
chrome://enigmail/content/enigmailPrefsOverlay.xul
++overlay chrome://enigmail/content/am-enigprefs.xul
chrome://enigmail/content/enigmailEditIdentity.xul
++overlay chrome://enigmail/content/am-enigprefs-edit.xul
chrome://enigmail/content/enigmailEditIdentity.xul
++overlay chrome://browser/content/browser.xul
chrome://enigmail/content/enigmailNavigatorOverlay.xul
++content enigmail jar:enigmail.jar!/content/enigmail/
++
++locale enigmail en-US
jar:enigmail.jar!/locale/en-US/enigmail/
++
++locale enigmail en-US
jar:enigmail-en-US.jar!/locale/en-US/enigmail/
++
++skin enigmail modern/1.0
jar:enigmail-skin.jar!/skin/modern/enigmail/
++
++skin enigmail classic/1.0
jar:enigmail-skin.jar!/skin/classic/enigmail/
++
++locale enigmail ca-AD
jar:enigmail-locale.jar!/locale/ca-AD/enigmail/
++
++locale enigmail de-AT
jar:enigmail-locale.jar!/locale/de-AT/enigmail/
++
++locale enigmail de-DE
jar:enigmail-locale.jar!/locale/de-DE/enigmail/
++
++locale enigmail el
jar:enigmail-locale.jar!/locale/el/enigmail/
++
++locale enigmail es-ES
jar:enigmail-locale.jar!/locale/es-ES/enigmail/
++
++locale enigmail fi-FI
jar:enigmail-locale.jar!/locale/fi-FI/enigmail/
++
++locale enigmail fr-FR
jar:enigmail-locale.jar!/locale/fr-FR/enigmail/
++
++locale enigmail hu-HU
jar:enigmail-locale.jar!/locale/hu-HU/enigmail/
++
++locale enigmail it-IT
jar:enigmail-locale.jar!/locale/it-IT/enigmail/
++
++locale enigmail ja-JP
jar:enigmail-locale.jar!/locale/ja-JP/enigmail/
++
++locale enigmail ko-KR
jar:enigmail-locale.jar!/locale/ko-KR/enigmail/
++
++locale enigmail nb-NO
jar:enigmail-locale.jar!/locale/nb-NO/enigmail/
++
++locale enigmail pl-PL
jar:enigmail-locale.jar!/locale/pl-PL/enigmail/
++
++locale enigmail pt-BR
jar:enigmail-locale.jar!/locale/pt-BR/enigmail/
++
++locale enigmail pt-PT
jar:enigmail-locale.jar!/locale/pt-PT/enigmail/
++
++locale enigmail ru-RU
jar:enigmail-locale.jar!/locale/ru-RU/enigmail/
++
++locale enigmail sl-SI
jar:enigmail-locale.jar!/locale/sl-SI/enigmail/
++
++locale enigmail sv-SE
jar:enigmail-locale.jar!/locale/sv-SE/enigmail/
++
++locale enigmail tr-TR
jar:enigmail-locale.jar!/locale/tr-TR/enigmail/
++
++locale enigmail zh-CN
jar:enigmail-locale.jar!/locale/zh-CN/enigmail/
++
++locale enigmail zh-TW
jar:enigmail-locale.jar!/locale/zh-TW/enigmail/
diff --git a/net/xinetd/HISTORY b/net/xinetd/HISTORY
index 1e09e80..2465615 100644
--- a/net/xinetd/HISTORY
+++ b/net/xinetd/HISTORY
@@ -1,3 +1,6 @@
+2008-02-24 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * xinetd.conf: Corrected to work with current xinetd
+
2007-06-17 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on some system logger to run

diff --git a/net/xinetd/xinetd.conf b/net/xinetd/xinetd.conf
index 289f922..64c52b9 100644
--- a/net/xinetd/xinetd.conf
+++ b/net/xinetd/xinetd.conf
@@ -1 +1 @@
-ID="includedir /etc/xinetd.d"
+includedir /etc/xinetd.d
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index f9ffa0d..ec1c56c 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=0.99.7
- SECURITY_PATCH=6
+ VERSION=0.99.8
+ SECURITY_PATCH=7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:39a6863326a117c9748ff9cbfe1599b18b6c6c50d28ac1653064ee6e56af75b3c433c5568d4bd6e49e839267907523bd634a7a0edd9aa9bf82055554b1c6b3e7
+
SOURCE_HASH=sha512:c192e8b90d796ded1d136dcbe0f5e4e8400afa4f4b1ac278664a9dc7f6075888a0d28ebee16bec6c3990d20f6235bf22510b9b01ca101f0ae2df7ed6a76852ad
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 772dbec..6485a1f 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,7 @@
+2008-02-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.99.8, SECURITY_PATCH=7
+ http://www.wireshark.org/security/wnpa-sec-2008-01.html
+
2007-12-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.99.7, SECURITY_PATCH=6
http://www.wireshark.org/security/wnpa-sec-2007-03.html
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index efadfe5..3fa4a96 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,7 +1,7 @@
SPELL=dbus
- VERSION=1.0.2
-
SOURCE_HASH=sha512:a3fe504577183fcda2db7cf71de2d114a4e873f8f2e01ccf661914fc29289a5380d98cb77c1417051557b6406d6a83bbb4054a3be9f619c6a9c5cf707f4d5292
- SECURITY_PATCH=1
+ VERSION=1.0.3
+
SOURCE_HASH=sha512:84115044bf7700f32632a13ef45922923bcfa518cabbc67fa2480e730de382095c8a1b1de1a70293effc049b2dce1f62785c6762405cf6909db170ae43e94c0f
+ SECURITY_PATCH=2
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 738871c..a0d40d5 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2008-02-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.3, SECURITY_PATCH=2, CVE-2008-0595
+
2007-06-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: fixed WEB_SITE

diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index b3f1621..1afe8ca 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -5,8 +5,8 @@ optional_depends alsa-lib
\
'--enable-alsa' \
'--disable-alsa' \
'for Advanced Linux Sound Architecture driver support' &&
-
+# Qemu configure script doesn't accept --enable-kqemu .
optional_depends kqemu \
- '--enable-kqemu' \
+ '' \
'--disable-kqemu' \
'for kernel acceleration support'
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 5c0aa4a..3ee25ec 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,6 @@
+2008-02-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: No --enable-kqemu! The custom configure script does only
know the disable.
+
2008-01-19 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 0.9.1
* BUILD: fixed configure's options
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index f7ff067..12acaf2 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,15 +1,15 @@
SPELL=vlc
- VERSION=0.8.6d
+ VERSION=0.8.6e
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE
WEB_SITE=http://www.videolan.org
-
SOURCE_HASH=sha512:5ab2505b7a4724aa5ddbafdf5dce9944b0fa8ddbb15e689c248f93152b8f8402c1a9d92b6e59819a676dfb2ea829270ec1d008e2c0d808c08bb6d0e22a753f0f
+
SOURCE_HASH=sha512:92b3a24ff0329ed5df3ac00385bfe418a00fbd26ae9b4f90644d4699bec95e887096104073e8a01c6ecd000f21572d4a024f888262e5aef5504a6161427e5fab
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
ENTERED=20011113
KEYWORDS="player video"
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
SHORT="multimedia player"
cat << EOF
VLC (initially VideoLAN Client) is a highly portable multimedia player for
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index fd7c3c1..823c2d5 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,9 @@
+2008-02-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.8.6e, SECURITY_PATCH=4
+ http://www.videolan.org/security/sa0801.php
+ http://www.videolan.org/security/sa0802.php
+ * PRE_BUILD, ffmpeg-api.patch, old-faad2.patch: removed patches
+
2007-10-22 Pol Vinogradov <vin.public AT gmail.com>
* BUILD: changed iceweasel to icecat

diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 73f6f8d..b43756d 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -8,12 +8,5 @@ elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner;
then
sedit 's:$(libdir)/mozilla:$(libdir)/xulrunner:' mozilla/Makefile.in
fi &&

-# patch to make it not require faad2 2.5, but take advantage of it if it's
-# available
-patch -p0 < $SCRIPT_DIRECTORY/old-faad2.patch &&
-
-# patch for ffmpeg-svn of 2007-11-21, also supports older versions
-patch -p0 < $SPELL_DIRECTORY/ffmpeg-api.patch &&
-
# fix png linking
sedit 's/-lpng -lz/-lpng -lm -lz/' configure
diff --git a/video/vlc/ffmpeg-api.patch b/video/vlc/ffmpeg-api.patch
deleted file mode 100644
index 03037a6..0000000
--- a/video/vlc/ffmpeg-api.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- modules/codec/ffmpeg/mux.c.orig 2007-11-21 21:47:16.000000000 +0100
-+++ modules/codec/ffmpeg/mux.c 2007-11-21 21:49:41.000000000 +0100
-@@ -133,7 +133,11 @@
- return VLC_EGENERIC;
- }
-
-+#if (LIBAVFORMAT_BUILD >= ((52<<16)+(0<<8)+0))
-+ p_sys->oc->pb = &p_sys->io;
-+#else
- p_sys->oc->pb = p_sys->io;
-+#endif
- p_sys->oc->nb_streams = 0;
-
- p_sys->b_write_header = VLC_TRUE;
diff --git a/video/vlc/old-faad2.patch b/video/vlc/old-faad2.patch
deleted file mode 100644
index b8f0f56..0000000
--- a/video/vlc/old-faad2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- modules/codec/faad.c~ 2007-02-15 19:50:20.000000000 +0100
-+++ modules/codec/faad.c 2007-02-15 19:50:23.000000000 +0100
-@@ -316,6 +316,7 @@
- p_dec->fmt_out.audio.i_channels = frame.channels;
-
- /* Adjust stream info when dealing with SBR/PS */
-+#ifdef NEAACDECAPI
- if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) &&
- p_dec->p_parent->i_object_type == VLC_OBJECT_INPUT )
- {
-@@ -336,6 +337,7 @@
- free( psz_cat );
- p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
- }
-+#endif
-
- /* Convert frame.channel_position to our own channel values */
- for( i = 0; i < frame.channels; i++ )
diff --git a/video/vobcopy/HISTORY b/video/vobcopy/HISTORY
index 0818f95..0e3bce3 100644
--- a/video/vobcopy/HISTORY
+++ b/video/vobcopy/HISTORY
@@ -1,3 +1,7 @@
+2008-02-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * vobcopy-1.1.0.tar.bz2.sig: updated signature, minor changes in the
+ tarball, bug #14331
+
2008-01-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 1.1.0, SECURITY_PATCH++, CVE-2007-5718

diff --git a/video/vobcopy/vobcopy-1.1.0.tar.bz2.sig
b/video/vobcopy/vobcopy-1.1.0.tar.bz2.sig
index fe7093b..dbd50d9 100644
Binary files a/video/vobcopy/vobcopy-1.1.0.tar.bz2.sig and
b/video/vobcopy/vobcopy-1.1.0.tar.bz2.sig differ


  • [SM-Commit] GIT changes to stable-0.18 grimoire by Eric Sandall (c393f4320c77963c0515c1b19caf9296085198c8), Eric Sandall, 03/05/2008

Archive powered by MHonArc 2.6.24.

Top of Page