From 693cc9b6e847a01c1bb692153021aaf9fb0fab25 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Jan 2019 08:09:37 +0000 Subject: gentoo resync : 25.01.2019 --- sys-freebsd/Manifest.gz | Bin 2713 -> 2715 bytes sys-freebsd/freebsd-ubin/Manifest | 2 + .../files/freebsd-ubin-11.1-man-paths.patch | 40 ++++ .../freebsd-ubin/freebsd-ubin-11.1-r1.ebuild | 214 +++++++++++++++++++++ 4 files changed, 256 insertions(+) create mode 100644 sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-man-paths.patch create mode 100644 sys-freebsd/freebsd-ubin/freebsd-ubin-11.1-r1.ebuild (limited to 'sys-freebsd') diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz index 84c6105f53c3..7f25b4ebb0d5 100644 Binary files a/sys-freebsd/Manifest.gz and b/sys-freebsd/Manifest.gz differ diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest index 198434f168e1..93f176b85e51 100644 --- a/sys-freebsd/freebsd-ubin/Manifest +++ b/sys-freebsd/freebsd-ubin/Manifest @@ -2,6 +2,7 @@ AUX freebsd-ubin-10.2-bsdxml.patch 367 BLAKE2B 0a2dfc1b2646aa2c42bfa8b9a6cbd3d22 AUX freebsd-ubin-10.2-talk-workaround.patch 349 BLAKE2B c5697082af994d7f019254c19bf8ab5ab3e193d248da95de45eefd4a26b21905fbec65e507a47790b2a603d982738532383435c336ee56d27db9bd1bcbf8da4a SHA512 5eb04f1769fd4e04a26b9ff69865a6188269d971b83b7e93a5c41def44c9152e5262a192c866e3949cb3aae3b8e0a13663b8e1a438e796b0b923d9171a3e6b27 AUX freebsd-ubin-11.0-setXid.patch 3527 BLAKE2B feccd24c34869e35dad18391687be0bec1c86b5573c40ba9c97a3faef0578031226aee817552d19d4416892896ed9e69867287744637def99c2915ff31f96f36 SHA512 204ce8a36eae6435d9549de7c45e361715fd50f721ea44aba630fdfad482bf434e8ac34c1bab588b7af2e2c941931e2aeb4690d65904d617b65ecfa7c76c4211 AUX freebsd-ubin-11.1-fixmakefiles.patch 453 BLAKE2B 626500cab079cb0a28a375cb3415fc1ecdd3f8ae5c92f564a63420d1e1d6a7f91184d45f81b6a6ac73a2b217b6345db3789ad59c8aa15571f9d259b603f52a03 SHA512 ec3cd800596998c2bc3499a0cde45a173daf87db2af709bef1ae47e70f88a16a7af7649492e4ab96abba4d9b10b58f82e7d8cb3c2882a738ae7963677fd60f0f +AUX freebsd-ubin-11.1-man-paths.patch 1113 BLAKE2B b0f33f24552ef98d55988cfe39284122889d7cb612f01bb1ee64396ad50dbf994ea1ec03fd17565dd8b1dff6f2e0943ea866f5a86907a93b1f098e3da87a779c SHA512 82e7ef832741589343b40f108dd2f2f75c3d15ae86c65da89744437adfd397adb9a41e71b802f8e4372c29885aacc7bd47c25ff87a37d8684aac11a22dceed4e AUX freebsd-ubin-6.0-bsdcmp.patch 413 BLAKE2B 3c9b81f373d1438ca97edf0b0c0339faadf04a3b73f63a9fda51618803b191bbf697a038809ead6d276c3664c309acc68186f5fc571de26334605a693442536a SHA512 1516d984e7e17e8a3474ce519c9e5d6fefaee244ad27f1ed21af73335a6a25275e842007e71a60d6b18aa049f84c87b349f3350664cea03885cd55a846a73d50 AUX freebsd-ubin-8.0-xinstall.patch 1014 BLAKE2B 9d51cab56860e63bc79057ec910b1f5d39dc1c100e43a0f15ce4c3696da4da3366dbb13bea280fdaae2dff91e2a5d0aad2f5b7448a46d76fdfce317393db7f46 SHA512 a39843600497876287c13a10ca783041123631ef7a82501df323c6a118eb20d871fa6683b812eeebea220c4cfa1eba81450dc7de7ea08888229f326375ff285d AUX freebsd-ubin-9.0-fixmakefiles.patch 445 BLAKE2B 6d284099f5c52d94fe682e190cb584f3a78e475005ddc349fbf1fb690a17f87e9753fc93a27715e3815450fadb51d7ae9158308cea1aeec9e58310709474a620 SHA512 588b0e7f58504ae338b714fb324b1525ed340b56e2e99a1ebaac2606799c9ff15b8c1a05e2ddaa5dfbdc7328684917de8753d99b0c8929c056d6eb6446aa9955 @@ -25,6 +26,7 @@ DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8 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 +EBUILD freebsd-ubin-11.1-r1.ebuild 6259 BLAKE2B 0ea000ae8ce17f50f24a50b49d3d31eae30aa5f501aac300a37951dcdebf822dee30c4ba733ed722b4fc41e7b24d1c839373694a6fc68db9921d02141017cda3 SHA512 7fa660a330c80865c32efe64d8cdfac2ecb1cc1b4ad82f4edb34e25b8775340a9e53f397e75f376e49193ddc2efaec1c83d229c7933f0e5ce6c091c3da69c986 EBUILD freebsd-ubin-11.1.ebuild 6191 BLAKE2B f39322b75a7d4a208e00c4a254fa785ed97f47c02fe74982cb724d83d8d9990dad52d3147b79ac228ffa01fe97e39e4863a8335ed7c8986e955dc7f422ffc2e5 SHA512 a900e3f060f44f9b15f0894725cfb0c247e3cfd7785184a2847714d1089a2dd61c3c7882d9dd0922e88e1d83bb0572ff874106bc0466dae883538cfd23009ea1 EBUILD freebsd-ubin-9.1-r2.ebuild 5435 BLAKE2B 593ac216d25f29ea13839a4713115d7b502d9c706b5c44d258c6fd95d96a1782dd5065ec4a439ce01208cefa056f75d7ca629160d9c43b88d4dab6d172d04e6f SHA512 10cbe0ef273e83d0828ba54178fc03f736f0eba0e77d194ccd497bc1fc9123cb88705dca4bc3918fcc1a6fb8adca71edc215a4056c7a2f59e0a60c8e091fc395 EBUILD freebsd-ubin-9.1-r3.ebuild 5442 BLAKE2B a19be7516757aafad2141d462023cd0dcc078393be1f8b54219c1ba8d214c737f2a956d1a30931be9f07fc95633e90d18f3f56cb4b1c1bd955767a521c602abd SHA512 53e627e4f98a2b7636992cd7d33366128b4d1f39bfea2ab1af49ccfc896db8ba98d9dc391d67d09a0ba609b6ee05fcde285cce6cf5cf4b0739c65adacf5930a5 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-man-paths.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-man-paths.patch new file mode 100644 index 000000000000..c26a672f372b --- /dev/null +++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-man-paths.patch @@ -0,0 +1,40 @@ +diff -dupr a/usr.bin/man/man.sh b/usr.bin/man/man.sh +--- a/usr.bin/man/man.sh 2017-07-21 01:43:23.000000000 +0200 ++++ b/usr.bin/man/man.sh 2019-01-22 19:32:52.136578832 +0100 +@@ -883,12 +883,12 @@ search_whatis() { + # Finds an appropriate decompressor based on extension + setup_cattool() { + case "$1" in +- *.bz) cattool='/usr/bin/bzcat' ;; +- *.bz2) cattool='/usr/bin/bzcat' ;; +- *.gz) cattool='/usr/bin/zcat' ;; +- *.lzma) cattool='/usr/bin/lzcat' ;; +- *.xz) cattool='/usr/bin/xzcat' ;; +- *) cattool='/usr/bin/zcat -f' ;; ++ *.bz) cattool='bzcat' ;; ++ *.bz2) cattool='bzcat' ;; ++ *.gz) cattool='zcat' ;; ++ *.lzma) cattool='lzcat' ;; ++ *.xz) cattool='xzcat' ;; ++ *) cattool='zcat -f' ;; + esac + } + +@@ -903,7 +903,7 @@ setup_pager() { + if [ -n "$PAGER" ]; then + MANPAGER="$PAGER" + else +- MANPAGER="more -s" ++ MANPAGER="less -sR" + fi + fi + fi +@@ -1008,7 +1008,7 @@ SYSCTL=/sbin/sysctl + debug=0 + man_default_sections='1:8:2:3:n:4:5:6:7:9:l' + man_default_path='/usr/share/man:/usr/share/openssl/man:/usr/local/man' +-cattool='/usr/bin/zcat -f' ++cattool='zcat -f' + + config_global='/etc/man.conf' + diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1-r1.ebuild new file mode 100644 index 000000000000..1ed9907fc971 --- /dev/null +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1-r1.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build + +DESCRIPTION="FreeBSD's base system source for /usr/bin" +SLOT="0" +IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" +LICENSE="BSD zfs? ( CDDL )" + +# Security Advisory and Errata patches. +# UPSTREAM_PATCHES=() + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~amd64-fbsd ~x86-fbsd" + SRC_URI="${SRC_URI} + $(freebsd_upstream_patches)" +fi + +EXTRACTONLY=" + usr.bin/ + contrib/ + lib/ + etc/ + bin/ + include/ +" + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}] + ssl? ( dev-libs/openssl:0= ) + kerberos? ( virtual/krb5 ) + ar? ( >=app-arch/libarchive-3 ) + virtual/pam + sys-libs/zlib + >=sys-libs/ncurses-5.9:0= + !sys-process/fuser-bsd + !dev-util/csup + !dev-libs/libiconv + !sys-apps/man + !sys-apps/man-db + !sys-freebsd/freebsd-contrib" + +DEPEND="${RDEPEND} + sys-devel/flex + !build? ( =sys-freebsd/freebsd-sources-${RV}* ) + =sys-freebsd/freebsd-sbin-${RV}* + =sys-freebsd/freebsd-mk-defs-${RV}*" + +RDEPEND="${RDEPEND} + >=sys-auth/pambase-20080219.1 + sys-process/cronbase" + +S="${WORKDIR}/usr.bin" + +PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" + "${FILESDIR}/${PN}-11.1-fixmakefiles.patch" + "${FILESDIR}/${PN}-11.0-setXid.patch" + "${FILESDIR}/${PN}-lint-stdarg.patch" + "${FILESDIR}/${PN}-9.1-bsdar.patch" + "${FILESDIR}/${PN}-10.2-talk-workaround.patch" + "${FILESDIR}/${PN}-10.2-bsdxml.patch" + "${FILESDIR}/${PN}-11.1-man-paths.patch" ) + +# Here we remove some sources we don't need because they are already +# provided by portage's packages or similar. In order: +# - Archiving tools, provided by their own ebuilds +# - ncurses stuff +# - less stuff +# - bind utils +# - rsh stuff +# - binutils gprof +# - dc stuff +# and the rest are misc utils we already provide somewhere else. +REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio + gzip gprof minigzip + lzmainfo xz xzdec + unzip + tput tset tabs + less lessecho lesskey + hesinfo host + rsh rlogin rusers rwho ruptime + compile_et lex vi smbutil file vacation nc ftp telnet + c99 c89 + bc dc + whois tftp + addr2line bsdcat cxxfilt cxxfilt elfcopy nm readelf sdiff size soelim strings" + +pkg_setup() { + # Add the required source files. + use zfs && EXTRACTONLY+="cddl/ " + use build && EXTRACTONLY+="sys/ " + use nis && EXTRACTONLY+="usr.sbin/ypserv/ " + + 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 kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " + use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " + use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " + mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= WITHOUT_MANDOCDB= " +} + +pkg_preinst() { + # bison installs a /usr/bin/yacc symlink ... + # we need to remove it to avoid triggering + # collision-protect errors + if [[ -L ${ROOT}/usr/bin/yacc ]]; then + rm -f "${ROOT}"/usr/bin/yacc || die + fi +} + +src_prepare() { + if [[ ! -e "${WORKDIR}/sys" ]]; then + use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" + fi + + # Rename manpage for renamed cmp + mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die + # Rename manpage for renamed ar + mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die + # Fix whereis(1) manpath search. + sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die + + # Build a dynamic make + sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/bmake/Makefile.inc || die + + # Disable it here otherwise our patch wont apply + use ar || dummy_mk ar + + # Preparing to build xlint + export LINT=xlint +} + +setup_multilib_vars() { + if ! multilib_is_native_abi ; then + cd "${WORKDIR}/usr.bin/ldd" || die + export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN=" + else + cd "${S}" || die + fi + "$@" +} + +src_compile() { + local MULTIBUILD_VARIANTS="${DEFAULT_ABI}" + # Preparing to build addr2line, elfcopy, m4, getaddrinfo + for dir in libelftc libpe libopenbsd libnetbsd; do + cd "${WORKDIR}/lib/${dir}" || die + multibuild_foreach_variant freebsd_multilib_multibuild_wrapper freebsd_src_compile -j1 + done + + MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1 +} + +src_install() { + cd "${S}"/calendar/calendars || die + for dir in $(find . -type d ! -name "." ); do + dodir /usr/share/calendar/"$(basename ${dir})" + done + + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install + + # baselayout requires these in /bin + dodir /bin + for bin in sed printf ; do + mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" + dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" + done + + for pamdfile in login passwd su; do + newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die + done + + cd "${WORKDIR}/etc" || die + insinto /etc + doins remote phones opieaccess fbtab + + exeinto /etc/cron.daily + newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die + + # tip requires /var/spool/lock/, bug #200700 + keepdir /var/spool/lock + + # create locate database #472468 + local f=/var/db/locate.database + mkdir "${ED}${f%/*}" || die + touch "${ED}${f}" || die + fowners nobody:nobody ${f} +} + +pkg_postinst() { + # We need to ensure that login.conf.db is up-to-date. + if [[ -e "${ROOT}"etc/login.conf ]] ; then + einfo "Updating ${ROOT}etc/login.conf.db" + "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die + elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" + fi +} + +pkg_postrm() { + # and if we uninstall yacc but keep bison, + # lets restore the /usr/bin/yacc symlink + if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then + ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die + fi +} -- cgit v1.2.3