From f431fc9c8567fcf49e0f150d158e44cda1b20ba9 Mon Sep 17 00:00:00 2001 From: Yuta SATOH Date: Sun, 28 Feb 2016 11:09:40 +0900 Subject: sys-freebsd: bump 10.3_beta3 --- sys-freebsd/boot0/Manifest | 4 +- sys-freebsd/boot0/boot0-10.3_beta2.ebuild | 83 --- sys-freebsd/boot0/boot0-10.3_beta3.ebuild | 83 +++ sys-freebsd/freebsd-bin/Manifest | 4 +- .../freebsd-bin/freebsd-bin-10.3_beta2.ebuild | 42 -- .../freebsd-bin/freebsd-bin-10.3_beta3.ebuild | 42 ++ sys-freebsd/freebsd-cddl/Manifest | 4 +- .../freebsd-cddl/freebsd-cddl-10.3_beta2.ebuild | 75 --- .../freebsd-cddl/freebsd-cddl-10.3_beta3.ebuild | 75 +++ sys-freebsd/freebsd-lib/Manifest | 4 +- .../freebsd-lib/freebsd-lib-10.3_beta2.ebuild | 638 --------------------- .../freebsd-lib/freebsd-lib-10.3_beta3.ebuild | 638 +++++++++++++++++++++ sys-freebsd/freebsd-libexec/Manifest | 4 +- .../freebsd-libexec-10.3_beta2.ebuild | 109 ---- .../freebsd-libexec-10.3_beta3.ebuild | 109 ++++ sys-freebsd/freebsd-mk-defs/Manifest | 4 +- .../freebsd-mk-defs-10.3_beta2.ebuild | 42 -- .../freebsd-mk-defs-10.3_beta3.ebuild | 42 ++ sys-freebsd/freebsd-pam-modules/Manifest | 4 +- .../freebsd-pam-modules-10.3_beta2.ebuild | 48 -- .../freebsd-pam-modules-10.3_beta3.ebuild | 48 ++ sys-freebsd/freebsd-pf/Manifest | 4 +- .../freebsd-pf/freebsd-pf-10.3_beta2.ebuild | 73 --- .../freebsd-pf/freebsd-pf-10.3_beta3.ebuild | 73 +++ sys-freebsd/freebsd-rescue/Manifest | 4 +- .../freebsd-rescue-10.3_beta2.ebuild | 82 --- .../freebsd-rescue-10.3_beta3.ebuild | 82 +++ sys-freebsd/freebsd-sbin/Manifest | 4 +- .../freebsd-sbin/freebsd-sbin-10.3_beta2.ebuild | 101 ---- .../freebsd-sbin/freebsd-sbin-10.3_beta3.ebuild | 101 ++++ sys-freebsd/freebsd-share/Manifest | 4 +- .../freebsd-share/freebsd-share-10.3_beta2.ebuild | 112 ---- .../freebsd-share/freebsd-share-10.3_beta3.ebuild | 112 ++++ sys-freebsd/freebsd-sources/Manifest | 4 +- .../freebsd-sources-10.3_beta2.ebuild | 156 ----- .../freebsd-sources-10.3_beta3.ebuild | 156 +++++ sys-freebsd/freebsd-ubin/Manifest | 4 +- .../freebsd-ubin/freebsd-ubin-10.3_beta2.ebuild | 207 ------- .../freebsd-ubin/freebsd-ubin-10.3_beta3.ebuild | 207 +++++++ sys-freebsd/freebsd-usbin/Manifest | 4 +- .../freebsd-usbin/freebsd-usbin-10.3_beta2.ebuild | 186 ------ .../freebsd-usbin/freebsd-usbin-10.3_beta3.ebuild | 186 ++++++ 42 files changed, 1982 insertions(+), 1982 deletions(-) delete mode 100644 sys-freebsd/boot0/boot0-10.3_beta2.ebuild create mode 100644 sys-freebsd/boot0/boot0-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-bin/freebsd-bin-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-bin/freebsd-bin-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-cddl/freebsd-cddl-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-cddl/freebsd-cddl-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-share/freebsd-share-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-share/freebsd-share-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta3.ebuild delete mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_beta2.ebuild create mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_beta3.ebuild (limited to 'sys-freebsd') diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest index 0132ede..c050dda 100644 --- a/sys-freebsd/boot0/Manifest +++ b/sys-freebsd/boot0/Manifest @@ -6,6 +6,6 @@ AUX boot0-10.3-uefi-support.patch 762 SHA256 5089401accfd622091253ec652b0e86edaf 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-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD boot0-10.3_beta2.ebuild 1888 SHA256 b553cfceb8f08ff8821b386cdde80c01d48cc3ffc249783b91ed5646ab1a8ef4 SHA512 e010a3bc9a461390dbd5e00e081fdf827fd83996f9064558ba0bdd749902a9cdd17f2da9bbe42829a7b2ec18b081944ece831c80c0a22da7e1f2b2ca8111037b WHIRLPOOL 8cf81b00701b410a7f17c735c86c18ffad3576cb8032d90503bd99e3fed0a494c4d0cfe8a0f1ee4f7c1c218da86c9e968995de00d6b1966afd64916a7258cb5c +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD boot0-10.3_beta3.ebuild 1909 SHA256 adb4fe3da8c0301dd5b69b0ecd191612ce375e3e6f84a5a00e9a85e2298d2928 SHA512 19d5d0ce363ce4e332d8fba9c8e6fc1333498961e016bf07ec7259a6f3235bb2b879f3009c959606492f26d30a02fb0d70bc5302b33537277aa26b99647b53af WHIRLPOOL 48abbf2dce67014799dd1b599968a586191ff2d94c6152979c20dfa2c36fd7f43447dd2709d3c88abc5e35efaa92757e36b078fe372f0cdc7974ba48a9fe76f9 MISC metadata.xml 295 SHA256 922f6d4e6468957777d39f1f596b0770e5bae7372d0bf3165e0cff93a838b644 SHA512 5543bbaf2b1d8532edb50462c17ff024af0f34466ed075888742ea0408a3518788684c74738bc2037ebadcace35d5018390dc81f08a2b29a127b2bbce98d73c1 WHIRLPOOL 26819d164c3bdad8c1bea131f5031165f8135b40faf0f2df40bc9b92201eed989975d021309c739f09c753a42ea3ebd31ac203ed32e1ba09df8f8d5b2d27c8d9 diff --git a/sys-freebsd/boot0/boot0-10.3_beta2.ebuild b/sys-freebsd/boot0/boot0-10.3_beta2.ebuild deleted file mode 100644 index 7d49e80..0000000 --- a/sys-freebsd/boot0/boot0-10.3_beta2.ebuild +++ /dev/null @@ -1,83 +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}-10.1-gcc46.patch" - "${FILESDIR}/${PN}-10.3-clang.patch" - "${FILESDIR}/${PN}-10.3-drop-unsupport-cflags.patch" - "${FILESDIR}/${PN}-10.3-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 - - 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${WORKDIR}/lib/libstand" - export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a" - - cd "${S}" - NOFLAGSTRIP="yes" freebsd_src_compile -} - -src_install() { - dodir /boot/defaults - mkinstall FILESDIR=/boot || die "mkinstall failed" - - 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/boot0-10.3_beta3.ebuild b/sys-freebsd/boot0/boot0-10.3_beta3.ebuild new file mode 100644 index 0000000..a6361bf --- /dev/null +++ b/sys-freebsd/boot0/boot0-10.3_beta3.ebuild @@ -0,0 +1,83 @@ +# 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}-10.1-gcc46.patch" + "${FILESDIR}/${PN}-10.3-clang.patch" + "${FILESDIR}/${PN}-10.3-drop-unsupport-cflags.patch" + "${FILESDIR}/${PN}-10.3-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 + + 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${WORKDIR}/lib/libstand" + export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a" + + cd "${S}" || die + NOFLAGSTRIP="yes" freebsd_src_compile +} + +src_install() { + dodir /boot/defaults + mkinstall FILESDIR=/boot || die "mkinstall failed" + + cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die + insinto /boot + newins GENERIC.hints device.hints || die + + echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0 + doenvd "${T}"/50boot0 || die +} diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest index 7c0a533..4db399a 100644 --- a/sys-freebsd/freebsd-bin/Manifest +++ b/sys-freebsd/freebsd-bin/Manifest @@ -1,3 +1,3 @@ -DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-bin-10.3_beta2.ebuild 797 SHA256 3745de8aada88406b72412db6782e468a6fbaaa1d4a50d2401f127c4cac02ac9 SHA512 16a111a780b22c95cf2542ad45ef6c9d1f31636186fced2e7386afb7c65ce050ed3fb2a5c2a4a146f4b074e66d4c90ffa0e3f9c4aab6d07b895066f93acb9f92 WHIRLPOOL 9f98f68860f0a0127597c833143874d088653004f490ab4e09bca0a903b0427f7f1d0cab33cba92f0395ffd9419a84b0e06861c1d53b51e1e1bf3a77759ad1b0 +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-bin-10.3_beta3.ebuild 797 SHA256 3745de8aada88406b72412db6782e468a6fbaaa1d4a50d2401f127c4cac02ac9 SHA512 16a111a780b22c95cf2542ad45ef6c9d1f31636186fced2e7386afb7c65ce050ed3fb2a5c2a4a146f4b074e66d4c90ffa0e3f9c4aab6d07b895066f93acb9f92 WHIRLPOOL 9f98f68860f0a0127597c833143874d088653004f490ab4e09bca0a903b0427f7f1d0cab33cba92f0395ffd9419a84b0e06861c1d53b51e1e1bf3a77759ad1b0 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84 diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.3_beta2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.3_beta2.ebuild deleted file mode 100644 index 745b14c..0000000 --- a/sys-freebsd/freebsd-bin/freebsd-bin-10.3_beta2.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 - sys-apps/ed - !app-misc/realpath - ! /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 use userland_GNU; then - find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; - 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" - export LDADD="-lssp_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}" - CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" - 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" - 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 use userland_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)" || 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 "${D}/$2/libc.so" || die - - # Move the library if needed - if [ "$1" != "$2" ] ; then - mv "${D}/$2/libc.so.7" "${D}/$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 > "${D}/$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 - gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" - else - dodir "$(get_libdir)" - gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" - fi - else - CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/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} NO_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= || die "install_includes() failed" - einfo "includes installed ok." - EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex" - 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}" || die "problem installing $i includes." - einfo "$i includes installed ok." - done -} diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta3.ebuild new file mode 100644 index 0000000..c6b0376 --- /dev/null +++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta3.ebuild @@ -0,0 +1,638 @@ +# 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" + +# 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 ) + 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}-6.1-csu.patch" + "${FILESDIR}/${PN}-10.0-liblink.patch" + "${FILESDIR}/${PN}-10.2-liblink.patch" + "${FILESDIR}/${PN}-10.0-atfcxx.patch" + "${FILESDIR}/${PN}-10.3-libusb.patch" + "${FILESDIR}/${PN}-10.0-libproc-libcxx.patch" + "${FILESDIR}/${PN}-10.2-bsdxml2expat.patch" + "${FILESDIR}/${PN}-9.0-bluetooth.patch" + "${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.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() { + 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}" || die + epatch "${FILESDIR}/${PN}-includes.patch" + epatch "${FILESDIR}/${PN}-8.0-gcc45.patch" + epatch "${FILESDIR}/${PN}-9.0-opieincludes.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}" || die + 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-elf/Makefile" \ + -i "${S}/csu/ia64/Makefile" || die + if use build; then + cd "${WORKDIR}" || die + # 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}"/${PN}-7.1-types.h-fix.patch + epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch + return 0 + fi + + if ! is_crosscompile ; then + if [[ ! -e "${WORKDIR}/sys" ]]; then + ln -s "/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 + + 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}" || die + if use userland_GNU; then + find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; + 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" || die + 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" + export LDADD="-lssp_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}" + CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" + 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" + 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 use userland_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" || die + $(freebsd_get_bmake) CC="$(tc-getCC)" || 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 "${D}/$2/libc.so" || die + + # Move the library if needed + if [ "$1" != "$2" ] ; then + mv "${D}/$2/libc.so.7" "${D}/$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 > "${D}/$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 + gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" + else + dodir "$(get_libdir)" + gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" + fi + else + CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/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" || die + 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} NO_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/" || die + 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" || die + + 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= || die "install_includes() failed" + einfo "includes installed ok." + EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex" + 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}" || die "problem installing $i includes." + einfo "$i includes installed ok." + done +} diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest index 0625ff7..007bc94 100644 --- a/sys-freebsd/freebsd-libexec/Manifest +++ b/sys-freebsd/freebsd-libexec/Manifest @@ -11,6 +11,6 @@ AUX rstatd.xinetd 218 SHA256 7bf526babdd46f03a6ea9ed12b5df16e5c2abc8aeb567214c8e 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-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-libexec-10.3_beta2.ebuild 3284 SHA256 4f31ead40c1c6b24465e6ee43e4160e061df8321455e6cf393a2ca8a8cce0acd SHA512 b5a788836a995d93e37e14d30c4b7bc1b5044be7c28815f120850f9392a922e10f8cd79c79739002d6707a2bb772be522292f9f51a9d08804232c0f4f65c5917 WHIRLPOOL ffee504bc508af78fe9012cec7e192955dd9500d578d4e40b45446ee97f465f2eddba12fb73657a785047d5b3b10cc1240e915164d4e306a69788a706e3d497d +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-libexec-10.3_beta3.ebuild 3291 SHA256 e0851e239479ecdc812197f3f73e6d95db20ee3eb6080a12e91f7afafe4a9134 SHA512 ced93d79465235a9e30d9ddb90fe356a383bf6512ff6fae791d098aa2bb5c40711c193c9647ca762b3103ee8612dea1d9c6caa6e10c16fd02d69e54bbfecd28a WHIRLPOOL c98fe3c68604642d73fd47fd5ca9732c13282b46aa3cd83e18f9a30f4964f2e7539f8dfdc6c836277d0a55010caae8563ea48b66f7924d25fcd5b0a18ce8fcd2 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84 diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta2.ebuild deleted file mode 100644 index 7ca8c49..0000000 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta2.ebuild +++ /dev/null @@ -1,109 +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/hyperv/ - 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}-9.2-no_ld32.patch" - "${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= " -} - -src_prepare() { - # gcc-5.0 or later, Workaround for critical issue. bug 573358. - [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O[2-9] -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 "> "${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 - # taken from sys/sys/fcntl.h - echo "#define F_DUPFD_CLOEXEC 17" >> "${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_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h - 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}" - 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/freebsd-libexec-10.3_beta3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta3.ebuild new file mode 100644 index 0000000..a8008a3 --- /dev/null +++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta3.ebuild @@ -0,0 +1,109 @@ +# 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/hyperv/ + 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}-9.2-no_ld32.patch" + "${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= " +} + +src_prepare() { + # gcc-5.0 or later, Workaround for critical issue. bug 573358. + [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O[2-9] -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 "> "${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 + # taken from sys/sys/fcntl.h + echo "#define F_DUPFD_CLOEXEC 17" >> "${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_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h + 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-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index 03b2d33..d4af34f 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -8,6 +8,6 @@ AUX freebsd-mk-defs-8.0-gnu.patch 4074 SHA256 00034d4d94ec011f595864113d469ec83d 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-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-mk-defs-10.3_beta2.ebuild 795 SHA256 0b899c21899afe4e27c6783e766c1a07f032ef4ba1b6fe0b2d9d0d180b704821 SHA512 1bc652eadc222e87e131d3d11f0f9ddb2413b07403e4a08111a7306bec98273977b0c4f4989c82ca07c208bd67dbae3a1567b7110ad7aad157f8def197fd8a02 WHIRLPOOL e696b94b54a4ca14f065ba516c66d9e1466d1860c67919285430c2c7ccb4ba62c03e6bf947ace6b234406da64881f9eb1808eb129ff879aad062da07beaf1f00 +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-mk-defs-10.3_beta3.ebuild 795 SHA256 0b899c21899afe4e27c6783e766c1a07f032ef4ba1b6fe0b2d9d0d180b704821 SHA512 1bc652eadc222e87e131d3d11f0f9ddb2413b07403e4a08111a7306bec98273977b0c4f4989c82ca07c208bd67dbae3a1567b7110ad7aad157f8def197fd8a02 WHIRLPOOL e696b94b54a4ca14f065ba516c66d9e1466d1860c67919285430c2c7ccb4ba62c03e6bf947ace6b234406da64881f9eb1808eb129ff879aad062da07beaf1f00 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84 diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta2.ebuild deleted file mode 100644 index 571e0f8..0000000 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta2.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="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() { - epatch "${FILESDIR}/${PN}-10.3-gentoo.patch" - epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch" - use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch" -} - -src_compile() { :; } - -src_install() { - if [[ ${CHOST} != *-freebsd* ]]; then - insinto /usr/share/mk/freebsd - else - insinto /usr/share/mk - fi - doins *.mk *.awk -} diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta3.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta3.ebuild new file mode 100644 index 0000000..571e0f8 --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta3.ebuild @@ -0,0 +1,42 @@ +# 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() { + epatch "${FILESDIR}/${PN}-10.3-gentoo.patch" + epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch" + use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch" +} + +src_compile() { :; } + +src_install() { + if [[ ${CHOST} != *-freebsd* ]]; then + insinto /usr/share/mk/freebsd + else + insinto /usr/share/mk + fi + doins *.mk *.awk +} diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest index 193d7f7..c281b34 100644 --- a/sys-freebsd/freebsd-pam-modules/Manifest +++ b/sys-freebsd/freebsd-pam-modules/Manifest @@ -1,6 +1,6 @@ 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-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-pam-modules-10.3_beta2.ebuild 1096 SHA256 0077f4f4cb836ac70f74bb7dadb430abe3651a5e5bcce2aeb65e492214fca113 SHA512 840087e548241b1333599b3195e6e4cf74b2340a389f1fa6de6be7a93ff05330798a027929c49f2d822a70a3e4d7b3ca9ff1e4f72124bb954e26c82e1a1f62f7 WHIRLPOOL 7a8ce799922aa804c2feb475d447a5ee05bb76141d2efc4d09c95110809d04e46af0929ef9476f23761f8d414391ef50d4c58dac8c216cd2f887244f2bc42fee +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-pam-modules-10.3_beta3.ebuild 1103 SHA256 8e5afefc9661af6d0a6a616374a6caae81349d20fc420975f97f6e6caffe61bb SHA512 6e55e4d5d7b0c944f149065525bdebfbcc45be5be30215542e514a505d409b80603b0b7926535a933e6b171fa4ecbc7bda67ff69a3d8b213c9946f2ea5d2d6be WHIRLPOOL 156e2e4e31c5b74da32f91c144b1688dc9231731d6ccd6bb8771692ae5e2b4f1661781fd146ea52f32596f03c5ffd2550f0edbb8b5828251e99549754929fea1 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84 diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta2.ebuild deleted file mode 100644 index 788158a..0000000 --- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta2.ebuild +++ /dev/null @@ -1,48 +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 - virtual/krb5 )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" - -S=${WORKDIR}/lib/libpam/modules - -PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch ) - -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 - done -} - -src_install() { - mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed" - - dodoc "${FILESDIR}/README.pamd" -} diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta3.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta3.ebuild new file mode 100644 index 0000000..2cd29f7 --- /dev/null +++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta3.ebuild @@ -0,0 +1,48 @@ +# 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 + virtual/krb5 )" +DEPEND="${RDEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-sources-${RV}*" + +S=${WORKDIR}/lib/libpam/modules + +PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch ) + +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() { + mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed" + + dodoc "${FILESDIR}/README.pamd" +} diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest index 80181a9..473e9ff 100644 --- a/sys-freebsd/freebsd-pf/Manifest +++ b/sys-freebsd/freebsd-pf/Manifest @@ -9,6 +9,6 @@ AUX freebsd-pf-9.0-pcap_pollution.patch 450 SHA256 d6ec6b1952e22f621b33d85956837 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 809 SHA256 d22b84e3400582bfcc1363871f21911617ae61502e2fc2ed7e86cf50505b530f SHA512 9c5135e1f86caccabf7f0440a5747a17e488f60891a822024b1908945781e0957f6ec61cae46f7d0a09aa90815e4e7dc58e064b5137b3f8207e3e5a90fd30118 WHIRLPOOL 4716aeb605e14f78010f3a68dd98dd9c217f29e012d14ed6e3a951ba973fccc9ca7314f6588ab5d4dbd8ee635a7eda47eefd484215dd5282d456ea7b031ca9f2 -DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-pf-10.3_beta2.ebuild 1579 SHA256 153dd2c2aa0f731db7c4d48ca07be49148820b9c299bd0b93bed34fff8f3d0c8 SHA512 f76d9dcce90d3c668705e066432fb9cfa8680782ee1549be1d3d68498a44ec04bc36f58fda9a19b9e9ba733cce8a2ee37bd44487095f3ed35c29d6393e0573e3 WHIRLPOOL ed6da438dbc0b3c7337399685ae8a752738def36afb42d4cf5a79d09c7dc586aa123ac4fbf24363f95db33db7a298697f8bbd03600f1ceaad250d67a9da7b4d4 +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-pf-10.3_beta3.ebuild 1593 SHA256 8702bb90a54501cfe4b5118f880d221a2e71417ae39cbea1701c97413580cfd9 SHA512 babb6b940ee1786b06675f8ce6a723dc7a68893a733bb583209ba84636e4ec29b7fe38fbc7af9d2eab75a2a6659624ecdbc98ce70bde1adb50e2f00ba625455e WHIRLPOOL a76b4f84e29fa9b68ab216fb1394637776bf39c10dba30be1b304cc587d3245e42449d3db0c3521f94e7d0c864d7544a3fa01b19f69f86722f3b540e37cd40ce MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84 diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta2.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta2.ebuild deleted file mode 100644 index 823906a..0000000 --- a/sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta2.ebuild +++ /dev/null @@ -1,73 +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/ftp-proxy" - -pkg_setup() { - enewgroup authpf 63 - mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " -} - -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}-10.0-libevent.patch" - epatch "${FILESDIR}/${PN}-10.0-pflogd.patch" - epatch "${FILESDIR}/${PN}-9.0-bpf.patch" - epatch "${FILESDIR}/${PN}-9.0-getline.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}" - mkmake || die "Make ${dir} failed" - done -} - -src_install() { - for dir in ${SUBDIRS}; do - einfo "Starting install in ${dir}" - cd "${S}/${dir}" - mkinstall || 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/freebsd-pf-10.3_beta3.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta3.ebuild new file mode 100644 index 0000000..14efdcb --- /dev/null +++ b/sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta3.ebuild @@ -0,0 +1,73 @@ +# 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/ftp-proxy" + +pkg_setup() { + enewgroup authpf 63 + mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " +} + +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}-10.0-libevent.patch" + epatch "${FILESDIR}/${PN}-10.0-pflogd.patch" + epatch "${FILESDIR}/${PN}-9.0-bpf.patch" + epatch "${FILESDIR}/${PN}-9.0-getline.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 + mkmake || die "Make ${dir} failed" + done +} + +src_install() { + for dir in ${SUBDIRS}; do + einfo "Starting install in ${dir}" + cd "${S}/${dir}" || die + mkinstall || 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-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest index 654b00a..e5745f3 100644 --- a/sys-freebsd/freebsd-rescue/Manifest +++ b/sys-freebsd/freebsd-rescue/Manifest @@ -6,6 +6,6 @@ AUX freebsd-rescue-9.1-bsdtar.patch 404 SHA256 0e71e3e370b33318bbb167e82d6507589 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-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-rescue-10.3_beta2.ebuild 1815 SHA256 91d0e56e62021b6326de439e7776ae2e46e932801b6f6485c96cae89978e746f SHA512 cfe5887798a19a0270221a0ba33f4c8cff3e8167430fdd8e945377a09c7cc89d38a6ec29025478268eee2cebb7302b3c4f25a5ec171c0cb9a9b9f6be25960760 WHIRLPOOL f1cf2218d9453541684db51eb2faf744d55825be25247f4053f37049326faff8c6c5c6aa7f3e1a99e29f73754f215533dd9e956930b21aa64d8630c08a27ac35 +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-rescue-10.3_beta3.ebuild 1836 SHA256 a25b99a3496df7129084d5796910f17a741f5af63c502649a5b71d5be81eade9 SHA512 52b0756515f10e1a21b401c2d94fd8d3821f81fb48627884b7243744c576178ae91b72212795f559f8a4842d738f016c4558ebfabddaf3e02e005ed22259cecd WHIRLPOOL 98ff26e0460ae0dcad19ff95c8db530d3bec0eb2017fa0d284b086a47ecdca489ba63a1a6a05e2ce1c4696e2209d475a0a1b17658f8dd458ab5763f897054229 MISC metadata.xml 312 SHA256 957f4b12031fc0ad63ba3709a92dc8440874022d1c917e0c788583add1eacc48 SHA512 c0580fc77c25021bf7cf5284d6f40c0b5a254be8ab5294fc7d2259a4d85ed68a78a29f1f6b1ed4308646b471236ed0dd194a4449d46ccb4322fc27eea2108129 WHIRLPOOL 0e5713d6a650cbfe595f121286aead777a842178dc74d6f3557ccbad1fbe520933cafd46c9a002a15b102a3e556db5da26cfadccd89407c49d14c0900d130c30 diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta2.ebuild deleted file mode 100644 index f14c4e9..0000000 --- a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta2.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 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[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}" - epatch "${FILESDIR}/${PN}"-10.0-zlib.patch - epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch" - epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch" -} - -src_compile() { - tc-export CC - # crunchgen is now checks env MAKE. - # Use to force BSD's make - export MAKE=/usr/bin/make - - cd "${WORKDIR}/lib/libarchive" - echo "#include " > bsdxml.h - freebsd_src_compile - export CC="${CC} -L${WORKDIR}/lib/libarchive" - - cd "${S}" - freebsd_src_compile -} diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta3.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta3.ebuild new file mode 100644 index 0000000..d480106 --- /dev/null +++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta3.ebuild @@ -0,0 +1,82 @@ +# 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[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}/freebsd-sbin-bsdxml2expat.patch" + epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch" +} + +src_compile() { + 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 " > bsdxml.h + freebsd_src_compile + export CC="${CC} -L${WORKDIR}/lib/libarchive" + + cd "${S}" || die + freebsd_src_compile +} diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest index 2abef41..1363c0a 100644 --- a/sys-freebsd/freebsd-sbin/Manifest +++ b/sys-freebsd/freebsd-sbin/Manifest @@ -12,6 +12,6 @@ AUX idmapd.initd 440 SHA256 e89050097731f658825b4a7215023e1c5070f0e31cfdf79eaf29 AUX ipfw.confd 364 SHA256 97911a2f003e2108c1f5da04b84a3b73fbccbde48fe58af0f056d8a9effbb3d3 SHA512 6bb923386c40e7bfcc2d9a122ee3e942fe30cb49715d1cfb122923416d2dcf63fd6f61cb93510a245eb8bbd767e33f029726bb277cb0e16e98d2e856ef33ff2f WHIRLPOOL e1de6e7f8807f7079b856197d9e7a650491a0a0f7b9fab703befed7bc24ccedb3be1ff758194c70cfa4e86f0930b6f30bc03342edd8de55795621ceb5be471f0 AUX ipfw.initd 2911 SHA256 45789a2e51c8eb164247d08c58d47ab52798bfbd19b4ddb6cc87acb5684e4eb5 SHA512 56776597170cf3549d7560fbb13ebb81cf608eb6f16d5ea440d38d4f3edbd06d56bc3fe104f9114e099d622cff1cd8e1a65529ebb4a7ecbf75ee6759e7bdc190 WHIRLPOOL f82edd7d971946637451519a78bcd0da73344944e2002fddca2b1fe22012d9a74dabec644937833e3f9250ea6d81fbd002569dc64b11db04c83e57c18ec508fe AUX sysctl.initd 557 SHA256 49b93a918e66a7464284d5d5cfb7bc969b88f8cfb43921cc0b5859d8f63ea693 SHA512 7de60d317542b912fecaeb29323bded3be579df7b231bc7326ef9978b9985e180b812a847c5707900f4683b46389d19d393c2474fbbc5a1573beacda85a590e9 WHIRLPOOL 29e983847ce0b925ed2bd168241e89f1052c5353b2863750ae0c3f1c6133635b800a54787b5838e3d3f30dab2d9f2b62bc382ec2e30ccaa6fcd6e3d37df392d6 -DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-sbin-10.3_beta2.ebuild 2558 SHA256 104b27902edd010c2c5f6be35f14a9a610aea9a29fbf4c3719182dd0e33313f0 SHA512 4d2e8344f584199264f8e75a1309dd3b12601bf1c0c31cc8a24a602d36457377b1e638322b1f712cb48240c6bee4b18dc695fd4d41646614785d4b2785b653cc WHIRLPOOL fea16356daa2598b6792b194d6e74a431f884120cc3200b34121b78d3524d4f7e33912fff144e3be388761960f948e5e14dd551abbe74977e51fd95ddd575fd1 +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-sbin-10.3_beta3.ebuild 2572 SHA256 84f60f09f70129c4f4a9a79f620cb9762d536b34308f8c2f286acf52d80fbcd0 SHA512 0e467d9d913421e72ab41f38e4e0e33a822aac8d29aa7064033b5c14ed709281dcc4e84d4f693f608778ed7a4c49a191a4d9688dff95509c8ded9f7df641b835 WHIRLPOOL 25a485f632ae3fdd501f5868ede08d3f86ae97c6458a58a5c979df2ca171df9a4d6a48d94ec04f49556615635fa318ba1bfbc8f527cbeeb3f35ced762a2bb514 MISC metadata.xml 473 SHA256 b13f1868fdc53bc53952bb41f6b68a5f320d36c493329ddf1b940f0fd5bafa8e SHA512 bf69dfade6ba52de900634d131d0aacfd36f9bb94a11f81c7256b144b2a90daa9b5f5bfa1a6c028314c8bb763fc59a4c0a9e8332a24d6732995fdebb3964b6dc WHIRLPOOL 32e9ac1cbaac74edd43d97d8d8069f61f29179f93904d126c32e4cb3504683f118c5027e1a42b1b456bb31dd68ffbdb0ce23c7b84806edcd03b80af9a34db96a diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta2.ebuild deleted file mode 100644 index 168eed4..0000000 --- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta2.ebuild +++ /dev/null @@ -1,101 +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 ) - >=dev-libs/libedit-20120311.3.0-r1 - sys-libs/readline - || ( - 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" - "${FILESDIR}/${PN}-bsdxml2expat.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/" - 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" - - 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/freebsd-sbin-10.3_beta3.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta3.ebuild new file mode 100644 index 0000000..c1e4b5f --- /dev/null +++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta3.ebuild @@ -0,0 +1,101 @@ +# 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 ) + >=dev-libs/libedit-20120311.3.0-r1 + sys-libs/readline + || ( + 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" + "${FILESDIR}/${PN}-bsdxml2expat.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-share/Manifest b/sys-freebsd/freebsd-share/Manifest index a2d0c2d..f50169e 100644 --- a/sys-freebsd/freebsd-share/Manifest +++ b/sys-freebsd/freebsd-share/Manifest @@ -5,6 +5,6 @@ AUX freebsd-share-5.3-doc-locations.patch 608 SHA256 d949e9081a181ab9443a18e5694 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-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-share-10.3_beta2.ebuild 3056 SHA256 de95f86abcd2eb01c376b1543551a3be3e3e10625d5c941739fb02cf12f67385 SHA512 3eedbc57e03cda34e0b5253a47fba3ab59d06439bf94530b7bab5b80941fc97ebd6266a4845ed7100bbe9737cc611187d8ca443b157d7d62376c5ba22f48a4e8 WHIRLPOOL 8474a0a702759f65ae94c2c2b8be0205b588f46aee44616ec3296c044c5568245ba6d61d0e90f8212980e202a95c21c0a01004300731bda79ae4910ae0d4689c +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-share-10.3_beta3.ebuild 3070 SHA256 5c3c80d2749d77095ded254044cdd5536e0cd47b7f8ed5901c4ecf07e81db3cc SHA512 270a417a78ac0fc12659660db829b78029e6842e8ad0b436459535d1bc31f8151ff8f1a3635d4a0b8e1ce3efefaab57242f1ea18a9c19e0027e8d500ca09a66d WHIRLPOOL 31683d52c9f3dc685993875dc5a8e276eeac3928d4dfaa0774af423e2a4fc9d1163b513cfda5c300a22fd25ea48c444e7de74bd0fbbf0733cc3ebb327b4c1d88 MISC metadata.xml 269 SHA256 2afafb02d7d4a5e81c04ccb660f5d0f0317b453d08d9d9d742f9d901a21ee096 SHA512 93c9f1dc528cbc6071792b0f9a26a1f3116067409d14bd9593829ef40d513f85e72ced99b36494ffd94bd405e4e6d941a23b0ca78c6ff8df428853ecd2a675ad WHIRLPOOL 0c206ebfef419ed5d25e36eb06253c054f6b2c293a5fea9117a8bd1849fe6f3306c21bffd4165c14cbe71b81129a4de1e45bbaca13191f49f57447a5281df4b0 diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.3_beta2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.3_beta2.ebuild deleted file mode 100644 index 244d1c1..0000000 --- a/sys-freebsd/freebsd-share/freebsd-share-10.3_beta2.ebuild +++ /dev/null @@ -1,112 +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" - -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/ -" - -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} NO_SHAREDOCS= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - [[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= " - - mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= " -} - -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 mklocale 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} - freebsd_src_compile - done - - # This is a groff problem and not a -shared problem. - cd "${S}" - export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/" - freebsd_src_compile -j1 || die "emake failed" -} - -src_install() { - mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed" -} diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.3_beta3.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.3_beta3.ebuild new file mode 100644 index 0000000..8023eac --- /dev/null +++ b/sys-freebsd/freebsd-share/freebsd-share-10.3_beta3.ebuild @@ -0,0 +1,112 @@ +# 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" + +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/ +" + +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} NO_SHAREDOCS= " + use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " + use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " + [[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= " + + mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= " +} + +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 mklocale 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() { + mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed" +} diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index 12b3485..261b329 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -31,6 +31,6 @@ AUX freebsd-sources-9.1-random.patch 792 SHA256 46d4035d31e8a64531e1893c08b8235e 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 -DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-sources-10.3_beta2.ebuild 4403 SHA256 3695e402c6c77602d0180910b29dbe1c7897d1ae7fb70f328b14d01702d698f7 SHA512 f74cca3bedf3edd431c96a8f0971bf488ff32ff1bbd84f94875f8bfa1c7d522a9cadee7f5f60872dfd89fa9fa961d42f7bef4ffe2c663918f75f3b38f29cb3fc WHIRLPOOL bcc620a441f9a0720e41f16f6f4769b5bd8bf9c80f0c10c9c4755309d772ee6412862ac337fa22ac5795a1d8728b7ff2ccb954a9b31192560e68039b4a643e1c +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-sources-10.3_beta3.ebuild 4403 SHA256 3695e402c6c77602d0180910b29dbe1c7897d1ae7fb70f328b14d01702d698f7 SHA512 f74cca3bedf3edd431c96a8f0971bf488ff32ff1bbd84f94875f8bfa1c7d522a9cadee7f5f60872dfd89fa9fa961d42f7bef4ffe2c663918f75f3b38f29cb3fc WHIRLPOOL bcc620a441f9a0720e41f16f6f4769b5bd8bf9c80f0c10c9c4755309d772ee6412862ac337fa22ac5795a1d8728b7ff2ccb954a9b31192560e68039b4a643e1c MISC metadata.xml 354 SHA256 1febde9432e112ae9f645a26ede3cea3720e5784b444c1b83425dd3288f5e729 SHA512 430631962f1640984e674082d12d2f59fdf1bb5013c9c75e73b47a7d499f1bb1b5e8eca3ba168d19f378c85f5bc599e5ffc8cb80a314115fba1307867076ab6a WHIRLPOOL 483f77a75637d9117fe55656e32c7295352fb484bdd735e6e530ad87b453b860bad26716f5e99cb8ea78248e0f7f8e4d3d869d9073689d72fec1cdf26d04f7fc diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta2.ebuild deleted file mode 100644 index d5542a7..0000000 --- a/sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta2.ebuild +++ /dev/null @@ -1,156 +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" - -IUSE="+build-kernel debug dtrace zfs" - -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 - !> "${conf}" - use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" - - # 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-cddl-9.2_beta1' ; then - ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it." - fi -} diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta3.ebuild new file mode 100644 index 0000000..d5542a7 --- /dev/null +++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta3.ebuild @@ -0,0 +1,156 @@ +# 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" + +IUSE="+build-kernel debug dtrace zfs" + +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 + !> "${conf}" + use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" + + # 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-cddl-9.2_beta1' ; then + ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it." + fi +} diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest index ecae62e..6adb2d2 100644 --- a/sys-freebsd/freebsd-ubin/Manifest +++ b/sys-freebsd/freebsd-ubin/Manifest @@ -27,6 +27,6 @@ AUX passwd.1.pamd 154 SHA256 39706dd518995631a8eb6a48498685db9a777124bb84f217e20 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-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-ubin-10.3_beta2.ebuild 5912 SHA256 6b9a51efd669182f3686af191e96363eee29aa3060d92cc2351d9798e9d7b663 SHA512 786e5e406f1781db1f1dfc925ef861ee99a8651a5c77a52268dbada52b207d1ce9d752bbd9ca885c1d949d40b29207e63b69b0acc4619358b2ca2c46a87cbace WHIRLPOOL 8c8e01eff6b31bef32f53aebb876d2adcab54ab124a1999ec1e4552f745c3c56ca654a664a4c9ceaac7ca92f0050dddcd02435f8eef4f6684fade78399ab0c7a +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-ubin-10.3_beta3.ebuild 5940 SHA256 a8c2bfc607a0d8c397ab082219451a3f4576cf485c28d77c8645df8bc4c12c9d SHA512 a433b8bff8b0837ad3d1ca7b3df81f0646b8564b1336adbc09303191be63fc209b233423d5362f768dc846542556e115daf43fd96c954fe0b1c8e075dbcb57e2 WHIRLPOOL 00923fb16961bb8d2cdc97e69621bac39f4ccac565908e15234070dc2ffe947d4c5a68a98cacf796a0113551288e91615b76b5a41763a7802a797fe85205d896 MISC metadata.xml 692 SHA256 9d7a61c414fb50713568dc2782c2de6460bac1eff7ca6a9f8a2d25979b48e811 SHA512 8bc469bb79edb0c34e5fb03f4a53c12b0f3741f06a20e1fc1b58772e594f259cc91368157ced396f8843b6e4398bffd1e5b5b8c694d5bec324e89966e4e618d6 WHIRLPOOL 026491842e88460c5fb80acdf7b26e274c74c6d0ced8c23e16382b82a9b99d9657b96a5ecbca2d95ecd0dfef463dfa012f7aeb3acd8e655df859ab6aada0d312 diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta2.ebuild deleted file mode 100644 index a0d69a4..0000000 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta2.ebuild +++ /dev/null @@ -1,207 +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 ) - kerberos? ( virtual/krb5 ) - ar? ( >=app-arch/libarchive-3 ) - virtual/pam - sys-libs/zlib - >=sys-libs/ncurses-5.9 - !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}-setXid.patch" - "${FILESDIR}/${PN}-lint-stdarg.patch" - "${FILESDIR}/${PN}-8.0-xinstall.patch" - "${FILESDIR}/${PN}-9.1-bsdar.patch" - "${FILESDIR}/${PN}-9.1-minigzip.patch" - "${FILESDIR}/${PN}-10.0-atf.patch" - "${FILESDIR}/${PN}-10.0-dtc-gcc46.patch" - "${FILESDIR}/${PN}-10.0-kdump-ioctl.patch" - "${FILESDIR}/${PN}-10.0-mandoc.patch" - "${FILESDIR}/${PN}-10.2-bsdxml.patch" - "${FILESDIR}/${PN}-10.2-talk-workaround.patch" - "${FILESDIR}/${PN}-10.3-bmake-workaround.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" - -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= " -} - -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}"/make/Makefile || 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}" - fi - "$@" -} - -src_compile() { - # Preparing to build mandoc - cd "${WORKDIR}/lib/libmandoc" - freebsd_src_compile -j1 - - cd "${S}" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1 -} - -src_install() { - 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" - 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/freebsd-ubin-10.3_beta3.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta3.ebuild new file mode 100644 index 0000000..28e35dd --- /dev/null +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta3.ebuild @@ -0,0 +1,207 @@ +# 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 ) + kerberos? ( virtual/krb5 ) + ar? ( >=app-arch/libarchive-3 ) + virtual/pam + sys-libs/zlib + >=sys-libs/ncurses-5.9 + !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}-setXid.patch" + "${FILESDIR}/${PN}-lint-stdarg.patch" + "${FILESDIR}/${PN}-8.0-xinstall.patch" + "${FILESDIR}/${PN}-9.1-bsdar.patch" + "${FILESDIR}/${PN}-9.1-minigzip.patch" + "${FILESDIR}/${PN}-10.0-atf.patch" + "${FILESDIR}/${PN}-10.0-dtc-gcc46.patch" + "${FILESDIR}/${PN}-10.0-kdump-ioctl.patch" + "${FILESDIR}/${PN}-10.0-mandoc.patch" + "${FILESDIR}/${PN}-10.2-bsdxml.patch" + "${FILESDIR}/${PN}-10.2-talk-workaround.patch" + "${FILESDIR}/${PN}-10.3-bmake-workaround.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" + +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= " +} + +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}"/make/Makefile || 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 mandoc + cd "${WORKDIR}/lib/libmandoc" || die + freebsd_src_compile -j1 + + cd "${S}" || die + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1 +} + +src_install() { + 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-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest index 59ec4d0..ddebc4d 100644 --- a/sys-freebsd/freebsd-usbin/Manifest +++ b/sys-freebsd/freebsd-usbin/Manifest @@ -27,6 +27,6 @@ AUX rpcbind.initd 601 SHA256 dbeb5e51aa52d53742715a3bcc48dd8a28d6f5f7af88b4f05e7 AUX syscons.confd 348 SHA256 8d963ed1d6b63eed6b9f8bc1492c1e589458051e99f601e1ee0a8131890b0e70 SHA512 3dd50c0f223a93c0b0544fc9e85624fa78e045d2b6846242f431ea1ce4f121a33c1f3a0a2ef0763f45230dac0033d04c0d397e268f633d809e2466c269c22993 WHIRLPOOL a1ddfccb0aeb448e8d5086f9ba0554c0ff9fdd52003bf98bc2a1efbc7e2d835a79ea52886ac58e3818f9b5bc1d705658d2c8c1f05bad4bd7e5ef916ffe542451 AUX syscons.initd 1598 SHA256 187055f4395438ad54ab339b6bf3a42ab02ed3bac0bc259a25b151ed7c7fa14a SHA512 7933c4484ae52da4f1f5af3f3853292faa794add22991bd0c01613daa35e7b9f5121cf5e9d6a2db1f6dc0b02350c6a8b202678631dbb44dc3638c024ff2f5599 WHIRLPOOL b10117fe41245263aa17ef3e4151f2456846499db3e370b043cd654b56665a7e3f2ddab86e1d2786606e1ae3a11121ece1f98f1b0c48eb5526433be9dad1f8b7 AUX syslogd.initd 456 SHA256 3654435b79efdeab6d8c496670d31bf576fe81a51a8d1dd91584454f2ec34e3a SHA512 c3e3247301475a689759f52a376af11704d8a0ab23ff6e9522fad9738b19306aa881f3acc13a9296dabbe70699cce8b524975e5134264a2a398205f2e46ed68e WHIRLPOOL 61043039b6bd4e9c8c7a51f43f89c69ec8b4d23480663c54628059fa10d2bac80ed303dc03267b0970237254729ebf736966b8172547d3a3e7998ac7da815395 -DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0 -EBUILD freebsd-usbin-10.3_beta2.ebuild 5441 SHA256 4b4f2519cb4df44c35165dfa291657a74d29684e4d7dcd82b828394e0c3d08fc SHA512 88e8f58ce3461363ea6599cb76e915159f331f734b99e32da5546fa36546ebbb22611ef1cbdbf98a1c69c90bf96ae56a78cdb252fb3003279e7e3c4810c38461 WHIRLPOOL 4e0dbc9065e033b1b514bacabb9d739ed4f4b0eaf7b65efbe4f4dee902233d72206b64025068e9e0ea42ba6c24313821f47cbebbcac64e43d758c3b7c957e833 +DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb +EBUILD freebsd-usbin-10.3_beta3.ebuild 5469 SHA256 3f52ac494a963251e288c90fdd73aba7d17e338f41050dc64a13e7a37450b769 SHA512 943eb9dc246396c0b00b36ac260bd2f1d7aa7105f4052ad84542c60b2b7f951950951a7c549c1bdd98b49398205fbb492c10df57ea836a0928c569a329ec5621 WHIRLPOOL 85421c83b5bdacf1b929b6e4b5983eeb2397030f375a884eec49a5c145ff809e18c52729df86c151a7f2ff010e384673d193469f7e8a2244297dbcffa1130e10 MISC metadata.xml 461 SHA256 fd2d6bce2b50c4fc19752eb8e94b8770f1c94186698c3358b8b906cfde2c5302 SHA512 58cf153c795ea258951d25190723aa5706d48741775a3547b54c35ba67507b652089ceeb2b4da9b9bf8b7e2cdbb9163cbdbe673e5240f30164e10560cbae4e50 WHIRLPOOL 828545f7bc374fd8e22b68d2980fa14b5d8fe92a160582bb7f49f00594e5de91449345eed5dd626b641d77efb3bd45f92f345b9262c080b7649d31e24481e36d diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_beta2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_beta2.ebuild deleted file mode 100644 index 82b1af5..0000000 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_beta2.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" - -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" - ) - -REMOVE_SUBDIRS=" - tcpdchk tcpdmatch - sendmail praliases editmap mailstats makemap - pc-sysinstall cron mailwrapper ntp bsnmpd - tcpdump ndp inetd - wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase - zic amd - pkg pkg_install freebsd-update service sysrc" - -src_prepare() { - if ! use build; then - [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" - [[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include" - else - dummy_mk mount_smbfs - fi - # Don't install mtree format manpage - # it's installed by libarchive. - sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile -} - -src_compile() { - # Preparing to build nmtree - cd "${WORKDIR}/lib/libnetbsd" - freebsd_src_compile - - cd "${S}" - freebsd_src_compile -} - -src_install() { - # By creating these directories we avoid having to do a - # more complex hack - dodir /usr/share/doc - dodir /sbin - dodir /usr/libexec - dodir /usr/bin - - # FILESDIR is used by some makefiles which will install files - # in the wrong place, just put it in the doc directory. - mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed" - - # Most of these now come from openrc. - for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do - newinitd "${FILESDIR}/"${util}.initd ${util} || die - if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ - newconfd "${FILESDIR}"/${util}.confd ${util} || die - fi - done - - for class in daily monthly weekly; do - cat - > "${T}/periodic.${class}" < "${T}/periodic.${class}" <