Fix init.d script to use the right variable in sysctl call, thanks to Javier Villavicencio in bug #129621.

(Portage version: 2.1_pre7-r5)

5 files changed, 117 insertions, 22 deletions

diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index eac4fb8aca72..307fd2a5996b 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.4 2006/04/12 16:07:48 flameeyes Exp $
+
+*freebsd-sbin-6.0-r1 (12 Apr 2006)
+
+  12 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> files/sysctl.initd,
+  +freebsd-sbin-6.0-r1.ebuild:
+  Fix init.d script to use the right variable in sysctl call, thanks to Javier
+  Villavicencio in bug #129621.
 
   02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/freebsd-sbin-fixmakefiles.patch, -files/freebsd-sbin-flex.patch:
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index fb3813a9258f..aef7644a6711 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0593edff46dd21d8f42e220585276b0e ChangeLog 3228
 RMD160 8fccec18ca368ee543b2ff8cc09e735dde8222bf ChangeLog 3228
 SHA256 73fb5ceb75f1ec8fcb987fcf7c8d07b56dc2b6c61e3192f7f05a21bdb9448b8a ChangeLog 3228
-MD5 5fd83bcbf48686bcd615b60799613cce files/digest-freebsd-sbin-6.0 1548
-RMD160 bf64735bbceeed83ebccd22f2b3a989100e6ec31 files/digest-freebsd-sbin-6.0 1548
-SHA256 c10cfdca82d0a375d105c9ec1834a52f8ebab8e1ab244cedb63ff06f29d39c05 files/digest-freebsd-sbin-6.0 1548
+MD5 5fd83bcbf48686bcd615b60799613cce files/digest-freebsd-sbin-6.0-r1 1548
+RMD160 bf64735bbceeed83ebccd22f2b3a989100e6ec31 files/digest-freebsd-sbin-6.0-r1 1548
+SHA256 c10cfdca82d0a375d105c9ec1834a52f8ebab8e1ab244cedb63ff06f29d39c05 files/digest-freebsd-sbin-6.0-r1 1548
 MD5 6bd98aaa283db05c1f71d75c3efb62cd files/freebsd-sbin-setXid.patch 541
 RMD160 003ee4530218c609a4a443d2c2d2c8c05d1f4ae6 files/freebsd-sbin-setXid.patch 541
 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267 files/freebsd-sbin-setXid.patch 541
@@ -16,19 +13,12 @@ SHA256 a02a2f8dda23952f6d90100fd1dddc3a3a5048653a74fb1f4b52ceb18bedb448 files/fr
 MD5 3ccb6c4f3937e2d01885accb4eeb4352 files/ipfw.initd 2027
 RMD160 898be7e6f8a769cec0386653552fc4c214dc7a68 files/ipfw.initd 2027
 SHA256 f1629c547de16228304a19d13027288da507086faef40b9e722e7443a3c629ce files/ipfw.initd 2027
-MD5 4cb7682b89d1fe3764d0c6ad2e6e98f3 files/sysctl.initd 780
-RMD160 84d59a9f0025e294e203b70e87f043c36c27b95f files/sysctl.initd 780
-SHA256 d0a236fbbf77edc3fd8591f0ac113f611f61286955b17513bfd631972dd6bf73 files/sysctl.initd 780
-MD5 3fee67932e9e930db90bde7d2967b06a freebsd-sbin-6.0.ebuild 2026
-RMD160 3e52890b638e78163c7346a5ce0f353eeb38bfa5 freebsd-sbin-6.0.ebuild 2026
-SHA256 79d23f12b370de8958872e1b298bfe44294465cda2a7a7335fdb4e7476d78f13 freebsd-sbin-6.0.ebuild 2026
+MD5 100982dc647789bfea4e6f3850d4ba4e files/sysctl.initd 778
+RMD160 96c00e816c5b2b88391bd490d226c65eefc20cd5 files/sysctl.initd 778
+SHA256 34d0c3a056e94c2f7fa974baa2ebcb74677c3d3edc4a3b302472b824aca8318b files/sysctl.initd 778
+MD5 3fee67932e9e930db90bde7d2967b06a freebsd-sbin-6.0-r1.ebuild 2026
+RMD160 3e52890b638e78163c7346a5ce0f353eeb38bfa5 freebsd-sbin-6.0-r1.ebuild 2026
+SHA256 79d23f12b370de8958872e1b298bfe44294465cda2a7a7335fdb4e7476d78f13 freebsd-sbin-6.0-r1.ebuild 2026
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEME+SAiZjviIA2XgRAiRpAJ4r88kr6py/SpXjKUYDziHTxScC5QCgwc10
-NT79QVLO3vfOXVaTvgnnOQI=
-=Bbqu
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.0-r1 b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.0-r1
new file mode 100644
index 000000000000..ea6f6cd46214
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.0-r1
@@ -0,0 +1,18 @@
+MD5 b5b626909c9707d0bab0c54b50e132b9 freebsd-contrib-6.0.tar.bz2 34972594
+RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b freebsd-contrib-6.0.tar.bz2 34972594
+SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 freebsd-contrib-6.0.tar.bz2 34972594
+MD5 7c2af3af5be2f46372f9cc0efaeda4c7 freebsd-etc-6.0.tar.bz2 178941
+RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 freebsd-etc-6.0.tar.bz2 178941
+SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 freebsd-etc-6.0.tar.bz2 178941
+MD5 3888da5da1cb329a65a3ac9d316f99ea freebsd-lib-6.0.tar.bz2 2613087
+RMD160 30bf04438a00408284f135c2670106141cae4873 freebsd-lib-6.0.tar.bz2 2613087
+SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 freebsd-lib-6.0.tar.bz2 2613087
+MD5 44996c2edac20108da43add45b599d94 freebsd-libexec-6.0.tar.bz2 277631
+RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 freebsd-libexec-6.0.tar.bz2 277631
+SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e freebsd-libexec-6.0.tar.bz2 277631
+MD5 961eeb893125bfaa47a7d2f2fee9f2c2 freebsd-sbin-6.0.tar.bz2 1132085
+RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 freebsd-sbin-6.0.tar.bz2 1132085
+SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f freebsd-sbin-6.0.tar.bz2 1132085
+MD5 df8c3764da190437a1d47c6ff1872520 freebsd-usbin-6.0.tar.bz2 2635411
+RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d freebsd-usbin-6.0.tar.bz2 2635411
+SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 freebsd-usbin-6.0.tar.bz2 2635411
diff --git a/sys-freebsd/freebsd-sbin/files/sysctl.initd b/sys-freebsd/freebsd-sbin/files/sysctl.initd
index aea7833eb8fb..9b28ab06ce03 100644
--- a/sys-freebsd/freebsd-sbin/files/sysctl.initd
+++ b/sys-freebsd/freebsd-sbin/files/sysctl.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/files/sysctl.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/files/sysctl.initd,v 1.2 2006/04/12 16:07:48 flameeyes Exp $
 
 start() {
     ebegin "Setting sysctl variables"
@@ -14,7 +14,7 @@ start() {
 		name="${var%%=*}"
 		val="${var#*=}"
 		if [[ $(sysctl -N ${name} 2>/dev/null) == ${name} ]]; then
-		    sysctl ${name}=${value} &>/dev/null
+		    sysctl ${name}=${val} &>/dev/null
 		else
 		    eerror "Kernel doesn't like ${name}"
 		    success=1
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.0-r1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.0-r1.ebuild
new file mode 100644
index 000000000000..8abfdf72cab8
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.0-r1.ebuild,v 1.1 2006/04/12 16:07:48 flameeyes Exp $
+
+inherit flag-o-matic bsdmk freebsd
+
+DESCRIPTION="FreeBSD sbin utils"
+KEYWORDS="~x86-fbsd"
+SLOT="0"
+
+SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${LIBEXEC}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	=sys-freebsd/freebsd-libexec-${RV}*
+	ssl? ( dev-libs/openssl )
+	sys-libs/readline"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-headers-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+PROVIDE="virtual/dev-manager
+	virtual/dhcpc"
+
+S="${WORKDIR}/sbin"
+
+IUSE="atm ipfilter ipv6 vinum suid ssl"
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
+	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
+	use vinum || mymakeopts="${mymakeopts} NO_VINUM= "
+	use suid || mymakeopts="${mymakeopts} NO_SUID= "
+
+	# O3 breaks this, apparently
+	replace-flags -O3 -O2
+}
+
+REMOVE_SUBDIRS="dhclient pfctl pflogd"
+
+PATCHES="${FILESDIR}/${PN}-setXid.patch
+	${FILESDIR}/${PN}-zlib.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+}
+
+src_install() {
+	freebsd_src_install
+	keepdir /var/log
+
+	newinitd ${FILESDIR}/ipfw.initd ipfw
+	newinitd ${FILESDIR}/sysctl.initd sysctl
+
+	cd ${WORKDIR}/etc/
+	insinto /etc
+	doins devd.conf pccard_ether defaults/pccard.conf minfree rc.firewall \
+		sysctl.conf
+
+	# Install the periodic stuff (needs probably to be ported in a more
+	# gentooish way)
+	cd "${WORKDIR}/etc/periodic"
+
+	doperiodic security \
+		security/*.ipfwlimit \
+		security/*.ip6fwlimit \
+		security/*.ip6fwdenied \
+		security/*.ipfwdenied
+
+	use ipfilter && doperiodic security \
+		security/*.ipf6denied \
+		security/*.ipfdenied
+}