From fb8a38e2ebf412adaf5497339a8c7c8105873627 Mon Sep 17 00:00:00 2001 From: Ned Ludd Date: Tue, 10 Apr 2007 00:29:46 +0000 Subject: [PATCH] - important bugfix.. use memmove vs chdir.. Package-Manager: portage-2.1.2_pre1 --- app-portage/portage-utils/ChangeLog | 8 ++- app-portage/portage-utils/Manifest | 19 ++++-- .../files/digest-portage-utils-0.1.25-r1 | 3 + .../portage-utils/files/fix-bug-168442.patch | 20 ++++++ .../portage-utils-0.1.25-r1.ebuild | 66 +++++++++++++++++++ 5 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 app-portage/portage-utils/files/digest-portage-utils-0.1.25-r1 create mode 100644 app-portage/portage-utils/files/fix-bug-168442.patch create mode 100644 app-portage/portage-utils/portage-utils-0.1.25-r1.ebuild diff --git a/app-portage/portage-utils/ChangeLog b/app-portage/portage-utils/ChangeLog index 81e134ab131e..8fcb3672cb46 100644 --- a/app-portage/portage-utils/ChangeLog +++ b/app-portage/portage-utils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-portage/portage-utils # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.75 2007/04/05 18:40:59 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.76 2007/04/10 00:29:46 solar Exp $ + +*portage-utils-0.1.25-r1 (10 Apr 2007) + + 10 Apr 2007; +files/fix-bug-168442.patch, + +portage-utils-0.1.25-r1.ebuild: + - important bugfix.. use memmove vs chdir.. *portage-utils-0.1.25 (05 Apr 2007) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 73c2ad12662d..d2fa12294410 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1,3 +1,7 @@ +AUX fix-bug-168442.patch 682 RMD160 58180f08278f16977cef83ef4cbdffc122cc7276 SHA1 9429753e32c5e89f5574611ca267e62516f1ddda SHA256 a63f85cbd12470e85bb17657b1fab7def8b759d004e2d60a6706e90b14f39a61 +MD5 26b3be004e99074325bfc2429ed9b3f7 files/fix-bug-168442.patch 682 +RMD160 58180f08278f16977cef83ef4cbdffc122cc7276 files/fix-bug-168442.patch 682 +SHA256 a63f85cbd12470e85bb17657b1fab7def8b759d004e2d60a6706e90b14f39a61 files/fix-bug-168442.patch 682 DIST portage-utils-0.1.23.tar.bz2 73456 RMD160 1887c34f2dcc277a01b0783a1af74056fecadf3c SHA1 b88293b23947445b271076424901afbd14fc1d41 SHA256 18cb004d477bac4715b73fe3833e20ed958467f3450862e900dc0b9b0992ed3b DIST portage-utils-0.1.24.tar.bz2 73776 RMD160 1b447323b0006058f022fc485041bca86281fbbc SHA1 f48c6165909ebb526cac631dae82035c2db86941 SHA256 cf26ed4ab861cbfb6d10e2c8451464a9e3939509c2660d7c1d4dbd9e58089ffa DIST portage-utils-0.1.25.tar.bz2 76749 RMD160 f1c9d1eb548a9656810345b437a517b06e5e6135 SHA1 c951c9d57b6c97445b847d57dbadeebf6fee14f5 SHA256 fd2a8e6c76e7e4e8414cfc7daeb264d8f7207d4772d239cd1a8f19caf6fc7831 @@ -9,14 +13,18 @@ EBUILD portage-utils-0.1.24.ebuild 1922 RMD160 bcf2bc3758ca11f891ea0341c9cb8d426 MD5 bc0018c1e4c61296801a9a7c4b6229d5 portage-utils-0.1.24.ebuild 1922 RMD160 bcf2bc3758ca11f891ea0341c9cb8d426916dff0 portage-utils-0.1.24.ebuild 1922 SHA256 8e8d3be3afafec6e3c727eeb22b31b0f230334940c34e1d0dd3d51be239a1d75 portage-utils-0.1.24.ebuild 1922 +EBUILD portage-utils-0.1.25-r1.ebuild 1980 RMD160 00bb7e7922ef77fb852b1b6b6cb26eb3cce6f29d SHA1 2e45ab895c36edc14546c9d9860df59670e84024 SHA256 5abbe153bda576972d7c72ffb339331d1352709691e907932a5b507a3d9b9ff2 +MD5 d8e9997a243b9efa248ec25e44aaa2cd portage-utils-0.1.25-r1.ebuild 1980 +RMD160 00bb7e7922ef77fb852b1b6b6cb26eb3cce6f29d portage-utils-0.1.25-r1.ebuild 1980 +SHA256 5abbe153bda576972d7c72ffb339331d1352709691e907932a5b507a3d9b9ff2 portage-utils-0.1.25-r1.ebuild 1980 EBUILD portage-utils-0.1.25.ebuild 1876 RMD160 8aff17c6e8cfee81cf2f6d117349eeed54743bc8 SHA1 47b9b91b19dc0591dff32b27e7927603ff81ca35 SHA256 5323e4a884df162b2a0b4d0354caf3545544f5ed34fa28f4dd4562a6be0010e7 MD5 f79c67f4b4c6fb972b6c7a528ce435d9 portage-utils-0.1.25.ebuild 1876 RMD160 8aff17c6e8cfee81cf2f6d117349eeed54743bc8 portage-utils-0.1.25.ebuild 1876 SHA256 5323e4a884df162b2a0b4d0354caf3545544f5ed34fa28f4dd4562a6be0010e7 portage-utils-0.1.25.ebuild 1876 -MISC ChangeLog 15899 RMD160 e20a8026edf09f3cf002ef3dcd286e175ade7220 SHA1 17939bd9c105fff218e072b2a69d1715aa0056df SHA256 10f5572c157c179c73585e9654facc5d13b0a6b2d84cb226e5dc22d67c3d2c8a -MD5 8dc4810e0d7a823d01a32c583e63a11b ChangeLog 15899 -RMD160 e20a8026edf09f3cf002ef3dcd286e175ade7220 ChangeLog 15899 -SHA256 10f5572c157c179c73585e9654facc5d13b0a6b2d84cb226e5dc22d67c3d2c8a ChangeLog 15899 +MISC ChangeLog 16084 RMD160 2e6c9351e72fd09c93279eba21bf433c3c80aa9f SHA1 fcf0fd2a60eb80ab1f34c1b0c686e3b3d1c977af SHA256 9c8cffecb276c551a979634306cef2bffa5dae44b03720c9b164e437071abd8d +MD5 c5f0582217c8fb9d1048b48d0916115d ChangeLog 16084 +RMD160 2e6c9351e72fd09c93279eba21bf433c3c80aa9f ChangeLog 16084 +SHA256 9c8cffecb276c551a979634306cef2bffa5dae44b03720c9b164e437071abd8d ChangeLog 16084 MISC metadata.xml 228 RMD160 323ccad50269403e29fe5f701459b3412a400829 SHA1 3211a7ef9ed65dc14a3ee262fd1d33f7c06aeeb3 SHA256 ffd15c4104ad6803ab7ff1345e33c4ccbb9fbbcd277506ec7a5e047ea755aec1 MD5 b868d2ab4d823325239e6c8a754f2678 metadata.xml 228 RMD160 323ccad50269403e29fe5f701459b3412a400829 metadata.xml 228 @@ -30,3 +38,6 @@ SHA256 240a4e925a6dfd9a6fcd3f6948a469bff901fb3161d7154ca29d78e11b2829a0 files/di MD5 d33ccf8c6056516e12de9872ab86c7c6 files/digest-portage-utils-0.1.25 262 RMD160 0c687717fcf35cae35e4f11ab89665fd335db969 files/digest-portage-utils-0.1.25 262 SHA256 e824801696497d2be4fd8c89260110ec4a3d24a769ea6383b702cf0db53ba07a files/digest-portage-utils-0.1.25 262 +MD5 d33ccf8c6056516e12de9872ab86c7c6 files/digest-portage-utils-0.1.25-r1 262 +RMD160 0c687717fcf35cae35e4f11ab89665fd335db969 files/digest-portage-utils-0.1.25-r1 262 +SHA256 e824801696497d2be4fd8c89260110ec4a3d24a769ea6383b702cf0db53ba07a files/digest-portage-utils-0.1.25-r1 262 diff --git a/app-portage/portage-utils/files/digest-portage-utils-0.1.25-r1 b/app-portage/portage-utils/files/digest-portage-utils-0.1.25-r1 new file mode 100644 index 000000000000..3ddb329e09f7 --- /dev/null +++ b/app-portage/portage-utils/files/digest-portage-utils-0.1.25-r1 @@ -0,0 +1,3 @@ +MD5 143a9fd367c1d0441d84a4b8869e50bb portage-utils-0.1.25.tar.bz2 76749 +RMD160 f1c9d1eb548a9656810345b437a517b06e5e6135 portage-utils-0.1.25.tar.bz2 76749 +SHA256 fd2a8e6c76e7e4e8414cfc7daeb264d8f7207d4772d239cd1a8f19caf6fc7831 portage-utils-0.1.25.tar.bz2 76749 diff --git a/app-portage/portage-utils/files/fix-bug-168442.patch b/app-portage/portage-utils/files/fix-bug-168442.patch new file mode 100644 index 000000000000..40d4eadb4543 --- /dev/null +++ b/app-portage/portage-utils/files/fix-bug-168442.patch @@ -0,0 +1,20 @@ +Index: main.c +=================================================================== +RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v +retrieving revision 1.136 +retrieving revision 1.137 +diff -u -b -B -r1.136 -r1.137 +--- main.c 8 Apr 2007 19:45:41 -0000 1.136 ++++ main.c 9 Apr 2007 23:08:27 -0000 1.137 +@@ -508,7 +508,10 @@ + f = 0; + if (readlink("/etc/make.profile", profile, sizeof(profile)) == -1) + strcpy(profile, "/etc/make.profile"); +- chdir("/etc"); ++ if (profile[0] != '/') { ++ memmove(profile+5, profile, strlen(profile)); ++ memcpy(profile, "/etc/", 5); ++ } + do { + if (f == 0) + snprintf(portage_file, sizeof(portage_file), "%s/make.defaults", profile); diff --git a/app-portage/portage-utils/portage-utils-0.1.25-r1.ebuild b/app-portage/portage-utils/portage-utils-0.1.25-r1.ebuild new file mode 100644 index 000000000000..023831d78792 --- /dev/null +++ b/app-portage/portage-utils/portage-utils-0.1.25-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.1.25-r1.ebuild,v 1.1 2007/04/10 00:29:46 solar Exp $ + +inherit toolchain-funcs eutils + +DESCRIPTION="small and fast portage helper tools written in C" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="" + +src_unpack() { + unpack "${A}" + cd "${S}" || die + epatch "${FILESDIR}"/fix-bug-168442.patch +} + +src_compile() { + tc-export CC + emake || die +} + +src_install() { + dobin q || die "dobin failed" + doman man/*.[0-9] + for applet in $( ${ROOT}/etc/portage/bin/post_sync +#!/bin/sh +# Copyright 2006-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +if [ -d /etc/portage/postsync.d/ ]; then + for f in /etc/portage/postsync.d/* ; do + if [ -x \${f} ] ; then + \${f} + fi + done +else + : +fi +__EOF__ + chmod 755 ${ROOT}/etc/portage/bin/post_sync + if [ ! -e ${ROOT}/etc/portage/postsync.d/q-reinitialize ]; then + mkdir -p ${ROOT}/etc/portage/postsync.d/ + echo '[ -x /usr/bin/q ] && /usr/bin/q -qr' > ${ROOT}/etc/portage/postsync.d/q-reinitialize + elog "${ROOT}/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 simply chmod +x ${ROOT}/etc/portage/postsync.d/q-reinitialize" + elog "Normally this should only take a few seconds to run but file systems such as ext3 can take a lot longer." + elog "If ever you find this to be an inconvenience simply chmod -x ${ROOT}/etc/portage/postsync.d/q-reinitialize" + fi + : +} -- 2.26.2