security fix for the stupid qpkg (needs to die)

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index 98b6f9cf64705ff9508f2ed8fd174312a315d338..85f64397dd99d09b305bfd201c0045d8bd2fdeb0 100644 (file)
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.30 2004/10/13 23:36:13 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.31 2004/10/31 01:08:35 genone Exp $
+
+*gentoolkit-0.2.0_pre10-r1 (31 Oct 2004)
+
+  31 Oct 2004; Marius Mauch <genone@gentoo.org>
+  +files/qpkg-security-fix-68846.diff, +gentoolkit-0.2.0_pre10-r1.ebuild,
+  +gentoolkit-0.2.0_pre8-r1.ebuild:
+  Added a patch from cvs to qpkg to fix a security bug (#68846).
 
   14 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
   gentoolkit-0.2.0_pre9.ebuild, gentoolkit-0.2.0_pre10.ebuild:

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index ad4c57f6f97ca1c84b023a5a06b0f40dad8aebaa..1f009aad12756bcbd3791e2efdcc4f52f5c8e363 100644 (file)
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,8 +1,13 @@
-MD5 70f30922eacb00a88fb16fbc99059a5d ChangeLog 25684
 MD5 c36d3e9465a96d7220228d2ef5457bd3 metadata.xml 451
-MD5 6c4d39e4dd9b2859f94f8749ffd82d94 gentoolkit-0.2.0_pre10.ebuild 990
 MD5 1bc98dbc873369180a0360b470b7d925 gentoolkit-0.2.0_pre8.ebuild 1102
+MD5 6c4d39e4dd9b2859f94f8749ffd82d94 gentoolkit-0.2.0_pre10.ebuild 990
 MD5 6d03c9d28889126d188696352def5d6e gentoolkit-0.2.0_pre9.ebuild 848
-MD5 096ea293c35570bd708ebd8cde10ca6b files/digest-gentoolkit-0.2.0_pre10 73
+MD5 4c406c824328196cfcb38546dea365ae gentoolkit-0.2.0_pre8-r1.ebuild 1219
+MD5 28d4c08e8a577e7234967c3413ca336b gentoolkit-0.2.0_pre10-r1.ebuild 1101
+MD5 cac36975797be257f6911b275a635ff2 ChangeLog 25950
 MD5 1b132e20e9de1c5163594b2cbd950d34 files/digest-gentoolkit-0.2.0_pre8 72
 MD5 ece108f9a9cf45a6cdd9211bb1b26db5 files/digest-gentoolkit-0.2.0_pre9 72
+MD5 096ea293c35570bd708ebd8cde10ca6b files/digest-gentoolkit-0.2.0_pre10 73
+MD5 693ad4ff7cf37c0af0232098f2d5b273 files/qpkg-security-fix-68846.diff 625
+MD5 1b132e20e9de1c5163594b2cbd950d34 files/digest-gentoolkit-0.2.0_pre8-r1 72
+MD5 096ea293c35570bd708ebd8cde10ca6b files/digest-gentoolkit-0.2.0_pre10-r1 73

diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre10-r1 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre10-r1
new file mode 100644 (file)
index 0000000..60e8959
--- /dev/null
+++ b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre10-r1
@@ -0,0 +1 @@
+MD5 3871f0ac879bc059b3fb58899aa7a507 gentoolkit-0.2.0_pre10.tar.gz 67645

diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre8-r1 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre8-r1
new file mode 100644 (file)
index 0000000..b979894
--- /dev/null
+++ b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre8-r1
@@ -0,0 +1 @@
+MD5 b07d04363203b386e15a73bc745d3dfb gentoolkit-0.2.0_pre8.tar.gz 67168

diff --git a/app-portage/gentoolkit/files/qpkg-security-fix-68846.diff b/app-portage/gentoolkit/files/qpkg-security-fix-68846.diff
new file mode 100644 (file)
index 0000000..a5f5717
--- /dev/null
+++ b/app-portage/gentoolkit/files/qpkg-security-fix-68846.diff
@@ -0,0 +1,29 @@
+--- src/qpkg/qpkg      1 Aug 2004 17:31:46 -0000       1.15
++++ src/qpkg/qpkg      31 Oct 2004 00:43:00 -0000      1.16
+@@ -9,7 +9,9 @@
+ ID='$Id: qpkg-security-fix-68846.diff,v 1.1 2004/10/31 01:08:35 genone Exp $'
+ VERSION=0.`echo ${ID} | cut -d\  -f3`
+ 
+-TMP="/tmp/qpkg-${$}/"
++umask 0077
++
++TMP="$(mktemp -d -t qpkg-XXXXXX)" || exit 1
+ rm -rf ${TMP}
+ mkdir -p ${TMP}
+ 
+@@ -228,6 +230,7 @@
+                       the older ones will have \"damaged\" files.
+   ${PROG} -f /bin/ls  print package(s) that own /bin/ls
+ "
++      rm -rf ${TMP}
+       exit
+ fi
+ 
+@@ -292,6 +295,7 @@
+                                       -e "s:-[0-9].*$::" \
+                                       -e "s:\(^[^/]*/\)\(.*\):${BR}\1${CY}\2${NO}:"|uniq
+       fi
++      rm -rf ${TMP}
+       exit
+ fi
+ 

diff --git a/app-portage/gentoolkit/gentoolkit-0.2.0_pre10-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.0_pre10-r1.ebuild
new file mode 100644 (file)
index 0000000..3b5e0bb
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.2.0_pre10-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.0_pre10-r1.ebuild,v 1.1 2004/10/31 01:08:35 genone Exp $
+
+inherit eutils
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~genone/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+#KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~ppc-macos"
+
+DEPEND=">=sys-apps/portage-2.0.51_pre21
+       >=dev-lang/python-2.0
+       >=dev-util/dialog-0.7
+       >=dev-lang/perl-5.6
+       >=sys-apps/grep-2.4
+       sys-apps/debianutils"
+
+src_install() {
+       # patch taken from cvs
+       epatch ${FILESDIR}/qpkg-security-fix-68846.diff
+       make DESTDIR=${D} install-gentoolkit || die
+}
+
+pkg_postinst() {
+       einfo "The following older scripts have been removed in this release:"
+       einfo "    dep-clean, ewhich, mkebuild, pkg-clean, pkg-size"
+}

diff --git a/app-portage/gentoolkit/gentoolkit-0.2.0_pre8-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.0_pre8-r1.ebuild
new file mode 100644 (file)
index 0000000..7b18281
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.2.0_pre8-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.0_pre8-r1.ebuild,v 1.1 2004/10/31 01:08:35 genone Exp $
+
+inherit eutils
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/~karltk/projects/gentoolkit/"
+SRC_URI="http://dev.gentoo.org/~genone/distfiles/${P}.tar.gz"
+#SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 ~ppc-macos"
+IUSE=""
+#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 "
+
+DEPEND=">=sys-apps/portage-2.0.50
+       >=dev-lang/python-2.0
+       >=dev-util/dialog-0.7
+       >=dev-lang/perl-5.6
+       >=sys-apps/grep-2.4
+       sys-apps/debianutils"
+
+
+src_install() {
+       # patch taken from cvs
+       pwd
+       epatch ${FILESDIR}/qpkg-security-fix-68846.diff
+       make DESTDIR=${D} install-gentoolkit || die
+}
+
+pkg_postinst() {
+       echo
+       einfo "This version of ${PN} has a script to test the upcoming"
+       einfo "portage GLSA integration (aka 'emerge security'). If you"
+       einfo "want to try it out run"
+       einfo "    glsa-check --help"
+       einfo "and read the output carefully."
+       echo
+}