From 72dd0b8f703f76eb0bca96487ad88b469dc6646f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 11 Oct 2019 17:13:37 +0200 Subject: [PATCH] sys-freebsd/freebsd-share: Remove last-rited pkg MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/683284 Signed-off-by: Michał Górny --- profiles/package.mask | 1 - sys-freebsd/freebsd-share/Manifest | 1 - .../freebsd-share-10.0-gentoo-eapi3.patch | 17 --- .../freebsd-share-10.2-gnu-miscfiles.patch | 30 ----- .../freebsd-share-10.3-gentoo-skel.patch | 20 --- .../files/freebsd-share-SA-1808-tcp-11.patch | 23 ---- .../files/freebsd-share-SA-1810-ip.patch | 113 ---------------- .../freebsd-share/freebsd-share-11.1.ebuild | 118 ----------------- .../freebsd-share-11.1_p1.ebuild | 122 ------------------ sys-freebsd/freebsd-share/metadata.xml | 11 -- 10 files changed, 456 deletions(-) delete mode 100644 sys-freebsd/freebsd-share/Manifest delete mode 100644 sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch delete mode 100644 sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch delete mode 100644 sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch delete mode 100644 sys-freebsd/freebsd-share/files/freebsd-share-SA-1808-tcp-11.patch delete mode 100644 sys-freebsd/freebsd-share/files/freebsd-share-SA-1810-ip.patch delete mode 100644 sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild delete mode 100644 sys-freebsd/freebsd-share/freebsd-share-11.1_p1.ebuild delete mode 100644 sys-freebsd/freebsd-share/metadata.xml diff --git a/profiles/package.mask b/profiles/package.mask index 2fbdf5f16589..b906cfdb6d9a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -756,7 +756,6 @@ sys-freebsd/freebsd-mk-defs sys-freebsd/freebsd-pam-modules sys-freebsd/freebsd-pf sys-freebsd/freebsd-rescue -sys-freebsd/freebsd-share # Lars Wendler (2019-09-04) # Unofficial build. Superseded by official 2.49.5 release. diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest deleted file mode 100644 index f3dcd89d595d..000000000000 --- a/sys-freebsd/freebsd-share/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch deleted file mode 100644 index 1d0a53ef10cb..000000000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/share/i18n/esdb/Makefile.part b/share/i18n/esdb/Makefile.part -index 9ca8577..329e9fb 100644 ---- a/share/i18n/esdb/Makefile.part -+++ b/share/i18n/esdb/Makefile.part -@@ -13,10 +13,10 @@ PART!= sed '/^\#/d;/^ *$$/d' ${PARTFILE} - .endif - .if !defined(NO_EPREFIX) - CODESETS?= ${PART:C/^/${CODE}${SEP}/} --EPREFIX?= ${CODE}${SEP} -+EPREFIX= ${CODE}${SEP} - .else - CODESETS?= ${PART} --EPREFIX?= -+EPREFIX= - .endif - ESUBDIR?= ${CODE} - ESDB?= ${CODESETS:C/$/.esdb/:S/:/@/} diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch deleted file mode 100644 index 1dc848873a67..000000000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/share/dict/Makefile b/share/dict/Makefile -index 3e2a0df..5395077 100644 ---- a/share/dict/Makefile -+++ b/share/dict/Makefile -@@ -4,8 +4,7 @@ - NO_OBJ= - - # XXX MISSING: connectives words --FILES= README propernames web2 web2a freebsd -+FILES= README freebsd - FILESDIR= ${BINDIR}/dict --SYMLINKS= web2 ${FILESDIR}/words - - .include -diff --git a/share/misc/Makefile b/share/misc/Makefile -index ffd42d8..7eb90bb 100644 ---- a/share/misc/Makefile -+++ b/share/misc/Makefile -@@ -5,9 +5,9 @@ - - .PATH: ${.CURDIR}/../../sys/dev/usb - --FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ -+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \ - committers-src.dot eqnchar flowers init.ee \ -- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ -+ iso3166 iso639 man.template mdoc.template pci_vendors \ - scsi_modes \ - organization.dot - diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch deleted file mode 100644 index 79e29e989e2a..000000000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/share/skel/Makefile b/share/skel/Makefile -index 024985c..6f6e563 100644 ---- a/share/skel/Makefile -+++ b/share/skel/Makefile -@@ -2,11 +2,11 @@ - # $FreeBSD: stable/10/share/skel/Makefile 291794 2015-12-04 18:21:05Z bdrewery $ - - FILESGROUPS= FILES1 FILES2 --FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ -+FILES1= dot.login_conf dot.mailrc \ - dot.shrc --FILES2= dot.mail_aliases dot.rhosts --FILES1DIR= ${SHAREDIR}/skel --FILES2DIR= ${SHAREDIR}/skel -+FILES2= dot.mail_aliases -+FILES1DIR= /etc/skel -+FILES2DIR= /etc/skel - FILES1MODE= 0644 - FILES2MODE= 0600 - NO_OBJ= diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-SA-1808-tcp-11.patch b/sys-freebsd/freebsd-share/files/freebsd-share-SA-1808-tcp-11.patch deleted file mode 100644 index b7d2a750c789..000000000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-SA-1808-tcp-11.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 deleted file mode 100644 index 1fee32f348b6..000000000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-SA-1810-ip.patch +++ /dev/null @@ -1,113 +0,0 @@ ---- 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.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild deleted file mode 100644 index 27899c51835f..000000000000 --- a/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# 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 " - - - - bsd@gentoo.org - BSD Project - - - Enable ZFS support. - - -- 2.26.2