From da188bc0219a295917bc1643451332205c6abdac Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Thu, 17 Nov 2005 23:53:47 +0000 Subject: [PATCH] fix #112061 Package-Manager: portage-2.0.53_rc7 --- app-portage/eix/ChangeLog | 11 ++++- app-portage/eix/Manifest | 21 +++----- app-portage/eix/eix-0.2.2.ebuild | 39 --------------- app-portage/eix/eix-0.2.6.ebuild | 48 ------------------- .../{eix-0.3.0.ebuild => eix-0.3.0-r2.ebuild} | 7 ++- .../eix/files/0.2.2-incorrect-masks.patch | 43 ----------------- app-portage/eix/files/0.2.2-unistd.h.patch | 23 --------- app-portage/eix/files/0.2.6-cdb-cast.patch | 14 ------ app-portage/eix/files/0.2.6-package.cc.patch | 14 ------ .../eix/files/0.3.0-insecure-tmpfile.patch | 18 +++++++ app-portage/eix/files/digest-eix-0.2.2 | 1 - app-portage/eix/files/digest-eix-0.2.6 | 1 - .../{digest-eix-0.3.0 => digest-eix-0.3.0-r2} | 0 13 files changed, 40 insertions(+), 200 deletions(-) delete mode 100644 app-portage/eix/eix-0.2.2.ebuild delete mode 100644 app-portage/eix/eix-0.2.6.ebuild rename app-portage/eix/{eix-0.3.0.ebuild => eix-0.3.0-r2.ebuild} (76%) delete mode 100644 app-portage/eix/files/0.2.2-incorrect-masks.patch delete mode 100644 app-portage/eix/files/0.2.2-unistd.h.patch delete mode 100644 app-portage/eix/files/0.2.6-cdb-cast.patch delete mode 100644 app-portage/eix/files/0.2.6-package.cc.patch create mode 100644 app-portage/eix/files/0.3.0-insecure-tmpfile.patch delete mode 100644 app-portage/eix/files/digest-eix-0.2.2 delete mode 100644 app-portage/eix/files/digest-eix-0.2.6 rename app-portage/eix/files/{digest-eix-0.3.0 => digest-eix-0.3.0-r2} (100%) diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog index 3440d3291c5e..c84795e417ef 100644 --- a/app-portage/eix/ChangeLog +++ b/app-portage/eix/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-portage/eix # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.51 2005/11/14 12:59:59 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.52 2005/11/17 23:53:47 hollow Exp $ + +*eix-0.3.0-r2 (17 Nov 2005) + + 17 Nov 2005; Benedikt Boehm + -files/0.2.2-incorrect-masks.patch, -files/0.2.6-cdb-cast.patch, + -files/0.2.2-unistd.h.patch, -files/0.2.6-package.cc.patch, + +files/0.3.0-insecure-tmpfile.patch, -eix-0.2.2.ebuild, -eix-0.2.6.ebuild, + -eix-0.3.0.ebuild, +eix-0.3.0-r2.ebuild: + fix #112061 *eix-0.5.0_pre1 (14 Nov 2005) diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest index 11db4d2bab07..74e3f63e2ab7 100644 --- a/app-portage/eix/Manifest +++ b/app-portage/eix/Manifest @@ -1,32 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 6549d1f48746d9dd40f945fff820f3c7 ChangeLog 6572 -MD5 49642086df408e27d9c50e8759b6f8e3 eix-0.2.2.ebuild 1152 -MD5 c54871b1c3d77224848568572d63c710 eix-0.2.6.ebuild 1301 +MD5 676c49f5dfa0f08d20b08ac9020b33e9 ChangeLog 6915 MD5 9453c685fa99329b88b782086419847f eix-0.3.0-r1.ebuild 1283 -MD5 39e8d718b4e1c785eeafdb242a99ed29 eix-0.3.0.ebuild 1179 +MD5 abd23889d091ca575d92ecb39ffa7d70 eix-0.3.0-r2.ebuild 1338 MD5 1e7b8737862ec1bbf7e0d10fc5417ebf eix-0.5.0_beta.ebuild 1249 MD5 74e9939ab7e9ff1a514ea45102c4be57 eix-0.5.0_pre1.ebuild 1249 -MD5 b012df8992488da6f22e677cba2e1f9c files/0.2.2-incorrect-masks.patch 1661 -MD5 9033adc2410fa5477618aa28ae6d8582 files/0.2.2-unistd.h.patch 716 -MD5 1df3eabe7a20b27cf2d3c1c0b2b5a090 files/0.2.6-cdb-cast.patch 516 -MD5 3a36ef63cff165b67afeb774a7edf9d1 files/0.2.6-package.cc.patch 461 MD5 309a6ba7043e7941a8effc552ec3a1a0 files/0.3.0-datatype-mix.patch 2066 MD5 026ea1bfa86dd00de37c3e3d1305c9c7 files/0.3.0-dbmatchcriteria-fix.patch 445 MD5 7efa28889b9a45d2abc52e51c5155a7f files/0.3.0-getParentProfile.patch 1016 MD5 451cd103e930d34810d0c426b7ad0ddb files/0.3.0-if-else-fi.patch 635 -MD5 3eff250e62af117080bac27f4f2a9655 files/digest-eix-0.2.2 62 -MD5 79cb9eb15d5c16732f94bf126ee8ca2f files/digest-eix-0.2.6 62 -MD5 f0687628fdeca80bbcebef82a7a82e6f files/digest-eix-0.3.0 62 +MD5 d8f3f2eb38eac66200e8a7d95f7660af files/0.3.0-insecure-tmpfile.patch 891 MD5 f0687628fdeca80bbcebef82a7a82e6f files/digest-eix-0.3.0-r1 62 +MD5 f0687628fdeca80bbcebef82a7a82e6f files/digest-eix-0.3.0-r2 62 MD5 5eab90cc00475299b8435821f08915bf files/digest-eix-0.5.0_beta 67 MD5 b0a5a75447af47c7b63cf2d4bca90db8 files/digest-eix-0.5.0_pre1 67 MD5 74c5aadf8e3e9d642a20e64d1afefec8 metadata.xml 239 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDeIplmPFBzbX68WERAg54AJ9IinKrCB/wkiH1oehpXgAYoG+3kQCfWBmT -xdM3J3Y7y1qZLP4Ez1dCoOU= -=sFrG +iD8DBQFDfRgomPFBzbX68WERAlVkAJ96kZtQRJa2/LEo9NcmfC6We5A6JQCglyCY +q0/39UwHulorZx/RUd508Ps= +=fh12 -----END PGP SIGNATURE----- diff --git a/app-portage/eix/eix-0.2.2.ebuild b/app-portage/eix/eix-0.2.2.ebuild deleted file mode 100644 index 486c2f058d76..000000000000 --- a/app-portage/eix/eix-0.2.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.2.2.ebuild,v 1.11 2005/07/09 02:38:36 swegener Exp $ - -inherit eutils flag-o-matic bash-completion - -DESCRIPTION="Small utility for searching ebuilds with indexing for fast results" -HOMEPAGE="http://eixwiki.unfoog.de" -SRC_URI="mirror://sourceforge/eix/${P}.tar.bz2 http://frexx.de/eix/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc sparc x86" -IUSE="" - -DEPEND="sys-apps/portage" - -src_compile() { - epatch "${FILESDIR}"/0.2.2-incorrect-masks.patch - epatch "${FILESDIR}"/0.2.2-unistd.h.patch - - aclocal || die "aclocal" - libtoolize --force --copy || die "libtoolize" - autoconf || die "autoconf" - - econf || die "configure failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dobashcompletion contrib/eix.bash-completion ${PN} -} - -pkg_postinst() { - einfo "Please run 'update-eix' to setup the portage search database." - einfo "The database file will be located at /var/cache/eix" - bash-completion_pkg_postinst -} diff --git a/app-portage/eix/eix-0.2.6.ebuild b/app-portage/eix/eix-0.2.6.ebuild deleted file mode 100644 index 72478e693c59..000000000000 --- a/app-portage/eix/eix-0.2.6.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.2.6.ebuild,v 1.8 2005/09/10 05:34:01 agriffis Exp $ - -inherit eutils flag-o-matic bash-completion - -DESCRIPTION="Small utility for searching ebuilds with indexing for fast results" -HOMEPAGE="http://eixwiki.unfoog.de" -SRC_URI="mirror://sourceforge/eix/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha ~amd64 ~ia64 ppc sparc x86" -IUSE="" - -DEPEND="sys-apps/portage" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/0.2.6-package.cc.patch - epatch ${FILESDIR}/0.2.6-cdb-cast.patch -} - -src_compile() { - aclocal || die "aclocal" - libtoolize --force --copy || die "libtoolize" - autoconf || die "autoconf" - - econf || die "configure failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dobashcompletion contrib/eix.bash-completion "${PN}" -} - -pkg_postinst() { - einfo "Please run 'update-eix' to setup the portage search database." - einfo "The database file will be located at /var/cache/eix" - echo - einfo "If you want to use the cdb-support, you need to add" - einfo " PORTDIR_CACHE_METHOD=\"cdb\"" - einfo "to you /etc/eixrc or ~/.eixrc" - - bash-completion_pkg_postinst -} diff --git a/app-portage/eix/eix-0.3.0.ebuild b/app-portage/eix/eix-0.3.0-r2.ebuild similarity index 76% rename from app-portage/eix/eix-0.3.0.ebuild rename to app-portage/eix/eix-0.3.0-r2.ebuild index 33b15f215f65..8b10669834e2 100644 --- a/app-portage/eix/eix-0.3.0.ebuild +++ b/app-portage/eix/eix-0.3.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.3.0.ebuild,v 1.3 2005/09/03 12:29:59 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.3.0-r2.ebuild,v 1.1 2005/11/17 23:53:47 hollow Exp $ inherit eutils flag-o-matic bash-completion @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/eix/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86" IUSE="" DEPEND="sys-apps/portage" @@ -21,6 +21,9 @@ src_unpack() { epatch ${FILESDIR}/0.3.0-if-else-fi.patch epatch ${FILESDIR}/0.3.0-datatype-mix.patch + epatch ${FILESDIR}/0.3.0-dbmatchcriteria-fix.patch + epatch ${FILESDIR}/0.3.0-getParentProfile.patch + epatch ${FILESDIR}/0.3.0-insecure-tmpfile.patch } src_compile() { diff --git a/app-portage/eix/files/0.2.2-incorrect-masks.patch b/app-portage/eix/files/0.2.2-incorrect-masks.patch deleted file mode 100644 index 2c372320b243..000000000000 --- a/app-portage/eix/files/0.2.2-incorrect-masks.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Naur eix-0.2.2.orig/ChangeLog eix-0.2.2/ChangeLog ---- eix-0.2.2.orig/ChangeLog 2005-04-06 17:43:28.000000000 +0200 -+++ eix-0.2.2/ChangeLog 2005-04-06 17:43:59.000000000 +0200 -@@ -18,6 +18,7 @@ - - User root no longer needed to update database - - Moved some functionality into seperate toolkits. - - Added ~-operator to class Mask -+ - Fixed http://bugs.gentoo.org/show_bug.cgi?id=88148 - - *eix-0.2.1 (2005/02/24) - -diff -Naur eix-0.2.2.orig/src/cascadingprofile.cc eix-0.2.2/src/cascadingprofile.cc ---- eix-0.2.2.orig/src/cascadingprofile.cc 2005-04-06 17:43:28.000000000 +0200 -+++ eix-0.2.2/src/cascadingprofile.cc 2005-04-06 17:43:59.000000000 +0200 -@@ -42,6 +42,15 @@ - /** Exclude this files from listing of files in profile. */ - static const char *profile_exclude[] = { "parent", "..", "." , NULL }; - -+/** Key that should accumelate their content rathern then replace. */ -+static const char *accumulating_keys[4] = { -+ "USE", -+ "CONFIG_*", -+ "FEATURES", -+ NULL -+}; -+ -+ - CascadingProfile::~CascadingProfile() - { - for(unsigned int i = 0; imake_defaults, parser.begin(), parser.end()); -+ VarsReader parser(profile_files[i].c_str(), FSM_ALLOW_VAR_REFERENCES|FSM_USE_SUPPLIED_MAP|FSM_APPEND_VALUES); -+ parser.useMap(&make_defaults); -+ parser.accumulatingKeys(accumulating_keys); -+ parser.parse(); - } - this->arch = make_defaults["ARCH"].c_str(); - } diff --git a/app-portage/eix/files/0.2.2-unistd.h.patch b/app-portage/eix/files/0.2.2-unistd.h.patch deleted file mode 100644 index ed2fe55f4aaf..000000000000 --- a/app-portage/eix/files/0.2.2-unistd.h.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur eix-0.2.2/src/cascadingprofile.cc eix-0.2.2-patched/src/cascadingprofile.cc ---- eix-0.2.2/src/cascadingprofile.cc 2005-04-17 11:01:13.294954920 +0800 -+++ eix-0.2.2-patched/src/cascadingprofile.cc 2005-04-17 11:03:53.097661216 +0800 -@@ -32,6 +32,8 @@ - - #include - -+#include -+ - /* Path to symlink to profile */ - #define PROFILE_LINK "/etc/make.profile" - #define PROFILE_LINK_DIRECTORY "/etc/" -diff -ur eix-0.2.2/src/eix.cc eix-0.2.2-patched/src/eix.cc ---- eix-0.2.2/src/eix.cc 2005-04-17 11:01:13.280957048 +0800 -+++ eix-0.2.2-patched/src/eix.cc 2005-04-17 11:04:29.450134800 +0800 -@@ -44,6 +44,7 @@ - #include - - #include -+#include - - using namespace std; - diff --git a/app-portage/eix/files/0.2.6-cdb-cast.patch b/app-portage/eix/files/0.2.6-cdb-cast.patch deleted file mode 100644 index 19ad5306432c..000000000000 --- a/app-portage/eix/files/0.2.6-cdb-cast.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- eix-0.2.6/src/cacheTk/cdbCache.cc 2005-07-07 16:24:27.000000000 +0200 -+++ eix-0.2.6-new/src/cacheTk/cdbCache.cc 2005-07-07 16:24:56.000000000 +0200 -@@ -149,9 +149,9 @@ - - string get(uint32_t *dlen, void **data) { - uint32_t klen; -- UINT32_UNPACK(current, &klen); -+ UINT32_UNPACK((char *)current, &klen); - current++; -- UINT32_UNPACK(current, dlen); -+ UINT32_UNPACK((char *)current, dlen); - current++; - string key((char *)current, klen); - current = (uint32_t*)( (char *)current + (klen)); diff --git a/app-portage/eix/files/0.2.6-package.cc.patch b/app-portage/eix/files/0.2.6-package.cc.patch deleted file mode 100644 index be66359bdf1f..000000000000 --- a/app-portage/eix/files/0.2.6-package.cc.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -NurpP eix-0.2.6/src/package.cc eix-0.2.6-new/src/package.cc ---- eix-0.2.6/src/package.cc 2005-06-18 15:28:40.000000000 +0200 -+++ eix-0.2.6-new/src/package.cc 2005-07-06 11:21:56.245367136 +0200 -@@ -90,8 +90,9 @@ void Package::readNeeded(HasType we_want - for( unsigned short i=0; iaddVersion(new Version( this->input_stream )); - case Package::ALL: -- this->have = we_want; -+ break; - } -+ this->have = we_want; - } - - diff --git a/app-portage/eix/files/0.3.0-insecure-tmpfile.patch b/app-portage/eix/files/0.3.0-insecure-tmpfile.patch new file mode 100644 index 000000000000..6cb6eef92059 --- /dev/null +++ b/app-portage/eix/files/0.3.0-insecure-tmpfile.patch @@ -0,0 +1,18 @@ +diff -NurpP eix-0.3.0/src/eix-sync.in eix-0.3.0-tmpfile/src/eix-sync.in +--- eix-0.3.0/src/eix-sync.in 2005-08-26 23:29:36.000000000 +0200 ++++ eix-0.3.0-tmpfile/src/eix-sync.in 2005-11-18 00:44:16.427797250 +0100 +@@ -42,8 +42,10 @@ function die() { + + [ "$UID" -eq 0 ] || die "You need to be root." + +-emerge --sync || die "Error syncing." +-cp /var/cache/eix /tmp/eix.$$.sync || die "Error while copying cache-file to a save location." +-update-eix || die "Problems with update-eix." +-diff-eix /tmp/eix.$$.sync || die "Error while diffing." ++tmpfile=$(mktemp) ++ ++emerge --sync || die "Error syncing." ++cp /var/cache/eix ${tmpfile} || die "Error while copying cache-file to a save location." ++update-eix || die "Problems with update-eix." ++diff-eix ${tmpfile} || die "Error while diffing." + exit 0 diff --git a/app-portage/eix/files/digest-eix-0.2.2 b/app-portage/eix/files/digest-eix-0.2.2 deleted file mode 100644 index ecc5480f451e..000000000000 --- a/app-portage/eix/files/digest-eix-0.2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 d6acec8aa63941dd639fa3c4a53ff5ee eix-0.2.2.tar.bz2 249619 diff --git a/app-portage/eix/files/digest-eix-0.2.6 b/app-portage/eix/files/digest-eix-0.2.6 deleted file mode 100644 index 376bf8bd880b..000000000000 --- a/app-portage/eix/files/digest-eix-0.2.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 56bc4065b9401906da2321b8ff6f47ea eix-0.2.6.tar.bz2 249456 diff --git a/app-portage/eix/files/digest-eix-0.3.0 b/app-portage/eix/files/digest-eix-0.3.0-r2 similarity index 100% rename from app-portage/eix/files/digest-eix-0.3.0 rename to app-portage/eix/files/digest-eix-0.3.0-r2 -- 2.26.2