[gentoo-commits] repo/gentoo:master commit in: app-portage/portage-utils/files/, app-portage/portage-utils/

[Aaron Bauman]

commit:     2b53693f62f0a5ce8cdeefe3135fa13315fa53e2
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 08:17:10 2017 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 07:10:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b53693f

app-portage/portage-utils: drop vulnerable and obsolete patches wrt bug #573574

Closes: https://github.com/gentoo/gentoo/pull/3620

 app-portage/portage-utils/Manifest                 |  3 -
 .../files/portage-utils-0.56-qcheck-tz.patch       | 31 ---------
 .../files/portage-utils-0.56-qlop-tz.patch         | 39 -----------
 .../files/portage-utils-0.60-solaris.patch         | 48 -------------
 .../portage-utils/portage-utils-0.56.ebuild        | 80 ----------------------
 .../portage-utils/portage-utils-0.60.ebuild        | 79 ---------------------
 .../portage-utils/portage-utils-0.61.ebuild        | 79 ---------------------
 7 files changed, 359 deletions(-)

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 4801921..e6d7be8 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,6 +1,3 @@
-DIST portage-utils-0.56.tar.xz 513832 SHA256 4df7323fb2667dd9bcee0f2d169c01ed8600aa6196118e6cd3a10cfe99852bbf SHA512 f2136a7df4cd91499b135fbf000f81a71177d5a39b4da2db484ab0f9492d152eaa72a5fee0e56d4b58611462e251905e554f5e41890a749f05d19e50c16c77b6 WHIRLPOOL af0a96ca3bf2dd39335317829aa8aff110a63042c415368400977e974cc21163da7eb76f7d53fcd05e133fd8a8568255ba022a32f1b174bda0dcb15b5f1476b9
-DIST portage-utils-0.60.tar.xz 519424 SHA256 d5e4a7384321d21d0aa484fcd30768dbce557e9c97a98cd2723d3eb75b82f503 SHA512 80355b31d49ac0f47c0a05071584608bd5fc0b8a98ab9025cb0a3bc8c18e318fbc60ff33e6834cd4f0ad159c2eb7f63d0d9cb61d4c86cee473215670ebba5694 WHIRLPOOL ec6d2bc1b164a7baff83019455de91483a98401f052153e152cef3733d041e71ca2f4333c9281aa593ee962d0e42b2d4f72f0d04e13982cbb25518f3bd5ca66d
-DIST portage-utils-0.61.tar.xz 526588 SHA256 9c8942529dcfd9ee5798ab6a61fd0e8d1cc42645cbf4aeeefdb2d18a13076787 SHA512 0d09901f9d0213ef4d3d1b8961185d5f748d46a06663312f382f33e39fd9d94adc97660a11f482f3c9eb771e0f4e6bfc877390e002e7c0455c9e5ad8ebf1a7a2 WHIRLPOOL 0dcce5a46bd53b39c49edecdc35b64d79d83f06a136d773808270d685895e6bcb0669ce2689c39eeccb3f3f97cb7723b58317c34865aa80605af8b88f1d44280
 DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891
 DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b9565866674303152b55248b05130a02 SHA512 2b0bceee63b894e7f517f3c938a1873aa90c41b668abbf6a39125a1bb9ce1059731e34216cc357787b5cbf83a0cf0748530147262673ea0bc26404d6274714eb WHIRLPOOL fdaec19af639c744394063dd57f7e64fb02ff10c4ee5b1ef2f49928df6d47fb5bf732e547264390787e20ca6e3251be3935e9f348f2510aa0fc6779778ca44ba
 DIST portage-utils-0.64.tar.xz 533124 SHA256 a53505758d04b2115f636afc9f0c15176a591f3cdb58f684cfd148b29c4783f0 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 WHIRLPOOL 19e34782c2f1ed637db73865acc6c07c4162ace55c0b24287bf92c66a9ebea4ca0ab230bb94478aa71bee72280231f75dd5de4eb8fc10248b52ee77cc977392e

diff --git a/app-portage/portage-utils/files/portage-utils-0.56-qcheck-tz.patch b/app-portage/portage-utils/files/portage-utils-0.56-qcheck-tz.patch
deleted file mode 100644
index 5b493b6..00000000
--- a/app-portage/portage-utils/files/portage-utils-0.56-qcheck-tz.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 359fe5097ca531291a2cbb878dc6940351a7a358 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@g.o>
-Date: Thu, 11 Jun 2015 09:51:22 +0000
-Subject: [PATCH] tests: qcheck: fix timezone handling
-
-Make sure the stamps are pinned to UTC rather than using the active TZ.
-
-URL: https://bugs.gentoo.org/551718
-Reported-by: Jeroen Roovers <jer@g.o>
----
- tests/qcheck/dotest | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/qcheck/dotest b/tests/qcheck/dotest
-index 965a5b5..9122321 100755
---- a/tests/qcheck/dotest
-+++ b/tests/qcheck/dotest
-@@ -10,8 +10,8 @@ export Q_VDB=/
- # This is the "valid" mtime the test packages have hardcoded in the CONTENTS
- # files.  The stamp is the CONTENTS while the touch date is the corresponding
- # unpacked date.
--STAMP=1398954900 DATE=201405011035
--find "${ROOT}" -exec touch -h -t "${DATE}" {} +
-+STAMP=1398954900 DATE='2014-05-01T14:35:00Z'
-+find "${ROOT}" -exec touch -h -d "${DATE}" {} +
- 
- mktmpdir
- 
--- 
-2.4.1
-

diff --git a/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch b/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch
deleted file mode 100644
index d812daa..00000000
--- a/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 286688cb68c9989f697203ca779b08fad23366db Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@g.o>
-Date: Fri, 12 Jun 2015 05:05:41 -0400
-Subject: [PATCH] tests: force TZ to UTC for everyone
-
-This should make test outputs more stable across systems.
-
-URL: https://bugs.gentoo.org/551806
-Reported-by: Nikoli <nikoli@×××.us>
----
- tests/init.sh          | 2 ++
- tests/qlop/list01.good | 4 ++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tests/init.sh b/tests/init.sh
-index b3f634e..11fd379 100644
---- a/tests/init.sh
-+++ b/tests/init.sh
-@@ -33,6 +33,8 @@ setup_env
- unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET
- # but make sure we don't implicitly rely on user's setup
- export PORTAGE_CONFIGROOT="${ab}/not/a/real/path"
-+# Always use UTC for timestamps to keep tests stable. #551806
-+export TZ='UTC 0'
- 
- q -i -q
- 
-diff --git a/tests/qlop/list01.good b/tests/qlop/list01.good
-index 458c751..fc8683c 100644
---- a/tests/qlop/list01.good
-+++ b/tests/qlop/list01.good
-@@ -1,2 +1,2 @@
--Thu Jan 27 00:42:17 2005 >>> rsync://192.168.0.5/gentoo-portage
--Sat May 16 04:21:00 2015 >>> gentoo
-+Thu Jan 27 05:42:17 2005 >>> rsync://192.168.0.5/gentoo-portage
-+Sat May 16 08:21:00 2015 >>> gentoo
--- 
-2.4.1
-

diff --git a/app-portage/portage-utils/files/portage-utils-0.60-solaris.patch b/app-portage/portage-utils/files/portage-utils-0.60-solaris.patch
deleted file mode 100644
index c938844..00000000
--- a/app-portage/portage-utils/files/portage-utils-0.60-solaris.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-- remove non-compatible xasprintf wrapper (compared to statement
-  expression version in libq/xasprintf.c
-- work around missing d_type/DT_DIR
-
---- qcache.c
-+++ qcache.c
-@@ -750,13 +750,21 @@
- 
- 		xasprintf(&catpath, "%s/dep/%s", portedb, data->overlay);
- 		dir = opendir(catpath);
--		while ((de = readdir(dir)))
-+		while ((de = readdir(dir))) {
-+#ifndef DT_DIR
-+			struct stat s;
-+			if (stat(de->d_name, &s))
-+				continue;
-+			if (S_ISDIR(s.st_mode) && de->d_name[0] != '.') {
-+#else
- 			if (de->d_type == DT_DIR && de->d_name[0] != '.') {
-+#endif
- 				bool ok;
- 				allcats = add_set_unique(de->d_name, allcats, &ok);
- 				if (ok)
- 					++numcat;
- 			}
-+		}
- 		closedir(dir);
- 		free(catpath);
- 
---- libq/compat.c
-+++ libq/compat.c
-@@ -20,16 +20,6 @@
- 	return(off == NULL ? off : (char*)(big + (off - b)));
- }
- 
--#undef  xasprintf
--#define xasprintf(strp, fmt, args...) \
--	do { /* xasprintf() */ \
--		char str[BUFSIZ]; \
--		if ((snprintf(str, sizeof(str)-1, fmt , ## args)) == -1) \
--			err("Out of stack space?"); \
--		str[sizeof(str)-1] = '\0'; \
--		*strp = xstrdup(str); \
--	} while (0)
--
- #elif defined(__hpux__) || defined(__MINT__)
- 	/* must not include both dir.h and dirent.h on hpux11..11 & FreeMiNT */
- #elif defined(__linux__)

diff --git a/app-portage/portage-utils/portage-utils-0.56.ebuild b/app-portage/portage-utils/portage-utils-0.56.ebuild
deleted file mode 100644
index 2882919..00000000
--- a/app-portage/portage-utils/portage-utils-0.56.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="small and fast portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qcheck-tz.patch #551718
-	epatch "${FILESDIR}"/${P}-qlop-tz.patch #551806
-	epatch_user
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf --with-eprefix="${EPREFIX}"
-	else
-		tc-export CC
-	fi
-}
-
-src_compile() {
-	emake NLS=$(usex nls)
-}
-
-src_install() {
-	default
-
-	exeinto /etc/portage/bin
-	doexe "${FILESDIR}"/post_sync
-	insinto /etc/portage/postsync.d
-	doins "${FILESDIR}"/q-reinitialize
-
-	# Portage fixes shebangs, we just need to fix the paths in the files
-	sed -i \
-		-e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
-		"${ED}"/etc/portage/bin/post_sync \
-		"${ED}"/etc/portage/postsync.d/q-reinitialize || die
-}
-
-pkg_preinst() {
-	# preserve +x bit on postsync files #301721
-	local x
-	pushd "${ED}" >/dev/null
-	for x in etc/portage/postsync.d/* ; do
-		[[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
-	done
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
-		elog "If you wish for it to be automatically run at the end of every --sync:"
-		elog "   # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-		elog "Normally this should only take a few seconds to run but file systems"
-		elog "such as ext3 can take a lot longer.  To disable, simply do:"
-		elog "   # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-	fi
-}

diff --git a/app-portage/portage-utils/portage-utils-0.60.ebuild b/app-portage/portage-utils/portage-utils-0.60.ebuild
deleted file mode 100644
index ae43b8c..00000000
--- a/app-portage/portage-utils/portage-utils-0.60.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="small and fast portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-solaris.patch
-	epatch_user
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf --with-eprefix="${EPREFIX}"
-	else
-		tc-export CC
-	fi
-}
-
-src_compile() {
-	emake NLS=$(usex nls)
-}
-
-src_install() {
-	default
-
-	exeinto /etc/portage/bin
-	doexe "${FILESDIR}"/post_sync
-	insinto /etc/portage/postsync.d
-	doins "${FILESDIR}"/q-reinitialize
-
-	# Portage fixes shebangs, we just need to fix the paths in the files
-	sed -i \
-		-e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
-		"${ED}"/etc/portage/bin/post_sync \
-		"${ED}"/etc/portage/postsync.d/q-reinitialize || die
-}
-
-pkg_preinst() {
-	# preserve +x bit on postsync files #301721
-	local x
-	pushd "${ED}" >/dev/null
-	for x in etc/portage/postsync.d/* ; do
-		[[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
-	done
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
-		elog "If you wish for it to be automatically run at the end of every --sync:"
-		elog "   # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-		elog "Normally this should only take a few seconds to run but file systems"
-		elog "such as ext3 can take a lot longer.  To disable, simply do:"
-		elog "   # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-	fi
-}

diff --git a/app-portage/portage-utils/portage-utils-0.61.ebuild b/app-portage/portage-utils/portage-utils-0.61.ebuild
deleted file mode 100644
index 1b26679..00000000
--- a/app-portage/portage-utils/portage-utils-0.61.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="small and fast portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-solaris.patch
-	epatch_user
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf --with-eprefix="${EPREFIX}"
-	else
-		tc-export CC
-	fi
-}
-
-src_compile() {
-	emake NLS=$(usex nls)
-}
-
-src_install() {
-	default
-
-	exeinto /etc/portage/bin
-	doexe "${FILESDIR}"/post_sync
-	insinto /etc/portage/postsync.d
-	doins "${FILESDIR}"/q-reinitialize
-
-	# Portage fixes shebangs, we just need to fix the paths in the files
-	sed -i \
-		-e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
-		"${ED}"/etc/portage/bin/post_sync \
-		"${ED}"/etc/portage/postsync.d/q-reinitialize || die
-}
-
-pkg_preinst() {
-	# preserve +x bit on postsync files #301721
-	local x
-	pushd "${ED}" >/dev/null
-	for x in etc/portage/postsync.d/* ; do
-		[[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
-	done
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
-		elog "If you wish for it to be automatically run at the end of every --sync:"
-		elog "   # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-		elog "Normally this should only take a few seconds to run but file systems"
-		elog "such as ext3 can take a lot longer.  To disable, simply do:"
-		elog "   # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-	fi
-}