remove patches that have been merged upstream

7 files changed, 0 insertions, 188 deletions

diff --git a/dev-libs/uclibc/files/cvs/01_all_uClibc-pie-option.patch b/dev-libs/uclibc/files/cvs/01_all_uClibc-pie-option.patch
deleted file mode 100644
index 41beaea78abc..000000000000
--- a/dev-libs/uclibc/files/cvs/01_all_uClibc-pie-option.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- extra/Configs/Config.in.mps	2004-01-05 11:07:27.000000000 +0100
-+++ extra/Configs/Config.in	2004-01-05 11:10:58.000000000 +0100
-@@ -180,13 +180,14 @@
- config UCLIBC_PIE_SUPPORT
- 	bool "Support ET_DYN in shared library loader"
- 	select FORCE_SHAREABLE_TEXT_SEGMENTS
-+	select UCLIBC_COMPLETELY_PIC
- 	default n
- 	help
- 	  If you answer Y here, the uClibc native shared library loader will
- 	  support ET_DYN/PIE executables.
- 	  It requires binutils-2.14.90.0.6 or later and the usage of the
- 	  -pie option.
--	  More about ET_DYN/PIE binaries on <http://pageexec.virtualave.net/> .
-+	  More about ET_DYN/PIE binaries on <http://pax.grsecurity.net/> .
- 	  WARNING: This option also enables FORCE_SHAREABLE_TEXT_SEGMENTS, so all
- 		libraries have to be built with -fPIC or -fpic, and all assembler
- 		functions must be written as position independent code (PIC).
diff --git a/dev-libs/uclibc/files/cvs/02_all_uClibc-Makefile.patch b/dev-libs/uclibc/files/cvs/02_all_uClibc-Makefile.patch
deleted file mode 100644
index 965ace9c0cb3..000000000000
--- a/dev-libs/uclibc/files/cvs/02_all_uClibc-Makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- extra/scripts/fix_includes.sh.mps	2004-01-05 11:14:05.000000000 +0100
-+++ extra/scripts/fix_includes.sh	2004-01-05 12:25:11.000000000 +0100
-@@ -59,10 +59,10 @@
-     esac;
- done;
- 
--if [ ! -f "$KERNEL_SOURCE/Makefile" ]; then
-+if [ ! -f "$KERNEL_SOURCE/Makefile" -a ! -f "$KERNEL_SOURCE/include/linux/version.h" ]; then
-     echo "";
-     echo "";
--    echo "The file $KERNEL_SOURCE/Makefile is missing!";
-+    echo "The file $KERNEL_SOURCE/Makefile or $KERNEL_SOURCE/include/linux/version.h is missing!";
-     echo "Perhaps your kernel source is broken?"
-     echo "";
-     echo "";
-@@ -78,8 +78,21 @@
-     exit 1;
- fi;
- 
--# set current VERSION, PATCHLEVEL, SUBLEVEL, EXTERVERSION
-+if [ -f "$KERNEL_SOURCE/Makefile" ] ; then
-+# set current VERSION, PATCHLEVEL, SUBLEVEL, EXTRAVERSION
- eval `sed -n -e 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' -e 's/^\([A-Z]*\) = \(-[-a-z0-9]*\)$/\1=\2/p' $KERNEL_SOURCE/Makefile`
-+else
-+ver=`grep UTS_RELEASE $KERNEL_SOURCE/include/linux/version.h | cut -d '"' -f 2`
-+VERSION=`echo "$ver" | cut -d '.' -f 1`
-+PATCHLEVEL=`echo "$ver" | cut -d '.' -f 2`
-+if echo "$ver" | grep -q '-' ; then
-+SUBLEVEL=`echo "$ver" | sed "s/${VERSION}.${PATCHLEVEL}.//" | cut -d '-' -f 1`
-+EXTRAVERSION=`echo "$ver" | sed "s/${VERSION}.${PATCHLEVEL}.${SUBLEVEL}-//"`
-+else
-+SUBLEVEL=`echo "$ver" | cut -d '.' -f 3`
-+#EXTRAVERSION=
-+fi
-+fi
- if [ -z "$VERSION" -o -z "$PATCHLEVEL" -o -z "$SUBLEVEL" ]
- then
-     echo "Unable to determine version for kernel headers"
diff --git a/dev-libs/uclibc/files/cvs/03_all_uClibc-ssp-sigtype.patch b/dev-libs/uclibc/files/cvs/03_all_uClibc-ssp-sigtype.patch
deleted file mode 100644
index 7a4811021460..000000000000
--- a/dev-libs/uclibc/files/cvs/03_all_uClibc-ssp-sigtype.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- extra/Configs/Config.in.ssp	2004-02-01 16:49:31.000000000 +0100
-+++ extra/Configs/Config.in	2004-02-01 16:51:59.000000000 +0100
-@@ -231,6 +231,34 @@
- 	  gcc version, were __guard and __stack_smash_handler are removed from libgcc.
- 	  Most people will answer N.
- 
-+choice
-+	prompt "Propolice protection blocking signal"
-+	depends on UCLIBC_PROPOLICE
-+	default PROPOLICE_BLOCK_ABRT if ! DODEBUG
-+	default PROPOLICE_BLOCK_SEGV if DODEBUG
-+	help
-+	  "abort" use SIGABRT to block offending programs.
-+	  This is the default implementation.
-+
-+	  "segfault" use SIGSEGV to block offending programs.
-+	  Use this for debugging.
-+
-+	  "kill" use SIGKILL to block offending programs.
-+	  Perhaps the best for security.
-+
-+	  If unsure, answer "abort".
-+
-+config PROPOLICE_BLOCK_ABRT
-+	bool "abort"
-+
-+config PROPOLICE_BLOCK_SEGV
-+	bool "segfault"
-+
-+config PROPOLICE_BLOCK_KILL
-+	bool "kill"
-+
-+endchoice
-+
- config HAS_NO_THREADS
- 	bool
- 	default y
diff --git a/dev-libs/uclibc/files/cvs/08_all_uClibc-pt_pax.patch b/dev-libs/uclibc/files/cvs/08_all_uClibc-pt_pax.patch
deleted file mode 100644
index 7b66ab9acc00..000000000000
--- a/dev-libs/uclibc/files/cvs/08_all_uClibc-pt_pax.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- include/elf.h.mps	2004-05-08 13:51:59.000000000 +0200
-+++ include/elf.h	2004-05-08 13:52:38.000000000 +0200
-@@ -567,6 +567,7 @@ typedef struct
- #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-+#define PT_PAX_FLAGS	0x65041580	/* Indicates PaX flag markings */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-@@ -580,6 +581,18 @@ typedef struct
- #define PF_X		(1 << 0)	/* Segment is executable */
- #define PF_W		(1 << 1)	/* Segment is writable */
- #define PF_R		(1 << 2)	/* Segment is readable */
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
- #define PF_MASKOS	0x0ff00000	/* OS-specific */
- #define PF_MASKPROC	0xf0000000	/* Processor-specific */
- 
diff --git a/dev-libs/uclibc/files/cvs/09_all_uClibc-test-make.patch b/dev-libs/uclibc/files/cvs/09_all_uClibc-test-make.patch
deleted file mode 100644
index 1f19428d2ab3..000000000000
--- a/dev-libs/uclibc/files/cvs/09_all_uClibc-test-make.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- test/Makefile.mps	2003-10-18 11:20:27.000000000 +0100
-+++ test/Makefile	2004-02-02 13:55:45.000000000 +0100
-@@ -22,19 +22,19 @@
- .EXPORT_ALL_VARIABLES:
- 
- 
--ALL_SUBDIRS = args assert ctype dlopen pwd_grp signal silly stdlib string unistd crypt #misc
-+ALL_SUBDIRS = args assert ctype pwd_grp signal silly stdlib string unistd crypt #misc
- DIRS = $(ALL_SUBDIRS)
- #ifeq ($(TARGET_ARCH), $(HOST_ARCH))
- #	DIRS = $(ALL_SUBDIRS)
- #else
- #	DIRS =
- #endif
--ifeq ($(strip $(HAVE_SHARED)),true)
--  ifeq ($(strip $(DODYNAMIC)),true)
-+ifeq ($(HAVE_SHARED),y)
-+  ifeq ($(BUILD_UCLIBC_LDSO),y)
- 	DIRS += dlopen
-   endif	
- endif	
--ifeq ($(strip $(INCLUDE_THREADS)),true)
-+ifeq ($(UCLIBC_HAS_THREADS),y)
-     DIRS += pthread
- endif	
- 
---- test/Rules.mak.mps	2004-01-03 00:10:37.000000000 +0100
-+++ test/Rules.mak	2004-02-02 13:54:59.000000000 +0100
-@@ -44,7 +44,7 @@
- CROSS=
- CC= $(CROSS)gcc
- STRIPTOOL=strip
--LDD=../$(TESTDIR)ldso/util/ldd
-+LDD=../$(TOPDIR)/utils/ldd
- 
- RM= rm -f
- 
diff --git a/dev-libs/uclibc/files/cvs/10_all_uClibc-ldso-ssp.patch b/dev-libs/uclibc/files/cvs/10_all_uClibc-ldso-ssp.patch
deleted file mode 100644
index 978925d4cb13..000000000000
--- a/dev-libs/uclibc/files/cvs/10_all_uClibc-ldso-ssp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ldso/ldso/Makefile.orig	2004-08-25 22:29:27 +0000
-+++ ldso/ldso/Makefile	2004-08-25 22:29:45 +0000
-@@ -21,7 +21,9 @@
- include $(TOPDIR)Rules.mak
- LDSO_FULLNAME=ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
- 
--XXFLAGS=$(XWARNINGS) $(LIBRARY_CACHE)
-+SSPFLAGS=$(call check_gcc,-fno-stack-protector,)
-+
-+XXFLAGS=$(XWARNINGS) $(LIBRARY_CACHE) $(SSPFLAGS)
- ifeq ($(DODEBUG),y)
- # Not really much point in including debugging info, since gdb
- # can't really debug ldso, since gdb requires help from ldso to
diff --git a/dev-libs/uclibc/files/cvs/12_all_uClibc-libc-ssp.patch b/dev-libs/uclibc/files/cvs/12_all_uClibc-libc-ssp.patch
deleted file mode 100644
index cb2e9de6dd99..000000000000
--- a/dev-libs/uclibc/files/cvs/12_all_uClibc-libc-ssp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- uClibc-0.9.26/Rules.mak.mps	2004-05-17 15:10:52.000000000 +0200
-+++ uClibc-0.9.26/Rules.mak	2004-05-17 15:23:24.000000000 +0200
-@@ -208,8 +208,12 @@ ifeq ($(strip $(TARGET_ARCH)),arm)
- endif
- endif
- 
-+ifeq ($(SSP_CFLAGS),)
-+SSP_CFLAGS=$(call check_gcc,-fno-stack-protector-all,)
-+endif
-+
- # Some nice CFLAGS to work with
--CFLAGS=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) $(CPU_CFLAGS) \
-+CFLAGS=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \
- 	-fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
- 
- ifeq ($(DODEBUG),y)