diff options
| -rw-r--r-- | sys-apps/openrc/ChangeLog | 12 | ||||
| -rw-r--r-- | sys-apps/openrc/Manifest | 15 | ||||
| -rw-r--r-- | sys-apps/openrc/files/openrc-0.2-multilib-fix.patch | 84 | ||||
| -rw-r--r-- | sys-apps/openrc/files/openrc-0.2-multiple-ntp-servers.patch | 23 | ||||
| -rw-r--r-- | sys-apps/openrc/files/openrc-0.2-sysctl-vserver-fix.patch | 21 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.2-r2.ebuild (renamed from sys-apps/openrc/openrc-0.2-r1.ebuild) | 46 |
6 files changed, 169 insertions, 32 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index b2d5d07b78f4..10e449e5ffd6 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.13 2008/03/28 18:56:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.14 2008/03/28 20:11:39 cardoe Exp $ + +*openrc-0.2-r2 (28 Mar 2008) + + 28 Mar 2008; Doug Goldstein <cardoe@gentoo.org> + +files/openrc-0.2-multilib-fix.patch, + +files/openrc-0.2-multiple-ntp-servers.patch, + +files/openrc-0.2-sysctl-vserver-fix.patch, -openrc-0.2-r1.ebuild, + +openrc-0.2-r2.ebuild: + fix multilib issues. support multiple ntp servers. fix sysctl w/ vserver + issue. 28 Mar 2008; Mike Frysinger <vapier@gentoo.org> openrc-0.2-r1.ebuild, openrc-9999.ebuild: diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index a5f0c1ef67fa..33a82a862f15 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -2,15 +2,18 @@ Hash: SHA1 AUX openrc-0.2-freebsd-install-rc.patch 888 RMD160 5f3c421d389bf1d5ca8113ee7566b2fa9f3dd89d SHA1 e4f0ab407b88f28e3ce696e63ee0450338c3ca1a SHA256 a14eadfc0cb2da40d53783f73b4d8474827baaf7a38f21fd5c1050d295cff14e +AUX openrc-0.2-multilib-fix.patch 2932 RMD160 13d72da315afdd2e8e26ea89e51f4dd54fe47f7f SHA1 da18061560ebd38b8d712cfc4c2390fd2f88dc45 SHA256 1d7e7cd190240d0359c305f387d06503f54087a6dc30d62c245809f03238320d +AUX openrc-0.2-multiple-ntp-servers.patch 836 RMD160 166f26228c8f76dab12e7f0f69dd81c31b4dd510 SHA1 00832b699d08b2548078f03d2aeafeabe9dee636 SHA256 b758817e770321b201a75e0005839a2221c5c20c15df66b76c7e2a06eb532b74 +AUX openrc-0.2-sysctl-vserver-fix.patch 600 RMD160 bf7cf450d96247eba9e4deb2e8dca14b761cdb56 SHA1 8f413560cdcac5e300a958a805cf4aff58bdaae1 SHA256 7db22dcb9a1e3aca9b08d743df40939e46c456a5c249aa1bacbb6924e216fce6 DIST openrc-0.2.tar.bz2 141615 RMD160 282122e6b152e3b86483eb2b3e90565adb11f08f SHA1 b41a9981b6d0e3963e278c37b292d3f4877bb8fc SHA256 5f8f718ef0c1e3188b7b19fc868fdf5719fc5a1a65d4376f2becd3b78ccc2ef1 -EBUILD openrc-0.2-r1.ebuild 7294 RMD160 dea20dda3750873e5d8eff9336fbdbce8f85a0d0 SHA1 9598a23c1870b7377e317a9580dfde5bab2e443a SHA256 c1a894c681719b56ab6fc4753e09ab0a8a2c77ab424bf3ae46f706eb9a41be37 +EBUILD openrc-0.2-r2.ebuild 7289 RMD160 abfe684b46ecb105c14e07cb465638a0cd274467 SHA1 f5120879582e349c733b1d6180c3b056f8bb760c SHA256 1e2382f34ec4f64b4d8330e4f44618722cd124b355121140fbd51afba5ab392d EBUILD openrc-9999.ebuild 7197 RMD160 e166e8a6ee2afe3086fb63b94b116969eca6d20a SHA1 28fdec47cbc184798c0d08fa044c452f94246e28 SHA256 144b40fef01f5866857fe1200fb1e5edd8f82f15df85ccc0db1d969c10018761 -MISC ChangeLog 1999 RMD160 431240278fcab539638b61066716c20105354629 SHA1 2ef622df45c1516dde835bb900d28ef8ad21266b SHA256 e51a512f04e51f7df7919bf22e10ba9a5a537f7368825e72e3001eecdca2a0b8 +MISC ChangeLog 2346 RMD160 09dc7b765f113580c1a0f2af257194f965167080 SHA1 f4b0200ddc25f14a0169dd25ccc8c68cdb11ca5c SHA256 3bf89b43fb3011cc5a4dc8a9dd63a1afb0984f2b0d71c0d1ee1a4b40936d15c2 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) +Version: GnuPG v2.0.9 (GNU/Linux) -iD8DBQFH7UBCj9hvisErhMIRApDcAJ9R9TfatYz3TAR6rU+HBjfJoKu1/ACfTFpq -P1gLwrBGJq3eZ2gkFeQ3n60= -=OKSe +iEYEARECAAYFAkftUQMACgkQoeSe8B0zEfzdMwCfUonwpAf8EpxPOeaw28SEyfPm +bVAAn2JJJzijLOtwCDXLHCU9lWa7MIN6 +=GG3M -----END PGP SIGNATURE----- diff --git a/sys-apps/openrc/files/openrc-0.2-multilib-fix.patch b/sys-apps/openrc/files/openrc-0.2-multilib-fix.patch new file mode 100644 index 000000000000..138d715e7689 --- /dev/null +++ b/sys-apps/openrc/files/openrc-0.2-multilib-fix.patch @@ -0,0 +1,84 @@ +From: Roy Marples <roy@marples.name> +Date: Thu, 27 Mar 2008 16:53:22 +0000 (+0000) +Subject: Fix mulitlib issues. +X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=bf488c54bf93e0b4d95e6aa9303107de098cf049;hp=4e3ef56e27028d1f2976340205ab7f4adc700cb9 + +Fix mulitlib issues. +--- + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 1a1fbba..7575d9c 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -43,7 +43,7 @@ _sanitize_path() + local IFS=":" p= path= + for p in ${PATH}; do + case "${p}" in +- @PREFIX@/lib/rc/sbin|@PREFIX@/bin|@PREFIX@/sbin|/usr/bin|/usr/sbin);; ++ @PREFIX@/@LIB@/rc/sbin|@PREFIX@/bin|@PREFIX@/sbin|/usr/bin|/usr/sbin);; + @PKG_PREFIX@/bin|@PKG_PREFIX@/sbin);; + @LOCAL_PREFIX@/bin|@LOCAL_PREFIX@/sbin);; + *) path="${path}${path:+:}${p}";; +@@ -66,7 +66,7 @@ _PREFIX=@PREFIX@ + _PKG_PREFIX=@PKG_PREFIX@ + _LOCAL_PREFIX=@LOCAL_PREFIX@ + _LOCAL_PREFIX=${_LOCAL_PREFIX:-/usr/local} +-_PATH=@PREFIX@/lib/rc/bin ++_PATH=@PREFIX@/@LIB@/rc/bin + case "${_PREFIX}" in + "${_PKG_PREFIX}"|"${_LOCAL_PREFIX}") ;; + *) _PATH="${_PATH}:${_PREFIX}/bin:${_PREFIX}/sbin";; +@@ -99,7 +99,7 @@ else + # the last ecmd + for _e in ebegin eend error errorn einfo einfon ewarn ewarnn ewend \ + vebegin veend veinfo vewarn vewend; do +- eval "${_e}() { local _r; @PREFIX@/lib/rc/bin/${_e} \"\$@\"; _r=$?; \ ++ eval "${_e}() { local _r; @PREFIX@/@LIB@/rc/bin/${_e} \"\$@\"; _r=$?; \ + export EINFO_LASTCMD=${_e}; return \$_r; }" + done + unset _e +diff --git a/sh/init-common-post.sh b/sh/init-common-post.sh +index cb44999..61f3863 100644 +--- a/sh/init-common-post.sh ++++ b/sh/init-common-post.sh +@@ -8,7 +8,7 @@ retval=0 + # the old service state data + if [ "${RC_SVCDIR}" != "/" ] && mkdir "${RC_SVCDIR}/.test.$$" 2>/dev/null; then + rmdir "${RC_SVCDIR}/.test.$$" +- for x in ${RC_SVCDIR:-/lib/rc/init.d}/*; do ++ for x in ${RC_SVCDIR:-/@LIB@/rc/init.d}/*; do + [ -e "${x}" ] || continue + case ${x##*/} in + depconfig|deptree|ksoftlevel|rc.log);; +diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in +index 74db71e..f449783 100644 +--- a/sh/rc-functions.sh.in ++++ b/sh/rc-functions.sh.in +@@ -4,15 +4,15 @@ + + has_addon() + { +- [ -e "${RC_LIBDIR}/addons/$1.sh" ] || [ -e /lib/rcscripts/addons/"$1".sh ] ++ [ -e "${RC_LIBDIR}/addons/$1.sh" ] || [ -e /@LIB@/rcscripts/addons/"$1".sh ] + } + + import_addon() + { + if [ -e "${RC_LIBDIR}/addons/$1.sh" ]; then + . "${RC_LIBDIR}/addons/$1.sh" +- elif [ -e /lib/rcscripts/addons/"$1".sh ]; then +- . /lib/rcscripts/addons/"$1".sh ++ elif [ -e /@LIB@/rcscripts/addons/"$1".sh ]; then ++ . /@LIB@/rcscripts/addons/"$1".sh + else + return 1 + fi +@@ -75,6 +75,6 @@ get_bootparam() + + # Add our sbin to $PATH + case "${PATH}" in +- @PREFIX@/lib/rc/sbin|@PREFIX@/lib/rc/sbin:*);; +- *) export PATH="@PREFIX@/lib/rc/sbin:${PATH}";; ++ "${RC_LIBDIR}"/rc/sbin|"${RC_LIBDIR}"/rc/sbin:*);; ++ *) export PATH="${RC_LIBDIR}/rc/sbin:${PATH}";; + esac diff --git a/sys-apps/openrc/files/openrc-0.2-multiple-ntp-servers.patch b/sys-apps/openrc/files/openrc-0.2-multiple-ntp-servers.patch new file mode 100644 index 000000000000..5c93d8340fc8 --- /dev/null +++ b/sys-apps/openrc/files/openrc-0.2-multiple-ntp-servers.patch @@ -0,0 +1,23 @@ +From: Nathan Phillip Brink <ohnobinki@gmail.com> +Date: Wed, 26 Mar 2008 22:39:27 +0000 (+0000) +Subject: Allow multiple ntp_servers without error, #47 +X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=790e886674f73af3d28d3e07ced854a4cbbe2e8c + +Allow multiple ntp_servers without error, #47 +--- + +diff --git a/net/system.sh b/net/system.sh +index 2cbab9c..aa654a1 100644 +--- a/net/system.sh ++++ b/net/system.sh +@@ -58,8 +58,8 @@ _system_ntp() + local servers= buffer= x= + + eval servers=\$ntp_servers_${IFVAR} +- [ -z ${servers} ] && servers=${ntp_servers} +- [ -z ${servers} ] && return 0 ++ [ -z "${servers}" ] && servers=${ntp_servers} ++ [ -z "${servers}" ] && return 0 + + buffer="# Generated by net-scripts for interface ${IFACE}\n" + buffer="${buffer}restrict default noquery notrust nomodify\n" diff --git a/sys-apps/openrc/files/openrc-0.2-sysctl-vserver-fix.patch b/sys-apps/openrc/files/openrc-0.2-sysctl-vserver-fix.patch new file mode 100644 index 000000000000..b3a57cf4446c --- /dev/null +++ b/sys-apps/openrc/files/openrc-0.2-sysctl-vserver-fix.patch @@ -0,0 +1,21 @@ +From: Roy Marples <roy@marples.name> +Date: Fri, 28 Mar 2008 19:05:26 +0000 (+0000) +Subject: Restore noserver and noopenvz to sysctl. +X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=b5c48ca38cd7b599a241ac658fa276a75a46cfd3 + +Restore noserver and noopenvz to sysctl. +--- + +diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in +index 03f48ee..9bf56a8 100644 +--- a/init.d/sysctl.Linux.in ++++ b/init.d/sysctl.Linux.in +@@ -6,7 +6,7 @@ depend() + { + use hostname + before bootmisc logger +- keyword noprefix ++ keyword noopenvz noprefix novserver + } + + start() diff --git a/sys-apps/openrc/openrc-0.2-r1.ebuild b/sys-apps/openrc/openrc-0.2-r2.ebuild index 32d8c18b09fc..37447b7625c2 100644 --- a/sys-apps/openrc/openrc-0.2-r1.ebuild +++ b/sys-apps/openrc/openrc-0.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild,v 1.8 2008/03/28 18:56:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.1 2008/03/28 20:11:39 cardoe Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -20,8 +20,8 @@ HOMEPAGE="http://roy.marples.name/openrc" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc-fbsd ~x86 ~x86-fbsd" #"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="debug ncurses pam unicode kernel_linux kernel_FreeBSD" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc-fbsd ~x86" #"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug ncurses pam static unicode kernel_linux kernel_FreeBSD" RDEPEND="virtual/init kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 ) @@ -33,6 +33,8 @@ RDEPEND="virtual/init DEPEND="${RDEPEND} virtual/os-headers" +#S="${WORKDIR}/${PN}-0.2" + pkg_setup() { LIBDIR="lib" [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") @@ -49,20 +51,25 @@ pkg_setup() { fi export BRANDING="Gentoo ${brand}" + export PROGLDFLAGS=$(use static && echo -static) export DEBUG=$(usev debug) - export MKPAM=$(usev pam) + export MKPAM=$(use static || usev pam) export MKTERMCAP=$(usev ncurses) + + if use pam && use static ; then + ewarn "OpenRC cannot be built statically with PAM support," + ewarn "so PAM support has been disabled." + fi } src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git_src_unpack - else - unpack ${A} - fi + unpack ${A} cd "${S}" epatch "${FILESDIR}"/${PN}-0.2-freebsd-install-rc.patch + epatch "${FILESDIR}"/${PN}-0.2-multiple-ntp-servers.patch + epatch "${FILESDIR}"/${PN}-0.2-multilib-fix.patch + epatch "${FILESDIR}"/${PN}-0.2-sysctl-vserver-fix.patch } src_compile() { @@ -101,8 +108,6 @@ src_install() { } pkg_preinst() { - local f - # default net script is just comments, so no point in biting people # in the ass by accident [[ -e ${ROOT}/etc/conf.d/net ]] && rm -f "${D}"/etc/conf.d/net @@ -136,24 +141,15 @@ pkg_preinst() { ) fi - # force net init.d scripts into symlinks - for f in "${ROOT}"/etc/init.d/net.* ; do - if [[ ! -L ${f} ]] ; then - elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." - elog "You should delete '${f##*/}.openrc.bak' if you don't need it." - mv "${f}" "${f}.openrc.bak" - ln -snf net.lo "${f}" - fi - done - # skip remaining migration if we already have openrc installed has_version sys-apps/openrc && return 0 # baselayout boot init scripts have been split out - for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do - [[ -e ${ROOT}/etc/runlevels/boot/${f} ]] && continue - elog "Auto-adding '${f}' service to your boot runlevel" - ln -snf /etc/init.d/${f} "${ROOT}"/etc/runlevels/boot/${f} + local x + for x in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do + [[ -e ${ROOT}/etc/runlevels/boot/${x} ]] && continue + elog "Auto-adding '${x}' service to your boot runlevel" + ln -snf /etc/init.d/${x} "${ROOT}"/etc/runlevels/boot/${x} done # Upgrade out state for baselayout-1 users |