Attachment 315217 Details for Bug 460429 – *DO NOT USE* Debian patch

[patch] *DO NOT USE* Debian patch

xastir-debian.diff (text/plain), 2.57 KB, created by Tomas Hoger on 2008-08-28 13:31:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Hoger

Created: 2008-08-28 13:31:51 UTC

Size: 2.57 KB

patch

obsolete

>diff -u xastir-1.9.2/debian/changelog xastir-1.9.2/debian/changelog
>--- xastir-1.9.2/debian/changelog
>+++ xastir-1.9.2/debian/changelog
>@@ -1,3 +1,12 @@
>+xastir (1.9.2-1.1) unstable; urgency=low
>+
>+  * Non-maintainer upload.
>+  * Fix attack with the help of symlinks. scripts/get-maptools.sh and
>+    scripts/get_shapelib.sh now use mktemp -t. Closes: #496383.
>+  * Add myself to the uploaders field.
>+
>+ -- Joop Stakenborg <pa3aba@debian.org>  Tue, 26 Aug 2008 15:48:02 +0200
>+
> xastir (1.9.2-1) unstable; urgency=low
> 
>   * New upstream release.
>diff -u xastir-1.9.2/debian/control xastir-1.9.2/debian/control
>--- xastir-1.9.2/debian/control
>+++ xastir-1.9.2/debian/control
>@@ -2,7 +2,7 @@
> Section: hamradio
> Priority: optional
> Maintainer: Debian Hams group <debian-hams@lists.debian.org>
>-Uploaders: Hamish Moffatt <hamish@debian.org>
>+Uploaders: Hamish Moffatt <hamish@debian.org>, Joop Stakenborg <pa3aba@debian.org>
> Standards-Version: 3.7.3
> Build-Depends: debhelper (>= 4), libax25-dev, lesstif2-dev, libxext-dev, libxp-dev, libxt-dev, festival-dev, festival, libgraphicsmagick1-dev | libgraphicsmagick-dev, libshp-dev, gpsman, gpsmanshp, proj, libpcre3-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, libgdal1-dev (>= 1.5.0), libdb-dev, libgeotiff-dev
> 
>only in patch2:
>unchanged:
>--- xastir-1.9.2.orig/scripts/get_shapelib.sh
>+++ xastir-1.9.2/scripts/get_shapelib.sh
>@@ -141,10 +141,11 @@
>     if (! grep /usr/local/lib /etc/ld.so.conf 2>&1 > /dev/null) 
>     then
>         printf "Warning: /usr/local/lib not in /etc/ld.so.conf - adding it\n"
>-        cp /etc/ld.so.conf /tmp
>-        printf "/usr/local/lib\n" >> /tmp/ld.so.conf
>+	TMPFILE = 'mktemp -t'
>+        cp /etc/ld.so.conf $TMPFILE
>+        printf "/usr/local/lib\n" >> $TMPFILE
>         $SUDO cp /etc/ld.so.conf /etc/ld.so.conf.save 
>-        $SUDO cp /tmp/ld.so.conf /etc/ld.so.conf
>+        $SUDO cp $TMPFILE /etc/ld.so.conf
>     fi
> 
>     if ( grep /usr/local/lib /etc/ld.so.conf ) 
>only in patch2:
>unchanged:
>--- xastir-1.9.2.orig/scripts/get-maptools.sh
>+++ xastir-1.9.2/scripts/get-maptools.sh
>@@ -166,13 +166,14 @@
>     if (! grep /usr/local/lib $LDCONF_FILE 2>&1 > /dev/null) 
>     then
>         printf "Warning: /usr/local/lib not in %s - adding it\n" $LDCONF_FILE
>+	TMPFILE = 'mktemp -t'
> 	if [ -f $LDCONF_FILE ]
> 	then
>-	        cp $LDCONF_FILE /tmp/ldconfig.tmp
>+	        cp $LDCONF_FILE $TMPFILE
> 	        $SUDO cp $LDCONF_FILE $LDCONF_FILE.orig.$$
> 	fi
>-        printf "/usr/local/lib\n" >> /tmp/ldconf.tmp
>-        $SUDO cp /tmp/ldconf.tmp $LDCONF_FILE
>+        printf "/usr/local/lib\n" >> $TMPFILE
>+        $SUDO cp $TMPFILE $LDCONF_FILE
> 
>     fi
>

Actions: View | Diff

Attachments on bug 460429: 315217 | 315220