gentoo resync : 25.08.2018

4 files changed, 261 insertions, 0 deletions

diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index a76d9a8a5b87..3e48e89a38f2 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -1,6 +1,9 @@
 AUX freebsd-share-10.0-gentoo-eapi3.patch 475 BLAKE2B 2003dbeb08815d0b71450301bbb91cf387525ae67b876260eec625d087f0df84b2ba08bc080b99606cc960b938a4203b52cc670668a6da6656202d0f61acf970 SHA512 b7fe870aafe1cf9029c1d1d9de16413b5be8354b1c2ba0d0eab6f0fe3076ab03da08ff764c923c087e246b90355a48d55acef9b9b5a29238ddf8c92bdb3ca0f8
 AUX freebsd-share-10.2-gnu-miscfiles.patch 913 BLAKE2B 2c264e3f7422f8f8f0994d2e888221e1f5223865596e5cfd4ab41cf6c4f6bb640cde891f7a32fe09d91115cb9bb934e5fc4bade310407205ec454cb3b0904c9b SHA512 fa792f15e325117e4448b344ab3dbf64d3880719698d88d8dda60c8cc4afea8c11cb845f44fa3b78ddc98fc6b021ef9edac639f649e8d166d79bf2c0e4f654f5
 AUX freebsd-share-10.3-gentoo-skel.patch 600 BLAKE2B b04b8653aef9add52fe180b587635809cdbfc644d0df59eef1f471449228689a19adc1f19613ba7265c30f200e52ecd6e5f95fbd7312c488d1565e629baaeb67 SHA512 338eb369c50b11835f00474be5363bf6af43d8391a28a6e78e1517afc686b168fd0bfc32d45a78e79515c3d89a35b097548117cb2838b751d3d41330939c7dc2
+AUX freebsd-share-SA-1808-tcp-11.patch 896 BLAKE2B 6f459795078217835f6accbe4ed27bd82f639a103f89e45bd78429d0de9ef8ee2f63be3afac63780f5cf663e2f3e1327bf15e655b612e2a0f6416f272ddd75c9 SHA512 f2bb1085b680eaad997d79940a33d8dfd56e0e4ec6d2df628f58f208d2a37cb7f60ed94b4738afcd25112ea55268c06a1bc6534128802fd522771537fa7f4164
+AUX freebsd-share-SA-1810-ip.patch 4563 BLAKE2B efbe805bccbff5e49c3e1f0d5fd6a95ebd077cdc026a296f314815a3918eaffb694a1f9fb4beffcd609ca5d57da37762e28c9c2ee450d681d22f0f280c8b164f SHA512 55404a2ed446b0aa3bcd4bc6f82f5c253644d448645da82233865e0fadb3875501810fd0eeda1caab2489445dc759e52b2cccfcad99f65678640692fb5abf404
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 EBUILD freebsd-share-11.1.ebuild 3324 BLAKE2B a4a35392bc6e32b2e7c8922e887260717b30df97d4c18b9d6b068338ed536e5cc4dafdbca59391345d1c2af93798b28417d660aa2cb86778b53d5097a904f3ce SHA512 6e91be861b588dc5e91ac6b6e71fd242c5b7d86f9aabc8077bc2084326b65d71c1da6a6c4bb1b61e71e991c501eb7ebd13bd2bb46352bdcd8b37815bd5ae1ea9
+EBUILD freebsd-share-11.1_p1.ebuild 3405 BLAKE2B b0d7ec19e8b9c2adf20a377d9f1a096d3e02e51bff41d1e969ee57b51c38f81049b1ee83906770cab466e2c7e17119354c92fc5e54b9714f9ca1ebc896cb79e5 SHA512 004f0e831b08895cb162117d4d4eab291a58581e655177997ae823f4825af8bb31067c1fcf0c58d0c50757027c7feee5ab051d7a9702d983469a57e6bd81fde5
 MISC metadata.xml 303 BLAKE2B 32a957edfc2dcb1fd1076d208b253fbe2408a65f44585ebd3863a9f6d95f4e25d8e3fc5ada378074e0d7e1ebd47793c4e8241656087da905100f68375c70df9e SHA512 4483a50bd02a3644bd12148d0a54ff78686d974337b5c22a267bdae228eefec85bf1a8b74a1c04a7759645e451e59c75734318d07376692d26c97261eaf2fbf3
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-SA-1808-tcp-11.patch b/sys-freebsd/freebsd-share/files/freebsd-share-SA-1808-tcp-11.patch
new file mode 100644
index 000000000000..b7d2a750c789
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/freebsd-share-SA-1808-tcp-11.patch
@@ -0,0 +1,23 @@
+--- share/man/man4/tcp.4.orig
++++ share/man/man4/tcp.4
+@@ -445,6 +445,20 @@
+ Reseeding should not be necessary, and will break
+ .Dv TIME_WAIT
+ recycling for a few minutes.
++.It Va reass.cursegments
++The current total number of segments present in all reassembly queues.
++.It Va reass.maxsegments
++The maximum limit on the total number of segments across all reassembly
++queues.
++The limit can be adjusted as a tunable.
++.It Va reass.maxqueuelen
++The maximum number of segments allowed in each reassembly queue.
++By default, the system chooses a limit based on each TCP connection's
++receive buffer size and maximum segment size (MSS).
++The actual limit applied to a session's reassembly queue will be the lower of
++the system-calculated automatic limit and the user-specified
++.Va reass.maxqueuelen
++limit.
+ .It Va rexmit_min , rexmit_slop
+ Adjust the retransmit timer calculation for
+ .Tn TCP .
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-SA-1810-ip.patch b/sys-freebsd/freebsd-share/files/freebsd-share-SA-1810-ip.patch
new file mode 100644
index 000000000000..1fee32f348b6
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/freebsd-share-SA-1810-ip.patch
@@ -0,0 +1,113 @@
+--- share/man/man4/inet.4.orig
++++ share/man/man4/inet.4
+@@ -28,7 +28,7 @@
+ .\"     From: @(#)inet.4	8.1 (Berkeley) 6/5/93
+ .\" $FreeBSD$
+ .\"
+-.Dd Feb 4, 2016
++.Dd August 14, 2018
+ .Dt INET 4
+ .Os
+ .Sh NAME
+@@ -229,15 +229,38 @@
+ cycle greatly.
+ Default is 0 (sequential IP IDs).
+ IPv6 flow IDs and fragment IDs are always random.
++.It Va ip.maxfrags
++Integer: maximum number of fragments the host will accept and simultaneously
++hold across all reassembly queues in all VNETs.
++If set to 0, reassembly is disabled.
++If set to -1, this limit is not applied.
++This limit is recalculated when the number of mbuf clusters is changed.
++This is a global limit.
+ .It Va ip.maxfragpackets
+-Integer: maximum number of fragmented packets the host will accept and hold
+-in the reassembling queue simultaneously.
+-0 means that the host will not accept any fragmented packets.
+-\-1 means that the host will accept as many fragmented packets as it receives.
++Integer: maximum number of fragmented packets the host will accept and
++simultaneously hold in the reassembly queue for a particular VNET.
++0 means that the host will not accept any fragmented packets for that VNET.
++\-1 means that the host will not apply this limit for that VNET.
++This limit is recalculated when the number of mbuf clusters is changed.
++This is a per-VNET limit.
++.It Va ip.maxfragbucketsize
++Integer: maximum number of reassembly queues per bucket.
++Fragmented packets are hashed to buckets.
++Each bucket has a list of reassembly queues.
++The system must compare the incoming packets to the existing reassembly queues
++in the bucket to find a matching reassembly queue.
++To preserve system resources, the system limits the number of reassembly
++queues allowed in each bucket.
++This limit is recalculated when the number of mbuf clusters is changed or
++when the value of
++.Va ip.maxfragpackets
++changes.
++This is a per-VNET limit.
+ .It Va ip.maxfragsperpacket
+ Integer: maximum number of fragments the host will accept and hold
+-in the reassembling queue for a packet.
+-0 means that the host will not accept any fragmented packets.
++in the reassembly queue for a packet.
++0 means that the host will not accept any fragmented packets for the VNET.
++This is a per-VNET limit.
+ .El
+ .Sh SEE ALSO
+ .Xr ioctl 2 ,
+--- share/man/man4/inet6.4.orig
++++ share/man/man4/inet6.4
+@@ -29,7 +29,7 @@
+ .\"
+ .\" $FreeBSD$
+ .\"
+-.Dd September 2, 2009
++.Dd August 14, 2018
+ .Dt INET6 4
+ .Os
+ .Sh NAME
+@@ -219,12 +219,41 @@
+ This value applies to all the transport protocols on top of
+ .Tn IPv6 .
+ There are APIs to override the value.
++.It Dv IPV6CTL_MAXFRAGS
++.Pq ip6.maxfrags
++Integer: maximum number of fragments the host will accept and simultaneously
++hold across all reassembly queues in all VNETs.
++If set to 0, fragment reassembly is disabled.
++If set to -1, this limit is not applied.
++This limit is recalculated when the number of mbuf clusters is changed.
++This is a global limit.
+ .It Dv IPV6CTL_MAXFRAGPACKETS
+ .Pq ip6.maxfragpackets
+-Integer: default maximum number of fragmented packets the node will accept.
+-0 means that the node will not accept any fragmented packets.
+--1 means that the node will accept as many fragmented packets as it receives.
+-The flag is provided basically for avoiding possible DoS attacks.
++Integer: maximum number of fragmented packets the node will accept and
++simultaneously hold in the reassembly queue for a particular VNET.
++0 means that the node will not accept any fragmented packets for that VNET.
++-1 means that the node will not apply this limit for that VNET.
++This limit is recalculated when the number of mbuf clusters is changed.
++This is a per-VNET limit.
++.It Dv IPV6CTL_MAXFRAGBUCKETSIZE
++.Pq ip6.maxfragbucketsize
++Integer: maximum number of reassembly queues per bucket.
++Fragmented packets are hashed to buckets.
++Each bucket has a list of reassembly queues.
++The system must compare the incoming packets to the existing reassembly queues
++in the bucket to find a matching reassembly queue.
++To preserve system resources, the system limits the number of reassembly
++queues allowed in each bucket.
++This limit is recalculated when the number of mbuf clusters is changed or
++when the value of
++.Va ip6.maxfragpackets
++changes.
++This is a per-VNET limit.
++.It Dv IPV6CTL_MAXFRAGSPERPACKET
++.Pq ip6.maxfragsperpacket
++Integer: maximum number of fragments the host will accept and hold in the
++ressembly queue for a packet.
++This is a per-VNET limit.
+ .It Dv IPV6CTL_ACCEPT_RTADV
+ .Pq ip6.accept_rtadv
+ Boolean: the default value of a per-interface flag to
diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.1_p1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.1_p1.ebuild
new file mode 100644
index 000000000000..a8b673e53ec3
--- /dev/null
+++ b/sys-freebsd/freebsd-share/freebsd-share-11.1_p1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD shared tools/files"
+SLOT="0"
+LICENSE="BSD zfs? ( CDDL )"
+
+IUSE="doc usb zfs"
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
+fi
+
+EXTRACTONLY="
+	share/
+	contrib/
+	gnu/
+	usr.bin/
+	usr.sbin/
+	sbin/
+	bin/
+	lib/
+	etc/
+	tools/tools/locale/
+"
+
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+		=sys-freebsd/freebsd-sources-${RV}*"
+RDEPEND="sys-apps/miscfiles"
+
+RESTRICT="strip"
+
+S="${WORKDIR}/share"
+
+pkg_setup() {
+	# Add the required source files.
+	use zfs && EXTRACTONLY+="cddl/ "
+
+	use doc || mymakeopts="${mymakeopts} WITHOUT_SHAREDOCS= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+
+	has_version "<sys-freebsd/freebsd-ubin-10.1" && mymakeopts="${mymakeopts} WITHOUT_VT= "
+	has_version "<sys-freebsd/freebsd-ubin-11.0" && mymakeopts="${mymakeopts} WITHOUT_LOCALES= "
+	has_version "<sys-freebsd/freebsd-lib-9.1-r11" && mymakeopts="${mymakeopts} WITHOUT_ICONV= "
+
+	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= "
+}
+
+REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-10.3-gentoo-skel.patch"
+	"${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch"
+	"${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch"
+	"${FILESDIR}/${PN}-SA-1808-tcp-11.patch"
+	"${FILESDIR}/${PN}-SA-1810-ip.patch"
+)
+
+src_prepare() {
+	# Remove make.conf manpage as it describes bsdmk's make.conf.
+	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
+	# Remove rc.conf manpage as it describes bsd's rc.conf.
+	sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
+	sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile"
+	# Remove mailer.conf manpage
+	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
+	# Remove pbm and moduli(ssh) manpages
+	sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
+	# Remove builtins manpage
+	sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
+	# Remove rc manpages
+	sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
+	# Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin.
+	sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile"
+
+	# Don't install the arch-specific directories in subdirectories
+	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
+
+	# Remove them so that they can't be included by error
+	rm -rf "${S}"/mk/*.mk
+
+	# Make proper symlinks by defining the full target.
+	local sdir
+	for sdir in colldef monetdef msgdef numericdef timedef
+	do
+		sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
+			"${S}/${sdir}/Makefile" || \
+			die "Error fixing ${sdir}/Makefile"
+	done
+	if [[ ! -e "${WORKDIR}/sys" ]]; then
+		ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink"
+	fi
+}
+
+src_compile() {
+	export ESED="/usr/bin/sed"
+
+	# libiconv support.
+	if ! has_version "<sys-freebsd/freebsd-lib-9.1-r11" ; then
+		# 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
+	fi
+
+	# This is a groff problem and not a -shared problem.
+	cd "${S}" || die
+	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/"
+	freebsd_src_compile -j1 || die "emake failed"
+}
+
+src_install() {
+	freebsd_src_install -j1 DOCDIR=/usr/share/doc/${PF}
+}