commit: aa655378e457e47abd9c358df124e2bc754231f7 Author: Nils Freydank <holgersson <AT> posteo <DOT> de> AuthorDate: Mon Aug 7 15:42:53 2017 +0000 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> CommitDate: Mon Aug 7 17:03:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa655378
sys-apps/pacman-4.x: Security cleanup wrt Gentoo bug #585940. Package-Manager: Portage-2.3.6, Repoman-2.3.3 sys-apps/pacman/Manifest | 2 - sys-apps/pacman/files/pacman-4.0.0-gpgme.patch | 45 -------------- sys-apps/pacman/pacman-4.0.1.ebuild | 82 ------------------------ sys-apps/pacman/pacman-4.0.3-r1.ebuild | 86 -------------------------- sys-apps/pacman/pacman-4.0.3.ebuild | 82 ------------------------ 5 files changed, 297 deletions(-) diff --git a/sys-apps/pacman/Manifest b/sys-apps/pacman/Manifest index 679b00ebe9d..c2e540aa814 100644 --- a/sys-apps/pacman/Manifest +++ b/sys-apps/pacman/Manifest @@ -1,3 +1 @@ -DIST pacman-4.0.1.tar.gz 1897685 SHA256 04f6822b31022100de6cd0a1905b199bbd1eaf878ef0726b6242ee032f3c33b1 SHA512 3508fd4ef02c1b6ed5220946a9b7a54ebc24b4b5444c0fd58ada5e4bae9486be2aa38043c313bc2c82d485b03f7283f7754244a944c8529649fb4edbc0851de9 WHIRLPOOL 429e5c59f116d1d053c597f0fa186ece6bd5c042c58a257c5bf75ed4cd8eec11bdd282bb4ec2900c79b5f0aabe6dd2accebea71355fbb315d2d9522745d7d58d -DIST pacman-4.0.3.tar.gz 1961839 SHA256 a48696ae51aaccf31a69ea7916ba9b06e7836eb933b8a281c666729c9d55ce25 SHA512 a1c7607470f0c54affe09a1b0491cdc310f37accaf782489439fd80f85b7b0ae313c477f5f3075ddef86234364b2b317e9f6abe618722b603cc9808fbba2b326 WHIRLPOOL f01c0ee89e471fbf08d71abe6e1413d7102ce6b20d20a1658a88f4600df01e9485420975ef698765b2f358e83dffe84d68df0891a6d888a35826254db33856ed DIST pacman-5.0.2.tar.gz 3361701 SHA256 dfd36086ad68564bcd977f4a1fafe51dd328acd4a95093ac4bf1249be9c41f0e SHA512 94a8cce1a52d2365a993c72f16537f4dbea6100feb8f22e8782cc7d2c1ef8a525a63f3c40bb183294c0faedcc743e3d806d2fc3c50a21ab9b03df2910039d628 WHIRLPOOL 2419486287d1ce26d97b3ad53513b4699d876cf5823f65b10d60d8f1df6b2150bc1b742677a60891dccc32bb2105a9a9bb10b58950f5403d0bd64859b0b8640b diff --git a/sys-apps/pacman/files/pacman-4.0.0-gpgme.patch b/sys-apps/pacman/files/pacman-4.0.0-gpgme.patch deleted file mode 100644 index ab0f57c7a16..00000000000 --- a/sys-apps/pacman/files/pacman-4.0.0-gpgme.patch +++ /dev/null @@ -1,45 +0,0 @@ -From fc732def0944aac5c7b18860b4f46444e6d50044 Mon Sep 17 00:00:00 2001 -From: Nathan Phillip Brink <[email protected]> -Date: Mon, 17 Oct 2011 21:01:22 +0000 -Subject: [PATCH] Use AM_GPGME_PATH macro from gpgme instead of home-built gpgme detection. - -Fixes compilation on Gentoo, where CPPFLAGS=-I/usr/include/gpgme is -necessary. ---- - configure.ac | 20 ++++++++++++-------- - 1 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c23da75..87cd359 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -161,14 +161,18 @@ AM_CONDITIONAL([HAVE_LIBSSL], [test "x$with_openssl" = "xyes"]) - # Check for gpgme - AC_MSG_CHECKING(whether to link with libgpgme) - AS_IF([test "x$with_gpgme" != "xno"], -- [AC_MSG_RESULT(yes) -- AC_CHECK_LIB([gpgme], [gpgme_check_version], , -- [if test "x$with_gpgme" != "xcheck"; then -- AC_MSG_FAILURE([--with-ggpme was given, but -lgpgme was not found]) -- fi], -- [-lgpgme]) -- with_gpgme=$ac_cv_lib_gpgme_gpgme_check_version], -- AC_MSG_RESULT(no)) -+ [AC_MSG_RESULT([yes])], -+ [AC_MSG_RESULT([no])]) -+AS_IF([test "x$with_gpgme" != "xno"], -+ [AM_PATH_GPGME([], -+ [LIBS="$LIBS $GPGME_LIBS" -+ CPPFLAGS="$CPPFLAGS $GPGME_CPPFLAGS" -+ CFLAGS="$CFLAGS $GPGME_CFLAGS" -+ with_gpgme=yes -+ AC_DEFINE([HAVE_LIBGPGME], [1], [Define if gpgme should be used to provide GPG signature support.])], -+ [AS_IF([test "x$with_gpgme" != "xcheck"], -+ [AC_MSG_FAILURE([--with-gpgme was given, but gpgme was not found])]) -+ with_gpgme=no])]) - AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$with_gpgme" = "xyes"]) - - # Checks for header files. --- -1.7.3.4 - diff --git a/sys-apps/pacman/pacman-4.0.1.ebuild b/sys-apps/pacman/pacman-4.0.1.ebuild deleted file mode 100644 index 44c51197f16..00000000000 --- a/sys-apps/pacman/pacman-4.0.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools autotools-utils bash-completion-r1 eutils - -DESCRIPTION="Archlinux's binary package manager" -HOMEPAGE="http://archlinux.org/pacman/"; -SRC_URI="ftp://ftp.archlinux.org/other/${PN}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="curl debug doc gpg test" - -COMMON_DEPEND="app-arch/libarchive - dev-libs/openssl - virtual/libiconv - virtual/libintl - sys-devel/gettext - curl? ( net-misc/curl ) - gpg? ( app-crypt/gpgme )" -RDEPEND="${COMMON_DEPEND} - app-arch/xz-utils" -# autoconf macros from gpgme requied unconditionally -DEPEND="${COMMON_DEPEND} - app-crypt/gpgme - doc? ( app-doc/doxygen - app-text/asciidoc ) - test? ( dev-lang/python )" - -RESTRICT="test" - -src_prepare() { - # Adds AM_GPGME_PATH call which requires app-crypt/gpgme to be - # DEPENDed on unconditionally: - epatch "${FILESDIR}"/${PN}-4.0.0-gpgme.patch - - # Remove a line that adds -Werror in ./configure when --enable-debug - # is passed: - sed -i -e '/-Werror/d' configure.ac || die "-Werror" - - # autopoint is unwilling to replace m4/gettext.m4 with the correct - # version even though it'll gladly replace */po/Makefile.in.in, - # creating an inconsistency between gettext m4 macros and - # Makefile.in.in. Also, AM_MKINSTALLDIRS apparently doesn't exist - # anymore, so we need newer gettext macros. #420469 - rm m4/gettext.m4 || die - sed -i -e '/AM_GNU_GETTEXT_VERSION/s/0\.13\.1/0.18.1/' configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir=/var - --disable-git-version - --with-openssl - # Help protect user from shooting his/her Gentoo installation in - # its foot. - --with-root-dir="${EPREFIX}"/var/chroot/archlinux - $(use_enable debug) - $(use_enable doc) - $(use_enable doc doxygen) - $(use_with curl libcurl) - $(use_with gpg gpgme) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - dodir /etc/pacman.d - newbashcomp "${AUTOTOOLS_BUILD_DIR}"/contrib/bash_completion pacman -} - -pkg_postinst() { - einfo "Please see http://ohnopub.net/~ohnobinki/gentoo/arch/ for information" - einfo "about setting up an archlinux chroot." -} diff --git a/sys-apps/pacman/pacman-4.0.3-r1.ebuild b/sys-apps/pacman/pacman-4.0.3-r1.ebuild deleted file mode 100644 index c7ff22ff936..00000000000 --- a/sys-apps/pacman/pacman-4.0.3-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -PYTHON_COMPAT=( python2_7 ) -inherit autotools autotools-utils bash-completion-r1 eutils python-any-r1 - -DESCRIPTION="Archlinux's binary package manager" -HOMEPAGE="http://archlinux.org/pacman/"; -SRC_URI="ftp://ftp.archlinux.org/other/${PN}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="curl debug doc gpg test" - -COMMON_DEPEND="app-arch/libarchive - dev-libs/openssl - virtual/libiconv - virtual/libintl - sys-devel/gettext - curl? ( net-misc/curl ) - gpg? ( app-crypt/gpgme )" -RDEPEND="${COMMON_DEPEND} - app-arch/xz-utils" -# autoconf macros from gpgme requied unconditionally -# makepkg collision with old bash-completion -DEPEND="${COMMON_DEPEND} - app-crypt/gpgme - doc? ( app-doc/doxygen - app-text/asciidoc ) - test? ( ${PYTHON_DEPS} ) - !<=app-shells/bash-completion-2.1-r90" - -RESTRICT="test" - -src_prepare() { - # Adds AM_GPGME_PATH call which requires app-crypt/gpgme to be - # DEPENDed on unconditionally: - epatch "${FILESDIR}"/${PN}-4.0.0-gpgme.patch - - # Remove a line that adds -Werror in ./configure when --enable-debug - # is passed: - sed -i -e '/-Werror/d' configure.ac || die "-Werror" - - # autopoint is unwilling to replace m4/gettext.m4 with the correct - # version even though it'll gladly replace */po/Makefile.in.in, - # creating an inconsistency between gettext m4 macros and - # Makefile.in.in. Also, AM_MKINSTALLDIRS apparently doesn't exist - # anymore, so we need newer gettext macros. #420469 - rm m4/gettext.m4 || die - sed -i -e '/AM_GNU_GETTEXT_VERSION/s/0\.13\.1/0.18.1/' configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir=/var - --disable-git-version - --with-openssl - # Help protect user from shooting his/her Gentoo installation in - # its foot. - --with-root-dir="${EPREFIX}"/var/chroot/archlinux - $(use_enable debug) - $(use_enable doc) - $(use_enable doc doxygen) - $(use_with curl libcurl) - $(use_with gpg gpgme) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - dodir /etc/pacman.d - newbashcomp "${AUTOTOOLS_BUILD_DIR}"/contrib/bash_completion pacman - bashcomp_alias pacman pacman-key makepkg -} - -pkg_postinst() { - einfo "Please see http://ohnopub.net/~ohnobinki/gentoo/arch/ for information" - einfo "about setting up an archlinux chroot." -} diff --git a/sys-apps/pacman/pacman-4.0.3.ebuild b/sys-apps/pacman/pacman-4.0.3.ebuild deleted file mode 100644 index 44c51197f16..00000000000 --- a/sys-apps/pacman/pacman-4.0.3.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools autotools-utils bash-completion-r1 eutils - -DESCRIPTION="Archlinux's binary package manager" -HOMEPAGE="http://archlinux.org/pacman/"; -SRC_URI="ftp://ftp.archlinux.org/other/${PN}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="curl debug doc gpg test" - -COMMON_DEPEND="app-arch/libarchive - dev-libs/openssl - virtual/libiconv - virtual/libintl - sys-devel/gettext - curl? ( net-misc/curl ) - gpg? ( app-crypt/gpgme )" -RDEPEND="${COMMON_DEPEND} - app-arch/xz-utils" -# autoconf macros from gpgme requied unconditionally -DEPEND="${COMMON_DEPEND} - app-crypt/gpgme - doc? ( app-doc/doxygen - app-text/asciidoc ) - test? ( dev-lang/python )" - -RESTRICT="test" - -src_prepare() { - # Adds AM_GPGME_PATH call which requires app-crypt/gpgme to be - # DEPENDed on unconditionally: - epatch "${FILESDIR}"/${PN}-4.0.0-gpgme.patch - - # Remove a line that adds -Werror in ./configure when --enable-debug - # is passed: - sed -i -e '/-Werror/d' configure.ac || die "-Werror" - - # autopoint is unwilling to replace m4/gettext.m4 with the correct - # version even though it'll gladly replace */po/Makefile.in.in, - # creating an inconsistency between gettext m4 macros and - # Makefile.in.in. Also, AM_MKINSTALLDIRS apparently doesn't exist - # anymore, so we need newer gettext macros. #420469 - rm m4/gettext.m4 || die - sed -i -e '/AM_GNU_GETTEXT_VERSION/s/0\.13\.1/0.18.1/' configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir=/var - --disable-git-version - --with-openssl - # Help protect user from shooting his/her Gentoo installation in - # its foot. - --with-root-dir="${EPREFIX}"/var/chroot/archlinux - $(use_enable debug) - $(use_enable doc) - $(use_enable doc doxygen) - $(use_with curl libcurl) - $(use_with gpg gpgme) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - dodir /etc/pacman.d - newbashcomp "${AUTOTOOLS_BUILD_DIR}"/contrib/bash_completion pacman -} - -pkg_postinst() { - einfo "Please see http://ohnopub.net/~ohnobinki/gentoo/arch/ for information" - einfo "about setting up an archlinux chroot." -}
