From: Roy Marples Date: Wed, 20 Dec 2006 22:14:17 +0000 (+0000) Subject: Add a patch so the new postgresql init script works as it likes to put X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=959329813e79f0021800506858222a9cfab82a09;p=gentoo.git Add a patch so the new postgresql init script works as it likes to put extra data after the pid in the pidfile (1.12 isn't affected). Package-Manager: portage-2.1.2_rc3-r8 --- diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 218db2d4130d..ab4ba4d3a534 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,18 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.379 2006/12/20 16:17:27 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.380 2006/12/20 22:14:17 uberlord Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog +*baselayout-1.13.0_alpha10-r2 (20 Dec 2006) + + 20 Dec 2006; Roy Marples + +files/baselayout-1.13.0_alpha10-pidfile.patch, + +baselayout-1.13.0_alpha10-r2.ebuild: + Add a patch so the new postgresql init script works as it likes to put + extra data after the pid in the pidfile (1.12 isn't affected). + *baselayout-1.13.0_alpha10-r1 (20 Dec 2006) *baselayout-1.12.8-r1 (20 Dec 2006) diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index b5338c4213e1..6833c4dd7f7f 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -86,6 +86,10 @@ AUX baselayout-1.12.8-r2440.patch 1779 RMD160 eeda0b3883163b8d8184812aadee8525d0 MD5 322d665a75ef5cc1db64ab02242c634e files/baselayout-1.12.8-r2440.patch 1779 RMD160 eeda0b3883163b8d8184812aadee8525d0be0b54 files/baselayout-1.12.8-r2440.patch 1779 SHA256 31f0936868430bd06a161372b0030fadc086121f71fabc40b9588575360fa202 files/baselayout-1.12.8-r2440.patch 1779 +AUX baselayout-1.13.0_alpha10-pidfile.patch 420 RMD160 24d7171fcb717b2866d80ae09e9160cd88fb309d SHA1 6dfa3386fc9fc3c931e9d8a061b287e690dd3704 SHA256 4b0f2e2ccf05f95b287b487988717e98c06856091d446e220ce2210d8177269e +MD5 902f750996bea188164b3c9bd40f20d7 files/baselayout-1.13.0_alpha10-pidfile.patch 420 +RMD160 24d7171fcb717b2866d80ae09e9160cd88fb309d files/baselayout-1.13.0_alpha10-pidfile.patch 420 +SHA256 4b0f2e2ccf05f95b287b487988717e98c06856091d446e220ce2210d8177269e files/baselayout-1.13.0_alpha10-pidfile.patch 420 AUX baselayout-1.13.0_alpha10-r2440.patch 2511 RMD160 7681a687c35fd000ee13e2b1e074e3b8b8258784 SHA1 db374e5af1cd2d885dad953d2916fb62117f0b4a SHA256 8bc7ff0ec1d14d7891304d53d215cb9effb219c26a28a9658b9a00c5f0eee026 MD5 418a78aac276fda7361114f0b4ea9a39 files/baselayout-1.13.0_alpha10-r2440.patch 2511 RMD160 7681a687c35fd000ee13e2b1e074e3b8b8258784 files/baselayout-1.13.0_alpha10-r2440.patch 2511 @@ -138,14 +142,18 @@ EBUILD baselayout-1.13.0_alpha10-r1.ebuild 10022 RMD160 34d043897f9f887ceb23c14d MD5 a10b36ce27df1a86fcc4c4f7172ed47c baselayout-1.13.0_alpha10-r1.ebuild 10022 RMD160 34d043897f9f887ceb23c14d33b6376457502393 baselayout-1.13.0_alpha10-r1.ebuild 10022 SHA256 7aa0fa9cccbfab2ae027f0d86689bdf234b643d35a1e2aab2e512402bee0e168 baselayout-1.13.0_alpha10-r1.ebuild 10022 +EBUILD baselayout-1.13.0_alpha10-r2.ebuild 10063 RMD160 5a46dc4bee45fc90d7578de9ad934a8d3eee88c2 SHA1 5d7b566ca09395e530fac3b9c962b60b89ef6f4d SHA256 2e39caf73997a0e93eaadd83d66d0e24d96299bf87d000e99a3ebeb52efc8962 +MD5 7f3e54075ad1b122d3eb038a812cf2eb baselayout-1.13.0_alpha10-r2.ebuild 10063 +RMD160 5a46dc4bee45fc90d7578de9ad934a8d3eee88c2 baselayout-1.13.0_alpha10-r2.ebuild 10063 +SHA256 2e39caf73997a0e93eaadd83d66d0e24d96299bf87d000e99a3ebeb52efc8962 baselayout-1.13.0_alpha10-r2.ebuild 10063 EBUILD baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865c5243c0f55d3 SHA1 c677943150955e11a42236be5906f25d4cb9f4ff SHA256 426ef12358ae0ff7bd6e112fbea601bbf263f605b7c7ccd2e0858a837f6a9bd6 MD5 3142bbab3c121b88c30c92eef33acbba baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865c5243c0f55d3 baselayout-1.13.0_alpha10.ebuild 9979 SHA256 426ef12358ae0ff7bd6e112fbea601bbf263f605b7c7ccd2e0858a837f6a9bd6 baselayout-1.13.0_alpha10.ebuild 9979 -MISC ChangeLog 86086 RMD160 ff63a2682d825aaec3d4227c030b1275cc0ece17 SHA1 2dafa3c2aa998f96065e00dc0d107908f49723f7 SHA256 641e2b8daac1154e5b9c1c51208ea6970dd7843f1110517aa592f9aea7d501ff -MD5 a11d6e953b57cf332b33644545e40fd3 ChangeLog 86086 -RMD160 ff63a2682d825aaec3d4227c030b1275cc0ece17 ChangeLog 86086 -SHA256 641e2b8daac1154e5b9c1c51208ea6970dd7843f1110517aa592f9aea7d501ff ChangeLog 86086 +MISC ChangeLog 86409 RMD160 ccbdd4fae57aaf63cc907e26481bd211b65a6c57 SHA1 808fd3d46829d960906756a20e771f8e588c3ac4 SHA256 fe3f5b3f7ae00d864f948c9501f4f7ac1d9edc5debc58b871b29371d2efd84ab +MD5 3c4394c5fd96d6962c71414791bed87c ChangeLog 86409 +RMD160 ccbdd4fae57aaf63cc907e26481bd211b65a6c57 ChangeLog 86409 +SHA256 fe3f5b3f7ae00d864f948c9501f4f7ac1d9edc5debc58b871b29371d2efd84ab ChangeLog 86409 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -180,3 +188,6 @@ SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/di MD5 a906c725ad1f2a7363333865e410227c files/digest-baselayout-1.13.0_alpha10-r1 280 RMD160 4f16b9967ebd8f5133edcbd9eee430020b4094ea files/digest-baselayout-1.13.0_alpha10-r1 280 SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/digest-baselayout-1.13.0_alpha10-r1 280 +MD5 a906c725ad1f2a7363333865e410227c files/digest-baselayout-1.13.0_alpha10-r2 280 +RMD160 4f16b9967ebd8f5133edcbd9eee430020b4094ea files/digest-baselayout-1.13.0_alpha10-r2 280 +SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/digest-baselayout-1.13.0_alpha10-r2 280 diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild new file mode 100644 index 000000000000..57d1119d3a7a --- /dev/null +++ b/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild @@ -0,0 +1,290 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild,v 1.1 2006/12/20 22:14:17 uberlord Exp $ + +inherit flag-o-matic eutils toolchain-funcs multilib + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2 + http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${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="bootstrap build pam static unicode kernel_linux kernel_FreeBSD" + +# This version of baselayout needs awk in /bin, but as we do not have +# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" +# or "build" are in USE. +RDEPEND="virtual/init + !build? ( + !bootstrap? ( + >=sys-libs/readline-5.0-r1 + >=app-shells/bash-3.2_p3-r1 + kernel_linux? ( + >=sys-apps/coreutils-5.2.1 + ) + kernel_FreeBSD? ( + sys-process/fuser-bsd + sys-process/pidof-bsd + ) + ) + ) + pam? ( virtual/pam ) + ! "${IMAGE}/etc/conf.d/$1" + fi +} + +pkg_preinst() { + # Move our makefiles to a temporay location + mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}" + + # Change some vars introduced in baselayout-1.11.0 before we go stable + # The new names make more sense and allow nis_domain + # for use in baselayout-1.12.0 + remap_dns_vars net + remap_dns_vars wireless +} + +src_install() { + make $(make_opts) DESTDIR="${D}" install + dodoc ChangeLog COPYRIGHT + + # Should this belong in another ebuild? Like say binutils? + # List all the multilib libdirs in /etc/env/04multilib (only if they're + # actually different from the normal + if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then + local libdirs="$(get_all_libdirs)" libdirs_env= + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + for dir in ${libdirs}; do + libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} + done + + # Special-case uglyness... For people updating from lib32 -> lib amd64 + # profiles, keep lib32 in the search path while it's around + if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then + libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" + fi + echo "LDPATH=\"${libdirs_env}\"" > "${D}"/etc/env.d/04multilib + fi + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System version ${PV}" > "${D}"/etc/gentoo-release + + # Remove the installed runlevels, as we don't know about $ROOT yet + rm -rf "${D}/etc/runlevels" + + # Copy the make files to /usr/share/baselayout so we can re-use them in + # postinst, otherwise binpkg will break. + insinto /usr/share/baselayout + doins -r Makefile default.mk runlevels* +} + +pkg_postinst() { + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + if use build || use bootstrap ; then + make -C "${T}" $(make_opts) layout || die "failed to layout filesystem" + fi + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}etc/runlevels ]] ; then + einfo "Making default runlevels" + make -C "${T}" $(make_opts) runlevels_install >/dev/null + fi + + if use kernel_linux ; then + if use build || use bootstrap ; then + # Create base directories + if [[ ! -e ${ROOT}/dev/.udev && ! -e ${ROOT}/dev/.devfsd ]] ; then + einfo "Creating dev nodes" + PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \ + dev || die "failed to create /dev nodes" + fi + fi + fi + + # We installed some files to /usr/share/baselayout instead of /etc to stop + # (1) overwriting the user's settings + # (2) screwing things up when attempting to merge files + # (3) accidentally packaging up personal files with quickpkg + # If they don't exist then we install them + for x in master.passwd passwd shadow group fstab ; do + [[ -e "${ROOT}etc/${x}" ]] && continue + [[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue + cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc + done + + # We need to copy svcdir if upgrading + if has_version "/dev/null + fi + + # This is also written in src_install (so it's in CONTENTS), but + # write it here so that the new version is immediately in the file + # (without waiting for the user to do etc-update) + rm -f "${ROOT}"/etc/._cfg????_gentoo-release + echo "Gentoo Base System version ${PV}" > "${ROOT}"/etc/gentoo-release + + echo + einfo "Please be sure to update all pending '._cfg*' files in /etc," + einfo "else things might break at your next reboot! You can use 'etc-update'" + einfo "to accomplish this:" + einfo + einfo " # etc-update" + + local lo="net.lo0" + use kernel_linux && lo="net.lo" + for f in ${ROOT}etc/init.d/net.*; do + [[ -L ${f} ]] && continue + echo + einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/" + einfo "They need to be converted to symlinks to ${lo}. If you haven't" + einfo "made personal changes to those files, you can update with the" + einfo "following command:" + einfo + einfo " /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/${lo}$' | xargs -n1 ln -sfvn ${lo}" + break + done + + if sed -e 's/#.*//' "${ROOT}"etc/conf.d/{net,wireless} 2>/dev/null \ + | egrep -q '\<(domain|nameservers|searchdomains)_' ; then + echo + ewarn "You have depreciated variables in ${ROOT}etc/conf.d/net" + ewarn "or ${ROOT}etc/conf.d/wireless" + ewarn + ewarn "domain_* -> dns_domain_*" + ewarn "nameservers_* -> dns_servers_*" + ewarn "searchdomains_* -> dns_search_domains_*" + ewarn + ewarn "They have been converted for you - ensure that you" + ewarn "update them via 'etc-update'" + fi + + if sed -e 's/#.*//' "${ROOT}"etc/conf.d/net 2>/dev/null \ + | egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then + echo + ewarn "You are using deprecated variables in ${ROOT}etc/conf.d/net" + ewarn + ewarn "You are advised to review the new configuration variables as" + ewarn "found in ${ROOT}etc/conf.d/net.example as there is no" + ewarn "guarantee that they will work in future versions." + fi + + # Remove old stuff that may cause problems. + if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then + rm -f "${ROOT}"/etc/env.d/01hostname + fi + if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then + rm -f "${ROOT}"/etc/{conf.d,init.d}/domainname \ + "${ROOT}"/etc/runlevels/*/domainname + echo + ewarn "The domainname init script has been removed in this version." + ewarn "Consult ${ROOT}etc/conf.d/net.example for details about how" + ewarn "to apply dns/nis information to the loopback interface." + fi + + echo + einfo "baselayout-1.13 and higher have dropped the RC_STRICT_NET_CHECKING" + einfo "variable from /etc/conf.d/rc. ${lo} now provides \"net\" and so does" + einfo "each net script linked to it." + einfo "The net dependency is now satisfied by any net.* scripts in the default" + einfo "runlevel, otherwise it's the last net.* script running which includes" + einfo "${lo}. So if you need to restart a net script that is listed in the" + einfo "runlevel you are in and not restart anything that needs it then you" + einfo "will need to use the --nodeps command line option." +} + +# Handle our downgraders +# We should remove this when <1.13 has been removed from the tree +pkg_postrm() { + # Remove dir if downgrading + if has_version "/dev/null + rm -rf "${ROOT}lib/rcscripts/init.d" + ) + ewarn "You will need to re-emerge ${PN} to restore ${ROOT}etc/init.d/net.lo" + fi +} diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha10-pidfile.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha10-pidfile.patch new file mode 100644 index 000000000000..173bcf6293f1 --- /dev/null +++ b/sys-apps/baselayout/files/baselayout-1.13.0_alpha10-pidfile.patch @@ -0,0 +1,15 @@ +Index: sh/rc-daemon.sh +=================================================================== +--- sh/rc-daemon.sh (revision 2440) ++++ sh/rc-daemon.sh (working copy) +@@ -166,8 +166,8 @@ + return $? + fi + +- pid=$(cat "${pidfile}" 2>/dev/null) +- [[ -n ${pid} && " ${pids} " == *" ${pid} "* ]] ++ pid=$(sed '1q' "${pidfile}" 2>/dev/null) ++ [[ -n ${pid} && " ${pids} " == *" ${pid%% *} "* ]] + } + + # int rc_start_daemon(void) diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha10-r2 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha10-r2 new file mode 100644 index 000000000000..479e418898f4 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha10-r2 @@ -0,0 +1,3 @@ +MD5 75464388b25fb3a9f9a092bc56c2e2ac baselayout-1.13.0_alpha10.tar.bz2 255190 +RMD160 930065e8fd850ad1247c639293ab05ff499409d1 baselayout-1.13.0_alpha10.tar.bz2 255190 +SHA256 ea78f92f45801c306458bc66a076d566893cac11e3dac429810629aea0738ef4 baselayout-1.13.0_alpha10.tar.bz2 255190