* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-usbin/files/
@ 2018-01-23 14:47 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2018-01-23 14:47 UTC (permalink / raw
To: gentoo-commits
commit: d8de910c29a0cb91e3bc2e63403050826b10d0a9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 13:06:40 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 14:46:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8de910c
sys-freebsd/freebsd-usbin: Remove 8.2
sys-freebsd/freebsd-usbin/Manifest | 10 --
.../files/freebsd-usbin-7.0-nowrap.patch | 45 ------
.../files/freebsd-usbin-8.2-newsyslog.patch | 10 --
sys-freebsd/freebsd-usbin/files/mountd.patch | 15 --
.../freebsd-usbin/freebsd-usbin-8.2-r2.ebuild | 162 ---------------------
5 files changed, 242 deletions(-)
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 917172245e9..f9c678f284c 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,21 +1,11 @@
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c31cd5a7011851305a155a648f50b5b7769fafd4ff59e105dcac54079947b8f98c05527b517e955a3e60423c68a849a10 SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3
DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
deleted file mode 100644
index 9b11104e833..00000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile
---- usr.sbin.orig/rpcbind/Makefile 2007-04-21 12:02:30 +0000
-+++ usr.sbin/rpcbind/Makefile 2007-04-21 12:05:32 +0000
-@@ -8,13 +8,20 @@
- SRCS= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
- rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c
-
--CFLAGS+= -DPORTMAP -DLIBWRAP
-+CFLAGS+= -DPORTMAP
-
- .if ${MK_INET6_SUPPORT} != "no"
- CFLAGS+= -DINET6
- .endif
-
--DPADD= ${LIBWRAP} ${LIBUTIL}
--LDADD= -lwrap -lutil
-+DPADD= ${LIBUTIL}
-+LDADD= -lutil
-+
-+.if !defined(NO_WRAP)
-+CFLAGS+= -DLIBWRAP
-+DPADD+= ${LIBWRAP}
-+LDADD+= -lwrap
-+.endif
-+
-
- .include <bsd.prog.mk>
-diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile
---- usr.sbin.orig/ypserv/Makefile 2007-04-21 12:02:31 +0000
-+++ usr.sbin/ypserv/Makefile 2007-04-21 12:06:53 +0000
-@@ -8,10 +8,13 @@
- SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
- ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c
-
--CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I.
-+CFLAGS+= -DDB_CACHE -I.
-
-+.if !defined(NO_WRAP)
-+CFLAGS+= -DTCP_WRAPPER
- DPADD= ${LIBWRAP}
- LDADD= -lwrap
-+.endif
-
- CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h
-
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
deleted file mode 100644
index a0983912178..00000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/files/mountd.patch b/sys-freebsd/freebsd-usbin/files/mountd.patch
deleted file mode 100644
index 3cb9f03e9d8..00000000000
--- a/sys-freebsd/freebsd-usbin/files/mountd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-11:01.mountd.asc
-
-Index: usr.sbin/mountd/mountd.c
-===================================================================
---- usr.sbin/mountd/mountd.c 20 Dec 2010 09:28:28 -0000 1.107
-+++ usr.sbin/mountd/mountd.c 1 Mar 2011 11:47:16 -0000 1.108
-@@ -2875,7 +2875,7 @@ makemask(struct sockaddr_storage *ssp, i
-
- for (i = 0; i < len; i++) {
- bits = (bitlen > CHAR_BIT) ? CHAR_BIT : bitlen;
-- *p++ = (1 << bits) - 1;
-+ *p++ = (u_char)~0 << (CHAR_BIT - bits);
- bitlen -= bits;
- }
- return 0;
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
deleted file mode 100644
index 315df33e620..00000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~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 )
- 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 minimal netware nis pam ssl 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 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= "
-
- 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 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-usbin/files/
@ 2018-02-19 19:24 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2018-02-19 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 1efb9650cf0f9a46758630d425b3f9615ceeb188
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 19:11:08 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 19:24:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efb9650
sys-freebsd/freebsd-usbin: Remove 9.1
sys-freebsd/freebsd-usbin/Manifest | 10 --
.../files/freebsd-usbin-9.1-bsdxml2expat.patch | 12 --
.../files/freebsd-usbin-9.1-kldxref.patch | 30 ----
.../freebsd-usbin/freebsd-usbin-9.1-r1.ebuild | 170 ---------------------
4 files changed, 222 deletions(-)
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index f9c678f284c..f3dcd89d595 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,11 +1 @@
-DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
-DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
deleted file mode 100644
index bddc0c77f21..00000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c
---- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900
-+++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900
-@@ -60,7 +60,7 @@
- #include <errno.h>
- #include <err.h>
- #include <ctype.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <cam/scsi/scsi_all.h>
- #include <cam/scsi/scsi_message.h>
- #include <cam/ctl/ctl.h>
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch
deleted file mode 100644
index 95bd665ded6..00000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: usr.sbin/kldxref/kldxref.c
-===================================================================
---- usr.sbin/kldxref/kldxref.c (revision 265111)
-+++ usr.sbin/kldxref/kldxref.c (working copy)
-@@ -274,6 +274,16 @@ usage(void)
- exit(1);
- }
-
-+static int
-+compare(const FTSENT *const *a, const FTSENT *const *b)
-+{
-+ if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D)
-+ return 1;
-+ if ((*a)->fts_info != FTS_D && (*b)->fts_info == FTS_D)
-+ return -1;
-+ return strcmp((*a)->fts_name, (*b)->fts_name);
-+}
-+
- int
- main(int argc, char *argv[])
- {
-@@ -315,7 +325,7 @@ main(int argc, char *argv[])
- err(1, "%s", argv[0]);
- }
-
-- ftsp = fts_open(argv, fts_options, 0);
-+ ftsp = fts_open(argv, fts_options, compare);
- if (ftsp == NULL)
- exit(1);
-
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild
deleted file mode 100644
index 2627caf7733..00000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~amd64-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}*
- =sys-freebsd/freebsd-contrib-${RV}*
- acpi? ( sys-power/iasl )
- build? ( sys-apps/baselayout )
- ssl? ( dev-libs/openssl )
- >=app-arch/libarchive-3
- sys-apps/tcp-wrappers
- dev-util/dialog
- dev-libs/libelf
- >=dev-libs/libedit-20120311.3.0-r1
- net-libs/libpcap
- kerberos? ( app-crypt/heimdal )"
-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 kerberos minimal netware nis pam ssl 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 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 kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-
- 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}-adduser.patch"
- "${FILESDIR}/${PN}-9.0-newsyslog.patch"
- "${FILESDIR}/${PN}-9.1-bsdxml2expat.patch"
- "${FILESDIR}/${PN}-9.1-kldxref.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 pkg_install freebsd-update service"
-
-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 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-usbin/files/
@ 2018-02-26 8:04 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2018-02-26 8:04 UTC (permalink / raw
To: gentoo-commits
commit: 52b1d1bf7ce8a7a58c60118a301fb0ba3f1d4729
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 07:58:23 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 08:04:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52b1d1bf
sys-freebsd/freebsd-usbin: Revert "Remove 9.1"
Restore 9.1 version. Its removal was premature, and we should fix
the CI problems via masking old versions in new profiles instead.
sys-freebsd/freebsd-usbin/Manifest | 10 ++
.../files/freebsd-usbin-9.1-bsdxml2expat.patch | 12 ++
.../files/freebsd-usbin-9.1-kldxref.patch | 30 ++++
.../freebsd-usbin/freebsd-usbin-9.1-r1.ebuild | 170 +++++++++++++++++++++
4 files changed, 222 insertions(+)
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index f3dcd89d595..f9c678f284c 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1 +1,11 @@
+DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
+DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
+DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
+DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
+DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
+DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
+DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
+DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
+DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
+DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
new file mode 100644
index 00000000000..bddc0c77f21
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
@@ -0,0 +1,12 @@
+diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c
+--- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900
++++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900
+@@ -60,7 +60,7 @@
+ #include <errno.h>
+ #include <err.h>
+ #include <ctype.h>
+-#include <bsdxml.h>
++#include <expat.h>
+ #include <cam/scsi/scsi_all.h>
+ #include <cam/scsi/scsi_message.h>
+ #include <cam/ctl/ctl.h>
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch
new file mode 100644
index 00000000000..95bd665ded6
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch
@@ -0,0 +1,30 @@
+Index: usr.sbin/kldxref/kldxref.c
+===================================================================
+--- usr.sbin/kldxref/kldxref.c (revision 265111)
++++ usr.sbin/kldxref/kldxref.c (working copy)
+@@ -274,6 +274,16 @@ usage(void)
+ exit(1);
+ }
+
++static int
++compare(const FTSENT *const *a, const FTSENT *const *b)
++{
++ if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D)
++ return 1;
++ if ((*a)->fts_info != FTS_D && (*b)->fts_info == FTS_D)
++ return -1;
++ return strcmp((*a)->fts_name, (*b)->fts_name);
++}
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -315,7 +325,7 @@ main(int argc, char *argv[])
+ err(1, "%s", argv[0]);
+ }
+
+- ftsp = fts_open(argv, fts_options, 0);
++ ftsp = fts_open(argv, fts_options, compare);
+ if (ftsp == NULL)
+ exit(1);
+
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild
new file mode 100644
index 00000000000..2627caf7733
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD /usr/sbin tools"
+SLOT="0"
+KEYWORDS="~amd64-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}*
+ =sys-freebsd/freebsd-contrib-${RV}*
+ acpi? ( sys-power/iasl )
+ build? ( sys-apps/baselayout )
+ ssl? ( dev-libs/openssl )
+ >=app-arch/libarchive-3
+ sys-apps/tcp-wrappers
+ dev-util/dialog
+ dev-libs/libelf
+ >=dev-libs/libedit-20120311.3.0-r1
+ net-libs/libpcap
+ kerberos? ( app-crypt/heimdal )"
+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 kerberos minimal netware nis pam ssl 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 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 kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
+
+ 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}-adduser.patch"
+ "${FILESDIR}/${PN}-9.0-newsyslog.patch"
+ "${FILESDIR}/${PN}-9.1-bsdxml2expat.patch"
+ "${FILESDIR}/${PN}-9.1-kldxref.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 pkg_install freebsd-update service"
+
+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 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-26 8:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-26 8:04 [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-usbin/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2018-02-19 19:24 Michał Górny
2018-01-23 14:47 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox