Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.27 grimoire by Arwed von Merkatz (c7c211f684d461e95267b5c7af4fc44dc02ffba3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.27 grimoire by Arwed von Merkatz (c7c211f684d461e95267b5c7af4fc44dc02ffba3)
  • Date: Wed, 19 Nov 2008 12:09:20 -0600

GIT changes to stable-rc-0.27 grimoire by Arwed von Merkatz
<v.merkatz AT gmx.net>:

graphics/imagemagick/DETAILS | 1
graphics/imagemagick/HISTORY | 3
http/seamonkey/DEPENDS | 4 -
http/seamonkey/DETAILS | 6 -
http/seamonkey/HISTORY | 4 +
http/xulrunner/DETAILS | 7 +-
http/xulrunner/HISTORY | 5 +
http/xulrunner/UP_TRIGGERS | 10 +++
kernels/linux/HISTORY | 8 ++
kernels/linux/info/patches/maintenance_patches/patch-2.6.27.6 | 6 +
kernels/linux/latest.defaults | 4 -
mail/dovecot/DEPENDS | 3
mail/dovecot/DETAILS | 6 -
mail/dovecot/HISTORY | 12 +++
video/ffmpeg/DEPENDS | 2
video/ffmpeg/HISTORY | 4 +
video/vlc/DETAILS | 6 -
video/vlc/HISTORY | 3
xfce/thunar/HISTORY | 5 +
xfce/thunar/PRE_BUILD | 6 +
xfce/thunar/thunar-zombie.patch | 31
++++++++++
21 files changed, 118 insertions(+), 18 deletions(-)

New commits:
commit c7c211f684d461e95267b5c7af4fc44dc02ffba3
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

xulrunner: Updated to version 1.9.0.4. SECURITY_PATCH++

commit a27965c8012e2214db150c62970ff723e5428a9c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

thunar: Added patch from
http://bugzilla.xfce.org/show_bug.cgi?id=2983 for Bug 14884.
(cherry picked from commit 155502e3d92a24b3c5309756657be8c053d7dc11)

commit 9d89e9628cd82a01fdfce16c48d9d199d98ef782
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

seamonkey: Updated to version 1.1.13. SECURITY_PATCH++
Added depends fixes for nss 3.12 from Bug #14858
(cherry picked from commit c56c1e123fe3bec31bc6e9606ee810b42e8731e4)

commit 19905ff42afacaced04e12c32f2a5733cb1889f9
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

linux 2.6.27.6, CVE-2008-5025

commit b5118ecc31045823a3548e7dace77e927097bf4e
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ffmpeg: Should be optional_depends libdts vice libdca. Bug #14881
(cherry picked from commit 18fab9efd56b3db1b25ddcdd4d3e91e7c136b269)

commit 45965d9ed5ca27abf659542b3d6821274d01fae8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

Merge branch 'master' of ssh://florian AT scm.sourcemage.org/smgl/grimoire

Conflicts:
video/vlc/HISTORY
(cherry picked from commit d79346b26365964cba1751e7625d1bcc1b3429c5)

commit 97a1242d7771a019daddc650a4559a9ec7efec43
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

vlc 0.9.6
(cherry picked from commit 4102908f6ff3f62a7874f456fdaa4449b8df3fce)

commit 9c20870686a47f005ef6973b66cc7934a97ddf55
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

imagemagick: Added CCACHE="off" to DETAILS. See bug #14860

commit d54d7e88122b955a0bfae39f36a0432acc6514b7
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

dovecot: security update to managesieve

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 9a358ae..2442139 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION/-*/}
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
LICENSE[0]=http://www.imagemagick.org/www/Copyright.html
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index f43dafd..1bc41e7 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2008-11-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Added CCACHE="off". See Bug 14860.
+
2008-10-26 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 6.4.5-0

diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index 869d18b..7d36625 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -3,8 +3,10 @@ depends jpeg '--with-system-jpeg'
&&
depends libidl '--with-libIDL' &&
depends libpng '--with-system-png' &&
depends libxft &&
+if spell_ok nss && [[ $(installed_version nss) == 3.11* ]]; then
depends nspr '--with-system-nspr' &&
-depends nss '--with-system-nss --enable-crypto' &&
+depends nss '--with-system-nss --enable-crypto'
+fi &&
depends perl &&
depends xorg-libs '--with-x' &&
depends zip &&
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index fedaa8d..cede440 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,12 +1,12 @@
SPELL=seamonkey
- VERSION=1.1.12
+ VERSION=1.1.13
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:95f14ac5c04c36b938f8a8d483aea8c194e2fb19a73592d16f3dc1b4d14a1f65450b197d0f2e40ab9f41440297708ec5ad1bf0c0d6cad60358d097a248afe222
+
SOURCE_HASH=sha512:58d15a31f0781026756332cacebbcee705e52d3bb2267b899aa2c5e63e2214f4f67b417dedda36f378fcb867b8d656655d792e8b450a9b673dfd8990f57f1430
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=14
+ SECURITY_PATCH=15
ENTERED=20010922
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index d543ab8..25c8aa2 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2008-11-13 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.1.3. SECURITY_PATCH++
+ * DEPENDS: Added nss 3.12 fix from #14858
+
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
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index f33af98..e4e349c 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,10 +1,10 @@
SPELL=xulrunner
- VERSION=1.9.0.3
+ VERSION=1.9.0.4
SOURCE=$SPELL-$VERSION-source.tar.bz2
# SOURCE2=$SOURCE.asc
# SOURCE2_IGNORE=signature
# SOURCE_GPG=firefox.gpg:$SOURCE2:WORKS_FOR_ME
-
SOURCE_HASH=sha512:10788d5fc10a5c40ef0907cc7a817efd846beb76a14d3bcaf4fd11ebdcd43f6d2ac2be0e3c7ba038585452a98d64449009ecc4a298255abbf59603265633d60f
+
SOURCE_HASH=sha512:8cf9ae6c4b71573e336220d9f3ba0fa7f3c145285355584ef2041c9d15750090d76b18b033966cc0daeb9e2d97cd7faf1ce0a35ffd8a574a9a794560ab5c2251
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=$SPELL/releases/$VERSION/source/$SOURCE
# SOURCE2_URI=$SPELL/releases/$VERSION/source/$SOURCE2
@@ -35,7 +35,8 @@
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE2_URL[11]=ftp://ftp.free.fr/pub/Networking/www/Mozilla/$SOURCE2_URI
SOURCE2_URL[12]=ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/pub/$SOURCE2_URI
WEB_SITE=http://www.mozilla.org/
- PATCHLEVEL=2
+ PATCHLEVEL=3
+ SECURITY_PATCH=1
ENTERED=20060829
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 0a9cd60..0def226 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,8 @@
+2008-11-17 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILs: Updated to version 1.9.0.4. SECURITY_PATCH++
+ See
http://www.mozilla.org/security/known-vulnerabilities/firefox30.html#firefox3.0.4
+ * UP_TRIGGERS: Added to rebuild spell built against xulrunner
+
2008-10-10 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* DEPENDS: depends nss
diff --git a/http/xulrunner/UP_TRIGGERS b/http/xulrunner/UP_TRIGGERS
new file mode 100755
index 0000000..44c49de
--- /dev/null
+++ b/http/xulrunner/UP_TRIGGERS
@@ -0,0 +1,10 @@
+# this makes ABI changes automatically cast those that depend on
+# xulrunner via an up_trigger
+
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION}" != "${OLD_SPELL_VERSION}" ]; then
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each cast_self
+ done
+fi
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index acc39d6..fc816f0 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,11 @@
+2008-11-13 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: updated latest to patch-2.6.27.6
+ * info/patches/maintenance_patches/patch-2.6.27.6: added
+
+2008-11-09 Eric Sandall <sandalle AT sourcemage.org>
+ * latest.defaults: Updated LATEST_PRE_2_6 to patch-2.6.28-rc4
+ * info/patches/PRE_2_6/patch-2.6.28-rc4: Added
+
2008-10-26 Eric Sandall <sandalle AT sourcemage.org>
* info/patches/maintenance_patches/patch-2.6.26.7: Added
* info/patches/maintenance_patches/patch-2.6.25.19: Added
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.6
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.6
new file mode 100755
index 0000000..2b58d59
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.6
@@ -0,0 +1,6 @@
+appliedkernels="2.6.27"
+patchversion="${appliedkernels}.6"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index b81f5fd..ceac5f0 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
LATEST_2_6=2.6.27
-LATEST_PRE_2_6=patch-2.6.28-rc1
-LATEST_maintenance_patches=patch-2.6.27.4
+LATEST_PRE_2_6=patch-2.6.28-rc4
+LATEST_maintenance_patches=patch-2.6.27.6
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.32
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/mail/dovecot/DEPENDS b/mail/dovecot/DEPENDS
index cf9a0ce..4be449e 100755
--- a/mail/dovecot/DEPENDS
+++ b/mail/dovecot/DEPENDS
@@ -1,4 +1,5 @@
depends zlib &&
+depends libtool &&
if [[ $DOVECOT_MANAGESIEVE == y ]] ; then
depends autoconf &&
depends automake
@@ -18,7 +19,7 @@ optional_depends krb5 \
'for GSSAPI support' &&
optional_depends openldap \
'--with-ldap' \
- '--without-dap' \
+ '--without-ldap' \
'Enable LDAP support' &&
optional_depends mysql \
'--with-mysql' \
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 6789c67..56c30d7 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -15,8 +15,8 @@ if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
SOURCE4_IGNORE=signature
SOURCE3_GPG="dovecot.gpg:${SOURCE4}:UPSTREAM_KEY"
if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
- VERSION3=1.1.4
- VERSION4=0.10.3
+ VERSION3=1.1.6
+ VERSION4=0.10.4
VERSION5=1.1
SOURCE5=$SPELL-$VERSION3-managesieve-$VERSION4.diff.gz
SOURCE5_URL[0]=http://www.rename-it.nl/dovecot/$VERSION5/$SOURCE5
@@ -34,7 +34,7 @@ if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20030224
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
LICENSE[0]=LGPL2.1/LGPL2/MIT/BSD/PublicDomain
WEB_SITE=http://www.dovecot.org/
KEYWORDS="mail"
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 769bb10..e2522c4 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,15 @@
+2008-11-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: security fix for managesieve patch
+ http://www.dovecot.org/list/dovecot/2008-November/035259.html
+ * DEPENDS: fixed type for --without-ldap,
+ * added libtool as per bug #14892
+
+2008-11-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 1.1.6, managesieve patch to 1.1.6
+ * PRE_BUILD: two patches to fix upstream issue
+ * fixforhome1.diff: fixes an issue when using %h
+ * fixforhome2.diff: fixes the previous patch for %h
+
2008-10-10 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated spell to 1.1.4; updated managesieve patch to
1.1.4/0.10.3
* PREPARE: rewrote the warning for pre-1.1 installs
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index cab8c39..cfcedac 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -22,7 +22,7 @@ optional_depends "freetype2" \
"" \
"" \
"for a text render plugin" &&
-optional_depends "libdca" \
+optional_depends "libdts" \
"--enable-libdts" \
"" \
"for DTS audio decoding" &&
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index caff583..3419f8f 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,7 @@
+2008-11-18 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: optional_depends libdts vice libdca
+ Bug #14881
+
2008-07-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: removed STAGED_INSTALL=off; works fine

diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index 4a99646..f847f11 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,15 +1,15 @@
SPELL=vlc
- VERSION=0.9.5
+ VERSION=0.9.6
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:f93421330622801768c952eef17b7b3ab8cb425f34f41cd8564b855ca75851d5c93615ff09ee6506dfff4a7593728e7174ae2661856b98f7ab9504142de2fe90
+
SOURCE_HASH=sha512:47ed52fd42efc6fbd78bb990df7bc4e56b3500fc4d9b946972a795c4f97fecc380298d7fd1d7af70c3dc4b9fe83cf4e46e8062117242277184742a73324c0b7b
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
ENTERED=20011113
KEYWORDS="player video"
- SECURITY_PATCH=7
+ SECURITY_PATCH=8
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 5605aff..505a41b 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2008-11-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.6
+
2008-10-24 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 0.9.5
* x264.patch: removed, added upstream
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index bcb9642..1dec369 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,8 @@
+2008-11-14 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added patch.
+ * thunar-zombie.patch: Added upstream patch. Bug #14884
+ See http://bugzilla.xfce.org/show_bug.cgi?id=2983
+
2008-10-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9.3; quoting paths; fixed short desc
* PRE_BUILD: quoting paths; cleaned up
diff --git a/xfce/thunar/PRE_BUILD b/xfce/thunar/PRE_BUILD
index 8acb7d2..2cd1574 100755
--- a/xfce/thunar/PRE_BUILD
+++ b/xfce/thunar/PRE_BUILD
@@ -8,4 +8,8 @@ sed -i "s:doc/Thunar:doc/$SPELL:g" \
for lang in C es eu fr ja pl ru zh_TW; do
sed -i "s:doc/Thunar:doc/$SPELL:g" \
docs/manual/$lang/{images/,}Makefile.{am,in}
-done
+done &&
+
+
+# See http://bugzilla.xfce.org/show_bug.cgi?id=2983
+patch -p0 < $SCRIPT_DIRECTORY/thunar-zombie.patch
diff --git a/xfce/thunar/thunar-zombie.patch b/xfce/thunar/thunar-zombie.patch
new file mode 100644
index 0000000..4353c74
--- /dev/null
+++ b/xfce/thunar/thunar-zombie.patch
@@ -0,0 +1,31 @@
+Index: thunar-vfs/thunar-vfs-exec.c
+===================================================================
+--- thunar-vfs/thunar-vfs-exec.c (revision 26428)
++++ thunar-vfs/thunar-vfs-exec.c (working copy)
+@@ -324,8 +324,10 @@
+ if (startup_data->watch_id != 0)
+ g_source_remove (startup_data->watch_id);
+
+- /* close the PID */
+- g_spawn_close_pid (startup_data->pid);
++ /* make sure we don't leave zombies (see bug #2983 for details) */
++ g_child_watch_add_full (G_PRIORITY_LOW, startup_data->pid,
++ (GChildWatchFunc) g_spawn_close_pid,
++ NULL, NULL);
+
+ /* release the startup data */
+ _thunar_vfs_slice_free (TvsnStartupData, startup_data);
+@@ -513,7 +515,13 @@
+ startup_data->pid = pid;
+ }
+ }
++ else if (G_LIKELY (succeed))
++ {
++ /* make sure we don't leave zombies (see bug #2983 for details) */
++ g_child_watch_add_full (G_PRIORITY_LOW, pid, (GChildWatchFunc)
g_spawn_close_pid, NULL, NULL);
+
++ }
++
+ /* release the sn display */
+ if (G_LIKELY (sn_display != NULL))
+ sn_display_unref (sn_display);



  • [SM-Commit] GIT changes to stable-rc-0.27 grimoire by Arwed von Merkatz (c7c211f684d461e95267b5c7af4fc44dc02ffba3), Arwed von Merkatz, 11/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page