Add patch to fix bzip2/gzip path. Bug #359223. Patch from Dmitri Bogomolov

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 195 insertions, 5 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index c92e1def36f3..c66af9abc8bd 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.68 2011/08/30 02:12:19 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.69 2011/09/05 14:53:54 naota Exp $
+
+*freebsd-usbin-8.2-r2 (05 Sep 2011)
+
+  05 Sep 2011; Naohiro Aota <naota@gentoo.org> +freebsd-usbin-8.2-r2.ebuild,
+  +files/freebsd-usbin-8.2-newsyslog.patch:
+  Add patch to fix bzip2/gzip path. Bug #359223. Patch from Dmitri Bogomolov
 
   30 Aug 2011; Naohiro Aota <naota@gentoo.org> freebsd-usbin-8.2-r1.ebuild:
   Add -fno-strict-aliasing
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 5b118ae3e09b..9e398c2a4aef 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX freebsd-usbin-7.0-nowrap.patch 1185 RMD160 268b102794cf39ce870a7b197d6ad1c03beece94 SHA1 058bffeaf34563fbf825f30a3c8402667ad52068 SHA256 a3c35cd997a22f4d212c3fe08d20fa7552b6de64527fee0166249ae76a3e49c8
+AUX freebsd-usbin-8.2-newsyslog.patch 400 RMD160 d8900321b54a553d9fd6b0cf4c68cbb7bf4f796f SHA1 520da4bf9721ec2799635897238a6ab39b93db07 SHA256 f13d5ea43531f42ff0cb42438b58875afce4046c650a7459fd2eac62dc11696e
 AUX freebsd-usbin-adduser.patch 428 RMD160 fecedb0bad9f29e9f0d889b2fce0edeb9a954d0b SHA1 3407974fcd42701d1587684f14547b5e02b6b342 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af
 AUX mountd.patch 542 RMD160 f68fb1bdc53705a392bbb92d91fc44991f19e742 SHA1 c5fb79a35ff7a6a34266b7a7523c56132c4d3d5f SHA256 da895dabdb52c63d876c13605aa1ef446f8babb47100932b5b451155181a759f
 AUX moused.confd 827 RMD160 a9d0822aa3894caed9efa9df93ef25ec6ec6fb8e SHA1 e09f3f44ee29fa75a1ce6fbe9cdbfe503eaa11d6 SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e
@@ -53,12 +54,13 @@ DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab848353
 EBUILD freebsd-usbin-7.2-r1.ebuild 5278 RMD160 fe22f027d29f6a435b4ec8355933c9348f08be95 SHA1 530fffda2a82bab7d6ab93673df9daa1e0daae1d SHA256 3e635b2b34749e224185e10ca87f7644cf0b1688093ec4974d0e5cf9bd786aa6
 EBUILD freebsd-usbin-8.0-r1.ebuild 5346 RMD160 b485010627c843313b3c5d9be70d2626154eea18 SHA1 7558779bbbb1b498da9a803f5e00ebc16a4a3d42 SHA256 2c1d1b55b9dfa4f7c85de5b8e64f56c4fc1b546ee23f9de598a3715b209935cd
 EBUILD freebsd-usbin-8.2-r1.ebuild 5424 RMD160 e6ffd721787ff01b334f8bd5c823de2faf175a49 SHA1 9b2449c9c8fb2a7740d7d01351de3082f0d26714 SHA256 ac6fc00c1b08f5a96945fd40acae3a1a648de7a39ea4a28ff8fc120b9be9e3e2
-MISC ChangeLog 18461 RMD160 7672f9a04cdcc919080f8f8301470951b8d53e39 SHA1 20509010dbc64f4a17911f884f2726b5619fa81b SHA256 003232bd808b44c58f0fb14675f6f7191af0a1526d4fe370e51ccfa237845e3f
+EBUILD freebsd-usbin-8.2-r2.ebuild 5465 RMD160 322c086d8f7c54d8ac1173f3c780fa87435a484d SHA1 aaabe3d6288fd3c00d6a2a7406c9d1b80e58643a SHA256 c49accbce29a6c7120ce65513950bae84f54d4100d2be274a3ef1ec50e8ce77e
+MISC ChangeLog 18697 RMD160 136ff6252cc0a6604d82795da02f19d828f42363 SHA1 03a6e6663c1689b6f43bffe7518531655fd893cd SHA256 598e00f22f81cfcaa38bf4a9aa76df765c6d2d85601caafd7e1e5ab448b1e3a1
 MISC metadata.xml 511 RMD160 159e8a06a03c2b27a64a3ca54de4373a5aae5c6a SHA1 1d4f7993fe8c31a4f7478c91df9103b69b29148e SHA256 ad3d3afca8e209c42d1767c5d1dab12eef47c9016c0ce9aaa3490942bd185bac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5cRwkACgkQGpDnPLSHuMDjjACg4HytKhE8uKd1aPtVhIVxYm6k
-fRkAoKD8iwxdkz1bVjpY1fVqk+U7fNfa
-=5JUs
+iEYEARECAAYFAk5k4oYACgkQGpDnPLSHuMCpoACggA7VhO0siS0hBIwJV8a/tRck
+iA8AoOJQ/MmQMpF0aOpGLSLg0MNEwrlp
+=NA6y
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch
new file mode 100644
index 000000000000..a0983912178f
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch
@@ -0,0 +1,10 @@
+--- usr.sbin/newsyslog/pathnames.h.orig	2001-07-30 18:17:17.000000000 +0300
++++ usr.sbin/newsyslog/pathnames.h	2009-09-11 08:32:57.508226240 +0300
+@@ -24,5 +24,5 @@
+ 
+ #define _PATH_CONF	"/etc/newsyslog.conf"
+ #define _PATH_SYSLOGPID	_PATH_VARRUN "syslog.pid"
+-#define _PATH_BZIP2	"/usr/bin/bzip2"
+-#define _PATH_GZIP	"/usr/bin/gzip"
++#define _PATH_BZIP2	"/bin/bzip2"
++#define _PATH_GZIP	"/bin/gzip"
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
new file mode 100644
index 000000000000..e8cfcb76d9ac
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild,v 1.1 2011/09/05 14:53:54 naota Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD /usr/sbin tools"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
+		build? ( mirror://gentoo/${SYS}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
+	=sys-freebsd/freebsd-libexec-${RV}*
+	acpi? ( sys-power/iasl )
+	build? ( sys-apps/baselayout )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libelf
+	dev-libs/libedit
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-ubin-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	sys-apps/texinfo
+	sys-devel/flex"
+
+S="${WORKDIR}/usr.sbin"
+
+IUSE="acpi atm audit bluetooth floppy ipv6 isdn minimal netware nis pam ssl tcpd usb build"
+
+pkg_setup() {
+	# Release crunch is something like minimal. It seems to remove everything
+	# which is not needed to work.
+	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
+
+	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
+	use tcpd || mymakeopts="${mymakeopts} NO_WRAP="
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
+
+	append-flags $(test-flags -fno-strict-aliasing)
+}
+
+PATCHES=( "${FILESDIR}/${PN}-7.0-nowrap.patch"
+	"${FILESDIR}/${PN}-adduser.patch"
+	"${FILESDIR}/mountd.patch"
+	"${FILESDIR}/${PN}-8.2-newsyslog.patch" )
+
+REMOVE_SUBDIRS="
+	named named-checkzone named-checkconf rndc rndc-confgen
+	dnssec-keygen dnssec-signzone
+	tcpdchk tcpdmatch
+	sendmail praliases editmap mailstats makemap
+	sysinstall cron mailwrapper ntp bsnmpd
+	tcpdump ndp inetd
+	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
+	zic amd
+	pkg_install freebsd-update"
+
+src_prepare() {
+	if ! use build; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+		ln -s "/usr/include" "${WORKDIR}/include"
+	else
+		dummy_mk mount_smbfs
+	fi
+	# Don't install mtree format manpage
+	# it's installed by libarchive.
+	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
+}
+
+src_install() {
+	# By creating these directories we avoid having to do a
+	# more complex hack
+	dodir /usr/share/doc
+	dodir /sbin
+	dodir /usr/libexec
+	dodir /usr/bin
+
+	# FILESDIR is used by some makefiles which will install files
+	# in the wrong place, just put it in the doc directory.
+	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
+
+	# Most of these now come from openrc.
+	for util in nfs rpc.statd rpc.lockd; do
+		newinitd "${FILESDIR}/"${util}.initd ${util} || die
+		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
+			newconfd "${FILESDIR}"/${util}.confd ${util} || die
+		fi
+	done
+
+	for class in daily monthly weekly; do
+		cat - > "${T}/periodic.${class}" <<EOS
+#!/bin/sh
+/usr/sbin/periodic ${class}
+EOS
+		exeinto /etc/cron.${class}
+		newexe "${T}/periodic.${class}" periodic
+	done
+
+	# Install the pw.conf file to let pw use Gentoo's skel location
+	insinto /etc
+	doins "${FILESDIR}/pw.conf" || die
+
+	cd "${WORKDIR}/etc"
+	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
+
+	insinto /etc/ppp
+	doins ppp/ppp.conf || die
+
+	if use isdn; then
+		insinto /etc/isdn
+		doins isdn/* || die
+		rm -f "${D}"/etc/isdn/Makefile
+	fi
+
+	if use bluetooth; then
+		insinto /etc/bluetooth
+		doins bluetooth/* || die
+		rm -f "${D}"/etc/bluetooth/Makefile
+	fi
+
+	# Install the periodic stuff (needs probably to be ported in a more
+	# gentooish way)
+	cd "${WORKDIR}/etc/periodic"
+
+	doperiodic daily daily/*.accounting
+	doperiodic monthly monthly/*.accounting
+}
+
+pkg_postinst() {
+	# We need to run pwd_mkdb if key files are not present
+	# If they are, then there is no need to run pwd_mkdb
+	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
+		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
+			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
+			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
+		else
+			eerror "${ROOT}etc/master.passwd does not exist!"
+			eerror "You will no be able to log into your system!"
+		fi
+	fi
+
+	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
+		debug.log slip.log ppp.log; do
+		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
+	done
+}