From c9f6b96cd6fc0d5d1669d1cccd10cf4f6b3f9a20 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 23 Mar 2010 20:04:32 +0000 Subject: [PATCH] Fix by Lars Wendler for syntax error in network init.d script #310805 by Leonid Podolny. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-apps/openrc/ChangeLog | 9 +- sys-apps/openrc/Manifest | 15 +- .../files/openrc-0.6.1-network-syntax.patch | 14 + sys-apps/openrc/openrc-0.6.1-r1.ebuild | 408 ++++++++++++++++++ 4 files changed, 443 insertions(+), 3 deletions(-) create mode 100644 sys-apps/openrc/files/openrc-0.6.1-network-syntax.patch create mode 100644 sys-apps/openrc/openrc-0.6.1-r1.ebuild diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index 53712d928f6f..74072c769620 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.110 2010/03/22 20:34:59 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.111 2010/03/23 20:04:30 vapier Exp $ + +*openrc-0.6.1-r1 (23 Mar 2010) + + 23 Mar 2010; Mike Frysinger +openrc-0.6.1-r1.ebuild, + +files/openrc-0.6.1-network-syntax.patch: + Fix by Lars Wendler for syntax error in network init.d script #310805 by + Leonid Podolny. *openrc-0.6.1 (22 Mar 2010) diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 8f71a4036273..7226a88f5658 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,13 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX openrc-0.6.0-fix-bsd-compile.patch 591 RMD160 50e3ce41fa074e9a838b6f1067eb091e9c44b6e4 SHA1 0fb4ade50ba5ec79b2af01bbff1771d47820892c SHA256 ed4b1653fa520ed1fbc761746b20b14c26fb6e344d1111c96908e909ca1c2d45 AUX openrc-0.6.0-fix-vlan.patch 797 RMD160 cc7c5ade98053e02b1df7629dd4fa0c749f646b5 SHA1 eb697b71413ff335fbae970cd6f2295123321d56 SHA256 b32f19a3ded0fa0aac6d649ceb2529fb2b22296958c25462733ac765939d4f69 AUX openrc-0.6.0-typos.patch 23652 RMD160 4e7082b2e87e386229c633d07637d78191897aea SHA1 935ea189125f1b1b36c283ca3ef575e949b5f9cc SHA256 1931799422824bde4b05b5b3c827d4bf2c7e03534e91ea9064d5345f8ad099c5 +AUX openrc-0.6.1-network-syntax.patch 274 RMD160 7c2340f50bf36a4571a9ba3c8225798e185bccb1 SHA1 a860c3b5c8952aaadebcbe5635c90d5a8d482762 SHA256 bfec81964c82d7fb4b4789042ef109be76fde56cf41a0466c35753bb80965021 AUX openrc-9999-msg-style.patch 2775 RMD160 af958b2a8ed5ad29f25b53bad9a426cf7e173405 SHA1 251b8d0a52bb6e98d80a5213afc4d067583441fc SHA256 637fc2d13e0940b55b7d4613ebf8ebabdee87a802a2690191c01fd5ee7cb3581 AUX openrc-9999-pause.patch 825 RMD160 737615919d779894e990072a0ff026aeb4fc0a95 SHA1 c9c469d0bfb685a83d8a736467434b22eaf702cd SHA256 ffa34418921d30c589ad762a5d6d7640c37e7279ca19af469912cb9f118cc75d AUX openrc.logrotate 71 RMD160 4e7370ca873bd917f16e2b8cfc4bc71accbf2353 SHA1 ef1f26020db432f96a1485f72a189b288ef6873b SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c DIST openrc-0.6.0.tar.bz2 154403 RMD160 20710f2c772368d84c46128984bf08e065558268 SHA1 b0475b9ef4ed877a63878325f60c444b0b33454f SHA256 1b302ef12b1c144ae4260d442bd9fa5dd6176c9601d9c1f609ef49f14a1b0728 DIST openrc-0.6.1.tar.bz2 154897 RMD160 d3ee62bdc57b38f2ecfdb2e55d75b5279a4253b7 SHA1 07c27e443b7adfcab02eb3e267f4d228bb580dfc SHA256 c7847254e41b613b76ae570cf786ce8164d637962ad4580d0825b4b62b475e07 EBUILD openrc-0.6.0-r1.ebuild 13455 RMD160 8cc84f557154b9a36d74a2e523848075a26e9b33 SHA1 b9e1bb061c1c82dad4aa13453dd87ec47c580530 SHA256 45e399b948c167780012ebf21ea0dfbaa2d0df617e33bedce145e18471e8837e -EBUILD openrc-0.6.1.ebuild 13322 RMD160 5a6dd8a27458057e99eb325546a688ad632c890e SHA1 278e00735044a10196d2e45aecc04bb9269a36d3 SHA256 257e3154fbb19b68c0a376c17885ef369e0d78c14359891ed328dbd0c4100580 +EBUILD openrc-0.6.1-r1.ebuild 13379 RMD160 e495cc0e20d0cf52a3fb5a9d0b4ce883d4b9c66e SHA1 e43fcc04f6a17ff351e39681923733755a0206a2 SHA256 7ce4fc49e8f8ec0fb1a98ff89fd4b47c28673a2a75e4371cdc6999dece92a49b EBUILD openrc-9999.ebuild 13322 RMD160 def757e4ade935eb2abaf06244d4f9a73a4e35b0 SHA1 7dbeadf2a2a00ebe0e780a3bf7879047c6bae2ac SHA256 039650e26ff1ea3700160522b064d02a0cc25e65d11da80383cfffde1aa2a667 -MISC ChangeLog 22420 RMD160 cd2b368207e1c7b5ada90d514dfa5161bb042266 SHA1 73b7d4fc3e6e4ac572276f6508e54199e996142c SHA256 5154ab1fe3d830dc44decee9e0f495f46d3950f87985cd72f8f1c86d74ddb701 +MISC ChangeLog 22663 RMD160 a795af5a64bda4f3df340d0f371367662ac81c6f SHA1 ca639b5eee96298e8a7076c1824e0841e509d194 SHA256 7eb78b6e97979f579715440fc0fe89eaeeb4a8efc97cf215525167339e8088f4 MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iF4EAREIAAYFAkupHvIACgkQTwhj9JtAlp7hqwEAi0xRGFTAAivxcprnxesQVWpq +IaBy5h83xZAfma3EAWoBAMTXT+A6/xO8vdKdYgQpccPLMP6j68r4KfYBSuzMpksK +=OXO0 +-----END PGP SIGNATURE----- diff --git a/sys-apps/openrc/files/openrc-0.6.1-network-syntax.patch b/sys-apps/openrc/files/openrc-0.6.1-network-syntax.patch new file mode 100644 index 000000000000..534a8899797f --- /dev/null +++ b/sys-apps/openrc/files/openrc-0.6.1-network-syntax.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/310805 + +patch by Lars Wendler + +--- openrc-0.6.1/init.d/network.in ++++ openrc-0.6.1/init.d/network.in +@@ -74,6 +74,7 @@ + esac + done + [ $? = 2 ] ++ ;; + *) + local inet= address= rest= + LC_ALL=C ifconfig -a | while read inet address rest; do diff --git a/sys-apps/openrc/openrc-0.6.1-r1.ebuild b/sys-apps/openrc/openrc-0.6.1-r1.ebuild new file mode 100644 index 000000000000..a307b3ee360d --- /dev/null +++ b/sys-apps/openrc/openrc-0.6.1-r1.ebuild @@ -0,0 +1,408 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.6.1-r1.ebuild,v 1.1 2010/03/23 20:04:30 vapier Exp $ + +EAPI="1" + +inherit eutils flag-o-matic multilib toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://roy.marples.name/openrc.git" + inherit git + KEYWORDS="" +else + SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +fi + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://roy.marples.name/openrc" + +LICENSE="BSD-2" +SLOT="0" +IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + kernel_FreeBSD? ( sys-process/fuser-bsd ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + >=sys-apps/baselayout-2.0.0 + kernel_linux? ( !