[Pkg-cli-apps-commits] r5351 - in /packages/gnome-subtitles/trunk/debian: changelog control patches/ patches/fix_insecure_library_loading patches/series rules

[laney-guest at users.alioth.debian.org]

Author: laney-guest
Date: Wed Oct 13 21:05:18 2010
New Revision: 5351

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5351
Log:
  + Add quilt patchsys
* debian/patches/insecure_library_loading:
  + Add patch taken from upstream git to fix insecure library loading bug. (Closes: #598289)
    References: CVE-2010-3357
    Thanks to dai for forwarding the patch, and for Pedro Castro for developing it.

Added:
    packages/gnome-subtitles/trunk/debian/patches/
    packages/gnome-subtitles/trunk/debian/patches/fix_insecure_library_loading
    packages/gnome-subtitles/trunk/debian/patches/series
Modified:
    packages/gnome-subtitles/trunk/debian/changelog
    packages/gnome-subtitles/trunk/debian/control
    packages/gnome-subtitles/trunk/debian/rules

Modified: packages/gnome-subtitles/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-subtitles/trunk/debian/changelog?rev=5351&op=diff
==============================================================================
--- packages/gnome-subtitles/trunk/debian/changelog (original)
+++ packages/gnome-subtitles/trunk/debian/changelog Wed Oct 13 21:05:18 2010
@@ -5,8 +5,13 @@
       is not present (Closes: #586986)
     + Add recommends on gstreamer0.10-ffmpeg — cannot import or preview videos
       without any codecs present
+    + Add quilt patchsys
+  * debian/patches/insecure_library_loading:
+    + Add patch taken from upstream git to fix insecure library loading bug. (Closes: #598289)
+      References: CVE-2010-3357
+      Thanks to dai for forwarding the patch, and for Pedro Castro for developing it.
 
- -- Iain Lane <laney at ubuntu.com>  Sun, 27 Jun 2010 23:34:35 +0100
+ -- Iain Lane <laney at ubuntu.com>  Wed, 13 Oct 2010 21:26:29 +0100
 
 gnome-subtitles (1.0-1) unstable; urgency=low
 

Modified: packages/gnome-subtitles/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-subtitles/trunk/debian/control?rev=5351&op=diff
==============================================================================
--- packages/gnome-subtitles/trunk/debian/control (original)
+++ packages/gnome-subtitles/trunk/debian/control Wed Oct 13 21:05:18 2010
@@ -5,6 +5,7 @@
 Uploaders: Tiago Bortoletto Vaz <tiago at debian.org>, Mirco Bauer <meebey at debian.org>
 Build-Depends: cli-common-dev (>= 0.5.7),
  debhelper (>= 7),
+ quilt (>= 0.46-7~),
  autotools-dev,
  mono-devel (>= 2.4.3),
  libmono-dev,

Added: packages/gnome-subtitles/trunk/debian/patches/fix_insecure_library_loading
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-subtitles/trunk/debian/patches/fix_insecure_library_loading?rev=5351&op=file
==============================================================================
--- packages/gnome-subtitles/trunk/debian/patches/fix_insecure_library_loading (added)
+++ packages/gnome-subtitles/trunk/debian/patches/fix_insecure_library_loading Wed Oct 13 21:05:18 2010
@@ -1,0 +1,18 @@
+Description: Fix CVE-2010-3357 gnome-subtitles: insecure library loading vulnerability
+Author: Pedro Castro <mail at pedrocastro.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598289
+Origin: http://git.gnome.org/browse/gnome-subtitles/commit/?id=44370dc2a87f7fa0d6c9730979514bd407a37c65
+
+Index: gnome-subtitles-1.0/src/GnomeSubtitles/Execution/gnome-subtitles.in
+===================================================================
+--- gnome-subtitles-1.0.orig/src/GnomeSubtitles/Execution/gnome-subtitles.in	2010-10-13 21:22:27.437232084 +0100
++++ gnome-subtitles-1.0/src/GnomeSubtitles/Execution/gnome-subtitles.in	2010-10-13 21:22:25.547085884 +0100
+@@ -6,7 +6,7 @@
+ 
+ sublibdir=@SUBLIB_DLL_DIR@
+ 
+-export LD_LIBRARY_PATH="$libdir/gnome-subtitles:$LD_LIBRARY_PATH"
++export LD_LIBRARY_PATH=$libdir/gnome-subtitles${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ export MONO_PATH=$sublibdir:$MONO_PATH
+ exec -a gnome-subtitles @MONO@ $libdir/gnome-subtitles/gnome-subtitles.exe "$@"
+ 

Added: packages/gnome-subtitles/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-subtitles/trunk/debian/patches/series?rev=5351&op=file
==============================================================================
--- packages/gnome-subtitles/trunk/debian/patches/series (added)
+++ packages/gnome-subtitles/trunk/debian/patches/series Wed Oct 13 21:05:18 2010
@@ -1,0 +1,1 @@
+fix_insecure_library_loading

Modified: packages/gnome-subtitles/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-subtitles/trunk/debian/rules?rev=5351&op=diff
==============================================================================
--- packages/gnome-subtitles/trunk/debian/rules (original)
+++ packages/gnome-subtitles/trunk/debian/rules Wed Oct 13 21:05:18 2010
@@ -2,12 +2,13 @@
 #export DH_VERBOSE=1
 
 include /usr/share/cli-common/cli.make
+include /usr/share/quilt/quilt.make
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
 
 build: build-stamp
 build-stamp:
-	dh build --before configure
+	dh build --with quilt --before configure
 	dh_auto_configure -- \
 	  --disable-scrollkeeper MCS=/usr/bin/mono-csc
 	dh build --after configure
@@ -21,7 +22,7 @@
 	dh $@
 
 clean:
-	dh $@
+	dh --with quilt $@
 	rm -f build-stamp
 	rm -f build/libgstreamer_playbin.so