Missed an old patch when tidying.

Package-Manager: portage-2.0.51.22-r2

3 files changed, 9 insertions, 78 deletions

diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index 83a4af57ac18..b57d06cdd29d 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-forensics/rkhunter
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.49 2005/09/02 09:58:35 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.50 2005/09/02 10:03:03 ka0ttic Exp $
+
+  02 Sep 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/rkhunter-1.2.3-fix-insecure-tmp-creation.diff:
+  Missed an old patch when tidying.
 
 *rkhunter-1.2.7-r1 (02 Sep 2005)
 
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index d61134e59fdb..24bf820ed8b1 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 03a57af3f452538a1d2ab6dee5e1c948 ChangeLog 9584
+MD5 23e5f1275f4c0327d5844190f153139c ChangeLog 9726
 MD5 f1608c19ea0727ee36b2a692b1f3470b metadata.xml 264
 MD5 4dde05e5bd650802e6527e1a6a88da0f rkhunter-1.2.7-r1.ebuild 1758
 MD5 f620bf00896d60c4a4a47ace8956f8ac files/rkhunter-1.2.3-specify-logfile.patch 2481
@@ -9,11 +9,10 @@ MD5 3f3b34e98201ab14484cb0bb478babc2 files/rkhunter.cron 3881
 MD5 2473ff095ea8aa159a379872571b5d43 files/rkhunter.bash-completion 2628
 MD5 ecbc10aed5cbe2c9d0dfcb0df424556e files/digest-rkhunter-1.2.7-r1 66
 MD5 d07a47cbe2364dc010d37ead80ff8f4b files/rkhunter-1.2.1-create-tmpdir.diff 551
-MD5 20350356b04e1a9a2a4ec768692c925b files/rkhunter-1.2.3-fix-insecure-tmp-creation.diff 3114
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDGCJiEZCkKN40op4RAkpiAKC2A2eQpgwSUfBDadz9Utts2WMx4QCcDTxJ
-o7AhHkjSbj43uDG/xeu+C1M=
-=WUdB
+iD8DBQFDGCNqEZCkKN40op4RAnWUAJwPXcFjXTUxqXeUxR9ByC2GvUpEPwCgvdkm
+B99KdYXbLcfx3aYOMglYFMM=
+=OycS
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/rkhunter/files/rkhunter-1.2.3-fix-insecure-tmp-creation.diff b/app-forensics/rkhunter/files/rkhunter-1.2.3-fix-insecure-tmp-creation.diff
deleted file mode 100644
index 3db14e21b3eb..000000000000
--- a/app-forensics/rkhunter/files/rkhunter-1.2.3-fix-insecure-tmp-creation.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ruN rkhunter.orig/files/check_update.sh rkhunter/files/check_update.sh
---- rkhunter.orig/files/check_update.sh	2004-08-20 16:05:43.000000000 +0100
-+++ rkhunter/files/check_update.sh	2005-04-25 17:51:23.000000000 +0100
-@@ -52,15 +52,11 @@
-   {
-     echo -n "${FILEDESC}: "  
-     UPDATEDBURL="${FIRSTMIRROR}/${VERSIONUPDATEURL}"
--    ${WGETBINARY} -q -O /tmp/rkhunter.upd ${UPDATEDBURL}
--    
--    if [ -f /tmp/rkhunter.upd ]; then
--        LATESTVERSION=`cat /tmp/rkhunter.upd`
--        rm -f /tmp/rkhunter.upd
--      else
-+
-+	if ! LATESTVERSION=`${WGETBINARY} -q -O - ${UPDATEDBURL}`; then
-         echo "ERROR"
-         echo "Fatal error: Problem while fetching file"
--	exit 1
-+		exit 1
-     fi
-       
-     CURRENTVERSION=`cat ${DBDIR}/${FILENAME} | grep '000:version' | cut -d ':' -f3`
-@@ -89,12 +85,9 @@
- 
- 	    # Fetch file
- 	    GETFILE="${FIRSTMIRROR}/${FILENAME}.gz"
--	    ${WGETBINARY} -q -O /tmp/rkhunter.upd.gz ${GETFILE}
--	    if [ $? -eq 0 ]
--	      then
--	        # Gunzip it and place it on the right location
--	        gunzip /tmp/rkhunter.upd.gz
--	        mv /tmp/rkhunter.upd ${DBDIR}/${FILENAME}
-+		TMPFILE="`mktemp /tmp/rkhunter.upd.gz.XXXXXX`" || exit 1
-+	    if ${WGETBINARY} -q -O - ${GETFILE} | gunzip -c > ${TMPFILE}; then
-+	        mv ${TMPFILE} ${DBDIR}/${FILENAME}
- 		echo "  Action: Database updated (current version: ${CURRENTVERSION}, new version ${LATESTVERSION})"
- 	      else
- 	        echo "Fatal error: Can't retrieve file: ${GETFILE}"
-@@ -126,10 +119,6 @@
-         rm -f ${MIRRORFILE}.new
-     fi
- 
--    if [ -f /tmp/rkhunter.upd ]; then
--      rm -f /tmp/rkhunter.upd
--    fi
--
-     touch ${MIRRORFILE}.new
-     echo "${MIRRORSVERSION}" > ${MIRRORFILE}.new
-     for I in ${OTHERMIRRORS}; do
-diff -ruN rkhunter.orig/files/rkhunter rkhunter/files/rkhunter
---- rkhunter.orig/files/rkhunter	2005-02-21 18:32:08.000000000 +0000
-+++ rkhunter/files/rkhunter	2005-04-25 17:47:48.000000000 +0100
-@@ -4421,16 +4421,16 @@
-                 VERSION=`${I}/php -v | head -n 1 | awk '{ print $2 }'`
-                 ;;
-           procmail)
--                VERSION=`${I}/procmail -v 2> /tmp/procmail.txt && cat /tmp/procmail.txt | grep 'procmail v' | awk '{ print $2 }' | tr -d 'v' && rm -f /tmp/procmail.txt`
-+                VERSION=`${I}/procmail -v 2>&1 | grep 'procmail v' | awk '{ print $2 }' | tr -d 'v'`
-                 ;;
-           proftpd)
--                VERSION=`${I}/proftpd -v 2> /tmp/proftpd.txt && cat /tmp/proftpd.txt | awk '{ print $4 }' && rm -f /tmp/proftpd.txt`
-+                VERSION=`${I}/proftpd -v 2>&1 | awk '{ print $4 }'`
-                 ;;
-           squid)
-                 VERSION=`${I}/squid -v | grep 'Squid Cache' | awk '{ print $4 }'`
-                 ;;
-           sshd)
--                VERSION=`${I}/sshd -t -d 2> /tmp/openssh.txt && cat /tmp/openssh.txt | head -n 1 | awk '{ print $4 }' | cut -d '_' -f2 && rm -f /tmp/openssh.txt`
-+                VERSION=`${I}/sshd -t -d 2>&1 | head -n 1 | awk '{ print $4 }' | cut -d '_' -f2`
- 		if [ ! "`echo "${VERSION}" | grep "+"`" = "" ]; then
- 		  VERSION=`echo "${VERSION}" | cut -d'+' -f1`
- 		fi