From 19c0008ab9004ac5a42d8e0c563ce1fe665289c8 Mon Sep 17 00:00:00 2001 From: Yuta Satoh Date: Fri, 16 Oct 2015 21:55:44 +0900 Subject: sys-freebsd/freebsd-usbin: Fix QA warnings, missing slot dependencies. --- sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild index 54ce185c286b..16f96faeb99d 100644 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild +++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild @@ -40,7 +40,7 @@ fi RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-${RV}* build? ( sys-apps/baselayout ) - ssl? ( dev-libs/openssl ) + ssl? ( dev-libs/openssl:0 ) >=app-arch/libarchive-3 sys-apps/tcp-wrappers dev-util/dialog -- cgit v1.2.3-18-g5258 From 0d5b61cf03bc9e759f0152aca9bc856e022c8771 Mon Sep 17 00:00:00 2001 From: Yuta Satoh Date: Fri, 16 Oct 2015 21:57:28 +0900 Subject: sys-freebsd/freebsd-usbin: Fix FreeBSD-SA-15:24.rpcbind v1.1. --- sys-freebsd/freebsd-usbin/Manifest | 1 + .../freebsd-usbin/freebsd-usbin-10.2-r3.ebuild | 190 -------------------- .../freebsd-usbin/freebsd-usbin-10.2-r4.ebuild | 191 +++++++++++++++++++++ 3 files changed, 192 insertions(+), 190 deletions(-) delete mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild create mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest index d12ce5e16741..0146e1e30d4a 100644 --- a/sys-freebsd/freebsd-usbin/Manifest +++ b/sys-freebsd/freebsd-usbin/Manifest @@ -21,4 +21,5 @@ DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e DIST freebsd-usbin-EN-1513-vidcontrol.patch 497 SHA256 7de0a9693d8c014cd4bef842ab94408da1a07317d84ff779f9a3e9e2160d2527 SHA512 f141b763a85765b34a762aaa267cbaa10b51958a5947ac5d153cbe8a21bf32c4cbc2234687154988d080c668821aa87fa6777d41da243c52de3c6bda67645ac0 WHIRLPOOL b7df3d790a521cf28723a26e231d9d5f801736e5d215ef32c70e2e935b81db7f36b55b79c6bffa35fc9708272ea28f692d8fe26cb565e5a2432e6aa606e9fbae DIST freebsd-usbin-EN-1516-pw.patch 540 SHA256 20f67f2ae87d87be0d60d817f57bf42f3721c88f4f99beec6e616992bc43fe41 SHA512 42eefb4bf76132eb14bf0a5abe8fab4b0b0859e81c59a4381912101fb9b942609f68406a713f2abcf50d05acf5c5bb6a51361c6065b79cbf9fa3e467747dd29d WHIRLPOOL cea498d3809274968c280b373631c1cf07c801bd5559e9c315e900c764dc6e767c399bf4f8e8726269f48530ee8d5846496895ad0030385cf3a8aaaf6d8efc1d +DIST freebsd-usbin-SA-1524-rpcbind-00.patch 713 SHA256 7f10713bd0c3ff34f3ea71dd03b93faca1fa4d9a0127ec8bf39da11978e40737 SHA512 1e9dab75c487fbfcca0cc5fc8c7733db19ffdf7023649384e878551da73561cd5eaebc8fe3edf47a42907f361e19134609b3843b8591c36418a5879519a7bc97 WHIRLPOOL 872350990a7afbaa679ddc98eb8c12ae6388b480bf08cdff27c32fa8f38b8c0e455612934a12acee8f405f77996648a9c080f138b43aeceeef5033191dba791f DIST freebsd-usbin-SA-1524-rpcbind.patch 1621 SHA256 f00e6a02cdb1a520a1cd1271ede77cde4e658d2cf336377af0f8f0589eed477f SHA512 c15f8d83e92ae6f6457831c182bcd022af8ad61e2c7c9f4240f3b50d494c59b6e923d01b932ce4878a27eb36b9d87bcefa41c15f123095be779b905ac0585cda WHIRLPOOL 0df3a1bd60fb43f639c51ee779b9ebe1468afe301323f1103cf1d56151d79667d7716df7e75a19aa57a03b699fe481d3a7da83327876cbcf60c9e114db21eca7 diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild deleted file mode 100644 index 16f96faeb99d..000000000000 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic eutils - -DESCRIPTION="FreeBSD /usr/sbin tools" -SLOT="0" - -# Security Advisory and Errata patches. -UPSTREAM_PATCHES=( "EN-15:13/vidcontrol.patch" - "EN-15:16/pw.patch" - "SA-15:24/rpcbind.patch" ) - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - usr.sbin/ - contrib/ - usr.bin/ - lib/ - sbin/ - etc/ - gnu/ -" -use nis && EXTRACTONLY+="libexec/" -if use build ; then - EXTRACTONLY+=" - sys/ - include/ - " -fi - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] - =sys-freebsd/freebsd-libexec-${RV}* - build? ( sys-apps/baselayout ) - ssl? ( dev-libs/openssl:0 ) - >=app-arch/libarchive-3 - sys-apps/tcp-wrappers - dev-util/dialog - >=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_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= " - - append-flags $(test-flags -fno-strict-aliasing) -} - -PATCHES=( - "${FILESDIR}/${PN}-adduser.patch" - "${FILESDIR}/${PN}-9.0-newsyslog.patch" - "${FILESDIR}/${PN}-10.0-bsdxml2expat.patch" - ) - -REMOVE_SUBDIRS=" - tcpdchk tcpdmatch - sendmail praliases editmap mailstats makemap - pc-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 sysrc" - -src_prepare() { - if ! use build; then - [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" - [[ ! -e "${WORKDIR}/include" ]] && 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_compile() { - # Preparing to build nmtree - cd "${WORKDIR}/lib/libnetbsd" - freebsd_src_compile - - cd "${S}" - freebsd_src_compile -} - -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 iscsid nfs nfsuserd 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}" < "${T}/periodic.${class}" <