From 8bc0c6ab908031bb6c89b7d87e3e25109ad17b14 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Tue, 23 Jan 2018 14:16:14 +0100
Subject: sys-freebsd/freebsd-sources: Remove 8.2

---
 sys-freebsd/freebsd-sources/Manifest               |   1 -
 .../files/freebsd-sources-7.1-binutils_link.patch  |  37 -------
 .../files/freebsd-sources-7.2-debug-O2.patch       |  27 ------
 .../files/freebsd-sources-8.0-gentoo.patch         |  33 -------
 .../files/freebsd-sources-8.2-unix2.patch          |  55 -----------
 .../files/freebsd-sources-cve-2012-0217.patch      |  26 -----
 .../freebsd-sources/freebsd-sources-8.2-r2.ebuild  | 108 ---------------------
 7 files changed, 287 deletions(-)
 delete mode 100644 sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
 delete mode 100644 sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
 delete mode 100644 sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
 delete mode 100644 sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
 delete mode 100644 sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
 delete mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild

(limited to 'sys-freebsd')

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index cb987fb75a3b..8d66cc22f48f 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -4,5 +4,4 @@ DIST freebsd-sources-EN-1708-pf.patch 706 BLAKE2B 7b812c1d696f2a1ab6e648228fe4fc
 DIST freebsd-sources-SA-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e
 DIST freebsd-sources-SA-1710-kldstat.patch 2155 BLAKE2B e2c47d72a4a497283d7def916cdf0991b5ec791f545736474db18301866362b3c96f0a4ac5e7c1c2a91535961ac048e5e1c1e7ad10d10ced3dba954453a04ef5 SHA512 a5cc0acfcac8401fb4066fd5bfbaa1c5718a38f05877b8fb1c5a9cce1df9af4a82bd1c263c80c2b58ad058349753dcec9c4aa13bdb178f3b80493785badc65a4
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
deleted file mode 100644
index 43d01baef347..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ruN sys.orig/conf/kern.post.mk sys/conf/kern.post.mk
---- sys.orig/conf/kern.post.mk	2007-03-23 18:55:59 -0300
-+++ sys/conf/kern.post.mk	2008-06-18 19:51:13 -0300
-@@ -85,7 +85,9 @@
- ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
- 	@rm -f ${.TARGET}
- 	@echo linking ${.TARGET}
--	${SYSTEM_LD}
-+	${SYSTEM_LD} -o ${.TARGET}.tmp
-+	@sh $S/tools/gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt
-+	${SYSTEM_LD} "@${.TARGET}.lopt"
- .if defined(CTFMERGE)
- 	${SYSTEM_CTFMERGE}
- .endif
-diff -ruN sys.orig/conf/kmod.mk sys/conf/kmod.mk
---- sys.orig/conf/kmod.mk	2008-06-18 09:11:53 -0300
-+++ sys/conf/kmod.mk	2008-06-18 19:50:01 -0300
-@@ -176,7 +176,8 @@
- 
- .if ${MACHINE_ARCH} != amd64
- ${FULLPROG}: ${KMOD}.kld
--	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
-+	sh ./@/tools/gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
-+	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
- .if !defined(DEBUG_FLAGS)
- 	${OBJCOPY} --strip-debug ${.TARGET}
- .endif
-diff -ruN sys.orig/tools/gen-ld-u-options sys/tools/gen-ld-u-options
---- sys.orig/tools/gen-ld-u-options	1969-12-31 21:00:00 -0300
-+++ sys/tools/gen-ld-u-options	2008-06-18 19:47:56 -0300
-@@ -0,0 +1,6 @@
-+#!/bin/sh
-+
-+for i in `objdump -h -w $1 | grep set_ | cut -c5- | cut -f1 -d " "`
-+do
-+    echo -n " -u __start_$i -u __stop_$i "
-+done
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
deleted file mode 100644
index 4fa3565207ec..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-My UltraSPARC U5 panics on boot about a memory alignment error when compiled
-with gcc4 and -O. Compiling with -O2 fixes this, and it should not adversly
-affect debugging.
-
-NOTE: This does not fix the memory alignment panic when loading kernel modules.
-
-Roy Marples (uberlord@gentoo.org)
-
---- sys/conf/kern.pre.mk.old	2009-05-22 10:09:46 +0000
-+++ sys/conf/kern.pre.mk	2009-05-22 10:10:27 +0000
-@@ -22,15 +22,13 @@
- COPTFLAGS?=	-O
- .else
- . if defined(DEBUG)
--_MINUS_O=	-O
- CTFFLAGS+=	-g
- . else
--_MINUS_O=	-O2
- . endif
- . if ${MACHINE_ARCH} == "amd64"
- COPTFLAGS?=-O2 -frename-registers -pipe
- . else
--COPTFLAGS?=${_MINUS_O} -pipe
-+COPTFLAGS?=-O2 -pipe
- . endif
- . if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
- COPTFLAGS+= -fno-strict-aliasing
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
deleted file mode 100644
index 0f8d070e9a31..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- sys/conf/kern.mk.old	2007-05-24 23:53:42.000000000 +0200
-+++ sys/conf/kern.mk	        2008-03-14 14:37:47.216420518 +0100
-@@ -12,7 +12,7 @@
- .else
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		${_wundef} ${_Wno_pointer_sign} -fformat-extensions
-+		${_wundef} ${_Wno_pointer_sign}
- .if !defined(WITH_GCC3)
- _Wno_pointer_sign=-Wno-pointer-sign
- .endif
-@@ -36,7 +36,7 @@
- # reserved for user applications.
- #
- .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2 \
-+CFLAGS+=	-mpreferred-stack-boundary=2 \
- 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
- INLINE_LIMIT?=	8000
- .endif
-Only in ./sys/conf: kern.mk.rej
-Only in ./sys/conf: kern.mk~
---- sys/dev/aic7xxx/aicasm/Makefile.old	2010-03-10 14:01:50 +0100
-+++ sys/dev/aic7xxx/aicasm/Makefile	2010-03-10 14:01:56 +0100
-@@ -14,7 +14,7 @@
- SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD=	${LIBL}
--LDADD=	-ll
-+LDADD=	-lfl
- WARNS?=	6
- 
- # Correct path for kernel builds
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
deleted file mode 100644
index 50dacd0e5a49..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: sys/kern/uipc_usrreq.c
-===================================================================
---- sys/kern/uipc_usrreq.c	(revision 225745)
-+++ sys/kern/uipc_usrreq.c	(working copy)
-@@ -462,6 +462,8 @@
- 	unp = sotounpcb(so);
- 	KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
- 
-+	if (soun->sun_len > sizeof(struct sockaddr_un))
-+		return (EINVAL);
- 	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
- 	if (namelen <= 0)
- 		return (EINVAL);
-@@ -1252,6 +1254,8 @@
- 	unp = sotounpcb(so);
- 	KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
- 
-+	if (nam->sa_len > sizeof(struct sockaddr_un))
-+		return (EINVAL);
- 	len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
- 	if (len <= 0)
- 		return (EINVAL);
-Index: sys/compat/linux/linux_socket.c
-===================================================================
---- sys/compat/linux/linux_socket.c	(revision 225919)
-+++ sys/compat/linux/linux_socket.c	(working copy)
-@@ -104,6 +104,7 @@
- 	int oldv6size;
- 	struct sockaddr_in6 *sin6;
- #endif
-+	int namelen;
- 
- 	if (*osalen < 2 || *osalen > UCHAR_MAX || !osa)
- 		return (EINVAL);
-@@ -166,6 +167,20 @@
- 		}
- 	}
- 
-+	if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) {
-+		for (namelen = 0;
-+		    namelen < *osalen - offsetof(struct sockaddr_un, sun_path);
-+		    namelen++)
-+			if (!((struct sockaddr_un *)kosa)->sun_path[namelen])
-+				break;
-+		if (namelen + offsetof(struct sockaddr_un, sun_path) >
-+		    sizeof(struct sockaddr_un)) {
-+			error = EINVAL;
-+			goto out;
-+		}
-+		alloclen = sizeof(struct sockaddr_un);
-+	}
-+
- 	sa = (struct sockaddr *) kosa;
- 	sa->sa_family = bdom;
- 	sa->sa_len = alloclen;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
deleted file mode 100644
index 0bf1b611a091..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: sys/amd64/amd64/trap.c
-===================================================================
---- sys/amd64/amd64/trap.c.orig
-+++ sys/amd64/amd64/trap.c	(working copy)
-@@ -972,4 +972,21 @@
- 	     syscallname(td->td_proc, sa.code)));
- 
- 	syscallret(td, error, &sa);
-+
-+	/*
-+	 * If the user-supplied value of %rip is not a canonical
-+	 * address, then some CPUs will trigger a ring 0 #GP during
-+	 * the sysret instruction.  However, the fault handler would
-+	 * execute with the user's %gs and %rsp in ring 0 which would
-+	 * not be safe.  Instead, preemptively kill the thread with a
-+	 * SIGBUS.
-+	 */
-+	if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) {
-+		ksiginfo_init_trap(&ksi);
-+		ksi.ksi_signo = SIGBUS;
-+		ksi.ksi_code = BUS_OBJERR;
-+		ksi.ksi_trapno = T_PROTFLT;
-+		ksi.ksi_addr = (void *)td->td_frame->tf_rip;
-+		trapsignal(td, &ksi);
-+	}
- }
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild
deleted file mode 100644
index 03ee1d16a6ed..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 8.2-RELEASE it's 800001.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=800001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	epatch "${FILESDIR}/${PN}-8.0-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i	"${S}/conf/ldscript.sparc64" || die
-	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
-	epatch "${FILESDIR}/${PN}-7.2-debug-O2.patch"
-	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
-	# http://security.FreeBSD.org/patches/SA-11:05/unix2.patch
-	epatch "${FILESDIR}"/${P}-unix2.patch
-
-	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
-	# vop_whiteout to tmpfs, so it can be used as an overlay
-	# unionfs filesystem over the cd9660 readonly filesystem.
-	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-
-	# See https://sourceware.org/bugzilla/show_bug.cgi?id=5391
-	# ld doesn't provide symbols constructed as the __start_set_(s) ones
-	# are on FreeBSD modules.
-	# This patch adds code to generate a list of these and adds them
-	# as undefined references to ld's commandline to get them.
-	# Without this kernel modules will not load.
-	epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch"
-
-	epatch "${FILESDIR}/${PN}-cve-2012-0217.patch"
-	epatch "${FILESDIR}/${PN}-9.0-ipv6refcount.patch"
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		# just in case...
-		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-
-#	if use sparc-fbsd ; then
-#		ewarn "WARNING: kldload currently causes kernel panics"
-#		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-#		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-#		ewarn "Please compile all modules you need into the kernel"
-#	fi
-}
-- 
cgit v1.2.3-65-gdbad