diff options
| author |   Yuta SATOH <nigoro.dev@gmail.com> | 2016-11-02 21:57:07 +0900 |
|---|---|---|
| committer | Yuta SATOH <nigoro.dev@gmail.com> | 2016-11-02 21:57:07 +0900 |
| commit | 4933d8a774f911cc7ec2b371f62cbcec83447438 (patch) | |
| tree | 51bd5af28d8fee9e62174022e9680494c06083ad | |
| parent | dev-util/catalyst: added -9999 patches. (diff) | |
| download | gentoo-bsd-4933d8a774f911cc7ec2b371f62cbcec83447438.tar.gz gentoo-bsd-4933d8a774f911cc7ec2b371f62cbcec83447438.tar.bz2 gentoo-bsd-4933d8a774f911cc7ec2b371f62cbcec83447438.zip | |
clean up freebsd 11.0 related files.
273 files changed, 0 insertions, 11225 deletions
diff --git a/eclass/bsdmk.eclass b/eclass/bsdmk.eclass deleted file mode 100644 index a92b4c0..0000000 --- a/eclass/bsdmk.eclass +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# @ECLASS: bsdmk.eclass -# @MAINTAINER: -# maintainer-needed@gentoo.org -# @BLURB: Some functions for BSDmake - -inherit toolchain-funcs portability flag-o-matic - -EXPORT_FUNCTIONS src_compile src_install - -RDEPEND="" -# this should actually be BDEPEND, but this works. -DEPEND="virtual/pmake" - -ESED="/usr/bin/sed" - -# @ECLASS-VARIABLE: mymakeopts -# @DESCRIPTION: -# Options for bsd-make - -# @FUNCTION: append-opt -# @USAGE: < options > -# @DESCRIPTION: -# append options to enable or disable features -append-opt() { - mymakeopts="${mymakeopts} $@" -} - -# @FUNCTION: mkmake -# @USAGE: [ options ] -# @DESCRIPTION: -# calls bsd-make command with the given options, passing ${mymakeopts} to -# enable ports to useflags bridge. -mkmake() { - [[ -z ${BMAKE} ]] && BMAKE="$(get_bmake)" - - tc-export CC CXX LD RANLIB - - ${BMAKE} ${MAKEOPTS} ${EXTRA_EMAKE} ${mymakeopts} NO_WERROR= STRIP= "$@" -} - -# @FUNCTION: mkinstall -# @USAGE: [ options ] -# @DESCRIPTION: -# Calls "bsd-make install" with the given options, passing ${mamakeopts} to -# enable ports to useflags bridge -mkinstall() { - [[ -z ${BMAKE} ]] && BMAKE="$(get_bmake)" - - # STRIP= will replace the default value of -s, leaving to portage the - # task of stripping executables. - ${BMAKE} ${mymakeopts} NO_WERROR= STRIP= MANSUBDIR= DESTDIR="${D}" "$@" install -} - -# @FUNCTION: dummy_mk -# @USAGE: < dirnames > -# @DESCRIPTION: -# removes the specified subdirectories and creates a dummy makefile in them -# useful to remove the need for "minimal" patches -dummy_mk() { - for dir in $@; do - [ -d ${dir} ] || ewarn "dummy_mk called on a non-existing directory: $dir" - [ -f ${dir}/Makefile ] || ewarn "dummy_mk called on a directory without Makefile: $dir" - echo ".include <bsd.lib.mk>" > ${dir}/Makefile - done -} - -# @FUNCTION: bsdmk_src_compile -# @DESCRIPTION: -# The bsdmk src_compile function, which is exported -bsdmk_src_compile() { - mkmake "$@" || die "make failed" -} - -# @FUNCTION: bsdmk_src_install -# @DESCRIPTION: -# The bsdmk src_install function, which is exported -bsdmk_src_install() { - mkinstall "$@" || die "install failed" -} diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass deleted file mode 100644 index 8f6b204..0000000 --- a/eclass/freebsd.eclass +++ /dev/null @@ -1,327 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -# -# @MAINTAINER: -# maintainer-needed@gentoo.org -# @AUTHOR: -# Diego Pettenò <flameeyes@gentoo.org> - -inherit versionator eutils flag-o-matic bsdmk - -# Drop patch level from ${PV} -MY_PV=${PV/_p*} -PLEVEL=${PV##*_p} - -LICENSE="BSD" -HOMEPAGE="http://www.freebsd.org/" - -# Define global package names -LIB="freebsd-lib-${PV}" -BIN="freebsd-bin-${PV}" -CONTRIB="freebsd-contrib-${PV}" -SHARE="freebsd-share-${PV}" -UBIN="freebsd-ubin-${PV}" -USBIN="freebsd-usbin-${PV}" -CRYPTO="freebsd-crypto-${PV}" -LIBEXEC="freebsd-libexec-${PV}" -SBIN="freebsd-sbin-${PV}" -GNU="freebsd-gnu-${PV}" -ETC="freebsd-etc-${PV}" -SYS="freebsd-sys-${PV}" -INCLUDE="freebsd-include-${PV}" -RESCUE="freebsd-rescue-${PV}" -CDDL="freebsd-cddl-${PV}" -SECURE="freebsd-secure-${PV}" - -# Release version (5.3, 5.4, 6.0, etc) -RV="$(get_version_component_range 1-2 ${MY_PV})" - -# SVN ebuild support. -# 9.1.0.9999 --> release/9.1.0 -# 9.1.9999 --> releng/9.1 -# 9.9999 --> stable/9 -# 9999 --> head -# -# svn revision can be specified by patch level: -# freebsd-lib-9.9999_p247000 --> set svn -r 247000 - -if [[ ${MY_PV} == *9999* ]]; then - inherit subversion - - # Set SVN revision using patch level. - [[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}" - - case ${MY_PV%.9999} in - *.*.*) BRANCH="release";; - *.*) BRANCH="releng" ;; - 9999) BRANCH="head" ;; - *) BRANCH="stable" ;; - esac - - if [[ ${BRANCH} == head ]] ; then - SVN_SUB_URI="${BRANCH}" - else - SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}" - fi - - ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}" - ESVN_PROJECT="freebsd-${BRANCH}" -fi - -# use the original source code. -if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then - DL_PV=${MY_PV/_rc/-RC} - DL_PV=${DL_PV/_beta/-BETA} - DL_PV=${DL_PV/_alpha/-ALPHA} - if [[ ${DL_PV} == ${MY_PV} ]]; then - DL_PV="${DL_PV}-RELEASE" - fi - SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz" -fi - -IUSE="profile" - -#unalias -a -alias install-info='/usr/bin/bsdinstall-info' - -EXPORT_FUNCTIONS src_compile src_install src_unpack - -# doperiodic <kind> <file> ... -doperiodic() { - local kind=$1 - shift - - ( # dont want to pollute calling env - insinto /etc/periodic/${kind} - insopts -m 0755 - doins "$@" - ) -} - -freebsd_get_bmake() { - local bmake - bmake=$(get_bmake) - if version_is_at_least 11.0 ${RV} ; then - if [[ ${CBUILD} == *-freebsd* ]] ; then - bmake="${bmake} -m /usr/share/mk/system" - else - bmake="${bmake} -m /usr/share/mk/freebsd/system" - fi - else - [[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd" - fi - - echo "${bmake}" -} - -# Generates a patch SRC_URI or DISTDIR of upstream. -freebsd_upstream_patches() { - local opt=$1 - [[ ${#UPSTREAM_PATCHES[@]} -eq 0 ]] && return 1 - for x in "${UPSTREAM_PATCHES[@]}" - do - local out=${PN}-${x/\//-} - out=${out/:/} - if [[ ${opt} == -s ]] ; then - echo "${DISTDIR}/${out}" - else - echo "https://security.freebsd.org/patches/${x} -> ${out}" - fi - done -} - -freebsd_do_patches() { - if [[ ${#PATCHES[@]} -gt 1 ]] ; then - for x in "${PATCHES[@]}"; do - epatch "${x}" - done - else - for x in ${PATCHES} ; do - epatch "${x}" - done - fi - [[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] && epatch $(freebsd_upstream_patches -s) - epatch_user -} - -freebsd_rename_libraries() { - ebegin "Renaming libraries" - # We don't use libtermcap, we use libncurses - find "${S}" -name Makefile -print0 | xargs -0 \ - sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g' - # flex provides libfl, not libl - find "${S}" -name Makefile -print0 | xargs -0 \ - sed -i -e 's:-ll$:-lfl:g; s:-ll :-lfl :g; s:{LIBL}:{LIBFL}:g' - # ncurses provides libncursesw not libcursesw - find "${S}" -name Makefile -print0 | xargs -0 \ - sed -i -e 's:-lcursesw:-lncursesw:g' - # we use expat instead of bsdxml - find "${S}" -name Makefile -print0 | xargs -0 \ - sed -i -e 's:-lbsdxml:-lexpat:g' - - eend $? -} - -freebsd_src_unpack() { - if [[ ${MY_PV} == *9999* ]]; then - S="${WORKDIR}" subversion_src_unpack - - # When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0 - # Removed "${WORKDIR}"/share/mk/*.mk, use to force /usr/share/mk. - if [[ ${PN} != freebsd-mk-defs ]] ; then - [[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk/*.mk - fi - else - if version_is_at_least 10.0 ${RV} ; then - local tarball="freebsd-src-${MY_PV}.tar.xz" - local topdir="usr/src/" - local extractlist=() - for i in ${EXTRACTONLY} ; do - extractlist+=( ${topdir}${i} ) - done - ebegin "Unpacking parts of ${tarball} to ${WORKDIR}" - cd "${WORKDIR}" || die - tar -xJpf "${DISTDIR}/${tarball}" --strip-components=2 "${extractlist[@]}" 2> /dev/null || die "tar extract command failed" - cd - || die - else - for f in ${A} ; do - [[ ${f} == *.tar.* ]] && unpack ${f} - done - fi - fi - cd "${S}" - - dummy_mk ${REMOVE_SUBDIRS} - - freebsd_do_patches - if ! version_is_at_least 11.0 ${RV} ; then - freebsd_rename_libraries - fi - - # Starting from FreeBSD 9.2, its install command supports the -l option and - # they now use it. Emulate it if we are on a system that does not have it. - if version_is_at_least 9.2 ${RV} && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then - export INSTALL_LINK="ln -f" - export INSTALL_SYMLINK="ln -fs" - fi - if version_is_at_least 11.0 ${RV} ; then - export RSYMLINK=" -l s" - fi - - # When CC=clang, force use clang-cpp #478810, #595878 - if [[ $(tc-getCC) == *clang* ]] ; then - if type -P clang-cpp > /dev/null ; then - export CPP=clang-cpp - else - mkdir "${WORKDIR}"/workaround_clang-cpp || die "Could not create ${WORKDIR}/workaround_clang-cpp" - ln -s "$(type -P clang)" "${WORKDIR}"/workaround_clang-cpp/clang-cpp || die "Could not create clang-cpp symlink." - export CPP="${WORKDIR}/workaround_clang-cpp/clang-cpp" - fi - fi - - # Add a special CFLAGS required for multilib support. - use amd64-fbsd && export CFLAGS_x86_fbsd="${CFLAGS_x86_fbsd} -DCOMPAT_32BIT -B/usr/lib32 -L/usr/lib32" -} - -freebsd_src_compile() { - use profile && filter-flags "-fomit-frame-pointer" - if version_is_at_least 11.0 ${RV} ; then - if ! use profile ; then - mymakeopts="${mymakeopts} WITHOUT_PROFILE= " - fi - # Disable debugging info, use FEATURES=splitdebug instead. - mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " - # Test does not support yet. - mymakeopts="${mymakeopts} WITHOUT_TESTS= " - # Force set SRCTOP. - mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " - # Set common option. - mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " - else - use profile || mymakeopts="${mymakeopts} NO_PROFILE= " - mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " - fi - - mymakeopts="${mymakeopts} NO_FSCHG=" - - # Make sure to use FreeBSD definitions while crosscompiling - [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" - - # Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of - # tree builds easily. - if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then - mkmake obj || die - fi - - bsdmk_src_compile "$@" -} - -# Helper function to make a multilib build with FreeBSD Makefiles. -# Usage: -# MULTIBUILD_VARIANTS=( $(get_all_abis) ) -# multibuild_foreach_variant freebsd_multilib_multibuild_wrapper my_function -# -# Important note: To use this function you _have_ to: -# - inherit multilib.eclass and multibuild.eclass -# - set MULTIBUILD_VARIANTS - -freebsd_multilib_multibuild_wrapper() { - # Get the ABI from multibuild.eclass - # This assumes MULTIBUILD_VARIANTS contains only valid ABIs. - local ABI=${MULTIBUILD_VARIANT} - - # First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts. - for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do - export ${i}_SAVE="${!i}" - done - - # Setup the variables specific to this ABI. - multilib_toolchain_setup "${ABI}" - - local target="$(tc-arch-kernel ${CHOST})" - mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)" - if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then - mymakeopts="${mymakeopts} COMPAT_32BIT=" - fi - - einfo "Building for ABI=${ABI} and TARGET=${target}" - - export MAKEOBJDIRPREFIX="${BUILD_DIR}" - if [ ! -d "${MAKEOBJDIRPREFIX}" ] ; then - mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}." - fi - - CTARGET="${CHOST}" "$@" - - # Restore the variables now. - for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do - ii="${i}_SAVE" - export ${i}="${!ii}" - done -} - -freebsd_src_install() { - if version_is_at_least 11.0 ${RV} ; then - if ! use profile ; then - mymakeopts="${mymakeopts} WITHOUT_PROFILE= " - fi - # Disable debugging info, use FEATURES=splitdebug instead. - mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " - # Test does not support yet. - mymakeopts="${mymakeopts} WITHOUT_TESTS= " - # Force set SRCTOP. - mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " - # Set common option. - mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " - else - use profile || mymakeopts="${mymakeopts} NO_PROFILE= " - mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " - fi - - mymakeopts="${mymakeopts} NO_FSCHG=" - - [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" - - bsdmk_src_install "$@" -} diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest deleted file mode 100644 index bda3b4c..0000000 --- a/sys-freebsd/boot0/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX boot0-10.1-drop-unsupport-cflags.patch 893 SHA256 7d58c67b73ed6ae7326b03e7a4c1204d17808328de0ac904973604658bc1804c SHA512 c4d441c9538489585f27f292fa0acd921496cdd10e06a7de45f4db7f6a6300f41401a387c9e65bf909790e7755fb92001131d668c6246a2505756b8e9e10eeea WHIRLPOOL 9ce41efe802fc181fac9026eb310d3d48173df7db585f4ddb5424ced43f5e7081a8baefc12370588ba2979e0ef6234fa5718457e3e854f66c7d1309778d863f4 -AUX boot0-10.1-gcc46.patch 2180 SHA256 a664f792660fe1dc25b6e54a973ad6d8ac6c19ef309954f5bb7973b52832cc82 SHA512 a0633fe171c668b976277d26c3406d75ec5892cd6fe28845ea9faca03659689ad87fee6eeac5968b00026733e854bb0d2216e6f3987cf1ed9bcedb3bc2b210b6 WHIRLPOOL 2d5ba9602c93ab02aef29838478b578603b39e7d26dbf688e3fccd1cdd7e5fec3aec729db81b4548b69841ab330e8898eb445ee09d06ccd8500fb0f7387c3fc8 -AUX boot0-10.3-clang.patch 847 SHA256 6687fa92439ec0813a61221f5acfc6fe4588432c6660f9e6962437d2589f5a1c SHA512 74a64f9853dc28e5354d1d3d1a97c9543b6f80d48568d264874a23355c4bcab9e6a90a22630b2c7afea4b51c906db4745cb2773feaf42979a9192b8f995d7405 WHIRLPOOL 3a299ffc554ad91a763a974268978755dc7819a6e4c21736efca6df1c0e5a95b07184103724634af3eb634fb2da77abb40d6bfb493cb6effb7463abe2c339905 -AUX boot0-10.3-drop-unsupport-cflags.patch 971 SHA256 26a7aef66e0b436201698f0df262d8af50061da203f90e1bc8babd79815f62b9 SHA512 ca2d36c332515c0c7b89bae24213e5dd21065e7bdd689726e1777d4439dfc850918ad4312751cdc69a417f05724f484f14a8254895e673844245e69133b8cf46 WHIRLPOOL 6ff2f96c33857433ed3160241a7137aef9375d15533f7fd3db979ac8294ee28f21fc9e1c292450fac6a3dd515e86f5969b7b517d36636712ef921af5956faa0f -AUX boot0-10.3-uefi-support.patch 762 SHA256 5089401accfd622091253ec652b0e86edaf00021ec7372829bec56d08ba4d83c SHA512 6ff9b34969475f9580b364c6fca591901554107ac0eacb7e19888a05411fc4e9928ec632525dba30449678bb14f22cef23605ca5843370f882ca90bb1dc32a1a WHIRLPOOL cb83d397f0a1660b6ee0154b1c2d6e7807e2c6e61d92790e5be37233fa6f8bec3947f9c49d5046329486654a648e758f0e4d9f6d2ce7b2cf448c181059745281 -AUX boot0-11.0-gcc46.patch 481 SHA256 d05e22731b13b3eb12c75034c3f3d5ba74c1d842271ba1c81669698d0cfe1911 SHA512 114580260572d03ae145f38d9e7552e18d1d9eace430c102dbc73de055e453fdff9fd81e1ee6f4237d36b87800ff1da63b78ecdd17208ecf8969919fa245cf01 WHIRLPOOL a4a1620b892850f9affac443399901f52af2344539e251169d08d6b7db588a23db5ec3b4857992acda96b9893a7acde848a3171689eebf332fdbb1c9e18e858a -AUX boot0-11.0-uefi-support.patch 715 SHA256 ca983122c1a73575ce81cfad1c11378b60cdcb869dea4db4fafd387a38136086 SHA512 e6b4b48e5442ad4d948389aa4862484947fce5f15deedd6603cf5616054ccf9fa61a0c190443cdbe76502225a44da37675d1bccf49476ffedd633fe8128a2db6 WHIRLPOOL 0bf282dff86cd8cd59dbf42ad99aae10cf056260e356f4ac88392698107b4c26970c2028300c795ee28e91b8b5129b414e6c25d8f8587effac6cdf8ee56e6e65 -AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4 -AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1 -AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD boot0-11.0.ebuild 1862 SHA256 3247b5ca4135f21acf4710536c85389f5a76738da24ded110711678aaa4364a4 SHA512 fdb37a29b7916ff1f8912bb544ddb3e40cd95395a7b42e830adac5c9c8df21b3a5577d3b8baf6ecd74482c53bebd63ecf3d7bbec47923ffe9f7ef96cd23b2558 WHIRLPOOL dc761ab66f1b874dfee3fb458cc97ce0e98a35589fc9f45520edc1449b1ccb42b5e130e634f741d2e164217e34bfd4de1556cf87ea3a32a8ce0bc6bcffe48111 -MISC metadata.xml 385 SHA256 1b6dbb50d321102c9a48b5f6bce5825e88ce8dfcabd86892194b2fa10e540b11 SHA512 b65045bfb5e261f1a26102c00ff576065570701658bc643ded73761de269e72fb8843ce38231e92def5c7823720e1ec687b8cce575307097847d10dd35b8a808 WHIRLPOOL f073e698718e05e55026bad3888ce2809d2a0a7f4d0e4090e5c1fb16be55846e0bbf81c09748b76ea960a77e74b96678031c888852b8e4e259640d67386cc655 diff --git a/sys-freebsd/boot0/boot0-11.0.ebuild b/sys-freebsd/boot0/boot0-11.0.ebuild deleted file mode 100644 index d108508..0000000 --- a/sys-freebsd/boot0/boot0-11.0.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic toolchain-funcs - -DESCRIPTION="FreeBSD's bootloader" -SLOT="0" - -IUSE="bzip2 ieee1394 tftp zfs" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - sys/ - lib/ - contrib/bzip2/ -" - -RDEPEND="" -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-lib-${RV}*" - -S="${WORKDIR}/sys/boot" - -PATCHES=( "${FILESDIR}/${PN}-11.0-gcc46.patch" - "${FILESDIR}/${PN}-11.0-uefi-support.patch" - "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) - -boot0_use_enable() { - use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" - use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= " -} - -pkg_setup() { - boot0_use_enable ieee1394 FIREWIRE - boot0_use_enable zfs ZFS - boot0_use_enable tftp TFTP - boot0_use_enable bzip2 BZIP2 -} - -src_prepare() { - sed -e '/-mno-align-long-strings/d' \ - -i "${S}"/i386/boot2/Makefile \ - -i "${S}"/i386/gptboot/Makefile \ - -i "${S}"/i386/gptzfsboot/Makefile \ - -i "${S}"/i386/zfsboot/Makefile || die - - mymakeopts="${mymakeopts} LOADER_NO_GELI_SUPPORT=yes" - export MAKEOBJDIRPREFIX="${WORKDIR}/build" -} - -src_compile() { - strip-flags - append-flags "-fno-strict-aliasing" - - cd "${WORKDIR}/lib/libstand" || die - freebsd_src_compile - - CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" - LDFLAGS="${LDFLAGS} -L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand" - export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a" - - cd "${S}" || die - NOFLAGSTRIP="yes" freebsd_src_compile -} - -src_install() { - dodir /boot/defaults - freebsd_src_install FILESDIR=/boot - - cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die - insinto /boot - newins GENERIC.hints device.hints - - echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0 - doenvd "${T}"/50boot0 -} diff --git a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch deleted file mode 100644 index 4ab415b..0000000 --- a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile -index 76ed0ca..2d1d39d 100644 ---- a/sys/boot/efi/libefi/Makefile -+++ b/sys/boot/efi/libefi/Makefile -@@ -17,7 +17,4 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand - CFLAGS+= -I${.CURDIR}/../../common - - --# Suppress warning from clang for FreeBSD %b and %D formats --CFLAGS+= -fformat-extensions -- - .include <bsd.lib.mk> -diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile -index d714c74..a5cfa3c 100644 ---- a/sys/boot/i386/libi386/Makefile -+++ b/sys/boot/i386/libi386/Makefile -@@ -52,9 +52,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \ - # the location of libstand - CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ - --# Suppress warning from clang for FreeBSD %b and %D formats --CFLAGS+= -fformat-extensions -- - .if ${MACHINE_CPUARCH} == "amd64" - CLEANFILES+= machine - machine: diff --git a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch b/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch deleted file mode 100644 index 9b31e7c..0000000 --- a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc -index 472b275..0c9409d 100644 ---- a/sys/boot/i386/Makefile.inc -+++ b/sys/boot/i386/Makefile.inc -@@ -13,8 +13,6 @@ LDFLAGS+= -nostdlib - .if ${MACHINE_CPUARCH} == "amd64" - CFLAGS+= -m32 - ACFLAGS+= -m32 --# LD_FLAGS is passed directly to ${LD}, not via ${CC}: --LD_FLAGS+= -m elf_i386_fbsd - AFLAGS+= --32 - .endif - -diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile -index 428950e..6a15450 100644 ---- a/sys/boot/i386/boot2/Makefile -+++ b/sys/boot/i386/boot2/Makefile -@@ -113,3 +113,10 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.boot1.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build. -+CFLAGS+= -fno-asynchronous-unwind-tables -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LD_FLAGS+= -m elf_i386_fbsd -+.endif -diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile -index a90e712..d60ae00 100644 ---- a/sys/boot/i386/gptboot/Makefile -+++ b/sys/boot/i386/gptboot/Makefile -@@ -81,3 +81,8 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.gptldr.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LD_FLAGS+= -m elf_i386_fbsd -+.endif -+ -diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile -index 5eb2383..c10a917 100644 ---- a/sys/boot/i386/gptzfsboot/Makefile -+++ b/sys/boot/i386/gptzfsboot/Makefile -@@ -78,3 +78,8 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.gptldr.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LD_FLAGS+= -m elf_i386_fbsd -+.endif -+ -diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile -index 149f43a..be1e46a 100644 ---- a/sys/boot/i386/zfsboot/Makefile -+++ b/sys/boot/i386/zfsboot/Makefile -@@ -91,3 +91,8 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.zfsldr.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LD_FLAGS+= -m elf_i386_fbsd -+.endif -+ diff --git a/sys-freebsd/boot0/files/boot0-10.3-clang.patch b/sys-freebsd/boot0/files/boot0-10.3-clang.patch deleted file mode 100644 index 4245e21..0000000 --- a/sys-freebsd/boot0/files/boot0-10.3-clang.patch +++ /dev/null @@ -1,30 +0,0 @@ -Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=542676 - -https://svnweb.freebsd.org/base/head/sys/boot/i386/boot2/Makefile?r1=272249&r2=276479 - -diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile -index 8a6e771..c030853 100644 ---- a/sys/boot/i386/boot2/Makefile -+++ b/sys/boot/i386/boot2/Makefile -@@ -22,8 +22,7 @@ BOOT2_UFS?= UFS1_AND_UFS2 - #BOOT2_UFS?= UFS2_ONLY - #BOOT2_UFS?= UFS1_ONLY - --CFLAGS= -Os \ -- -fomit-frame-pointer \ -+CFLAGS= -fomit-frame-pointer \ - -mrtd \ - -mregparm=3 \ - -DUSE_XREAD \ -@@ -40,7 +39,10 @@ CFLAGS= -Os \ - -Winline \ - ${CLANG_OPT_SMALL} - --CFLAGS.gcc+= -fno-guess-branch-probability \ -+CFLAGS.clang+= -Oz -+ -+CFLAGS.gcc+= -Os \ -+ -fno-guess-branch-probability \ - -fno-unit-at-a-time \ - --param max-inline-insns-single=100 - .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201 diff --git a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch deleted file mode 100644 index af1d351..0000000 --- a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile -index fc66e01..470453d 100644 ---- a/sys/boot/efi/libefi/Makefile -+++ b/sys/boot/efi/libefi/Makefile -@@ -17,9 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand - # Pick up the bootstrap header for some interface items - CFLAGS+= -I${.CURDIR}/../../common - -- --# Suppress warning from clang for FreeBSD %b and %D formats --CFLAGS+= -fformat-extensions - CFLAGS+= -DTERM_EMU - - .include <bsd.lib.mk> -diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile -index 24cc4c1..e5d2bae 100644 ---- a/sys/boot/i386/libi386/Makefile -+++ b/sys/boot/i386/libi386/Makefile -@@ -55,9 +55,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \ - # the location of libstand - CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ - --# Suppress warning from clang for FreeBSD %b and %D formats --CFLAGS+= -fformat-extensions -- - .if ${MACHINE_CPUARCH} == "amd64" - CLEANFILES+= machine - machine: diff --git a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch deleted file mode 100644 index fdafe74..0000000 --- a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/efi/Makefile b/efi/Makefile -index 30024e3..a33efb2 100644 ---- a/efi/Makefile -+++ b/efi/Makefile -@@ -2,15 +2,10 @@ - - .include <bsd.own.mk> - --# In-tree GCC does not support __attribute__((ms_abi)). --.if ${COMPILER_TYPE} != "gcc" -- - .if ${MACHINE_CPUARCH} == "amd64" - SUBDIR+= libefi loader boot1 - .endif - --.endif # ${COMPILER_TYPE} != "gcc" -- - .if ${MACHINE_CPUARCH} == "ia64" - SUBDIR+= libefi - .endif -diff --git a/efi/boot1/Makefile b/efi/boot1/Makefile -index 4ffdfda..8ec0e00 100644 ---- a/efi/boot1/Makefile -+++ b/efi/boot1/Makefile -@@ -64,7 +64,7 @@ LDFLAGS+= -Wl,-znocombreloc - # Add libstand for required string and memory functions for all platforms. - # - DPADD+= ${LIBSTAND} --LDADD+= -lstand -+LDADD+= ${LIBSTAND} - - DPADD+= ${LDSCRIPT} - diff --git a/sys-freebsd/boot0/files/boot0-11.0-gcc46.patch b/sys-freebsd/boot0/files/boot0-11.0-gcc46.patch deleted file mode 100644 index ec17d92..0000000 --- a/sys-freebsd/boot0/files/boot0-11.0-gcc46.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile -index ead9ad1..af5e021 100644 ---- a/sys/boot/i386/boot2/Makefile -+++ b/sys/boot/i386/boot2/Makefile -@@ -45,6 +45,9 @@ CFLAGS.gcc+= -Os \ - .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201 - CFLAGS.gcc+= -mno-align-long-strings - .endif -+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40600 -+CFLAGS.gcc+= -fno-asynchronous-unwind-tables -+.endif - - CFLAGS.clang+= -Oz ${CLANG_OPT_SMALL} - diff --git a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch b/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch deleted file mode 100644 index c7a69d6..0000000 --- a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile -index 79ee9a9..f7789f1 100644 ---- a/sys/boot/efi/Makefile -+++ b/sys/boot/efi/Makefile -@@ -4,7 +4,7 @@ - - # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer - # than 4.5 supports it. --.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500 -+.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 - - .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" - .if ${MK_FDT} != "no" -@@ -18,6 +18,6 @@ SUBDIR+= fdt - SUBDIR+= libefi loader boot1 - .endif - --.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500 -+.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 - - .include <bsd.subdir.mk> diff --git a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch deleted file mode 100644 index a3a33d5..0000000 --- a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile -index bb16ea3..7dedb49 100644 ---- a/sys/boot/i386/zfsboot/Makefile -+++ b/sys/boot/i386/zfsboot/Makefile -@@ -83,6 +83,8 @@ zfsboot.bin: zfsboot.out - zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} - -+drv.o: drv.c xreadorg.h -+ - zfsboot.o: zfsboot.s - - SRCS= zfsboot.c xreadorg.h diff --git a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch b/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch deleted file mode 100644 index ffd9f43..0000000 --- a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc -index f5faec7..a9cf593 100644 ---- a/sys/boot/i386/Makefile.inc -+++ b/sys/boot/i386/Makefile.inc -@@ -12,7 +12,6 @@ LDFLAGS+= -nostdlib - .if ${MACHINE_CPUARCH} == "amd64" - CFLAGS+= -m32 - ACFLAGS+= -m32 --LDFLAGS+= -m elf_i386_fbsd - AFLAGS+= --32 - .endif - -diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile -index 65815a5..61840dd 100644 ---- a/sys/boot/i386/boot2/Makefile -+++ b/sys/boot/i386/boot2/Makefile -@@ -109,3 +109,10 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.boot1.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build. -+CFLAGS+= -fno-asynchronous-unwind-tables -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LDFLAGS+= -m elf_i386_fbsd -+.endif -diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile -index e1a640a..29886cc 100644 ---- a/sys/boot/i386/gptboot/Makefile -+++ b/sys/boot/i386/gptboot/Makefile -@@ -78,3 +78,8 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.gptldr.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LDFLAGS+= -m elf_i386_fbsd -+.endif -+ -diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile -index a2b8fcc..107f531 100644 ---- a/sys/boot/i386/gptzfsboot/Makefile -+++ b/sys/boot/i386/gptzfsboot/Makefile -@@ -76,3 +76,8 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.gptldr.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LDFLAGS+= -m elf_i386_fbsd -+.endif -+ -diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile -index b2db778..252dc62 100644 ---- a/sys/boot/i386/zfsboot/Makefile -+++ b/sys/boot/i386/zfsboot/Makefile -@@ -89,3 +89,8 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.zfsldr.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LDFLAGS+= -m elf_i386_fbsd -+.endif -+ diff --git a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch b/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch deleted file mode 100644 index abc6a57..0000000 --- a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=511698 - -diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc -index e0039b9..533dea0 100644 ---- a/sys/boot/Makefile.inc -+++ b/sys/boot/Makefile.inc -@@ -1,3 +1,3 @@ - # $FreeBSD: release/10.0.0/sys/boot/Makefile.inc 188895 2009-02-21 15:04:31Z ru $ - --SSP_CFLAGS= -+SSP_CFLAGS= -fno-stack-protector diff --git a/sys-freebsd/boot0/metadata.xml b/sys-freebsd/boot0/metadata.xml deleted file mode 100644 index d9f0c83..0000000 --- a/sys-freebsd/boot0/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> - </maintainer> - <use> - <flag name="tftp">Enable PXE/TFTP boot support.</flag> - <flag name="zfs">Enable booting on ZFS filesystems.</flag> - </use> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest deleted file mode 100644 index 353f2b2..0000000 --- a/sys-freebsd/freebsd-bin/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-bin-11.0.ebuild 800 SHA256 ccc8ba3dce3c251ccf7fbc468b803d41414968012808a89baa85fdffdf374dbf SHA512 7a0e427a5621bf195544cfeed199bf93c2f5d42bce139d31c5477019c2ee9c8e9cd1bcea41cb5b3cb10f972db89f29f4868c5c7687062d85a3d51051f72fe5fb WHIRLPOOL 8f64ea4813d9db4b379a53a12222eaea8d1ff43a49a961a64e844bb30768029aec2b953b7c8afbbedd35451070b25322ff04dc0019524a2bbb3ffb6ee766aa53 -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild deleted file mode 100644 index d4bf7e3..0000000 --- a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD /bin tools" -SLOT="0" - -IUSE="" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - bin/ - usr.bin/ - sbin/ - lib/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - >=dev-libs/libedit-20120311.3.0-r1 - sys-libs/ncurses:0= - sys-apps/ed - !app-misc/realpath - !<sys-freebsd/freebsd-ubin-8" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - >=sys-devel/flex-2.5.31-r2" - -S=${WORKDIR}/bin - -# csh and tcsh are provided by tcsh package, rmail is sendmail stuff. -REMOVE_SUBDIRS="csh rmail ed freebsd-version" - -pkg_setup() { - mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= " -} diff --git a/sys-freebsd/freebsd-bin/metadata.xml b/sys-freebsd/freebsd-bin/metadata.xml deleted file mode 100644 index a00f3ae..0000000 --- a/sys-freebsd/freebsd-bin/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> -</maintainer> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest deleted file mode 100644 index 55d9aa4..0000000 --- a/sys-freebsd/freebsd-cddl/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX freebsd-cddl-10.2-libpaths.patch 9569 SHA256 80350e3493fd667840555d06e453769e02604da8362d6e76280573a30dd9185b SHA512 615caa713eee62030a9f4630578f8f7ae8c4a2df71307237083115e2226734646ba1923f5de46aaf1523ffaa6b4c83b5fc64ceee552b15cb0244583408736ed4 WHIRLPOOL 3fd3f8d42057ab01965b4314f4565009076ea54da83401efdedd838299cf554092717d7795ba7a4dca22420c993d521411021dc4f521a273af4ff894bb938353 -AUX freebsd-cddl-10.3-underlink.patch 437 SHA256 ac486d44bf8ed4dd1b30d6200c59446e552e9e21f30535077533a080a28280ef SHA512 9ef6768be960a0c08cef094ba220e045b434aef6cfdb0be4631a63ea0b233158e927ca32c4f1d47a2f9a1e4a568f3850e61f56dcab35bd26cf1cea49035240fd WHIRLPOOL 8d5de341ceeca0e4a6c22b3bde9ddfdd611b1508344e837d34b926a3f8ac411a9daebaf30198fb323197d0860f102dc5b76172b7213a4cd4d41e623b79111393 -AUX freebsd-cddl-11.0-add-libs.patch 3401 SHA256 d722c667769b403a0b1485d7df23e6b37a5406c2ed3c9b09959e7f0ac1851b19 SHA512 7a3da3a57bde26a79784dcb023961ed0a292da4945c49e07c4a69035fe6cd0773e09cec25eab638a64c6ccc54bb775c169b1553743f7a9b4af60ce49f1fee54c WHIRLPOOL aae94c0c23568359c135db4f3f2745280292fc337c3bf03516182ef38b920b4344049fe260a71d6769f3ecd8b53d7497361e768b7d67fdab3eba126128051cad -AUX freebsd-cddl-11.0-workaround.patch 576 SHA256 38f7af5e9560ead4ea3cae3a756b73a3d605e7053c944b4ed8abc0a0c9788723 SHA512 0a2280caeb23622454351657d61e8e465c597b82bf49cb534a924758844cd7da2df330434ba6282e159d9bc2e6ade27c2a9db41980ada6370bcab59c6a57da22 WHIRLPOOL 8a6afdbb8f5243822e6040d07af966a45c21c52bb0e916aea2b1be03b3ff6cfec40da5c3b0268881abbf6b2edc8b43bf005fca81714461567a0e6edc15178073 -AUX freebsd-cddl-8.0-libpaths.patch 4418 SHA256 3fa5555254ae38a0e6d4e1385e2dd2b4ea0f84ae326f3941c69726cdcbe3a05c SHA512 dac14bcac23d16ee8acc7a3adfe7de896f6595d98dd3d0c93e39205aa5bdf1a0fc35adf338e05df66b18186da4b10f578cfe2d084b446aeb84eb49d07f5736d5 WHIRLPOOL 0ed3869833b9606ce325b30874f01106c2d288c6bff703398f63abe00602c6d3adf1d2faf2dc629a220dcfeb4c3d819f672875ce3b7bb4ab969977b5ce6920fd -AUX freebsd-cddl-8.2-libpaths.patch 822 SHA256 f6884f9c471f2d1bf522c26b2f2607e9506d7fea9612c24b4392f1e861a1a5db SHA512 1d335eb70592436941b093c76ad2e7573cb317333f81b11be7a2ef9cc0b3e57e21d797bf43c5ac9154d9817aa136851640f2b7b67bdd66b8abde7a589fd9f567 WHIRLPOOL 3ecdb9ea5050d4309b2561dd37082982450180e6eb8b77373ca3949f62ccd7719e5178a3c3a61346b2820fa827e0bc13075d2266d5500a5f80d8efab16adb414 -AUX freebsd-cddl-9.0-bsdxml.patch 1419 SHA256 0a5c5f5b242e17d0a378778ec39ff43d410e1efed144dd14a46cbd2cf4a44542 SHA512 8ea86f6918b2629c33286c2396226bb4944e373069a423104d96f65e387162e0da94707458fd5caebcab08b9305b435ac66f4207aa6b15ce9571a5fa5878f3c5 WHIRLPOOL 5af01d3ba6e1e4a038de1f3274bf3bd241264db05b021fa374c5a56c805901320a4c30c2234013902eb2f5ca879a4972d3468e0157315dd98e73ce1ee4359e0a -AUX freebsd-cddl-9.0-libpaths.patch 7621 SHA256 392593d858b1cbd6c5d6a6da25d9fda48f412d4eb75c0dfeba20cd9e8ad6d762 SHA512 87e56647a41262363900ab4ecc6aabd1b4ba4f0d7d5b5011dc2eb9ec312c640bed5aa931495f208110277b2baf6c3625d20d59e62c19a70e7625a6b36b61a278 WHIRLPOOL 1f6798ac319bba9dedb0a0776e09cbce01637e057e38f77d59410c942f68c7051b7ccc10bfed748b72eeabf9254bc52262b5c9cc3fa3a4187f8698ede2d27d4f -AUX freebsd-cddl-9.0-underlink.patch 755 SHA256 12d2dbbbb19c7b4920d84d01c48b6cc331b8a244eaaabe72081c7a5c6ff2300c SHA512 002c9e6a389140455f9a698dbe47197d795d36ff08e4e5fb096d38525b8cf017672de7f511b2495fdea6f536e07a426e299e0a056cbdd8dae64677299376d2f9 WHIRLPOOL c6403e8e56f2c2e9d67387137eab77eae0f6e1a8c4c4d595c1950ee3ab3bff8d0d8a0f15ca83a7b65aa05d35dafa86ff75ff8fec7ce8f320a2e1d44be38c0995 -AUX freebsd-cddl-9.2-libpaths.patch 9212 SHA256 bf53fe0918b5746e269fadf1c1a4986a8f0b41584967f4384f462537663d1f16 SHA512 4920d1002ff2c67f99c112a4a4bf9b0fb6a8e7bab2577d4a7ef4e13d34c8d8c3187d000cd5a86f75edf143393f7a6dc1dfb359255a071b7965be7cb0f0a5f1e5 WHIRLPOOL b77361c90eacaa3f9e2ffb0da699e6bfc7a929eb1da7fa5f43e1c290a4f0a225e32769b23bc184ba744dfc9296fc4481775fef99a237d88682696e6280197643 -AUX zfs.initd 375 SHA256 4d87977d430ba846a0b1c8ef383838891d93b40480d4a2816c94902b0cbe274d SHA512 b70d0c2e6214bb09e1258548f3bbca09aeade26550e27a212d53691d5d5778d3ced78402449612ca753f44e04863382692d12a4777c4e451f9b25a18e34fa221 WHIRLPOOL 7b906d372fcc064ba0780fcbb71c2ce3e734531fbf17679b5d695b851586274df06cf8a99a71b08e544d23f4e27f66765eb0d6e63199d4911abe64ba70f2e5b5 -AUX zvol.initd 845 SHA256 70f237d969b5e539ad1c83fa49b0e5e85d4e2f588e97c1f2e65161edc9c93484 SHA512 18b706cd611858299228a7b74314149fc9a30351f03695accea8a0afbae164acfd8b10df4018b8103273adea1b6e764ca52e0ee3cb07d8f3ff8952b16201edb0 WHIRLPOOL 430d429b43c7be432133859dcd12820362ea03ea4a28a3f335230d66873bcc1658dcbb62e779942de06e7e8a987be30fc968194f31d5431f3b0e3e609509e79a -AUX zvol.initd-9.0 819 SHA256 42d8b9a3eed04273e1638e0e7f7aa1f3b939e925c068260ef11a760fc61b5afb SHA512 1d59d5001ecb0ab4416f4bea8e2f4ff2c7ca19891d23b2a24cd1f389ca66f7cbe3a12bf913633dd90c013b730301dd704c072b94e5d95f7724203d3810314c70 WHIRLPOOL bdb6f1da1c420a254fb12776c0af378619b98c030c0830bcb3fcf2ee6eabf3e89576079d1a31a797e311e9b98d45dfcdf0ea22bddfe7ebc0a1936016474a469b -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-cddl-11.0.ebuild 1708 SHA256 5639b9aa8083c825eb2e8df97f336dbfde36094072b820363af4f2d5d1bf6d9a SHA512 82579abdd555463b191143c210e57c3db4c179dfaa6365b07632f5f92e9db82ba01f6f7148ca369d4ce84a263293783219c67f7073a6d61166d054c6e8f49f04 WHIRLPOOL 549801fee4dc1270e854dd8029b17f5739670c9fbe716ce041da08e7232b1c9d390ec3ee2d3ee058999a9e7735dba364dc6991ec33c681653fd3ef4ddc73cfee -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch deleted file mode 100644 index 9af7cfb..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch +++ /dev/null @@ -1,220 +0,0 @@ -diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile -index d8bcccb..2cebbcb 100644 ---- a/cddl/lib/libzfs/Makefile -+++ b/cddl/lib/libzfs/Makefile -@@ -59,6 +59,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common - -diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile -index 262d3e9..9643210 100644 ---- a/cddl/lib/libzfs_core/Makefile -+++ b/cddl/lib/libzfs_core/Makefile -@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+ - .include <bsd.lib.mk> -diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile -index 83cefca..55c56d5 100644 ---- a/cddl/lib/libzpool/Makefile -+++ b/cddl/lib/libzpool/Makefile -@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread - CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+ - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \ - ${LIBAVL} ${LIBUMEM} - LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem -diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile -index 1f909aa..2590302 100644 ---- a/cddl/sbin/zfs/Makefile -+++ b/cddl/sbin/zfs/Makefile -@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \ - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} - LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs -diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile -index 4b5b898..f89d010 100644 ---- a/cddl/sbin/zpool/Makefile -+++ b/cddl/sbin/zpool/Makefile -@@ -27,6 +27,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} - LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs -diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile -index 6cb9529..e76fbc4 100644 ---- a/cddl/usr.bin/ctfconvert/Makefile -+++ b/cddl/usr.bin/ctfconvert/Makefile -@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile -index 673c7e3..5fff940 100644 ---- a/cddl/usr.bin/ctfmerge/Makefile -+++ b/cddl/usr.bin/ctfmerge/Makefile -@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile -index b6605cb..7028630 100644 ---- a/cddl/usr.bin/zinject/Makefile -+++ b/cddl/usr.bin/zinject/Makefile -@@ -21,6 +21,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ - ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool -diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile -index 888b9af..523ba44 100644 ---- a/cddl/usr.bin/zstreamdump/Makefile -+++ b/cddl/usr.bin/zstreamdump/Makefile -@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl -diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile -index f6f7e03..6fed691 100644 ---- a/cddl/usr.bin/ztest/Makefile -+++ b/cddl/usr.bin/ztest/Makefile -@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL} - LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \ -diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile -index fb5729f..ea9a752 100644 ---- a/cddl/usr.sbin/dtrace/Makefile -+++ b/cddl/usr.sbin/dtrace/Makefile -@@ -25,4 +25,7 @@ DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ - LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \ - -lrtld_db - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - .include <bsd.prog.mk> -diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile -index ccd8189..827a197 100644 ---- a/cddl/usr.sbin/lockstat/Makefile -+++ b/cddl/usr.sbin/lockstat/Makefile -@@ -20,6 +20,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - - CFLAGS+= -DNEED_ERRLOC -g - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - #YFLAGS+= -d - - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ -diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile -index c2a6b1d..f411fc0 100644 ---- a/cddl/usr.sbin/zdb/Makefile -+++ b/cddl/usr.sbin/zdb/Makefile -@@ -24,6 +24,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool -diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile -index 1957aad..9a5570a 100644 ---- a/cddl/usr.sbin/zhack/Makefile -+++ b/cddl/usr.sbin/zhack/Makefile -@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch deleted file mode 100644 index c8ce8e1..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile -index 2a66337..04988d7 100644 ---- a/cddl/lib/libzfs/Makefile -+++ b/cddl/lib/libzfs/Makefile -@@ -12,6 +12,7 @@ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ - - LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \ - -lbsdxml -lgeom -lnvpair -lz -lzfs_core -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl - - SRCS= deviceid.c \ - fsshare.c \ diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch deleted file mode 100644 index 46f2521..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile -index 1e386e5..a4c08ee 100644 ---- a/cddl/sbin/zfs/Makefile -+++ b/cddl/sbin/zfs/Makefile -@@ -22,6 +22,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - --LIBADD= jail nvpair uutil zfs_core zfs -+LIBADD= jail nvpair uutil zfs_core zfs umem avl - - .include <bsd.prog.mk> -diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile -index ebf0f90..c70a3c4 100644 ---- a/cddl/sbin/zpool/Makefile -+++ b/cddl/sbin/zpool/Makefile -@@ -27,6 +27,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common - --LIBADD= geom nvpair uutil zfs -+LIBADD= geom nvpair uutil zfs umem avl zfs_core - - .include <bsd.prog.mk> -diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile -index fc68904..9af6ff2 100644 ---- a/cddl/usr.sbin/lockstat/Makefile -+++ b/cddl/usr.sbin/lockstat/Makefile -@@ -21,6 +21,6 @@ CFLAGS+= -DNEED_ERRLOC -g - - #YFLAGS+= -d - --LIBADD= elf dtrace rt -+LIBADD= elf dtrace rt ctf - - .include <bsd.prog.mk> -diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile -index 77b6139..7737efd 100644 ---- a/cddl/usr.sbin/plockstat/Makefile -+++ b/cddl/usr.sbin/plockstat/Makefile -@@ -18,6 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/lib/libdtrace \ - -I${.CURDIR}/../../../sys - --LIBADD= dtrace proc -+LIBADD= dtrace proc ctf - - .include <bsd.prog.mk> -diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile -index 3609502..71526f7 100644 ---- a/cddl/usr.sbin/zdb/Makefile -+++ b/cddl/usr.sbin/zdb/Makefile -@@ -24,7 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - --LIBADD= nvpair umem uutil zfs zpool -+LIBADD= nvpair umem uutil zfs zpool avl zfs_core - - # Since there are many asserts in this program, it makes no sense to compile - # it without debugging. -diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common -index a545609..034d418 100644 ---- a/cddl/usr.sbin/zfsd/Makefile.common -+++ b/cddl/usr.sbin/zfsd/Makefile.common -@@ -35,7 +35,7 @@ CXXFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} - - DPADD= ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \ - ${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL} --LIBADD= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil -+LIBADD= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil umem avl - - cscope: - find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \ -diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile -index 02c51ac..d9b79a9 100644 ---- a/cddl/usr.sbin/zhack/Makefile -+++ b/cddl/usr.sbin/zhack/Makefile -@@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - --LIBADD= nvpair zfs zpool -+LIBADD= nvpair zfs zpool umem uutil avl zfs_core - - CFLAGS+= -DDEBUG=1 - #DEBUG_FLAGS+= -g diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch deleted file mode 100644 index 839b6b5..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common -index 6c71bdf..6b71908 100644 ---- a/cddl/usr.sbin/zfsd/Makefile.common -+++ b/cddl/usr.sbin/zfsd/Makefile.common -@@ -31,6 +31,7 @@ INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs - INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys - - CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} -+CXXFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} - - DPADD= ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \ - ${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL} diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch deleted file mode 100644 index ad5c83e..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -ru cddl.orig/lib/libctf/Makefile cddl/lib/libctf/Makefile ---- cddl.orig/lib/libctf/Makefile 2009-01-24 03:36:33 -0200 -+++ cddl/lib/libctf/Makefile 2009-01-24 03:55:10 -0200 -@@ -4,6 +4,7 @@ - - LIB= ctf - SHLIB_MAJOR= 2 -+LDADD+=-lz - - SRCS= ctf_create.c \ - ctf_decl.c \ -diff -ru cddl.orig/lib/libdtrace/Makefile cddl/lib/libdtrace/Makefile ---- cddl.orig/lib/libdtrace/Makefile 2009-01-24 00:18:47 -0200 -+++ cddl/lib/libdtrace/Makefile 2009-01-24 03:31:06 -0200 -@@ -74,7 +74,7 @@ - .endif - - LFLAGS+=-l -- -+LDADD+=-lz -lproc - YFLAGS+=-d - - CLEANFILES= dt_errtags.c dt_names.c -diff -ru cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile ---- cddl.orig/lib/libzfs/Makefile 2008-06-22 10:26:18 -0300 -+++ cddl/lib/libzfs/Makefile 2008-06-22 10:26:26 -0300 -@@ -7,7 +7,8 @@ - - LIB= zfs - DPADD= ${LIBUTIL} --LDADD= -lutil -+LDADD= -lutil -lgeom -lm -luutil -lumem -+LDFLAGS+= -L${.CURDIR}/../libuutil -L${.CURDIR}/../libumem - - SRCS= deviceid.c \ - mnttab.c \ -diff -ru cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile ---- cddl.orig/lib/libzpool/Makefile 2008-06-22 10:35:15 -0300 -+++ cddl/lib/libzpool/Makefile 2008-06-22 10:37:06 -0300 -@@ -42,7 +42,8 @@ - CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair - - DPADD= ${LIBPTHREAD} ${LIBZ} --LDADD= -lpthread -lz -+LDADD= -lpthread -lz -lavl -lumem -+LDFLAGS+= -L${.CURDIR}/../libavl -L${.CURDIR}/../libumem - - # atomic.S doesn't like profiling. - NO_PROFILE= -diff -ru cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile ---- cddl.orig/sbin/zfs/Makefile 2008-06-22 10:02:30 -0300 -+++ cddl/sbin/zfs/Makefile 2008-06-22 10:14:23 -0300 -@@ -23,5 +23,7 @@ - ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} - LDADD= -lzfs -lgeom -lbsdxml -lsbuf \ - -lm -lnvpair -luutil -lutil -+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libnvpair \ -+ -L${.CURDIR}/../../lib/libuutil -L/lib -L/usr/lib - - .include <bsd.prog.mk> -diff -ru cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile ---- cddl.orig/sbin/zpool/Makefile 2008-06-22 10:02:30 -0300 -+++ cddl/sbin/zpool/Makefile 2008-06-22 10:14:47 -0300 -@@ -23,5 +23,7 @@ - ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} - LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \ - -lm -lnvpair -luutil -lutil -+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib \ -+ -L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libuutil - - .include <bsd.prog.mk> -diff -ru cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile ---- cddl.orig/usr.bin/ztest/Makefile 2008-06-22 10:02:30 -0300 -+++ cddl/usr.bin/ztest/Makefile 2008-06-22 10:12:40 -0300 -@@ -18,5 +18,7 @@ - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl -+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \ -+ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib - - .include <bsd.prog.mk> -diff -ru cddl.orig/usr.bin/Makefile.inc cddl/usr.bin/Makefile.inc ---- cddl.orig/usr.bin/Makefile.inc 2009-01-10 07:21:10 +0000 -+++ cddl/usr.bin/Makefile.inc 2009-01-10 07:18:55 +0000 -@@ -1,5 +1,6 @@ - # $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $ - - BINDIR?= /usr/bin -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf - - .include "../Makefile.inc" ---- cddl.orig/usr.sbin/zdb/Makefile 2010-03-11 13:19:48 +0100 -+++ cddl/usr.sbin/zdb/Makefile 2010-03-11 13:20:08 +0100 -@@ -22,6 +22,8 @@ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} - LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool -+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \ -+ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libuutil -L${.CURDIR}/../../lib/libzfs - - CSTD= c99 - ---- cddl.orig/usr.bin/zinject/Makefile 2010-03-11 13:30:32 +0100 -+++ cddl/usr.bin/zinject/Makefile 2010-03-11 13:33:27 +0100 -@@ -21,5 +21,8 @@ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ - ${LIBZFS} ${LIBZPOOL} ${LIBUUTIL} - LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libnvpair \ -+ -L${.CURDIR}/../../lib/libumem -L${.CURDIR}/../../lib/libuutil \ -+ -L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libzpool - - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch deleted file mode 100644 index a0e5677..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- cddl/usr.sbin/dtrace/Makefile.old 2011-07-06 00:09:01.000000000 +0000 -+++ cddl/usr.sbin/dtrace/Makefile 2011-07-06 00:09:48.000000000 +0000 -@@ -24,6 +24,8 @@ - #CFLAGS+= -DNEED_ERRLOC - #YFLAGS+= -d - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB} - LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \ ---- cddl/usr.sbin/lockstat/Makefile.old 2011-07-06 00:10:33.000000000 +0000 -+++ cddl/usr.sbin/lockstat/Makefile 2011-07-06 00:10:57.000000000 +0000 -@@ -23,6 +23,8 @@ - - CFLAGS+= -DNEED_ERRLOC -g - -+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf -+ - #YFLAGS+= -d - - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch deleted file mode 100644 index b3d95bb..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur cddl.old/sbin/zfs/Makefile cddl/sbin/zfs/Makefile ---- cddl.old/sbin/zfs/Makefile 2011-11-04 10:01:46.000000000 +0000 -+++ cddl/sbin/zfs/Makefile 2011-11-04 10:07:15.000000000 +0000 -@@ -21,8 +21,8 @@ - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - --DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ -+DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} --LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs -+LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs - - .include <bsd.prog.mk> -diff -ur cddl.old/sbin/zpool/Makefile cddl/sbin/zpool/Makefile ---- cddl.old/sbin/zpool/Makefile 2011-11-04 10:01:46.000000000 +0000 -+++ cddl/sbin/zpool/Makefile 2011-11-04 10:06:38.000000000 +0000 -@@ -26,8 +26,8 @@ - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common - --DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ -+DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} --LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs -+LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs - - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch deleted file mode 100644 index c81a2c3..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff -upNr a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile ---- a/cddl/lib/libzfs/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/lib/libzfs/Makefile 2012-03-30 19:04:39.904906253 +0000 -@@ -54,4 +54,8 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/cont - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+ - .include <bsd.lib.mk> -diff -upNr a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile ---- a/cddl/lib/libzpool/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/lib/libzpool/Makefile 2012-03-30 19:04:55.839233753 +0000 -@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpt - CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+ - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} - LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl - -diff -upNr a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile ---- a/cddl/sbin/zfs/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/sbin/zfs/Makefile 2012-03-30 19:05:11.094859502 +0000 -@@ -21,6 +21,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} - LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs -diff -upNr a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile ---- a/cddl/sbin/zpool/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/sbin/zpool/Makefile 2012-03-30 19:05:24.830721002 +0000 -@@ -26,6 +26,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} - LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs -diff -upNr a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile ---- a/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 19:05:49.454897012 +0000 -@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff -upNr a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile ---- a/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 19:06:08.084858412 +0000 -@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff -upNr a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile ---- a/cddl/usr.bin/zinject/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/usr.bin/zinject/Makefile 2012-03-30 19:06:25.084865592 +0000 -@@ -19,6 +19,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ - ${LIBZFS} ${LIBZPOOL} - LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool -diff -upNr a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile ---- a/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 19:06:44.544860132 +0000 -@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl -diff -upNr a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile ---- a/cddl/usr.bin/ztest/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/usr.bin/ztest/Makefile 2012-03-30 19:06:58.344895642 +0000 -@@ -17,6 +17,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl -diff -upNr a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile ---- a/cddl/usr.sbin/zdb/Makefile 2012-03-30 18:58:53.164736000 +0000 -+++ b/cddl/usr.sbin/zdb/Makefile 2012-03-30 19:07:17.454861002 +0000 -@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} - LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool ---- a/cddl/usr.sbin/dtrace/Makefile.old 2011-07-06 00:09:01.000000000 +0000 -+++ b/cddl/usr.sbin/dtrace/Makefile 2011-07-06 00:09:48.000000000 +0000 -@@ -24,6 +24,8 @@ - #CFLAGS+= -DNEED_ERRLOC - #YFLAGS+= -d - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB} - LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \ ---- a/cddl/usr.sbin/lockstat/Makefile.old 2011-07-06 00:10:33.000000000 +0000 -+++ b/cddl/usr.sbin/lockstat/Makefile 2011-07-06 00:10:57.000000000 +0000 -@@ -23,6 +23,8 @@ - - CFLAGS+= -DNEED_ERRLOC -g - -+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf -+ - #YFLAGS+= -d - - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch deleted file mode 100644 index ff87d2c..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- cddl/lib/libzfs/Makefile.old 2011-11-04 10:27:30.000000000 +0000 -+++ cddl/lib/libzfs/Makefile 2011-11-04 10:28:59.000000000 +0000 -@@ -7,7 +7,7 @@ - - LIB= zfs - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} --LDADD= -lmd -lpthread -lumem -lutil -+LDADD= -lmd -lpthread -lumem -lutil -luutil -lnvpair -lm -lgeom - - SRCS= deviceid.c \ - fsshare.c \ ---- cddl/lib/libzpool/Makefile.old 2011-11-04 18:22:28.000000000 +0000 -+++ cddl/lib/libzpool/Makefile 2011-11-04 18:24:01.000000000 +0000 -@@ -57,7 +57,7 @@ - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include - - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} --LDADD= -lmd -lpthread -lz -+LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl - - # atomic.S doesn't like profiling. - NO_PROFILE= diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch deleted file mode 100644 index 36eb570..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch +++ /dev/null @@ -1,220 +0,0 @@ -diff --git a/lib/libzfs/Makefile b/lib/libzfs/Makefile -index 5b6b47d..c8549b4 100644 ---- a/lib/libzfs/Makefile -+++ b/lib/libzfs/Makefile -@@ -55,6 +55,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common - -diff --git a/lib/libzfs_core/Makefile b/lib/libzfs_core/Makefile -index a470fbc..ae8c649 100644 ---- a/lib/libzfs_core/Makefile -+++ b/lib/libzfs_core/Makefile -@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+ - .include <bsd.lib.mk> -diff --git a/lib/libzpool/Makefile b/lib/libzpool/Makefile -index 417c1cc..838cdb5 100644 ---- a/lib/libzpool/Makefile -+++ b/lib/libzpool/Makefile -@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread - CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+ - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} - LDADD= -lmd -lpthread -lz - -diff --git a/sbin/zfs/Makefile b/sbin/zfs/Makefile -index a49d278..b22442e 100644 ---- a/sbin/zfs/Makefile -+++ b/sbin/zfs/Makefile -@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \ - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} - LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs -diff --git a/sbin/zpool/Makefile b/sbin/zpool/Makefile -index 1884d24..5f06d5f 100644 ---- a/sbin/zpool/Makefile -+++ b/sbin/zpool/Makefile -@@ -26,6 +26,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} - LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs -diff --git a/usr.bin/ctfconvert/Makefile b/usr.bin/ctfconvert/Makefile -index 7e4a05a..72327ad 100644 ---- a/usr.bin/ctfconvert/Makefile -+++ b/usr.bin/ctfconvert/Makefile -@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff --git a/usr.bin/ctfmerge/Makefile b/usr.bin/ctfmerge/Makefile -index ba4840e..845d28c 100644 ---- a/usr.bin/ctfmerge/Makefile -+++ b/usr.bin/ctfmerge/Makefile -@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff --git a/usr.bin/zinject/Makefile b/usr.bin/zinject/Makefile -index 8c5c141..3db2b29 100644 ---- a/usr.bin/zinject/Makefile -+++ b/usr.bin/zinject/Makefile -@@ -19,6 +19,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ - ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool -diff --git a/usr.bin/zstreamdump/Makefile b/usr.bin/zstreamdump/Makefile -index 304ff7c..5f0b00e 100644 ---- a/usr.bin/zstreamdump/Makefile -+++ b/usr.bin/zstreamdump/Makefile -@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl -diff --git a/usr.bin/ztest/Makefile b/usr.bin/ztest/Makefile -index 965300e..ad40a92 100644 ---- a/usr.bin/ztest/Makefile -+++ b/usr.bin/ztest/Makefile -@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL} - LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \ -diff --git a/usr.sbin/dtrace/Makefile b/usr.sbin/dtrace/Makefile -index 3930f01..4bdbd1a 100644 ---- a/usr.sbin/dtrace/Makefile -+++ b/usr.sbin/dtrace/Makefile -@@ -25,4 +25,7 @@ DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \ - -lrtld_db - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - .include <bsd.prog.mk> -diff --git a/usr.sbin/lockstat/Makefile b/usr.sbin/lockstat/Makefile -index 70515ef..d65e4c3 100644 ---- a/usr.sbin/lockstat/Makefile -+++ b/usr.sbin/lockstat/Makefile -@@ -20,6 +20,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - - CFLAGS+= -DNEED_ERRLOC -g - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - #YFLAGS+= -d - - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ -diff --git a/usr.sbin/zdb/Makefile b/usr.sbin/zdb/Makefile -index 8068385..337e324 100644 ---- a/usr.sbin/zdb/Makefile -+++ b/usr.sbin/zdb/Makefile -@@ -23,6 +23,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool -diff --git a/usr.sbin/zhack/Makefile b/usr.sbin/zhack/Makefile -index f09d2d8..fc3d7a4 100644 ---- a/usr.sbin/zhack/Makefile -+++ b/usr.sbin/zhack/Makefile -@@ -22,6 +22,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool diff --git a/sys-freebsd/freebsd-cddl/files/zfs.initd b/sys-freebsd/freebsd-cddl/files/zfs.initd deleted file mode 100644 index 7daf445..0000000 --- a/sys-freebsd/freebsd-cddl/files/zfs.initd +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need hostid - before fsck -} - -start() { - einfo "Starting zfs ..." - zfs mount -a - zfs share -a - if [ ! -r /etc/zfs/exports ]; then - touch /etc/zfs/exports - fi -} - -stop() { - einfo "Stopping zfs ..." - zfs unshare -a - zfs unmount -a -} diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd b/sys-freebsd/freebsd-cddl/files/zvol.initd deleted file mode 100644 index 0f9fcb9..0000000 --- a/sys-freebsd/freebsd-cddl/files/zvol.initd +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need hostid - before fsck -} - -start() { - einfo "Starting zfs volumes..." - zfs volinit - eend $? - # Enable swap on ZVOLs that have org.freebsd:swap=on. - zfs list -H -o org.freebsd:swap,name -t volume | \ - while read state name; do - case "${state}" in - [oO][nN]) - einfo "Enabling swap on zvol ${name}" - swapon /dev/zvol/${name} - eend $? - ;; - esac - done -} - -stop() { - # Disable what we had enabled before. - zfs list -H -o org.freebsd:swap,name -t volume | \ - while read state name; do - case "${state}" in - [oO][nN]) - einfo "Disabling swap on zvol ${name}" - swapoff /dev/zvol/${name} - eend $? - ;; - esac - done - einfo "Stopping zfs volumes..." - zfs volfini - eend $? -} - -restart() { - : -} diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 b/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 deleted file mode 100644 index bfba28f..0000000 --- a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 +++ /dev/null @@ -1,45 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need hostid - before fsck -} - -start() { - einfo "Starting zfs volumes..." - eend $? - # Enable swap on ZVOLs that have org.freebsd:swap=on. - zfs list -H -o org.freebsd:swap,name -t volume | \ - while read state name; do - case "${state}" in - [oO][nN]) - einfo "Enabling swap on zvol ${name}" - swapon /dev/zvol/${name} - eend $? - ;; - esac - done -} - -stop() { - # Disable what we had enabled before. - zfs list -H -o org.freebsd:swap,name -t volume | \ - while read state name; do - case "${state}" in - [oO][nN]) - einfo "Disabling swap on zvol ${name}" - swapoff /dev/zvol/${name} - eend $? - ;; - esac - done - einfo "Stopping zfs volumes..." - eend $? -} - -restart() { - : -} diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild deleted file mode 100644 index 2efbb35..0000000 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd toolchain-funcs multilib - -DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software" -SLOT="0" - -IUSE="build" -LICENSE="CDDL GPL-2" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -# sys is required. -EXTRACTONLY=" - cddl/ - contrib/ - usr.bin/ - lib/ - sbin/ - sys/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - =sys-freebsd/freebsd-libexec-${RV}* - build? ( sys-apps/baselayout )" - -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - !build? ( =sys-freebsd/freebsd-sources-${RV}* )" - -S="${WORKDIR}/cddl" - -PATCHES=( "${FILESDIR}/${PN}-11.0-workaround.patch" - "${FILESDIR}/${PN}-11.0-add-libs.patch" ) - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="include/ " - [[ $(tc-getCXX) != *clang++* ]] && REMOVE_SUBDIRS="usr.sbin/zfsd" -} - -src_prepare() { - if [[ ! -e "${WORKDIR}/include" ]]; then - # Link in include headers. - ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." - fi - for d in libavl libctf libdtrace libnvpair libumem libuutil libzfs libzfs_core libzpool; do - LDFLAGS="${LDFLAGS} -L${S}/lib/${d}" - done -} - -src_compile() { - cd "${S}"/lib || die - freebsd_src_compile - cd "${S}" || die - freebsd_src_compile -} - -src_install() { - # Install libraries proper place - local mylibdir=$(get_libdir) - freebsd_src_install SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" - - gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core - - # Install zfs volinit script. - newinitd "${FILESDIR}"/zvol.initd-9.0 zvol - - # Install zfs script - newinitd "${FILESDIR}"/zfs.initd zfs - - keepdir /etc/zfs -} diff --git a/sys-freebsd/freebsd-cddl/metadata.xml b/sys-freebsd/freebsd-cddl/metadata.xml deleted file mode 100644 index a00f3ae..0000000 --- a/sys-freebsd/freebsd-cddl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> -</maintainer> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest deleted file mode 100644 index 25129fa..0000000 --- a/sys-freebsd/freebsd-lib/Manifest +++ /dev/null @@ -1,43 +0,0 @@ -AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2 -AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf -AUX freebsd-lib-10.0-libproc-libcxx.patch 393 SHA256 da065c458716e8a56a3c3aab87c9e5135287d6c8fa46eb26092c197e167b7acd SHA512 086d71467dcaccefdb2d9d31deab1905407aadca625853ff222610ea713e80dd8dd61caae3765107045b376f4162f73d12407d1d27aad29603b45b108c09cd8f WHIRLPOOL 3bed09ac5887736dcb15583b4d6cde50419d156bc12f1e1a55668ed85bfb0f502c79c760e8cde3db7172b72775786bb8968df811980ad046c677ff0aff176b33 -AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370 -AUX freebsd-lib-10.2-bsdxml2expat.patch 982 SHA256 0dab6d4525cee88eb1d6ce6c1176100ff9271222d6c6cde20f894781c02eb075 SHA512 b65fd732825e2813d499bd519bc5ef69b4c603ad57b047d2716405cc47a221c6e137a1f2e890b79a23bc26036834f7696dc9ac5953400f26975a0139fedad7c5 WHIRLPOOL dd2bd2384e12ee5e978dfb284ecdee73ce07f32d16dd67302a8cfc0ca324d078ab8b6153e170753a2fbe22993e07a4240e848d7b00aad78b58a4fa5cd27d0c26 -AUX freebsd-lib-10.2-liblink.patch 653 SHA256 a252201ec74f0cf0940b28b626e72f909cfab04addcb86b8f9abe984265c074e SHA512 c75c1fd81bd826685db5258ce0cd2407e385990dd576973fad361206271eda678d1fbe95a406909904bfee22890c79eb0f4cbfab09ddbee579552d003df2e6b1 WHIRLPOOL 3a579e65e07d7b8b558004eae9923c249d9dbd13983e3e263cb5384734d4e8c739440baa95a67953a56d2c6b7ff0a2cb8d2d7d8f7a0fbb4366001d0ea990cc4d -AUX freebsd-lib-10.3-libusb.patch 339 SHA256 64c737051839e430108c96914485bc200e83ea951832033ace683470da823791 SHA512 15ad67c805c34e5a67f21de0db9ec3826aa96fadb880f2cca8110d4b26ed3722eea8aa9ee2c8e1976288b5e9be5e6046e4bd60d515305fff283ad50cc01d3d0f WHIRLPOOL 59ad6cb93295a95f8bb94fb7d2b13e1a8bd83267a96bc816142f9254bbdf494fd17670a0e8634eaeebe93f7535467c1b388f044eb459e222eecb84a7e21745bc -AUX freebsd-lib-11.0-bsdxml2expat.patch 1103 SHA256 fea5f9bb3f59bcf9277253d41763ccf415dcb5fb6fa88e49459102cecbb43e18 SHA512 a0e9d99ff47ce813a98a5c1fd3605dd757ceb6c4f68e3784f1b48192c9f0966cbf1c769387a808ae4511f004b00242fc47f7fd3a2971e371de587cac6827533e WHIRLPOOL 9d7cac8b4b1cc575ddb0a74657e3e228a2d9439d43e5a69b4863247838d9224fa7d26818992629fda0f6db07d08da433e012cb63f4516c62206f2d9d71bda1c1 -AUX freebsd-lib-11.0-liblink.patch 1771 SHA256 07231f264161547cbfca2c6647b84d058c8e9610b6660d9af12edd43781800c4 SHA512 94ae726ede275090093dbd39edf1accbc06d618c0fd8d9b96bc72337998a5d85a909ec2a5a011bd10729f82eb83b1a71dce0523c62e8c85361274383da47d21b WHIRLPOOL 519788ddac01ae2503e93878f9c5dcc2e3d2c7c33ae33eef093bbe6639c635785c4666dcf500ed2f0326a7130329f46ecf8f1a413bc64db8a69d44810fd8b54f -AUX freebsd-lib-11.0-libproc-libcxx.patch 350 SHA256 23f5d80d5fb5cf683f3b7990e4899612a82ab878af450423a0da4179d846ad40 SHA512 c9ace882ac2fb2a077839a02a4307ce7df1dd0699cef081e6a99f12f9c2b443e4a4e4f85415a59d208859442dc665d7b9cae22de8d61f80ab8a5875d423c5795 WHIRLPOOL f1dc721386c698c50e69b4b4bd4b82be0ac47ae63546b15ba421a5a7784ee3af33e852484bf8cf763897d646857924bdae5a6551e4585740ce06deb628bc8653 -AUX freebsd-lib-11.0-libsysdecode.patch 680 SHA256 7f458085c5cddaec8fb94053150803058f444513ba0f3bb528e0e654022e653b SHA512 2601924267ea0efc1fee4bb582fa22918aa83964cbe519eec69c6e6bf09b6943b025d65833982fdfea01b74726ee5fba3f78ecf6ed2877f22965141c78074fd8 WHIRLPOOL d5ec768349e1524a3416c522f0d108fc5f2f0c1622bfefbf7c2a5a3530bf452f1163d038a5416fe8607c3af6282ee0db45d864ab21586f6f7a48fe0a3ed3b7fe -AUX freebsd-lib-11.0-workaround.patch 295 SHA256 5f09d646d7137649b8dc0e1736a81a4ab7f2599fc48f4f75ac3341a9cd817773 SHA512 5c7559dc1876e833f440bc85e23e601eaa5dd26484b1905a5a59e29345f83438208770671c248b4dfb5138c4dded1f08234c77070afadb5c6b54e2b6dc35e24a WHIRLPOOL 165245510300f2b5f75d4a0cbeefee4b56971da5ddb70324885506d8223a86ee0c866921f008225674d520bbdd9c9bc22c43bfc32d55cc2f6a1094e7d48bc7f9 -AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0 -AUX freebsd-lib-6.0-gccfloat.patch 542 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495 WHIRLPOOL dee1bcf99935ae9ead0d5f498049a46ee89416f06eb7361901c69f40d0151ae1d3647a7dbb1c58b1aca7f541169b20d622019bc20b12953ba0c06fba56fd375e -AUX freebsd-lib-6.0-pmc.patch 338 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327 WHIRLPOOL 1744ed829c1775c01b5d1b827b5677b6b5d731cff376da4d8e7ab8facbb0c465131a34157d77186bfcf1a1097f515e3909d1e753aa2b8e72efaf7feae319361f -AUX freebsd-lib-6.1-csu.patch 655 SHA256 e6fe72a4183227b275815a75eec9639321046dc1e02b80c507ae6bf902a58cf1 SHA512 926d8aafd6f517a0fb97af61746d53bafab7fe7003f71181c43b4f9b31e7652624d060a350cc23d83ca7da7c1be2dcc048bb00a581c3524f0f2b7b06de6100b4 WHIRLPOOL fada1ac622c48e1e5af34245bdb17507b2b317938265f722c8cbdbbce3d14bbe76f39a231c0e7237bd229a8c0687952643c6f56e65ffc56b18508969fad837f7 -AUX freebsd-lib-6.2-bluetooth.patch 243 SHA256 4c90cb6d45fa24a07e21255949f219cc561a94011f645c58bce2a68027db6658 SHA512 60d938a6f1162f106ec93c4122707a4dd9ca6afc73be4d90871db745ad084ca1d229e7460f4faa9885c4f6d192a41cb8be7cf671b0c8ec720eccd1c7af994bbc WHIRLPOOL df2ab6e6d9223c7e2369fb8baf19638cb897343b6ba571c7b9294be7d335068b7978690b2cd50174b4ee0215f2409322a9cc2a374140fc14dff460e181c05578 -AUX freebsd-lib-7.1-types.h-fix.patch 371 SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f WHIRLPOOL d284dd82244a108e4677be143cfc302c18f18e5b39c39fcaa8915c61053d94bf7171e48028f40d25f8058f8ec910c3e55a3753ccecb46bbabbb0e5ba86e808e3 -AUX freebsd-lib-8.0-gcc45.patch 1264 SHA256 5288e313beffa0e50fc0301e859c59f1a95302d546d27eae50b97c4a98c81c4d SHA512 12b81def4e7690cf5b910f31466b06c3fdf58f38a41f63dd359582d8f480e8081b54fd4997c6595e9e1a8912f991ba1b8d04989e270f242dd547d72c9ad5ea57 WHIRLPOOL 0cb37d909a02492a1ca700a5b990e4b6ce42a7f7d55e14a5a3fe685d28f360a10e95d97bd489f1dae0b152e168e9d901bfc13bf08bc91d8dfa1d263d4dba9abf -AUX freebsd-lib-8.0-log2.patch 667 SHA256 dc421c3d92790da46360225de2dd4d707c314e962ecb95650799ee12f166a214 SHA512 72f99ecc4632ba9b5ea8f26cbe7311a2ada1822c1c3ccf2c6690d72fb91748e7e70915f33e0f29087125c4027ef084c1d37638fc423bde533595e8d4910084c3 WHIRLPOOL dbe9a686efa26dab9ca129ed39ddab49556490fee22b43f6aa07bd9cbebfa24bd8ccb6e30f0d213bab857571a022bcd1b110d47bd85c6f70462441772bfeb243 -AUX freebsd-lib-8.0-rpcsec_gss.patch 298 SHA256 775ec2ee12c49f134938fa8264c04c6b2bf95f8001371f20b85058c25ff1c472 SHA512 2dd63be1a31a1e78fff38a3061469148b673423d958223a459d157accd3a2d1b1f4e568910c49979b0a214322c4e7371f2710ef78fab7d161545fec2a78dc702 WHIRLPOOL 884b76cd6d5d01f801b2fb13f53cfa6ed26dd0b9b2a5062ac9dbe63a6813bfe737e4c3f98b3d94c32dfb6ce3cc19cd5c8760c81250f4b2d5980a4f084d7dc54b -AUX freebsd-lib-8.2-liblink.patch 510 SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee SHA512 52a050078dc71163709e6dbe6d1c3177adbc51cb9b30a6990194ddd32f5b54e107b758801f0ff5632c4fe800c6734d63d42e53378a78caa0072847060fbb0dee WHIRLPOOL c0b95cb074ff6fd7699a03dfe31572a5edbde2b59c8aac3431fb85a0a0d71ad28566500951e0fb96ed9a8d3081abca7ec507c26e12e988f0ff2ece51bb0df2d1 -AUX freebsd-lib-8.2-nlm_syscall.patch 385 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b SHA512 1c871dc00da4b6d1106720954014f60933c99508dfc34fe08ae37b2f67ca05f70ac5e1bb75d0d1d119c7750405871ee3fb6e95ebd3ec378fc84e819cc0c4c9fd WHIRLPOOL 4d335910c00f21d2d8d5f80cd99c5316e5c485f935eefb782398e2e308e20a2cd4da0e1acf74c07a2c6d8ff446b3757cc416c0bee7e1be9d9cae0843a45e0748 -AUX freebsd-lib-9.0-bluetooth.patch 318 SHA256 5b8810471bd57e1100cc7ee6eee3ed92799e1a5c0244f5ae42f3715189fb06c3 SHA512 71cba168c1530407840dde9e25ce374abb7e0d69800e85bf6f5aff28d1a777ff31f47a84ab763e1518d3492f604d1c09ca95cf8ec5b4e05e8bd5b85267ca4488 WHIRLPOOL eccb54dd10a01358aa7e8267e64f103b89c2981ab2475f27282d5ea0bfe8adb8a106c869ca661553c3d2eda0c1d3d9dec669da6cfe61c23d5749535bdcc8c28b -AUX freebsd-lib-9.0-cve-2010-2632.patch 6963 SHA256 a6383bd3b59bb6a8989ba7746f89115b91e5082768d914bab169842144569c45 SHA512 bb7090a0acbf8ab431334245b1e767da60dcf8f2d23de97a4690e879ae5d528065f5462e2ad3647313662a906f139cfff04f15bce80efede2d2174f74792a07b WHIRLPOOL 6df4a824cd657e79cce984f9181f3e6b20e998f9b9bc1a233bbc5dd7f2e40c055e9f9d401453b49bffb3cc8ef6bb541400f486a966339e56584569c08b358ee4 -AUX freebsd-lib-9.0-liblink.patch 627 SHA256 41f0b7f92f2a8f0a3e422447b830d7dec70a068573086484d5efd6826b7c4c3c SHA512 0c570fea9cc386afe4b742985cf7de4d49370be3f34b2059dee76869d8e64bd52db0a07e61fac8924848d12d0e6d510ad6a266ce8ef76e2be885d81d909ab616 WHIRLPOOL b59e3bb0aaede34492d1940a77b11c7e5192643122f18ee6ad363053f9dec2600218ca416dd153e1d0b3bb6621d6f9e2ec50621e6e7f4b610abbd69993dc428a -AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041b765c79eef392970665740411c382 SHA512 07ebde5797480f37502e60db2a8c9ce9459bd55b176e79c0f20a859cf737f619559cb27706fb0e83fb501493677a3ffeaa9a98d45db3c0c539b71d2f18140246 WHIRLPOOL 2d78565fe0bc0dcdd61d028ba24b20d2db94f32b40536e7e8e1d5e7f485e0e2f3125807dbb6607d26e4366a6aa8ee89a8f0af7c9498f1fba9431f652c181a8f1 -AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473 -AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133 -AUX freebsd-lib-9.1-aligned_alloc.patch 1355 SHA256 379880b3e1be34a145d6388481645af5212eea7830285a7660a56a02e47dc608 SHA512 d9ac6008650efcd02ff1a0f64ac486e413c926681082d4ab9c1cb5abfbf1070e44b723e685a0b5b0e7159ab9071d85c5ee08c9063c9dcda470dfaa06a29391bc WHIRLPOOL fd80089b4b31f0a0d4dcb912d5dde74b3eb9e0530a3dc145f40ac476ef89ae256a0847123b44a0a59966c28f7f7529c401ce0dab493400a7aa24513989853e36 -AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414 -AUX freebsd-lib-add-nossp-cflags.patch 1193 SHA256 53a844511feca44a9db4ac19de336320398335d18617b39cbc4e66db3f88e861 SHA512 fcb290527381df5b91355ca7f36bb4c770378b014890e7a4d129b7cc28e7c18cb1f87ef9e1b308e0de61b54d767677865969c77a9877d8874f2bec223331f9f8 WHIRLPOOL 20e4a0cd017f9aee59f0e4fa809ae74c855fcb7c7a794e1e71b1e5900390d08a9bdfaf5a36a45b057d6211c056a5fb69adfc688fa2adb0586f115be0aea40219 -AUX freebsd-lib-bsdxml.patch 339 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 SHA512 8d14ebc848426cf600cf2206f60b91d3a5e555c738be8bb84707dcf2455be98ea3dd0a6929495b93027f71097ff0232cc85c16be4d5381a167ee0aae5a14d542 WHIRLPOOL dbafb2f98b56cac9c3ec1377c7fae40935ca3c8b1116665ce36b82a55242dbead24dc4fc38d0268cf5af82e7f908543f1376fdd3f7d847bd92dc51438a3934ee -AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb -AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317 -AUX freebsd-lib-new_as.patch 1494 SHA256 6021f34246dcf768a94ffe7273ea2f5590adf6d82ce7fb555234f8012bdbd982 SHA512 f53aa3833179c701a8c0fc6c48c3ab9d1a2694a1c30287ae08e9ea94ddf8c547f7bfe632908b9c3a3ffc4541ed2bf41277a309ffbb7d3eea58d389198d884adb WHIRLPOOL 738b312f04f8a51ab7182c4fde21bfa18d90c9a85486cd071724a61c2ecdb58cb3cdf4c52c50219baab91f15ccebf7de7700267952da65ec52e7c71eab3f954b -AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8 -AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e -AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae -AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8 -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-lib-11.0.ebuild 19400 SHA256 4695f889de60e8c782108a50835dbc3951613286898c671683ad37564ca3161b SHA512 909ed2a228d4af07abe8971f1ef16ec69a13ec6a78279ff59d4c5627d2b6ae2d01bf3f8aa9540aec58c878bf51b19a2d98b4845cfaf07b59b8590f0f48d08c7c WHIRLPOOL db6a0c89df20fc3621bfe11a64ead7612741692627353436caf892a1f559bc60404d564c2360d2ae44a8bb5a7735ae2d812e299004818c3ae174b2e2d157bc5e -MISC metadata.xml 500 SHA256 82c704031ba7ec4dec7348c15d1188fad5e9df804c12f90c04afcb0a46eb5dd6 SHA512 a164ccc254879d798007a4fb1db376b0dd807b3b6ef628c7f65ff05560d92d742f315226fe4935eb8b142d6937d6cfb01f515d21664f171e94f1549b40815470 WHIRLPOOL 0837f442d3673e9bac470774a9868ad4992056a4edae8e07759248ec58830cb1a596cf39b347d04a3e33b16d88329084571df30f33bdc9c9e73073f32ca015ae diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch deleted file mode 100644 index 42b64b5..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc -index 937187a..d5277f3 100644 ---- a/lib/atf/Makefile.inc -+++ b/lib/atf/Makefile.inc -@@ -49,6 +49,24 @@ CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' - CFLAGS+= -DATF_SHELL='"/bin/sh"' - CFLAGS+= -DATF_WORKDIR='"/tmp"' - -+CXXFLAGS+= -DHAVE_CONFIG_H -+CXXFLAGS+= -DATF_ARCH='"${MACHINE}"' -+CXXFLAGS+= -DATF_BUILD_CC='"${CC}"' -+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' -+CXXFLAGS+= -DATF_BUILD_CPP='"${CPP}"' -+CXXFLAGS+= -DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"' -+CXXFLAGS+= -DATF_BUILD_CXX='"${CXX}"' -+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' -+CXXFLAGS+= -DATF_CONFDIR='"${CONFDIR}/atf"' -+CXXFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' -+CXXFLAGS+= -DATF_LIBDIR='"${LIBDIR}"' -+CXXFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"' -+CXXFLAGS+= -DATF_MACHINE='"${MACHINE_ARCH}"' -+CXXFLAGS+= -DATF_M4='"/usr/bin/m4"' -+CXXFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' -+CXXFLAGS+= -DATF_SHELL='"/bin/sh"' -+CXXFLAGS+= -DATF_WORKDIR='"/tmp"' -+ - WARNS?= 3 - - # vim: syntax=make -diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile -index 37d6073..90a2687 100644 ---- a/lib/atf/libatf-c++/Makefile -+++ b/lib/atf/libatf-c++/Makefile -@@ -40,11 +40,11 @@ LDFLAGS+= -L${.OBJDIR}/../libatf-c - .PATH: ${ATF}/atf-c++ - .PATH: ${ATF}/atf-c++/detail - --CFLAGS+= -I${ATF} --CFLAGS+= -I${.CURDIR}/../libatf-c --CFLAGS+= -I. -+CXXFLAGS+= -I${ATF} -+CXXFLAGS+= -I${.CURDIR}/../libatf-c -+CXXFLAGS+= -I. - --CFLAGS+= -DHAVE_CONFIG_H -+CXXFLAGS+= -DHAVE_CONFIG_H - - SRCS= application.cpp \ - build.cpp \ diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch deleted file mode 100644 index 6ef3f07..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile -index 9a21dde..0815f0a 100644 ---- a/lib/libcam/Makefile -+++ b/lib/libcam/Makefile -@@ -8,6 +8,7 @@ INCS= camlib.h - - DPADD= ${LIBSBUF} - LDADD= -lsbuf -+LDFLAGS+= -L${.OBJDIR}/../libsbuf - - MAN= cam.3 cam_cdbparse.3 - -diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile -index dbd7895..607b1f6 100644 ---- a/lib/libdwarf/Makefile -+++ b/lib/libdwarf/Makefile -@@ -21,6 +21,7 @@ SRCS= \ - INCS= dwarf.h libdwarf.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf - - SHLIB_MAJOR= 3 - -diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile -index 4449c06..f024cf0 100644 ---- a/lib/libproc/Makefile -+++ b/lib/libproc/Makefile -@@ -14,6 +14,7 @@ SRCS= proc_bkpt.c \ - INCS= libproc.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf - - .if ${MK_LIBCPLUSPLUS} != "no" - LDADD+= -lcxxrt -@@ -27,4 +28,7 @@ SHLIB_MAJOR= 2 - - WITHOUT_MAN= - -+LDADD+= -lelf -+LDFLAGS+= -L${.OBJDIR}/../libelf -+ - .include <bsd.lib.mk> -diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile -index af5a775..c01aa05 100644 ---- a/lib/libprocstat/Makefile -+++ b/lib/libprocstat/Makefile -@@ -16,6 +16,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def - SYMBOL_MAPS= ${.CURDIR}/Symbol.map - - INCS= libprocstat.h -+CFLAGS+= -I${.CURDIR}/../libelf -+LDFLAGS+= -L${.OBJDIR}/../libelf - CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE - SHLIB_MAJOR= 1 - -diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile -index 2815a07..e992662 100644 ---- a/lib/librtld_db/Makefile -+++ b/lib/librtld_db/Makefile -@@ -10,5 +10,8 @@ SRCS= rtld_db.c - INCS= rtld_db.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf -+LDADD+= -lutil -lproc -+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc - - .include <bsd.lib.mk> -diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile -index 1cf52a0..3d25fae 100644 ---- a/lib/libtelnet/Makefile -+++ b/lib/libtelnet/Makefile -@@ -13,6 +13,8 @@ INTERNALLIB= - SRCS= genget.c getent.c misc.c - CFLAGS+= -I${TELNETDIR} - -+CFLAGS+= -I${.CURDIR}/../libmp -+ - WARNS?= 2 - - .if !defined(RELEASE_CRUNCH) -diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile -index 30a1dfb..9f8a99c 100644 ---- a/lib/libexecinfo/Makefile -+++ b/lib/libexecinfo/Makefile -@@ -10,8 +10,10 @@ SHLIB_MAJOR= 1 - INCS= execinfo.h - SRCS= backtrace.c symtab.c unwind.c - -+CFLAGS+= -I${.CURDIR}/../libelf - DPADD= ${LIBELF} - LDADD= -lelf -+LDFLAGS+= -L${.OBJDIR}/../libelf - - MAN= backtrace.3 - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch deleted file mode 100644 index 55987aa..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile -index f9e01ab..15b27d8 100644 ---- a/lib/libproc/Makefile -+++ b/lib/libproc/Makefile -@@ -15,7 +15,10 @@ INCS= libproc.h - - CFLAGS+= -I${.CURDIR} - --.if ${MK_LIBCPLUSPLUS} != "no" -+.if ${CXX:T:M*-stdlib=libc++*} -+LDADD+= -lcxxrt -+DPADD+= ${LIBCXXRT} -+.elif ${CXXFLAGS:T:M*-stdlib=libc++*} - LDADD+= -lcxxrt - DPADD+= ${LIBCXXRT} - .else diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch deleted file mode 100644 index 2968252..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile -index 21016a9..26010e8 100644 ---- a/lib/libusb/Makefile -+++ b/lib/libusb/Makefile -@@ -40,11 +40,11 @@ CFLAGS+= -DCOMPAT_32BIT - - beforeinstall: - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ -- ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig -+ ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDIR}/pkgconfig - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ -- ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig -+ ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDIR}/pkgconfig - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ -- ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig -+ ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDIR}/pkgconfig - - # - # Cross platform support diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch deleted file mode 100644 index 303f422..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile -index bbfb57b..a7c17e3 100644 ---- a/lib/libgeom/Makefile -+++ b/lib/libgeom/Makefile -@@ -13,7 +13,7 @@ CFLAGS += -I${.CURDIR} - - WARNS?= 3 - --DPADD= ${LIBBSDXML} ${LIBSBUF} -+DPADD= ${LIBSBUF} - LDADD= -lbsdxml -lsbuf - - MAN= libgeom.3 -diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c -index 9dedb8e..d96420c 100644 ---- a/lib/libgeom/geom_xml2tree.c -+++ b/lib/libgeom/geom_xml2tree.c -@@ -43,7 +43,7 @@ - #include <sys/sbuf.h> - #include <sys/sysctl.h> - #include <err.h> --#include <bsdxml.h> -+#include <expat.h> - #include <libgeom.h> - - struct mystate { -diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c -index d1fc0b1..89ac55e 100644 ---- a/lib/libmt/mtlib.c -+++ b/lib/libmt/mtlib.c -@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: stable/10/lib/libmt/mtlib.c 280438 2015-03-24 14:36:10Z ken - #include <unistd.h> - #include <stdint.h> - #include <errno.h> --#include <bsdxml.h> -+#include <expat.h> - #include <mtlib.h> - - /* diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch deleted file mode 100644 index b08d95f..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile -index cb1da71..43de5a5 100644 ---- a/lib/libmt/Makefile -+++ b/lib/libmt/Makefile -@@ -5,6 +5,7 @@ SHLIBDIR?= /lib - SRCS= mtlib.c - INCS= mtlib.h - -+CFLAGS+= -I${.CURDIR} - DPADD= ${LIBSBUF} - LDADD= -lsbuf - -diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile -index e9384b7..085ef62 100644 ---- a/lib/libdpv/Makefile -+++ b/lib/libdpv/Makefile -@@ -11,7 +11,8 @@ LDADD= -ldialog -lfigpar -lncursesw -lutil - - SRCS= dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c - --CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libfigpar -+LDFLAGS+= -L${.OBJDIR}/../libfigpar - - WARNS?= 6 - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch deleted file mode 100644 index 813a42b..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile -index 88ec3fe..076b8d4 100644 ---- a/lib/libusb/Makefile -+++ b/lib/libusb/Makefile -@@ -38,7 +38,7 @@ SRCS+= libusb10_io.c - CFLAGS+= -DCOMPAT_32BIT - .else - FILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc --FILESDIR= ${LIBDATADIR}/pkgconfig -+FILESDIR= ${LIBDIR}/pkgconfig - .endif - - # diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-bsdxml2expat.patch deleted file mode 100644 index 41a394b..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-bsdxml2expat.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c -index 9dedb8e..d96420c 100644 ---- a/lib/libgeom/geom_xml2tree.c -+++ b/lib/libgeom/geom_xml2tree.c -@@ -43,7 +43,7 @@ - #include <sys/sbuf.h> - #include <sys/sysctl.h> - #include <err.h> --#include <bsdxml.h> -+#include <expat.h> - #include <libgeom.h> - - struct mystate { -diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c -index d1fc0b1..89ac55e 100644 ---- a/lib/libmt/mtlib.c -+++ b/lib/libmt/mtlib.c -@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: stable/10/lib/libmt/mtlib.c 280438 2015-03-24 14:36:10Z ken - #include <unistd.h> - #include <stdint.h> - #include <errno.h> --#include <bsdxml.h> -+#include <expat.h> - #include <mtlib.h> - - /* -diff --git a/lib/lib80211/lib80211_regdomain.c b/lib/lib80211/lib80211_regdomain.c -index c500d3f..fe1d37e 100644 ---- a/lib/lib80211/lib80211_regdomain.c -+++ b/lib/lib80211/lib80211_regdomain.c -@@ -40,7 +40,7 @@ static const char rcsid[] = "$FreeBSD: stable/11/lib/lib80211/lib80211_regdomain - #include <err.h> - #include <unistd.h> - --#include <bsdxml.h> -+#include <expat.h> - - #include "lib80211_regdomain.h" - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch deleted file mode 100644 index da495e4..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile -index 2dedf11..275f4c3 100644 ---- a/lib/libproc/Makefile -+++ b/lib/libproc/Makefile -@@ -15,6 +15,7 @@ SRCS= proc_bkpt.c \ - INCS= libproc.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf - - .if ${MK_CXX} == "no" - CFLAGS+= -DNO_CXA_DEMANGLE -@@ -28,6 +29,9 @@ LIBADD+= elf rtld_db util - - .if ${MK_CDDL} != "no" - LIBADD+= ctf -+LDADD+= -lelf -+LDFLAGS+= -L${.OBJDIR}/../libelf -+ - IGNORE_PRAGMA= YES - CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \ - -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \ -diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile -index 1829883..d0065a3 100644 ---- a/lib/libprocstat/Makefile -+++ b/lib/libprocstat/Makefile -@@ -17,6 +17,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def - SYMBOL_MAPS= ${.CURDIR}/Symbol.map - - INCS= libprocstat.h -+CFLAGS+= -I${.CURDIR}/../libelf -+LDFLAGS+= -L${.OBJDIR}/../libelf - CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE - SHLIB_MAJOR= 1 - -diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile -index 0a8ed95..11baf5b 100644 ---- a/lib/librtld_db/Makefile -+++ b/lib/librtld_db/Makefile -@@ -11,6 +11,9 @@ SRCS= rtld_db.c - INCS= rtld_db.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf -+LDADD+= -lutil -lproc -+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc - # Avoid circular dependency, we only need the libproc.h header here. - CFLAGS+= -I${.CURDIR:H}/libproc - -diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile -index f84aee3..c36ade9 100644 ---- a/lib/libtelnet/Makefile -+++ b/lib/libtelnet/Makefile -@@ -14,6 +14,8 @@ INTERNALLIB= - SRCS= genget.c getent.c misc.c - CFLAGS+= -I${TELNETDIR} - -+CFLAGS+= -I${.CURDIR}/../libmp -+ - WARNS?= 2 - - .if ${MK_OPENSSL} != "no" diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libproc-libcxx.patch deleted file mode 100644 index 013ad20..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libproc-libcxx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile -index e3b2578..acd76e8 100644 ---- a/lib/libproc/Makefile -+++ b/lib/libproc/Makefile -@@ -18,7 +18,7 @@ CFLAGS+= -I${.CURDIR} - - .if ${MK_CXX} == "no" - CFLAGS+= -DNO_CXA_DEMANGLE --.elif ${MK_LIBCPLUSPLUS} != "no" -+.elif ${COMPILER_TYPE} == "clang" - LIBADD+= cxxrt - .else - LIBADD+= supcplusplus diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch deleted file mode 100644 index d90aa31..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile -index e3bfe00..51fc5f0 100644 ---- a/lib/libsysdecode/Makefile -+++ b/lib/libsysdecode/Makefile -@@ -8,7 +8,7 @@ LIB= sysdecode - SRCS= errno.c ioctl.c syscallnames.c utrace.c - INCS= sysdecode.h - --CFLAGS+= -I${.CURDIR}/../../sys -+CFLAGS+= -I${.CURDIR}/../../sys -I${.CURDIR} - - MAN+= sysdecode.3 \ - sysdecode_abi_to_freebsd_errno.3 \ -@@ -37,7 +37,7 @@ CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}} - - ioctl.c: mkioctls - env MACHINE=${MACHINE} CPP="${CPP}" \ -- /bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} -+ /bin/sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} - - beforedepend: ioctl.c - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-workaround.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-workaround.patch deleted file mode 100644 index 05f817e..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-workaround.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/libdevdctl/event.cc b/lib/libdevdctl/event.cc -index a8cb447..d56df2e 100644 ---- a/lib/libdevdctl/event.cc -+++ b/lib/libdevdctl/event.cc -@@ -50,6 +50,7 @@ - #include <syslog.h> - #include <unistd.h> - -+#include <cstdio> - #include <cstdarg> - #include <cstring> - #include <iostream> diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch deleted file mode 100644 index 00de8a6..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: fbsd-6/lib/libipsec/policy_token.l -=================================================================== ---- fbsd-6.orig/lib/libipsec/policy_token.l -+++ fbsd-6/lib/libipsec/policy_token.l -@@ -138,8 +138,6 @@ void - __policy__strbuffer__init__(msg) - char *msg; - { -- if (yy_current_buffer) -- yy_delete_buffer(yy_current_buffer); - strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg); - yy_switch_to_buffer(strbuffer); - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch deleted file mode 100644 index a3e7d5e..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch +++ /dev/null @@ -1,16 +0,0 @@ -This patch is needed to avoid inclusion of GCC's float.h that defines -LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64. - -Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c -=================================================================== ---- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c -+++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c -@@ -28,7 +28,7 @@ - __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $"); - - #include <fenv.h> --#include <float.h> -+#include <machine/float.h> - #include <math.h> - - /* diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch deleted file mode 100644 index 2f6de46..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: freebsd-6.0_beta4/lib/libpmc/Makefile -=================================================================== ---- freebsd-6.0_beta4.orig/lib/libpmc/Makefile -+++ freebsd-6.0_beta4/lib/libpmc/Makefile -@@ -9,6 +9,8 @@ WARNS?= 6 - - MAN= pmc.3 pmclog.3 - -+CFLAGS+= -I${.CURDIR} -+ - MLINKS+= \ - pmc.3 pmc_allocate.3 \ - pmc.3 pmc_attach.3 \ diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch deleted file mode 100644 index 075f278..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/csu/amd64/Makefile.orig 2006-07-04 07:49:58 -0300 -+++ lib/csu/amd64/Makefile 2006-07-04 07:50:15 -0300 -@@ -16,6 +16,7 @@ - ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c - - realinstall: -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${OBJS} ${DESTDIR}${LIBDIR} - ---- lib/csu/sparc64/Makefile.orig 2006-10-06 15:13:55 +0100 -+++ lib/csu/sparc64/Makefile 2006-10-06 15:15:06 +0100 -@@ -15,6 +15,7 @@ - ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC} - - realinstall: -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${OBJS} ${DESTDIR}${LIBDIR} - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch deleted file mode 100644 index a9b8435..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/libsdp/Makefile 2007-06-15 12:04:37 +0200 -+++ lib.sdp/libsdp/Makefile 2007-06-15 12:26:14 +0200 -@@ -5,7 +5,7 @@ - MAN= sdp.3 - - WARNS?= 2 --CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libbluetooth - - SHLIB_MAJOR= 2 - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch deleted file mode 100644 index 8de5df2..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fixes a compile error if XOPEN_SOURCE 600 is defined. - -See: http://www.mailinglistarchive.com/freebsd-current@freebsd.org/msg15011.html - ---- sys/sys/types.h.orig -+++ sys/sys/types.h -@@ -46,7 +46,7 @@ - - #include <sys/_pthreadtypes.h> - --#if __BSD_VISIBLE -+#ifndef _POSIX_SOURCE - typedef unsigned char u_char; - typedef unsigned short u_short; - typedef unsigned int u_int; diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch deleted file mode 100644 index 2ddb9ea..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur work.orig/include/rpcsvc/nis.x work/include/rpcsvc/nis.x ---- work.orig/include/rpcsvc/nis.x 2009-10-25 10:10:29.000000000 +0900 -+++ work/include/rpcsvc/nis.x 2011-04-13 21:25:13.000000000 +0900 -@@ -399,10 +399,7 @@ - %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights) - %#define WORLD_DEFAULT (NIS_READ_ACC) - %#define GROUP_DEFAULT (NIS_READ_ACC << 8) --%#define OWNER_DEFAULT ((NIS_READ_ACC +\ -- NIS_MODIFY_ACC +\ -- NIS_CREATE_ACC +\ -- NIS_DESTROY_ACC) << 16) -+%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16) - %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT) - % - %/* Result manipulation defines ... */ -@@ -431,10 +428,8 @@ - % * these definitions they take an nis_object *, and an int and return - % * a u_char * for Value, and an int for length. - % */ --%#define ENTRY_VAL(obj, col) \ -- (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val --%#define ENTRY_LEN(obj, col) \ -- (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len -+%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val -+%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len - % - %#ifdef __cplusplus - %} diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch deleted file mode 100644 index a9fd189..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch +++ /dev/null @@ -1,21 +0,0 @@ -log2 and log2f are required by C99 and are not implemented. -Workaround the deficiency. - ---- lib/msun/src/math.h.old 2010-03-14 17:02:25.000000000 +0100 -+++ lib/msun/src/math.h 2010-03-14 17:07:03.000000000 +0100 -@@ -203,6 +203,7 @@ - double frexp(double, int *); /* fundamentally !__pure2 */ - double ldexp(double, int); - double log(double); -+#define log2(x) log(x)/log(2.0) - double log10(double); - double modf(double, double *); /* fundamentally !__pure2 */ - -@@ -319,6 +320,7 @@ - float log10f(float); - float log1pf(float); - float logf(float); -+#define log2f(x) logf(x)/logf(2.0) - float modff(float, float *); /* fundamentally !__pure2 */ - - float powf(float, float); diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch deleted file mode 100644 index a7de06f..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch +++ /dev/null @@ -1,12 +0,0 @@ -Without this linking fails during a stage3 build. - ---- lib/librpcsec_gss/Makefile.orig -+++ lib/librpcsec_gss/Makefile -@@ -8,6 +8,7 @@ - - DPADD+= ${LIBGSSAPI} - LDADD+= -lgssapi -+LDFLAGS+= -L${.OBJDIR}/../libgssapi - - VERSION_DEF= ${.CURDIR}/../libc/Versions.def - SYMBOL_MAPS= ${.CURDIR}/Symbol.map diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch deleted file mode 100644 index c8be7f4..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/libproc/Makefile.old 2011-07-06 00:58:04.000000000 +0000 -+++ lib/libproc/Makefile 2011-07-06 00:58:58.000000000 +0000 -@@ -18,5 +18,6 @@ - WARNS?= 6 - - WITHOUT_MAN= yes -+LDADD=-lelf - - .include <bsd.lib.mk> ---- lib/librtld_db/Makefile.old 2011-07-06 00:58:12.000000000 +0000 -+++ lib/librtld_db/Makefile 2011-07-06 00:59:27.000000000 +0000 -@@ -10,5 +10,7 @@ - INCS= rtld_db.h - - CFLAGS+= -I${.CURDIR} -+LDADD=-lutil -lproc -+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc - - .include <bsd.lib.mk> diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch deleted file mode 100644 index 556ade5..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- include/unistd.h 2010/12/20 20:39:49 216602 -+++ include/unistd.h 2010/12/20 21:12:18 216603 -@@ -529,6 +529,7 @@ - #define _MKTEMP_DECLARED - #endif - int nfssvc(int, void *); -+int nlm_syscall(int, int, int, char **); - int profil(char *, size_t, vm_offset_t, int); - int rcmd(char **, int, const char *, const char *, const char *, int *); - int rcmd_af(char **, int, const char *, diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch deleted file mode 100644 index cf1172a..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur lib.orig/libsdp/Makefile lib/libsdp/Makefile ---- lib.orig/libsdp/Makefile 2012-12-25 20:28:50.000000000 +0900 -+++ lib/libsdp/Makefile 2012-12-25 20:31:19.000000000 +0900 -@@ -5,7 +5,7 @@ - MAN= sdp.3 - - WARNS?= 2 --CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libbluetooth - - SHLIB_MAJOR= 4 - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-cve-2010-2632.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-cve-2010-2632.patch deleted file mode 100644 index ad9b960..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-cve-2010-2632.patch +++ /dev/null @@ -1,215 +0,0 @@ -Index: lib/libc/gen/glob.c -=================================================================== ---- lib/libc/gen/glob.c (revision 246357) -+++ lib/libc/gen/glob.c (working copy) -@@ -94,6 +94,25 @@ __FBSDID("$FreeBSD$"); - - #include "collate.h" - -+/* -+ * glob(3) expansion limits. Stop the expansion if any of these limits -+ * is reached. This caps the runtime in the face of DoS attacks. See -+ * also CVE-2010-2632 -+ */ -+#define GLOB_LIMIT_BRACE 128 /* number of brace calls */ -+#define GLOB_LIMIT_PATH 65536 /* number of path elements */ -+#define GLOB_LIMIT_READDIR 16384 /* number of readdirs */ -+#define GLOB_LIMIT_STAT 1024 /* number of stat system calls */ -+#define GLOB_LIMIT_STRING ARG_MAX /* maximum total size for paths */ -+ -+struct glob_limit { -+ size_t l_brace_cnt; -+ size_t l_path_lim; -+ size_t l_readdir_cnt; -+ size_t l_stat_cnt; -+ size_t l_string_cnt; -+}; -+ - #define DOLLAR '$' - #define DOT '.' - #define EOS '\0' -@@ -153,15 +172,18 @@ static const Char *g_strchr(const Char *, wchar_t) - static Char *g_strcat(Char *, const Char *); - #endif - static int g_stat(Char *, struct stat *, glob_t *); --static int glob0(const Char *, glob_t *, size_t *); --static int glob1(Char *, glob_t *, size_t *); --static int glob2(Char *, Char *, Char *, Char *, glob_t *, size_t *); --static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, size_t *); --static int globextend(const Char *, glob_t *, size_t *); --static const Char * -+static int glob0(const Char *, glob_t *, struct glob_limit *); -+static int glob1(Char *, glob_t *, struct glob_limit *); -+static int glob2(Char *, Char *, Char *, Char *, glob_t *, -+ struct glob_limit *); -+static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, -+ struct glob_limit *); -+static int globextend(const Char *, glob_t *, struct glob_limit *); -+static const Char * - globtilde(const Char *, Char *, size_t, glob_t *); --static int globexp1(const Char *, glob_t *, size_t *); --static int globexp2(const Char *, const Char *, glob_t *, int *, size_t *); -+static int globexp1(const Char *, glob_t *, struct glob_limit *); -+static int globexp2(const Char *, const Char *, glob_t *, int *, -+ struct glob_limit *); - static int match(Char *, Char *, Char *); - #ifdef DEBUG - static void qprintf(const char *, Char *); -@@ -171,8 +193,8 @@ int - glob(const char * __restrict pattern, int flags, - int (*errfunc)(const char *, int), glob_t * __restrict pglob) - { -+ struct glob_limit limit = { 0, 0, 0, 0, 0 }; - const char *patnext; -- size_t limit; - Char *bufnext, *bufend, patbuf[MAXPATHLEN], prot; - mbstate_t mbs; - wchar_t wc; -@@ -186,11 +208,10 @@ glob(const char * __restrict pattern, int flags, - pglob->gl_offs = 0; - } - if (flags & GLOB_LIMIT) { -- limit = pglob->gl_matchc; -- if (limit == 0) -- limit = ARG_MAX; -- } else -- limit = 0; -+ limit.l_path_lim = pglob->gl_matchc; -+ if (limit.l_path_lim == 0) -+ limit.l_path_lim = GLOB_LIMIT_PATH; -+ } - pglob->gl_flags = flags & ~GLOB_MAGCHAR; - pglob->gl_errfunc = errfunc; - pglob->gl_matchc = 0; -@@ -243,11 +264,17 @@ glob(const char * __restrict pattern, int flags, - * characters - */ - static int --globexp1(const Char *pattern, glob_t *pglob, size_t *limit) -+globexp1(const Char *pattern, glob_t *pglob, struct glob_limit *limit) - { - const Char* ptr = pattern; - int rv; - -+ if ((pglob->gl_flags & GLOB_LIMIT) && -+ limit->l_brace_cnt++ >= GLOB_LIMIT_BRACE) { -+ errno = 0; -+ return (GLOB_NOSPACE); -+ } -+ - /* Protect a single {}, for find(1), like csh */ - if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS) - return glob0(pattern, pglob, limit); -@@ -266,7 +293,8 @@ static int - * If it fails then it tries to glob the rest of the pattern and returns. - */ - static int --globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv, size_t *limit) -+globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv, -+ struct glob_limit *limit) - { - int i; - Char *lm, *ls; -@@ -436,7 +464,7 @@ globtilde(const Char *pattern, Char *patbuf, size_ - * if things went well, nonzero if errors occurred. - */ - static int --glob0(const Char *pattern, glob_t *pglob, size_t *limit) -+glob0(const Char *pattern, glob_t *pglob, struct glob_limit *limit) - { - const Char *qpatnext; - int err; -@@ -529,7 +557,7 @@ compare(const void *p, const void *q) - } - - static int --glob1(Char *pattern, glob_t *pglob, size_t *limit) -+glob1(Char *pattern, glob_t *pglob, struct glob_limit *limit) - { - Char pathbuf[MAXPATHLEN]; - -@@ -547,7 +575,7 @@ static int - */ - static int - glob2(Char *pathbuf, Char *pathend, Char *pathend_last, Char *pattern, -- glob_t *pglob, size_t *limit) -+ glob_t *pglob, struct glob_limit *limit) - { - struct stat sb; - Char *p, *q; -@@ -563,6 +591,15 @@ glob2(Char *pathbuf, Char *pathend, Char *pathend_ - if (g_lstat(pathbuf, &sb, pglob)) - return(0); - -+ if ((pglob->gl_flags & GLOB_LIMIT) && -+ limit->l_stat_cnt++ >= GLOB_LIMIT_STAT) { -+ errno = 0; -+ if (pathend + 1 > pathend_last) -+ return (GLOB_ABORTED); -+ *pathend++ = SEP; -+ *pathend = EOS; -+ return (GLOB_NOSPACE); -+ } - if (((pglob->gl_flags & GLOB_MARK) && - pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) - || (S_ISLNK(sb.st_mode) && -@@ -606,7 +643,7 @@ glob2(Char *pathbuf, Char *pathend, Char *pathend_ - static int - glob3(Char *pathbuf, Char *pathend, Char *pathend_last, - Char *pattern, Char *restpattern, -- glob_t *pglob, size_t *limit) -+ glob_t *pglob, struct glob_limit *limit) - { - struct dirent *dp; - DIR *dirp; -@@ -652,6 +689,19 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_ - size_t clen; - mbstate_t mbs; - -+ if ((pglob->gl_flags & GLOB_LIMIT) && -+ limit->l_readdir_cnt++ >= GLOB_LIMIT_READDIR) { -+ errno = 0; -+ if (pathend + 1 > pathend_last) -+ err = GLOB_ABORTED; -+ else { -+ *pathend++ = SEP; -+ *pathend = EOS; -+ err = GLOB_NOSPACE; -+ } -+ break; -+ } -+ - /* Initial DOT must be matched literally. */ - if (dp->d_name[0] == DOT && *pattern != DOT) - continue; -@@ -702,14 +752,15 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_ - * gl_pathv points to (gl_offs + gl_pathc + 1) items. - */ - static int --globextend(const Char *path, glob_t *pglob, size_t *limit) -+globextend(const Char *path, glob_t *pglob, struct glob_limit *limit) - { - char **pathv; - size_t i, newsize, len; - char *copy; - const Char *p; - -- if (*limit && pglob->gl_pathc > *limit) { -+ if ((pglob->gl_flags & GLOB_LIMIT) && -+ pglob->gl_matchc > limit->l_path_lim) { - errno = 0; - return (GLOB_NOSPACE); - } -@@ -737,6 +788,12 @@ static int - for (p = path; *p++;) - continue; - len = MB_CUR_MAX * (size_t)(p - path); /* XXX overallocation */ -+ limit->l_string_cnt += len; -+ if ((pglob->gl_flags & GLOB_LIMIT) && -+ limit->l_string_cnt >= GLOB_LIMIT_STRING) { -+ errno = 0; -+ return (GLOB_NOSPACE); -+ } - if ((copy = malloc(len)) != NULL) { - if (g_Ctoc(path, copy, len)) { - free(copy); diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch deleted file mode 100644 index f8e4707..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -uNr lib.ol/libproc/Makefile lib/libproc/Makefile ---- lib.ol/libproc/Makefile 2011-11-02 14:02:17.000000000 +0000 -+++ lib/libproc/Makefile 2011-11-02 14:03:09.000000000 +0000 -@@ -16,5 +16,6 @@ - SHLIB_MAJOR= 2 - - WITHOUT_MAN= -+LDADD+=-lelf - - .include <bsd.lib.mk> -diff -uNr lib.ol/librtld_db/Makefile lib/librtld_db/Makefile ---- lib.ol/librtld_db/Makefile 2011-11-02 14:02:13.000000000 +0000 -+++ lib/librtld_db/Makefile 2011-11-02 14:04:00.000000000 +0000 -@@ -10,5 +10,7 @@ - INCS= rtld_db.h - - CFLAGS+= -I${.CURDIR} -+LDADD+=-lutil -lproc -+LDFLAGS+=-L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc - - .include <bsd.lib.mk> diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch deleted file mode 100644 index c1c2a0e..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur lib.orig/libncp/Makefile lib/libncp/Makefile ---- lib.orig/libncp/Makefile 2012-12-25 20:35:16.000000000 +0900 -+++ lib/libncp/Makefile 2012-12-25 20:36:23.000000000 +0900 -@@ -6,6 +6,7 @@ - - DPADD= ${LIBIPX} - LDADD= -lipx -+LDFLAGS+=-L${.OBJDIR}/../libipx - - SRCS= ncpl_subr.c ncpl_bind.c ncpl_queue.c ncpl_file.c ncpl_misc.c \ - ncpl_net.c ncpl_rcfile.c ncpl_conn.c ncpl_nls.c ncpl_msg.c \ diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch deleted file mode 100644 index bf77a0a..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch +++ /dev/null @@ -1,122 +0,0 @@ -Fixes warnings like: -/var/tmp/portage/sys-freebsd/freebsd-lib-9.0-r2/work/lib/libopie/../../contrib/opie/libopie/randomchallenge.c:43:5: -warning: incompatible implicit declaration of built-in function ‘strcpy’ - -diff -uNr contrib.old/opie/libopie/accessfile.c contrib/opie/libopie/accessfile.c ---- contrib.old/opie/libopie/accessfile.c 2012-05-25 08:54:33.000000000 -0400 -+++ contrib/opie/libopie/accessfile.c 2012-05-25 09:12:34.000000000 -0400 -@@ -46,6 +46,7 @@ - #ifdef DEBUG - #include <syslog.h> - #endif /* DEBUG */ -+#include <ctype.h> - - #include "opie.h" - -diff -uNr contrib.old/opie/libopie/generator.c contrib/opie/libopie/generator.c ---- contrib.old/opie/libopie/generator.c 2012-05-25 08:54:33.000000000 -0400 -+++ contrib/opie/libopie/generator.c 2012-05-25 08:58:10.000000000 -0400 -@@ -50,6 +50,7 @@ - #include <syslog.h> - #endif /* DEBUG */ - #include "opie.h" -+#include <stdio.h> - - static char *algids[] = { NULL, NULL, NULL, "sha1", "md4", "md5" }; - -diff -uNr contrib.old/opie/libopie/lookup.c contrib/opie/libopie/lookup.c ---- contrib.old/opie/libopie/lookup.c 2012-05-25 08:54:33.000000000 -0400 -+++ contrib/opie/libopie/lookup.c 2012-05-25 09:15:08.000000000 -0400 -@@ -14,6 +14,7 @@ - #include "opie_cfg.h" - #include <stdio.h> - #include "opie.h" -+#include <string.h> - - int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal) - { -diff -uNr contrib.old/opie/libopie/newseed.c contrib/opie/libopie/newseed.c ---- contrib.old/opie/libopie/newseed.c 2012-05-25 08:54:33.000000000 -0400 -+++ contrib/opie/libopie/newseed.c 2012-05-25 09:14:37.000000000 -0400 -@@ -36,6 +36,9 @@ - #include <syslog.h> - #endif /* DEBUG */ - #include "opie.h" -+#include <stdio.h> -+#include <stdlib.h> -+#include <time.h> - - int opienewseed FUNCTION((seed), char *seed) - { -diff -uNr contrib.old/opie/libopie/parsechallenge.c contrib/opie/libopie/parsechallenge.c ---- contrib.old/opie/libopie/parsechallenge.c 2012-05-25 08:54:33.000000000 -0400 -+++ contrib/opie/libopie/parsechallenge.c 2012-05-25 09:15:54.000000000 -0400 -@@ -20,6 +20,8 @@ - #include <string.h> - #endif /* HAVE_STRING_H */ - #include "opie.h" -+#include <stdlib.h> -+#include <ctype.h> - - struct algorithm { - char *name; -diff -uNr contrib.old/opie/libopie/passwd.c contrib/opie/libopie/passwd.c ---- contrib.old/opie/libopie/passwd.c 2012-05-25 08:54:33.000000000 -0400 -+++ contrib/opie/libopie/passwd.c 2012-05-25 09:13:45.000000000 -0400 -@@ -22,6 +22,7 @@ - - #include "opie_cfg.h" - #include "opie.h" -+#include <string.h> - - int opiepasswd FUNCTION((old, flags, principal, n, seed, ks), struct opie *old AND int flags AND char *principal AND int n AND char *seed AND char *ks) - { -diff -uNr contrib.old/opie/libopie/randomchallenge.c contrib/opie/libopie/randomchallenge.c ---- contrib.old/opie/libopie/randomchallenge.c 2012-05-25 08:54:33.000000000 -0400 -+++ contrib/opie/libopie/randomchallenge.c 2012-05-25 09:00:27.000000000 -0400 -@@ -28,6 +28,9 @@ - - #include "opie_cfg.h" - #include "opie.h" -+#include <stdio.h> -+#include <string.h> -+#include <stdlib.h> - - static char *algids[] = { 0, 0, 0, "sha1", "md4", "md5" }; - -diff -uNr contrib.old/opie/libopie/verify.c contrib/opie/libopie/verify.c ---- contrib.old/opie/libopie/verify.c 2012-05-25 08:54:33.000000000 -0400 -+++ contrib/opie/libopie/verify.c 2012-05-25 09:12:09.000000000 -0400 -@@ -25,6 +25,7 @@ - #include <string.h> - #endif /* HAVE_STRING_H */ - #include "opie.h" -+#include <ctype.h> - - #define RESPONSE_STANDARD 0 - #define RESPONSE_WORD 1 -diff -uNr contrib.old/opie/libopie/version.c contrib/opie/libopie/version.c ---- contrib.old/opie/libopie/version.c 2012-05-25 08:54:33.000000000 -0400 -+++ contrib/opie/libopie/version.c 2012-05-25 09:13:15.000000000 -0400 -@@ -19,6 +19,8 @@ - */ - #include "opie_cfg.h" - #include "opie.h" -+#include <stdio.h> -+#include <stdlib.h> - - VOIDRET opieversion FUNCTION_NOARGS - { -diff -uNr contrib.old/opie/opie.h contrib/opie/opie.h ---- contrib.old/opie/opie.h 2012-05-25 08:54:33.000000000 -0400 -+++ contrib/opie/opie.h 2012-05-25 09:21:28.000000000 -0400 -@@ -158,6 +158,9 @@ - int __opiereadrec __P((struct opie *)); - int __opiewriterec __P((struct opie *)); - int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts)); -+VOIDRET opiehashlen FUNCTION((algorithm, in, out, n), int algorithm AND VOIDPTR in AND struct opie_otpkey *out AND int n); -+int opieinsecure FUNCTION_NOARGS; -+int opienewseed FUNCTION((seed), char *seed); - __END_DECLS - - #define opiestrncpy(dst, src, n) \ diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch deleted file mode 100644 index fdb7e16..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix "no .eh_frame_hdr table will be created" error. - -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47829 -http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4a0e0cd7377c45dc21d5c71bcab931b5e5727e74 - -diff -Nur lib.orig/csu/i386-elf/Makefile lib/csu/i386-elf/Makefile ---- lib.orig/csu/i386-elf/Makefile 2013-03-06 01:07:57.000000000 +0900 -+++ lib/csu/i386-elf/Makefile 2013-03-06 01:10:09.000000000 +0900 -@@ -10,6 +10,8 @@ - FILESDIR= ${LIBDIR} - CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include -+CFLAGS+= -fno-omit-frame-pointer -+CFLAGS+= -fno-asynchronous-unwind-tables - CLEANFILES= ${FILES} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o - CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-aligned_alloc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-aligned_alloc.patch deleted file mode 100644 index 97ac141..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-aligned_alloc.patch +++ /dev/null @@ -1,51 +0,0 @@ -Backport aligned_alloc for C++11 support. - -http://lists.freebsd.org/pipermail/svn-src-stable-9/2012-November/003313.html - -diff -uNr lib.old/libc/stdlib/Symbol.map lib/libc/stdlib/Symbol.map ---- lib.old/libc/stdlib/Symbol.map 2013-05-24 17:03:55.000000000 -0400 -+++ lib/libc/stdlib/Symbol.map 2013-05-24 17:06:03.000000000 -0400 -@@ -97,6 +97,7 @@ - atoi_l; - atol_l; - atoll_l; -+ aligned_alloc; - at_quick_exit; - quick_exit; - strtod_l; -diff -uNr lib.old/libc/stdlib/malloc.c lib/libc/stdlib/malloc.c ---- lib.old/libc/stdlib/malloc.c 2013-05-24 17:03:55.000000000 -0400 -+++ lib/libc/stdlib/malloc.c 2013-05-24 17:05:40.000000000 -0400 -@@ -6046,6 +6046,21 @@ - } - - void * -+aligned_alloc(size_t alignment, size_t size) -+{ -+ void *memptr; -+ int ret; -+ -+ ret = posix_memalign(&memptr, alignment, size); -+ if (ret != 0) { -+ errno = ret; -+ return (NULL); -+ } -+ return (memptr); -+} -+ -+ -+void * - calloc(size_t num, size_t size) - { - void *ret; -diff -uNr includeold/stdlib.h include/stdlib.h ---- includeold/stdlib.h 2013-05-24 17:03:46.000000000 -0400 -+++ include/stdlib.h 2013-05-24 17:04:46.000000000 -0400 -@@ -155,6 +155,7 @@ - * If we're in a mode greater than C99, expose C1x functions. - */ - #if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L -+void * aligned_alloc(size_t, size_t); - _Noreturn void - quick_exit(int); - int at_quick_exit(void (*)(void)); diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch deleted file mode 100644 index 62357e0..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- include/Makefile.orig 2013-06-16 10:47:52.000000000 +0200 -+++ include/Makefile 2013-06-16 10:47:37.000000000 +0200 -@@ -6,11 +6,11 @@ - .include <bsd.own.mk> - - CLEANFILES= osreldate.h version vers.c -+SUBDIR= arpa protocols rpcsvc rpc xlocale --SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale - INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ - db.h \ - dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ -+ fts.h ftw.h getopt.h glob.h grp.h \ -- fts.h ftw.h getopt.h glob.h grp.h gssapi.h \ - ieeefp.h ifaddrs.h \ - inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ - locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \ diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch deleted file mode 100644 index 00b39f7..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch +++ /dev/null @@ -1,30 +0,0 @@ -Please do not disable this patch. -All commands will be non-executable. -Abort trap: 6 (core dumped) is displayed... - -Details see Gentoo Bug #511698. -https://bugs.gentoo.org/show_bug.cgi?id=511698 - -diff --git a/lib/libc/Makefile b/lib/libc/Makefile -index 1cc23b7..7dd458e 100644 ---- a/lib/libc/Makefile -+++ b/lib/libc/Makefile -@@ -149,6 +149,6 @@ CWARNFLAGS:= ${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/} - # in the future to circumvent this. - SSP_CFLAGS:= ${SSP_CFLAGS:S/^-fstack-protector-all$/-fstack-protector/} - # Disable stack protection for SSP symbols. --SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/} -+SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/:C/^$/-fno-stack-protector/} - # Generate stack unwinding tables for cancellation points - CANCELPOINTS_CFLAGS:= ${.IMPSRC:Mcancelpoints_*:C/^.+$/${CANCELPOINTS_CFLAGS}/:C/^$//} -diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc -index f92d87d..7a3a2f3 100644 ---- a/lib/csu/Makefile.inc -+++ b/lib/csu/Makefile.inc -@@ -1,5 +1,5 @@ - # $FreeBSD: release/9.1.0/lib/csu/Makefile.inc 204757 2010-03-05 13:29:05Z uqs $ - --SSP_CFLAGS= -+SSP_CFLAGS= -fno-stack-protector - - .include "../Makefile.inc" diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch deleted file mode 100644 index ec90def..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile ---- lib/libgeom/Makefile 2004-03-07 16:07:57 +0000 -+++ lib.xml/libgeom/Makefile 2005-05-06 10:38:41 +0000 -@@ -8,7 +8,8 @@ - SRCS+= geom_ctl.c - INCS= libgeom.h - --CFLAGS += -I${.CURDIR} -+CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat -+LDFLAGS += -L${.CURDIR}/../libexpat - - WARNS?= 3 - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch deleted file mode 100644 index 1b4e791..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur lib/libgeom.old/Makefile lib/libgeom/Makefile ---- lib/libgeom.old/Makefile 2011-07-10 14:23:51.000000000 +0000 -+++ lib/libgeom/Makefile 2011-07-10 15:12:39.000000000 +0000 -@@ -13,8 +13,8 @@ - - WARNS?= 3 - --DPADD= ${LIBBSDXML} ${LIBSBUF} --LDADD= -lbsdxml -lsbuf -+DPADD= ${LIBSBUF} -+LDADD= -lexpat -lsbuf - - MAN= libgeom.3 - -diff -ur lib/libgeom.old/geom_xml2tree.c lib/libgeom/geom_xml2tree.c ---- lib/libgeom.old/geom_xml2tree.c 2010-12-21 17:09:25.000000000 +0000 -+++ lib/libgeom/geom_xml2tree.c 2011-07-10 15:12:52.000000000 +0000 -@@ -43,7 +43,7 @@ - #include <sys/sbuf.h> - #include <sys/sysctl.h> - #include <err.h> --#include <bsdxml.h> -+#include <expat.h> - #include <libgeom.h> - - struct mystate { diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch deleted file mode 100644 index c2cf142..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix headers dependencies so that they can be included alone. - ---- include/ifaddrs.h.old 2009-05-15 13:50:10 +0000 -+++ include/ifaddrs.h 2009-05-15 13:50:23 +0000 -@@ -28,6 +28,8 @@ - #ifndef _IFADDRS_H_ - #define _IFADDRS_H_ - -+#include <sys/types.h> -+ - struct ifaddrs { - struct ifaddrs *ifa_next; - char *ifa_name; diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch deleted file mode 100644 index c9288a4..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- lib/msun/i387/fenv.c.orig 2007-01-05 04:15:26 -0300 -+++ lib/msun/i387/fenv.c 2008-06-14 00:49:30 -0300 -@@ -152,7 +152,8 @@ - int - feupdateenv(const fenv_t *envp) - { -- int mxcsr, status; -+ int mxcsr; -+ short status; - - __fnstsw(&status); - if (__HAS_SSE()) ---- lib/msun/i387/fenv.h.orig 2007-01-06 18:46:23 -0300 -+++ lib/msun/i387/fenv.h 2008-06-14 01:06:40 -0300 -@@ -134,7 +134,8 @@ - static __inline int - fegetexceptflag(fexcept_t *__flagp, int __excepts) - { -- int __mxcsr, __status; -+ int __mxcsr; -+ short __status; - - __fnstsw(&__status); - if (__HAS_SSE()) -@@ -151,7 +152,8 @@ - static __inline int - fetestexcept(int __excepts) - { -- int __mxcsr, __status; -+ int __mxcsr; -+ short __status; - - __fnstsw(&__status); - if (__HAS_SSE()) ---- lib/msun/amd64/fenv.c.orig 2007-01-05 04:15:26 -0300 -+++ lib/msun/amd64/fenv.c 2008-06-14 01:02:41 -0300 -@@ -101,7 +101,8 @@ - int - feupdateenv(const fenv_t *envp) - { -- int mxcsr, status; -+ int mxcsr; -+ short status; - - __fnstsw(&status); - __stmxcsr(&mxcsr); ---- lib/msun/amd64/fenv.h.orig 2007-01-06 18:46:23 -0300 -+++ lib/msun/amd64/fenv.h 2008-06-14 01:08:23 -0300 -@@ -110,7 +110,8 @@ - static __inline int - fegetexceptflag(fexcept_t *__flagp, int __excepts) - { -- int __mxcsr, __status; -+ int __mxcsr; -+ short __status; - - __stmxcsr(&__mxcsr); - __fnstsw(&__status); -@@ -124,7 +125,8 @@ - static __inline int - fetestexcept(int __excepts) - { -- int __mxcsr, __status; -+ int __mxcsr; -+ short __status; - - __stmxcsr(&__mxcsr); - __fnstsw(&__status); diff --git a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch deleted file mode 100644 index 751a77c..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch +++ /dev/null @@ -1,13 +0,0 @@ -u_int is defined in sys/types.h -makes header usable alone. - ---- sys/sys/sysctl.h.old 2012-05-25 11:08:53.000000000 -0400 -+++ sys/sys/sysctl.h 2012-05-25 11:09:16.000000000 -0400 -@@ -788,6 +788,7 @@ - struct sysctl_req *); - #else /* !_KERNEL */ - #include <sys/cdefs.h> -+#include <sys/types.h> /* for u_int */ - - __BEGIN_DECLS - int sysctl(const int *, u_int, void *, size_t *, const void *, size_t); diff --git a/sys-freebsd/freebsd-lib/files/libmap.conf b/sys-freebsd/freebsd-lib/files/libmap.conf deleted file mode 100644 index 7a879f9..0000000 --- a/sys-freebsd/freebsd-lib/files/libmap.conf +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/libmap.conf - -# Ensure that libthr does all threading -libpthread.so.2 libthr.so.2 -libpthread.so libthr.so -libc_r.so.6 libthr.so.2 -libc_r.so libthr.so - diff --git a/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in b/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in deleted file mode 100644 index 058ecb4..0000000 --- a/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=@LIBDIR@ -includedir=${prefix}/include - -Name: libusb -Description: USB access library (FreeBSD version) -Version: 1.0.1 -Libs: -L${libdir} -lusb -Cflags: -I${includedir} - diff --git a/sys-freebsd/freebsd-lib/files/libusb.pc.in b/sys-freebsd/freebsd-lib/files/libusb.pc.in deleted file mode 100644 index f63c6e3..0000000 --- a/sys-freebsd/freebsd-lib/files/libusb.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=@LIBDIR@ -includedir=${prefix}/include - -Name: libusb -Description: USB access library (FreeBSD version) -Version: 0.1.12 -Libs: -L${libdir} -lusb -Cflags: -I${includedir} - diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild deleted file mode 100644 index 5265af2..0000000 --- a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild +++ /dev/null @@ -1,644 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build - -DESCRIPTION="FreeBSD's base system libraries" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -# Security Advisory and Errata patches. -# UPSTREAM_PATCHES=() - -# Crypto is needed to have an internal OpenSSL header -# sys is needed for libalias, probably we can just extract that instead of -# extracting the whole tarball -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - lib/ - contrib/ - crypto/ - libexec/ - etc/ - include/ - usr.sbin/ - gnu/ - secure/ -" - -if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then - RDEPEND="ssl? ( dev-libs/openssl:0= ) - hesiod? ( net-dns/hesiod ) - kerberos? ( app-crypt/heimdal ) - usb? ( !dev-libs/libusb ) - zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) - >=dev-libs/expat-2.0.1 - >=dev-util/dialog-1.2.20150225 - =sys-freebsd/freebsd-libexec-${RV}* - !sys-libs/libutempter - !dev-libs/libelf - !dev-libs/libexecinfo - !dev-libs/libiconv - !sys-freebsd/freebsd-headers" - DEPEND="${RDEPEND} - >=sys-devel/flex-2.5.31-r2 - =sys-freebsd/freebsd-sources-${RV}*" - RDEPEND="${RDEPEND} - =sys-freebsd/freebsd-share-${RV}* - >=virtual/libiconv-0-r2" -else - EXTRACTONLY+="sys/ " -fi - -DEPEND="${DEPEND} - userland_GNU? ( sys-apps/mtree ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -S="${WORKDIR}/lib" - -export CTARGET=${CTARGET:-${CHOST}} -if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then - export CTARGET=${CATEGORY/cross-} -fi - -IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware - build crosscompile_opts_headers-only zfs - userland_GNU userland_BSD" - -QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7" - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="sys/ " - use zfs && EXTRACTONLY+="cddl/ " - - [ -c /dev/zero ] || \ - die "You forgot to mount /dev; the compiled libc would break." - - if ! use ssl && use kerberos; then - eerror "If you want kerberos support you need to enable ssl support, too." - fi - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " - use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= " - - if [ "${CTARGET}" != "${CHOST}" ]; then - mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" - mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})" - fi -} - -PATCHES=( - "${FILESDIR}/${PN}-6.0-pmc.patch" - "${FILESDIR}/${PN}-10.0-atfcxx.patch" - "${FILESDIR}/${PN}-9.0-bluetooth.patch" - "${FILESDIR}/${PN}-11.0-workaround.patch" - "${FILESDIR}/${PN}-11.0-bsdxml2expat.patch" - "${FILESDIR}/${PN}-11.0-libsysdecode.patch" - "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" - "${FILESDIR}/${PN}-add-nossp-cflags.patch" - ) -# Here we disable and remove source which we don't need or want -# In order: -# - ncurses stuff -# - libexpat creates a bsdxml library which is the same as expat -# - archiving libraries (have their own ebuild) -# - sendmail libraries (they are installed by sendmail) -# - SNMP library and dependency (have their own ebuilds) -# - libstand: static library, 32bits on amd64 used for boot0, we build it from -# boot0 instead. -# -# The rest are libraries we already have somewhere else because -# they are contribution. -REMOVE_SUBDIRS="ncurses \ - libexpat \ - libz libbz2 libarchive liblzma \ - libsm libsmdb libsmutil \ - libbegemot libbsnmp \ - libpam libpcap libwrap libmagic \ - libcom_err - libedit - libstand - libgssapi" - -# Are we building a cross-compiler? -is_crosscompile() { - [ "${CATEGORY#*cross-}" != "${CATEGORY}" ] -} - -src_prepare() { - # gcc-5.0 or later, Workaround for critical issue. bug 573358. - use x86-fbsd && [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 - - sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc" - - # Upstream Display Managers default to using VT7 - # We should make FreeBSD allow this by default - local x= - for x in "${WORKDIR}"/etc/etc.*/ttys ; do - sed -i.bak \ - -e '/ttyv5[[:space:]]/ a\ -# Display Managers default to VT7.\ -# If you use the xdm init script, keep ttyv6 commented out\ -# unless you force a different VT for the DM being used.' \ - -e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \ - || die "Failed to sed ${x}" - rm "${x}".bak - done - - # This one is here because it also - # patches "${WORKDIR}/include" - cd "${WORKDIR}" - epatch "${FILESDIR}/${PN}-includes.patch" - - # Don't install the hesiod man page or header - rm "${WORKDIR}"/include/hesiod.h || die - sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die - sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \ - "${WORKDIR}"/lib/libc/net/Makefile.inc || die - - # Fix the Makefiles of these few libraries that will overwrite our LDADD. - cd "${S}" - for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \ - libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \ - die "Problem fixing \"${dir}/Makefile" - done - # Call LD with LDFLAGS, rename them to RAW_LDFLAGS - sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \ - -i "${S}/csu/i386/Makefile" || die - - if install --version 2> /dev/null | grep -q GNU; then - sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" - fi - - # Try to fix sed calls for GNU sed. Do it only with GNU userland and force - # BSD's sed on BSD. - cd "${S}" - if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then - find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; - sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die - fi - - if use build; then - cd "${WORKDIR}" - # This patch has to be applied on ${WORKDIR}/sys, so we do it here since it - # shouldn't be a symlink to /usr/src/sys (which should be already patched) - epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch - return 0 - fi - - if ! is_crosscompile ; then - if [[ ! -e "${WORKDIR}/sys" ]]; then - ln -s "${SYSROOT}/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!" - fi - else - sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \ - "${S}/libc/rpc/Makefile.inc" \ - "${S}/libc/yp/Makefile.inc" - fi -} - -bootstrap_lib() { - for i ; do - cd "${WORKDIR}/${i}" || die "missing ${i}" - freebsd_src_compile - append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}" - done -} - -get_csudir() { - if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then - echo "lib/csu/$1-elf" - else - echo "lib/csu/$1" - fi -} - -bootstrap_csu() { - local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))" - export RAW_LDFLAGS=$(raw-ldflags) - bootstrap_lib "${csudir}" - - CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" - append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" - - bootstrap_lib "gnu/lib/csu" - - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" - for i in *.So ; do - ln -s $i ${i%.So}S.o - done - CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" - append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" -} - -# Compile libssp_nonshared.a and add it's path to LDFLAGS. -bootstrap_libssp_nonshared() { - bootstrap_lib "gnu/lib/libssp/libssp_nonshared" -} - -bootstrap_libgcc() { - bootstrap_lib "lib/libcompiler_rt" - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die - ln -s libcompiler_rt.a libgcc.a || die - - bootstrap_lib "lib/libc" "gnu/lib/libgcc" -} - -bootstrap_libthr() { - bootstrap_lib "lib/libthr" - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die - ln -s libthr.so libpthread.so -} - -# What to build for a cross-compiler. -# We also need the csu but this has to be handled separately. -CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared" - -# What to build for non-default ABIs. -NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules" - -# Subdirs for a native build: -NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules" - -# Is my $ABI native ? -is_native_abi() { - is_crosscompile && return 1 - multilib_is_native_abi -} - -# Do we need to bootstrap the csu and libssp_nonshared? -need_bootstrap() { - is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}" -} - -# Get the subdirs we are building. -get_subdirs() { - local ret="" - if is_native_abi ; then - # If we are building for the native ABI, build everything - ret="${NATIVE_SUBDIRS}" - elif is_crosscompile ; then - # With a cross-compiler we only build the very core parts. - ret="${CROSS_SUBDIRS}" - if [ "${EBUILD_PHASE}" = "install" ]; then - # Add the csu dir first when installing. We treat it separately for - # compiling. - ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}" - fi - else - # For the non-native ABIs we only build the csu parts and very core - # libraries for now. - ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))" - fi - echo "${ret}" -} - -# Bootstrap the core libraries and setup the flags so that the other parts can -# build against it. -do_bootstrap() { - einfo "Bootstrapping on ${CHOST} for ${CTARGET}" - if ! is_crosscompile ; then - # Pre-install headers, but not when building a cross-compiler since we - # assume they have been installed in the previous pass. - einfo "Pre-installing includes in include_proper_${ABI}" - mkdir "${WORKDIR}/include_proper_${ABI}" || die - CTARGET="${CHOST}" install_includes "/include_proper_${ABI}" - CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" - [[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1" - CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" - mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc" - fi - bootstrap_csu - bootstrap_libssp_nonshared - is_crosscompile && bootstrap_lib "lib/libc" - is_crosscompile || is_native_abi || bootstrap_libgcc - is_native_abi || bootstrap_libthr -} - -# Compile it. Assume we have the toolchain setup correctly. -do_compile() { - # Bootstrap if needed, otherwise assume the system headers are in - # /usr/include. - if need_bootstrap ; then - do_bootstrap - else - CFLAGS="${CFLAGS} -isystem /usr/include" - [[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1" - CXXFLAGS="${CXXFLAGS} -isystem /usr/include" - fi - - export RAW_LDFLAGS=$(raw-ldflags) - - # Everything is now setup, build it! - for i in $(get_subdirs) ; do - einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}" - cd "${WORKDIR}/${i}/" || die "missing ${i}." - freebsd_src_compile || die "make ${i} failed" - done -} - -src_compile() { - # Does not work with GNU sed - # Force BSD's sed on BSD. - if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then - export ESED=/usr/bin/sed - unalias sed - fi - - use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid" - - cd "${WORKDIR}/include" - $(freebsd_get_bmake) CC="$(tc-getCC)" SRCTOP="${WORKDIR}" || die "make include failed" - - use crosscompile_opts_headers-only && return 0 - - # Bug #270098 - append-flags $(test-flags -fno-strict-aliasing) - - # Bug #324445 - append-flags $(test-flags -fno-strict-overflow) - - # strip flags and do not do it later, we only add safe, and in fact - # needed flags after all - strip-flags - export NOFLAGSTRIP=yes - if is_crosscompile ; then - export YACC='yacc -by' - CHOST=${CTARGET} tc-export CC LD CXX RANLIB - mymakeopts="${mymakeopts} NLS=" - CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include" - CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include" - append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc" - fi - - if is_crosscompile ; then - do_compile - else - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile - fi -} - -gen_libc_ldscript() { - # Parameters: - # $1 = target libdir - # $2 = source libc dir - # $3 = source libssp_nonshared dir - - # Clear the symlink. - rm -f "${DESTDIR}/$2/libc.so" || die - - # Move the library if needed - if [ "$1" != "$2" ] ; then - mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die - fi - - # Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking - # this is done to avoid having to touch gcc spec file as it is currently - # done on FreeBSD upstream, mostly because their binutils aren't able to - # cope with linker scripts yet. - # Taken from toolchain-funcs.eclass: - local output_format - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" - - # iconv symbol provided by libc_nonshared.a. - # http://svnweb.freebsd.org/base?view=revision&revision=258283 - cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT -/* GNU ld script - SSP (-fstack-protector) requires __stack_chk_fail_local to be local. - GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if - this symbol was provided by a shared libc. So we link in - libssp_nonshared.a from here. - */ -${output_format} -GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a ) -END_LDSCRIPT -} - -header_list="" - -move_header() { - local dirname=$(dirname ${1}) - local filename=$(basename ${1}) - - if [ ! -d "${dirname}/${ABI}" ] ; then - mkdir "${dirname}/${ABI}" || die - fi - - mv "${1}" "${dirname}/${ABI}/" || die - - export header_list="${header_list} ${1}" -} - -make_header_template() { - cat <<-END_HEADER -/* - * Wrapped header for multilib support. - * See the real headers included below. - */ - -#if defined(__x86_64__) - @ABI_amd64_fbsd@ -#elif defined(__i386__) - @ABI_x86_fbsd@ -#else - @ABI_${DEFAULT_ABI}@ -#endif -END_HEADER -} - -wrap_header() { - local dirname=$(dirname ${1}) - local filename=$(basename ${1}) - - if [ -n "${dirname#.}" ] ; then - dirname="${dirname}/${2}" - else - dirname="${2}" - fi - - if [ -f "${dirname}/${filename}" ] ; then - sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1} - else - cat ${1} - fi -} - -wrap_header_end() { - sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1} -} - -do_install() { - if is_crosscompile ; then - INCLUDEDIR="/usr/${CTARGET}/usr/include" - else - INCLUDEDIR="/usr/include" - fi - - dodir ${INCLUDEDIR} - CTARGET="${CHOST}" \ - install_includes ${INCLUDEDIR} - - is_crosscompile && use crosscompile_opts_headers-only && return 0 - - # Install a libusb.pc for better compat with Linux's libusb - if use usb ; then - dodir /usr/$(get_libdir)/pkgconfig - sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc - fi - - for i in $(get_subdirs) ; do - if [[ ${i} != *libiconv_modules* ]] ; then - einfo "Installing in ${i}..." - cd "${WORKDIR}/${i}/" || die "missing ${i}." - freebsd_src_install || die "Install ${i} failed" - fi - done - - if ! is_crosscompile; then - local mymakeopts_save="${mymakeopts}" - mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n" - - einfo "Installing in lib/libiconv_modules..." - cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules." - freebsd_src_install || die "Install lib/libiconv_modules failed" - - mymakeopts="${mymakeopts_save}" - fi - - if ! is_crosscompile ; then - if ! multilib_is_native_abi ; then - DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" - else - dodir "$(get_libdir)" - DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" - fi - else - CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib" - # We're done for the cross libc here. - return 0 - fi - - # Generate ldscripts for core libraries that will go in / - multilib_is_native_abi && \ - gen_usr_ldscript -a alias cam geom ipsec jail kiconv \ - kvm m md procstat sbuf thr ufs util elf - - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then - cd "${D}/usr/include" - for i in machine/*.h fenv.h ; do - move_header ${i} - done - if multilib_is_native_abi ; then - # Supposedly the last one! - local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')" - for j in ${uniq_headers} ; do - make_header_template > ${j} - for i in $(get_all_abis) ; do - wrap_header ${j} ${i} > ${j}.new - cp ${j}.new ${j} - rm -f ${j}.new - done - wrap_header_end ${j} > ${j}.new - cp ${j}.new ${j} - rm -f ${j}.new - done - fi - fi -} - -src_install() { - if is_crosscompile ; then - einfo "Installing for ${CTARGET} in ${CHOST}.." - # From this point we need to force: get stripped with the correct tools, - # get tc-arch-kernel to return the right value, etc. - export CHOST=${CTARGET} - - mymakeopts="${mymakeopts} WITHOUT_MAN= \ - INCLUDEDIR=/usr/${CTARGET}/usr/include \ - SHLIBDIR=/usr/${CTARGET}/usr/lib \ - LIBDIR=/usr/${CTARGET}/usr/lib" - - dosym "usr/include" "/usr/${CTARGET}/sys-include" - do_install - - return 0 - else - export STRIP_MASK="*/usr/lib*/*crt*.o" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install - fi - - cd "${WORKDIR}/etc/" - insinto /etc - doins nls.alias mac.conf netconfig - - # Install ttys file - local MACHINE="$(tc-arch-kernel)" - doins "etc.${MACHINE}"/* -} - -install_includes() -{ - local INCLUDEDIR="$1" - - # The idea is to be called from either install or unpack. - # During unpack it's required to install them as portage's user. - if [[ "${EBUILD_PHASE}" == "install" ]]; then - local DESTDIR="${D}" - BINOWN="root" - BINGRP="wheel" - else - local DESTDIR="${WORKDIR}" - [[ -z "${USER}" ]] && USER="portage" - BINOWN="${USER}" - [[ -z "${GROUPS}" ]] && GROUPS="portage" - BINGRP="${GROUPS}" - fi - - # Must exist before we use it. - [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes." - cd "${WORKDIR}/include" - - local MACHINE="$(tc-arch-kernel)" - - einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." - $(freebsd_get_bmake) installincludes \ - MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ - DESTDIR="${DESTDIR}" \ - INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ - BINGRP="${BINGRP}" \ - WITHOUT_GSSAPI= \ - SRCTOP="${WORKDIR}"|| die "install_includes() failed" - einfo "includes installed ok." - EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex lib/libcasper lib/libmp" - for i in $EXTRA_INCLUDES; do - einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." - cd "${WORKDIR}/$i" || die - $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ - MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ - INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ - BINGRP="${BINGRP}" \ - SRCTOP="${WORKDIR}" || die "problem installing $i includes." - einfo "$i includes installed ok." - done -} diff --git a/sys-freebsd/freebsd-lib/metadata.xml b/sys-freebsd/freebsd-lib/metadata.xml deleted file mode 100644 index 24ca540..0000000 --- a/sys-freebsd/freebsd-lib/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> - </maintainer> - <use> - <flag name="hesiod">Enable support for net-dns/hesiod</flag> - <flag name="netware"> - Build libraries and tools to work with NetWare protocols (IPX - and NCP). - </flag> - <flag name="zfs">Enable ZFS support.</flag> - </use> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest deleted file mode 100644 index 2d67c7a..0000000 --- a/sys-freebsd/freebsd-libexec/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX bootpd.confd 183 SHA256 c70c6a7a99470354a5f61bfe5c0f71325f4896e41da150e782223a30f07a275c SHA512 3f097c1acb5547add8d12fcee0b4b55b03896cb3ba473214d1634804f3683e0dea4b3c9559b61b2366b7f264d7a3d878695e16f29acff076b8060ca1fd79757f WHIRLPOOL c6721ac9b3ba70268fdba8c81ad9225e26049a5eb5ef8ea9bccc5fbbe7a110defe15df1d27b1c4b54f92e19d7d8b2099f87e7972faa0e5ddf17b66d30e26e0ad -AUX bootpd.initd 554 SHA256 a1b1160a3e3d8f068a446ba5c9210737e120130fe173e68026263b7d057efb7e SHA512 69bc8dc708d955e41d3e0cfb997f96b589e8a3d33b11b2728541082fc5ab0844d753ca036a6c70ddd23a2a0085c39a89340b0f7d332b1384c94671cf3fe09b66 WHIRLPOOL 4764e746340fa0ace0310880a8ac13852df14ca14ba077610b5bfea09a45c093d064b5a534ed6e3dd839c869cf0c8013bcfe022814793ecc5f6e38cc08335f92 -AUX freebsd-libexec-10.2-atf-check.patch 809 SHA256 75cddd83ece1a3be8c10c0e2fd335180738d5b6a6b01b89e51d5c53243e54f46 SHA512 46b265db484d707e9e65906e8d5b3dbb06223c1c229c78b6cb92864f4a4a017b61cfd2de35e5533bae2eb8867adea5e1732c279bc5d90e60d07646b9a4b06681 WHIRLPOOL 77f069b1c649dd6f37ed4b0343c43609c7bc9efb09ebd0e22449a5db7d8eabbb9a870127974639108ceb3bf272bca64a3358809ea2a6a89296ac2097125cefc2 -AUX freebsd-libexec-7.2-pic.patch 348 SHA256 424ed7b69067d3a3a77ad387026548b77d41412f52ae17c737e96e57b6cb3b0f SHA512 c77297582efccd799f6d0e67c0976f1ee5551617abf2df9ccd0e2fc0abd7fb76ecaf7f5e019356034fb47d3cc39590a5eecd9b9868d2c356467e43e845638ab5 WHIRLPOOL 6407b4f3781b56aeb62252f87f7522e38930e24952610938a05cad24c0b56c62dac8b8b517c5805699432f3d3b4b59e31784def6aa38ca6b8a6c8aabace40712 -AUX freebsd-libexec-8.2-rtld.patch 1332 SHA256 0f0dc285b4797ab3be266db02f905ca72ffb39589c927311f74678acd9517e4d SHA512 9abbac7dfb703a05b3f6f1d3dc96db7df106355e3641eeb6fb446ea5f9ba15cfb9375e00bfa02b5ae26e4c9cdb52e14e2260981908c40e2c44549a43a2865ad6 WHIRLPOOL 41489254c1f800208bc0ff2548d109cd34a84c025f5428f85c7aada69c5cbbe3f165410cc58dff773b7e792c9c9145580423f55f120f0e29159b251fc7e99d0c -AUX freebsd-libexec-9.2-no_ld32.patch 634 SHA256 ee5568c2ffbff4cf73c87401e5eb93165e813a2ff252d953a95fc4294dd2ace8 SHA512 df5421ad4d07d9f3d5f8dfd110eca588848ff55a63c70adf76f90746c1156ac50004a79bb626783ada8f96060fdd37e153e64da6ed43148c02a8eae4493c18d8 WHIRLPOOL d11ddc097a8ff171d143c655c1f2c9dd4ee3ff5e7bd6693bbd7c5d065e72c4d9e2c5a3521b9701ea0a3c7f5234fb174675373e68fb65cbb41c95133db6eb53f5 -AUX ftpd.pamd 192 SHA256 4b789fb18bc0d1f9b0a9b0f1bf5dac6d86166a7106e966e5f65ffd4faf5ce024 SHA512 d7e7f08ef05ccc63e63ddc65d79f96106dfa0ec2421ee9fbbb83966aaccb73d9868cb14467c1bdfaa9d12299a8ad27cbc725a33fec58e47b5b8212e52a7c18eb WHIRLPOOL 1d418e336dec5b6c34541c11068fd19ffe7546d338851f47359c50c18bc382c84230c0d751fa8185d48ca1c67250ba320fec895fc92f96c1d6909647db67a54a -AUX rquotad.xinetd 162 SHA256 3f73f86e5a6ab3b6d25698f6179cdbe169b2fd01c682b45a9c8711f36bb317e5 SHA512 2cf16514f18abe2aeaa273fabc2dc94b09f31d02001ece5c82d9336c02d921e03dff6f82a613a4bffe57b5e415add2b82ef883a306907dd20ffe1bbe332b011f WHIRLPOOL 237667cbff4807d703a3c4c4eb8c2c5863d024a6263e3addf8d96ffa1461a8d1cda6318deee1de72146d27305b670b501da9ad4035880551dee5138b6798f6c6 -AUX rstatd.xinetd 218 SHA256 7bf526babdd46f03a6ea9ed12b5df16e5c2abc8aeb567214c8edb8ac327d4381 SHA512 febca8ab8248b1c103dd7be0806e3d678c5b5cf165a7b3bd0305bc905da228bf92392d65d44a765b7692f772befeedcbc3df205d32bb62ad5aa307f71a1c1011 WHIRLPOOL 76f8b1f3f85e97f27950549f62dc411e0620b25eba68c161c96a5252617c7c4beb0fecf94af9bc9cf931dff8fc4c750e780c41143a50b39d7538a30b7c0bd322 -AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e99181408067a49cd3 SHA512 fdf4ef4e0b0dd11c64fb38d32c9fca2d378a69e4cff87523127089d7dc0db12b26f6399c7a61fc43d62ca8083b116440f6fffff9e3329f0548bf54f0f26699cd WHIRLPOOL 7517089e5ab5b3925b46908c22a929cb04c8390387ad075f17c2fa0213ab38cae833d9280cfe289915afe4c2ee0b3e0299cee42daa871c23507f5f96cc22f227 -AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f -AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802 -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-libexec-11.0.ebuild 4156 SHA256 280c2f86164a03c6f29c9b1a97052a96e3440db3a5b7089f7bcc0e78f6b6a240 SHA512 2358f3abf07776f07bdf2b35d3115c2b9db3d9808970827e41574ece785cf2a9c8fd4179b896883d572717b9e1fade88239403d50898a1b3359cdb80fdcf130f WHIRLPOOL c71f337efb4120a4e28e7df79b63394e110bc5e583b68327c485f750028b4f872d789a98fba9e031c56262bd916617a17e3b3a97377280931b0faf5f7b236f30 -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-libexec/files/bootpd.confd b/sys-freebsd/freebsd-libexec/files/bootpd.confd deleted file mode 100644 index 6d238e4..0000000 --- a/sys-freebsd/freebsd-libexec/files/bootpd.confd +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration file for /etc/init.d/bootpd - -# Name of the configuration file for bootpd -# bootptab_file="/etc/bootptab" - -# Options to pass to bootpd. See bootpd(8). -# bootpd_opts="" diff --git a/sys-freebsd/freebsd-libexec/files/bootpd.initd b/sys-freebsd/freebsd-libexec/files/bootpd.initd deleted file mode 100644 index 82288eb..0000000 --- a/sys-freebsd/freebsd-libexec/files/bootpd.initd +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - local bootptab=${bootptab_file:-/etc/bootptab} - - if ! [ -f "${bootptab}" ]; then - eerror "Unable to find the bootptab file: ${bootptab}" - eend 1 - return 1 - fi - - ebegin "Starting BOOTP server" - start-stop-daemon --start --exec /usr/libexec/bootpd -- ${bootpd_opts} ${bootptab} - eend $? -} - -stop() { - ebegin "Stopping BOOTP server" - start-stop-daemon --stop --exec /usr/libexec/bootpd - eend $? -} diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch deleted file mode 100644 index e9c0925..0000000 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc -index b50e14e..e59a413 100644 ---- a/libexec/atf/Makefile.inc -+++ b/libexec/atf/Makefile.inc -@@ -25,7 +25,7 @@ - # - # $FreeBSD: stable/10/libexec/atf/Makefile.inc 271298 2014-09-09 04:00:30Z ngie $ - --CFLAGS+= -DHAVE_CONFIG_H -+CXXFLAGS+= -DHAVE_CONFIG_H - - WARNS?= 3 - -diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile -index 77c11db..7449ddb 100644 ---- a/libexec/atf/atf-check/Makefile -+++ b/libexec/atf/atf-check/Makefile -@@ -34,8 +34,8 @@ PROG_CXX= atf-check - SRCS= atf-check.cpp - MAN= atf-check.1 - --CFLAGS+= -I${ATF} --CFLAGS+= -DATF_SHELL='"/bin/sh"' -+CXXFLAGS+= -I${ATF} -+CXXFLAGS+= -DATF_SHELL='"/bin/sh"' - - LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c++ - LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch deleted file mode 100644 index 22d5658..0000000 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fails to build on sparc without using -fPIC - ---- libexec/rtld-elf/Makefile.old 2010-01-09 17:17:21 +0100 -+++ libexec/rtld-elf/Makefile 2010-01-09 17:17:33 +0100 -@@ -19,7 +19,7 @@ - MLINKS= rtld.1 ld-elf.so.1.1 \ - rtld.1 ld.so.1 - --CFLAGS+= -fpic -DPIC -+CFLAGS+= -fPIC -DPIC - LDFLAGS+= -shared -Wl,-Bsymbolic - DPADD= ${LIBC_PIC} - LDADD= -lc_pic diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch deleted file mode 100644 index c60b2fe..0000000 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- head/libexec/rtld-elf/rtld.c 2011/09/15 11:50:09 225582 -+++ head/libexec/rtld-elf/rtld.c 2011/10/08 12:39:47 226155 -@@ -495,8 +495,12 @@ - exit (0); - } - -- /* setup TLS for main thread */ -- dbg("initializing initial thread local storage"); -+ /* -+ * Processing tls relocations requires having the tls offsets -+ * initialized. Prepare offsets before starting initial -+ * relocation processing. -+ */ -+ dbg("initializing initial thread local storage offsets"); - STAILQ_FOREACH(entry, &list_main, link) { - /* - * Allocate all the initial objects out of the static TLS -@@ -504,7 +508,6 @@ - */ - allocate_tls_offset(entry->obj); - } -- allocate_initial_tls(obj_list); - - if (relocate_objects(obj_main, - ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, NULL) == -1) -@@ -519,6 +522,14 @@ - exit (0); - } - -+ /* -+ * Setup TLS for main thread. This must be done after the -+ * relocations are processed, since tls initialization section -+ * might be the subject for relocations. -+ */ -+ dbg("initializing initial thread local storage"); -+ allocate_initial_tls(obj_list); -+ - dbg("initializing key program variables"); - set_program_var("__progname", argv[0] != NULL ? basename(argv[0]) : ""); - set_program_var("environ", env); diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch deleted file mode 100644 index d330009..0000000 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch +++ /dev/null @@ -1,15 +0,0 @@ -Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*. -We use LD_* everywhere on Gentoo and things like libtool wrappers have no clue -about LD_32_* and thus fail to run from the build directory. - -diff -uNr libexec.old/rtld-elf/rtld.h libexec/rtld-elf/rtld.h ---- libexec.old/rtld-elf/rtld.h 2013-08-24 12:30:26.000000000 -0400 -+++ libexec/rtld-elf/rtld.h 2013-08-26 17:10:19.000000000 -0400 -@@ -47,7 +47,6 @@ - #define _PATH_ELF_HINTS "/var/run/ld-elf32.so.hints" - /* For running 32 bit binaries */ - #define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32" --#define LD_ "LD_32_" - #endif - - #ifndef STANDARD_LIBRARY_PATH diff --git a/sys-freebsd/freebsd-libexec/files/ftpd.pamd b/sys-freebsd/freebsd-libexec/files/ftpd.pamd deleted file mode 100644 index 8e90823..0000000 --- a/sys-freebsd/freebsd-libexec/files/ftpd.pamd +++ /dev/null @@ -1,8 +0,0 @@ -# PAM configuration for the "ftpd" service -# - -auth include system-auth -account include system-auth -password include system-auth -session include system-auth - diff --git a/sys-freebsd/freebsd-libexec/files/rquotad.xinetd b/sys-freebsd/freebsd-libexec/files/rquotad.xinetd deleted file mode 100644 index 876cd16..0000000 --- a/sys-freebsd/freebsd-libexec/files/rquotad.xinetd +++ /dev/null @@ -1,11 +0,0 @@ -service rquotad -{ - type = rpc - socket_type = dgram - protocol = udp - wait = yes - user = root - server = /usr/libexec/rpc.rquotad - rpc_version = 1 - disabled = yes -} diff --git a/sys-freebsd/freebsd-libexec/files/rstatd.xinetd b/sys-freebsd/freebsd-libexec/files/rstatd.xinetd deleted file mode 100644 index ba1b819..0000000 --- a/sys-freebsd/freebsd-libexec/files/rstatd.xinetd +++ /dev/null @@ -1,11 +0,0 @@ -service rstatd -{ - type = rpc - socket_type = dgram - protocol = udp - wait = yes - user = root - server = /usr/libexec/rpc.rstatd - rpc_version = 1-3 - disabled = yes -} diff --git a/sys-freebsd/freebsd-libexec/files/rusersd.xinetd b/sys-freebsd/freebsd-libexec/files/rusersd.xinetd deleted file mode 100644 index 5cbe091..0000000 --- a/sys-freebsd/freebsd-libexec/files/rusersd.xinetd +++ /dev/null @@ -1,11 +0,0 @@ -service rusersd -{ - type = rpc - socket_type = dgram - protocol = udp - wait = yes - user = root - server = /usr/libexec/rpc.rusersd - rpc_version = 1-2 - disabled = yes -} diff --git a/sys-freebsd/freebsd-libexec/files/sprayd.xinetd b/sys-freebsd/freebsd-libexec/files/sprayd.xinetd deleted file mode 100644 index 7be5577..0000000 --- a/sys-freebsd/freebsd-libexec/files/sprayd.xinetd +++ /dev/null @@ -1,11 +0,0 @@ -service sprayd -{ - type = rpc - socket_type = dgram - protocol = udp - wait = yes - user = root - server = /usr/libexec/rpc.sprayd - rpc_version = 1 - disabled = yes -} diff --git a/sys-freebsd/freebsd-libexec/files/walld.xinetd b/sys-freebsd/freebsd-libexec/files/walld.xinetd deleted file mode 100644 index 800b84f..0000000 --- a/sys-freebsd/freebsd-libexec/files/walld.xinetd +++ /dev/null @@ -1,11 +0,0 @@ -service walld -{ - type = rpc - socket_type = dgram - protocol = udp - wait = yes - user = root - server = /usr/libexec/rpc.rwalld - rpc_version = 1 - disabled = yes -} diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild deleted file mode 100644 index 8aea14d..0000000 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs - -DESCRIPTION="FreeBSD libexec things" -SLOT="0" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - libexec/ - usr.bin/ - bin/ - contrib/blacklist/ - contrib/dma/ - contrib/hyperv/ - contrib/telnet/ - lib/ - etc/ - usr.sbin/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}] - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" -RDEPEND="${RDEPEND} - xinetd? ( sys-apps/xinetd )" - -S="${WORKDIR}/libexec" - -# Remove sendmail, tcp_wrapper and other useless stuff -REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd" - -IUSE="pam ssl kerberos ipv6 nis xinetd" - -PATCHES=( "${FILESDIR}/${PN}-10.2-atf-check.patch" ) - -pkg_setup() { - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " - use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= " - - if has_version "<sys-freebsd/freebsd-libexec-11.0"; then - REMOVE_SUBDIRS="${REMOVE_SUBDIRS} rpc.rstatd ulog-helper" - fi - - if has_version "<sys-freebsd/freebsd-ubin-11.0"; then - mymakeopts="${mymakeopts} WITHOUT_MAN_UTILS= " - fi - - if has_version "<sys-freebsd/freebsd-share-${RV}"; then - die ">=sys-freebsd/freebsd-share-${RV} is required." - fi -} - -src_prepare() { - # gcc-5.0 or later, Workaround for critical issue. bug 573358. - [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 - - if [[ ! -e "${WORKDIR}/include" ]]; then - ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.." - fi - # allow upgrade directly from 9.x to 10.2. - if has_version "<sys-freebsd/freebsd-lib-${RV}"; then - # taken from sys/sys/elf_common.h - echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h - echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h - echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h - echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h - echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h - echo "#define NT_FREEBSD_ABI_TAG 1" >> "${S}"/rtld-elf/rtld.h - echo "#define NT_FREEBSD_NOINIT_TAG 2" >> "${S}"/rtld-elf/rtld.h - # taken from sys/sys/fcntl.h - echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h - echo "#define O_VERIFY 0x00200000" >> "${S}"/rtld-elf/rtld.h - # taken from sys/sys/cdefs.h - echo '#define __compiler_membar() __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h - # taken from sys/sys/mman.h - echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h - echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h - echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h - echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h - - export mymakeopts="${mymakeopts} WITHOUT_SYMVER= WITHOUT_BLACKLIST_SUPPORT= " - fi -} - -setup_multilib_vars() { - if ! multilib_is_native_abi ; then - cd "${WORKDIR}/libexec/rtld-elf" || die - export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1" - else - cd "${S}" || die - fi - "$@" -} - -src_compile() { - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -} - -src_install() { - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install - - insinto /etc - doins "${WORKDIR}/etc/gettytab" - newinitd "${FILESDIR}/bootpd.initd" bootpd - newconfd "${FILESDIR}/bootpd.confd" bootpd - - if use xinetd; then - for rpcd in rstatd rusersd walld rquotad sprayd; do - insinto /etc/xinetd.d - newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd} - done - fi -} diff --git a/sys-freebsd/freebsd-libexec/metadata.xml b/sys-freebsd/freebsd-libexec/metadata.xml deleted file mode 100644 index a00f3ae..0000000 --- a/sys-freebsd/freebsd-libexec/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> -</maintainer> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest deleted file mode 100644 index f74b1f5..0000000 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX freebsd-mk-defs-10.2-gnu.patch 1853 SHA256 acc69cba0617496e6dcef543198bf5023fb1799b81a458451f58ea2fe63e46a1 SHA512 3913287e294a09bf17a06b8878de40995c27e63c64e79711112c8fc60bb1630e757e8df2ba4ee41720270776ed5df06d7f1cfb9c09e20b566653023466e01a1e WHIRLPOOL 1db20b2a7e39da3b86a4fb09c42980c6c028b1b46baac55c334abccea87f8c6c59f1c3aaa753bcbc2c08e9bad17d342410ca882a75e37edcf9bdfd26ac7ec1ba -AUX freebsd-mk-defs-10.3-gentoo.patch 11845 SHA256 2298f4bead99ffed440d92c7b0d5ff81542bce0cbf07a3fe99f920201297d010 SHA512 05d0366b58e02ff11e6fa34cd3f731a06e5d4464eee92f05128e2b68bf6b2539e792489a44ff9e224bb994fcdc6807c19be7aaa459163bb900c8ee130b6a4c11 WHIRLPOOL 3bfdda2ebfa3ba81ad7464845c9ca9c81c438a0becf848e960d2a30171d506ae868aa5b5151cfce6f5390a5d487e423112c56eb8a4be24885e1df28a256c2da7 -AUX freebsd-mk-defs-11.0-drop-unsupport-cflags.patch 461 SHA256 4f592c92b88173156bb4688ccc2f26d79a37fa2c9905fc93286291fe80fb9533 SHA512 82275fe36338a31f1da5ed7d60d72e3f7f5eb3c8e029700afbcb9bc6219dc3051f35a49d33694d553fb8bce0dcf2fbdfbead5bc6e074fa7d9aebda19da603168 WHIRLPOOL de041217c36baee221543ebfd6fd202bd8a7f753d27cb9118f8c38b4f94bdde6b6726db6967a007f6ed6aba4b65e39aa139ae374858b32e5a895cb7bd3335d33 -AUX freebsd-mk-defs-11.0-gentoo.patch 12840 SHA256 30b491c6037f302f62c6d7d9cec93d32b03333ded0dc4bf54dbd37b0394801c6 SHA512 1b070418a5cb5739c55dc8f3e146ccd1390031ec6c13283573900922cd547310e0ccc18093c81df8836c3f78d6ce4279c3b56d6ad059ecb1d09f2b55b781ff79 WHIRLPOOL 1e3d87efa5303586218e9719e9d7aa86b9168413638c7b98cb64ff670f30c84d024627c66e8f53f8227c62b945333a8d625160caaaa9b7ce943718a8556c9736 -AUX freebsd-mk-defs-11.0-gnu.patch 1946 SHA256 37005860ec5ecb6fb916668af794f43bdc6fa64a79b01ab01e93cb1156ae1435 SHA512 bda6a5396c653b964426a3de80ed9c37205d30f3a863f7df231e0cc708ce3bca65ef46f2ca8bf63ea9a37309e2d3ac74ccbf0000e147688be686c998d940ded0 WHIRLPOOL f6d4a3cc293e87789827a81e8ddd1c81226dc1bb7f894c8a397b494ae418fdc5a75ac1055ff11ff70a3deec9dbc4fb971d580d9ed588f6de9f18a11f584b2109 -AUX freebsd-mk-defs-11.0-libproc-libcxx.patch 369 SHA256 dbefba73ba46a51a252fe17dbd0530df9fcf613ea990bdfa75689151e24d9ef8 SHA512 87de2c90588bccdc2e74ee206f2ca4135fbf5a4674d8400479d5eb08575a30a5b421bb81008ae1cf577e7acbebdc951fd1bd204b7b99f2818343c3f74ed59545 WHIRLPOOL 1a6df92d61ac0d72ce04c0989377e63a08f995990abb0d7c6fbe876594bf005c6fc277d2fc63b54e5f1dafbf7c1d1740da263a6441fede72d13eb617fae4713b -AUX freebsd-mk-defs-11.0-rename-libs.patch 478 SHA256 a776bf656af7c328d2cd02c13e95e2c869240476459d8129e0227254e79a0847 SHA512 e07091f6b91d4d02cc6db5f76e0fbddc682f594dc5b9176cf282758253eddfb03093f4ef0b0bb5c514724d6065a6a4784e518526b32a86c7b344f43cb1e56ec2 WHIRLPOOL 5e175ca3eba51680ae1fdd54dfe92eff92f83de4d9b589d7067e0cdd4480991b264da01a28f2a3e237cfe781332ca26e5bbc12f61c5fc9f8e90646a438df0a87 -AUX freebsd-mk-defs-8.0-gentoo.patch 11076 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5 SHA512 3b3e828ac0f5cafdd3f3ef84ae2e0ea5eb36d9c3d465800d1234d8b405b727628b82ca691513bb47c609dbb7767cfb8f16be05f7eefa361a96cb8f282569e480 WHIRLPOOL ae4a0110d88e584ee650fdb04847a29c285e40f4a5a931fbbc21fefeccd4a3a7b948a15f0a9b09b9672e662de55dd4e293d3745c12eacb0dac3ec7d7f433b973 -AUX freebsd-mk-defs-8.0-gnu.patch 4074 SHA256 00034d4d94ec011f595864113d469ec83d11786802b997b2350e955c6d2d64a0 SHA512 8196f6f01059dd7890af9e0e0be654ad264938f4e8c9a209543b995baf6be43d841417ba8b8340c3c092c8d5f14ad76d578ddcd9267c372999b857ca9a566f03 WHIRLPOOL 28a4600e93855aba192d326beb479743890814c68999290d65a94e7cfa636db897c2c2a2c4ac177a87f8af12ff0a51c1b8ba5a8bb22802e0ef695e7418469d70 -AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924 -AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6 -AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 SHA256 fa9f47aa7bee35feee0462b6c91995f648143384c547326bcec3b58f69d3db5b SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 WHIRLPOOL 98c8fd10f85e9b2e780ef639de932caaa68ae4da50d7417601ae3366d119445364d15307016561b11fa91e4849a0ba45599a85b988702688e15ebd44457883c1 -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-mk-defs-11.0.ebuild 1156 SHA256 26382098451176e61b1e9309389fa3dba8d8855b12c5bd53d05feacf3bfc8c01 SHA512 55391c3f2779056847eaa491ca5bff09c0ef0f15f989c702b62358c962a0fa005de0134f2b116809888edc75c9d97352bfe4828bd644ff77d47fcb8172331604 WHIRLPOOL d835a323d911b31bf390c253e3aa0ab31cca28207e1c91ce9db743459c6d42de5ebb9f49840f336e62002443d2cd3bb3803000603cd9fdd971f94df75c1f0994 -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch deleted file mode 100644 index b88fde2..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk -index 80549d8..fd2aac5 100644 ---- a/share/mk/bsd.lib.mk -+++ b/share/mk/bsd.lib.mk -@@ -173,7 +173,7 @@ _LIBS= lib${LIB}.a - lib${LIB}.a: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library - @rm -f ${.TARGET} -- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} -+ @${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} - ${RANLIB} ${RANLIBFLAGS} ${.TARGET} - .endif - -@@ -186,7 +186,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} - lib${LIB}_p.a: ${POBJS} - @${ECHO} building profiled ${LIB} library - @rm -f ${.TARGET} -- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} -+ @${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD} - ${RANLIB} ${RANLIBFLAGS} ${.TARGET} - .endif - -@@ -215,7 +215,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} - .endif - ${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ - -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} - .if ${MK_CTF} != "no" - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} - .endif -@@ -273,13 +273,6 @@ _EXTRADEPEND: - - .if !target(install) - --.if defined(PRECIOUSLIB) --.if !defined(NO_FSCHG) --SHLINSTALLFLAGS+= -fschg --.endif --SHLINSTALLFLAGS+= -S --.endif -- - _INSTALLFLAGS:= ${INSTALLFLAGS} - .for ie in ${INSTALLFLAGS_EDIT} - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} -diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk -index 19ad99f..46c4b09 100644 ---- a/share/mk/bsd.prog.mk -+++ b/share/mk/bsd.prog.mk -@@ -179,13 +179,6 @@ _EXTRADEPEND: - - .if !target(install) - --.if defined(PRECIOUSPROG) --.if !defined(NO_FSCHG) --INSTALLFLAGS+= -fschg --.endif --INSTALLFLAGS+= -S --.endif -- - _INSTALLFLAGS:= ${INSTALLFLAGS} - .for ie in ${INSTALLFLAGS_EDIT} - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch deleted file mode 100644 index cdc244d..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch +++ /dev/null @@ -1,337 +0,0 @@ -diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk -index a8aa595..476b33b 100644 ---- a/share/mk/bsd.doc.mk -+++ b/share/mk/bsd.doc.mk -@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \ - realinstall: - .if ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} - .endif - .for _dev in ${PRINTERDEVICE:Nhtml} -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} - .endfor -diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk -index 183cb1c..5b57594 100644 ---- a/share/mk/bsd.files.mk -+++ b/share/mk/bsd.files.mk -@@ -40,6 +40,7 @@ ${group}NAME_${file:T}?= ${file:T} - .endif - installfiles-${group}: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -52,10 +53,12 @@ _${group}FILES+= ${file} - installfiles-${group}: _${group}INS - _${group}INS: ${_${group}FILES} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} \ - ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk -index b938221..6b98e72 100644 ---- a/share/mk/bsd.incs.mk -+++ b/share/mk/bsd.incs.mk -@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?= ${header:T} - .endif - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -53,9 +56,13 @@ _${group}INCS+= ${header} - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk -index 6275ce3..8d32289 100644 ---- a/share/mk/bsd.info.mk -+++ b/share/mk/bsd.info.mk -@@ -83,6 +83,7 @@ INFO2HTML?= info2html - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: - .if !empty(.MAKEFLAGS:M-j) -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .else -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .endif - .endfor -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk -index c753afe..14f74aa 100644 ---- a/share/mk/bsd.lib.mk -+++ b/share/mk/bsd.lib.mk -@@ -46,8 +46,6 @@ CFLAGS+= ${DEBUG_FLAGS} - .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" - CTFFLAGS+= -g - .endif --.else --STRIP?= -s - .endif - - .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \ -@@ -296,14 +294,17 @@ realinstall: _libinstall - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR} - .endif - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR} - .endif - .if defined(SHLIB_NAME) -+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR} - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ - ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR} -@@ -357,10 +358,12 @@ _libinstall: - .endif # SHLIB_LINK - .endif # SHIB_NAME - .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR} - .endif - .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} - .endif -diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk -index c097c77..c2994d8 100644 ---- a/share/mk/bsd.libnames.mk -+++ b/share/mk/bsd.libnames.mk -@@ -51,7 +51,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a - LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a - LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a - LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a -@@ -81,7 +81,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a --LIBL?= ${DESTDIR}${LIBDIR}/libl.a -+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a - .if ${MK_LDNS} != "no" - LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a - .endif -diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk -index 574f0f5..b63b117 100644 ---- a/share/mk/bsd.links.mk -+++ b/share/mk/bsd.links.mk -@@ -15,6 +15,8 @@ _installlinks: - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ${INSTALL_LINK} $$l $$t; \ - done; true - .endif -@@ -26,6 +28,8 @@ _installlinks: - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ${INSTALL_SYMLINK} $$l $$t; \ - done; true - .endif -diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk -index 0212d3a..6435936 100644 ---- a/share/mk/bsd.man.mk -+++ b/share/mk/bsd.man.mk -@@ -165,9 +165,11 @@ _maninstall: ${MAN} - .if defined(NO_MANCOMPRESS) - .if defined(MANFILTER) - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} - .endif -@@ -181,11 +183,14 @@ _maninstall: ${MAN} - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ -+ ${ECHO} ${INSTALL} -d $${d}; \ -+ ${INSTALL} -d $${d}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} - .endfor -@@ -193,9 +198,11 @@ _maninstall: ${MAN} - .endif - .else - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT} - ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} - .endif -diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk -index 28255ea..2bc6546 100644 ---- a/share/mk/bsd.nls.mk -+++ b/share/mk/bsd.nls.mk -@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls - # installation rules - # - .for file in ${NLS} --NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat -+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ -+NLSNAME_${file:T}= ${NLSNAME}.cat - .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) - NLSLINKS+= ${file:R} - .endif -diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk -index 73de02d..c6c30ca 100644 ---- a/share/mk/bsd.own.mk -+++ b/share/mk/bsd.own.mk -@@ -206,9 +206,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK} - INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} - - # Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk -index d6d0fa5..93a9046 100644 ---- a/share/mk/bsd.prog.mk -+++ b/share/mk/bsd.prog.mk -@@ -42,10 +42,6 @@ CTFFLAGS+= -g - .endif - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") - LDFLAGS+= -static - .endif -@@ -200,6 +196,7 @@ realinstall: _proginstall - .ORDER: beforeinstall _proginstall - _proginstall: - .if defined(PROG) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} - .if ${MK_DEBUG_FILES} != "no" -@@ -233,6 +230,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} - _scriptsinstall: _SCRIPTSINS_${script:T} - _SCRIPTSINS_${script:T}: ${script} -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk -index fee6ccc..c2fe39a 100644 ---- a/share/mk/bsd.sys.mk -+++ b/share/mk/bsd.sys.mk -@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD} - .if defined(WARNS) - .if ${WARNS} >= 1 - CWARNFLAGS+= -Wsystem-headers --.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \ -- || !defined(NO_WERROR.clang)) --CWARNFLAGS+= -Werror --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) - .endif # WARNS >= 1 - .if ${WARNS} >= 2 - CWARNFLAGS+= -Wall -Wno-format-y2k -@@ -102,10 +98,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args - CWARNFLAGS+= -Wno-format-nonliteral - .endif # WARNS <= 3 - .endif # CLANG --.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \ -- || !defined(NO_WERROR.clang)) --CWARNFLAGS+= -Werror --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) - .endif # WFORMAT > 0 - .endif # WFORMAT - .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang)) -diff --git a/share/mk/sys.mk b/share/mk/sys.mk -index c270260..68491ce 100644 ---- a/share/mk/sys.mk -+++ b/share/mk/sys.mk -@@ -327,12 +327,6 @@ YFLAGS ?= -d - rm -f ${.PREFIX}.tmp.c - ${CTFCONVERT_CMD} - --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif -- - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) - SHELL= ${__MAKE_SHELL} - .SHELL: path=${__MAKE_SHELL} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-drop-unsupport-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-drop-unsupport-cflags.patch deleted file mode 100644 index d12bbbe..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-drop-unsupport-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk -index 37c4d01..e840a25 100644 ---- a/share/mk/bsd.sys.mk -+++ b/share/mk/bsd.sys.mk -@@ -112,7 +112,7 @@ CWARNFLAGS+= -Wno-error=unused-function -Wno-error=enum-compare -Wno-error=logic - .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600 - FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__ - .else --FORMAT_EXTENSIONS= -fformat-extensions -+FORMAT_EXTENSIONS= - .endif - - .if defined(IGNORE_PRAGMA) diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch deleted file mode 100644 index e87bdba..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch +++ /dev/null @@ -1,343 +0,0 @@ -diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk -index 9f4ea2c..0f666bf 100644 ---- a/share/mk/bsd.doc.mk -+++ b/share/mk/bsd.doc.mk -@@ -144,10 +144,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \ - realinstall: - .if ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}/ - .endif - .for _dev in ${PRINTERDEVICE:Nhtml} -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}/ - .endfor -diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk -index bc123e1..4707b84 100644 ---- a/share/mk/bsd.files.mk -+++ b/share/mk/bsd.files.mk -@@ -63,6 +63,7 @@ stage_as.${file:T}: ${file} - - installfiles-${group}: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -77,10 +78,12 @@ stage_files.${group}: ${_${group}FILES} - installfiles-${group}: _${group}INS - _${group}INS: ${_${group}FILES} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} - ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} \ - ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/ - .endif -diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk -index 9636e8c..fc2751a 100644 ---- a/share/mk/bsd.incs.mk -+++ b/share/mk/bsd.incs.mk -@@ -62,6 +62,9 @@ stage_includes: stage_as.${header:T} - - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -77,9 +80,13 @@ stage_includes: stage_files.${group} - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/ - .endif -diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk -index 0544662..1a7aad7 100644 ---- a/share/mk/bsd.info.mk -+++ b/share/mk/bsd.info.mk -@@ -83,6 +83,7 @@ INFO2HTML?= info2html - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -141,15 +142,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: - .if !empty(.MAKEFLAGS:M-j) -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .else -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .endif - .endfor -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk -index bd93e57..92df111 100644 ---- a/share/mk/bsd.lib.mk -+++ b/share/mk/bsd.lib.mk -@@ -52,8 +52,6 @@ CFLAGS+= ${DEBUG_FLAGS} - .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" - CTFFLAGS+= -g - .endif --.else --STRIP?= -s - .endif - - .if ${SHLIBDIR:M*lib32*} -@@ -335,14 +333,17 @@ realinstall: _libinstall - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/ - .endif - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/ - .endif - .if defined(SHLIB_NAME) -+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR} - ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ - ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/ -@@ -387,10 +388,12 @@ _libinstall: - .endif # SHLIB_LINK - .endif # SHIB_NAME - .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/ - .endif - .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}/ - .endif -diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk -index 0844ae2..caec715 100644 ---- a/share/mk/bsd.libnames.mk -+++ b/share/mk/bsd.libnames.mk -@@ -63,7 +63,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a - LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a - LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a - LIBGEOM?= ${DESTDIR}${LIBDIR}/libgeom.a -@@ -92,7 +92,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a --LIBL?= ${DESTDIR}${LIBDIR}/libl.a -+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a - LIBLN?= "don't use LIBLN, use LIBL" - LIBLZMA?= ${DESTDIR}${LIBDIR}/liblzma.a - LIBM?= ${DESTDIR}${LIBDIR}/libm.a -diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk -index 0c7d063..f5d1779 100644 ---- a/share/mk/bsd.links.mk -+++ b/share/mk/bsd.links.mk -@@ -16,9 +16,11 @@ afterinstall: _installlinks - _installlinks: - .for s t in ${LINKS} - @${ECHO} "${t} -> ${s}" ;\ -+ test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\ - ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t} - .endfor - .for s t in ${SYMLINKS} - @${ECHO} "${t} -> ${s}" ;\ -+ test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\ - ${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}/${t} - .endfor -diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk -index 6f78501..bc9a1a6 100644 ---- a/share/mk/bsd.man.mk -+++ b/share/mk/bsd.man.mk -@@ -188,9 +188,11 @@ maninstall: ${MAN} - .if ${MK_MANCOMPRESS} == "no" - .if defined(MANFILTER) - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} - ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} - ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} - .endif -@@ -204,11 +206,14 @@ maninstall: ${MAN} - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ -+ ${ECHO} ${INSTALL} -d $${d}; \ -+ ${INSTALL} -d $${d}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} - ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} - .endfor -@@ -216,9 +221,11 @@ maninstall: ${MAN} - .endif # defined(MANFILTER) - .else # ${MK_MANCOMPRESS} == "yes" - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} - ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/ - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT} - ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} - .endif -diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk -index 87a7347..c860c97 100644 ---- a/share/mk/bsd.nls.mk -+++ b/share/mk/bsd.nls.mk -@@ -71,7 +71,8 @@ STAGE_SYMLINKS_DIR.NLS= ${STAGE_OBJTOP} - SYMLINKS+= ${NLSSYMLINKS} - .endif - .for file in ${NLS} --NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat -+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ -+NLSNAME_${file:T}= ${NLSNAME}.cat - .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) - .if !empty(NLSLINKS_${file:R}:M${file:R}) - .error NLSLINKS_${file:R} contains itself: ${file:R} -diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk -index c10e492..5984215 100644 ---- a/share/mk/bsd.own.mk -+++ b/share/mk/bsd.own.mk -@@ -233,9 +233,6 @@ INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} - INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} - - # Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk -index f1a5c65..3b1ecf8 100644 ---- a/share/mk/bsd.prog.mk -+++ b/share/mk/bsd.prog.mk -@@ -44,10 +44,6 @@ CTFFLAGS+= -g - .endif - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_ROOT) - .if !defined(TAGS) || ! ${TAGS:Mpackage=*} - TAGS+= package=${PACKAGE:Uruntime} -@@ -217,6 +213,7 @@ realinstall: _proginstall - .ORDER: beforeinstall _proginstall - _proginstall: - .if defined(PROG) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} - .if ${MK_DEBUG_FILES} != "no" -@@ -255,6 +252,7 @@ SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} - STAGE_AS_${script:T}= ${SCRIPTSDIR_${script:T}}/${SCRIPTSNAME_${script:T}} - _scriptsinstall: _SCRIPTSINS_${script:T} - _SCRIPTSINS_${script:T}: ${script} -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} - ${INSTALL} ${TAG_ARGS} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk -index 0ae45c5..37c4d01 100644 ---- a/share/mk/bsd.sys.mk -+++ b/share/mk/bsd.sys.mk -@@ -29,9 +29,6 @@ CFLAGS+= -std=${CSTD} - .if defined(WARNS) - .if ${WARNS} >= 1 - CWARNFLAGS+= -Wsystem-headers --.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE}) --CWARNFLAGS+= -Werror --.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE} - .endif # WARNS >= 1 - .if ${WARNS} >= 2 - CWARNFLAGS+= -Wall -Wno-format-y2k -@@ -100,9 +97,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args - .if ${WARNS} <= 3 - CWARNFLAGS.clang+= -Wno-format-nonliteral - .endif # WARNS <= 3 --.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE}) --CWARNFLAGS+= -Werror --.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE} - .endif # WFORMAT > 0 - .endif # WFORMAT - .if defined(NO_WFORMAT) || defined(NO_WFORMAT.${COMPILER_TYPE}) -@@ -151,6 +145,13 @@ CFLAGS.clang+= -fno-dwarf2-cfi-asm - # but not yet. - CXXFLAGS.clang+= -Wno-c++11-extensions - -+.if ${MK_SSP} == "no" -+# gcc-4.9, -fstack-protector-strong is enabled by default. -+# Add -fno-stack-protector to disable it. Gentoo Bug #511698. -+SSP_CFLAGS?= -fno-stack-protector -+CFLAGS+= ${SSP_CFLAGS} -+.endif -+ - .if ${MK_SSP} != "no" && \ - ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" - .if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \ -diff --git a/share/mk/sys.mk b/share/mk/sys.mk -index 5cfd0bb..25abf8e 100644 ---- a/share/mk/sys.mk -+++ b/share/mk/sys.mk -@@ -418,12 +418,6 @@ YFLAGS ?= -d - rm -f ${.PREFIX}.tmp.c - ${CTFCONVERT_CMD} - --# Pull in global settings. --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif -- - # late include for customization - .sinclude <local.sys.mk> - diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch deleted file mode 100644 index 97e882d..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk -index 92df111..88c75d9 100644 ---- a/share/mk/bsd.lib.mk -+++ b/share/mk/bsd.lib.mk -@@ -184,7 +184,7 @@ _LIBS= lib${LIB_PRIVATE}${LIB}.a - lib${LIB_PRIVATE}${LIB}.a: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library - @rm -f ${.TARGET} -- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} -+ ${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} - ${RANLIB} ${RANLIBFLAGS} ${.TARGET} - .endif - -@@ -199,7 +199,7 @@ CLEANFILES+= ${POBJS} - lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS} - @${ECHO} building profiled ${LIB} library - @rm -f ${.TARGET} -- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${POBJS} | tsort -q` ${ARADD} -+ ${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD} - ${RANLIB} ${RANLIBFLAGS} ${.TARGET} - .endif - -@@ -247,7 +247,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} - .endif - ${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ - -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${SOBJS} | tsort -q` ${LDADD} -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} - .if ${MK_CTF} != "no" - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} - .endif -@@ -312,13 +312,6 @@ _EXTRADEPEND: - - .if !target(install) - --.if defined(PRECIOUSLIB) --.if !defined(NO_FSCHG) --SHLINSTALLFLAGS+= -fschg --.endif --SHLINSTALLFLAGS+= -S --.endif -- - _INSTALLFLAGS:= ${INSTALLFLAGS} - .for ie in ${INSTALLFLAGS_EDIT} - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} -diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk -index 3b1ecf8..26ac9c5 100644 ---- a/share/mk/bsd.prog.mk -+++ b/share/mk/bsd.prog.mk -@@ -196,13 +196,6 @@ _EXTRADEPEND: - - .if !target(install) - --.if defined(PRECIOUSPROG) --.if !defined(NO_FSCHG) --INSTALLFLAGS+= -fschg --.endif --INSTALLFLAGS+= -S --.endif -- - _INSTALLFLAGS:= ${INSTALLFLAGS} - .for ie in ${INSTALLFLAGS_EDIT} - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-libproc-libcxx.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-libproc-libcxx.patch deleted file mode 100644 index 5da025d..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-libproc-libcxx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk -index 14489a8..c993f7c 100644 ---- a/share/mk/src.libnames.mk -+++ b/share/mk/src.libnames.mk -@@ -245,7 +245,7 @@ _DP_radius= crypto - .endif - _DP_procstat= kvm util elf - .if ${MK_CXX} == "yes" --.if ${MK_LIBCPLUSPLUS} != "no" -+.if ${COMPILER_TYPE} == "clang" - _DP_proc= cxxrt - .else - _DP_proc= supcplusplus diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-rename-libs.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-rename-libs.patch deleted file mode 100644 index fd72f1f..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-rename-libs.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk -index 249ac52..14489a8 100644 ---- a/share/mk/src.libnames.mk -+++ b/share/mk/src.libnames.mk -@@ -343,6 +343,11 @@ LIBATF_CXX= ${DESTDIR}${LIBDIR}/libprivateatf-c++.a - LDADD_atf_c= -lprivateatf-c - LDADD_atf_cxx= -lprivateatf-c++ - -+LDADD_bsdxml= -lexpat -+LDADD_l= -lfl -+LDADD_termcap= -lncurses -+LDADD_termcapw= -lncursesw -+ - .for _l in ${_PRIVATELIBS} - LIB${_l:tu}?= ${DESTDIR}${LIBDIR}/libprivate${_l}.a - .endfor diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch deleted file mode 100644 index f17f6c4..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch +++ /dev/null @@ -1,332 +0,0 @@ -Index: share/mk/bsd.doc.mk -=================================================================== ---- share/mk/bsd.doc.mk.orig -+++ share/mk/bsd.doc.mk -@@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${ - realinstall: - .for _dev in ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} - .endfor - .for _dev in ${PRINTERDEVICE:Nhtml} -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} - .endfor -Index: share/mk/bsd.files.mk -=================================================================== ---- share/mk/bsd.files.mk.orig -+++ share/mk/bsd.files.mk -@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} - .endif - installfiles: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H} - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,10 +52,12 @@ _${group}FILES+= ${file} - installfiles: _${group}INS - _${group}INS: ${_${group}FILES} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} \ - ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -Index: share/mk/bsd.incs.mk -=================================================================== ---- share/mk/bsd.incs.mk.orig -+++ share/mk/bsd.incs.mk -@@ -41,6 +41,10 @@ ${group}NAME_${header:T}?= ${header:T} - .endif - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -53,9 +57,11 @@ _${group}INCS+= ${header} - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -Index: share/mk/bsd.info.mk -=================================================================== ---- share/mk/bsd.info.mk.orig -+++ share/mk/bsd.info.mk -@@ -83,6 +83,7 @@ INFO2HTML?= info2html - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -144,12 +145,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: - .if !empty(.MAKEFLAGS:M-j) -+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ - --defsection=${INFOSECTION} \ - --defentry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .else -+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ - --defsection=${INFOSECTION} \ - --defentry=${INFOENTRY_${x}} \ -Index: share/mk/bsd.lib.mk -=================================================================== ---- share/mk/bsd.lib.mk.orig -+++ share/mk/bsd.lib.mk -@@ -41,10 +41,6 @@ CTFFLAGS+= -g - .endif - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .include <bsd.libnames.mk> - - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries -@@ -276,14 +272,17 @@ realinstall: _libinstall - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} - .endif - .if defined(SHLIB_NAME) -+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ - ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} -Index: share/mk/bsd.libnames.mk -=================================================================== ---- share/mk/bsd.libnames.mk.orig -+++ share/mk/bsd.libnames.mk -@@ -46,7 +46,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf. - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a - LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDOR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a -@@ -77,7 +77,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeyca - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a --LIBL?= ${DESTDIR}${LIBDIR}/libl.a -+LIBL?= ${DESTDIR}${LIBDOR}/libfl.a - LIBLN?= "don't use LIBLN, use LIBL" - .if ${MK_BIND} != "no" - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -Index: share/mk/bsd.man.mk -=================================================================== ---- share/mk/bsd.man.mk.orig -+++ share/mk/bsd.man.mk -@@ -165,9 +165,11 @@ _maninstall: ${MAN} - .if defined(NO_MANCOMPRESS) - .if defined(MANFILTER) - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} - .endif -@@ -181,11 +183,14 @@ _maninstall: ${MAN} - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ -+ ${ECHO} ${INSTALL} -d $${d}; \ -+ ${INSTALL} -d $${d}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} - .endfor -@@ -193,9 +198,11 @@ _maninstall: ${MAN} - .endif - .else - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} - .endif -Index: share/mk/bsd.prog.mk -=================================================================== ---- share/mk/bsd.prog.mk.orig -+++ share/mk/bsd.prog.mk -@@ -27,10 +27,6 @@ CTFFLAGS+= -g - CFLAGS+=${CRUNCH_CFLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") - LDFLAGS+= -static - .endif -@@ -152,9 +148,11 @@ realinstall: _proginstall - _proginstall: - .if defined(PROG) - .if defined(PROGNAME) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} - .else -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} - .endif -@@ -182,6 +180,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} - _scriptsinstall: _SCRIPTSINS_${script:T} - _SCRIPTSINS_${script:T}: ${script} -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -Index: share/mk/bsd.sys.mk -=================================================================== ---- share/mk/bsd.sys.mk.orig -+++ share/mk/bsd.sys.mk -@@ -28,9 +28,6 @@ CFLAGS += -std=${CSTD} - . if defined(WARNS) - . if ${WARNS} >= 1 - CWARNFLAGS += -Wsystem-headers --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . if ${WARNS} >= 2 - CWARNFLAGS += -Wall -Wno-format-y2k -@@ -64,9 +61,6 @@ WFORMAT = 1 - . if ${WFORMAT} > 0 - #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args - CWARNFLAGS += -Wformat=2 -Wno-format-extra-args --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . endif - .endif -Index: share/mk/bsd.links.mk -=================================================================== ---- share/mk/bsd.links.mk.orig -+++ share/mk/bsd.links.mk -@@ -15,6 +15,8 @@ _installlinks: - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -f $$l $$t; \ - done; true - .endif -@@ -26,6 +28,8 @@ _installlinks: - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -fs $$l $$t; \ - done; true - .endif -Index: share/mk/bsd.own.mk -=================================================================== ---- share/mk/bsd.own.mk.orig -+++ share/mk/bsd.own.mk -@@ -164,11 +164,6 @@ NLSMODE?= ${NOBINMODE} - - INCLUDEDIR?= /usr/include - --# Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz - -Index: share/mk/sys.mk -=================================================================== ---- share/mk/sys.mk.orig -+++ share/mk/sys.mk -@@ -34,11 +34,11 @@ AFLAGS ?= - CC ?= c89 - CFLAGS ?= -O - .else --CC ?= cc -+CC ?= gcc - .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" --CFLAGS ?= -O -pipe -+CFLAGS ?= -pipe - .else --CFLAGS ?= -O2 -pipe -+CFLAGS ?= -pipe - .endif - .if defined(NO_STRICT_ALIASING) - CFLAGS += -fno-strict-aliasing -@@ -64,7 +64,7 @@ CFLAGS += -g - .endif - .endif - --CXX ?= c++ -+CXX ?= g++ - CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} - - CPP ?= cpp -@@ -333,12 +333,6 @@ YFLAGS ?= -d - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} - .endif - --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif -- - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) - SHELL= ${__MAKE_SHELL} - .SHELL: path=${__MAKE_SHELL} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch deleted file mode 100644 index 41c4de4..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch +++ /dev/null @@ -1,121 +0,0 @@ -Index: mk/bsd.incs.mk -=================================================================== ---- mk/bsd.incs.mk.orig -+++ mk/bsd.incs.mk -@@ -45,7 +45,7 @@ _${group}INS_${header:T}: ${header} - ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} -- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ -+ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ - ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} -@@ -58,11 +58,11 @@ installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) - ${INSTALL} -d ${DESTDIR}${${group}DIR} -- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ -+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else - ${INSTALL} -d ${DESTDIR}${${group}DIR} -- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ -+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif - .endif -Index: mk/bsd.lib.mk -=================================================================== ---- mk/bsd.lib.mk.orig -+++ mk/bsd.lib.mk -@@ -156,11 +156,7 @@ _LIBS= lib${LIB}.a - lib${LIB}.a: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -173,11 +169,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= - lib${LIB}_p.a: ${POBJS} - @${ECHO} building profiled ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -195,15 +187,9 @@ ${SHLIB_NAME}: ${SOBJS} - .if defined(SHLIB_LINK) - @ln -fs ${.TARGET} ${SHLIB_LINK} - .endif --.if !defined(NM) -- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ -- -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `lorder ${SOBJS} | tsort -q` ${LDADD} --.else - @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ - -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} --.endif -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} - .if defined(CTFMERGE) - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} - .endif -@@ -251,13 +237,6 @@ _EXTRADEPEND: - - .if !target(install) - --.if defined(PRECIOUSLIB) --.if !defined(NO_FSCHG) --SHLINSTALLFLAGS+= -fschg --.endif --SHLINSTALLFLAGS+= -S --.endif -- - _INSTALLFLAGS:= ${INSTALLFLAGS} - .for ie in ${INSTALLFLAGS_EDIT} - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} -@@ -273,12 +252,12 @@ realinstall: _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" - ${INSTALL} -d ${DESTDIR}${LIBDIR} -- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ -+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) - ${INSTALL} -d ${DESTDIR}${LIBDIR} -- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ -+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} - .endif - .if defined(SHLIB_NAME) -Index: mk/bsd.prog.mk -=================================================================== ---- mk/bsd.prog.mk.orig -+++ mk/bsd.prog.mk -@@ -130,13 +130,6 @@ _EXTRADEPEND: - - .if !target(install) - --.if defined(PRECIOUSPROG) --.if !defined(NO_FSCHG) --INSTALLFLAGS+= -fschg --.endif --INSTALLFLAGS+= -S --.endif -- - _INSTALLFLAGS:= ${INSTALLFLAGS} - .for ie in ${INSTALLFLAGS_EDIT} - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch deleted file mode 100644 index 598d0b9..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch +++ /dev/null @@ -1,326 +0,0 @@ -diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk ---- share.orig/mk/bsd.doc.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.doc.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -135,10 +135,12 @@ - realinstall: - .for _dev in ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} - .endfor - .for _dev in ${PRINTERDEVICE:Nhtml} -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} - .endfor -diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk ---- share.orig/mk/bsd.files.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.files.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -39,6 +39,7 @@ - .endif - installfiles: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,10 +52,12 @@ - installfiles: _${group}INS - _${group}INS: ${_${group}FILES} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} \ - ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk ---- share.orig/mk/bsd.incs.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.incs.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -41,6 +41,9 @@ - .endif - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -53,9 +56,13 @@ - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk ---- share.orig/mk/bsd.info.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.info.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -83,6 +83,7 @@ - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -144,15 +145,17 @@ - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: - .if !empty(.MAKEFLAGS:M-j) -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .else -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .endif - .endfor -diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk ---- share.orig/mk/bsd.lib.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.lib.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -46,10 +46,6 @@ - .endif - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .include <bsd.libnames.mk> - - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries -@@ -284,14 +280,17 @@ - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} - .endif - .if defined(SHLIB_NAME) -+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ - ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} -@@ -329,10 +328,12 @@ - .endif # SHLIB_LINK - .endif # SHIB_NAME - .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} - .endif - .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} - .endif -diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk ---- share.orig/mk/bsd.libnames.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.libnames.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -48,7 +48,7 @@ - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a - LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a -@@ -79,7 +79,7 @@ - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a --LIBL?= ${DESTDIR}${LIBDIR}/libl.a -+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a - LIBLN?= "don't use LIBLN, use LIBL" - .if ${MK_BIND} != "no" - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk ---- share.orig/mk/bsd.links.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.links.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -15,6 +15,8 @@ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -f $$l $$t; \ - done; true - .endif -@@ -26,6 +28,8 @@ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -fs $$l $$t; \ - done; true - .endif -diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk ---- share.orig/mk/bsd.man.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.man.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -165,9 +165,11 @@ - .if defined(NO_MANCOMPRESS) - .if defined(MANFILTER) - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} - .endif -@@ -181,11 +183,14 @@ - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ -+ ${ECHO} ${INSTALL} -d $${d}; \ -+ ${INSTALL} -d $${d}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} - .endfor -@@ -193,9 +198,11 @@ - .endif - .else - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT} - ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} - .endif -diff -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk ---- share.orig/mk/bsd.nls.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.nls.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -62,7 +62,8 @@ - # installation rules - # - .for file in ${NLS} --NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat -+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ -+NLSNAME_${file:T}= ${NLSNAME}.cat - .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) - NLSLINKS+= ${file:R} - .endif -diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk ---- share.orig/mk/bsd.own.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.own.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -182,9 +182,6 @@ - INCLUDEDIR?= /usr/include - - # Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk ---- share.orig/mk/bsd.prog.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.prog.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -33,10 +33,6 @@ - CFLAGS+=${CRUNCH_CFLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") - LDFLAGS+= -static - .endif -@@ -155,6 +151,7 @@ - .ORDER: beforeinstall _proginstall - _proginstall: - .if defined(PROG) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - .if defined(PROGNAME) - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} -@@ -186,6 +183,7 @@ - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} - _scriptsinstall: _SCRIPTSINS_${script:T} - _SCRIPTSINS_${script:T}: ${script} -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk ---- share.orig/mk/bsd.sys.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.sys.mk 2012-07-16 00:04:14.000000000 +0900 -@@ -28,10 +28,6 @@ - .if defined(WARNS) - .if ${WARNS} >= 1 - CWARNFLAGS+= -Wsystem-headers --.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \ -- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) --CWARNFLAGS+= -Werror --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) - .endif # WARNS >= 1 - .if ${WARNS} >= 2 - CWARNFLAGS+= -Wall -Wno-format-y2k -@@ -95,10 +91,6 @@ - CWARNFLAGS+= -Wno-format-nonliteral - .endif # WARNS <= 3 - .endif # CLANG --.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \ -- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) --CWARNFLAGS+= -Werror --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) - .endif # WFORMAT > 0 - .endif # WFORMAT - .if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \ -diff -Nur share.orig/mk/sys.mk share/mk/sys.mk ---- share.orig/mk/sys.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/sys.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -349,12 +349,6 @@ - (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \ - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}) - --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif -- - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) - SHELL= ${__MAKE_SHELL} - .SHELL: path=${__MAKE_SHELL} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch deleted file mode 100644 index f986ed9..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk ---- share.orig/mk/bsd.lib.mk 2012-07-16 02:40:07.000000000 +0900 -+++ share/mk/bsd.lib.mk 2012-07-16 02:41:40.000000000 +0900 -@@ -155,11 +155,7 @@ - lib${LIB}.a: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -172,11 +168,7 @@ - lib${LIB}_p.a: ${POBJS} - @${ECHO} building profiled ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -203,15 +195,9 @@ - .if defined(SHLIB_LINK) - @ln -fs ${.TARGET} ${SHLIB_LINK} - .endif --.if !defined(NM) - @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ - -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `lorder ${SOBJS} | tsort -q` ${LDADD} --.else -- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ -- -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} --.endif -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} - @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \ - (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \ - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}) -@@ -259,13 +245,6 @@ - - .if !target(install) - --.if defined(PRECIOUSLIB) --.if !defined(NO_FSCHG) --SHLINSTALLFLAGS+= -fschg --.endif --SHLINSTALLFLAGS+= -S --.endif -- - _INSTALLFLAGS:= ${INSTALLFLAGS} - .for ie in ${INSTALLFLAGS_EDIT} - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} -diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk ---- share.orig/mk/bsd.prog.mk 2012-07-16 02:40:07.000000000 +0900 -+++ share/mk/bsd.prog.mk 2012-07-16 02:40:24.000000000 +0900 -@@ -134,13 +134,6 @@ - - .if !target(install) - --.if defined(PRECIOUSPROG) --.if !defined(NO_FSCHG) --INSTALLFLAGS+= -fschg --.endif --INSTALLFLAGS+= -S --.endif -- - _INSTALLFLAGS:= ${INSTALLFLAGS} - .for ie in ${INSTALLFLAGS_EDIT} - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch deleted file mode 100644 index 8eb80c3..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=511698 - -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk -index e438633..de4a05b 100644 ---- a/share/mk/bsd.sys.mk -+++ b/share/mk/bsd.sys.mk -@@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\ - CFLAGS+= -Qunused-arguments - .endif # CLANG - --.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ -- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" -+.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \ -+ && ${MACHINE_CPUARCH} != "mips" -+.if ${MK_SSP} != "no" - # Don't use -Wstack-protector as it breaks world with -Werror. - SSP_CFLAGS?= -fstack-protector -+.else -+# gcc-4.9, -fstack-protector-strong is enabled by default. -+# Add -fno-stack-protector to disable it. Gentoo Bug #511698. -+SSP_CFLAGS= -fno-stack-protector -+.endif #SSP - CFLAGS+= ${SSP_CFLAGS} --.endif # SSP && !IA64 && !ARM && !MIPS -+.endif # !IA64 && !ARM && !MIPS - - # Allow user-specified additional warning flags - CFLAGS+= ${CWARNFLAGS} diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild deleted file mode 100644 index e1eb27a..0000000 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd - -DESCRIPTION="Makefiles definitions used for building and installing libraries and system files" -SLOT="0" - -IUSE="userland_GNU" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY="share/" - -RDEPEND="" -DEPEND="" - -RESTRICT="strip" - -S="${WORKDIR}/share/mk" - -src_prepare() { - local installdir - - epatch "${FILESDIR}/${PN}-11.0-gentoo.patch" - epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" - epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" - epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch" - use userland_GNU && epatch "${FILESDIR}/${PN}-11.0-gnu.patch" - - if [[ ${CHOST} != *-freebsd* ]]; then - installdir="/usr/share/mk/freebsd" - else - installdir="/usr/share/mk" - fi - - sed -i -e "s:FILESDIR=.*:FILESDIR= ${installdir}:" "${S}"/Makefile || die -} - -src_compile() { :; } - -src_install() { - freebsd_src_install - if [[ ${CHOST} != *-freebsd* ]]; then - insinto /usr/share/mk/freebsd/system - else - insinto /usr/share/mk/system - fi - doins *.mk *.awk -} diff --git a/sys-freebsd/freebsd-mk-defs/metadata.xml b/sys-freebsd/freebsd-mk-defs/metadata.xml deleted file mode 100644 index a00f3ae..0000000 --- a/sys-freebsd/freebsd-mk-defs/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> -</maintainer> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest deleted file mode 100644 index dd5d3c6..0000000 --- a/sys-freebsd/freebsd-pam-modules/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX README.pamd 2846 SHA256 cc15a45d85590c1c1267a6083048e410b0175d863f1685b51e26745672cd1b44 SHA512 155b5ba68ffcdff57b9bc5822eb3affd01cba9dcc5ae8095c91aa5048d61f7b550cb8f4c7a0b508055f4300a1a6295770f6075cd6c0df84ce6782088c84c7f6a WHIRLPOOL 080a3c562a81986289992a8a43a8f41a6e4161ff5ff72d96ca6b76ba3182e94a949944fca1342acdf75ac4bd0e03940cbfba22390d5da7c4d150a880ace2f201 -AUX freebsd-pam-modules-6.0-gentoo.patch 701 SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d SHA512 7adba1261547c11bb1a0b0d3c8cc800bba9aca4a878c9fa63f8b68e270a3a0d54388eb1e156aadcba54d9dd23a2817232b3f287522d820da15abb7dd9c8cd995 WHIRLPOOL 2b02611fce484145fe62468826bbdb8f1dedfb1c4a7a14b01234c99f13daefe9597d08a23e0836f5804f92c26cc1b950180f7fcbd1698af360b23e06c143621c -AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 WHIRLPOOL 168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7 -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-pam-modules-11.0.ebuild 1042 SHA256 4442bd6cdd5ab3a18b02e000ee7d4f55131d7bd27493081c5222325cac0c55f6 SHA512 a75de8d65675770d75690cd48ba4c6d3a231fefd84e2315756a11b4632851d2643b2786e3924ac52825ae66230f598f6bd92ecd1e32c59e6554c1d67a8968a29 WHIRLPOOL 4d12fe089999575321b0c1832e19a67fd526b86fea65613fa6e1f4e9f1a7e410e246406e004b218eef6acf3193b91e7f5e9ffc712c74b2418e71d7f59e4d712e -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-pam-modules/files/README.pamd b/sys-freebsd/freebsd-pam-modules/files/README.pamd deleted file mode 100644 index 10da6cc..0000000 --- a/sys-freebsd/freebsd-pam-modules/files/README.pamd +++ /dev/null @@ -1,63 +0,0 @@ -/etc/pam.d - -This directory contains configuration files for the Pluggable -Authentication Modules (PAM) library. - -Each file details the module chain for a single service, and must be -named after that service. If no configuration file is found for a -particular service, the /etc/pam.d/other is used instead. If that -file does not exist, /etc/pam.conf is searched for entries matching -the specified service or, failing that, the "other" service. - -See the pam(8) manual page for an explanation of the workings of the -PAM library and descriptions of the various files and modules. Below -is a summary of the format for the pam.conf and /etc/pam.d/* files. - -Configuration lines take the following form: - -module-type control-flag module-path arguments - -Comments are introduced with a hash mark ('#'). Blank lines and lines -consisting entirely of comments are ignored. - -The meanings of the different fields are as follows: - - module-type: - auth: prompt for a password to authenticate that the user is - who they say they are, and set any credentials. - account: non-authentication based authorization, based on time, - resources, etc. - session: housekeeping before and/or after login. - password: update authentication tokens. - - control-flag: How libpam handles success or failure of the module. - required: success is required; on failure all remaining - modules are run, but the request will be denied. - requisite: success is required, and on failure no remaining - modules are run. - sufficient: success is sufficient, and if no previous required - module failed, no remaining modules are run. - binding: success is sufficient; on failure all remaining - modules are run, but the request will be denied. - optional: ignored unless the other modules return PAM_IGNORE. - - arguments: Module-specific options, plus some generic ones: - debug: syslog debug info. - no_warn: return no warning messages to the application. - Remove this to feed back to the user the - reason(s) they are being rejected. - use_first_pass: try authentication using password from the - preceding auth module. - try_first_pass: first try authentication using password from - the preceding auth module, and if that fails - prompt for a new password. - use_mapped_pass: convert cleartext password to a crypto key. - expose_account: allow printing more info about the user when - prompting. - -Note that having a "sufficient" module as the last entry for a -particular service and module type may result in surprising behaviour. -To get the intended semantics, add a "required" entry listing the -pam_deny module at the end of the chain. - -$Id$ diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch deleted file mode 100644 index ce1a7fb..0000000 --- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: fbsd-6.0/lib/libpam/modules/Makefile.inc -=================================================================== ---- fbsd-6.0.orig/lib/libpam/modules/Makefile.inc -+++ fbsd-6.0/lib/libpam/modules/Makefile.inc -@@ -5,18 +5,10 @@ PAMDIR= ${.CURDIR}/../../../../contrib/ - NO_INSTALLLIB= - NO_PROFILE= - --CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam -+CFLAGS+= -I${.CURDIR}/../../libpam - WARNS?= 4 - --# This is nasty. --# For the static case, libpam.a depends on the modules. --# For the dynamic case, the modules depend on libpam.so.N --.if defined(_NO_LIBPAM_SO_YET) --NO_PIC= --.else - SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} --DPADD+= ${LIBPAM} - LDADD+= -lpam --.endif - - .include "../Makefile.inc" diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch deleted file mode 100644 index aa08d40..0000000 --- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/libpam/modules/Makefile.inc.old 2011-11-02 20:46:56.000000000 +0000 -+++ lib/libpam/modules/Makefile.inc 2011-11-02 20:47:16.000000000 +0000 -@@ -5,18 +5,10 @@ - NO_INSTALLLIB= - NO_PROFILE= - --CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam -+CFLAGS+= -I${.CURDIR}/../../libpam - --# This is nasty. --# For the static case, libpam.a depends on the modules. --# For the dynamic case, the modules depend on libpam.so.N --.if defined(_NO_LIBPAM_SO_YET) --NO_PIC= --.else - SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} --DPADD+= ${LIBPAM} - LDADD+= -lpam --.endif - - .c.o: - ${CC} ${CFLAGS} -DOPENPAM_STATIC_MODULES -c ${.IMPSRC} diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild deleted file mode 100644 index 0172c4e..0000000 --- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd multilib pam - -DESCRIPTION="FreeBSD's PAM authentication modules" -SLOT="0" - -IUSE="kerberos nis" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY="lib/" - -RDEPEND=">=sys-auth/openpam-20050201-r1 - kerberos? ( dev-libs/openssl:0= - virtual/krb5 )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" - -S=${WORKDIR}/lib/libpam/modules - -pkg_setup() { - # Avoid installing pam_ssh as that has its own ebuild. - mymakeopts="${mymakeopts} WITHOUT_OPENSSH= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " -} - -src_prepare() { - for module in pam_deny pam_passwdqc pam_permit pam_krb5; do - sed -i -e "s:${module}::" "${S}"/modules.inc || die - done -} - -src_install() { - freebsd_src_install "LIBDIR=/$(get_libdir)/security" - - dodoc "${FILESDIR}/README.pamd" -} diff --git a/sys-freebsd/freebsd-pam-modules/metadata.xml b/sys-freebsd/freebsd-pam-modules/metadata.xml deleted file mode 100644 index a00f3ae..0000000 --- a/sys-freebsd/freebsd-pam-modules/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> -</maintainer> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest deleted file mode 100644 index a360de1..0000000 --- a/sys-freebsd/freebsd-pf/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX freebsd-pf-10.0-libevent.patch 403 SHA256 b3de99dbc75a116ae46fec1aeaab0bfcc7448a87b963e9defbb94238bb79bee0 SHA512 1ec0d97afd9392c852071d6df704b05a0ca3146a20a3daa4ac541291a2a30c7c8752330381e1f3ae3d874640dd2f04d4b94c5b4adf985a3fbf8890da6a7f9b0b WHIRLPOOL 9cfa4b4b751737b224c43eb75a6eb27ba2e02f2c99829ce8327956d5b0aa381afce7cb86455bc97792ffbe66d8919959865f0c4a5ba44302391c8ea91c7bc065 -AUX freebsd-pf-10.0-pflogd.patch 349 SHA256 630346adc5d39d32112ebb299391b728a0e22b517376fa5f1d872593186f3800 SHA512 d4a605bb1a31837bfb0fa5d20fbac5ed449e4d579c5ab6025da2988ff101c31df7c67e23f9863f2f0b98a76788123e06402d8790d1c9baafd5b732dff0678644 WHIRLPOOL 388b3e724a6971e17867fc4749ea8769d56327a07fbba318f6e4d052ac049f78cc673911cca28dc37dbc3ca93f47eee061c07c0854101cefe6919b373746ebe1 -AUX freebsd-pf-11.0-libevent.patch 312 SHA256 9a70eb1587538294c9d046d06fc0a14d86514061b157277805c439bf3bb89ff2 SHA512 0c9eef97f7bfa5bcf4019a2449a096a6a6b66d3f0b5275181af86694cd0efd832788433d0203d3b9a54fc11c3eb728b6e67b143a622ce6f8b36f52299a9db85f WHIRLPOOL ef2ae2aec4a52b857574325133a788e1a97099b998bc44237affc0dd48aedd5322da618e0313552f4f9d54a1dd86164804d7502b8c445aca8774f73f5e09c5cc -AUX freebsd-pf-11.0-pflogd.patch 326 SHA256 0a2bff431b2fb3f29200b6337d7e77f1e16c8dbacefd52995d60a851a3fad5e4 SHA512 25327461327f01f1858e6d2108db973090c62c1dbccb09390d834cdfaff97d5258123b1162538e2d8faf7f452a8a7eb743ef72ebfddeac3c989aa43b96f05a90 WHIRLPOOL fab1348ddaf1f13e79c218a26de9b0b7978548be137c5e39b9bb8874789d97c7e23ae322ea3d2e899bbbd9b88e69884b8bb9bcfa4cb6d8df84e47c8df456c62d -AUX freebsd-pf-7.0-libevent.patch 331 SHA256 ea5db9308712447cee285d2ac479d95399f1c0948afbbaf6598ad362e262c716 SHA512 fe2db637c8b1f6f8853fd4f6a88dbc0de8d58cc8f3875f0a94dbda74ef4bab4f1402409ff4732f8deae5d9da6bf5eb32d2a8e985f210b84926f94942dffe9c61 WHIRLPOOL 2f84a4ae54fa3dd53610db31af88c064b6df82460516f2024176d4acd5dd6c702c5adee98473a6a05ed701b07b0404c90dae490acd11483a48206ce542b21a96 -AUX freebsd-pf-7.0-pcap_pollution.patch 437 SHA256 65eb1dd0c9084981faa80dfc74140deb431223ae14cf47b1ee0b83fc0fa2bfef SHA512 e08df63ac57747cbd42e32b6e61e08e92b0f7af333508e32717194e9c0d0a1b0f23bf4ed9f0b745f804c164b2c950bf92d2abc22ece58113b7ccaee5e86ea3d9 WHIRLPOOL 735d498ba1765df65acb2db018c0f058da06dd5bef27eca3137ed1409e959bd637c6040f32fe40d022d6fba98272c496765e84319e1f1f5857618ac66744c872 -AUX freebsd-pf-9.0-bpf.patch 309 SHA256 9adf0af94c2cf2f61c1e9f2ab071c8628b3845778f7f61abfe52feb347a615a7 SHA512 e3364e372b5c2d2c4a1960ee1f6d5fa411810ba3597356ec17b275afd8bb6813cce62d781fc683663037b008d81804d28a2617f308c942a741657cf8dcf0e039 WHIRLPOOL 141a2ad5dbc1e199dc669aef995fcd9b4c71a6a0da55c11645adbef073755a8d661ae4e653d377c42ab000913599ba7f90aa611059496996a2f57282eaf07f8a -AUX freebsd-pf-9.0-getline.patch 1159 SHA256 c56fa01870e2ea7ea187b14ef0d13801782c3f479f3e7fe31ac8fba2917969aa SHA512 2b7ab780e8a66a63e17302f9de19a9a72c7246b349f16745fbe7a2a69d8c83c9d8c5c7e18311bf0273620ce18cd9add6dcf051364013f941d477dbbf165b3ddb WHIRLPOOL 4ab2c2598b79a4066d013bc056f6e3977501cdce959568b7f14360b8b34f3622654a784291c9ba979390fb71f6b76672c26c0242ee9c1df09aadbe96e3e4156e -AUX freebsd-pf-9.0-libevent.patch 384 SHA256 e1331cdc64d5d135f3cf33bea70031cba7813abc39778f860f06a161c395f799 SHA512 763c352e5a1e789e5d634066cfa7de84199db14a1f0d61b699f84f04ef1a2acb82dd63d59cffa339ff673bf92a3a9aab25f4b60fb5928e040e47b8c43b6a93f8 WHIRLPOOL ac352886754590178c550aa755a2380e493cccb66815f2875e03427d5d644394de5f711b6d01625a49fafabb4df1e63bff89ea19f47f99b1f6252ff7ca248ab2 -AUX freebsd-pf-9.0-pcap_pollution.patch 450 SHA256 d6ec6b1952e22f621b33d85956837bae26fd06a79cd3daf5e073b889d4650276 SHA512 262d23f74449f75d628dcda09a7c7e0d501b61899c0a2a1ca71179989803f5c5f70fd4f8908f06ce998aca994d54b43efe03578892ff121c0a27e7fa36e4f1dd WHIRLPOOL 9dd4be7cf9741a8cbb0395346a79656233532b10762551d04c85a36637bd95e5d1aed0024ba1ee4259d41d1b5d26777524353787d3c13ad12e4dfb21f12955cf -AUX freebsd-pf-9.0-pflogd.patch 332 SHA256 fc832fdfa406603a2cb185b8f0f746b13f7673742578913ba635849e1fd778f6 SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073 WHIRLPOOL b90b5e454e96cc6f243e99358b78d45b6a13a46810a3683d837f03721052e7b4fc3f8733ac2c96cabed204435a9be93a0652da5311f6552ece294031b0b663df -AUX pf.confd 274 SHA256 dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5 WHIRLPOOL fa87094a2339af4fc117840741e6460331c8de1d7ff656394701d58d0f362243788b1d6e650ee2cea34e9e4ad9c19f97996de8d01927808875384af2925a8adc -AUX pf.initd 810 SHA256 e2e592682e4c8e2b5de2a0be21c061e0f9adbe237d566ce8846dbda13fb56750 SHA512 7638cae25c51f8be6229992b6462ac65ad7fd53fd61aaaedd70e7f97ea3b3314278f5ed3336dde043cdd86f017f1b6d025a95931649257b596eba3dbf2c64eff WHIRLPOOL 099108815854abb3e05f4f0100e1bef515570955677eb68d2b1f1d2301057adc12f319a7ef5805af466b3de4d10414e49df53d6119ebcc674410cafe968d9992 -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-pf-11.0.ebuild 1498 SHA256 56f9cb1cb83e1e72ea89a09d4dadafbac81fb2fd7aba5d00113e5680b89c4f21 SHA512 0f9e4054b4d758437e5ef0aec840fde5def23e2e17b1ecb21f8404a207dabba134126623d92a23f6778faca9ca22dc672bbd459e801b094458e93abf3df1f77e WHIRLPOOL 51d26a08d3a367d06b257c26fa17b2e814849b9487a2cb9a4242986734f33540e2b621e30bd06b4bca9f11edf20fcba5a4a6005d987af0a8f0be0212d6671fdf -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch deleted file mode 100644 index 57474ea..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile -index de49888..2ab32fb 100644 ---- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile -+++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile -@@ -7,10 +7,7 @@ MAN= ftp-proxy.8 - - SRCS= ftp-proxy.c filter.c - --CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent -- --LDADD+= ${LIBEVENT} --DPADD+= ${LIBEVENT} -+LDADD+= -levent - - WARNS?= 3 - diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch deleted file mode 100644 index 1316d3b..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile -index fcff8eb..0da383d 100644 ---- a/sbin/pflogd/Makefile -+++ b/sbin/pflogd/Makefile -@@ -6,10 +6,7 @@ PROG= pflogd - SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c - MAN= pflogd.8 - --CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h -- - LDADD= -lpcap --DPADD= ${LIBPCAP} - - WARNS?= 2 - diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch deleted file mode 100644 index 0f3ecb1..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile -index 941505f..df5ccb2 100644 ---- a/usr.sbin/ftp-proxy/Makefile -+++ b/usr.sbin/ftp-proxy/Makefile -@@ -7,8 +7,6 @@ MAN= ftp-proxy.8 - - SRCS= ftp-proxy.c filter.c - --CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent -- - LIBADD= event - - WARNS?= 3 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch deleted file mode 100644 index 6435280..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile -index b3822dd..5912ad2 100644 ---- a/sbin/pflogd/Makefile -+++ b/sbin/pflogd/Makefile -@@ -7,8 +7,6 @@ PROG= pflogd - SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c - MAN= pflogd.8 - --CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h -- - LIBADD= pcap - - WARNS?= 2 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch deleted file mode 100644 index 1425db2..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- usr.sbin/ftp-proxy/ftp-proxy/Makefile.orig 2008-06-14 00:01:52 -0300 -+++ usr.sbin/ftp-proxy/ftp-proxy/Makefile 2008-06-14 00:03:19 -0300 -@@ -10,8 +10,7 @@ - CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent - CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf - --DPADD= ${LIBEVENT} --LDADD= ${LIBEVENT} -+LDADD= -levent - - WARNS?= 2 - diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch deleted file mode 100644 index 4a7c2e9..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- contrib/pf/pflogd/privsep.c.orig 2007-07-03 09:30:02 -0300 -+++ contrib/pf/pflogd/privsep.c 2008-06-13 23:55:39 -0300 -@@ -31,13 +31,14 @@ - #include <errno.h> - #include <fcntl.h> - #include <limits.h> -+#include <stdio.h> -+#define HAVE_SNPRINTF - #ifndef __FreeBSD__ - #include <pcap.h> - #include <pcap-int.h> - #endif - #include <pwd.h> - #include <signal.h> --#include <stdio.h> - #include <stdlib.h> - #include <string.h> - #ifdef __FreeBSD__ diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch deleted file mode 100644 index fb3c701..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- contrib/pf/pflogd/pflogd.c.old 2011-11-02 21:12:57.000000000 +0000 -+++ contrib/pf/pflogd/pflogd.c 2011-11-02 21:13:11.000000000 +0000 -@@ -39,6 +39,7 @@ - #include <sys/stat.h> - #include <sys/socket.h> - #include <net/if.h> -+#include <net/bpf.h> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch deleted file mode 100644 index 6679d32..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- contrib/pf/ftp-proxy/ftp-proxy.c.old 2011-11-02 21:18:19.000000000 +0000 -+++ contrib/pf/ftp-proxy/ftp-proxy.c 2011-11-02 21:18:36.000000000 +0000 -@@ -103,7 +103,7 @@ - int drop_privs(void); - void end_session(struct session *); - void exit_daemon(void); --int getline(char *, size_t *); -+int ftpgetline(char *, size_t *); - void handle_connection(const int, short, void *); - void handle_signal(int, short, void *); - struct session * init_session(void); -@@ -249,7 +249,7 @@ - buf_avail); - s->cbuf_valid += clientread; - -- while ((n = getline(s->cbuf, &s->cbuf_valid)) > 0) { -+ while ((n = ftpgetline(s->cbuf, &s->cbuf_valid)) > 0) { - logmsg(LOG_DEBUG, "#%d client: %s", s->id, linebuf); - if (!client_parse(s)) { - end_session(s); -@@ -343,7 +343,7 @@ - } - - int --getline(char *buf, size_t *valid) -+ftpgetline(char *buf, size_t *valid) - { - size_t i; - -@@ -1087,7 +1087,7 @@ - buf_avail); - s->sbuf_valid += srvread; - -- while ((n = getline(s->sbuf, &s->sbuf_valid)) > 0) { -+ while ((n = ftpgetline(s->sbuf, &s->sbuf_valid)) > 0) { - logmsg(LOG_DEBUG, "#%d server: %s", s->id, linebuf); - if (!server_parse(s)) { - end_session(s); diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch deleted file mode 100644 index e488423..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- usr.sbin/ftp-proxy/ftp-proxy/Makefile.old 2011-11-02 20:57:03.000000000 +0000 -+++ usr.sbin/ftp-proxy/ftp-proxy/Makefile 2011-11-02 20:57:21.000000000 +0000 -@@ -7,11 +7,9 @@ - - SRCS= ftp-proxy.c filter.c - --CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent - CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf - --LDADD+= ${LIBEVENT} --DPADD+= ${LIBEVENT} -+LDADD+= -levent - - WARNS?= 3 - diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch deleted file mode 100644 index 184ab6f..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- contrib/pf/pflogd/privsep.c.old 2011-11-02 21:04:01.000000000 +0000 -+++ contrib/pf/pflogd/privsep.c 2011-11-02 21:04:27.000000000 +0000 -@@ -32,11 +32,13 @@ - #include <errno.h> - #include <fcntl.h> - #include <limits.h> -+#include <stdio.h> -+#define HAVE_SNPRINTF -+#define HAVE_STRLCPY - #include <pcap.h> - #include <pcap-int.h> - #include <pwd.h> - #include <signal.h> --#include <stdio.h> - #include <stdlib.h> - #include <string.h> - #include <syslog.h> diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch deleted file mode 100644 index d5a65ea..0000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- sbin/pflogd/Makefile.old 2011-11-02 21:08:46.000000000 +0000 -+++ sbin/pflogd/Makefile 2011-11-02 21:08:53.000000000 +0000 -@@ -6,10 +6,7 @@ - SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c - MAN= pflogd.8 - --CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h -- - LDADD= -lpcap --DPADD= ${LIBPCAP} ${LIBUTIL} - - WARNS?= 2 - diff --git a/sys-freebsd/freebsd-pf/files/pf.confd b/sys-freebsd/freebsd-pf/files/pf.confd deleted file mode 100644 index 87c21b2..0000000 --- a/sys-freebsd/freebsd-pf/files/pf.confd +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Defines where the rules file is found, by default /etc/pf.conf -# pf_conf=/etc/pf.conf - -# Extra options to pass to pfctl when loading the rules -# See pfctl(8) -# pf_args= diff --git a/sys-freebsd/freebsd-pf/files/pf.initd b/sys-freebsd/freebsd-pf/files/pf.initd deleted file mode 100644 index 38ee4ea..0000000 --- a/sys-freebsd/freebsd-pf/files/pf.initd +++ /dev/null @@ -1,50 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need net -} - -checkconfig() { - if ! [ -c /dev/pf ]; then - ewarn "Pseudo-device /dev/pf not found." - - ebegin "Loading pf module" - if ! kldload pf; then - eerror "Unable to load pf module." - eend 1 - return 1 - fi - eend $? - - if ! [ -c /dev/pf ]; then - eerror "Pseudo-device /dev/pf still not found." - return 1 - fi - fi - - return 0 -} - -start() { - checkconfig || return 1 - - einfo "Starting firewall" - - if [ -r "${PF_RULES_FILE}" ]; then - einfo "Loading firewall rules" - /sbin/pfctl -qe -f ${PF_RULES_FILE:-/etc/pf.conf} ${PF_OPTS} - else - /sbin/pfctl -qe ${PF_OPTS} - fi - - eend $? -} - -stop() { - einfo "Stopping firewall" - /sbin/pfctl -qd || retval=1 - eend $? -} diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild deleted file mode 100644 index 914cfe1..0000000 --- a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd user - -DESCRIPTION="FreeBSD's base system libraries" -SLOT="0" - -IUSE="" - -# Crypto is needed to have an internal OpenSSL header -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - usr.sbin/ - sbin/ - contrib/pf/ - etc/ -" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND} - dev-libs/libevent - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" - -S="${WORKDIR}" - -SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy" - -pkg_setup() { - enewgroup authpf 63 -} - -src_prepare() { - # pcap-int.h redefines snprintf as pcap_snprintf - epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch" - # Use system's libevent - epatch "${FILESDIR}/${PN}-11.0-libevent.patch" - epatch "${FILESDIR}/${PN}-11.0-pflogd.patch" - epatch "${FILESDIR}/${PN}-9.0-bpf.patch" - # Link in kernel sources - [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" -} - -src_compile() { - for dir in ${SUBDIRS}; do - einfo "Starting make in ${dir}" - cd "${S}/${dir}" || die - freebsd_src_compile || die "Make ${dir} failed" - done -} - -src_install() { - for dir in ${SUBDIRS}; do - einfo "Starting install in ${dir}" - cd "${S}/${dir}" || die - freebsd_src_install || die "Install ${dir} failed" - done - - cd "${WORKDIR}"/etc - insinto /etc - doins pf.os - # pf.initd provided by openrc, but no pf.confd - newconfd "${FILESDIR}/pf.confd" pf -} diff --git a/sys-freebsd/freebsd-pf/metadata.xml b/sys-freebsd/freebsd-pf/metadata.xml deleted file mode 100644 index a00f3ae..0000000 --- a/sys-freebsd/freebsd-pf/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> -</maintainer> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest deleted file mode 100644 index d8fb22e..0000000 --- a/sys-freebsd/freebsd-rescue/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX freebsd-rescue-10.0-zlib.patch 861 SHA256 e6ed90b353f180dc805d8ebf8774ef221f99dcd2ee2df485d48e795020ae8f4c SHA512 b055878934144bb2403bcf7d93b6239d161654d822ff5839676430eec282b1a7d210e9d4d4b744995b6e6d400ac15a98af9268f0ef62e455c6e776fa79d7b037 WHIRLPOOL 13e41e3aa5d9e0ca581927a8550acddd31ca0619b8e59f34a4f1c0a4a43b1d5fe2927fe8860db9c3bbd8cce8f7267c6f88ceca139569a0ac3ab575561929b4b8 -AUX freebsd-rescue-11.0-rename-libs.patch 874 SHA256 05dbc376b4e0b84d2d41a1d627d2a8b704584047acd0331fdbd927d44945066c SHA512 8ac692342e0ce3cd39286c08523bc89d56f15964242c08ec2065e70fbf3cec24c00608d50ab5b94ab4a7781a4175acc40c2bcc0e4a2cfaf3afcd89fa06dd77c9 WHIRLPOOL 2d3670648d3aea78b77ac0cf201e77fb9028eb00d105113543362df801a3f48610356f4adc6635a18852fc6ac750fa39c6fe223d50ab70474ab117d6199ad99b -AUX freebsd-rescue-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4d00d1ae436e40af0d1cd095bc4f SHA512 54db6c1ad6030002fb1b5848e75470136a2b0b3d0c5398e1e0b3439c0bb736eb1ffa4799da7a3775a29761196a2c09a9cf70f75244de7d4e99bfe07357ed759c WHIRLPOOL cc5572b6ed34cb0462da77edf714e92ba10b672a315b216f342d200f0081ffdc417936b69cdf9e7e5ba8e1451f509fe222d366c84d98a005999c2987ae08d3ef -AUX freebsd-rescue-8.0-pkgconfig_static_libarchive.patch 330 SHA256 3690730ee66082fcc4f04ab79c49c6759772c0aefc68abdebbe4497b1155a7bc SHA512 529294fbff01e573f714e7f0474ccb85755453da057d224ffc1eab91ea6945af2efc8cafcc48db4d75f5204fa5ab514da35af66d75f90df4bde3f0b8e8aa7dc5 WHIRLPOOL 95b65d6501a8d77fe4ecbc13aea1010e85fa5591fb5fc12d4a3ccaee51b908245ac79961bccd3d0e4b8430eacd7eb0fe271907c8a94812fad8df0ab888e3bd7d -AUX freebsd-rescue-8.2-libzcleverlink.patch 789 SHA256 80d86cb1b632d0c09fdcfd7b998fb1189e957619a41fc65682e2c439392c38fd SHA512 5c24aed5b05b1de4aad67961edbc168c31f80a2d0d034839af8b2fb73497b34d525e1af2c0979b1e23bbcbb53d6079030aa68a1b218cef470c8daa2f439d3a7f WHIRLPOOL 55b39e959f0d0821189070ca03167becdd6d446a97dff7c171c40b12629cb2365aed6633635e6d8f6e3f3fa6bea68c46f31b79e537c3d56752e4aee76d76ce84 -AUX freebsd-rescue-9.1-bsdtar.patch 404 SHA256 0e71e3e370b33318bbb167e82d6507589fb95cc2c2d1fc6e8b74d0faf3d17ef1 SHA512 320d2a69c2f0de5e6cb733238fcc46133e571d8536f2ac573597f008d4261fae4d27619c244a90a70392688004df438b80e89f6be810841f6a40a22c2c361bb4 WHIRLPOOL 412da27f4535e1300d150edc74f72cf5e4e2b8bb6d4c7e9f31a498396ac12514e97e4b3a83040484b4713a7edb6b2d6ed5e8b2fe714d13f297c35d657f90fc08 -AUX freebsd-rescue-9.1-libcleverlink.patch 801 SHA256 53794263aabaf55cd570adbbfdb68e86a9e9b17557e8ca223d424a5c2f4f6831 SHA512 556bb68f3307dc7fb10096080db2d336ba4096ba6bebc6a1fe9449ab5298ce2c66fb53f11f0702ee75c2208b45a6e2cb366a3d774bedb65bcdb2a49f51c08fa3 WHIRLPOOL 88125b9143113b1f7049bf63a20a0c6d82fbe2c722198405830092b0a183f4bf7744420e6a82b601c8fb25911556c8f3a9088949798c7f66caf7843a5f9b2347 -AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b -AUX freebsd-ubin-10.2-bsdxml.patch 367 SHA256 3bedd2e3efc7817c446395866e3ec2ca65430624dd4958bc91296d77cfc4fb90 SHA512 234fe495fcefaa9c36d97460da05365ff081661411451ae3d8dca83b3f8b1746450e111ac43baccd15a6c86c03c7cdd37d54d70fed551d694800dc6bca7c5e8d WHIRLPOOL 4946a71b63b05691ede60f15573356d98ef62b44cab40ba40a24d2be11e9655c95c660b62e898ff15ff9cdd8c006402c0dbe43a82d913b7707c1f30a55720863 -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-rescue-11.0.ebuild 1876 SHA256 0c95232e5325b9cf44794eddb0437aac011ea218eea4c6aa5196f853dea140f9 SHA512 c7769f4229c6d0af44e524c0208680a193e40874f4bc6010fe6d7c645c7423735123c9bbcce48fbab17b02737d49bb9f722172e9cfe37e1560bc50e8120edbf0 WHIRLPOOL 9d1eb2b421609571ba02d62a09213c1e5703d10945951fed237f8168e051fd90b543ebed5c19495c89c5c2a0c483a2e56638f9409f4932c41cd6b73c5d4396b5 -MISC metadata.xml 402 SHA256 75ec89a9158454c340bf52b7b8c9206f5cb65fe01afd5dfd36aaf13fd68eca7b SHA512 247e4e4c80cd64a81f698fc7fbeab529a02f8b2c6b0040628936ab7d83a09c7242df0b10d7cb4e4e8d7d78806c303cd82903adc4a38b649e911337a832c35834 WHIRLPOOL 4cd689a5c3a69a0ae7614bbed3c7a51eade7c77e03eba094fbeb75390ec9faee52c2bb085655ad3069148ec03838c03c713921a62eb6c1380e2a90781d294d72 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch deleted file mode 100644 index 42165c4..0000000 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c -index 13c0d43..1f258f3 100644 ---- a/sbin/savecore/savecore.c -+++ b/sbin/savecore/savecore.c -@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose; /* flags */ - static int nfound, nsaved, nerr; /* statistics */ - static int maxdumps; - --extern FILE *zopen(const char *, const char *); -+extern FILE *gzopen(const char *, const char *); - - static sig_atomic_t got_siginfo; - static void infohandler(int); -@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device) - if (compress) { - snprintf(corename, sizeof(corename), "%s.%d.gz", - istextdump ? "textdump.tar" : "vmcore", bounds); -- fp = zopen(corename, "w"); -+ fp = gzopen(corename, "w"); - } else { - snprintf(corename, sizeof(corename), "%s.%d", - istextdump ? "textdump.tar" : "vmcore", bounds); diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch deleted file mode 100644 index 3103574..0000000 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile -index e747c02..a061436 100644 ---- a/rescue/rescue/Makefile -+++ b/rescue/rescue/Makefile -@@ -54,7 +54,7 @@ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ - ed expr getfacl hostname kenv kill ln ls mkdir mv \ - pkill ps pwd realpath rm rmdir setfacl sh sleep stty \ - sync test --CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -ll -ltermcapw -lutil -lxo -+CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -lfl -lncursesw -lutil -lxo - CRUNCH_BUILDTOOLS+= bin/sh - - # Additional options for specific programs -@@ -128,7 +128,7 @@ CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem - # liblzma needs pthread - CRUNCH_LIBS+= -lpthread - .endif --CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -+CRUNCH_LIBS+= -lgeom -lexpat -lkiconv - .if ${MK_OPENSSL} == "no" - CRUNCH_LIBS+= -lmd - .endif diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch deleted file mode 100644 index 22fb2ec..0000000 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c ---- sbin/savecore/savecore.c 2005-02-26 01:21:50 +0000 -+++ sbin-zlib/savecore/savecore.c 2005-05-06 12:00:06 +0000 -@@ -95,7 +95,7 @@ - static int checkfor, compress, clear, force, keep, verbose; /* flags */ - static int nfound, nsaved, nerr; /* statistics */ - --extern FILE *zopen(const char *, const char *); -+extern FILE *gzopen(const char *, const char *); - - static void - printheader(FILE *f, const struct kerneldumpheader *h, const char *device, -@@ -553,7 +553,7 @@ - if (compress) { - sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" : - "vmcore", bounds); -- fp = zopen(filename, "w"); -+ fp = gzopen(filename, "w"); - } else { - sprintf(filename, "%s.%d", istextdump ? "textdump.tar" : - "vmcore", bounds); diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch deleted file mode 100644 index 7d12621..0000000 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rescue/rescue/Makefile.old 2010-03-12 12:14:17 +0100 -+++ rescue/rescue/Makefile 2010-03-12 12:14:47 +0100 -@@ -209,7 +209,7 @@ - CRUNCH_LIBS+= -lbz2 - - CRUNCH_PROGS_usr.bin+= tar --CRUNCH_LIBS+= -larchive -lmd -+CRUNCH_LIBS+= `pkg-config --static --libs libarchive` -lmd - .if ${MK_OPENSSL} != "no" - CRUNCH_LIBS+= -lcrypto - .endif diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch deleted file mode 100644 index 3d44457..0000000 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- rescue/rescue/Makefile.old 2011-07-06 01:35:13.000000000 +0000 -+++ rescue/rescue/Makefile 2011-07-06 01:35:54.000000000 +0000 -@@ -143,7 +143,7 @@ - .if ${MK_ZFS} != "no" - CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl - .endif --CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz -+CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs - - .if ${MACHINE_ARCH} == "i386" - CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk -@@ -234,7 +234,7 @@ - CRUNCH_PROGS_usr.sbin+= chown - CRUNCH_ALIAS_chown= chgrp - ################################################################## --CRUNCH_LIBS+= -lm -+CRUNCH_LIBS+= -lz -lm - - ################################################################## - # The following is pretty nearly a generic crunchgen-handling makefile diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch deleted file mode 100644 index d4d23d7..0000000 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur work.orig/contrib/libarchive/tar/bsdtar.c work/contrib/libarchive/tar/bsdtar.c ---- work.orig/contrib/libarchive/tar/bsdtar.c 2012-07-12 13:44:29.000000000 +0900 -+++ work/contrib/libarchive/tar/bsdtar.c 2012-07-29 00:57:25.000000000 +0900 -@@ -691,7 +691,7 @@ - { - printf("bsdtar %s - %s\n", - BSDTAR_VERSION_STRING, -- archive_version()); -+ archive_version_string()); - exit(0); - } - diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch deleted file mode 100644 index a194397..0000000 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur work.orig/rescue/rescue/Makefile work/rescue/rescue/Makefile ---- work.orig/rescue/rescue/Makefile 2012-07-29 00:50:20.000000000 +0900 -+++ work/rescue/rescue/Makefile 2012-07-29 00:56:01.000000000 +0900 -@@ -125,7 +125,7 @@ - .if ${MK_ZFS} != "no" - CRUNCH_LIBS+= -lavl -lnvpair -lpthread -lzfs -luutil -lumem - .endif --CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz -+CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lreadline -lsbuf -lufs - - .if ${MACHINE_CPUARCH} == "i386" - CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk -@@ -216,7 +216,7 @@ - CRUNCH_PROGS_usr.sbin+= chown - CRUNCH_ALIAS_chown= chgrp - ################################################################## --CRUNCH_LIBS+= -lm -+CRUNCH_LIBS+= -lmd -lz -lm - - .include <bsd.crunchgen.mk> - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch b/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch deleted file mode 100644 index bdda99b..0000000 --- a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -uNr sbin/ifconfig.old/regdomain.c sbin/ifconfig/regdomain.c ---- sbin/ifconfig.old/regdomain.c 2010-12-21 17:09:25.000000000 +0000 -+++ sbin/ifconfig/regdomain.c 2011-07-10 15:56:27.000000000 +0000 -@@ -39,7 +39,7 @@ - #include <err.h> - #include <unistd.h> - --#include <bsdxml.h> -+#include <expat.h> - - #include "regdomain.h" - -Los ficheros binarios sbin/ifconfig.old/regdomain.o y sbin/ifconfig/regdomain.o son distintos diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch b/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch deleted file mode 100644 index 6064717..0000000 --- a/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c -index af6562b..3121c81 100644 ---- a/usr.bin/mt/mt.c -+++ b/usr.bin/mt/mt.c -@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD: stable/10/usr.bin/mt/mt.c 280438 2015-03-24 14:36:10Z ken $" - #include <unistd.h> - #include <stdint.h> - #include <errno.h> --#include <bsdxml.h> -+#include <expat.h> - #include <mtlib.h> - - #include <cam/cam.h> diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild deleted file mode 100644 index f473264..0000000 --- a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd toolchain-funcs - -DESCRIPTION="FreeBSD's rescue binaries" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -IUSE="atm netware nis zfs" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - usr.bin/ - contrib/ - lib/ - bin/ - sbin/ - usr.sbin/ - gnu/ - sys/ - libexec/ - rescue/ -" - -RDEPEND="" -DEPEND="sys-devel/flex - app-arch/xz-utils[static-libs] - sys-libs/ncurses[static-libs] - dev-libs/expat[static-libs] - app-arch/bzip2[static-libs] - dev-libs/libedit[static-libs] - dev-libs/libxml2:2[static-libs] - dev-libs/openssl:0=[static-libs] - sys-libs/zlib[static-libs] - sys-libs/readline[static-libs] - =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?] - =sys-freebsd/freebsd-sources-${RV}* - =sys-freebsd/freebsd-mk-defs-${RV}* - zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )" - -S="${WORKDIR}/rescue" - -pkg_setup() { - # Add the required source files. - use zfs && EXTRACTONLY+="cddl/ " - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - mymakeopts="${mymakeopts} NO_PIC= " -} - -src_prepare() { - # As they are patches from ${WORKDIR} apply them by hand - cd "${WORKDIR}" || die - epatch "${FILESDIR}/${PN}-10.0-zlib.patch" - epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" - epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch" -} - -src_compile() { - export ESED=/usr/bin/sed - unalias sed - - tc-export CC - # crunchgen is now checks env MAKE. - # Use to force BSD's make - export MAKE=/usr/bin/make - - cd "${WORKDIR}/lib/libarchive" || die - echo "#include <expat.h>" > bsdxml.h - freebsd_src_compile - export CC="${CC} -L${WORKDIR}/lib/libarchive" - - cd "${S}" || die - freebsd_src_compile -} diff --git a/sys-freebsd/freebsd-rescue/metadata.xml b/sys-freebsd/freebsd-rescue/metadata.xml deleted file mode 100644 index 8703f7b..0000000 --- a/sys-freebsd/freebsd-rescue/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> - </maintainer> - <use> - <flag name="zfs">Enable ZFS support.</flag> - <flag name="netware"> Build tools to work with NetWare protocols (IPX and NCP).</flag> - </use> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest deleted file mode 100644 index 0058061..0000000 --- a/sys-freebsd/freebsd-sbin/Manifest +++ /dev/null @@ -1,17 +0,0 @@ -AUX adjkerntz-crontab 184 SHA256 f3b08140ea38bfe502b34dd8c69aa4a6b65b786d792828cce082be8f844345dc SHA512 28ecfd94257eca2d91323e4bac1920969e589a13f877f1d67c4be0dd5d0bf4585eba8f749ae04f2e0761d5860b76e0c04993350bbdeb52736584ea9df97c6093 WHIRLPOOL 883509014af5a6f3803993eb4fc9f53608b08eaffdfcb409be3945d8234ab66b6a99c620b781a8d650aaeaff1f05db2e5249fb280f9a2bb079421062be3e5332 -AUX devd.conf 4770 SHA256 48c6d3664813222aed6b3c0ff5badbf3e8a37477445fe705850f77a9b95e3219 SHA512 af33a24edda94487adca283427cd0c5c027033ea7c03b11ea4b75c5d402794845005551200d90b74a29867490c2f7e35c74a864a18c7fba09d792ec591fe2c75 WHIRLPOOL b249cb96a67b8c10564212cb3cef34a1779b3adc4068edc1c68b8a7bdbc8cf4f527d2a655b9c8da1e68ec50b4bb8e7a9efe36b5a10db329fac4544a06e28fed5 -AUX devd.initd 1137 SHA256 8f574e3cda5792b5ea8db460fcd5b9052ec13a1d6a9f0cfd037ed35f108d9faf SHA512 031e3958b30b897d7a48a72688c5ff9d9961a0db1d06b57587d58e6d1685a160d8d6557536e2e4cb42263b718440fbcc8fd0ca839a7edb670d131255826e3875 WHIRLPOOL 12f50aca77a62c8efff01892e5282a98fab9b8c0a3d3f5c3ed2f0abce03e35ade51102814e6574883e81fa7350a2f50a34b151aa846b1d3e22242810eccc0196 -AUX devd_queue 853 SHA256 af57ffa202eec7d8c050e32e5ca3f54cbf491fac2e439172f9e008ac3e5e8417 SHA512 9d14d3d41608de50877761fd015cafe29d9103e3f77d0f42726405d4e66da5508000056e3b7603e224e4fab86b992f40af2fa3a764b4aae71e2fe4a898d97d88 WHIRLPOOL 23e5d1268f85d71e761717c19a8d1bb5516d32847f47080ea10ea4536dd7154666f76a5709e9e9639989dc2121ace708bea22538e2a571244578668e0b1b5791 -AUX freebsd-sbin-10.0-zlib.patch 861 SHA256 9e2b89c1def6424b4a628d286ced8554f5f59bdf890e647f5b07e431e4bc9351 SHA512 8a6e14d15e44e9de22863c65cd359cc408207a4329ecdfe053317fd120d01025f5d42b958447ed0bb2e584cc050391306438934ac8cae0edc4a6a785da8138b7 WHIRLPOOL ebad6febc4ebdd4355fe6a60f99af13d2b15e52f538a6c677705401982e1e55556234df7099c570fa7e6fa5ee9c9264e5a394382c626919d43c214d21023d6ba -AUX freebsd-sbin-6.1-pr102701.patch 548 SHA256 dccf32386359a2cfd80272c86085467d612c8f4d7924a6a223cd1259a8b7a176 SHA512 2b882565670ffe559410b17e2fa6a94624eee89d25a791ef3e27d657dedcf95b2be282217a2350203af7727b839d5d6ff50368f72c4bef3d7e60fef8a6325cbe WHIRLPOOL 14db7a26e6189314cc9a0e8ff5ccd01bedba178d9ddff856df262b18ce35fbd85999f5f4a612c2388af8718c6a1c0b544db4287bca08356fa5fb191f1cccf978 -AUX freebsd-sbin-6.2-ldconfig.patch 389 SHA256 b3fd47a733d39dea3400bee180d156ed09ff4c19dd47fbf5df52af33bdc5dc2b SHA512 ed8f6073991ba0c8823aea1570e720273d7dc68ec6daf38d7e1d41f2285d307d7905cf674a1148d4783c69f2dafd7fc8a51e729aa4727eb46d857218ab2d71ed WHIRLPOOL 3ecccd7b56c9bee820ca92b8a6a446a1bf69e61e889324407f2e76336eb0328b1162c7dc5d5f24505ec1f36d235bfe33fbecc5c5d60bf0f04741eeca9eb5b1cb -AUX freebsd-sbin-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4d00d1ae436e40af0d1cd095bc4f SHA512 54db6c1ad6030002fb1b5848e75470136a2b0b3d0c5398e1e0b3439c0bb736eb1ffa4799da7a3775a29761196a2c09a9cf70f75244de7d4e99bfe07357ed759c WHIRLPOOL cc5572b6ed34cb0462da77edf714e92ba10b672a315b216f342d200f0081ffdc417936b69cdf9e7e5ba8e1451f509fe222d366c84d98a005999c2987ae08d3ef -AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b -AUX freebsd-sbin-setXid.patch 541 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267 SHA512 e6f1aefab22eca6941a5b62f6f9d9c82e0efc2b308ec636ecab40d9a678e87f2f6ccfefac99f5367ad8a16d18ddadf9a877a2f93697248b3f38a09edac75ec6e WHIRLPOOL a2d578ff3b54ad25875f65d6724d0762c0fc3a400aa8e14c93ab94dc789910fbc6ab70528cbd0074fd0d7a4957a2d2d51bf10f615cbfd751aa4e95edc88d4e7d -AUX idmapd.initd 441 SHA256 876ef332062f6e0335bd09152e6289ac1df8827cbf5d24d43b704e01ca875bce SHA512 69e548dd863c12dd9d525d9dd77ed06fd0418b6744c97899766d73aca26b60d12f27c791720b195c46b244fd2f3effd47d43b4fa277f795f402494f991837714 WHIRLPOOL 33e800223fac44ca8e476449044d75b274e1b1db7e8c6f1c615f4479b51f5f0255c15d46d9ea39888a8a2d0b419a6ce9786a9d9869ed81cde90b52e11fefa55d -AUX ipfw.confd 364 SHA256 97911a2f003e2108c1f5da04b84a3b73fbccbde48fe58af0f056d8a9effbb3d3 SHA512 6bb923386c40e7bfcc2d9a122ee3e942fe30cb49715d1cfb122923416d2dcf63fd6f61cb93510a245eb8bbd767e33f029726bb277cb0e16e98d2e856ef33ff2f WHIRLPOOL e1de6e7f8807f7079b856197d9e7a650491a0a0f7b9fab703befed7bc24ccedb3be1ff758194c70cfa4e86f0930b6f30bc03342edd8de55795621ceb5be471f0 -AUX ipfw.initd 2912 SHA256 156801d8b99f50e2d6b48cc01ecd57c779749fb40bb214b43cc036ce82f96b98 SHA512 7e07cad7e1305cb36b98a408f9fadd9ce4f4dd40680a92d84feeb00d3a0828e15fcfdfd821b26c31133e5da8a5337e5dc8fd7b376e2ab862158e42625b3756a7 WHIRLPOOL e88c9b57955af23ee01d7281359d447db4780697fd2899bb4c86e62145cc9f035f7c8a19ecea487bb0f5c6f71f1edf29f8c70b31af62caebe22b92ac4ceaa640 -AUX sysctl.initd 558 SHA256 e6921dc44d3e442b394eed3385d7cda9325efff2e51d08972e1db7b0d97e122d SHA512 e1858fedf435b6ada3b2846d63b6b74dfcfee98befc00946917f5ee009fc83cbc963f4dc05d5051e13c4493f2fa9d5ba2f2b7adffee8ee741d3268cb49cc6c2b WHIRLPOOL a8b59c1c3045e7441c109783a28dbf1505dd4bc9d091b291b406221091948b7526d47bd3a4f0d3e7dd6ae5810feca20e0cb855b74273e13884f7cda87ba9e004 -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-sbin-11.0.ebuild 2538 SHA256 742c55213680e92d28eb296a5540aeeec1a6c635b03c3974d1e4067522004a87 SHA512 d459593ae0df4571ec40c12f3f2b1a38219aadbdde0696dec178020151d7450dd1f6723065846848d6d583809a42d90b276570881d1e5ee9f68166cac6e41969 WHIRLPOOL 949e5ff234cb115d8b17ee9fe5ec8ae97f3a115c001d5d9bf172a7ba9d6017f04d5a3a10b89da2fff0e7c53428d5d1df5e3b0b1ffb573800863777ef0a5b3b9a -MISC metadata.xml 563 SHA256 fbc171fa5f85349a31cbd904e559b5f012f86f7aa61a60c57a9eaf12a5e39dd4 SHA512 e83379562dfc0fd06156ac34e3c06677655a79ec7f51df2a3adc90fcf246dc0a779085252801d5415826bf3cb050917005b12792987d2f199484291a3635d765 WHIRLPOOL 543a80aa8e2403d4dd119572ddf3f9c7992f9a84825d6130480f46b247f310718faf3c64cad81c45e5b3e56f56439fcac4caf2a19c22b8e1a3034335c0e296a6 diff --git a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab b/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab deleted file mode 100644 index 5fc46f5..0000000 --- a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab +++ /dev/null @@ -1,4 +0,0 @@ -# Adjust the time zone if the CMOS clock keeps local time, as opposed to -# UTC time. See adjkerntz(8) for details. -1,31 0-5 * * * root /sbin/adjkerntz -a - diff --git a/sys-freebsd/freebsd-sbin/files/devd.conf b/sys-freebsd/freebsd-sbin/files/devd.conf deleted file mode 100644 index fd1e035..0000000 --- a/sys-freebsd/freebsd-sbin/files/devd.conf +++ /dev/null @@ -1,153 +0,0 @@ -# Refer to devd.conf(5) and devd(8) man pages for the details on how to -# run and configure devd. -# - -# NB: All regular expressions have an implicit ^$ around them. -# NB: device-name is shorthand for 'match device-name' - -options { - # Each directory directive adds a directory the list of directories - # that we scan for files. Files are read-in in the order that they - # are returned from readdir(3). The rule-sets are combined to - # create a DFA that's used to match events to actions. - directory "/etc/devd"; - directory "/usr/local/etc/devd"; - pid-file "/var/run/devd.pid"; - - # Setup some shorthand for regex that we use later in the file. - #XXX Yes, these are gross -- imp - set scsi-controller-regex - "(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\ - esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\ - [0-9]+"; -}; - -# Note that the attach/detach with the highest value wins, so that one can -# override these general rules. - -# -# For ethernet like devices start configuring the interface. Due to -# a historical accident, this script is called pccard_ether. -# -attach 0 { - media-type "ethernet"; - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/net.$device-name start"; -}; - -detach 0 { - media-type "ethernet"; - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/net.$device-name stop"; -}; - -# -# Try to start dhclient on Ethernet like interfaces when the link comes -# up. Only devices that are configured to support DHCP will actually -# run it. No link down rule exists because dhclient automaticly exits -# when the link goes down. -# -notify 0 { - match "system" "IFNET"; - match "type" "LINK_UP"; - media-type "ethernet"; - action "/etc/devd_queue add /etc/init.d/net.$subsystem start"; -}; -notify 0 { - match "system" "IFNET"; - match "type" "LINK_DOWN"; - media-type "ethernet"; - action "/etc/devd_queue add /etc/init.d/net.$subsystem stop"; -}; - -# -# Like Ethernet devices, but separate because -# they have a different media type. We may want -# to exploit this later. -# -#detach 0 { -# media-type "802.11"; -# action "env IN_HOTPLUG=1 /etc/init.d/net.$device-name stop"; -#}; -#attach 0 { -# media-type "802.11"; -# action "env IN_HOTPLUG=1 /etc/init.d/net.$device-name start"; -#}; - -# Not sure how to handle this in Gentoo yet -# When a USB Bluetooth dongle appears activate it -#attach 100 { -# device-name "ubt[0-9]+"; -# action "/etc/rc.d/bluetooth start $device-name"; -#}; -#detach 100 { -# device-name "ubt[0-9]+"; -# action "/etc/rc.d/bluetooth stop $device-name"; -#}; - -# When a USB keyboard arrives, attach it as the console keyboard. -attach 100 { - device-name "ukbd0"; - action "kbdcontrol -k /dev/ukbd0 < /dev/console"; -}; -detach 100 { - device-name "ukbd0"; - action "kbdcontrol -k /dev/kbd0 < /dev/console"; -}; - -# The entry below starts and stops moused when a mouse is plugged in. -attach 100 { - device-name "psm[0-9]+"; - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name start"; -}; -detach 100 { - device-name "psm[0-9]+"; - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name stop"; -}; -attach 100 { - device-name "ums[0-9]+"; - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name start"; -}; -detach 100 { - device-name "ums[0-9]+"; - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name stop"; -}; - -# Notify all users before beginning emergency shutdown when we get -# a _CRT or _HOT thermal event and we're going to power down the system -# very soon. -notify 10 { - match "system" "ACPI"; - match "subsystem" "Thermal"; - match "notify" "0xcc"; - action "logger -p kern.emerg 'WARNING: system temperature too high, shutting down soon!'"; -}; - -/* EXAMPLES TO END OF FILE - - -# Examples of notify hooks. A notify is a generic way for a kernel -# subsystem to send event notification to userland. -# -# Here are some examples of ACPI notify handlers. ACPI subsystems that -# generate notifies include the AC adapter, power/sleep buttons, -# control method batteries, lid switch, and thermal zones. -# -# Information returned is not always the same as the ACPI notify -# events. See the ACPI specification for more information about -# notifies. Here is the information returned for each subsystem: -# -# ACAD: AC line state (0 is offline, 1 is online) -# Button: Button pressed (0 for power, 1 for sleep) -# CMBAT: ACPI battery events -# Lid: Lid state (0 is closed, 1 is open) -# Thermal: ACPI thermal zone events -# -# This example calls a script when the AC state changes, passing the -# notify value as the first argument. If the state is 0x00, it might -# call some sysctls to implement economy mode. If 0x01, it might set -# the mode to performance. -notify 10 { - match "system" "ACPI"; - match "subsystem" "ACAD"; - action "/etc/acpi_ac $notify"; -}; -*/ diff --git a/sys-freebsd/freebsd-sbin/files/devd.initd b/sys-freebsd/freebsd-sbin/files/devd.initd deleted file mode 100644 index 6171258..0000000 --- a/sys-freebsd/freebsd-sbin/files/devd.initd +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - after bootmisc hostname - before net -} - -start() { - # Services may depend on us, so mark us as inactive - mark_service_inactive "${SVCNAME}" - - # Create a queue so that if things went UP DOWN UP DOWN UP DOWN UP - # We just do an UP - # This is used by /etc/devd_queue - mkdir -p /var/run/devd - - ebegin "Starting the Device State Change Daemon" - sysctl hw.bus.devctl_disable=0 >/dev/null - start-stop-daemon --start --exec /sbin/devd \ - --pidfile /var/run/devd.pid - eend $? "Failed to start devd" \ - || return $? - - ebegin "Waiting for Device State Change Daemon to settle" - LC_ALL=C sleep "${DEVD_WAIT:-2}" - eend $? - - # Now flush the queue - einfo "Flushing Device State Change Daemon queue" - /etc/devd_queue flush - - mark_service_started "${SVCNAME}" - return 0 -} - -stop() { - ebegin "Stopping the Device State Change Daemon" - sysctl hw.bus.devctl_disable=1 >/dev/null - start-stop-daemon --stop --exec /sbin/devd \ - --pidfile /var/run/devd.pid - eend $? "Failed to stop devd" -} - -# vim: ts=4 : diff --git a/sys-freebsd/freebsd-sbin/files/devd_queue b/sys-freebsd/freebsd-sbin/files/devd_queue deleted file mode 100644 index d42cb83..0000000 --- a/sys-freebsd/freebsd-sbin/files/devd_queue +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -# Notify the rc system that we're in the background -export IN_BACKGROUND=true - -arg1="$1" -if [ -z "$arg1" ] ; then - echo "Command required" > /dev/stderr - exit 1 -fi -shift - -case "$arg1" in - add) - if [ -z "$1" ] ; then - echo "Command missing!" > /dev/stderr - exit 1 - fi - - # If we don't have a queue then just run - if [ ! -d /var/run/devd ] ; then - "$@" - exit $? - fi - - cmd="$1" - args="$*" - if [ "$cmd" = "env" ] ; then - shift - while echo "$1" | grep -q "="; do - shift - [ "$1" = "--" ] && shift && break - done - cmd="$1" - fi - echo "$args" > /var/run/devd/$(basename "$cmd") - ;; - flush) - while ! rmdir /var/run/devd 2>/dev/null ; do - for cmd in $(cd /var/run/devd; ls) ; do - args=$(cat /var/run/devd/$cmd) - rm -f /var/run/devd/$cmd - $args - done - done - ;; - *) - echo "Unknown command $arg1" - ;; -esac diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch deleted file mode 100644 index c0a2bf9..0000000 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c -index bdbf7e3..a4c67ec 100644 ---- a/sbin/savecore/savecore.c -+++ b/sbin/savecore/savecore.c -@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose; /* flags */ - static int nfound, nsaved, nerr; /* statistics */ - static int maxdumps; - --extern FILE *zopen(const char *, const char *); -+extern FILE *gzopen(const char *, const char *); - - static sig_atomic_t got_siginfo; - static void infohandler(int); -@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device) - if (compress) { - snprintf(corename, sizeof(corename), "%s.%d.gz", - istextdump ? "textdump.tar" : "vmcore", bounds); -- fp = zopen(corename, "w"); -+ fp = gzopen(corename, "w"); - } else { - snprintf(corename, sizeof(corename), "%s.%d", - istextdump ? "textdump.tar" : "vmcore", bounds); diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch deleted file mode 100644 index 7b9578c..0000000 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch +++ /dev/null @@ -1,17 +0,0 @@ -Solves the issue reported in Problem Report bin/102701. - -Can't delete an inet6 alias address from an interface. - -Index: fbsd-6.1/sbin/ifconfig/af_inet6.c -=================================================================== ---- fbsd-6.1.orig/sbin/ifconfig/af_inet6.c -+++ fbsd-6.1/sbin/ifconfig/af_inet6.c -@@ -515,7 +515,7 @@ static struct afswtch af_inet6 = { - .af_settunnel = in6_set_tunnel, - .af_difaddr = SIOCDIFADDR_IN6, - .af_aifaddr = SIOCAIFADDR_IN6, -- .af_ridreq = &in6_addreq, -+ .af_ridreq = &in6_ridreq, - .af_addreq = &in6_addreq, - }; - diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch deleted file mode 100644 index 81ad024..0000000 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur sbin.orig/ldconfig/elfhints.c sbin/ldconfig/elfhints.c ---- sbin.orig/ldconfig/elfhints.c 2001-05-03 00:56:18 +0100 -+++ sbin/ldconfig/elfhints.c 2007-08-06 10:16:24 +0100 -@@ -245,6 +245,9 @@ - else - add_dir(hintsfile, argv[i], 0); - } -+ /* Always add our system dirs */ -+ add_dir (hintsfile, "/lib", 1); -+ add_dir (hintsfile, "/usr/lib", 1); - write_elf_hints(hintsfile); - } - diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch deleted file mode 100644 index 22fb2ec..0000000 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c ---- sbin/savecore/savecore.c 2005-02-26 01:21:50 +0000 -+++ sbin-zlib/savecore/savecore.c 2005-05-06 12:00:06 +0000 -@@ -95,7 +95,7 @@ - static int checkfor, compress, clear, force, keep, verbose; /* flags */ - static int nfound, nsaved, nerr; /* statistics */ - --extern FILE *zopen(const char *, const char *); -+extern FILE *gzopen(const char *, const char *); - - static void - printheader(FILE *f, const struct kerneldumpheader *h, const char *device, -@@ -553,7 +553,7 @@ - if (compress) { - sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" : - "vmcore", bounds); -- fp = zopen(filename, "w"); -+ fp = gzopen(filename, "w"); - } else { - sprintf(filename, "%s.%d", istextdump ? "textdump.tar" : - "vmcore", bounds); diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch deleted file mode 100644 index bdda99b..0000000 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -uNr sbin/ifconfig.old/regdomain.c sbin/ifconfig/regdomain.c ---- sbin/ifconfig.old/regdomain.c 2010-12-21 17:09:25.000000000 +0000 -+++ sbin/ifconfig/regdomain.c 2011-07-10 15:56:27.000000000 +0000 -@@ -39,7 +39,7 @@ - #include <err.h> - #include <unistd.h> - --#include <bsdxml.h> -+#include <expat.h> - - #include "regdomain.h" - -Los ficheros binarios sbin/ifconfig.old/regdomain.o y sbin/ifconfig/regdomain.o son distintos diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch deleted file mode 100644 index c8cbebc..0000000 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur sbin.orig/ping/Makefile sbin.setXid/ping/Makefile ---- sbin.orig/ping/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin.setXid/ping/Makefile Thu Apr 7 20:42:02 2005 -@@ -18,4 +18,6 @@ - LDADD+= -lipsec - .endif - -+LDFLAGS+= -Wl,-z,now -+ - .include <bsd.prog.mk> -diff -ur sbin.orig/shutdown/Makefile sbin.setXid/shutdown/Makefile ---- sbin.orig/shutdown/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin.setXid/shutdown/Makefile Thu Apr 7 20:42:17 2005 -@@ -7,4 +7,6 @@ - BINGRP= operator - BINMODE=4550 - -+LDFLAGS+= -Wl,-z,now -+ - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-sbin/files/idmapd.initd b/sys-freebsd/freebsd-sbin/files/idmapd.initd deleted file mode 100644 index 60a0bb8..0000000 --- a/sys-freebsd/freebsd-sbin/files/idmapd.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need rpcbind -} - -start() { - ebegin "Starting NFS idmapd" - start-stop-daemon --start --quiet --exec \ - /sbin/idmapd -- $idmapdopts - eend $? "Error starting NFS idmapd" -} - -stop() { - ebegin "Stopping NFS idmapd" - start-stop-daemon --stop --quiet --exec /sbin/idmapd - eend $? "Error stopping NFS idmapd" -} diff --git a/sys-freebsd/freebsd-sbin/files/ipfw.confd b/sys-freebsd/freebsd-sbin/files/ipfw.confd deleted file mode 100644 index 687f92d..0000000 --- a/sys-freebsd/freebsd-sbin/files/ipfw.confd +++ /dev/null @@ -1,10 +0,0 @@ -# ipfw provides a stateful firewall. -# This means we allow everything out, and if we have a connection we allow it -# back in. This is very flexable and quite secure. - -# For ease of use, we allow auth and ssh ports through as well. -# To override the list of allowed ports -#PORTS_IN="auth ssh" - -# You may want to enable logging of denied connections -#LOG_DENY="yes" diff --git a/sys-freebsd/freebsd-sbin/files/ipfw.initd b/sys-freebsd/freebsd-sbin/files/ipfw.initd deleted file mode 100644 index 13cdaee..0000000 --- a/sys-freebsd/freebsd-sbin/files/ipfw.initd +++ /dev/null @@ -1,110 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# This is a nice client firewall script which should suit most desktop users. -# We allow auth and ssh in by default. - -PORTS_IN=${PORTS_IN-auth ssh} - -opts="panic showstatus" - -depend() { - before net - provide firewall -} - -ipfw() { - /sbin/ipfw -f -q "$@" -} - -init() { - # Load the kernel module - if ! sysctl net.inet.ip.fw.enable=1 >/dev/null 2>/dev/null ; then - if ! kldload ipfw ; then - eend 1 "Unable to load firewall module" - return 1 - fi - fi - - ipfw flush - - ipfw add allow all from any to any via lo0 - ipfw add allow all from any to 127.0.0.0/8 - ipfw add deny ip from 127.0.0.0/8 to any - - ipfw add allow ipv6-icmp from :: to ff02::/16 - ipfw add allow ipv6-icmp from fe80::/10 to fe80::/10 - ipfw add allow ipv6-icmp from fe80::/10 to ff02::/16 -} - -start() { - local x= log= - ebegin "Starting firewall rules" - if ! init ; then - eend 1 "Failed to flush firewall ruleset" - return 1 - fi - - [ "${LOG_DENY}" = "yes" ] && log="log" - - # Use a statefull firewall - ipfw add check-state - - # Open our configured ports - if [ -n "${PORTS_IN}" ] ; then - local pin= - for x in ${PORTS_IN} ; do - pin="${pin}${pin:+,}${x}" - done - ipfw add allow tcp from any to me ${pin} established keep-state - ipfw add allow tcp from any to me6 ${pin} established keep-state - ipfw add allow tcp from any to me ${pin} setup keep-state - ipfw add allow tcp from any to me6 ${pin} setup keep-state - ipfw add allow udp from any to me ${pin} established - ipfw add allow udp from any to me ${pin} keep-state - ipfw add allow udp from any to me6 ${pin} established - ipfw add allow udp from any to me6 ${pin} keep-state - fi - - # Nice flexable rules that disallow incoming except for stuff we - # have asked for, and allow all outgoing. - ipfw add allow tcp from me to any established keep-state - ipfw add allow tcp from me to any setup keep-state - ipfw add allow tcp from me6 to any established keep-state - ipfw add allow tcp from me6 to any setup keep-state - ipfw add deny ${log} tcp from any to any - ipfw add allow udp from me to any established - ipfw add allow udp from me to any keep-state - ipfw add allow udp from me6 to any established - ipfw add allow udp from me6 to any keep-state - ipfw add deny ${log} udp from any to any - - # Be a good firewall and allow some ICMP traffic. - # Remove 8 if you really want to disallow ping. - ipfw add allow icmp from any to any icmptypes 0,3,8,11,12 - ipfw add allow ip6 from any to any proto ipv6-icmp - - eend 0 -} - -stop() { - ebegin "Stopping firewall rules" - # We don't unload the kernel module as that action - # can cause memory leaks as of FreeBSD 6.x - sysctl net.inet.ip.fw.enable=0 >/dev/null - eend $? -} - -panic() { - ebegin "Stopping firewall rules - hard" - if ! init ; then - eend 1 "Failed to flush firewall ruleset" - return 1 - fi - eend 0 -} - -showstatus() { - ipfw show -} diff --git a/sys-freebsd/freebsd-sbin/files/sysctl.initd b/sys-freebsd/freebsd-sbin/files/sysctl.initd deleted file mode 100644 index 9b8aaf8..0000000 --- a/sys-freebsd/freebsd-sbin/files/sysctl.initd +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - after checkroot root -} - -start() { - ebegin "Configuring kernel parameters" - - if [ ! -f /etc/sysctl.conf ]; then - eend 1 "/etc/sysctl.conf" "not found" - return 1 - fi - - local retval=0 var= comments= - while read var comments ; do - case "${var}" in - ""|"#"*) continue;; - esac - sysctl "${var}" >/dev/null || retval=1 - done < /etc/sysctl.conf - eend ${retval} "Some errors were encountered" -} - -# vim: set ts=4 : diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild deleted file mode 100644 index b9ccdc5..0000000 --- a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd multilib - -DESCRIPTION="FreeBSD sbin utils" -SLOT="0" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - sbin/ - contrib/ - lib/ - libexec/ - usr.sbin/ - etc/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?] - =sys-freebsd/freebsd-libexec-${RV}* - >=dev-libs/expat-2.0.1 - ssl? ( dev-libs/openssl:0= ) - >=dev-libs/libedit-20120311.3.0-r1 - sys-libs/readline:0= - || ( - sys-process/cronie - sys-process/vixie-cron - ) - atm? ( net-analyzer/bsnmp )" -DEPEND="${RDEPEND} - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -S="${WORKDIR}/sbin" - -IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware" - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="sys/ " - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX=" - use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT=" - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use pf || mymakeopts="${mymakeopts} WITHOUT_PF= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL=" -} - -REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf" - -PATCHES=( "${FILESDIR}/${PN}-setXid.patch" - "${FILESDIR}/${PN}-10.0-zlib.patch" - "${FILESDIR}/${PN}-6.2-ldconfig.patch" - "${FILESDIR}/${PN}-6.1-pr102701.patch" ) - -src_prepare() { - if [[ ! -e "${WORKDIR}/sys" ]]; then - use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" - fi -} - -src_install() { - mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom " - freebsd_src_install - keepdir /var/log - # Needed by ldconfig: - keepdir /var/run - - # Maybe ship our own sysctl.conf so things like radvd work out of the box. - # New wireless config method requires regdomain.xml in /etc - cd "${WORKDIR}/etc/" || die - insinto /etc - doins minfree sysctl.conf regdomain.xml || die - - # Install a crontab for adjkerntz - insinto /etc/cron.d - newins "${FILESDIR}/adjkerntz-crontab" adjkerntz - - # Install the periodic stuff (needs probably to be ported in a more - # gentooish way) - cd "${WORKDIR}/etc/periodic" || die - - doperiodic security \ - security/*.ipfwlimit \ - security/*.ipfwdenied || die - - use ipfilter && { doperiodic security \ - security/*.ipfdenied || die ; } - - use pf && { doperiodic security \ - security/*.pfdenied || die ; } -} diff --git a/sys-freebsd/freebsd-sbin/metadata.xml b/sys-freebsd/freebsd-sbin/metadata.xml deleted file mode 100644 index dccfe68..0000000 --- a/sys-freebsd/freebsd-sbin/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> - </maintainer> - <use> - <flag name="ipfilter"> - Build tools to administer the ipfilter firewall. - </flag> - <flag name="pf"> - Build tools to administer the PF firewall. - </flag> - <flag name="netware"> - Build libraries and tools to work with NetWare protocols (IPX - and NCP). - </flag> - </use> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest deleted file mode 100644 index d65d9d8..0000000 --- a/sys-freebsd/freebsd-share/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX freebsd-share-10.0-gentoo-eapi3.patch 475 SHA256 504841c762c1fa82ac14c22e16b84543e88927608f3fb972d995caa89449e487 SHA512 b7fe870aafe1cf9029c1d1d9de16413b5be8354b1c2ba0d0eab6f0fe3076ab03da08ff764c923c087e246b90355a48d55acef9b9b5a29238ddf8c92bdb3ca0f8 WHIRLPOOL 58dd84d64cea1c149b0126d7e9567caf7dbe6f238b1434eb4ffde08496e45e268691ba8604ea80da863d06d3f6ac6aeff4e9f7a01d558a28a31f347ed6c0c4c9 -AUX freebsd-share-10.2-gnu-miscfiles.patch 913 SHA256 e2a7e8221753dabf78380b9820991ee067670b9593e3dc9d8ecc8bf487b1ebc8 SHA512 fa792f15e325117e4448b344ab3dbf64d3880719698d88d8dda60c8cc4afea8c11cb845f44fa3b78ddc98fc6b021ef9edac639f649e8d166d79bf2c0e4f654f5 WHIRLPOOL 3c9e15340a71a85f44df3cbc41a6bc46eba7f790410d1aa70266a342038c39dff2b3ec887c210afdde559fecc7c51fb5c0e1484db86d3fff1d5851c21d3f6f8d -AUX freebsd-share-10.3-gentoo-skel.patch 600 SHA256 6860f0376babafbc0367bfde0d348fac1e4f95f42cdfd2931c3d7a027cd62536 SHA512 338eb369c50b11835f00474be5363bf6af43d8391a28a6e78e1517afc686b168fd0bfc32d45a78e79515c3d89a35b097548117cb2838b751d3d41330939c7dc2 WHIRLPOOL 1a833bc8e2376b25275d5be27dcc403cb8f7b498be08ab1532da1b27e77af32779a38b9a8d54b03d80f36b0ec398425269b58a04d9eea74fd2af5d91fec4d8b9 -AUX freebsd-share-5.3-doc-locations.patch 608 SHA256 d949e9081a181ab9443a18e56949905a77eff2cbd16d09d37b8abb5771cee3b6 SHA512 2156f679683b8a02fd01fa71268f13f342d282b1885095e48611d9a94bdf99f03bad71f5c22253425c09ad5ae1ea544d1db3d0d40361f3b814f7e10f0061f2a6 WHIRLPOOL bac15f5c439ffa81b83dfac5dce981e346e2815b6a035e9b9791db16df77d7f2e9fb6706f7b5315c65d18f209176866b23a34b311c56847f543f1257fa5e9634 -AUX freebsd-share-5.4-gentoo-skel.patch 621 SHA256 5480127971c2a5df5faf44355d5ed6a8586923577d37e6cff10805626726c767 SHA512 608e108bcfdc1eaa1f45f4115f460e26fa89211aaefea9602d1943dfa51e34f721526ef5e71d7e44f019d31b43efbd8f9f937e71d71074b0c3b48a33329281af WHIRLPOOL 8fabb340e4fcb1a174e3870a2ebe737f89b892586fed61a239e96bb34fb508daaef1e8e80811634e2075dbf6a161a236bca10a589340fbc609382f685b0697a9 -AUX freebsd-share-8.0-gnu-miscfiles.patch 858 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853 WHIRLPOOL f8d6675121ac43d2672f77d7ea4215073ff213c311fc1c09fe367f2d86f7dc1791a95f31b6def6f5bb757a5cd682de4c373c91465aa05acd38acfb537e781a6a -AUX freebsd-share-9.2-gnu-miscfiles.patch 1022 SHA256 0484a9ea6d05eb8d26c33efac61928c399230d8bf71a374fa2ae5c22a1acf3d2 SHA512 b220c884a6e3bb9037a1817b3bb1bcf181b1493836dafbef98bf0973e9781d2e2e982d9e17eef78b24056038e985969ed08c471c9ba374557097086bfcff8f3e WHIRLPOOL ffa0400172e0834f31897738d426dd53df40e67612e51045cd899cd84cef018db6a14c8600233fe2e23699a708e73f1b6df7654089356bdaa62274f5fc11931b -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-share-11.0.ebuild 3146 SHA256 61d6c3e684e66f49fccfffb08da9b056d70d2ffab8340396bc12bf6ebf436502 SHA512 7e5fed82754beff86f5fe2062fc60b0450d516efa31a6c847b53f5c296a1c8f0d89476fe207f119703233173a23c6f712fb59678a1d08eac7ba368413ce3f5f5 WHIRLPOOL 69961e114980eeda1111f30139c631fb552297f4f414447d30d7a5005035789e59c6c2efea281f488be6754095191e74a6d5197a466c76fa1aad6b1de37410a2 -MISC metadata.xml 359 SHA256 e204eb4e849ada468d2815276528d5bd274b727484eb9edf73f601e7b3b9d302 SHA512 998035745a4f78369a7c88d69e52a5377f09e7804ee93f37758fb26a97731b1dbde42d69cae4656b47e57c5dd6c0f2fa1c1ede360aaee38e3170acb7f73643ac WHIRLPOOL 429a60edcf9afc20c72f296f08e72f36d9e1c86bb7054a32983ca21f057c8720b457352daf15afab2c2e92b2835629ccf3b47b67d8b0833805821924eedd167f diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch deleted file mode 100644 index 1d0a53e..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/share/i18n/esdb/Makefile.part b/share/i18n/esdb/Makefile.part -index 9ca8577..329e9fb 100644 ---- a/share/i18n/esdb/Makefile.part -+++ b/share/i18n/esdb/Makefile.part -@@ -13,10 +13,10 @@ PART!= sed '/^\#/d;/^ *$$/d' ${PARTFILE} - .endif - .if !defined(NO_EPREFIX) - CODESETS?= ${PART:C/^/${CODE}${SEP}/} --EPREFIX?= ${CODE}${SEP} -+EPREFIX= ${CODE}${SEP} - .else - CODESETS?= ${PART} --EPREFIX?= -+EPREFIX= - .endif - ESUBDIR?= ${CODE} - ESDB?= ${CODESETS:C/$/.esdb/:S/:/@/} diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch deleted file mode 100644 index 1dc8488..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/share/dict/Makefile b/share/dict/Makefile -index 3e2a0df..5395077 100644 ---- a/share/dict/Makefile -+++ b/share/dict/Makefile -@@ -4,8 +4,7 @@ - NO_OBJ= - - # XXX MISSING: connectives words --FILES= README propernames web2 web2a freebsd -+FILES= README freebsd - FILESDIR= ${BINDIR}/dict --SYMLINKS= web2 ${FILESDIR}/words - - .include <bsd.prog.mk> -diff --git a/share/misc/Makefile b/share/misc/Makefile -index ffd42d8..7eb90bb 100644 ---- a/share/misc/Makefile -+++ b/share/misc/Makefile -@@ -5,9 +5,9 @@ - - .PATH: ${.CURDIR}/../../sys/dev/usb - --FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ -+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \ - committers-src.dot eqnchar flowers init.ee \ -- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ -+ iso3166 iso639 man.template mdoc.template pci_vendors \ - scsi_modes \ - organization.dot - diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch deleted file mode 100644 index 79e29e9..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/share/skel/Makefile b/share/skel/Makefile -index 024985c..6f6e563 100644 ---- a/share/skel/Makefile -+++ b/share/skel/Makefile -@@ -2,11 +2,11 @@ - # $FreeBSD: stable/10/share/skel/Makefile 291794 2015-12-04 18:21:05Z bdrewery $ - - FILESGROUPS= FILES1 FILES2 --FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ -+FILES1= dot.login_conf dot.mailrc \ - dot.shrc --FILES2= dot.mail_aliases dot.rhosts --FILES1DIR= ${SHAREDIR}/skel --FILES2DIR= ${SHAREDIR}/skel -+FILES2= dot.mail_aliases -+FILES1DIR= /etc/skel -+FILES2DIR= /etc/skel - FILES1MODE= 0644 - FILES2MODE= 0600 - NO_OBJ= diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch deleted file mode 100644 index c0798d3..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- examples/smbfs/Makefile.orig Tue Mar 22 15:20:20 2005 -+++ examples/smbfs/Makefile Tue Mar 22 15:20:46 2005 -@@ -2,6 +2,7 @@ - - NOOBJ= - BINDIR= /usr/share/examples/smbfs -+FILESDIR= ${DOCDIR}/smbfs - FILES= dot.nsmbrc - - .PATH: ${.CURDIR}/../../../contrib/smbfs/examples ---- examples/smbfs/print/Makefile.orig Tue Mar 22 15:22:17 2005 -+++ examples/smbfs/print/Makefile Tue Mar 22 15:22:35 2005 -@@ -2,6 +2,7 @@ - - NOOBJ= - BINDIR= /usr/share/examples/smbfs/print -+FILESDIR= ${DOCDIR}/smbfs/print - FILES= lj6l ljspool printcap.sample tolj - - .PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch deleted file mode 100644 index f668d04..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: fbsd/share/skel/Makefile -=================================================================== ---- fbsd.orig/share/skel/Makefile -+++ fbsd/share/skel/Makefile -@@ -2,11 +2,11 @@ - # $FreeBSD: src/share/skel/Makefile,v 1.9.2.1 2005/02/13 07:23:30 obrien Exp $ - - FILESGROUPS= FILES1 FILES2 --FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ -+FILES1= dot.login_conf dot.mailrc \ - dot.shrc --FILES2= dot.mail_aliases dot.rhosts --FILES1DIR= /usr/share/skel --FILES2DIR= /usr/share/skel -+FILES2= dot.mail_aliases -+FILES1DIR= /etc/skel -+FILES2DIR= /etc/skel - FILES1MODE= 0644 - FILES2MODE= 0600 - NOOBJ= diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch deleted file mode 100644 index 19167a6..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- share/misc/Makefile.old 2010-03-12 01:32:39 +0100 -+++ share/misc/Makefile 2010-03-12 01:33:25 +0100 -@@ -3,9 +3,9 @@ - - .PATH: ${.CURDIR}/../../sys/dev/usb - --FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ -+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \ - committers-src.dot eqnchar flowers init.ee \ -- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ -+ iso3166 iso639 man.template mdoc.template pci_vendors \ - scsi_modes usb_hid_usages usbdevs - - NO_OBJ= ---- share/dict/Makefile.old 2010-03-12 01:33:53 +0100 -+++ share/dict/Makefile 2010-03-12 01:34:18 +0100 -@@ -4,8 +4,7 @@ - NO_OBJ= - - # XXX MISSING: connectives words --FILES= README propernames web2 web2a freebsd -+FILES= README freebsd - FILESDIR= ${BINDIR}/dict --SYMLINKS= web2 ${FILESDIR}/words - - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch deleted file mode 100644 index af84dc3..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur share.orig/dict/Makefile share/dict/Makefile ---- share.orig/dict/Makefile 2012-12-31 18:00:00.000000000 +0900 -+++ share/dict/Makefile 2012-12-31 18:03:15.000000000 +0900 -@@ -4,8 +4,7 @@ - NO_OBJ= - - # XXX MISSING: connectives words --FILES= README propernames web2 web2a freebsd -+FILES= README freebsd - FILESDIR= ${BINDIR}/dict --SYMLINKS= web2 ${FILESDIR}/words - - .include <bsd.prog.mk> -diff -Nur share.orig/misc/Makefile share/misc/Makefile ---- share.orig/misc/Makefile 2012-12-31 18:00:00.000000000 +0900 -+++ share/misc/Makefile 2012-12-31 18:04:22.000000000 +0900 -@@ -3,9 +3,9 @@ - - .PATH: ${.CURDIR}/../../sys/dev/usb - --FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ -+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \ - committers-src.dot eqnchar flowers init.ee \ -- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ -+ iso3166 iso639 man.template mdoc.template pci_vendors \ - scsi_modes usb_hid_usages usbdevs \ - organization.dot - diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild deleted file mode 100644 index 75cbfc0..0000000 --- a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD shared tools/files" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -IUSE="doc usb zfs" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - share/ - contrib/ - gnu/ - usr.bin/ - usr.sbin/ - sbin/ - bin/ - lib/ - etc/ - tools/tools/locale/ -" - -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" -RDEPEND="sys-apps/miscfiles" - -RESTRICT="strip" - -S="${WORKDIR}/share" - -pkg_setup() { - # Add the required source files. - use zfs && EXTRACTONLY+="cddl/ " - - use doc || mymakeopts="${mymakeopts} WITHOUT_SHAREDOCS= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - [[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= " - [[ ! -e /usr/bin/localedef ]] && mymakeopts="${mymakeopts} WITHOUT_LOCALES= " - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= " -} - -REMOVE_SUBDIRS="mk termcap zoneinfo tabset" - -PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch" - "${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch" - "${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" ) - -src_prepare() { - # Remove make.conf manpage as it describes bsdmk's make.conf. - sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" - # Remove rc.conf manpage as it describes bsd's rc.conf. - sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile" - sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile" - # Remove mailer.conf manpage - sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" - # Remove pbm and moduli(ssh) manpages - sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile" - # Remove builtins manpage - sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile" - # Remove rc manpages - sed -i -e '/rc.8/d' "${S}/man/man8/Makefile" - # Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin. - sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile" - - # Don't install the arch-specific directories in subdirectories - sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile - - # Remove them so that they can't be included by error - rm -rf "${S}"/mk/*.mk - - # Make proper symlinks by defining the full target. - local sdir - for sdir in colldef monetdef msgdef numericdef timedef - do - sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \ - "${S}/${sdir}/Makefile" || \ - die "Error fixing ${sdir}/Makefile" - done - if [[ ! -e "${WORKDIR}/sys" ]]; then - ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink" - fi -} - -src_compile() { - export ESED="/usr/bin/sed" - - # libiconv support. - # i18n/csmapper/APPLE requires mkcsmapper_static - # i18n/esdb/APPLE requires mkesdb_static - for pkg in mkcsmapper_static mkesdb_static - do - cd "${WORKDIR}"/usr.bin/${pkg} || die - freebsd_src_compile - done - - # This is a groff problem and not a -shared problem. - cd "${S}" || die - export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/" - freebsd_src_compile -j1 || die "emake failed" -} - -src_install() { - freebsd_src_install -j1 DOCDIR=/usr/share/doc/${PF} -} diff --git a/sys-freebsd/freebsd-share/metadata.xml b/sys-freebsd/freebsd-share/metadata.xml deleted file mode 100644 index 9a9053f..0000000 --- a/sys-freebsd/freebsd-share/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> - </maintainer> - <use> - <flag name="isdn">Enable ISDN support</flag> - <flag name="zfs">Enable ZFS support.</flag> - </use> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest deleted file mode 100644 index e43f572..0000000 --- a/sys-freebsd/freebsd-sources/Manifest +++ /dev/null @@ -1,39 +0,0 @@ -AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9 -AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf -AUX freebsd-sources-10.1-gcc48.patch 452 SHA256 26ad0753e59bd7e45f957cc98c8a11c8c1bcaf89ed55898b4efc6d95e3943671 SHA512 55e5249ec8337d880d96fd9429a0ffe5663c6182996b6b2ab8d19fe9d5168a0042b81222b2bb89de6d90f98d042b593fb40a7f4178ac739f681f84c2d62b5c96 WHIRLPOOL b6ed5ad4d7e444c79afcc0a14ce9fc85fddd5d1ae6b1d7dc8aa3e4949bb598e0da7a0d95025ba7e3981fc0af741c52e3c84fc81cba00bc79f59ab510afa85441 -AUX freebsd-sources-11.0-gentoo-gcc.patch 430 SHA256 e8f031a81dc611c7368bbb4330f2e162a50b72af9b3cdce012c93d0130668b8f SHA512 9869ba13091cc0975a7fe1a1b18a279835d19f1f57204dd3463798d3695a250ba6c96f2c1f6a2352dfce0022d7365257b0f938032b55e7090f68e58c4455bffe WHIRLPOOL 01b61475aabca1647092a8d77c426ffd609ce66a508672eb85b87f2b25db37dbc6191a3f9bfaa24f5fe03a233c122a4f2b971c3a4f4fd9022acaad55c8ad3427 -AUX freebsd-sources-11.0-gentoo.patch 852 SHA256 ea3a49d8d4da8bb67ae715b0551415ae144457386c1c63a11090cc80d223e70b SHA512 11f65627bb5436052b227d884c384e888bb8f44696c36b80a8715c912e41c953b57c1420b37030155c2751c72289470c4f681d14ed149e4f6aa82d8b63766ade WHIRLPOOL 418d1adc24fe6770beb7273724f510a3f89321e1f3cca1ee0242a2c6ce3e3533655339c10da67f92118b82fabf87f680487ef2d8e1781bf965e889e19adbd4b7 -AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc -AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14 -AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512 -AUX freebsd-sources-7.1-binutils_link.patch 1297 SHA256 957c03640f3aac6141efa3e775f33fcadd501f920612055d0e00b3f80fcd8f17 SHA512 0e3aa342646d18429ed76e484d7e15d353d858f00bda906dae74b01b4e73f1b4ccfb6404590d79cb206da3a732528a4437813540a26292d697ccc3b964dabfb0 WHIRLPOOL 5108bd5a1bd49f94a7902b5b478528b29f1e15fe1e06f96a80de6fbf047eaf4f925f00fcd5f83085d44e86828dee50cc2efd150ece362bbd3ab24b292d9e7249 -AUX freebsd-sources-7.1-includes.patch 318 SHA256 70c73d0939325185430a3a133380f0bc10674cb8fbe5c7ebfe3b07630d023369 SHA512 f73db3fd72bdd2972ae25c3f661e7677bd5877aa623981303a4b0c5e9522fd458e294799a0ebad17ac3c639d588394b10ad5fcab4d88743a6dfcc8a8d60eecd7 WHIRLPOOL 5dca685df773113dff0c8aac16f244882728ad586b62b7c20df948240b097e89d1bb62f16ed181f2535e13835471754d8fdd0f4ef02b73ce5077b9169c958557 -AUX freebsd-sources-7.1-types.h-fix.patch 371 SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f WHIRLPOOL d284dd82244a108e4677be143cfc302c18f18e5b39c39fcaa8915c61053d94bf7171e48028f40d25f8058f8ec910c3e55a3753ccecb46bbabbb0e5ba86e808e3 -AUX freebsd-sources-7.2-debug-O2.patch 771 SHA256 ad1fdd8a6dd53186793d70b65e1b37e3d3e7a4e50c32069aa535ae9f8e9aded8 SHA512 a74dacbd24c6130ec4c762a9c2df58a37d5fee2ee6fa4a970245b53837afa5ee3f72318b6e723e0591ddce00a5aa0fd66746a06783174d4edb9814e3a3724201 WHIRLPOOL 598f1e3282f5b8ebacd43835e148e5249737d8d7b240eaa459e5374444e0aeb39a692b01d3da5a8bec6aa44b8fe97879ce3bea739796688d8d6b365baac438b6 -AUX freebsd-sources-8.0-gentoo.patch 1138 SHA256 0bb6e4cb59bb6f5fd86c88bfd36ce8c9d148d96e8722f1d6a485f98ba892650c SHA512 677adbbbba367bda65f01b604a0a6235ac12d7b307857fa35c7722eb05e0a74d3cd35c03a9dfa56023b7869a865959c9edcfa601d841add92ff21a941d395ddc WHIRLPOOL bcf25d6f650f6435e7fa7c6d5888a1dbded300f0e4c9f595abc1386663b65fd378805efe1b8355c91efc357e0684ce7722526f93beae55a1102e813aaecbd711 -AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 SHA256 091764c97f4148d2245c24dcfabebd53ef0b4f3175a140fd5b1132788e718ca1 SHA512 9ae65e2775302b664dd4e5f5cbc58fe1ca7db61b6182db10971660207c72ec74e542181f1c2aefcacd2fd4b54e10d371efc619c3c03a977c35d3cf67b99b7de5 WHIRLPOOL 01e27e011c94641498cf0c04a663e4f8f4844a57bd462aa38a1c23a8b3244e5eec226fb11b5e8e598de7227ac2d3dd33aaa98d16f6e7628329ac59e1e7ce62ae -AUX freebsd-sources-8.2-unix2.patch 1642 SHA256 6dd35d13a13f5e9333557a84b56c89fc4988d55bc3267cca72e8ca8ca169ce61 SHA512 a7f8166abc9883cab92a4b1ce038cefc3c00a6567fd79ebab96ccebbed7e230459dd8efc0b96ba2029a89b4b5d41305be87d0c40ad85fcfe4c819a4604b4490b WHIRLPOOL 5152dca64e3799cc9b6ffd97019c542f93082631489b9c0e03128a09a3d0c667da4220cfc67039c24d13a2cb527dd325db501029478d528c688c0c35cf2373c7 -AUX freebsd-sources-9.0-disable-optimization.patch 927 SHA256 e8ad8d8ed1f729b7b22839a7af93b3dd667f257b05db95f408c48b270003a486 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b WHIRLPOOL 86f9586a3f07118f95e5fbce1a65fdd3be8dd701ed1bee1379ed2133cef3d9473b437826a13ec2a53c73f7b3e1003256d912a45eb80c86195749a8cd08f9813c -AUX freebsd-sources-9.0-ipv6refcount.patch 3259 SHA256 18186ef2f9fc020c0da053953b9e8c8629c2302082e0ee172dd7e84a7104bdd5 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658 WHIRLPOOL c0511b2fec1f2ecc8a6e3aba23808a4c60a4c94f45693b6f21a30cb01386e24969fcc9b655584c78a501524579f7e266993fdd6d565525740f4f8e04f47b55a9 -AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8 -AUX freebsd-sources-9.1-ciss.patch 2067 SHA256 a450312394a9ed449144c1b320ec323f8fcd6cb744ad6c6862046b0fd5086e4e SHA512 5b8088644813d465443754f248e0068da1c53b4f947b7c1e584ae9dcd9b7b135a53edd70efc463b500aef74c4f8193e2d1d349b39ce183ed1f18284a2c2d7989 WHIRLPOOL 59f1324eaa98e11a094e4fe48e8ad8f468bc373691de101c5082630d1a69d10a3e6d904f3b6138a2107b0f35f37c16f07da575c1efb4bbfa22869a7cf328e5e2 -AUX freebsd-sources-9.1-cve-2013-3077.patch 1064 SHA256 2c0b8a4df43b3a2b15bbb33000f4c0e0e132901dfe5d5531a694a17b9e1fd7b8 SHA512 12244d1335ab626e4a391cdd1d435f9f002ec4142fa2a2a93832b554f03fff69de09e950c4e80c797fd0b568504a69e18341fd35bd952a56e01a05024de8206f WHIRLPOOL 01c9e9270eea92448de3754ab0d6dc2efdec4b8e06a00b0d86c550e318c07c8e4a5b2b32e645008713e399c20b96d5e91e740e5120f889050ab91416763be3fa -AUX freebsd-sources-9.1-cve-2013-3266.patch 535 SHA256 3ddd63716570d7a08956228d3f2b165e80380d3062cecfa9ed781696542cf7e2 SHA512 04f421724d79a2e8c5a23120a44601bd611b938e4452d064034b7cf91ab36e2b019e3a12af62d5bd180a5da30ca59886f90aeb6f1255dcd2124285aec6b65fa7 WHIRLPOOL e12449b21f4a3200da65d815bdc33972e9aa7b2941560fba13a634be9baad4246b635ee87510a09dee123b65ea614ed57f17e482ba41a0ea2c986e579d75f3a9 -AUX freebsd-sources-9.1-cve-2013-5209.patch 645 SHA256 1b334cae7f7ac266785449bc34a8b4b652b961b7b77acc3488e418f4359b6041 SHA512 1ed132883d22aaf48be98dd9adaa48cea0023f3c986cedb45f986676f1c4a40d3d5463006f516d78fe77a408e5f4821cb7b26d8fbff7091bc2aad9faac2e728a WHIRLPOOL 8ea85c387106009ed4c5ac4652520d349cf403d6568d81aedcc05f81ebdb5ac0c287a188071bb7651b4e847d95abf9874bfc8710a025c9ea1c986993b6d4a0a9 -AUX freebsd-sources-9.1-cve-2013-5691.patch 2854 SHA256 418cb39d555c036013cd87a2205d2b1b9e4c729f409b3bd4c509648282a0a993 SHA512 6c3342e79fe3de90d37d82415b186f5012597dfbc5f522f9aadfa5420d601e4e6042b899ed348b581537491d4c49d6b4959ca3b438f9bda454b8d9b494120534 WHIRLPOOL 7436a1c9402c2de662b98e3615d1a62f290a8638c597d671474dab005a60a5c5b162ea31603902568c9443ebd39a2631297b6e19bd26f343c808e086b78da263 -AUX freebsd-sources-9.1-cve-2013-5710.patch 704 SHA256 c076858b5dd9ab31be241144bef4de2824fa27599f7f114bcab9a2934436a1dd SHA512 a87d571aa060f435e0ac53816307703e300e16365df13c88be0a982d5851d3c224e0cc23b32ef61445413abda86762e0e43b964d475f1d816ca83d2c6b3f7d58 WHIRLPOOL 71bceec1fad2cde48cd32475805f96a33d9fef85ac8f3b69c601874514b6eef89479cf9b372bc8639d48a317dc5216bd7e2f2902570a148da865983845f5fbc6 -AUX freebsd-sources-9.1-cve-2014-1453.patch 2239 SHA256 2605926b9a36cf2eecf65fc3bcc92ed772922562fdfebfd39c99137526f2a440 SHA512 27b48c96447cb961d2de3ad7f67a739ff78ee3904da508b2e6c1948d299090cb169bd3f289b0448e7d242c1c0d39fd5e5fc29700d92ba4877c3e6d013a6cd6a1 WHIRLPOOL 206c18f70756f77050c681ee4b14f7e0d0e38cac42d146ae0ccd9bd79a3977c4db57d1456c3bfe0294dad313eead5dfb748446e0fa401c98105ea53097505e45 -AUX freebsd-sources-9.1-exec.patch 2032 SHA256 8e75954777f69e87b9401f3ed79d65fd6e498bd82bdad4378a076fa088480e8f SHA512 db2ac3a96b9c2bfc3e785a6ea8060e7cf516e6cb25629749a7cae4ca8171b0f3b8f1128c5b646f8dfcd78c21fb3859b548907ba1781a698235dd5cf6a90f824b WHIRLPOOL f0a29fea6f7cd5096deb29a53830c7c7e51b9c5c2eb2b28b2baca42fa0003f54181245cd8c9dc63beafea1d8000f05ac615705cfb573af33d03d6d89ee2712e6 -AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e -AUX freebsd-sources-9.1-ktrace.patch 463 SHA256 328d14c5fd775b1a99f065911ab8c95065823dbd488bc0b1b3bc8bf46fcb8515 SHA512 b0cf73180320e0d1295fcde2c19a281575150f28d71fecd31c5793b6f0e9784005745fbc56b8578d40615e9276cfadf25d6fd3ea5e21f315e3c6beedc0476ffa WHIRLPOOL 03e3e9a090bd14c9f8be2fbf62a0c305da6e6e20ca1f5e30dd66c22b3f031132046ebd959c6f66a9b3227756c339cc3f87f339829592625dace8116f3ed67814 -AUX freebsd-sources-9.1-mmap-2014.patch 758 SHA256 cfc0663e536972ced5a45b5ff491b8590e95739ea6cd34687b9ca56e5d7e63b8 SHA512 fb1f28268355ad0a25705fecb7555222b53b04fd92b1b80af2db4b6f2ac02bf5a948ba0521d1674e31da57a1baf037fe0fe581c03a437d86325e185a8050aaa3 WHIRLPOOL 8995fb9d0751aa3c12bab79206f22c924ffe583060895c2cfc62e53ce89ce1cdde0f511e12e017209221075aa536e839ab68c241b8feffc26910c613aa8753ed -AUX freebsd-sources-9.1-mmap.patch 676 SHA256 4adee0a45d519d93d4bd3554c6b685becbaac2bc5e89511f61260e85a914235e SHA512 0daff1ef440be8e4f841eeff8917a36591bd3f4c31d79feb4666f9c3d65d49ee180397b81b07753c8892efd76436bf19d2218979cef3847d3cd46bdfcf166d6b WHIRLPOOL a31b32fb6fe8d7ca4464abae9c444e62d6ff00b4d53beed7c81c89bf0e85e61cf1eed7e70c7861a3559432086a923926737c4f6a727d2e389745de045e6f30cb -AUX freebsd-sources-9.1-nfsserver.patch 650 SHA256 b288a29155fbce8ac58460a3f64ce77b644c32ee54814e35086700d2fae3610a SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe WHIRLPOOL b4469dfb52ca87e95539bd63dcc36ba34c9a29b812b887ad9656c2adea7acee5ae6a14850d2f4733aff7248fb9d6d6107ea38f06365efba18f8f025506675de9 -AUX freebsd-sources-9.1-random.patch 792 SHA256 46d4035d31e8a64531e1893c08b8235ee92af002848a781d9f1af1a886f17fdc SHA512 6e7137a5b68ec92a6eaa5d6bbc1609794f7a71210331959135663bf4021b6cffcbf87f23b5d757956a1ff6907929012490bd85ca0ec37efbdfc2b70de108bc99 WHIRLPOOL db318323bd0d757ab0a97ef5e552ee38b9fe5eaf12f87769912abf16dda40b11692ae3715cd5fc34aa11d5ae226366b8bb63feff3067c539b9fc23a9ad14c840 -AUX freebsd-sources-9.1-tcp.patch 1249 SHA256 a51412349a8724931cfc749150e3c07802126382a6ce5dbbc6617e4f81188e7a SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e WHIRLPOOL 6e81938c55e2a40f4d75a53f4bfeac1c4183feebf023bcc320c0179dbf802151cc5f04dde9302e233eff86c33fdca8a6e80dda70d47d0d762da61e22782b1b0d -AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218 -AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 -AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-sources-11.0.ebuild 4823 SHA256 968c5d17553771f653e861cdfa78c7567049d6999dd436cc3189ada0e13707fa SHA512 ddefd5c3dca7b54c59d72e1d0ca83431b84de92be2274afaef6e77a9648f7fff82bbc500c0d225475476ebdfae04026f5d29577d5f36eb2fc407a4e258c6d72a WHIRLPOOL 6d18a50d484072a24d53d70824be5679bf6292658df83fd53ed5f8c1fd645e90bfa6f46415b1ed85b22d1451cc4a470535fc2493689a37423b4fefcdd617da99 -MISC metadata.xml 444 SHA256 c4696a22f747056498f14d7fbac5d3b317ee5ed5d0762351003ae7873475ff39 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc WHIRLPOOL af64f83a4459752b8b8656412abaf5feaedbaa4b06dbbd0a71f31fc440eb945d39617a540e6b9969586b190c984452f1eaded80062481c6b2b0121482cfa61c2 diff --git a/sys-freebsd/freebsd-sources/files/config-GENTOO b/sys-freebsd/freebsd-sources/files/config-GENTOO deleted file mode 100644 index 7c7eb26..0000000 --- a/sys-freebsd/freebsd-sources/files/config-GENTOO +++ /dev/null @@ -1,4 +0,0 @@ -# Kernel configuration for Gentoo/FreeBSD. -include GENERIC -ident GENTOO - diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch deleted file mode 100644 index c7e12bd..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk -index 2939a59..124ef6f 100644 ---- a/sys/conf/kern.mk -+++ b/sys/conf/kern.mk -@@ -5,7 +5,7 @@ - # - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ -+ -Wundef -Wno-pointer-sign \ - -Wmissing-include-dirs -fdiagnostics-show-option \ - ${CWARNEXTRA} - # -@@ -61,7 +61,7 @@ FORMAT_EXTENSIONS= -fformat-extensions - # - .if ${MACHINE_CPUARCH} == "i386" - .if ${COMPILER_TYPE} != "clang" --CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -+CFLAGS+= -mpreferred-stack-boundary=2 - .else - CFLAGS+= -mno-aes -mno-avx - .endif diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch deleted file mode 100644 index 5cb4cf8..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://svnweb.freebsd.org/base?view=revision&revision=281606 - -diff --git a/sys/crypto/aesni/aesencdec.h b/sys/crypto/aesni/aesencdec.h -index d4ed8b3..79847ee 100644 ---- a/sys/crypto/aesni/aesencdec.h -+++ b/sys/crypto/aesni/aesencdec.h -@@ -27,6 +27,11 @@ - * - */ - -+#if defined(__GNUC__) && defined(_KERNEL) -+/* Suppress inclusion of gcc's mm_malloc.h header */ -+#define _MM_MALLOC_H_INCLUDED 1 -+#endif -+ - #include <wmmintrin.h> - - static inline void diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo-gcc.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo-gcc.patch deleted file mode 100644 index 1d3c8d6..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo-gcc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh -index e4b2ad4..411bedf 100644 ---- a/sys/conf/newvers.sh -+++ b/sys/conf/newvers.sh -@@ -110,7 +110,7 @@ else - t=`date` - fi - i=`${MAKE:-make} -V KERN_IDENT` --compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep -w 'version') -+compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version' | tail -n 1) - - for dir in /usr/bin /usr/local/bin; do - if [ ! -z "${svnversion}" ] ; then diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch deleted file mode 100644 index 6acd6aa..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk -index e27ea93..615dbac 100644 ---- a/sys/conf/kern.mk -+++ b/sys/conf/kern.mk -@@ -5,7 +5,7 @@ - # - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ -+ -Wundef -Wno-pointer-sign \ - -Wmissing-include-dirs -fdiagnostics-show-option \ - -Wno-unknown-pragmas \ - ${CWARNEXTRA} -@@ -86,7 +86,7 @@ FORMAT_EXTENSIONS= -fformat-extensions - # Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42 - # - .if ${MACHINE_CPUARCH} == "i386" --CFLAGS.gcc+= -mno-align-long-strings -mpreferred-stack-boundary=2 -+CFLAGS.gcc+= -mpreferred-stack-boundary=2 - CFLAGS.clang+= -mno-aes -mno-avx - CFLAGS+= -mno-mmx -mno-sse -msoft-float - INLINE_LIMIT?= 8000 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch deleted file mode 100644 index 88710cf..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l -=================================================================== ---- fbsd-6.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l -+++ fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l -@@ -528,7 +528,7 @@ expand_macro(struct symbol *macro_symbol - - /* Put back everything up until the replacement. */ - while (body_pos > next_match) -- unput(*--body_pos); -+ yyunput(*--body_pos, body_head); - - /* Perform the replacement. */ - if (match_marg != NULL) { -@@ -537,7 +537,7 @@ expand_macro(struct symbol *macro_symbol - next_match = match_marg->replacement_text; - strp = next_match + strlen(next_match); - while (strp > next_match) -- unput(*--strp); -+ yyunput(*--strp, next_match); - - /* Skip past the unexpanded macro arg. */ - body_pos -= match.rm_eo - match.rm_so; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch deleted file mode 100644 index e74fcd3..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- sys/fs/ntfs/ntfs_vnops.c.orig 2006-10-17 17:31:36 -0300 -+++ sys/fs/ntfs/ntfs_vnops.c 2006-10-17 17:30:24 -0300 -@@ -507,8 +507,12 @@ - - /* Simulate . in every dir except ROOT */ - if( ip->i_number != NTFS_ROOTINO ) { -- struct dirent dot = { NTFS_ROOTINO, -- sizeof(struct dirent), DT_DIR, 1, "." }; -+ struct dirent dot; -+ dot.d_fileno = NTFS_ROOTINO; -+ dot.d_reclen = sizeof(struct dirent); -+ dot.d_type = DT_DIR; -+ dot.d_namlen = 1; -+ bcopy(".", dot.d_name, 1); - - if( uio->uio_offset < sizeof(struct dirent) ) { - dot.d_fileno = ip->i_number; -@@ -522,8 +526,12 @@ - - /* Simulate .. in every dir including ROOT */ - if( uio->uio_offset < 2 * sizeof(struct dirent) ) { -- struct dirent dotdot = { NTFS_ROOTINO, -- sizeof(struct dirent), DT_DIR, 2, ".." }; -+ struct dirent dotdot; -+ dotdot.d_fileno = NTFS_ROOTINO; -+ dotdot.d_reclen = sizeof(struct dirent); -+ dotdot.d_type = DT_DIR; -+ dotdot.d_namlen = 2; -+ bcopy("..", dotdot.d_name, 2); - - error = uiomove((char *)&dotdot,sizeof(struct dirent),uio); - if(error) diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch deleted file mode 100644 index 13524ef..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur sys/fs/tmpfs.orig/tmpfs_vnops.c sys/fs/tmpfs/tmpfs_vnops.c ---- sys/fs/tmpfs.orig/tmpfs_vnops.c 2008-06-22 12:17:48 -0300 -+++ sys/fs/tmpfs/tmpfs_vnops.c 2008-06-28 12:05:10 -0300 -@@ -1459,6 +1459,30 @@ - return (0); - } - -+ -+/* --------------------------------------------------------------------- */ -+/* This does absolutely nothing */ -+#ifdef GENTOO_LIVECD -+static int -+tmpfs_whiteout(struct vop_whiteout_args *ap) -+{ -+ switch (ap->a_flags) { -+ case LOOKUP: -+ return (0); -+ break; -+ case CREATE: -+ return(EOPNOTSUPP); -+ break; -+ case DELETE: -+ return (0); -+ break; -+ default: -+ return(EOPNOTSUPP); -+ } -+ return(0); -+} -+#endif -+ - /* --------------------------------------------------------------------- */ - - /* -@@ -1484,6 +1508,9 @@ - .vop_mkdir = tmpfs_mkdir, - .vop_rmdir = tmpfs_rmdir, - .vop_symlink = tmpfs_symlink, -+#ifdef GENTOO_LIVECD -+ .vop_whiteout = tmpfs_whiteout, -+#endif - .vop_readdir = tmpfs_readdir, - .vop_readlink = tmpfs_readlink, - .vop_inactive = tmpfs_inactive, diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch deleted file mode 100644 index 43d01ba..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ruN sys.orig/conf/kern.post.mk sys/conf/kern.post.mk ---- sys.orig/conf/kern.post.mk 2007-03-23 18:55:59 -0300 -+++ sys/conf/kern.post.mk 2008-06-18 19:51:13 -0300 -@@ -85,7 +85,9 @@ - ${FULLKERNEL}: ${SYSTEM_DEP} vers.o - @rm -f ${.TARGET} - @echo linking ${.TARGET} -- ${SYSTEM_LD} -+ ${SYSTEM_LD} -o ${.TARGET}.tmp -+ @sh $S/tools/gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt -+ ${SYSTEM_LD} "@${.TARGET}.lopt" - .if defined(CTFMERGE) - ${SYSTEM_CTFMERGE} - .endif -diff -ruN sys.orig/conf/kmod.mk sys/conf/kmod.mk ---- sys.orig/conf/kmod.mk 2008-06-18 09:11:53 -0300 -+++ sys/conf/kmod.mk 2008-06-18 19:50:01 -0300 -@@ -176,7 +176,8 @@ - - .if ${MACHINE_ARCH} != amd64 - ${FULLPROG}: ${KMOD}.kld -- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld -+ sh ./@/tools/gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt -+ ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt" - .if !defined(DEBUG_FLAGS) - ${OBJCOPY} --strip-debug ${.TARGET} - .endif -diff -ruN sys.orig/tools/gen-ld-u-options sys/tools/gen-ld-u-options ---- sys.orig/tools/gen-ld-u-options 1969-12-31 21:00:00 -0300 -+++ sys/tools/gen-ld-u-options 2008-06-18 19:47:56 -0300 -@@ -0,0 +1,6 @@ -+#!/bin/sh -+ -+for i in `objdump -h -w $1 | grep set_ | cut -c5- | cut -f1 -d " "` -+do -+ echo -n " -u __start_$i -u __stop_$i " -+done diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch deleted file mode 100644 index 3db46fa..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -Make headers usable alone, include the headers they need. -There are probably much more missing. - ---- sys/net/if.h.old 2009-05-15 10:51:50 +0000 -+++ sys/net/if.h 2009-05-15 10:52:05 +0000 -@@ -34,6 +34,7 @@ - #define _NET_IF_H_ - - #include <sys/cdefs.h> -+#include <sys/socket.h> - - #ifdef _KERNEL - #include <sys/queue.h> diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch deleted file mode 100644 index 8de5df2..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fixes a compile error if XOPEN_SOURCE 600 is defined. - -See: http://www.mailinglistarchive.com/freebsd-current@freebsd.org/msg15011.html - ---- sys/sys/types.h.orig -+++ sys/sys/types.h -@@ -46,7 +46,7 @@ - - #include <sys/_pthreadtypes.h> - --#if __BSD_VISIBLE -+#ifndef _POSIX_SOURCE - typedef unsigned char u_char; - typedef unsigned short u_short; - typedef unsigned int u_int; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch deleted file mode 100644 index 4fa3565..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch +++ /dev/null @@ -1,27 +0,0 @@ -My UltraSPARC U5 panics on boot about a memory alignment error when compiled -with gcc4 and -O. Compiling with -O2 fixes this, and it should not adversly -affect debugging. - -NOTE: This does not fix the memory alignment panic when loading kernel modules. - -Roy Marples (uberlord@gentoo.org) - ---- sys/conf/kern.pre.mk.old 2009-05-22 10:09:46 +0000 -+++ sys/conf/kern.pre.mk 2009-05-22 10:10:27 +0000 -@@ -22,15 +22,13 @@ - COPTFLAGS?= -O - .else - . if defined(DEBUG) --_MINUS_O= -O - CTFFLAGS+= -g - . else --_MINUS_O= -O2 - . endif - . if ${MACHINE_ARCH} == "amd64" - COPTFLAGS?=-O2 -frename-registers -pipe - . else --COPTFLAGS?=${_MINUS_O} -pipe -+COPTFLAGS?=-O2 -pipe - . endif - . if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing) - COPTFLAGS+= -fno-strict-aliasing diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch deleted file mode 100644 index 0f8d070..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- sys/conf/kern.mk.old 2007-05-24 23:53:42.000000000 +0200 -+++ sys/conf/kern.mk 2008-03-14 14:37:47.216420518 +0100 -@@ -12,7 +12,7 @@ - .else - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions -+ ${_wundef} ${_Wno_pointer_sign} - .if !defined(WITH_GCC3) - _Wno_pointer_sign=-Wno-pointer-sign - .endif -@@ -36,7 +36,7 @@ - # reserved for user applications. - # - .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc" --CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 \ -+CFLAGS+= -mpreferred-stack-boundary=2 \ - -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 - INLINE_LIMIT?= 8000 - .endif -Only in ./sys/conf: kern.mk.rej -Only in ./sys/conf: kern.mk~ ---- sys/dev/aic7xxx/aicasm/Makefile.old 2010-03-10 14:01:50 +0100 -+++ sys/dev/aic7xxx/aicasm/Makefile 2010-03-10 14:01:56 +0100 -@@ -14,7 +14,7 @@ - SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS} - CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g} - DPADD= ${LIBL} --LDADD= -ll -+LDADD= -lfl - WARNS?= 6 - - # Correct path for kernel builds diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch deleted file mode 100644 index a7335f6..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fixes changing the default subnet route after removing an ip address. - -See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133 -and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html - -Thanks to Roy Marples. ---- sys/netinet/in.c.orig -+++ sys/netinet/in.c -@@ -858,6 +858,12 @@ - error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags); - if (!error) - target->ia_flags |= IFA_ROUTE; -+ else if (error == EEXIST) { -+ /* -+ * the fact that the route already exists is not an error. -+ */ -+ error = 0; -+ } - return (error); - } - diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch deleted file mode 100644 index 50dacd0..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch +++ /dev/null @@ -1,55 +0,0 @@ -Index: sys/kern/uipc_usrreq.c -=================================================================== ---- sys/kern/uipc_usrreq.c (revision 225745) -+++ sys/kern/uipc_usrreq.c (working copy) -@@ -462,6 +462,8 @@ - unp = sotounpcb(so); - KASSERT(unp != NULL, ("uipc_bind: unp == NULL")); - -+ if (soun->sun_len > sizeof(struct sockaddr_un)) -+ return (EINVAL); - namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path); - if (namelen <= 0) - return (EINVAL); -@@ -1252,6 +1254,8 @@ - unp = sotounpcb(so); - KASSERT(unp != NULL, ("unp_connect: unp == NULL")); - -+ if (nam->sa_len > sizeof(struct sockaddr_un)) -+ return (EINVAL); - len = nam->sa_len - offsetof(struct sockaddr_un, sun_path); - if (len <= 0) - return (EINVAL); -Index: sys/compat/linux/linux_socket.c -=================================================================== ---- sys/compat/linux/linux_socket.c (revision 225919) -+++ sys/compat/linux/linux_socket.c (working copy) -@@ -104,6 +104,7 @@ - int oldv6size; - struct sockaddr_in6 *sin6; - #endif -+ int namelen; - - if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) - return (EINVAL); -@@ -166,6 +167,20 @@ - } - } - -+ if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { -+ for (namelen = 0; -+ namelen < *osalen - offsetof(struct sockaddr_un, sun_path); -+ namelen++) -+ if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) -+ break; -+ if (namelen + offsetof(struct sockaddr_un, sun_path) > -+ sizeof(struct sockaddr_un)) { -+ error = EINVAL; -+ goto out; -+ } -+ alloclen = sizeof(struct sockaddr_un); -+ } -+ - sa = (struct sockaddr *) kosa; - sa->sa_family = bdom; - sa->sa_len = alloclen; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch deleted file mode 100644 index 4824ff6..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch +++ /dev/null @@ -1,32 +0,0 @@ -Taken from debian GNU/kFreeBSD. - -Regretably, with GCC 4.4 or later this is the only flag combination -I could find that doesn't cause kernel panics CPU triple-faults or -other kind of severe breakage. This is Gentoo Bug #410945. - -Clang can use -O2, so we do not force -O1 on it - ---- a/sys/conf/kern.pre.mk -+++ b/sys/conf/kern.pre.mk -@@ -41,6 +41,9 @@ - .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing) - COPTFLAGS+= -fno-strict-aliasing - .endif -+.if ${CC:T:Mclang} != "clang" && !empty(COPTFLAGS:M-O[23s]) -+COPTFLAGS+= -O1 -+.endif - .if !defined(NO_CPU_COPTFLAGS) - COPTFLAGS+= ${_CPUCFLAGS} - .endif ---- a/sys/conf/kmod.mk -+++ b/sys/conf/kmod.mk -@@ -91,6 +91,9 @@ - .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) - CFLAGS+= -fno-strict-aliasing - .endif -+.if ${CC:T:Mclang} != "clang" && !empty(CFLAGS:M-O[23s]) -+CFLAGS+= -O1 -+.endif - WERROR?= -Werror - CFLAGS+= ${WERROR} - CFLAGS+= -D_KERNEL diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch deleted file mode 100644 index f0984f6..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch +++ /dev/null @@ -1,128 +0,0 @@ -Index: sys/netinet6/in6.c -=================================================================== ---- sys/netinet6/in6.c.orig -+++ sys/netinet6/in6.c -@@ -1369,6 +1369,8 @@ in6_purgeaddr(struct ifaddr *ifa) - } - - cleanup: -+ if (ifa0 != NULL) -+ ifa_free(ifa0); - - plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL); /* XXX */ - if ((ia->ia_flags & IFA_ROUTE) && plen == 128) { -@@ -1393,8 +1395,6 @@ cleanup: - return; - ia->ia_flags &= ~IFA_ROUTE; - } -- if (ifa0 != NULL) -- ifa_free(ifa0); - - in6_unlink_ifa(ia, ifp); - } -@@ -1667,14 +1667,19 @@ in6_lifaddr_ioctl(struct socket *so, u_long cmd, c - hostid = IFA_IN6(ifa); - - /* prefixlen must be <= 64. */ -- if (64 < iflr->prefixlen) -+ if (64 < iflr->prefixlen) { -+ if (ifa != NULL) -+ ifa_free(ifa); - return EINVAL; -+ } - prefixlen = iflr->prefixlen; - - /* hostid part must be zero. */ - sin6 = (struct sockaddr_in6 *)&iflr->addr; - if (sin6->sin6_addr.s6_addr32[2] != 0 || - sin6->sin6_addr.s6_addr32[3] != 0) { -+ if (ifa != NULL) -+ ifa_free(ifa); - return EINVAL; - } - } else -@@ -2265,14 +2265,20 @@ in6_ifawithifp(struct ifnet *ifp, struct in6_addr - IN6_IFADDR_RUNLOCK(); - return (struct in6_ifaddr *)ifa; - } -- IN6_IFADDR_RUNLOCK(); - - /* use the last-resort values, that are, deprecated addresses */ -- if (dep[0]) -+ if (dep[0]) { -+ ifa_ref((struct ifaddr *)dep[0]); -+ IN6_IFADDR_RUNLOCK(); - return dep[0]; -- if (dep[1]) -+ } -+ if (dep[1]) { -+ ifa_ref((struct ifaddr *)dep[1]); -+ IN6_IFADDR_RUNLOCK(); - return dep[1]; -+ } - -+ IN6_IFADDR_RUNLOCK(); - return NULL; - } - -Index: sys/netinet6/ip6_input.c -=================================================================== ---- sys/netinet6/ip6_input.c.orig -+++ sys/netinet6/ip6_input.c -@@ -879,19 +879,23 @@ passin: - * as our interface address (e.g. multicast addresses, addresses - * within FAITH prefixes and such). - */ -- if (deliverifp && !ip6_getdstifaddr(m)) { -+ if (deliverifp) { - struct in6_ifaddr *ia6; - -- ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); -- if (ia6) { -- if (!ip6_setdstifaddr(m, ia6)) { -- /* -- * XXX maybe we should drop the packet here, -- * as we could not provide enough information -- * to the upper layers. -- */ -+ if ((ia6 = ip6_getdstifaddr(m)) != NULL) { -+ ifa_free(&ia6->ia_ifa); -+ } else { -+ ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); -+ if (ia6) { -+ if (!ip6_setdstifaddr(m, ia6)) { -+ /* -+ * XXX maybe we should drop the packet here, -+ * as we could not provide enough information -+ * to the upper layers. -+ */ -+ } -+ ifa_free(&ia6->ia_ifa); - } -- ifa_free(&ia6->ia_ifa); - } - } - -Index: sys/netinet/tcp_input.c -=================================================================== ---- sys/netinet/tcp_input.c.orig -+++ sys/netinet/tcp_input.c -@@ -512,6 +512,8 @@ tcp6_input(struct mbuf **mp, int *offp, int proto) - (caddr_t)&ip6->ip6_dst - (caddr_t)ip6); - return IPPROTO_DONE; - } -+ if (ia6) -+ ifa_free(&ia6->ia_ifa); - - tcp_input(m, *offp); - return IPPROTO_DONE; -@@ -1240,7 +1242,8 @@ relocked: - rstreason = BANDLIM_RST_OPENPORT; - goto dropwithreset; - } -- ifa_free(&ia6->ia_ifa); -+ if (ia6) -+ ifa_free(&ia6->ia_ifa); - } - #endif /* INET6 */ - /* diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch deleted file mode 100644 index 751a77c..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch +++ /dev/null @@ -1,13 +0,0 @@ -u_int is defined in sys/types.h -makes header usable alone. - ---- sys/sys/sysctl.h.old 2012-05-25 11:08:53.000000000 -0400 -+++ sys/sys/sysctl.h 2012-05-25 11:09:16.000000000 -0400 -@@ -788,6 +788,7 @@ - struct sysctl_req *); - #else /* !_KERNEL */ - #include <sys/cdefs.h> -+#include <sys/types.h> /* for u_int */ - - __BEGIN_DECLS - int sysctl(const int *, u_int, void *, size_t *, const void *, size_t); diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch deleted file mode 100644 index 697984b..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: sys/dev/ciss/ciss.c -=================================================================== ---- sys/dev/ciss/ciss.c (revision 264510) -+++ sys/dev/ciss/ciss.c (revision 264511) -@@ -180,8 +180,6 @@ - static void ciss_cam_poll(struct cam_sim *sim); - static void ciss_cam_complete(struct ciss_request *cr); - static void ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio); --static struct cam_periph *ciss_find_periph(struct ciss_softc *sc, -- int bus, int target); - static int ciss_name_device(struct ciss_softc *sc, int bus, int target); - - /* periodic status monitoring */ -@@ -3398,27 +3396,6 @@ - - - /******************************************************************************** -- * Find a peripheral attached at (target) -- */ --static struct cam_periph * --ciss_find_periph(struct ciss_softc *sc, int bus, int target) --{ -- struct cam_periph *periph; -- struct cam_path *path; -- int status; -- -- status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), -- target, 0); -- if (status == CAM_REQ_CMP) { -- periph = cam_periph_find(path, NULL); -- xpt_free_path(path); -- } else { -- periph = NULL; -- } -- return(periph); --} -- --/******************************************************************************** - * Name the device at (target) - * - * XXX is this strictly correct? -@@ -3427,12 +3404,22 @@ - ciss_name_device(struct ciss_softc *sc, int bus, int target) - { - struct cam_periph *periph; -+ struct cam_path *path; -+ int status; - - if (CISS_IS_PHYSICAL(bus)) - return (0); -- if ((periph = ciss_find_periph(sc, bus, target)) != NULL) { -+ -+ status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), -+ target, 0); -+ -+ if (status == CAM_REQ_CMP) { -+ mtx_lock(&sc->ciss_mtx); -+ periph = cam_periph_find(path, NULL); - sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d", - periph->periph_name, periph->unit_number); -+ mtx_unlock(&sc->ciss_mtx); -+ xpt_free_path(path); - return(0); - } - sc->ciss_logical[bus][target].cl_name[0] = 0; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch deleted file mode 100644 index 23f68ed..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: sys/netinet/in_mcast.c -=================================================================== ---- sys/netinet/in_mcast.c (revision 254252) -+++ sys/netinet/in_mcast.c (working copy) -@@ -1648,6 +1648,8 @@ - * has asked for, but we always tell userland how big the - * buffer really needs to be. - */ -+ if (msfr.msfr_nsrcs > in_mcast_maxsocksrc) -+ msfr.msfr_nsrcs = in_mcast_maxsocksrc; - tss = NULL; - if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) { - tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs, -Index: sys/netinet6/in6_mcast.c -=================================================================== ---- sys/netinet6/in6_mcast.c (revision 254252) -+++ sys/netinet6/in6_mcast.c (working copy) -@@ -1625,6 +1625,8 @@ - * has asked for, but we always tell userland how big the - * buffer really needs to be. - */ -+ if (msfr.msfr_nsrcs > in6_mcast_maxsocksrc) -+ msfr.msfr_nsrcs = in6_mcast_maxsocksrc; - tss = NULL; - if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) { - tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs, diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch deleted file mode 100644 index 0d1a894..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: sys/fs/nfsserver/nfs_nfsdport.c -=================================================================== ---- sys/fs/nfsserver/nfs_nfsdport.c (revision 249651) -+++ sys/fs/nfsserver/nfs_nfsdport.c (working copy) -@@ -1568,6 +1568,8 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdg - nd->nd_repstat = NFSERR_BAD_COOKIE; - #endif - } -+ if (!nd->nd_repstat && vp->v_type != VDIR) -+ nd->nd_repstat = NFSERR_NOTDIR; - if (nd->nd_repstat == 0 && cnt == 0) { - if (nd->nd_flag & ND_NFSV2) - /* NFSv2 does not have NFSERR_TOOSMALL */ diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch deleted file mode 100644 index e6710e3..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: sys/netinet/sctp_output.c -=================================================================== ---- sys/netinet/sctp_output.c (revision 254337) -+++ sys/netinet/sctp_output.c (revision 254338) -@@ -5406,6 +5406,14 @@ - } - SCTP_BUF_LEN(m) = sizeof(struct sctp_init_chunk); - -+ /* -+ * We might not overwrite the identification[] completely and on -+ * some platforms time_entered will contain some padding. Therefore -+ * zero out the cookie to avoid putting uninitialized memory on the -+ * wire. -+ */ -+ memset(&stc, 0, sizeof(struct sctp_state_cookie)); -+ - /* the time I built cookie */ - (void)SCTP_GETTIME_TIMEVAL(&stc.time_entered); - diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch deleted file mode 100644 index 9aef150..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch +++ /dev/null @@ -1,89 +0,0 @@ -Index: sys/net/if.c -=================================================================== ---- sys/net/if.c (revision 254941) -+++ sys/net/if.c (working copy) -@@ -2553,11 +2553,23 @@ - CURVNET_RESTORE(); - return (EOPNOTSUPP); - } -+ -+ /* -+ * Pass the request on to the socket control method, and if the -+ * latter returns EOPNOTSUPP, directly to the interface. -+ * -+ * Make an exception for the legacy SIOCSIF* requests. Drivers -+ * trust SIOCSIFADDR et al to come from an already privileged -+ * layer, and do not perform any credentials checks or input -+ * validation. -+ */ - #ifndef COMPAT_43 - error = ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd, - data, - ifp, td)); -- if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL) -+ if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL && -+ cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR && -+ cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK) - error = (*ifp->if_ioctl)(ifp, cmd, data); - #else - { -@@ -2601,7 +2613,9 @@ - data, - ifp, td)); - if (error == EOPNOTSUPP && ifp != NULL && -- ifp->if_ioctl != NULL) -+ ifp->if_ioctl != NULL && -+ cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR && -+ cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK) - error = (*ifp->if_ioctl)(ifp, cmd, data); - switch (ocmd) { - -Index: sys/netinet6/in6.c -=================================================================== ---- sys/netinet6/in6.c (revision 254941) -+++ sys/netinet6/in6.c (working copy) -@@ -431,6 +431,18 @@ - case SIOCGIFSTAT_ICMP6: - sa6 = &ifr->ifr_addr; - break; -+ case SIOCSIFADDR: -+ case SIOCSIFBRDADDR: -+ case SIOCSIFDSTADDR: -+ case SIOCSIFNETMASK: -+ /* -+ * Although we should pass any non-INET6 ioctl requests -+ * down to driver, we filter some legacy INET requests. -+ * Drivers trust SIOCSIFADDR et al to come from an already -+ * privileged layer, and do not perform any credentials -+ * checks or input validation. -+ */ -+ return (EINVAL); - default: - sa6 = NULL; - break; -Index: sys/netnatm/natm.c -=================================================================== ---- sys/netnatm/natm.c (revision 254941) -+++ sys/netnatm/natm.c (working copy) -@@ -339,6 +339,21 @@ - npcb = (struct natmpcb *)so->so_pcb; - KASSERT(npcb != NULL, ("natm_usr_control: npcb == NULL")); - -+ switch (cmd) { -+ case SIOCSIFADDR: -+ case SIOCSIFBRDADDR: -+ case SIOCSIFDSTADDR: -+ case SIOCSIFNETMASK: -+ /* -+ * Although we should pass any non-ATM ioctl requests -+ * down to driver, we filter some legacy INET requests. -+ * Drivers trust SIOCSIFADDR et al to come from an already -+ * privileged layer, and do not perform any credentials -+ * checks or input validation. -+ */ -+ return (EINVAL); -+ } -+ - if (ifp == NULL || ifp->if_ioctl == NULL) - return (EOPNOTSUPP); - return ((*ifp->if_ioctl)(ifp, cmd, arg)); diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch deleted file mode 100644 index 83f30e8..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: sys/fs/nullfs/null_vnops.c -=================================================================== ---- sys/fs/nullfs/null_vnops.c (revision 254941) -+++ sys/fs/nullfs/null_vnops.c (working copy) -@@ -858,6 +858,15 @@ - return (error); - } - -+static int -+null_link(struct vop_link_args *ap) -+{ -+ -+ if (ap->a_tdvp->v_mount != ap->a_vp->v_mount) -+ return (EXDEV); -+ return (null_bypass((struct vop_generic_args *)ap)); -+} -+ - /* - * Global vfs data structures - */ -@@ -871,6 +880,7 @@ - .vop_getwritemount = null_getwritemount, - .vop_inactive = null_inactive, - .vop_islocked = vop_stdislocked, -+ .vop_link = null_link, - .vop_lock1 = null_lock, - .vop_lookup = null_lookup, - .vop_open = null_open, diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch deleted file mode 100644 index fe9e97e..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: sys/fs/nfsserver/nfs_nfsdserv.c -=================================================================== ---- sys/fs/nfsserver/nfs_nfsdserv.c (revision 264251) -+++ sys/fs/nfsserver/nfs_nfsdserv.c (working copy) -@@ -1457,10 +1457,23 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr - nfsvno_relpathbuf(&fromnd); - goto out; - } -+ /* -+ * Unlock dp in this code section, so it is unlocked before -+ * tdp gets locked. This avoids a potential LOR if tdp is the -+ * parent directory of dp. -+ */ - if (nd->nd_flag & ND_NFSV4) { - tdp = todp; - tnes = *toexp; -- tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, p, 0); -+ if (dp != tdp) { -+ NFSVOPUNLOCK(dp, 0); -+ tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, -+ p, 0); /* Might lock tdp. */ -+ } else { -+ tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, -+ p, 1); -+ NFSVOPUNLOCK(dp, 0); -+ } - } else { - tfh.nfsrvfh_len = 0; - error = nfsrv_mtofh(nd, &tfh); -@@ -1481,10 +1494,12 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr - tnes = *exp; - tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, - p, 1); -+ NFSVOPUNLOCK(dp, 0); - } else { -+ NFSVOPUNLOCK(dp, 0); - nd->nd_cred->cr_uid = nd->nd_saveduid; - nfsd_fhtovp(nd, &tfh, LK_EXCLUSIVE, &tdp, &tnes, NULL, -- 0, p); -+ 0, p); /* Locks tdp. */ - if (tdp) { - tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, - nd->nd_cred, p, 1); -@@ -1499,7 +1514,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr - if (error) { - if (tdp) - vrele(tdp); -- vput(dp); -+ vrele(dp); - nfsvno_relpathbuf(&fromnd); - nfsvno_relpathbuf(&tond); - goto out; -@@ -1514,7 +1529,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr - } - if (tdp) - vrele(tdp); -- vput(dp); -+ vrele(dp); - nfsvno_relpathbuf(&fromnd); - nfsvno_relpathbuf(&tond); - goto out; -@@ -1523,7 +1538,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr - /* - * Done parsing, now down to business. - */ -- nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 1, exp, p, &fdirp); -+ nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 0, exp, p, &fdirp); - if (nd->nd_repstat) { - if (nd->nd_flag & ND_NFSV3) { - nfsrv_wcc(nd, fdirfor_ret, &fdirfor, fdiraft_ret, diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch deleted file mode 100644 index c36bed5..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: sys/kern/kern_exec.c -=================================================================== ---- sys/kern/kern_exec.c (revision 266979) -+++ sys/kern/kern_exec.c (working copy) -@@ -280,6 +280,7 @@ kern_execve(td, args, mac_p) - struct mac *mac_p; - { - struct proc *p = td->td_proc; -+ struct vmspace *oldvmspace; - int error; - - AUDIT_ARG_ARGV(args->begin_argv, args->argc, -@@ -296,6 +297,8 @@ kern_execve(td, args, mac_p) - PROC_UNLOCK(p); - } - -+ KASSERT((td->td_pflags & TDP_EXECVMSPC) == 0, ("nested execve")); -+ oldvmspace = td->td_proc->p_vmspace; - error = do_execve(td, args, mac_p); - - if (p->p_flag & P_HADTHREADS) { -@@ -310,6 +313,12 @@ kern_execve(td, args, mac_p) - thread_single_end(); - PROC_UNLOCK(p); - } -+ if ((td->td_pflags & TDP_EXECVMSPC) != 0) { -+ KASSERT(td->td_proc->p_vmspace != oldvmspace, -+ ("oldvmspace still used")); -+ vmspace_free(oldvmspace); -+ td->td_pflags &= ~TDP_EXECVMSPC; -+ } - - return (error); - } -Index: sys/sys/proc.h -=================================================================== ---- sys/sys/proc.h (revision 266979) -+++ sys/sys/proc.h (working copy) -@@ -968,4 +968,5 @@ curthread_pflags_restore(int save) - - #endif /* _KERNEL */ - -+#define TDP_EXECVMSPC 0x40000000 /* Execve destroyed old vmspace */ - #endif /* !_SYS_PROC_H_ */ -Index: sys/vm/vm_map.c -=================================================================== ---- sys/vm/vm_map.c (revision 266979) -+++ sys/vm/vm_map.c (working copy) -@@ -3631,6 +3631,8 @@ vmspace_exec(struct proc *p, vm_offset_t minuser, - struct vmspace *oldvmspace = p->p_vmspace; - struct vmspace *newvmspace; - -+ KASSERT((curthread->td_pflags & TDP_EXECVMSPC) == 0, -+ ("vmspace_exec recursed")); - newvmspace = vmspace_alloc(minuser, maxuser); - if (newvmspace == NULL) - return (ENOMEM); -@@ -3647,7 +3649,7 @@ vmspace_exec(struct proc *p, vm_offset_t minuser, - PROC_VMSPACE_UNLOCK(p); - if (p == curthread->td_proc) - pmap_activate(curthread); -- vmspace_free(oldvmspace); -+ curthread->td_pflags |= TDP_EXECVMSPC; - return (0); - } - diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch deleted file mode 100644 index b02d8b6..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur sys.orig/conf/kern.mk sys/conf/kern.mk ---- sys.orig/conf/kern.mk 2012-07-12 13:26:37.000000000 +0900 -+++ sys/conf/kern.mk 2012-07-16 02:32:19.000000000 +0900 -@@ -5,7 +5,7 @@ - # - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -- -Wundef -Wno-pointer-sign -fformat-extensions \ -+ -Wundef -Wno-pointer-sign \ - -Wmissing-include-dirs -fdiagnostics-show-option \ - ${CWARNEXTRA} - # -@@ -52,7 +52,7 @@ - # - .if ${MACHINE_CPUARCH} == "i386" - .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang" --CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -+CFLAGS+= -mpreferred-stack-boundary=2 - .else - CFLAGS+= -mno-aes -mno-avx - .endif diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch deleted file mode 100644 index 0fb6df7..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: sys/kern/kern_ktrace.c -=================================================================== ---- sys/kern/kern_ktrace.c (revision 266771) -+++ sys/kern/kern_ktrace.c (working copy) -@@ -119,6 +119,7 @@ static int data_lengths[] = { - 0, /* KTR_SYSCTL */ - sizeof(struct ktr_proc_ctor), /* KTR_PROCCTOR */ - 0, /* KTR_PROCDTOR */ -+ 0, /* unused */ - sizeof(struct ktr_fault), /* KTR_FAULT */ - sizeof(struct ktr_faultend), /* KTR_FAULTEND */ - }; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch deleted file mode 100644 index fd4040a..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: sys/vm/vm_map.c -=================================================================== ---- sys/vm/vm_map.c (revision 259950) -+++ sys/vm/vm_map.c (revision 259951) -@@ -1207,6 +1207,7 @@ charged: - } - else if ((prev_entry != &map->header) && - (prev_entry->eflags == protoeflags) && -+ (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 && - (prev_entry->end == start) && - (prev_entry->wired_count == 0) && - (prev_entry->cred == cred || -@@ -3339,7 +3340,6 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm - * NOTE: We explicitly allow bi-directional stacks. - */ - orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP); -- cow &= ~orient; - KASSERT(orient != 0, ("No stack grow direction")); - - if (addrbos < vm_map_min(map) || diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch deleted file mode 100644 index ef2d0a7..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch +++ /dev/null @@ -1,20 +0,0 @@ -http://www.freebsd.org/security/advisories/FreeBSD-SA-13:06.mmap.asc -https://bugs.gentoo.org/show_bug.cgi?id=473688 - -Index: sys/vm/vm_map.c -=================================================================== ---- sys/vm/vm_map.c (revision 251636) -+++ sys/vm/vm_map.c (working copy) -@@ -3761,6 +3761,12 @@ RetryLookup:; - vm_map_unlock_read(map); - return (KERN_PROTECTION_FAILURE); - } -+ if ((fault_typea & VM_PROT_COPY) != 0 && -+ (entry->max_protection & VM_PROT_WRITE) == 0 && -+ (entry->eflags & MAP_ENTRY_COW) == 0) { -+ vm_map_unlock_read(map); -+ return (KERN_PROTECTION_FAILURE); -+ } - - /* - * If this page is not pageable, we have to get it for all possible diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch deleted file mode 100644 index 767588f..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://www.freebsd.org/security/advisories/FreeBSD-SA-13:08.nfsserver.asc -https://bugs.gentoo.org/show_bug.cgi?id=478314 - -Index: sys/kern/vfs_export.c -=================================================================== ---- sys/kern/vfs_export.c (revision 253367) -+++ sys/kern/vfs_export.c (working copy) -@@ -208,7 +208,7 @@ - np->netc_anon = crget(); - np->netc_anon->cr_uid = argp->ex_anon.cr_uid; - crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups, -- np->netc_anon->cr_groups); -+ argp->ex_anon.cr_groups); - np->netc_anon->cr_prison = &prison0; - prison_hold(np->netc_anon->cr_prison); - np->netc_numsecflavors = argp->ex_numsecflavors; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch deleted file mode 100644 index bb3caba..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: sys/dev/random/probe.c -=================================================================== ---- sys/dev/random/probe.c (revision 260523) -+++ sys/dev/random/probe.c (working copy) -@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$"); - - #include <sys/types.h> - #include <sys/param.h> -+#include <sys/systm.h> -+#include <sys/kernel.h> - #include <sys/malloc.h> - #include <sys/random.h> - #include <sys/selinfo.h> -@@ -57,7 +59,12 @@ random_ident_hardware(struct random_systat *systat - /* Then go looking for hardware */ - #if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) - if (via_feature_rng & VIA_HAS_RNG) { -- *systat = random_nehemiah; -+ int enable; -+ -+ enable = 0; -+ TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable); -+ if (enable) -+ *systat = random_nehemiah; - } - #endif - } diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch deleted file mode 100644 index 2f82a5f..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: sys/netinet/tcp_reass.c -=================================================================== ---- sys/netinet/tcp_reass.c (revision 264836) -+++ sys/netinet/tcp_reass.c (working copy) -@@ -211,7 +211,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int - * Investigate why and re-evaluate the below limit after the behaviour - * is understood. - */ -- if (th->th_seq != tp->rcv_nxt && -+ if ((th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) && - tp->t_segqlen >= (so->so_rcv.sb_hiwat / tp->t_maxseg) + 1) { - V_tcp_reass_overflows++; - TCPSTAT_INC(tcps_rcvmemdrop); -@@ -234,7 +234,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int - */ - te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT); - if (te == NULL) { -- if (th->th_seq != tp->rcv_nxt) { -+ if (th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) { - TCPSTAT_INC(tcps_rcvmemdrop); - m_freem(m); - *tlenp = 0; -@@ -282,7 +282,8 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int - TCPSTAT_INC(tcps_rcvduppack); - TCPSTAT_ADD(tcps_rcvdupbyte, *tlenp); - m_freem(m); -- uma_zfree(V_tcp_reass_zone, te); -+ if (te != &tqs) -+ uma_zfree(V_tcp_reass_zone, te); - tp->t_segqlen--; - /* - * Try to present any queued data diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch deleted file mode 100644 index 9076fd2..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh -index e504f75..7aa63df 100644 ---- a/sys/conf/newvers.sh -+++ b/sys/conf/newvers.sh -@@ -86,7 +86,7 @@ fi - touch version - v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date` - i=`${MAKE:-make} -V KERN_IDENT` --compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version') -+compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version' | tail -n 1) - - for dir in /bin /usr/bin /usr/local/bin; do - if [ -x "${dir}/svnversion" ] ; then diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch deleted file mode 100644 index 0bf1b61..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: sys/amd64/amd64/trap.c -=================================================================== ---- sys/amd64/amd64/trap.c.orig -+++ sys/amd64/amd64/trap.c (working copy) -@@ -972,4 +972,21 @@ - syscallname(td->td_proc, sa.code))); - - syscallret(td, error, &sa); -+ -+ /* -+ * If the user-supplied value of %rip is not a canonical -+ * address, then some CPUs will trigger a ring 0 #GP during -+ * the sysret instruction. However, the fault handler would -+ * execute with the user's %gs and %rsp in ring 0 which would -+ * not be safe. Instead, preemptively kill the thread with a -+ * SIGBUS. -+ */ -+ if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) { -+ ksiginfo_init_trap(&ksi); -+ ksi.ksi_signo = SIGBUS; -+ ksi.ksi_code = BUS_OBJERR; -+ ksi.ksi_trapno = T_PROTFLT; -+ ksi.ksi_addr = (void *)td->td_frame->tf_rip; -+ trapsignal(td, &ksi); -+ } - } diff --git a/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch b/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch deleted file mode 100644 index c0ca444..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile -index 6c6d8c2..22fec7a 100644 ---- a/usr.bin/bmake/Makefile -+++ b/usr.bin/bmake/Makefile -@@ -5,7 +5,7 @@ - - .sinclude "Makefile.inc" - --SRCTOP?= ${.CURDIR:H:H} -+SRCTOP= ${.CURDIR:H:H} - - # look here first for config.h - CFLAGS+= -I${.CURDIR} diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild deleted file mode 100644 index aebc8cf..0000000 --- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic toolchain-funcs - -DESCRIPTION="FreeBSD kernel sources" -SLOT="0" -LICENSE="BSD dtrace? ( CDDL ) zfs? ( CDDL )" - -IUSE="+build-kernel debug dtrace zfs" - -# Security Advisory and Errata patches. -# UPSTREAM_PATCHES=() - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - sys/ - contrib/bmake/ - usr.bin/bmake/ -" - -RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) - =sys-freebsd/freebsd-mk-defs-${RV}* - !sys-freebsd/virtio-kmod - !sys-fs/fuse4bsd - !<sys-freebsd/freebsd-sources-9.2_beta1" -DEPEND="build-kernel? ( - dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) - >=sys-freebsd/freebsd-usbin-9.1 - =sys-freebsd/freebsd-mk-defs-${RV}* - )" - -RESTRICT="strip binchecks" - -S="${WORKDIR}/sys" - -KERN_BUILD=GENTOO - -PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" - "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" - "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" - "${FILESDIR}/${PN}-7.1-includes.patch" - "${FILESDIR}/${PN}-9.0-sysctluint.patch" - "${FILESDIR}/${PN}-11.0-gentoo.patch" - "${FILESDIR}/${PN}-11.0-gentoo-gcc.patch" - "${FILESDIR}/${PN}-10.1-gcc48.patch" ) - -pkg_setup() { - # Add the required source files. - use dtrace && EXTRACTONLY+="cddl/ " - - # WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914 - [[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS=" - use dtrace || mymakeopts="${mymakeopts} WITHOUT_CDDL=" - use zfs || mymakeopts="${mymakeopts} WITHOUT_ZFS=" -} - -src_prepare() { - local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}" - - cd "${WORKDIR}" || die - epatch "${FILESDIR}/freebsd-ubin-10.3-bmake-workaround.patch" - cd "${S}" || die - - # This replaces the gentoover patch, it doesn't need reapply every time. - sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ - -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ - -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ - "${S}/conf/newvers.sh" - - # __FreeBSD_cc_version comes from FreeBSD's gcc. - # on 11.0-RELEASE it's 1100001. - # FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h. - sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1100001:g" \ - -i "${S}/conf/kern.pre.mk" \ - -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" - - # Remove -Werror - sed -e "s:-Werror:-Wno-error:g" \ - -i "${S}/conf/kern.pre.mk" \ - -i "${S}/conf/kmod.mk" || die - - # Set the kernel configuration using USE flags. - cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die - use debug || echo 'nomakeoptions DEBUG' >> "${conf}" - use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" - - # hyperv fails to compile on x86-fbsd. - if use x86-fbsd && [[ $(tc-getCC) == *gcc* ]] ; then - echo 'nodevice hyperv' >> "${conf}" - dummy_mk modules/hyperv - fi - - # Only used with USE=build-kernel, let the kernel build with its own flags, its safer. - unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL -} - -src_configure() { - if use build-kernel ; then - tc-export CC - cd "${S}/$(tc-arch-kernel)/conf" || die - config ${KERN_BUILD} || die - fi -} - -src_compile() { - if use build-kernel ; then - if has_version "<sys-freebsd/freebsd-ubin-10.0"; then - cd "${WORKDIR}"/usr.bin/bmake || die - CC=${CHOST}-gcc freebsd_src_compile - export BMAKE="${WORKDIR}/usr.bin/bmake/make" - fi - cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die - freebsd_src_compile depend - freebsd_src_compile - else - einfo "Nothing to compile.." - fi -} - -src_install() { - if use build-kernel ; then - cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die - freebsd_src_install - rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" - cd "${S}" - fi - - insinto "/usr/src/sys" - doins -r "${S}/". - if use zfs ; then - insinto "/usr/src/cddl" - doins -r "${WORKDIR}/cddl/". - fi -} - -pkg_preinst() { - if [[ -L "${ROOT}/usr/src/sys" ]]; then - einfo "/usr/src/sys is a symlink, removing it..." - rm -f "${ROOT}/usr/src/sys" - fi - - if use sparc-fbsd ; then - ewarn "WARNING: kldload currently causes kernel panics" - ewarn "on sparc64. This is probably a gcc-4.1 issue, but" - ewarn "we need gcc-4.1 to compile the kernel correctly :/" - ewarn "Please compile all modules you need into the kernel" - fi - - ewarn "If you want manual compile (not recommended), please don't forget the following step." - if ! use sparc-fbsd ; then - ewarn "export CC=clang" - ewarn "export CXX=clang++" - fi - if ! use zfs ; then - ewarn "export WITHOUT_CDDL=" - ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license." - fi - if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then - ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it." - fi -} diff --git a/sys-freebsd/freebsd-sources/metadata.xml b/sys-freebsd/freebsd-sources/metadata.xml deleted file mode 100644 index 3860e80..0000000 --- a/sys-freebsd/freebsd-sources/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> - </maintainer> - <use> - <flag name="build-kernel">Build and install a kernel (recommended).</flag> - <flag name="dtrace">Enable DTrace support.</flag> - <flag name="zfs">Enable ZFS support.</flag> - </use> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest deleted file mode 100644 index 8992ddc..0000000 --- a/sys-freebsd/freebsd-ubin/Manifest +++ /dev/null @@ -1,33 +0,0 @@ -AUX freebsd-ubin-10.0-atf.patch 424 SHA256 31ac8807f4088b75ae4684316f18f3096363ee2d8bb1d5c47d9caab77e6cd5f5 SHA512 b343441f49d3fd41221766c7b54b8f831cf6e19f4400b6a0913e16476e32fd70603c28fc5a8d82eef54afc50c4a999d5151bdd96b243495bca319a0f69a6e860 WHIRLPOOL e4f2ab98d015c7656d3da2364e9dc9c6f675ac95fed05bbb886edf5efc79c843103ba9eaac13376cb9f5c5f02d37fed485a54db508ca350a13d5de2483403045 -AUX freebsd-ubin-10.0-dtc-gcc46.patch 591 SHA256 0adcc784a7fa6a6d8bd867d39b46149c4b61c3751e1ce5eb0a50d0e07d927b60 SHA512 a47ae1540cf2d7f71b718dad84010f725312bc0308cc61b99ab3560a5a18c67c8a34b54d9b99c0974b0662519c20c43c81843fca10d252178f888a14a6990eae WHIRLPOOL 6ae4e254b78d026e634fc1f26c304fc3026b8ceb7a8f7746a5480f61dbd8676aad07d0571f57b31279df119fbace4e8bb2ef7d246cf5d78566905e056bbf4d77 -AUX freebsd-ubin-10.0-kdump-ioctl.patch 1027 SHA256 7fe03c7e7cdbffdabf64557fa63eae0243a28be9025fc735393048ed2dca12c1 SHA512 6fda9d9ab4210d952277b112a5c4a2e75fcff3f63debde980ca791c6f6471038fda26d1e3ddf809384d95525e9ec9140f7b5af17dee8c11967e0b4bc9ea2b850 WHIRLPOOL 1ae5e229824a4371940ef7a0c9d8bae78aada8bcd73371a4479ced9013c55137bd4b153e296ee5873c8a9042607e86273754589e6a2a38519ba5ac78ee442740 -AUX freebsd-ubin-10.0-mandoc.patch 375 SHA256 c4d14aabe0a39bc2c12ca87b6c83628ea1c46640044bbd6946f3e6af343348b6 SHA512 b2789a57ce9afd5b7fe2989f37d246b2034b1578314ac0f6e7c4af26e81f73d043ea3440edee7c30b82fc0ddf5a4592cc3c3c6871ed0eb5fc6932bdf97a88d68 WHIRLPOOL 8e9fa01e662376225c69b41890c1f518c23116ff105ec45c43958d5749b3e265af5dd799e2c2fed5c078e0ca42f8ac988dfe7acb401875c7a769cfe38b14c56a -AUX freebsd-ubin-10.1-kdump-workaround.patch 415 SHA256 a2812aaacae36bfab6703f72fde31e705f9ebe952d1d394eb91e4e05d06c4c60 SHA512 9ee3e9a8c508f36326e24463b1bdfc5a511d6c994b8fb0da8bd1a0fa30b9eafe968c228825ad6b25849c47d800f17866e4667dc9ae8c76cff6f8181b37148d70 WHIRLPOOL 5f4f2ab4b72bae236d0c34c65404f351520869ea6a083590239f38ab0fe95f74108a4b7cbd7f84dfc5fb22f2140ded334999c492adb3fddc5dcd81ddeed8b6e5 -AUX freebsd-ubin-10.2-bsdxml.patch 367 SHA256 3bedd2e3efc7817c446395866e3ec2ca65430624dd4958bc91296d77cfc4fb90 SHA512 234fe495fcefaa9c36d97460da05365ff081661411451ae3d8dca83b3f8b1746450e111ac43baccd15a6c86c03c7cdd37d54d70fed551d694800dc6bca7c5e8d WHIRLPOOL 4946a71b63b05691ede60f15573356d98ef62b44cab40ba40a24d2be11e9655c95c660b62e898ff15ff9cdd8c006402c0dbe43a82d913b7707c1f30a55720863 -AUX freebsd-ubin-10.2-talk-workaround.patch 349 SHA256 8882326b5048b2c2acef041c82f2830ad0eb68684c6773163c6beacae65b12d7 SHA512 5eb04f1769fd4e04a26b9ff69865a6188269d971b83b7e93a5c41def44c9152e5262a192c866e3949cb3aae3b8e0a13663b8e1a438e796b0b923d9171a3e6b27 WHIRLPOOL 3be00db5ef76a3bcf615038cad6a5bd36fdfd349be6b8938a9236fb0ed2a0df6a05b04d73343206905b88ddcbd3c2d1b39928a35f62838f719b28c368adc5770 -AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae -AUX freebsd-ubin-11.0-setXid.patch 3527 SHA256 cea92e6c95f14f77b20d7525e7a72e8b7b3870e9deb1ac571b978d30ba41effe SHA512 204ce8a36eae6435d9549de7c45e361715fd50f721ea44aba630fdfad482bf434e8ac34c1bab588b7af2e2c941931e2aeb4690d65904d617b65ecfa7c76c4211 WHIRLPOOL e3b0d02ec8305f2fa3a89fc828b54e9f96515347221e343f0c35fc8666dd68cfb245edca4b17c9313bc00ea12105459f8826cfa8c8d8f2a715505508dff1c0d9 -AUX freebsd-ubin-6.0-bsdcmp.patch 413 SHA256 a0a99a602538d95ddae2fc4b823150ea58862def87c8196806a379233e3ddb2c SHA512 1516d984e7e17e8a3474ce519c9e5d6fefaee244ad27f1ed21af73335a6a25275e842007e71a60d6b18aa049f84c87b349f3350664cea03885cd55a846a73d50 WHIRLPOOL 7a23988970695ccdeaadfce96a0bf05e986736d0c93079cddf0101c0b17b7e5f3421e5da6c1e2b6e0c96ff025dd8d80effc392064ce9ff1cb2e0bce0e8d90b35 -AUX freebsd-ubin-6.0-fixmakefiles.patch 1457 SHA256 318406fa003c5188163e0dac551d4cc5fed7653cc3ff0f6baa64f23572de6d7b SHA512 65009d59ba9739627afb04f7abf5a55395d7585d2c9c201faf8f7b849ea462b61fee407accfe4460aa33a231d151c9d2aa29be7a0ccd71e969f5235a2635442d WHIRLPOOL f01e4257b06159c18f64960eb5d55a595f357bd0c6fd6974c6db942b6b0cbd6fff9ca7151cffd67bb8dec23d855975c7ab9c39cd28ba9dae098acd6773fb4c79 -AUX freebsd-ubin-6.0-kdump-ioctl.patch 1111 SHA256 71f41de71568dd819e39c871dd5e570141f243dbabb23d855505c38bec4e9de9 SHA512 53f2decb5a695b8daa4db10ac4f72b5a1d4fa58bd151314211f0ce230de5247a64e360855cef10b9e0c195146a704acb7f4cec623501516dfb9dcce09946262e WHIRLPOOL 48d2be90273b6ce1a0b4701a77d5a10e7e26f9f595b54b35cc410d81266c104c67c1fd1d735b659d41e4c3e02261cc79a85f3fe61c45ce79e4dadd1cf17b877a -AUX freebsd-ubin-8.0-bsdar.patch 556 SHA256 cb81663b4cbb91372b492f2d8c430c166fe4f425fc464a94bb08ea43e23f278d SHA512 46ac4dc366571be48fb6bd131dba49253a3f6e54f68c33bb5b4fede5143c3b96dc107fbd1c3159e15f3816d3b716238c0dc162c958798fbafb5074603c7da430 WHIRLPOOL 32c57b0ccb3b2256e1169da0f7b4d9a3a6300cf703e792ab7286255a12bbaca983bb65ea1c42f6115fc071ee923b5182401e1d14461bf5407269a17361ce003d -AUX freebsd-ubin-8.0-xinstall.patch 1014 SHA256 124cd30b5f44425d0914c64fd8ae98242c9649e4eb0cb1f786839137532504d6 SHA512 a39843600497876287c13a10ca783041123631ef7a82501df323c6a118eb20d871fa6683b812eeebea220c4cfa1eba81450dc7de7ea08888229f326375ff285d WHIRLPOOL 94e16b120a39e5331fa5db7bcda4ba970c3c92049122e958f4ea378936bd384671955af700053d8ae89d6a0c118abae61751cc2e866f719f882559801c6db359 -AUX freebsd-ubin-8.2-compress.patch 1658 SHA256 19485003b70669399b363c4579cecac7fe0b59e3127a13a2c2bc103526fe226c SHA512 9b94b608e4dffb27cec0e6994a06de710ff2d73125d18fad2c5bbe9cab3e1f626ba2ade0333cac9d72350e30b2746f1ccf096bb67b472d1b9b0b79da68bf43bc WHIRLPOOL de29a9917312d1b2f20bcf01cfc224df626113b7d6eea86e5c6fdc306d04a08042a452b1c03a30874f9da1d48f8a3a3718026c4305a4a0373df18d331fd57d6a -AUX freebsd-ubin-9.0-fixmakefiles.patch 445 SHA256 88c90ea1e20afb56ae1b62c4e7ca9de8da8aa9b3726059a96e85beea13935d1c SHA512 588b0e7f58504ae338b714fb324b1525ed340b56e2e99a1ebaac2606799c9ff15b8c1a05e2ddaa5dfbdc7328684917de8753d99b0c8929c056d6eb6446aa9955 WHIRLPOOL 35445ccd0d4a63c5ac593157d55b0e08106d37cbab0a0b10a699e63872fd2a5e9bd53fe2c4a94dff7b1441fa27c141c171b6938ee51e7c696de95695938985a0 -AUX freebsd-ubin-9.1-ar-libarchive3.patch 593 SHA256 92a37952790362f73b0c6a1000877e633e7a0055be8397184aa8ad7e15bfecee SHA512 ece840657b425a666af495332a00a57a4c9c353187ee98747651da4ba69227bd0a58dbbdc7af860d49e0d662c9eaca046ec2f087a86c5bf282530bb9cdcf7aaa WHIRLPOOL 4e25ddac55843e725903c28ed009b646ed63eef4b935ee03eb4a60c3fdeb02b158e018ff76adea6ca14a9a40268a1b7347f26f067d407ffb7329fb3c4641da5c -AUX freebsd-ubin-9.1-bsdar.patch 656 SHA256 86834418e478bc21918d6f310fb422dbfd0aa0df1315bd4fbc0ddd7a8fc62868 SHA512 88fc86fdb0ee6f757cee9b6bd55226517e6b79946f0518904bedd8176230124b40b868dee30049daa7053ea0ebe7d242dc58778e3addae2612ffd53996303bac WHIRLPOOL b66fd0a613cd32f9037c739146e465fd2ddcc56f78a3fdffc67eec9b92b6f2f78d6948906a77c2418e2bae5d782ab70f9c4f473ee8e256f233b237f6a11ae08c -AUX freebsd-ubin-9.1-grep.patch 549 SHA256 5ab5dafccdc0c64f07742698abe51a24ab0abe10aba7d4bd80afcf4b5a36066f SHA512 2ddec1a02064ee91a177edb78a964d37b5be14c6e92a78ba9ce0a902c40f673eb7a6449042e341dfb3f31be6bef1a19fdf735af0d32526c0891fe6d9cc060101 WHIRLPOOL 3742f0c0612d2158ce2e5afaea7fb15f3f9cbc95f702fd51ea30c0c97a5cccabdffd4b722d1cb1930b362a4d2256bce77d997a69f02304a4d187391c8f8e0734 -AUX freebsd-ubin-9.1-kdump-ioctl.patch 1001 SHA256 03804b82087884efa28157b36781a746349f41164591b46b73785e0b53088e2a SHA512 aadf3a6d97c5822aa9ff0d1ad8a7bfb2d17fc3193851f864bcb847ef05fe5b7e2b852cb95aaf159194a12b26900697f089113ccb15854c8e3bdb43518de9adf8 WHIRLPOOL 904f1c9dee700cab16a6075216e85768c1a146064da10e865caa319850d400b96255f677df70b2ba1766d4d855b553ad58d74f7e139391bb841f7fc0ef39ebef -AUX freebsd-ubin-9.1-minigzip.patch 336 SHA256 88ad33268fd33012d37ec3f0f915322a536a4868900aa7c19486226e96125723 SHA512 e25cb6b74b17ee3d999321701fcc5a90ab94abac8ea33a155847f99e7836f16203485618be3426e34a1a5895b7582f5f466f997986486637e52dbc0e6c225dd5 WHIRLPOOL 2fa652c4548eb5b305bafca4b788d9f19f1f52903b0e27cbf402e11bcd7ceb78bdf1dfabf79932b8e78b1bbf898308405ccc19b1ca21198446889c8360db24a7 -AUX freebsd-ubin-lint-stdarg.patch 792 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198123594e770cc31d77d6775fd851bd6 SHA512 0f06547b0b90c65466c5c032efe6563dfd32ca56175fbad0885228310f6dc5f973d3adffe93bdb35d42b8af045ecdc23d1198fd8bad0c96c46512dbedbab3059 WHIRLPOOL 853d89f6f35c91718a30c8cbd2fed72a01c01dd03b3fab28c931fd80f71394122f4e5fe240df17b524dffb91829bc0148a605e797b88827d4f5e48730790fa57 -AUX freebsd-ubin-setXid.patch 3723 SHA256 961ac8dcd9efa4f1aab18f56b26c6210d1d5bf441410aae392160e7c0242d16d SHA512 9edaac765405e28b123fa40b708b1ab05af3e151726e6f2b75ab1c0fd17b6c2a428a58726da999f7a63e9550bdd3e0d274ce63517717137872a7e9c77a591501 WHIRLPOOL 36fff3ad1577981b157e4311226540ee9a0eca7f5d623e27b3fbc585bc5585158c21f27c2355ac773ff190817aee2056293d3a1c0306e7743ae72a3a49d1e670 -AUX locate-updatedb-cron 122 SHA256 63cceb90a3abb02e806af6940542f12d397e7600df37f1b7305104f78694cce9 SHA512 c3127d2ebb837d7fd6edc640604ce31c1639c036703b1e923e84b79f9840e13e28327eb7a5d655546ade8efb9188b041434552bcd0b4b76308c0e66132ad7985 WHIRLPOOL a040f971f7406f2dc022aee9e6b4cbfd4bb37931afabcdb58dcbe82539500bf7ae7fdfdf8651113ae3cea5ffa73771bb57a2a0a0e749701563664ccbf87285ca -AUX login.1.pamd 145 SHA256 c8b81b422104b58afa8b6bb478b1eda77f97c3037030ac09889b7c3bf3de9fcc SHA512 2308d818de388be2973b59fad5a21ffe5a9c9d302b47ccf1a148182ccaf082421c5a277acf0c85649874fd607a8da20222e7a05c15606ee36f6e74d0968a1397 WHIRLPOOL a562ee1210568bdf2339df413ec69eed066738d0d2929c8965f6bfc2b05d60075b23176ca8f744bee2c6a7cfa8448adf4e08a531d36477f78aac78da47f3209c -AUX login.pamd 309 SHA256 4680e4682c95faeb879e4cf4cc83280e91ec53870a19fc7dd67079ff5eb97c38 SHA512 a5fc8fc6c1ca597f194f1fc801185bc69020c8055211d20b1712cc8c9c3cfd27b3eb2031823771d73c1c2814a0dee29bf14c32319c6831732246800256e38a26 WHIRLPOOL c8df5d4d0f1ad85e42762c30dfecb3bdf84c4593d98ef7a71ca31674c28400b5014c2bb543919cd3741bfcb642e2490dd7f4f9850e743d5c89e8bbbd7b23a2ba -AUX passwd.1.pamd 154 SHA256 39706dd518995631a8eb6a48498685db9a777124bb84f217e2045f0162357081 SHA512 b89b339facf74c3fb2f68f38cb76d4104f8e497312140e76778ce4673f9a039afe22df78991e7625e1488e6dd1e679ca9cd9953dffb483db9b0bd106755b0a5f WHIRLPOOL cb683ae69af9fc5d1344c40a26e6518941d6ee241b11d2efb53b93ddabd69d9a2c53df8e33d4e68a20ceef4fef27372b5fb93eb653c461217091dd0c3872c0eb -AUX passwd.pamd 247 SHA256 df5babb31578b5fd56629dac06656a981cffd2e1ef4987e075c0e95029d40399 SHA512 db179adff0d3211b9409cd4efdc09c14212192ab24549acd1d2ecd7788947117d58c991899750530f80fb87b66bc6a7e08a863d0f37f57105af23db86bf278ee WHIRLPOOL 287de39190e8e377503d4a494c5b114af6a6feaff06129832054c9685ced1f127f784fa2f8ddf9a31b0603ca8d999ae0856feb28c82e406a5b830ecc8b218c8b -AUX su.1.pamd 321 SHA256 18ed54492632b231ca9074fe08aa5343a5dd7049834a7eda3aa45d42d313c779 SHA512 fa27233d99c70c3b968b5aff430cdbd55a3d795a1a4430143f863d3dae7bf7b6b1564d58f82431fe2e8e4a2b1bcc2f12714abf7d48ff75c08c1a65f22cd74d6c WHIRLPOOL 7b82c775ec138873b2754c101fa14c09e87bf052f2497b0bba12fee2cfa80f970b27041febb7fd22c3291977f942363ab558d52a92833fcd4cfdf7ece829c713 -AUX su.pamd 311 SHA256 5090fbcd2807019255062cacf3816e2e28088c0084c6e9f34a3cceda31e08e27 SHA512 d7c7eaf776aace61f2a534e5a8c2f65879fe27311859e6e8bd309f1425693e4effe8867a1a7ecc3f1d5a478989139f1731c1863c4509da49318c3cead5c8b0dd WHIRLPOOL 055d4b0b9f0645a4ee33170f3a69de0f8733dc972330bb3182400cdae54711f82f85536aa5b6b8ccbd66f1d2ab547780fa0198e2134466f6fa5782ff4b02a77d -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-ubin-11.0.ebuild 6032 SHA256 a85fbd41cd09b62593bbf6a475d9d9cad3f7d003e3b6c0ae2ff561e9487dacbc SHA512 fbc50e301e6daea2103ba96527d43233b6aacbe4fe52ff096cfda9d82277756cfa07613319e1a687d7fcf3a72ddeedc49eeeca60b265b452857d30b3a19a446b WHIRLPOOL 742f34fbce53872d7f9b27d34e5327f13060e441f5433bb497b31fbc5f7f854ccec981662bb2a6d4071c1080ea9853746a8416781e9c46ee52944e92b206c1cd -MISC metadata.xml 782 SHA256 9d530de89ea94bedcf5f2943f56417fd2a4942bac995425a485acf2ccd01f994 SHA512 50d638f761e118d9892e593dcea9d72805e3968d29cb3bbb1b95cf4eb6a4e3293a3c47b29415a4f9fa937dcccf2c2f09c2af10e62982a15069bad22162d70f3d WHIRLPOOL 8ce25849714014929d8b1b6b6e05a9e88e4671f5a3accb128e266a64994b390395b4d881018090ef778dde7afe6894e15a9047fa591b45bbd31df960cecdea37 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch deleted file mode 100644 index d758c48..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile -index 4ebdc33..37ff8fa 100644 ---- a/usr.bin/atf/atf-sh/Makefile -+++ b/usr.bin/atf/atf-sh/Makefile -@@ -33,8 +33,8 @@ PROG_CXX= atf-sh - SRCS= atf-sh.cpp - MAN= atf-sh.1 atf-sh-api.3 - --CFLAGS+= -DHAVE_CONFIG_H --CFLAGS+= -I${ATF} -+CXXFLAGS+= -DHAVE_CONFIG_H -+CXXFLAGS+= -I${ATF} - - DPADD+= ${LIBATF_C} ${LIBATF_CXX} - LDADD+= -latf-c++ -latf-c diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch deleted file mode 100644 index 1125238..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/usr.bin/dtc/string.hh b/usr.bin/dtc/string.hh -index 45bc4fd..6eaf8e4 100644 ---- a/usr.bin/dtc/string.hh -+++ b/usr.bin/dtc/string.hh -@@ -32,6 +32,8 @@ - - #ifndef _STRING_HH_ - #define _STRING_HH_ -+#include <cstdio> -+#include <cstring> - #include "input_buffer.hh" - - namespace dtc -diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh -index 7f2ec67..8e13b1c 100644 ---- a/usr.bin/dtc/util.hh -+++ b/usr.bin/dtc/util.hh -@@ -33,6 +33,7 @@ - #ifndef _UTIL_HH_ - #define _UTIL_HH_ - -+#include <stdint.h> - #include <vector> - - // If we aren't using C++11, then just ignore static asserts. diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch deleted file mode 100644 index e106852..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile -index 38e9df6..5e831c6 100644 ---- a/usr.bin/kdump/Makefile -+++ b/usr.bin/kdump/Makefile -@@ -22,7 +22,7 @@ CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c - - ioctl.c: mkioctls - env MACHINE=${MACHINE} CPP="${CPP}" \ -- sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET} -+ sh ${.CURDIR}/mkioctls print ${.CURDIR}/../../include > ${.TARGET} - - kdump_subr.h: mksubr - sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ -diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile -index 7a49497..bc8b61f 100644 ---- a/usr.bin/truss/Makefile -+++ b/usr.bin/truss/Makefile -@@ -24,7 +24,7 @@ syscalls.h: syscalls.master - - ioctl.c: ${.CURDIR}/../kdump/mkioctls - env MACHINE=${MACHINE} CPP="${CPP}" \ -- /bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}/usr/include > ${.TARGET} -+ /bin/sh ${.CURDIR}/../kdump/mkioctls return ${.CURDIR}/../../include > ${.TARGET} - - .if ${MACHINE_CPUARCH} == "i386" - SRCS+= i386-linux.c linux_syscalls.h diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch deleted file mode 100644 index c5f7706..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile -index 0995534..1bcb3e0 100644 ---- a/usr.bin/mandoc/Makefile -+++ b/usr.bin/mandoc/Makefile -@@ -1,7 +1,7 @@ - # $FreeBSD$ - - MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml --LIBMANDOC= ${.OBJDIR}/../../lib/libmandoc/libmandoc.a -+LIBMANDOC= ${.CURDIR}/../../lib/libmandoc/libmandoc.a - .PATH: ${MDOCMLDIR} - - PROG= mandoc diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch deleted file mode 100644 index 064647c..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile -index cbf31d0..fa0d04d 100644 ---- a/usr.bin/kdump/Makefile -+++ b/usr.bin/kdump/Makefile -@@ -8,7 +8,7 @@ SFX= 32 - .PATH: ${.CURDIR}/../ktrace - - PROG= kdump --SRCS= kdump_subr.c kdump.c ioctl.c subr.c -+SRCS= kdump_subr.h kdump_subr.c kdump.c ioctl.c subr.c - DPSRCS= kdump_subr.h - CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I. - diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch deleted file mode 100644 index 6064717..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c -index af6562b..3121c81 100644 ---- a/usr.bin/mt/mt.c -+++ b/usr.bin/mt/mt.c -@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD: stable/10/usr.bin/mt/mt.c 280438 2015-03-24 14:36:10Z ken $" - #include <unistd.h> - #include <stdint.h> - #include <errno.h> --#include <bsdxml.h> -+#include <expat.h> - #include <mtlib.h> - - #include <cam/cam.h> diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch deleted file mode 100644 index 3a65b37..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c -index 4daad7a..1fb9105 100644 ---- a/usr.bin/talk/io.c -+++ b/usr.bin/talk/io.c -@@ -50,6 +50,7 @@ static const char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93"; - #include <stdlib.h> - #include <string.h> - #include <unistd.h> -+#include <wctype.h> - #define _XOPEN_SOURCE_EXTENDED - #include <curses.h> - diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch deleted file mode 100644 index c0ca444..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile -index 6c6d8c2..22fec7a 100644 ---- a/usr.bin/bmake/Makefile -+++ b/usr.bin/bmake/Makefile -@@ -5,7 +5,7 @@ - - .sinclude "Makefile.inc" - --SRCTOP?= ${.CURDIR:H:H} -+SRCTOP= ${.CURDIR:H:H} - - # look here first for config.h - CFLAGS+= -I${.CURDIR} diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.0-setXid.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.0-setXid.patch deleted file mode 100644 index 946cc5b..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.0-setXid.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile -index d199a85..dc5cafd 100644 ---- a/usr.bin/at/Makefile -+++ b/usr.bin/at/Makefile -@@ -17,6 +17,8 @@ BINOWN= root - BINMODE= 4555 - CLEANFILES+= at.1 - -+LDFLAGS+=-Wl,-z,now -+ - at.1: at.man - @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ - sed -e \ -diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile -index 4427417..4f774a1 100644 ---- a/usr.bin/chpass/Makefile -+++ b/usr.bin/chpass/Makefile -@@ -17,6 +17,8 @@ CFLAGS+= -DYP - #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE - CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I. - -+LDFLAGS+=-Wl,-z,now -+ - LIBADD= crypt util - .if ${MK_NIS} != "no" - LIBADD+= ypclnt -diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile -index cd03a51..9a0fe6e 100644 ---- a/usr.bin/fstat/Makefile -+++ b/usr.bin/fstat/Makefile -@@ -9,3 +9,5 @@ LIBADD= procstat - MAN1= fuser.1 fstat.1 - - .include <bsd.prog.mk> -+LDFLAGS+=-Wl,-z,now -+ -diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile -index 07321f7..ed2c786 100644 ---- a/usr.bin/lock/Makefile -+++ b/usr.bin/lock/Makefile -@@ -7,4 +7,6 @@ BINMODE=4555 - - LIBADD= crypt - -+LDFLAGS+=-Wl,-z,now -+ - .include <bsd.prog.mk> -diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile -index 3499575..62a7356 100644 ---- a/usr.bin/login/Makefile -+++ b/usr.bin/login/Makefile -@@ -16,6 +16,8 @@ CFLAGS+= -DUSE_BSM_AUDIT - LIBADD+= bsm - .endif - -+LDFLAGS+=-Wl,-z,now -+ - .if ${MK_SETUID_LOGIN} != "no" - BINOWN= root - BINMODE=4555 -diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile -index 52cc3c7..11ebb2f 100644 ---- a/usr.bin/netstat/Makefile -+++ b/usr.bin/netstat/Makefile -@@ -57,6 +57,8 @@ BINGRP= kmem - BINMODE=2555 - LIBADD= kvm memstat xo util - -+LDFLAGS+=-Wl,-z,now -+ - .if ${MK_NETGRAPH_SUPPORT} != "no" - SRCS+= netgraph.c - LIBADD+= netgraph -diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile -index 3114a92..5c41213 100644 ---- a/usr.bin/opieinfo/Makefile -+++ b/usr.bin/opieinfo/Makefile -@@ -12,6 +12,8 @@ WARNS?= 0 - - LIBADD= opie - -+LDFLAGS+=-Wl,-z,now -+ - BINOWN= root - BINMODE=4555 - PRECIOUSPROG= -diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile -index ae35b20..32ba59b 100644 ---- a/usr.bin/opiepasswd/Makefile -+++ b/usr.bin/opiepasswd/Makefile -@@ -12,6 +12,8 @@ WARNS?= 0 - - LIBADD= opie - -+LDFLAGS+=-Wl,-z,now -+ - BINOWN= root - BINMODE=4555 - PRECIOUSPROG= -diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile -index 758be2d..ebde1a6 100644 ---- a/usr.bin/passwd/Makefile -+++ b/usr.bin/passwd/Makefile -@@ -13,6 +13,8 @@ SYMLINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd - MLINKS = passwd.1 yppasswd.1 - .endif - -+LDFLAGS+=-Wl,-z,now -+ - beforeinstall: - .for i in passwd yppasswd - [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ -diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile -index b3dd829..26eaa63 100644 ---- a/usr.bin/su/Makefile -+++ b/usr.bin/su/Makefile -@@ -10,6 +10,8 @@ WARNS?= 5 - LIBADD= util pam - - .if ${MK_AUDIT} != "no" -+LDFLAGS+=-Wl,-z,now -+ - CFLAGS+= -DUSE_BSM_AUDIT - LIBADD+= bsm - .endif -diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile -index 0579add..571be8d 100644 ---- a/usr.bin/wall/Makefile -+++ b/usr.bin/wall/Makefile -@@ -6,4 +6,6 @@ SRCS= ttymsg.c wall.c - BINGRP= tty - BINMODE=2555 - -+LDFLAGS+=-Wl,-z,now -+ - .include <bsd.prog.mk> -diff --git a/usr.bin/write/Makefile b/usr.bin/write/Makefile -index ba06110..ba6ce04 100644 ---- a/usr.bin/write/Makefile -+++ b/usr.bin/write/Makefile -@@ -5,4 +5,6 @@ PROG= write - BINMODE=2555 - BINGRP= tty - -+LDFLAGS+=-Wl,-z,now -+ - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch deleted file mode 100644 index 1a85529..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: fbsd-6.0/usr.bin/cmp/Makefile -=================================================================== ---- fbsd-6.0.orig/usr.bin/cmp/Makefile -+++ fbsd-6.0/usr.bin/cmp/Makefile -@@ -1,7 +1,7 @@ - # @(#)Makefile 8.1 (Berkeley) 6/6/93 - # $FreeBSD: src/usr.bin/cmp/Makefile,v 1.6.14.1 2005/09/17 11:33:41 brian Exp $ - --PROG= cmp -+PROG= bsdcmp - SRCS= cmp.c link.c misc.c regular.c special.c - - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch deleted file mode 100644 index b135a82..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: usr.bin/calendar/Makefile -=================================================================== ---- usr.bin/calendar/Makefile.orig -+++ usr.bin/calendar/Makefile -@@ -10,6 +10,7 @@ FR_LINKS= fr_FR.ISO8859-15 - TEXTMODE?= 444 - - beforeinstall: -+ ${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ - ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar - .for lang in ${INTER} -Index: usr.bin/ee/Makefile -=================================================================== ---- usr.bin/ee/Makefile.orig -+++ usr.bin/ee/Makefile -@@ -12,12 +12,12 @@ LDADD= -lncurses - NLS= en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \ - uk_UA.KOI8-U ru_RU.KOI8-R - --NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15 --NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \ -- fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \ -- fr_FR.ISO8859-15 --NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ -- de_CH.ISO8859-15 de_DE.ISO8859-15 -+#NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15 -+#NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \ -+# fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \ -+# fr_FR.ISO8859-15 -+#NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ -+# de_CH.ISO8859-15 de_DE.ISO8859-15 - - NLSSRCFILES=ee.msg - .for lang in ${NLS} diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch deleted file mode 100644 index a89cf52..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch +++ /dev/null @@ -1,28 +0,0 @@ -By default the mkioctl program that generates code for kdump does look for -ioctls in the whole /usr/include tree, but this does break when xorg is merged. -This patch allows to look for include files only in the source tree. - -Index: fbsd-6/usr.bin/kdump/Makefile -=================================================================== ---- fbsd-6.orig/usr.bin/kdump/Makefile -+++ fbsd-6/usr.bin/kdump/Makefile -@@ -10,6 +10,6 @@ CFLAGS+= -I${.CURDIR}/../ktrace -I${.CUR - CLEANFILES= ioctl.c - - ioctl.c: mkioctls -- sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} -+ sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} - - .include <bsd.prog.mk> -Index: fbsd-6/usr.bin/truss/Makefile -=================================================================== ---- fbsd-6.orig/usr.bin/truss/Makefile -+++ fbsd-6/usr.bin/truss/Makefile -@@ -29,6 +29,6 @@ syscalls.h: syscalls.master - ${.CURDIR}/i386.conf - - ioctl.c: ${.CURDIR}/../kdump/mkioctls -- sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET} -+ sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET} - - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch deleted file mode 100644 index c966b9b..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- usr.bin/ar/Makefile.old 2010-03-12 14:50:30 +0100 -+++ usr.bin/ar/Makefile 2010-03-12 14:50:53 +0100 -@@ -1,6 +1,6 @@ - # $FreeBSD: src/usr.bin/ar/Makefile,v 1.22.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ - --PROG= ar -+PROG= freebsd-ar - SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h - - WARNS?= 5 -@@ -10,8 +10,7 @@ - - CFLAGS+=-I. -I${.CURDIR} - --NO_SHARED?= yes --LINKS= ${BINDIR}/ar ${BINDIR}/ranlib --MLINKS= ar.1 ranlib.1 -+LINKS= ${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib -+MLINKS= freebsd-ar.1 freebsd-ranlib.1 - - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch deleted file mode 100644 index e8f978a..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch +++ /dev/null @@ -1,26 +0,0 @@ -Parallel make installs often cause 2 concurrent install -d to fail -while they are creating the path to the target dirs. -This patch changes the failure to a warning so that a make -j6 install doesn't -fails as often as it does on Gentoo/FreeBSD, if it uses /usr/bin/install. - ---- usr.bin/xinstall/xinstall.c.orig -+++ usr.bin/xinstall/xinstall.c -@@ -748,9 +748,17 @@ - ch = *p; - *p = '\0'; - if (stat(path, &sb)) { -- if (errno != ENOENT || mkdir(path, 0755) < 0) { -+ if (errno != ENOENT) { - err(EX_OSERR, "mkdir %s", path); - /* NOTREACHED */ -+ } else if (mkdir(path, 0755) < 0) { -+ /* Previous errno from stat() says that the directory didn't exist (ENOENT) -+ * But if errno is now EEXIST, then we just hit a parallel make bug. -+ */ -+ if (errno == EEXIST) -+ warn("mkdir: %s now exists!", path); /* let me know when this happens */ -+ else -+ err(EX_OSERR, "mkdir %s", path); - } else if (verbose) - (void)printf("install: mkdir %s\n", - path); diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch deleted file mode 100644 index 5bd1d55..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch +++ /dev/null @@ -1,55 +0,0 @@ -Index: usr.bin/compress/zopen.c -=================================================================== ---- usr.bin/compress/zopen.c (revision 225020) -+++ usr.bin/compress/zopen.c (working copy) -@@ -486,7 +486,7 @@ zread(void *cookie, char *rbp, int num) - block_compress = maxbits & BLOCK_MASK; - maxbits &= BIT_MASK; - maxmaxcode = 1L << maxbits; -- if (maxbits > BITS) { -+ if (maxbits > BITS || maxbits < 12) { - errno = EFTYPE; - return (-1); - } -@@ -513,17 +513,28 @@ zread(void *cookie, char *rbp, int num) - for (code = 255; code >= 0; code--) - tab_prefixof(code) = 0; - clear_flg = 1; -- free_ent = FIRST - 1; -- if ((code = getcode(zs)) == -1) /* O, untimely death! */ -- break; -+ free_ent = FIRST; -+ oldcode = -1; -+ continue; - } - incode = code; - -- /* Special case for KwKwK string. */ -+ /* Special case for kWkWk string. */ - if (code >= free_ent) { -+ if (code > free_ent || oldcode == -1) { -+ /* Bad stream. */ -+ errno = EINVAL; -+ return (-1); -+ } - *stackp++ = finchar; - code = oldcode; - } -+ /* -+ * The above condition ensures that code < free_ent. -+ * The construction of tab_prefixof in turn guarantees that -+ * each iteration decreases code and therefore stack usage is -+ * bound by 1 << BITS - 256. -+ */ - - /* Generate output characters in reverse order. */ - while (code >= 256) { -@@ -540,7 +551,7 @@ middle: do { - } while (stackp > de_stack); - - /* Generate the new entry. */ -- if ((code = free_ent) < maxmaxcode) { -+ if ((code = free_ent) < maxmaxcode && oldcode != -1) { - tab_prefixof(code) = (u_short) oldcode; - tab_suffixof(code) = finchar; - free_ent = code + 1; diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch deleted file mode 100644 index d34eb9e..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr usr.bin.old/calendar/Makefile usr.bin/calendar/Makefile ---- usr.bin.old/calendar/Makefile 2011-11-02 18:22:09.000000000 +0000 -+++ usr.bin/calendar/Makefile 2011-11-02 18:22:48.000000000 +0000 -@@ -15,6 +15,7 @@ - WARNS?= 7 - - beforeinstall: -+ ${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ - ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar - .for lang in ${INTER} diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch deleted file mode 100644 index d4d89e1..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur usr.bin.orig/ar/ar.c usr.bin/ar/ar.c ---- usr.bin.orig/ar/ar.c 2012-01-03 12:23:45.000000000 +0900 -+++ usr.bin/ar/ar.c 2012-12-25 20:50:29.000000000 +0900 -@@ -386,13 +386,13 @@ - static void - bsdar_version(void) - { -- (void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version()); -+ (void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version_string()); - exit(EX_OK); - } - - static void - ranlib_version(void) - { -- (void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version()); -+ (void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version_string()); - exit(EX_OK); - } diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch deleted file mode 100644 index a65185f..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nur work.orig/usr.bin/ar/Makefile work/usr.bin/ar/Makefile ---- work.orig/usr.bin/ar/Makefile 2012-07-16 03:59:48.000000000 +0900 -+++ work/usr.bin/ar/Makefile 2012-07-16 04:02:38.000000000 +0900 -@@ -2,7 +2,7 @@ - - .include <bsd.own.mk> - --PROG= ar -+PROG= freebsd-ar - SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h - - DPADD= ${LIBARCHIVE} ${LIBELF} -@@ -10,10 +10,7 @@ - - CFLAGS+=-I. -I${.CURDIR} - --.if ${MK_SHARED_TOOLCHAIN} == "no" --NO_SHARED?= yes --.endif --LINKS= ${BINDIR}/ar ${BINDIR}/ranlib --MLINKS= ar.1 ranlib.1 -+LINKS= ${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib -+MLINKS= freebsd-ar.1 freebsd-ranlib.1 - - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch deleted file mode 100644 index 06cc5d2..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur work.orig/usr.bin/grep/Makefile work/usr.bin/grep/Makefile ---- work.orig/usr.bin/grep/Makefile 2012-07-16 04:59:01.000000000 +0900 -+++ work/usr.bin/grep/Makefile 2012-07-16 05:00:15.000000000 +0900 -@@ -40,13 +40,6 @@ - grep.1 lzfgrep.1 - .endif - --LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \ -- ${BINDIR}/${PROG} ${BINDIR}/xzegrep \ -- ${BINDIR}/${PROG} ${BINDIR}/xzfgrep \ -- ${BINDIR}/${PROG} ${BINDIR}/lzgrep \ -- ${BINDIR}/${PROG} ${BINDIR}/lzegrep \ -- ${BINDIR}/${PROG} ${BINDIR}/lzfgrep -- - LDADD= -lz -llzma - DPADD= ${LIBZ} ${LIBLZMA} - diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch deleted file mode 100644 index d98e599..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur work.orig/usr.bin/kdump/Makefile work/usr.bin/kdump/Makefile ---- work.orig/usr.bin/kdump/Makefile 2012-07-12 13:24:01.000000000 +0900 -+++ work/usr.bin/kdump/Makefile 2012-07-16 03:54:14.000000000 +0900 -@@ -21,7 +21,7 @@ - - ioctl.c: mkioctls - env CPP="${CPP}" \ -- sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} -+ sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} - - kdump_subr.c: mksubr - sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET} -diff -Nur work.orig/usr.bin/truss/Makefile work/usr.bin/truss/Makefile ---- work.orig/usr.bin/truss/Makefile 2012-07-12 13:24:03.000000000 +0900 -+++ work/usr.bin/truss/Makefile 2012-07-16 03:54:40.000000000 +0900 -@@ -24,7 +24,7 @@ - - ioctl.c: ${.CURDIR}/../kdump/mkioctls - env CPP="${CPP}" \ -- sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET} -+ sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET} - - .if ${MACHINE_CPUARCH} == "i386" - SRCS+= i386-linux.c linux_syscalls.h diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch deleted file mode 100644 index a9c0622..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -Nur work.orig/usr.bin/minigzip/Makefile work/usr.bin/minigzip/Makefile ---- work.orig/usr.bin/minigzip/Makefile 2012-07-16 04:39:31.000000000 +0900 -+++ work/usr.bin/minigzip/Makefile 2012-07-16 04:45:30.000000000 +0900 -@@ -10,4 +10,6 @@ - DPADD= ${LIBZ} - LDADD= -lz - -+CFLAGS+= -I${.CURDIR}/../../lib/libz -+ - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch deleted file mode 100644 index 9774724..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur usr.bin.orig/xlint/llib/llib-lposix usr.bin/xlint/llib/llib-lposix ---- usr.bin.orig/xlint/llib/llib-lposix 2005-04-29 17:30:03 +0000 -+++ usr.bin/xlint/llib/llib-lposix 2005-05-03 14:12:26 +0000 -@@ -42,7 +42,7 @@ - #include <sys/utsname.h> - #include <sys/times.h> - #include <stdio.h> --#include <stdarg.h> -+#include <machine/stdarg.h> - #include <stdlib.h> - #include <unistd.h> - #include <math.h> -diff -ur usr.bin.orig/xlint/llib/llib-lstdc usr.bin/xlint/llib/llib-lstdc ---- usr.bin.orig/xlint/llib/llib-lstdc 2005-04-29 17:30:03 +0000 -+++ usr.bin/xlint/llib/llib-lstdc 2005-05-03 14:12:35 +0000 -@@ -44,7 +44,7 @@ - #include <math.h> - #include <setjmp.h> - #include <signal.h> --#include <stdarg.h> -+#include <machine/stdarg.h> - #include <stddef.h> - #include <stdio.h> - #include <stdlib.h> diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch deleted file mode 100644 index 631ee4f..0000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -ur usr.bin.orig/at/Makefile usr.bin.setXid/at/Makefile ---- usr.bin.orig/at/Makefile Thu Apr 7 20:52:57 2005 -+++ usr.bin.setXid/at/Makefile Thu Apr 7 21:21:02 2005 -@@ -15,6 +15,8 @@ - BINMODE= 4555 - CLEANFILES+= at.1 - -+LDFLAGS+=-Wl,-z,now -+ - at.1: at.man - @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ - sed -e \ -diff -ur usr.bin.orig/chpass/Makefile usr.bin.setXid/chpass/Makefile ---- usr.bin.orig/chpass/Makefile Thu Apr 7 20:52:57 2005 -+++ usr.bin.setXid/chpass/Makefile Thu Apr 7 21:22:40 2005 -@@ -15,6 +15,8 @@ - #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE - CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I. - -+LDFLAGS+=-Wl,-z,now -+ - DPADD= ${LIBCRYPT} ${LIBUTIL} - LDADD= -lcrypt -lutil - .if !defined(NO_NIS) -diff -ur usr.bin.orig/fstat/Makefile usr.bin.setXid/fstat/Makefile ---- usr.bin.orig/fstat/Makefile Thu Apr 7 20:52:57 2005 -+++ usr.bin.setXid/fstat/Makefile Thu Apr 7 21:24:35 2005 -@@ -9,4 +9,6 @@ - BINMODE=2555 - WARNS?= 6 - -+LDFLAGS+=-Wl,-z,now -+ - .include <bsd.prog.mk> -diff -ur usr.bin.orig/lock/Makefile usr.bin.setXid/lock/Makefile ---- usr.bin.orig/lock/Makefile Thu Apr 7 20:52:57 2005 -+++ usr.bin.setXid/lock/Makefile Thu Apr 7 21:24:45 2005 -@@ -7,4 +7,6 @@ - DPADD= ${LIBCRYPT} - LDADD= -lcrypt - -+LDFLAGS+=-Wl,-z,now -+ - .include <bsd.prog.mk> -diff -ur usr.bin.orig/login/Makefile usr.bin.setXid/login/Makefile ---- usr.bin.orig/login/Makefile Thu Apr 7 20:52:57 2005 -+++ usr.bin.setXid/login/Makefile Thu Apr 7 21:24:55 2005 -@@ -13,4 +13,6 @@ - INSTALLFLAGS=-fschg - .endif - -+LDFLAGS+=-Wl,-z,now -+ - .include <bsd.prog.mk> -diff -ur usr.bin.orig/netstat/Makefile usr.bin.setXid/netstat/Makefile ---- usr.bin.orig/netstat/Makefile Thu Apr 7 20:52:58 2005 -+++ usr.bin.setXid/netstat/Makefile Thu Apr 7 21:25:08 2005 -@@ -14,4 +14,6 @@ - DPADD= ${LIBKVM} ${LIBIPX} ${LIBNETGRAPH} ${LIBUTIL} - LDADD= -lkvm -lipx -lnetgraph -lutil - -+LDFLAGS+=-Wl,-z,now -+ - .include <bsd.prog.mk> -diff -ur usr.bin.orig/opieinfo/Makefile usr.bin.setXid/opieinfo/Makefile ---- usr.bin.orig/opieinfo/Makefile Thu Apr 7 20:52:58 2005 -+++ usr.bin.setXid/opieinfo/Makefile Thu Apr 7 21:25:20 2005 -@@ -11,6 +11,8 @@ - DPADD= ${LIBOPIE} ${LIBMD} - LDADD= -lopie -lmd - -+LDFLAGS+=-Wl,-z,now -+ - BINOWN= root - BINMODE=4555 - INSTALLFLAGS=-fschg -diff -ur usr.bin.orig/opiepasswd/Makefile usr.bin.setXid/opiepasswd/Makefile ---- usr.bin.orig/opiepasswd/Makefile Thu Apr 7 20:52:58 2005 -+++ usr.bin.setXid/opiepasswd/Makefile Thu Apr 7 21:25:29 2005 -@@ -11,6 +11,8 @@ - DPADD= ${LIBOPIE} ${LIBMD} - LDADD= -lopie -lmd - -+LDFLAGS+=-Wl,-z,now -+ - BINOWN= root - BINMODE=4555 - INSTALLFLAGS=-fschg -diff -ur usr.bin.orig/passwd/Makefile usr.bin.setXid/passwd/Makefile ---- usr.bin.orig/passwd/Makefile Thu Apr 7 20:52:58 2005 -+++ usr.bin.setXid/passwd/Makefile Thu Apr 7 21:25:37 2005 -@@ -10,6 +10,8 @@ - MLINKS = passwd.1 yppasswd.1 - WARNS ?= 4 - -+LDFLAGS+=-Wl,-z,now -+ - beforeinstall: - .for i in passwd yppasswd - [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ ---- usr.bin.orig/su/Makefile Thu Apr 7 20:52:58 2005 -+++ usr.bin.setXid/su/Makefile Thu Apr 7 21:26:00 2005 -@@ -10,4 +10,6 @@ - BINMODE=4555 - INSTALLFLAGS=-fschg - -+LDFLAGS+=-Wl,-z,now -+ - .include <bsd.prog.mk> -diff -ur usr.bin.orig/wall/Makefile usr.bin.setXid/wall/Makefile ---- usr.bin.orig/wall/Makefile Thu Apr 7 20:52:59 2005 -+++ usr.bin.setXid/wall/Makefile Thu Apr 7 21:26:07 2005 -@@ -5,4 +5,6 @@ - BINGRP= tty - BINMODE=2555 - -+LDFLAGS+=-Wl,-z,now -+ - .include <bsd.prog.mk> -diff -ur usr.bin.orig/write/Makefile usr.bin.setXid/write/Makefile ---- usr.bin.orig/write/Makefile Thu Apr 7 20:52:59 2005 -+++ usr.bin.setXid/write/Makefile Thu Apr 7 21:26:13 2005 -@@ -4,4 +4,6 @@ - BINMODE=2555 - BINGRP= tty - -+LDFLAGS+=-Wl,-z,now -+ - .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron b/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron deleted file mode 100644 index 323f455..0000000 --- a/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh - -if [ -x /usr/libexec/locate.updatedb ] -then - echo /usr/libexec/locate.updatedb | nice -n 5 su -fm nobody -fi diff --git a/sys-freebsd/freebsd-ubin/files/login.1.pamd b/sys-freebsd/freebsd-ubin/files/login.1.pamd deleted file mode 100644 index 2c09584..0000000 --- a/sys-freebsd/freebsd-ubin/files/login.1.pamd +++ /dev/null @@ -1,4 +0,0 @@ -auth include system-local-login -account include system-local-login -session include system-local-login -password include system-local-login diff --git a/sys-freebsd/freebsd-ubin/files/login.pamd b/sys-freebsd/freebsd-ubin/files/login.pamd deleted file mode 100644 index db1c74f..0000000 --- a/sys-freebsd/freebsd-ubin/files/login.pamd +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id$ -# -# PAM configuration for the "login" service -# - -# auth -auth required pam_nologin.so no_warn -auth sufficient pam_self.so no_warn -auth include system - -# account -account requisite pam_securetty.so -account include system - -# session -session include system - -# password -password include system diff --git a/sys-freebsd/freebsd-ubin/files/passwd.1.pamd b/sys-freebsd/freebsd-ubin/files/passwd.1.pamd deleted file mode 100644 index bab2eea..0000000 --- a/sys-freebsd/freebsd-ubin/files/passwd.1.pamd +++ /dev/null @@ -1,9 +0,0 @@ -# -# $Id$ -# -# PAM configuration for the "passwd" service -# - -# passwd(1) does not use the auth, account or session services. - -password include system-auth diff --git a/sys-freebsd/freebsd-ubin/files/passwd.pamd b/sys-freebsd/freebsd-ubin/files/passwd.pamd deleted file mode 100644 index 44b7e71..0000000 --- a/sys-freebsd/freebsd-ubin/files/passwd.pamd +++ /dev/null @@ -1,11 +0,0 @@ -# -# $Id$ -# -# PAM configuration for the "passwd" service -# - -# passwd(1) does not use the auth, account or session services. - -# password -#password requisite pam_passwdqc.so enforce=users -password required pam_unix.so no_warn try_first_pass nullok diff --git a/sys-freebsd/freebsd-ubin/files/su.1.pamd b/sys-freebsd/freebsd-ubin/files/su.1.pamd deleted file mode 100644 index 72e2bd1..0000000 --- a/sys-freebsd/freebsd-ubin/files/su.1.pamd +++ /dev/null @@ -1,17 +0,0 @@ -# -# $Id$ -# -# PAM configuration for the "su" service -# - -# auth -auth sufficient pam_rootok.so no_warn -auth sufficient pam_self.so no_warn -auth requisite pam_group.so no_warn group=wheel root_only fail_safe -auth include system-auth - -# account -account include system-auth - -# session -session required pam_permit.so diff --git a/sys-freebsd/freebsd-ubin/files/su.pamd b/sys-freebsd/freebsd-ubin/files/su.pamd deleted file mode 100644 index 57019c5..0000000 --- a/sys-freebsd/freebsd-ubin/files/su.pamd +++ /dev/null @@ -1,17 +0,0 @@ -# -# $Id$ -# -# PAM configuration for the "su" service -# - -# auth -auth sufficient pam_rootok.so no_warn -auth sufficient pam_self.so no_warn -auth requisite pam_group.so no_warn group=wheel root_only fail_safe -auth include system - -# account -account include system - -# session -session required pam_permit.so diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild deleted file mode 100644 index 537aad0..0000000 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 )" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-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-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}-9.0-fixmakefiles.patch" - "${FILESDIR}/${PN}-11.0-setXid.patch" - "${FILESDIR}/${PN}-lint-stdarg.patch" - "${FILESDIR}/${PN}-9.1-bsdar.patch" - "${FILESDIR}/${PN}-9.1-minigzip.patch" - "${FILESDIR}/${PN}-10.0-dtc-gcc46.patch" - "${FILESDIR}/${PN}-10.2-talk-workaround.patch" - "${FILESDIR}/${PN}-10.2-bsdxml.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 - 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 man - 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 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 - 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" - - # 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() { - # Preparing to build addr2line, elfcopy, m4 - for dir in libelftc libpe libopenbsd ; do - cd "${WORKDIR}/lib/${dir}" || die - freebsd_src_compile -j1 - done - - local 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 || die - - 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 - 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 - fi -} diff --git a/sys-freebsd/freebsd-ubin/metadata.xml b/sys-freebsd/freebsd-ubin/metadata.xml deleted file mode 100644 index a7fa78a..0000000 --- a/sys-freebsd/freebsd-ubin/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> - </maintainer> - <use> - <flag name="audit"> - Build auditing tools. - </flag> - <flag name="netware"> - Build libraries and tools to work with NetWare protocols (IPX - and NCP). - </flag> - <flag name="ar"> - Build FreeBSD's ar and ranlib replacements based on libarchive. The - toolchain will still use binutils' version but you can play with it. - They have been renamed to freebsd-ar and freebsd-ranlib not to collide - with binutils. - </flag> - <flag name="zfs">Enable ZFS support (for fstat actually).</flag> - </use> -</pkgmetadata> diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest deleted file mode 100644 index 0236b14..0000000 --- a/sys-freebsd/freebsd-usbin/Manifest +++ /dev/null @@ -1,33 +0,0 @@ -AUX freebsd-usbin-10.0-bsdxml2expat.patch 835 SHA256 765ab05ef6d5d828d2cc54e78e0676dc2b6caac7193788524a7dd4cc5a983c8c SHA512 23bcfdc1657c1dd7fdb59c3717af5a5560c8f3c10d498aaae539e1779838a0a33cf247ae806c72c09d298fc9be3c02b5c3d1d9f1a879493c0e5d1aeb4dbf3509 WHIRLPOOL 2342438a26ef915f29d487aecedfd0920baa6c2130b3efd6fbd64d7a2bf81f74444e7409ceaceb29d4c5ad210af4cee0a4d98b0935131ff577a6103023f83f44 -AUX freebsd-usbin-10.3-bsdxml2expat.patch 406 SHA256 ddf45cbb311c6b1ba49617db48c54eac1f4d5279a40f038e64aef52732a04049 SHA512 91a2323b5007e2381fb58d608dd19dcc010afb398a4b2285b53cae4157268fb6aa232323280cec72cccdb2010610f73e048b06bae76418b7db8cd1f34b7ad8dd WHIRLPOOL fad08c17acc523e240a6ef9c0fbf79e12bd048d9bf4e688cad58ebd5f5b7ec69a39b8786e67f73c5baee4d606abae48a204b94a5b7753e25bc7d137e614a890b -AUX freebsd-usbin-11.0-workaround.patch 374 SHA256 ecba0a19f110d07e76f1750441a62e22cfa00104bd9bae4cd3764fc07c9e9c6c SHA512 c9e8b493d99581dd7beac48def291843e31649a2962f720ed06ef095a128b039e8308662cfbbfcbecfbd0265132bb7a4df9d895ffe69aac09c129389ba5be518 WHIRLPOOL 44955062b41a72cc5671ca6b3911a0722860dae904ba9d0996d1c424b597ecedcbd8af053bfe017e1428b5ed857ef2be05d1836eafb6642a2e4747b4692cbdb5 -AUX freebsd-usbin-7.0-nowrap.patch 1185 SHA256 a3c35cd997a22f4d212c3fe08d20fa7552b6de64527fee0166249ae76a3e49c8 SHA512 4374954aecddaf51acc8121b58ea28a4b411652c1deaea05cb600dac3d27a7e42bae1b2ad6f90ffc503d40f296ce627106545c8ad0f2dd23231d454e71f83fee WHIRLPOOL 7049020fc9383c374ca33b4b4ad5d8eb8b9f014922362fe67be1423da649c6ae2afbfeb6e8e0a13e5f77cc4b8f214b8e60d1ddb848a96213e65a2a77220db66b -AUX freebsd-usbin-8.2-newsyslog.patch 400 SHA256 f13d5ea43531f42ff0cb42438b58875afce4046c650a7459fd2eac62dc11696e SHA512 f013a8911aaf1da759fae307276c482480d3938183f583d1c78c2711bf81e8cb9ebefa004112d4eb1fe7d9620527a49326e49186f0dfd9a9af9e0ff29d4aad56 WHIRLPOOL eb011fcc84e20873e8e86a0bbd101e4651c087b2f22716599bccd55b7ba28607520a450a2c98461ea7d78b2b52f233e6bfc4bf44cb11ec002ad7db631273ca24 -AUX freebsd-usbin-9.0-libarchive.patch 409 SHA256 105ce2534fdcf17bdbda21154a4679aba76e75b541ae06f9783333f8b7acd30a SHA512 f30851631a7a181b12f7e749d0bf8d3ce1a93d9cfa74e0ae0b8a96d7278192bb5569f100d9c9bc423a7dc9d37dcbebdc69ac993ff11c6aa19f49eaf83bd3b4f1 WHIRLPOOL c1a5a32cb070ebbd94f4a6b30ca79d0b75525c4a04e52b565e60e94aa22b533e26d038f3757d2a4aee4e2893ed6a729482aee6a933fd1f34193bcff1ee05b3b6 -AUX freebsd-usbin-9.0-newsyslog.patch 507 SHA256 d5f910655c66a3e766f227c25837347d11d796655d71480c3cf3526f4136d557 SHA512 5423fc577035c2a272d4cb4305c5ee5e1e910a68af44595524665f7b867bd0a48bab0349b2fa13eabc385b2ec29c8f578d018cd8196f3ad20a13a68d36a335ae WHIRLPOOL 0551fde1581f3642535d1e34f2b111ed1404fc153ed14f4d7d4c75bc96715ed1eb3f218fc55fb2bb038616a929e106b8d8355f2de95447f7a93c09c515cdd511 -AUX freebsd-usbin-9.1-bsdxml2expat.patch 431 SHA256 43f0ebe5406f6065d7dad45b4270f0645e7dc1d6db1bcdf1443e32aede9d7af6 SHA512 ef1e9be49796b50e8dd818ac1a6f363eaa54d767ac9477e3df09354df78dff887a31a3c793288f321b7976bd98de79821742550ee8e7f9fcf3b1a42cccbc68b0 WHIRLPOOL 17c14ef758cede73619f774710afd38862609da6302e0d2378e7b5124d38dd60c427218f140f67e1ea255a24f7eb6d900df1ad5835d23a135cef7cb5cc94bc73 -AUX freebsd-usbin-9.1-kldxref.patch 756 SHA256 b9021def1c9e1a6ffcd66cc86e4086e75b3630e9d6ce40bd8c29b961bd0c570b SHA512 8d1e0c80a6698729bdf40e60ac0373ed76e4c394f7fc93e9ae78e9e8bb06d63c99d04dbb942e90cc9240fc429be7048c4fee22c3ce593b49be90c9df3fc549ec WHIRLPOOL ec37a7350499f5ad5225f3b41151d2b8b060e210cd441cac56e2d87471b08ef0e8cdcca6daad299988808b9c1083afcbbe4c281885a003bca95177b3de0e6c86 -AUX freebsd-usbin-adduser.patch 428 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af SHA512 51720e3db9bf3728afc0dc370a469746cb1bf61623c44a20c58e27d647e5a5d0360145b1d174382176d803f2558afa2f2a29eca6c85c638529d0e11e2859c0c3 WHIRLPOOL 15a5a7e2c123a3103546134a27baad0a459758ec66bb0a7011684f367c7dd46435688f837d9d5fb5a9a51e95a58d6ce0e672c57a9dc2ef16a1e094a4b6e78931 -AUX iscsid.initd 429 SHA256 b6b387111050dbca190ac0bd338de3c32ed8c1fd65121b0811fe01632431282e SHA512 49a90719aa0279e19899a2107113cad0784a2cf3b57a0c24ad08549fa4b44dcb1aceecd71027e363b8d2cbbe1b590480ef7806cb05d8b00c1830c2d77b8a8540 WHIRLPOOL ff71e62ac3ebaf749815856674702ac321c67f661609bd11bf702a2c62a800bed71f845942845fc508235d25f9b13c2682d84ff763d27806ecae55f4069dc97f -AUX mountd.patch 542 SHA256 da895dabdb52c63d876c13605aa1ef446f8babb47100932b5b451155181a759f SHA512 c7a77ea1df0bd9c0a75b899a306aeb7fbee5ed4fb67a230d6348edbd238dc176267f19cd345f51b26ceef11b4657821ab752b333da5b03fc973bce3253e036e5 WHIRLPOOL a57f31ff146950d5aba5998dbd163f98321373dde5f731584c81bb841a8594422bb2ec44c63bd9e2742dbed3a03e200497948777a12b471d6dd7af9998578ad3 -AUX moused.confd 713 SHA256 c85c4c59e7e23a3ac98c3a4beebbe452506bcb6614315810c0f79c7b2f335715 SHA512 247bd942e83a211f953b0bfae8f4cc7db517a1b53231557f652526b5440a173ec4e8b7e3207ad7c0765fa949c91c170edb4771329fa2d9921f60595cbdec0dd7 WHIRLPOOL 797dbaa3d90d1a3e62a0c4492207e0ef90612a44a972b590c42040d9aeb554d41ced104a61ea5e9f44d948c8bc88b144deb202af588eb06c7b59e5f5f0e1e9a9 -AUX moused.initd 1670 SHA256 b5bb9d804e34303d1f29125db6be78a421af0fecc73190340b077312dc72cbc2 SHA512 e353ee859ec3657fb9357c8a72de34f36436b1b323e39652fec37612b11a56f59dbe3616d35edd30d50478b083ed2f14b144f14390c16a0a64d5916b4c73dc6e WHIRLPOOL 742bac13190f7a7a77289808560b6e7a04aecd5d2cb593857f997e519e1cdcccf20bc5f64a7514d639a9a4055fa896da30dfda147126f6fae12b00926e539a34 -AUX nfs.confd 303 SHA256 5714e0cbcc45a077ab2348ee4fea521ce9f739927094dccb4b91817f1edaccb8 SHA512 4224c7f525e39b105b8d80caa7db0f3e0b07d6c521970b2aacfd707ef524262cbdb9ed8aa5151022d571a759151dd25a280fc765a38e67864b0c446ee9fd6b5a WHIRLPOOL 70bfff7d5288c692ed767c1e09d48db6c8546d90955a1957de87fd67cb42ed5b1efa0101cf2eea71e4702e1170eadeed9cc45937b742e51cee42c9edd00a1ee9 -AUX nfs.initd 1424 SHA256 060a57ac9cb68d580405dcc7bc35b95aab3b97a0dea1f7c13a58dfa1fabb24a2 SHA512 1d85de665dfea1845189f2ad2e7205ab6185ce228f7140ccaafa22c84f8b9f0b4b4c5a26bd53895f1f2c4639bbeb8d5b76106d2e64851eb62f229028dc61cb5c WHIRLPOOL 1c5fee08af5cfd96153b98500f01c90123fcbc2c8e109d6b6e9c63bb5e4194eb004d03f80d9bf3f943050b37f3f9d84a72240784026024f679a174ca74c2a799 -AUX nfsmount.initd 1481 SHA256 68f3dbd4c915e98440d601adfbf4d858fdc4d982e87967c0b509a53eda28d569 SHA512 7f298317a2aca491b539fbb52758702bae0f38f12925aa5fbd4a2ef11d39bb0060533deee845a68084a322cab24640ab76b2512a0597b7507ffe8aae23aba6fc WHIRLPOOL b051b733ee3c14933cf78d261a409d33879c32e48d197e2c101d7f5fd89d36b914b67c7b04cb9d2281a707a45a15621c799abfb743062a0e23530ab3eb682215 -AUX nfsuserd.confd 153 SHA256 9575adaba684100f78ff1d60ca5e7b6f5be6fcda9e2d8fac2a1ab4aaf8944a59 SHA512 47bf885dc80a61c9f8aab5890a360063fc2e846ce8abefb84e9d504f62c455cd759af753c7a5ab8cdd624842200f6b0ec7d177ddfdc1e7564460764eb4d4d073 WHIRLPOOL 4e4aabc4c936c067d99133620a117d9c1fc539e23acfe9b15b4a7ebb57e3cb55b4ffab34b2af93fcfdf7fe81e4372e3afa38994ee999093aa1ec0a80c3c12175 -AUX nfsuserd.initd 447 SHA256 34bf516e11f3b948f9df6d9833dbd18707c86238f3ee13bcf114587ebb8bf336 SHA512 e18cbd9efa3bf9e7283a9633bebfadfa9160b6eb668f48723bb9f1b37c5476b75b71b505046025a185a74d409ce09fd305257cdcb6e953c795ed1397fbe76323 WHIRLPOOL e77f07aaa3d9fdef566f206248c266a9d6f3e9aee3f5ca9e2c195ce9c35d4953d7152d47f95e6a3a5738b79afc3982140837837bb66d8b9e42c8e960d5d08d7a -AUX powerd.confd 254 SHA256 39dc617f9aafc732762302120aa686ef8694591b0a2ec0cca79e7dc46ee9cfbc SHA512 c3e449561450e3579f93f5bda1c93f01a68ede2e9b6da56a7cb2f4eecf1313993fb4a384a2e65a1fd04e78b80732fab31349ee309368e28034f9467296cd1e0d WHIRLPOOL c1b07fd7ebf4231b9986850fdb41704b434c37f2b5f4b2d3517217f4195f38449bc0724d8fac736801f10cc67feabc6fa49d9ee86e793f05178f9328c9ae6acb -AUX powerd.initd 661 SHA256 3690c8205247fa6f7a3dc17bb28ee2e8e382b266fb4dc1b59b36ff6742589840 SHA512 61be59ec99c82799bc10457e5ee3b4142d6372ecb7b49468b6acc81063a03e19a317d768f5c515e4ce1bdb296f2da59c895a065ea8d9572a31daa8886dedd052 WHIRLPOOL f8b08efc68dc853ff72ec23ba9b4bc4efd4aec89fd5180d73d7e4b6dd342550db6a1d9c2fa6b88852707f36a7fb9abe3496c7d7d4787c650b7177689eb5f65a4 -AUX pw.conf 179 SHA256 0aa508e3911a80ccd1dc5005ec6f2e86e7c4fc5c99ca127f4d7e479d133c69ef SHA512 042b7c7805d891f453da58f607edb3174fddc8443d6995ebe833185ab313328c131bae87dbbc9db95bf69a9ee71548d350191b34a8b2bf41a56416aff03c3891 WHIRLPOOL 4edd4ba1aa0c2255fbd38dc9120a673d8e0b5a8fea50d95aa13c08df448c3fc584adfe8330cfce5bb5b06385d5855c2fed9beb210f8fb5f8e4d695bdedb6909c -AUX rarpd.confd 155 SHA256 0c0f02cddf4ddfb2c2e01276f93f2d3470a75dc83e396209d6cbeff52e9b424b SHA512 95fb1b2ecc60f5cc434d949957dbd49a02afa7eee860e5b13fcc110c705560ea519f491e530de8fa9cbeb2577b9f0835ac98b762f6fa1c5cdb8292322821566d WHIRLPOOL 4641c548e2a5f0300138038032c472ffc12140ef7b4f1010166386a75fa1fb637ab8a735aeaa863b341b724970b0a45ba8ec0207d023846bfa09099b0fb98bd8 -AUX rarpd.initd 754 SHA256 0c58add3ba88bd2a56cdaed7455aef5f33ed1cf89d401fa820d29893b21a035c SHA512 bccc40e34c19f885a274593c237e59c5c21e773ac91c5dc40d7344ef5e1d032b386976bf825f55598d8aa2b7e631b811fe352763932f075c340e5ca0a66dc781 WHIRLPOOL 214459c0d91f3bcf1afaec258c4ec27c583a174330935440ea94550e68f8415b59bf73545291136e63e76b0b1b386ee3f513ad67935fd7f78a45406eb3ae83be -AUX rpc.lockd.initd 530 SHA256 56ddc340ce6d65292d17962fd475ded591fd80aeec312d9d2423dbae77bf170e SHA512 930c42b63a230f6f64ecdaec95f61e43b463abe109f926c298507fa3c6b090edba1f8dcc95046a0a5b8c0378d336fbf728f9db77b8b0822d0e2b36713fefc9e5 WHIRLPOOL dc5eb15dc4485cd2e24f69114521ea7b5e54e8ba3f48292137bc5ec91b9046255d7af9c3fec6a8597935b2d540933265de88e3cd45d9ea7660ea3c9c27a9a292 -AUX rpc.statd.initd 520 SHA256 5f59ed36bc583821fb91431f6a3dce0094cfa8a90b2a93d76678d415f589f3ce SHA512 62c3bef69ca0619e3492050379a4c8b490305ab0ee7620143c31be7af414b1f1cbd79feaee345bd5e6bfdfa6c93bcce3cc9ff61a2f63e235a3807920e260cb7a WHIRLPOOL 737d7cad221b443929cd1f5cd7ec2b1a7d4dc3c091be5b871ca6b04bd57bccc7de49d4c7942baaa1b146c5a05034451d1977f6619fc1631eff582323bf7c0930 -AUX rpcbind.initd 602 SHA256 dc1840f9456cf465770146f65c0969ec7da4b9ef3458f54d51c86c8a0f2cb15c SHA512 9ea0d631377275c763194875610acc6afb720068f8c57ec763cb99f7980f44572996b220659cad37a95c60e3847f17342da4282d2dbc4158d5ba7cbe3d56de86 WHIRLPOOL 4b888224d0ed5193f8574a43bb4622846e3fd4461178944e936e5a0e5361acd25a758ef41bb2fe880aaf417849f116931c0ee2426efd1edc62970f7178bdf7e9 -AUX syscons.confd 348 SHA256 8d963ed1d6b63eed6b9f8bc1492c1e589458051e99f601e1ee0a8131890b0e70 SHA512 3dd50c0f223a93c0b0544fc9e85624fa78e045d2b6846242f431ea1ce4f121a33c1f3a0a2ef0763f45230dac0033d04c0d397e268f633d809e2466c269c22993 WHIRLPOOL a1ddfccb0aeb448e8d5086f9ba0554c0ff9fdd52003bf98bc2a1efbc7e2d835a79ea52886ac58e3818f9b5bc1d705658d2c8c1f05bad4bd7e5ef916ffe542451 -AUX syscons.initd 1599 SHA256 e3637bc00a18ef3377c64123926a9079c57b8d113a338ac8306f4f1f7c585127 SHA512 5f4fb657f34584ebfd8f967724b840722f2efb918850fe41a9b734bb81f6c1ab2e9173c38a98c99668795cbc80976f06c37f44f9319bc71bb329ab28e9ab4a83 WHIRLPOOL ec9ad9d2069656dc4011fc237e3ac80149a2db0cc1345212a353991bf94c76f63396a26015508e722c23530c860258a1035cc4037e225c88179febd2e2e14f18 -AUX syslogd.initd 457 SHA256 7e75bdcbc173c124d1991f8cab9cef86815e1685a2ffcf2fa6b8087216080443 SHA512 202402ab88c27ffce9dca28618435f4b7fdb54c37a41819c436d8d53f3b92c7063f3cb7d93f617007a2999f07e3a0cea55858b18f920da889d84fd526cad1c6b WHIRLPOOL da5646797d6ef2cba65ebf7a53b156d4c534ffdcd2938aba5d61187e6f87980728dbbc03731df2a3b2ea8350aaa93b9769f7d7324932315392005c42e71aa91c -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-usbin-11.0.ebuild 5423 SHA256 3052b08691e420ead531ec965826565921bcd7e1307ec712cc7697a935793e28 SHA512 732dd94b27ddd386abb900c14d55578051a5b26f9c7a6f263d87a8639d3c821e5a742e1b42d254b3c113abf0466b3d51a6056f7e248536d97bdfb661cd8c30c6 WHIRLPOOL 18a887dac4b7c487adbff5a88c9d582f720e63f68448a8a10fcdeb2731d1b61e032afcc908724bc31bddc0064357ebdcfe8d2461dd0bf7a2578187af296970d0 -MISC metadata.xml 599 SHA256 3f2851ed1214525bc9fd9887db068c00324b466bc9f54342517f3101d34f2659 SHA512 afe1f9e8ccacac89bcd308b6476bba009035542f86d71f70f27df029ff20dda7ff7ff8c9510e6939d502a31750c6bf69de608440fb61b1d590d018446aa14f99 WHIRLPOOL 3514ef434513a233cd7e525442c9a4de763deb680c2d2a3e380a5d69f2f31e397a97c5e0d4512045c957c650777e8b66a803b0a6c008cf1e79f0c87d597f7ae5 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch deleted file mode 100644 index a84f96d..0000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch +++ /dev/null @@ -1,24 +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 -Nur work.orig/usr.sbin/ctld/kernel.c work/usr.sbin/ctld/kernel.c ---- work.orig/usr.sbin/ctld/kernel.c 2013-09-20 21:55:45.000000000 +0900 -+++ work/usr.sbin/ctld/kernel.c 2013-09-20 22:01:17.000000000 +0900 -@@ -45,7 +45,7 @@ - #include <sys/sbuf.h> - #include <sys/capability.h> - #include <assert.h> --#include <bsdxml.h> -+#include <expat.h> - #include <ctype.h> - #include <errno.h> - #include <fcntl.h> diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch deleted file mode 100644 index 207b6ab..0000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c -index 88c648e..edf9c8b 100644 ---- a/usr.sbin/camdd/camdd.c -+++ b/usr.sbin/camdd/camdd.c -@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD: stable/10/usr.sbin/camdd/camdd.c 293409 2016-01-08 02:56:21Z - #include <libutil.h> - #include <pthread.h> - #include <assert.h> --#include <bsdxml.h> -+#include <expat.h> - - #include <cam/cam.h> - #include <cam/cam_debug.h> diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch deleted file mode 100644 index 04ba75a..0000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile -index 033002c..d198f10 100644 ---- a/usr.sbin/nmtree/Makefile -+++ b/usr.sbin/nmtree/Makefile -@@ -5,7 +5,7 @@ - .PATH: ${.CURDIR}/../../contrib/mtree - - PROG= mtree --MAN= mtree.5 mtree.8 -+MAN= mtree.8 - SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \ - only.c spec.c specspec.c verify.c - 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 9b11104..0000000 --- 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 a098391..0000000 --- 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/freebsd-usbin-9.0-libarchive.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch deleted file mode 100644 index bfe4794..0000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- usr.sbin/bsdinstall/distextract/distextract.c.old 2011-11-02 20:28:08.000000000 +0000 -+++ usr.sbin/bsdinstall/distextract/distextract.c 2011-11-02 20:28:57.000000000 +0000 -@@ -32,6 +32,9 @@ - #include <limits.h> - #include <archive.h> - #include <dialog.h> -+#ifndef archive_read_free -+#define archive_read_free(x) archive_read_finish(x) -+#endif - - static int extract_files(int nfiles, const char **files); - diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch deleted file mode 100644 index 1d83865..0000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr usr.sbin/newsyslog.old/pathnames.h usr.sbin/newsyslog/pathnames.h ---- usr.sbin/newsyslog.old/pathnames.h 2011-11-02 20:12:37.000000000 +0000 -+++ usr.sbin/newsyslog/pathnames.h 2011-11-02 20:12:50.000000000 +0000 -@@ -24,6 +24,6 @@ - - #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" - #define _PATH_XZ "/usr/bin/xz" 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 bddc0c7..0000000 --- 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 95bd665..0000000 --- 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/files/freebsd-usbin-adduser.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch deleted file mode 100644 index 39177b4..0000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- usr.sbin/adduser/adduser.sh.old 2006-10-01 13:41:16 +0000 -+++ usr.sbin/adduser/adduser.sh 2006-10-01 13:41:38 +0000 -@@ -809,7 +809,7 @@ - NOHOME="/nonexistent" - NOLOGIN="nologin" - NOLOGIN_PATH="/usr/sbin/nologin" --GREPCMD="/usr/bin/grep" -+GREPCMD="/bin/grep" - DATECMD="/bin/date" - - # Set default values -@@ -823,7 +823,7 @@ - uhome= - upass= - ushell= --udotdir=/usr/share/skel -+udotdir=/etc/skel - ugroups= - uexpire= - upwexpire= diff --git a/sys-freebsd/freebsd-usbin/files/iscsid.initd b/sys-freebsd/freebsd-usbin/files/iscsid.initd deleted file mode 100644 index f16d00e..0000000 --- a/sys-freebsd/freebsd-usbin/files/iscsid.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting iscsid" - start-stop-daemon --start --quiet --exec \ - /usr/sbin/iscsid -- $iscsidopts - eend $? "Error starting iscsid" -} - -stop() { - ebegin "Stopping iscsid" - start-stop-daemon --stop --quiet --exec /usr/sbin/iscsid - eend $? "Error stopping iscsid" -} diff --git a/sys-freebsd/freebsd-usbin/files/mountd.patch b/sys-freebsd/freebsd-usbin/files/mountd.patch deleted file mode 100644 index 3cb9f03..0000000 --- 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/files/moused.confd b/sys-freebsd/freebsd-usbin/files/moused.confd deleted file mode 100644 index 4d64933..0000000 --- a/sys-freebsd/freebsd-usbin/files/moused.confd +++ /dev/null @@ -1,20 +0,0 @@ -# $Id$ - -# See the moused man page for available settings. - -# Set to your mouse device psm[0-9] for PS/2 ports, ums[0-9] for USB ports -# Leave blank to try to autodetect it -MOUSED_DEVICE="" - -# Any additional flags requires -MOUSED_FLAGS="" - -# If 0xd0-0xd3 default range is occupied in your language code table, specify -# alternative range start like MOUSECHAR_START="3", see vidcontrol(1) -MOUSECHAR_START="" - -# You can also multiplex the init script for each device like so -# ln -s moused /etc/init.d/moused.ums0 -# This enables you to have a config file per mouse (forces MOUSED_DEVICE -# to ums0 in this case) and control each mouse. -# devd can also start and stop these mice, which laptop users will find handy. diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd b/sys-freebsd/freebsd-usbin/files/moused.initd deleted file mode 100644 index d7ca8e0..0000000 --- a/sys-freebsd/freebsd-usbin/files/moused.initd +++ /dev/null @@ -1,66 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -MOUSED_NAME=${SVCNAME##*.} -if [ -n "${MOUSED_NAME}" ] && [ ${MOUSED_NAME} != "moused" ] ; then - MOUSED_DEVICE=/dev/"${MOUSED_NAME}" - MOUSED_PIDFILE=/var/run/moused-"${MOUSED_NAME}".pid -else - MOUSED_NAME= - MOUSED_PIDFILE=/var/run/moused.pid -fi - -depend() { - need localmount -} - -start() { - ebegin "Starting the Console Mouse Daemon" "${MOUSED_NAME}" - - if [ -z ${MOUSED_DEVICE} ] ; then - for x in /dev/psm[0-9]* /dev/ums[0-9]* ; do - if [ -e "${x}" ] && \ - [ ! -e /var/run/moused-$(basename "${x}").pid ] ; then - MOUSED_DEVICE=${x} - eindent - einfo "Using mouse on ${MOUSED_DEVICE}" - eoutdent - break - fi - done - fi - - if [ -z "${MOUSED_DEVICE}" ] ; then - eend 1 "No device specified in" "/etc/conf.d/${SVCNAME}" \ - "and no mouse detected" - return 1 - fi - - local opts="${MOUSED_FLAGS} -p ${MOUSED_DEVICE}" - start-stop-daemon --start --quiet --exec /usr/sbin/moused \ - --pidfile "${MOUSED_PIDFILE}" \ - -- ${opts} -I "${MOUSED_PIDFILE}" - local retval=$? - - [ -n "${MOUSE_CHAR_START}" ] && MOUSE_CHAR_START="-M ${MOUSE_CHAR_START}" - local ttyv= - for ttyv in /dev/ttyv* ; do - vidcontrol < "${ttyv}" ${MOUSE_CHAR_START} -m on || retval=1 - done - - eend ${retval} "Failed to start moused" -} - -stop() { - ebegin "Stopping the Console Mouse Daemon" "${MOUSED_NAME}" - # Don't specify the binary as >1 instance of moused may be running - # which is perfectly valid as we can be multiplexed. - start-stop-daemon --stop --exec /usr/sbin/moused \ - --pidfile "${MOUSED_PIDFILE}" - eend $? "Failed to stop moused" -} - -# vim: set ts=4 : - diff --git a/sys-freebsd/freebsd-usbin/files/nfs.confd b/sys-freebsd/freebsd-usbin/files/nfs.confd deleted file mode 100644 index 844252f..0000000 --- a/sys-freebsd/freebsd-usbin/files/nfs.confd +++ /dev/null @@ -1,10 +0,0 @@ -# Config file for /etc/init.d/nfs -# Options for nfsd (see man nfsd) -# Example: 8 nfsd servers started: -#nfsdopts="-n 8" - -# Options for mountd (see man mountd) -# Example: allow non-root users to mount shares: -#mountdopts="-n" -# Specify t he exports file, this is the default: -#exportsfile="/etc/exports" diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd deleted file mode 100644 index 17974ca..0000000 --- a/sys-freebsd/freebsd-usbin/files/nfs.initd +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -#--------------------------------------------------------------------------- -# This script starts/stops nfsd and mountd -# Daemons rpc.rquotad, rpc.rstatd, rpc.rusersd, rpc.rwalld and rpc.sprayd -# should be started from inetd on FreeBSD. -#--------------------------------------------------------------------------- - -extra_started_commands="reload" - -# The binary locations -nfsd=/usr/sbin/nfsd -mountd=/usr/sbin/mountd - -depend() { - use ypbind net rpc.lockd - need rpcbind - after quota -} - -start() { - ebegin "Starting NFS daemon" - start-stop-daemon --start --quiet --exec \ - $nfsd -- ${nfsdopts} - eend $? "Error starting NFS daemon" - - # Start mountd - ebegin "Starting NFS mountd" - start-stop-daemon --start --quiet --exec \ - $mountd -- ${mountdopts} ${exportsfile} - eend $? "Error starting NFS mountd" -} - -stop() { - ebegin "Stopping NFS mountd" - start-stop-daemon --stop --quiet --exec $mountd \ - --pidfile /var/run/mountd.pid - eend $? "Error stopping NFS mountd" - - ebegin "Stopping NFS daemon" - start-stop-daemon --stop --signal USR1 --quiet \ - --name nfsd --user root - eend $? "Error stopping NFS daemon" -} - -reload() { - # Hangup signal to mountd reloads /etc/exports. - ebegin "Reloading /etc/exports" - start-stop-daemon --signal 1 --quiet --exec $mountd \ - --pidfile /var/run/mountd.pid - eend $? -} diff --git a/sys-freebsd/freebsd-usbin/files/nfsmount.initd b/sys-freebsd/freebsd-usbin/files/nfsmount.initd deleted file mode 100644 index 2fb4901..0000000 --- a/sys-freebsd/freebsd-usbin/files/nfsmount.initd +++ /dev/null @@ -1,63 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need net rpcbind - use ypbind -} - -start_statd() { - # Don't start rpc.statd if already started by init.d/nfs - killall -0 rpc.statd 2>/dev/null && return 0 - ebegin "Starting NFS statd" - rpc.statd - eend $? "Error starting NFS statd" -} - -stop_statd() { - # Don't stop rpc.statd if it's in use by init.d/nfs - killall -0 nfsd 2>/dev/null && return 0 - # Make sure it's actually running - killall -0 rpc.statd 2>/dev/null || return 0 - # Okay, all tests passed, stop rpc.statd - ebegin "Stopping NFS statd" - killall rpc.statd - eend $? "Error stopping NFS statd" -} - -start_lockd() { - # Don't start rpc.lockd if already started by init.d/nfs - killall -0 rpc.lockd 2>/dev/null && return 0 - ebegin "Starting NFS lockd" - rpc.lockd - eend $? "Error starting NFS lockd" -} - -stop_lockd() { - # Don't stop rpc.lockd if it's in use by init.d/nfs - killall -0 nfsd 2>/dev/null && return 0 - # Make sure it's actually running - killall -0 rpc.lockd 2>/dev/null || return 0 - # Okay, all tests passed, stop rpc.lockd - ebegin "Stopping NFS lockd" - killall rpc.lockd - eend $? "Error stopping NFS lockd" -} - -start() { - start_statd - start_lockd - ebegin "Mounting NFS filesystems" - mount -a -t nfs - eend $? "Error mounting NFS filesystems" -} - -stop() { - ebegin "Unmounting NFS filesystems" - umount -a -t nfs - eend $? "Error unmounting NFS filesystems" - stop_statd - stop_lockd -} diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd b/sys-freebsd/freebsd-usbin/files/nfsuserd.confd deleted file mode 100644 index f8f3ea1..0000000 --- a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd +++ /dev/null @@ -1,5 +0,0 @@ -# Config file for /etc/init.d/nfsuserd -# Options for nfsuserd (see man nfsuserd) -# Example: set domain example.com: -#nfsuserdopts="-domain example.com" - diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd b/sys-freebsd/freebsd-usbin/files/nfsuserd.initd deleted file mode 100644 index d690074..0000000 --- a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net nfs -} - -start() { - ebegin "Starting nfsuserd" - start-stop-daemon --start --quiet --exec \ - /usr/sbin/nfsuserd -- $nfsuserdopts - eend $? "Error starting nfsuserd" -} - -stop() { - ebegin "Stopping nfsuserd" - start-stop-daemon --stop --quiet --exec /usr/sbin/nfsuserd - eend $? "Error stopping nfsuserd" -} diff --git a/sys-freebsd/freebsd-usbin/files/powerd.confd b/sys-freebsd/freebsd-usbin/files/powerd.confd deleted file mode 100644 index e5db5a1..0000000 --- a/sys-freebsd/freebsd-usbin/files/powerd.confd +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Mode allowed: maximum, minimum, adaptive -# Default unless specified is adaptive - -AC_MODE="maximum" - -#BATTERY_MODE="minimum" - -POWERD_OPTS="" - - diff --git a/sys-freebsd/freebsd-usbin/files/powerd.initd b/sys-freebsd/freebsd-usbin/files/powerd.initd deleted file mode 100644 index ff79f63..0000000 --- a/sys-freebsd/freebsd-usbin/files/powerd.initd +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need localmount -} - -start() { - local args= - [ -n "${BATTERY_MODE}" ] && args="${args} -b ${BATTERY_MODE}" - [ -n "${AC_MODE}" ] && args="${args} -a ${AC_MODE}" - - ebegin "Starting Power Control Daemon" - start-stop-daemon --start --exec /usr/sbin/powerd \ - --pidfile /var/run/powerd.pid \ - -- ${args} ${POWERD_OPTS} - eend $? "Failed to start powerd" -} - -stop() { - ebegin "Stopping Power Control Daemon" - start-stop-daemon --stop --exec /usr/sbin/powerd \ - --pidfile /var/run/powerd.pid - eend $? "Failed to stop powerd" -} diff --git a/sys-freebsd/freebsd-usbin/files/pw.conf b/sys-freebsd/freebsd-usbin/files/pw.conf deleted file mode 100644 index 29a246f..0000000 --- a/sys-freebsd/freebsd-usbin/files/pw.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Change this to Gentoo's Default, instead of FreeBSD's default of -# /usr/share/skel, so that bash and other packages installs the files on the -# right place. -skeleton /etc/skel - diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.confd b/sys-freebsd/freebsd-usbin/files/rarpd.confd deleted file mode 100644 index b56fdd5..0000000 --- a/sys-freebsd/freebsd-usbin/files/rarpd.confd +++ /dev/null @@ -1,7 +0,0 @@ -# $Id$ - -# Configuration file for /etc/init.d/rarpd - -# To start rarpd only for a given interface, set the -# following variable -# RARPD_ONLY_INTERFACE="rl0" diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.initd b/sys-freebsd/freebsd-usbin/files/rarpd.initd deleted file mode 100644 index 3c2a3ff..0000000 --- a/sys-freebsd/freebsd-usbin/files/rarpd.initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - if [ -z "${RARPD_ONLY_INTERFACE}" ]; then - need net - else - need net."${RARPD_ONLY_INTERFACE}" - fi -} - -start() { - local rarpd_opts - - if [ -z "${RARPD_ONLY_INTERFACE}" ]; then - rarpd_opts="${rarpd_opts} -a" - else - rarpd_opts="${rarpd_opts} ${RARPD_ONLY_INTERFACE}" - fi - - ebegin "Starting reverse ARP daemon" - start-stop-daemon --start --background \ - --pidfile /var/run/rarpd.pid --make-pidfile \ - --exec /usr/sbin/rarpd -- -f ${rarpd_opts} - eend $? -} - -stop() { - ebegin "Stopping reverse ARP daemon" - start-stop-daemon --stop --pidfile /var/run/rarpd.pid \ - --exec /usr/sbin/rarpd -- ${rarpd_opts} - eend $? -} diff --git a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd deleted file mode 100644 index dd2fdbe..0000000 --- a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net rpcbind rpc.statd -} - -start() { - ebegin "Starting NFS lockd" - start-stop-daemon --start --quiet --exec \ - /usr/sbin/rpc.lockd -- $rpclockdopts - eend $? "Error starting NFS lockd" -} - -stop() { - ebegin "Stopping NFS lockd" - start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.lockd - eend $? "Error stopping NFS lockd" -} diff --git a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd deleted file mode 100644 index 163af5a..0000000 --- a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net rpcbind -} - -start() { - ebegin "Starting NFS statd" - start-stop-daemon --start --quiet --exec \ - /usr/sbin/rpc.statd -- $rpcstatdopts - eend $? "Error starting NFS statd" -} - -stop() { - ebegin "Stopping NFS statd" - start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.statd - eend $? "Error stopping NFS statd" -} diff --git a/sys-freebsd/freebsd-usbin/files/rpcbind.initd b/sys-freebsd/freebsd-usbin/files/rpcbind.initd deleted file mode 100644 index 1ff98a5..0000000 --- a/sys-freebsd/freebsd-usbin/files/rpcbind.initd +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need localmount - use net - before inetd - before xinetd -} - -start() { - ebegin "Starting rpcbind" - start-stop-daemon --start --exec /usr/sbin/rpcbind - local ret=$? - eend ${ret} - - # without, if a service depending on portmap is started too fast, - # connecting to portmap will fail -- azarah - # doing that for rpcbind, too -- flameeyes - sleep 1 - return ${ret} -} - -stop() { - ebegin "Stopping rpcbind" - start-stop-daemon --stop --exec /usr/sbin/rpcbind - eend $? -} diff --git a/sys-freebsd/freebsd-usbin/files/syscons.confd b/sys-freebsd/freebsd-usbin/files/syscons.confd deleted file mode 100644 index 7ba81ff..0000000 --- a/sys-freebsd/freebsd-usbin/files/syscons.confd +++ /dev/null @@ -1,14 +0,0 @@ -# $Id$ -# Example syscons config file. This is the place to set things like keymap, etc. - -# Set the keymap to "uk.iso". -#KEYMAP="uk.iso" - -# Set the keyboard rate to 250ms delay, and 34 repeat rate. -#KEYRATE="250.34" - -# Change the behaviour of F-unction keys (see kbdcontrol(1)). -#KEYCHANGE="10 'ssh myhost'" - -# See vidcontrol(1) -t -#BLANKTIME="off" diff --git a/sys-freebsd/freebsd-usbin/files/syscons.initd b/sys-freebsd/freebsd-usbin/files/syscons.initd deleted file mode 100644 index 5ab3075..0000000 --- a/sys-freebsd/freebsd-usbin/files/syscons.initd +++ /dev/null @@ -1,78 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need localmount -} - -start() { - ebegin "Configuring system console" - - if [ -n "${MODE}" ] ; then - einfo "Setting mode to ${MODE}" - vidcontrol "${MODE}" - eend $? - fi - - # XXX: This should handle serial consoles. - - # Set the keymap. - if [ -n "${KEYMAP}" ]; then - einfo "Setting keymap to" "${KEYMAP}" - kbdcontrol -l ${KEYMAP} < /dev/console - fi - - if [ -n "${KEYRATE}" ]; then - einfo "Setting keyrate to" "${KEYRATE}" - kbdcontrol -r ${KEYRATE} < /dev/console - fi - - if [ -n "${KEYCHANGE}" ]; then - einfo "Changing function keys..." - eval set -- "${KEYCHANGE}" - eindent - while [ $# -gt 0 ] ; do - veinfo "F$1 -> \`$2'" - kbdcontrol -f "$1" "$2" < /dev/console - shift ; shift - done - eoutdent - fi - - if [ -n "${CURSOR}" ]; then - einfo "Setting cursor" - vidcontrol -c ${CURSOR} - fi - - einfo "Setting custom fonts..." - # Nothing to see here, move along... - for v in FONT8x16 FONT8x14 FONT8x8; do - f=$(eval \$"${v}") - if [ -n "${f}" ]; then - vidcontrol -f ${v##FONT} ${f} - fi - done - - if [ -n "${BLANKTIME}" ]; then - einfo "Setting blanktime" - vidcontrol -t ${BLANKTIME} - fi - - if [ -n "${SAVER}" ]; then - for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do - kldunload ${i} - done - kldstat -v | grep -q _saver || kldload ${SAVER}_saver - fi - - if [ -n "${KBDFLAGS}" ]; then - einfo "Setting keyboard flags for all screens" - for ttyv in /dev/ttyv*; do - kbdcontrol ${KBDFLAGS} <${ttyv} >${ttyv} 2>&1 - done - fi - - eend 0 -} diff --git a/sys-freebsd/freebsd-usbin/files/syslogd.initd b/sys-freebsd/freebsd-usbin/files/syslogd.initd deleted file mode 100644 index 87c40cd..0000000 --- a/sys-freebsd/freebsd-usbin/files/syslogd.initd +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - provide logger - need localmount -} - -start() { - ebegin "Starting System Logger" - start-stop-daemon --start --quiet --exec /usr/sbin/syslogd \ - -- ${SYSLOGD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping System Logger" - start-stop-daemon --stop --quiet --pidfile /var/run/syslog.pid - eend $? -} - - - diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild deleted file mode 100644 index 31ca603..0000000 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2016 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" -LICENSE="BSD zfs? ( CDDL )" - -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/ -" - -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}* - zfs? ( =sys-freebsd/freebsd-cddl-${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 zfs" - -pkg_setup() { - # Add the required source files. - use nis && EXTRACTONLY+="libexec/ " - use build && EXTRACTONLY+="sys/ include/ " - use zfs && EXTRACTONLY+="cddl/ " - - # 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= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - - 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" - "${FILESDIR}/${PN}-10.3-bsdxml2expat.patch" - "${FILESDIR}/${PN}-11.0-workaround.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 freebsd-update service sysrc bsdinstall" - -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 -} - -src_compile() { - # Preparing to build nmtree - cd "${WORKDIR}/lib/libnetbsd" || die - freebsd_src_compile - - cd "${S}" || die - 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. - freebsd_src_install DOCDIR=/usr/share/doc/${PF} - - # 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}" <<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" || die - doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die - - if use bluetooth; then - insinto /etc/bluetooth - doins bluetooth/* || die - rm -f "${D}"/etc/bluetooth/Makefile - fi - - cd "${S}"/ppp || die - insinto /etc/ppp - doins ppp.conf || die - - # Install the periodic stuff (needs probably to be ported in a more - # gentooish way) - cd "${WORKDIR}/etc/periodic" || die - - 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 -} diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml deleted file mode 100644 index 45c930b..0000000 --- a/sys-freebsd/freebsd-usbin/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>bsd@gentoo.org</email> - <name>BSD Project</name> - </maintainer> - <use> - <flag name="floppy">Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).</flag> - <flag name="audit"> - Build auditing tools. - </flag> - <flag name="netware"> - Build libraries and tools to work with NetWare protocols (IPX - and NCP). - </flag> - <flag name='zfs'>Enable ZFS support.</flag> - </use> -</pkgmetadata> |