From 296001f0d990146d615f146256b8c9234f757371 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 14 Dec 2006 19:39:50 +0000 Subject: [PATCH] Fix #156766 Package-Manager: portage-2.1.2_rc3-r5 --- sys-apps/baselayout/Manifest | 31 ++++----- .../files/baselayout-1.13.0_alpha7-2380.patch | 37 ---------- .../files/baselayout-1.13.0_alpha8-stop.patch | 69 ------------------- .../files/baselayout-1.13.0_alpha8-use.patch | 20 ------ 4 files changed, 15 insertions(+), 142 deletions(-) delete mode 100644 sys-apps/baselayout/files/baselayout-1.13.0_alpha7-2380.patch delete mode 100644 sys-apps/baselayout/files/baselayout-1.13.0_alpha8-stop.patch delete mode 100644 sys-apps/baselayout/files/baselayout-1.13.0_alpha8-use.patch diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index f2821f50dfc6..1009b46ba428 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -82,22 +82,14 @@ AUX baselayout-1.12.5-dmesg.patch 5202 RMD160 ce0b8e91590888fa6f9f0cc84ed29bd3a6 MD5 05e23d7d8cd139821113afb7d6ef56cc files/baselayout-1.12.5-dmesg.patch 5202 RMD160 ce0b8e91590888fa6f9f0cc84ed29bd3a6007156 files/baselayout-1.12.5-dmesg.patch 5202 SHA256 837ed3be21597ae44de1debe5f48460945039cf1f4b7de9f067d5e78bb83a0c6 files/baselayout-1.12.5-dmesg.patch 5202 +AUX baselayout-1.12.7-halt.patch 791 RMD160 1ca883d70a7a870f5b8574fbcb26298652f4ded0 SHA1 a2a6c107ffae80b933c28cec9414d1b77718e4b8 SHA256 1763f11a5782b646801af1ce197ac92b155f99d02641d01619fb9911039e2e37 +MD5 957997bbf94234262996344a6790bb73 files/baselayout-1.12.7-halt.patch 791 +RMD160 1ca883d70a7a870f5b8574fbcb26298652f4ded0 files/baselayout-1.12.7-halt.patch 791 +SHA256 1763f11a5782b646801af1ce197ac92b155f99d02641d01619fb9911039e2e37 files/baselayout-1.12.7-halt.patch 791 AUX baselayout-1.12.7-ifconfig.patch 941 RMD160 ba51d02f9d491d678bb9723bf6a155025719df5d SHA1 ec0a18a5f488871546637ec5058807b83b73437d SHA256 3e314527b3b9bb2780ce570d92bb038c82c87abc001b44ebc76ef3733791ca0c MD5 de46ee8253ddd51cd9f2cbfdfb154c9a files/baselayout-1.12.7-ifconfig.patch 941 RMD160 ba51d02f9d491d678bb9723bf6a155025719df5d files/baselayout-1.12.7-ifconfig.patch 941 SHA256 3e314527b3b9bb2780ce570d92bb038c82c87abc001b44ebc76ef3733791ca0c files/baselayout-1.12.7-ifconfig.patch 941 -AUX baselayout-1.13.0_alpha7-2380.patch 1245 RMD160 9569358ba672b873cbfdc055ef5be856493565b5 SHA1 993001c59552cff32599b55086cbde58faedcbe3 SHA256 9e08046a07819462f8042e4bf23322d1e56594fa49aa6bd5fe223d7977808074 -MD5 f58aed630c19dbfe0178f9fb69d670d7 files/baselayout-1.13.0_alpha7-2380.patch 1245 -RMD160 9569358ba672b873cbfdc055ef5be856493565b5 files/baselayout-1.13.0_alpha7-2380.patch 1245 -SHA256 9e08046a07819462f8042e4bf23322d1e56594fa49aa6bd5fe223d7977808074 files/baselayout-1.13.0_alpha7-2380.patch 1245 -AUX baselayout-1.13.0_alpha8-stop.patch 2421 RMD160 3bb4a03e5bafcff403a9d8c5432e4dbb41a36941 SHA1 fa09c2105df4774aa8aa2ddc71df842aed791a54 SHA256 2a2e67ea8047a2a2a1682a47a44fba8ce40c964be213fe40e9f35b4034fc22f2 -MD5 53bebb0c746cf571aaad1f2fde187940 files/baselayout-1.13.0_alpha8-stop.patch 2421 -RMD160 3bb4a03e5bafcff403a9d8c5432e4dbb41a36941 files/baselayout-1.13.0_alpha8-stop.patch 2421 -SHA256 2a2e67ea8047a2a2a1682a47a44fba8ce40c964be213fe40e9f35b4034fc22f2 files/baselayout-1.13.0_alpha8-stop.patch 2421 -AUX baselayout-1.13.0_alpha8-use.patch 685 RMD160 297e0d9529f83f2b7acd2d5e17926242cda31e64 SHA1 07c095e0c449b78d8747c3a4079091723d206ae2 SHA256 b785458e90cc9afa5bbe76aa9593e046fe3b6865024211afaa92a1f8e0b657c9 -MD5 8526913205a8290f5620ed14b12c54f1 files/baselayout-1.13.0_alpha8-use.patch 685 -RMD160 297e0d9529f83f2b7acd2d5e17926242cda31e64 files/baselayout-1.13.0_alpha8-use.patch 685 -SHA256 b785458e90cc9afa5bbe76aa9593e046fe3b6865024211afaa92a1f8e0b657c9 files/baselayout-1.13.0_alpha8-use.patch 685 AUX baselayout-1.13.0_alpha9-ifconfig.patch 1197 RMD160 03441ec09c7f7ca671b332f938594644961b9b51 SHA1 6e62ea3e63022938a31dea9b3994773b487b36ad SHA256 c591cb5e322042d7a0788335c36e5ea05e3c26d60d6776783e7359630841f093 MD5 565734ac3ee00122eb5713021637705e files/baselayout-1.13.0_alpha9-ifconfig.patch 1197 RMD160 03441ec09c7f7ca671b332f938594644961b9b51 files/baselayout-1.13.0_alpha9-ifconfig.patch 1197 @@ -142,14 +134,18 @@ EBUILD baselayout-1.12.7-r3.ebuild 17814 RMD160 cb8a3ba5b46096fa82d95283c3595974 MD5 5af1f65739aaf8f39736e3e2c9c2216b baselayout-1.12.7-r3.ebuild 17814 RMD160 cb8a3ba5b46096fa82d95283c3595974c9f7c364 baselayout-1.12.7-r3.ebuild 17814 SHA256 0fce0c0fd5bf64188c9dedd38f0259e0f548dafd6e5309062d2f634307e87156 baselayout-1.12.7-r3.ebuild 17814 +EBUILD baselayout-1.12.7-r4.ebuild 17852 RMD160 f49d89af598605950f7080d91ff83c0e79704396 SHA1 33f02eb250e335d27a5e542300ef35b557a46e8a SHA256 569f726d500bdc003d0eb79b7570b7576387fed5cfe3aa6a5a72bed17d2f1a24 +MD5 f07266485a15e682f1ec8a5d2c3e4af6 baselayout-1.12.7-r4.ebuild 17852 +RMD160 f49d89af598605950f7080d91ff83c0e79704396 baselayout-1.12.7-r4.ebuild 17852 +SHA256 569f726d500bdc003d0eb79b7570b7576387fed5cfe3aa6a5a72bed17d2f1a24 baselayout-1.12.7-r4.ebuild 17852 EBUILD baselayout-1.13.0_alpha9-r3.ebuild 10110 RMD160 4c294b0f3f228a1bf1c4e9d5eb63a0bcc22ef103 SHA1 08fe7dea011fabbee11b0329fc157cebfad7a746 SHA256 aa6260c073bf365af32fc3b6c948f8f2f89e0aea10f535af79e9663ed6b539b1 MD5 aa02196f50280a51413fdccba2d07672 baselayout-1.13.0_alpha9-r3.ebuild 10110 RMD160 4c294b0f3f228a1bf1c4e9d5eb63a0bcc22ef103 baselayout-1.13.0_alpha9-r3.ebuild 10110 SHA256 aa6260c073bf365af32fc3b6c948f8f2f89e0aea10f535af79e9663ed6b539b1 baselayout-1.13.0_alpha9-r3.ebuild 10110 -MISC ChangeLog 84860 RMD160 ee373780ce445cb7212827a9082ccb814db68a5b SHA1 f29c5681f928da99b278a4166da22dfbdefdab6f SHA256 55716fc3efeb4788f14285b1d97268e6d3342100aa6f9190480335346b67d1a4 -MD5 b86c094c6ef9cdf4ec932c27f8874715 ChangeLog 84860 -RMD160 ee373780ce445cb7212827a9082ccb814db68a5b ChangeLog 84860 -SHA256 55716fc3efeb4788f14285b1d97268e6d3342100aa6f9190480335346b67d1a4 ChangeLog 84860 +MISC ChangeLog 85032 RMD160 84d51e95a791ee8d2eea489d0ad580266f546b09 SHA1 4fe85d582df094080974c73366e77597658f6383 SHA256 becf1b4064bdc927abd9a44759a4ec605897f2a00c69689fa2cdccef135f5e60 +MD5 73346153be6e82ed849b7e26b6bb276b ChangeLog 85032 +RMD160 84d51e95a791ee8d2eea489d0ad580266f546b09 ChangeLog 85032 +SHA256 becf1b4064bdc927abd9a44759a4ec605897f2a00c69689fa2cdccef135f5e60 ChangeLog 85032 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -175,6 +171,9 @@ SHA256 7d0ed81c4a5f1131c77c84febb52dcb9949dcfd9ce3bbc18ad4299780c92c74b files/di MD5 3c673749991736611feecc204537d0b9 files/digest-baselayout-1.12.7-r3 256 RMD160 a60fb330f3878b7573f51b2f5e213823bba5b613 files/digest-baselayout-1.12.7-r3 256 SHA256 9fea638948b58f1ff656b3acc35f412ac3aa70279efe0fe703ff495fd1a79d5b files/digest-baselayout-1.12.7-r3 256 +MD5 3c673749991736611feecc204537d0b9 files/digest-baselayout-1.12.7-r4 256 +RMD160 a60fb330f3878b7573f51b2f5e213823bba5b613 files/digest-baselayout-1.12.7-r4 256 +SHA256 9fea638948b58f1ff656b3acc35f412ac3aa70279efe0fe703ff495fd1a79d5b files/digest-baselayout-1.12.7-r4 256 MD5 8a931a7d421a3df91acb570f378fa464 files/digest-baselayout-1.13.0_alpha9-r3 277 RMD160 e2949b9445e60b6d9902b07504b4a4c2120747c9 files/digest-baselayout-1.13.0_alpha9-r3 277 SHA256 4c4a40b16d79de524bcec0efd55b0e0c383fc84b92937b2491074bcdab90ead9 files/digest-baselayout-1.13.0_alpha9-r3 277 diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha7-2380.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha7-2380.patch deleted file mode 100644 index a8f450067f3c..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha7-2380.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: sbin/runscript.sh -=================================================================== ---- sbin/runscript.sh (revision 2378) -+++ sbin/runscript.sh (working copy) -@@ -701,7 +701,7 @@ - exit 1 - fi - -- # We don't kill child processes if we're restarting -+ # We don't kill child processes if we're restarting - # This is especically important for sshd .... - RC_KILL_CHILDREN="no" - -@@ -714,7 +714,7 @@ - - # Simple way to try and detect if the service use svc_{start,stop} - # to restart if it have a custom restart() funtion. -- svcres=$(sed -ne '/[[:space:]]*restart[[:space:]]*()/,/}/ p' \ -+ svcres=$(sed -ne '/^[[:space:]]*restart[[:space:]]*()/,/}/ p' \ - "${myscript}" ) - if [[ -n ${svcres} ]] ; then - if [[ ! ${svcres} =~ svc_stop \ -Index: sh/net.sh -=================================================================== ---- sh/net.sh (revision 2378) -+++ sh/net.sh (working copy) -@@ -430,6 +430,10 @@ - fi - done - -+ # Bring the interface up if we exist -+ # We do this again as we may have been created in pre_up -+ interface_exists "${iface}" && interface_up "${iface}" -+ - x="metric_${ifvar}" - # If we don't have a metric then calculate one - # Our modules will set the metric variable to a suitable base diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha8-stop.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha8-stop.patch deleted file mode 100644 index 0ff64290fb74..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha8-stop.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: init.d/halt.sh -=================================================================== ---- init.d/halt.sh (revision 2411) -+++ init.d/halt.sh (working copy) -@@ -49,7 +49,7 @@ - [[ ${RC_GOT_SERVICES} != yes ]] && . "${svclib}"/sh/rc-services.sh - eindent - if [[ $(uname) == "Linux" ]] ; then -- do_unmount "mount -n -o remount,ro" "^(/dev|/dev/pts|/proc|/proc/bus/usb|/sys)$" -+ do_unmount "mount -n -o remount,ro" "^(/dev|/dev/pts|/proc|/proc/.*|/sys)$" - else - do_unmount "mount -u -o ro" "^/dev$" - fi -Index: init.d/localmount -=================================================================== ---- init.d/localmount (revision 2411) -+++ init.d/localmount (working copy) -@@ -71,7 +71,7 @@ - stop() { - # We never unmount / or /dev or $svcdir - NO_UMOUNTS="/|/dev|${svcdir}${NO_UMOUNTS:+|}${NO_UMOUNTS// /|}" -- [[ $(uname) == "Linux" ]] && NO_UMOUNTS="${NO_UMOUNTS}|/dev/pts|/proc|/sys" -+ [[ $(uname) == "Linux" ]] && NO_UMOUNTS="${NO_UMOUNTS}|/dev/pts|/proc|/proc/.*|/sys" - NO_UMOUNTS="^(${NO_UMOUNTS})$" - - # Flush all pending disk writes now -Index: src/start-stop-daemon.c -=================================================================== ---- src/start-stop-daemon.c (revision 2411) -+++ src/start-stop-daemon.c (working copy) -@@ -601,8 +601,14 @@ - int fd = -1; - - /* We no longer use stat inodes as we may have upgraded the program -- so it will no longer work. We cannot use the exe link either for -- the same reason. */ -+ so it will no longer work. We test the exe link first, then the -+ cmdline. */ -+ snprintf (cmdline, sizeof (cmdline), "/proc/%u/exe", pid); -+ memset (buf, 0, sizeof (buf)); -+ if (readlink (cmdline, buf, sizeof (buf)) != -1 -+ && strcmp (name, buf) == 0) -+ return 1; -+ - snprintf (cmdline, sizeof (cmdline), "/proc/%u/cmdline", pid); - if ((fd = open (cmdline, O_RDONLY)) < 0) - return 0; -@@ -772,7 +778,7 @@ - if (fscanf(f, "%d", &pid) == 1) - check(pid); - fclose(f); -- } else if (errno != ENOENT || stop != 0) -+ } else if (errno != ENOENT || (stop != 0 && schedule == NULL)) - errx(2, "open pidfile %s: %s", name, strerror(errno)); - - } -Index: sh/rc-daemon.sh -=================================================================== ---- sh/rc-daemon.sh (revision 2411) -+++ sh/rc-daemon.sh (working copy) -@@ -227,6 +227,8 @@ - fi - fi - -+ [[ -n ${name} ]] && cmd="${name}" -+ - local timeout=$((${RC_WAIT_ON_STOP} * 10)) - while [[ ${timeout} -gt 0 ]] ; do - ((timeout--)) diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha8-use.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha8-use.patch deleted file mode 100644 index 9acdd030942d..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha8-use.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: src/rc-depend.c -=================================================================== ---- src/rc-depend.c (revision 2408) -+++ src/rc-depend.c (working copy) -@@ -597,7 +597,6 @@ - { - di = get_depinfo (deptree, lp->item); - if (di && (strcmp (type->item, "ineed") == 0 || -- strcmp (type->item, "iuse") == 0 || - valid_service (di->service))) - visit_service (deptree, types, sorted, visited, di, - true); -@@ -606,7 +605,6 @@ - } - else - if (di && (strcmp (type->item, "ineed") == 0 || -- strcmp (type->item, "iuse") == 0 || - valid_service (service))) - visit_service (deptree, types, sorted, visited, di, true); - } -- 2.26.2