diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2011-04-23 13:46:21 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2011-04-23 13:46:21 +0000 |
commit | b79f3966e6846c57b8baba684f0e1381d72a2760 (patch) | |
tree | f993b0a7414064128e7b29b5b524d47721c9bdc9 /app-admin | |
parent | Version bump. (diff) | |
download | historical-b79f3966e6846c57b8baba684f0e1381d72a2760.tar.gz historical-b79f3966e6846c57b8baba684f0e1381d72a2760.tar.bz2 historical-b79f3966e6846c57b8baba684f0e1381d72a2760.zip |
Removed deprecated versions.
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/paxtest/ChangeLog | 11 | ||||
-rw-r--r-- | app-admin/paxtest/Manifest | 22 | ||||
-rw-r--r-- | app-admin/paxtest/files/Makefile-portable | 236 | ||||
-rw-r--r-- | app-admin/paxtest/files/Makefile.psm5 | 207 | ||||
-rw-r--r-- | app-admin/paxtest/files/paxtest-0.9.5-use-fPIE.patch | 33 | ||||
-rw-r--r-- | app-admin/paxtest/files/paxtest-0.9.5.1.diff | 92 | ||||
-rw-r--r-- | app-admin/paxtest/paxtest-0.9.5-r1.ebuild | 44 | ||||
-rw-r--r-- | app-admin/paxtest/paxtest-0.9.6.ebuild | 35 | ||||
-rw-r--r-- | app-admin/paxtest/paxtest-0.9.7_pre4.ebuild | 42 |
9 files changed, 20 insertions, 702 deletions
diff --git a/app-admin/paxtest/ChangeLog b/app-admin/paxtest/ChangeLog index 2d0eb3566a9c..84c532df5ef7 100644 --- a/app-admin/paxtest/ChangeLog +++ b/app-admin/paxtest/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/paxtest -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.40 2010/09/18 17:33:48 blueness Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.41 2011/04/23 13:46:20 blueness Exp $ + + 23 Apr 2011; Anthony G. Basile <blueness@gentoo.org> + -paxtest-0.9.5-r1.ebuild, -files/paxtest-0.9.5.1.diff, + -files/paxtest-0.9.5-use-fPIE.patch, -paxtest-0.9.6.ebuild, + -files/Makefile.psm5, -files/Makefile-portable, + -paxtest-0.9.7_pre4.ebuild: + Removed deprecated versions. 18 Sep 2010; Anthony G. Basile <blueness@gentoo.org> paxtest-0.9.5-r1.ebuild, paxtest-0.9.6.ebuild: diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest index 80e6bc65ed26..1513bbb2b928 100644 --- a/app-admin/paxtest/Manifest +++ b/app-admin/paxtest/Manifest @@ -1,19 +1,19 @@ -AUX Makefile-portable 7373 RMD160 bed87b6e723fb9042d6b1cd7379d9b1387bd9ba9 SHA1 50f8afbec0bfd2b7602a1734189dc1310298556c SHA256 856e805d432a52078534241ab5c79555a76eda0765d3cdf99b2173252c870842 -AUX Makefile.psm5 6157 RMD160 f385de3fbae354bbfda683587273f1f8e0edfb1c SHA1 c3981f529ef058e29499ee64534aca96a8d99a33 SHA256 6f8579361cfb3a055ae5450c6b3ffa7a07510e9382addb15fcf32f5541bf89a1 -AUX paxtest-0.9.5-use-fPIE.patch 813 RMD160 86f9d9456dbedde81853302f28bbe212aa8418ea SHA1 78e16661716988899cb2a1ba3b697a1fc07d099f SHA256 585f2d34cd438a3b9b3f05868f8a6e7a72af009c35e74feed4e33294a13fd2c6 -AUX paxtest-0.9.5.1.diff 2369 RMD160 7601b098ae29afb27de7d3460d777fb13c6d4824 SHA1 872b9c3e9a162bb3347bf07d6d447d74ddd98da3 SHA256 9b9ccde9603017be034d6ee3b63daa2ff7b2af5ba3b789429a58948bedf20a95 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX paxtest-0.9.7_pre5-Makefile.patch 1850 RMD160 5c34ff0c50fab36f1d450740601bdb1bbb6b4887 SHA1 9bd1eb5bcc14e867ab21d3b3546c155d459ace14 SHA256 2bceb20a825885cd2c127bfeff74f90abace0802e4f4e10e53976b16b2afaca8 AUX paxtest-0.9.7_pre5-missing-includes.patch 1139 RMD160 498d140cfe8dfae64bcc1c4f61efe550536b7656 SHA1 d547e9f7eba9faa7130f471175b018c1ad929216 SHA256 335107b93d3c76e4dc0321a030797e56436c5c99d3d4014172ae56f3c4670747 AUX paxtest-0.9.9-Makefile.patch 1966 RMD160 fa46054fdc50d0cb1257a096ab9657abd6deb7bf SHA1 dd47081c8520fc0178ad7ca7077c02a426bae229 SHA256 02e4ee1b395cc0fcf5827689c44f55e196b3225ef1898b57dadbd22044ff8e69 -DIST paxtest-0.9.5.tar.gz 26961 RMD160 28576260c17d887bbbc975948060805ca6b1345c SHA1 b053108597bbb339a0a89d1ce9b2d0cc5a5a5850 SHA256 2f055e14c794cddbe9cb32387e829f69a97c605aca9821cca5010068340002be -DIST paxtest-0.9.6.tar.gz 35747 RMD160 a19ef178bf11d2e3a007e6958f4e371ce941b97c SHA1 591065b15431d5b34a98a2e8946ff3cd09bbd0ff SHA256 d79bed06edbb28e3c69bba653a216cea3ed3f1704aeefe1565eddcbae8cd49b5 -DIST paxtest-0.9.7-pre4.tar.gz 34552 RMD160 dab85b408f0efc7c3de39563fda852be23771427 SHA1 edd55c07fbdbff862e531caa003fe8661425d0c9 SHA256 033c60eeed8e7ddf877b60e239f5b79c76874f53c3b656c16ed0e02893d014b5 DIST paxtest-0.9.7-pre5.tar.gz 34957 RMD160 f462d64a264d11b3b6024e1d09d2e48d58f2f731 SHA1 01fedc84b3c90ab0775dd0a2e41ac958f09f577e SHA256 32281809faf163857ca228b22d66c789370ff4464ccaeb195e330085024df3c9 DIST paxtest-0.9.9-r1.tgz 32095 RMD160 c3d19b0ad402ba9113fbd7007022fc600d9b368b SHA1 3e65c82c6e396767d516bbf884c6577bb4611244 SHA256 caca340492dedeee588d47683efde9797cba4fce5adca5d5f9b0b73b2120e1ab -EBUILD paxtest-0.9.5-r1.ebuild 1130 RMD160 a942c087239b18a46bf2f3e145c7b6923f7cc33c SHA1 51808290f7d0581c63a4d2ec7beffcef3318ea2b SHA256 e146536dac3c0be38c49fd38a33f5bb190399513b5ef1a286b1b2431da45561a -EBUILD paxtest-0.9.6.ebuild 990 RMD160 33c17a02cd3d0cb7ad3bbd4d93b9eba2d966565b SHA1 c9c1c6cc6c3d09dff3326b93a2a4a808358ddd2c SHA256 b762459d0d46a28fdb28ca9d1b1e790e6562a1834d9d4ddacce6ab7b7a0e9d2b -EBUILD paxtest-0.9.7_pre4.ebuild 1134 RMD160 075c0c738647a6ac2acc4dff6777aab711c40ed7 SHA1 39b157f8699b88ba0369be979f95bb667696e56f SHA256 9a4c81a916da64386b4d35cdd9c60b15cd8f8639e33182471d5fa5acd69ceb65 EBUILD paxtest-0.9.7_pre5.ebuild 1745 RMD160 c7b25f22e15e3f27302d171c3e11fef8e056fdc0 SHA1 31f4bbfc567035e632269edf799f8eab49c7f8dd SHA256 c431fdd351f48b80cbd61349cba85623a01211531553bcae42b3e3be5e731309 EBUILD paxtest-0.9.9-r1.ebuild 2413 RMD160 7c2ce17177aae113ccdcc4b0b71543798f39aefa SHA1 9e09f3d39408b0c91a30be4e10fae52b7cfdc6e5 SHA256 83d8a3cd790738b8ba48b6c2307c722853d510fada40923ef78638a88a39e031 -MISC ChangeLog 5658 RMD160 1b5b9eb6a93e6e9644fe64664771601903f27a70 SHA1 67a93ac4eb046411f33662d598bfcfcdbad0aead SHA256 c6e52d3585117dc5bc185b39fd8aab9a4f241cb6408f036b1e88b00845d7d8a1 +MISC ChangeLog 5944 RMD160 9c285534d627d161820ff2e089b7481e68001c3f SHA1 db78d65055e3ef66ffadee184e381b56b5e9ff7f SHA256 f9820b8e75bc577188b992321834e38186167cd97839e74dfc6848b58d61199a MISC metadata.xml 1085 RMD160 c54eb71eaf1067ea9716ed08e4cf36de55d1b5fc SHA1 e7055d216ad00e2af1c1d6e7b2739bb594b2e210 SHA256 f6ddd43e5c847f136548ea6037ba1546303885abb7e4fe3d6c60cdc860def948 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEAREIAAYFAk2y2DcACgkQl5yvQNBFVTUpJQCgjhFTOT8f2dGTT0aNWQJy+rVp +iswAoJTVshaWz8Se6tKii8VHhjoVoQfX +=kDBe +-----END PGP SIGNATURE----- diff --git a/app-admin/paxtest/files/Makefile-portable b/app-admin/paxtest/files/Makefile-portable deleted file mode 100644 index 65142e426daa..000000000000 --- a/app-admin/paxtest/files/Makefile-portable +++ /dev/null @@ -1,236 +0,0 @@ -#!/usr/bin/make - -# tested with make-3.79.1/gcc-2.96 (shared) and make-3.80/gcc-3.3.2/3 (pie) -# make-3.79.1 does not support $$@ as target requirement (works for make-3.80) - -# preliminaries: -# Adamantix modifies the specs adding etexec/etdyn for ET_EXEC/ET_DYN binaries -# Adamantix's behaviour is presumed (no answers from peter@adamantix) -# Gentoo modifies the specs adding yet_dyn/pie|yet_exec/nopie to enable|disable ET_DYN binaries -# -# disable ET_DYN binary building explicitely, where needed by setting -# Adamantix: etexec -# Gentoo: nopie/yet_exec - -# gcc does not check correctly -y<something>, so we have to grep the specs file - -# Gentoo used this to have non ET_DYN behaviour -# not working anymore w/ gcc-3.3.3-r1, since we do not know the defaults -#GCC_SPCS := $(shell gcc -dumpspecs > dumpspecs) -#CC := gcc -specs=dumpspecs - -CC := gcc -CC_PIC := -fPIC -DPIC - -# Adamantix -CC_PIE := $(shell if grep -q "etdyn" `gcc -print-file-name=specs` ; then echo "-etdyn"; fi) -CC_ETEXEC := $(shell if grep -q "etexec" `gcc -print-file-name=specs` ; then echo "-etexec"; fi) - -# non Adamantix case -ifneq ($(CC_ETEXEC),-etexec) - -SCRT_FILE := $(shell if test -r /usr/lib/crt1S.o; then echo "/usr/lib/crt1S.o"; fi) -ifeq ($(SCRT_FILE),) -SCRT_FILE := $(shell if test -r /usr/lib/Scrt1.o; then echo "/usr/lib/Scrt1.o"; fi) -endif -# we can use -pie only if /usr/lib/Scrt1.o exists -ifneq ($(SCRT_FILE),) -# test works only for -fpie, not -pie, why? -CC_PIE := $(shell if gcc -fpie -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-pie"; fi) - -# Gentoo disabling ET_DYN -ifeq ($(CC_PIE),-pie) -CC_ETEXEC := $(shell if grep -q "nopie" `gcc -print-file-name=specs` ; then echo "-nopie"; fi) -endif -endif - -ifeq ($(CC_PIE),) -# Gentoo creating ET_DYN (if defaulting to ET_EXEC) -CC_PIE := $(shell if grep -q "yet_dyn" `gcc -print-file-name=specs` ; then echo "-yet_dyn"; fi) -# Gentoo disabling ET_DYN (if defaulting to ET_DYN) -CC_ETEXEC := $(shell if grep -q "yet_exec" `gcc -print-file-name=specs` ; then echo "-yet_exec"; fi) - -# generic case, if we do not have any reference in specs -ifeq ($(CC_PIE),) -# if we have an Scrt1.o file, use that instead of the locally built one -# could someone test this on platforms, where Scrt1.o exists, but there -# is no equivalent crt1S.S? At least it works for uClibc. -ifeq ($(SCRT_FILE),) -SCRT_FILE := crt1S.o -endif - -CC_PIE := -shared -PAX_DEP := $(SCRT_FILE) interp.o - -# end of generic -endif - -# end of Gentoo -endif - -# end of non-Adamantix case -endif - -# check for stack-protector -CC_SSP := $(shell if gcc -fno-stack-protector -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-stack-protector"; fi) -CC_SSP_ALL := $(shell if gcc -fno-stack-protector-all -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-stack-protector-all"; fi) - -# check for installed binaries -CHPAXBIN := $(shell if which chpax >/dev/null 2>&1 ; then echo chpax; fi) -PAXCTLBIN := $(shell if which paxctl >/dev/null 2>&1 ; then echo paxctl; fi) -# should somehow use this to see if we really need paxctl -# list=`paxctl -qQv /sbin/paxctl 2>/dev/null`; if echo $list | grep -q "PaX flags" ; then echo paxctl; fi -# instead we use both markings to have paxtest running correctly on all platforms - -ifneq ($(PAXCTLBIN),) -DUMMY := $(shell echo '${PAXCTLBIN} $$*' > paxbin) -endif - -OPT_FLAGS := -O2 -PTHREAD := -lpthread -# define stripping of binaries/libs here, or set these on make's commandline, -# else you'll loose the chpax flags! -LDFLAGS := -SHLDFLAGS := -ifndef RUNDIR -RUNDIR := . -endif - -# The Hardened GCC compiler has stack protector on by default, this -# could interfere with the results of this test. - -CFLAGS := $(OPT_FLAGS) -DRUNDIR=\"${RUNDIR}\" $(CC_SSP) $(CC_SSP_ALL) - -EXEC_TESTS = anonmap execbss execdata execheap execstack -MPROT_TESTS = mprotanon mprotbss mprotdata mprotheap mprotstack -MPROTSH_TESTS = mprotshbss mprotshdata writetext -RAND_TESTS = randamap randheap1 randheap2 randmain1 randmain2 randshlib randstack1 randstack2 -RET_TESTS = rettofunc1 rettofunc2 -RETX_TESTS = rettofunc1x rettofunc2x -SHLIB_TESTS = shlibbss shlibdata - -TESTS = $(EXEC_TESTS) $(MPROT_TESTS) $(MPROTSH_TESTS) $(RAND_TESTS) $(RET_TESTS) $(RETX_TESTS) $(SHLIB_TESTS) - -UTILS= getamap getheap1 getheap2 getmain1 getmain2 getshlib getstack1 getstack2 - -SHLIBS= shlibtest.so shlibtest2.so - -ifeq ($(CHPAXBIN),) -CHPAXVER := 0.5 -CHPAX := chpax-$(CHPAXVER) -CHPAXSRC := $(CHPAX)/aout.c $(CHPAX)/chpax.c $(CHPAX)/elf32.c $(CHPAX)/elf64.c $(CHPAX)/flags.c $(CHPAX)/io.c -CHPAXBIN := ./chpax -all: chpax $(SHLIBS) $(TESTS) $(UTILS) paxtest -else -all: $(SHLIBS) $(TESTS) $(UTILS) paxtest -endif - -DUMMY := $(shell echo '${CHPAXBIN} $$*' >> paxbin; chmod +x paxbin) - -PAXBIN := ./paxbin - -clean: - -rm -f *.o *.s *~ core - -rm -f $(TESTS) $(UTILS) $(SHLIBS) - -rm -f paxtest paxtest.log a.out dumpspecs paxbin - -ifdef DESTDIR -ifdef BINDIR -ifdef RUNDIR -install: all - mkdir -p $(DESTDIR)/$(RUNDIR) - cp $(SHLIBS) $(TESTS) $(UTILS) $(DESTDIR)/$(RUNDIR) - mkdir -p $(DESTDIR)/$(BINDIR) - cp paxtest $(DESTDIR)/$(BINDIR) - chmod 755 $(DESTDIR)/$(BINDIR)/paxtest -endif -endif -endif - -chpax: $(CHPAXSRC:.c=.o) - $(CC) $(LDFLAGS) -o $@ $^ - -paxtest: $(TESTS) genpaxtest - sh genpaxtest $(TESTS) - -.S.o: - $(CC) $(CFLAGS) $(CC_PIC) -o $@ -c $< -.c.o: - $(CC) $(CFLAGS) -o $@ -c $< - -$(EXEC_TESTS) $(MPROT_TESTS): body.o - $(CC) $(CFLAGS) -o $@.o -c $@.c - $(CC) $(LDFLAGS) -o $@ $< $@.o $(PTHREAD) - -$(RAND_TESTS): randbody.o - $(CC) $(CFLAGS) -o $@.o -c $@.c - $(CC) $(LDFLAGS) -o $@ $< $@.o - -getamap: getamap.o - $(CC) $(LDFLAGS) -o $@ $@.o - -# get heap1/main1 are built w/o PIC -get%1.o: get%.c - $(CC) $(CFLAGS) $(CC_ETEXEC) -o $@ -c $< - -# get heap2/main2 are built w/ PIC -get%2.o: get%.c - $(CC) $(CFLAGS) $(CC_PIC) -o $@ -c $< - -# Adamantix uses the PIC version (getheap2.o), not necessary for ET_EXEC -# build as ET_EXEC (not in Adamantix's Makefile) -getheap1: getheap1.o - $(CC) $(LDFLAGS) $(CC_ETEXEC) -o $@ $< - -getmain1: getmain1.o - $(CC) $(LDFLAGS) $(CC_ETEXEC) -o $@ $< - $(PAXBIN) -SPRXM $@ - -getheap2 getmain2: $(PAX_DEP) getheap2.o getmain2.o - $(CC) $(LDFLAGS) $(CC_PIE) -o $@ $(PAX_DEP) $@.o - -getshlib: getshlib.o - $(CC) $(LDFLAGS) -o $@ $< -ldl - -# ET_EXEC and usage of "m" is not confirmed (as in Gentoo patch) -# Adamantix does not use it -# Pax Team does not want "m" for getstack1/2 -getstack1: getstack.o - $(CC) $(LDFLAGS) -o $@ $< - $(PAXBIN) -SRp $@ - -getstack2: getstack.o - $(CC) $(LDFLAGS) -o $@ $< - # disable segmexec, kernel else overrides pageexec - $(PAXBIN) -PRs $@ - -$(MPROTSH_TESTS): body.o shlibtest.so - $(CC) $(CFLAGS) -o $@.o -c $@.c - $(CC) $(LDFLAGS) -o $@ $@.o $^ $(PTHREAD) - -# used for RANDEXEC'd binaries -retbody.o: body.c - $(CC) $(CFLAGS) $(CC_ETEXEC) -o $@ -c $< - -# build as ET_EXEC (recommended by PaX Team, not really a requirement) -$(RET_TESTS): retbody.o - $(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c - $(CC) $(LDFLAGS) $(CC_ETEXEC) -o $@ $< $@.o $(PTHREAD) - -# build as ET_EXEC (not in Adamantix's Makefile) -$(RETX_TESTS): retbody.o - $(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c - $(CC) $(LDFLAGS) $(CC_ETEXEC) -o $@ $< $@.o $(PTHREAD) - $(PAXBIN) -SPXM $@ - -# should also shlibbss.o and shlibdata.o be built w/ PIC? -# if yes, remove tes from target and dependency -shlibtes%.o: shlibtes%.c - $(CC) $(CFLAGS) $(CC_PIC) -o $@ -c $< - -shlib%.so: shlib%.o - $(CC) $(SHLDFLAGS) -shared -o $@ $< - -$(SHLIB_TESTS): body.o $(SHLIBS) shlibbss.o shlibdata.o - $(CC) $(LDFLAGS) -o $@ body.o $@.o $(SHLIBS) -ldl $(PTHREAD) - diff --git a/app-admin/paxtest/files/Makefile.psm5 b/app-admin/paxtest/files/Makefile.psm5 deleted file mode 100644 index 8c42af9875bd..000000000000 --- a/app-admin/paxtest/files/Makefile.psm5 +++ /dev/null @@ -1,207 +0,0 @@ -#!/usr/bin/make - -# tested with make-3.79.1/gcc-2.96 (shared) and make-3.80/gcc-3.3.2/3 (pie) -# make-3.79.1 does not support $$@ as target requirement (works for make-3.80) - -# preliminaries: -# Gentoo modifies the specs adding pie/nopie to enable/disable ET_DYN binaries - -CC := gcc -LD := ld -CC_PIC := -fPIC -GCC_SPCS := $(shell $(CC) -print-file-name=${GCC_SPECS:-specs}) - -check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ - then echo "$(1)"; else echo "$(2)"; fi) - -check_as = $(shell if $(CC) -Wa,$(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; \ - then echo "-Wa,$(1)"; fi) - -# stack protector has to be disabled for some tests -CC_SSP := $(call check_gcc,-fno-stack-protector,) -CC_SSP += $(call check_gcc,-fno-stack-protector-all,) - -ASFLAGS := $(call check_as,--noexecstack) - -CC_PIE := $(call check_gcc,-fPIE,-fPIC) - -SCRT_FILE = $(shell if test -r /usr/lib/Scrt1.o ; then echo "/usr/lib/Scrt1.o"; fi) - -ifneq ($(SCRT_FILE),) -LD_PIE = $(shell $(LD) --help | grep -q pie && echo "-Wl,-pie") -ifneq ($(LD_PIE),) -# Gentoo (hardened specs enabled) -CC_ETEXEC = $(shell grep -q "\!nopie" $(GCC_SPCS) && echo "-nopie") -LD_ETEXEC = $(CC_ETEXEC) -endif -else -# generic, local version -SCRT_FILE = crt1S.o -endif - -ifeq ($(LD_PIE),) -LD_PIE = -shared -PAX_DEP = $(SCRT_FILE) interp.o -endif - -# check for installed binaries -CHPAXBIN := $(shell if which chpax >/dev/null 2>&1 ; then echo chpax; fi) -PAXCTLBIN := $(shell if which paxctl >/dev/null 2>&1 ; then echo paxctl; fi) -# should somehow use this to see if we really need paxctl -# list=`paxctl -qQv /sbin/paxctl 2>/dev/null`; if echo $list | grep -q "PaX flags" ; then echo paxctl; fi -# instead we use both markings to have paxtest running correctly on all platforms - -ifneq ($(PAXCTLBIN),) -DUMMY := $(shell echo '${PAXCTLBIN} $$*' > paxbin) -endif - -# for some reason the .c files need it, else GNU_STACK=RWE -OPT_FLAGS := -O2 $(ASFLAGS) -PTHREAD := -lpthread -# define stripping of binaries/libs here, or set these on make's commandline, -# else you'll loose the chpax flags! -LDFLAGS := -SHLDFLAGS := -ifndef RUNDIR -RUNDIR := . -endif - -# The Hardened GCC compiler has stack protector on by default, this -# could interfere with the results of this test. - -CFLAGS := $(OPT_FLAGS) -DRUNDIR=\"${RUNDIR}\" $(CC_SSP) - -EXEC_TESTS = anonmap execbss execdata execheap execstack -MPROT_TESTS = mprotanon mprotbss mprotdata mprotheap mprotstack -MPROTSH_TESTS = mprotshbss mprotshdata writetext -RAND_TESTS = randamap randheap1 randheap2 randmain1 randmain2 randshlib randstack1 randstack2 -RET_TESTS = rettofunc1 rettofunc2 -RETX_TESTS = rettofunc1x rettofunc2x -SHLIB_TESTS = shlibbss shlibdata - -TESTS = $(EXEC_TESTS) $(MPROT_TESTS) $(MPROTSH_TESTS) $(RAND_TESTS) $(RET_TESTS) $(RETX_TESTS) $(SHLIB_TESTS) - -UTILS= getamap getheap1 getheap2 getmain1 getmain2 getshlib getstack1 getstack2 - -SHLIBS= shlibtest.so shlibtest2.so - -ifeq ($(CHPAXBIN),) -CHPAXVER := 0.7 -CHPAX := chpax-$(CHPAXVER) -CHPAXSRC := $(CHPAX)/aout.c $(CHPAX)/chpax.c $(CHPAX)/elf32.c $(CHPAX)/elf64.c $(CHPAX)/flags.c $(CHPAX)/io.c -CHPAXBIN := ./chpax -all: chpax $(SHLIBS) $(TESTS) $(UTILS) paxtest -else -all: $(SHLIBS) $(TESTS) $(UTILS) paxtest -endif - -# we need the failure handling, for kernels not supporting EI_PAX -DUMMY := $(shell echo '${CHPAXBIN} $$* 2>/dev/null ||:' >> paxbin; chmod +x paxbin) - -PAXBIN := ./paxbin -DL := -ldl - -clean: - -rm -f *.o *.s *~ core - -rm -f $(TESTS) $(UTILS) $(SHLIBS) - -rm -f paxtest paxtest.log a.out dumpspecs paxbin - -ifdef DESTDIR -ifdef BINDIR -ifdef RUNDIR -install: all - mkdir -p $(DESTDIR)/$(RUNDIR) - cp $(SHLIBS) $(TESTS) $(UTILS) $(DESTDIR)/$(RUNDIR) - mkdir -p $(DESTDIR)/$(BINDIR) - cp paxtest $(DESTDIR)/$(BINDIR) - chmod 755 $(DESTDIR)/$(BINDIR)/paxtest -endif -endif -endif - -chpax: $(CHPAXSRC:.c=.o) - $(CC) $(LDFLAGS) -o $@ $^ - -paxtest: $(TESTS) genpaxtest - sh genpaxtest $(TESTS) - -.S.o: - $(CC) $(CFLAGS) $(CC_PIE) $(ASFLAGS) -o $@ -c $< -.c.o: - $(CC) $(CFLAGS) -o $@ -c $< - -$(EXEC_TESTS) $(MPROT_TESTS): body.o - $(CC) $(CFLAGS) -o $@.o -c $@.c - $(CC) $(LDFLAGS) -o $@ $< $@.o $(PTHREAD) - -$(RAND_TESTS): randbody.o - $(CC) $(CFLAGS) -o $@.o -c $@.c - $(CC) $(LDFLAGS) -o $@ $< $@.o - -getamap: getamap.o - $(CC) $(LDFLAGS) -o $@ $@.o - -# get heap1/main1 are built w/o PIC -get%1.o: get%.c - $(CC) $(CFLAGS) $(CC_ETEXEC) -o $@ -c $< - -# get heap2/main2 are built w/ PIC -get%2.o: get%.c - $(CC) $(CFLAGS) $(CC_PIE) -o $@ -c $< - -# Adamantix uses the PIC version (getheap2.o), not necessary for ET_EXEC -# build as ET_EXEC (not in Adamantix's Makefile) -getheap1: getheap1.o - $(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< - -getmain1: getmain1.o - $(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< - $(PAXBIN) -SPRXM $@ - -getheap2 getmain2: $(PAX_DEP) getheap2.o getmain2.o - $(CC) $(LDFLAGS) $(LD_PIE) -o $@ $(PAX_DEP) $@.o || (echo -e "#!/bin/sh\necho $@ pie not implemented" > $@; chmod +x $@) - -getshlib: getshlib.o - $(CC) $(LDFLAGS) -o $@ $< $(DL) - -# ET_EXEC and usage of "m" is not confirmed (as in Gentoo patch) -# Adamantix does not use it -# Pax Team does not want "m" for getstack1/2 -getstack1: getstack.o - $(CC) $(LDFLAGS) -o $@ $< - $(PAXBIN) -SRp $@ - -getstack2: getstack.o - $(CC) $(LDFLAGS) -o $@ $< - # disable segmexec, kernel else overrides pageexec - $(PAXBIN) -PRs $@ - -$(MPROTSH_TESTS): body.o shlibtest.so - $(CC) $(CFLAGS) -o $@.o -c $@.c - $(CC) $(LDFLAGS) -o $@ $@.o $^ $(PTHREAD) - -# used for RANDEXEC'd binaries -retbody.o: body.c - $(CC) $(CFLAGS) $(CC_ETEXEC) -o $@ -c $< - -# build as ET_EXEC (recommended by PaX Team, not really a requirement) -$(RET_TESTS): retbody.o - $(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c - $(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD) - -# build as ET_EXEC (not in Adamantix's Makefile) -$(RETX_TESTS): retbody.o - $(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c - $(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD) - $(PAXBIN) -SPXM $@ - -# should also shlibbss.o and shlibdata.o be built w/ PIC? -# if yes, remove tes from target and dependency -shlibtes%.o: shlibtes%.c - $(CC) $(CFLAGS) $(CC_PIC) -o $@ -c $< - -shlib%.so: shlib%.o - $(CC) $(SHLDFLAGS) -shared -o $@ $< - -$(SHLIB_TESTS): body.o $(SHLIBS) shlibbss.o shlibdata.o - $(CC) $(LDFLAGS) -o $@ body.o $@.o $(SHLIBS) $(DL) $(PTHREAD) diff --git a/app-admin/paxtest/files/paxtest-0.9.5-use-fPIE.patch b/app-admin/paxtest/files/paxtest-0.9.5-use-fPIE.patch deleted file mode 100644 index 76c41406d806..000000000000 --- a/app-admin/paxtest/files/paxtest-0.9.5-use-fPIE.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- paxtest-0.9.5.old/Makefile.Gentoo-hardened 2004-07-29 14:56:20.261505592 -0400 -+++ paxtest-0.9.5/Makefile.Gentoo-hardened 2004-07-29 14:57:04.160831880 -0400 -@@ -77,8 +77,6 @@ - paxtest: $(TESTS) genpaxtest - sh genpaxtest $(TESTS) - --crt1S.o: crt1S.S -- - anonmap: body.o anonmap.o - - execbss: body.o execbss.o -@@ -92,8 +90,8 @@ - getheap1: getheap.o - $(CC) $(LDFLAGS) -o $@ $+ - --getheap2: crt1S.o interp.o getheap.o -- $(CC) -shared -o $@ $+ -+getheap2: interp.o getheap.o -+ $(CC) -fPIE -o $@ $+ - - getheap.o: getheap.c - $(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $< -@@ -104,8 +102,8 @@ - $(CC) $(LDFLAGS) -o $@ $+ - chpax -X $@ - --getmain2: crt1S.o interp.o getmain2.o -- $(CC) -shared -o $@ $+ -+getmain2: interp.o getmain2.o -+ $(CC) -fPIE -o $@ $+ - - getmain2.o: getmain.c - $(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $< diff --git a/app-admin/paxtest/files/paxtest-0.9.5.1.diff b/app-admin/paxtest/files/paxtest-0.9.5.1.diff deleted file mode 100644 index 49d75c3192fe..000000000000 --- a/app-admin/paxtest/files/paxtest-0.9.5.1.diff +++ /dev/null @@ -1,92 +0,0 @@ -diff -Nru paxtest-0.9.5/Makefile paxtest-0.9.5.1/Makefile ---- paxtest-0.9.5/Makefile 2003-11-04 16:39:39.000000000 -0500 -+++ paxtest-0.9.5.1/Makefile 2003-11-10 18:19:47.000000000 -0500 -@@ -22,5 +22,5 @@ - make -f Makefile.generic - - clean: -- make -f Makefile.Adamantix clean -+ make -f Makefile.generic clean - -diff -Nru paxtest-0.9.5/Makefile.Gentoo-hardened paxtest-0.9.5.1/Makefile.Gentoo-hardened ---- paxtest-0.9.5/Makefile.Gentoo-hardened 2003-11-04 05:47:37.000000000 -0500 -+++ paxtest-0.9.5.1/Makefile.Gentoo-hardened 2003-11-10 18:20:17.000000000 -0500 -@@ -1,19 +1,18 @@ - #!/usr/bin/make - --CC=gcc --CFLAGS=-O2 --LDFLAGS= -+GCC_SPCS:=$(shell gcc -dumpspecs > dumpspecs) -+CC := gcc -specs=dumpspecs -+ -+CFLAGS := -O2 -+LDFLAGS := - ifndef RUNDIR --RUNDIR=. -+RUNDIR := /usr/lib/paxtest - endif - - # The Hardened GCC compiler has stack protector on by default, this - # could interfere with the results of this test. - --CFLAGS += -DRUNDIR=\"${RUNDIR}\" -fno-stack-protector --CFLAGS += $(shell portageq has_version / sys-devel/hardened-gcc && \ -- echo -yet_exec -yno_propolice) -- -+CFLAGS := -DRUNDIR=\"${RUNDIR}\" -fno-stack-protector - - TESTS= anonmap \ - execbss \ -@@ -60,7 +59,7 @@ - clean: - -rm -f *.o *.s *~ core - -rm -f $(SHLIBS) $(TESTS) $(UTILS) -- -rm -f paxtest paxtest.log a.out -+ -rm -f paxtest paxtest.log a.out dumpspecs - - ifdef DESTDIR - ifdef BINDIR -@@ -78,10 +77,10 @@ - paxtest: $(TESTS) genpaxtest - sh genpaxtest $(TESTS) - --anonmap: body.o anonmap.o -- - crt1S.o: crt1S.S - -+anonmap: body.o anonmap.o -+ - execbss: body.o execbss.o - - execdata: body.o execdata.o -@@ -93,7 +92,7 @@ - getheap1: getheap.o - $(CC) $(LDFLAGS) -o $@ $+ - --getheap2: getheap.o -+getheap2: crt1S.o interp.o getheap.o - $(CC) -shared -o $@ $+ - - getheap.o: getheap.c -@@ -105,7 +104,7 @@ - $(CC) $(LDFLAGS) -o $@ $+ - chpax -X $@ - --getmain2: getmain2.o -+getmain2: crt1S.o interp.o getmain2.o - $(CC) -shared -o $@ $+ - - getmain2.o: getmain.c -diff -Nru paxtest-0.9.5/Makefile.generic paxtest-0.9.5.1/Makefile.generic ---- paxtest-0.9.5/Makefile.generic 2003-11-04 08:44:19.000000000 -0500 -+++ paxtest-0.9.5.1/Makefile.generic 2003-11-10 18:19:47.000000000 -0500 -@@ -64,7 +64,7 @@ - clean: - -rm -f *.o $(CHPAX)/*.o *.s *~ core - -rm -f $(SHLIBS) $(TESTS) $(UTILS) -- -rm -f paxtest chpax paxtest.log a.out -+ -rm -f paxtest chpax paxtest.log a.out dumpspecs - - ifdef DESTDIR - ifdef BINDIR diff --git a/app-admin/paxtest/paxtest-0.9.5-r1.ebuild b/app-admin/paxtest/paxtest-0.9.5-r1.ebuild deleted file mode 100644 index 852223fb4dd7..000000000000 --- a/app-admin/paxtest/paxtest-0.9.5-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.5-r1.ebuild,v 1.16 2010/09/18 17:33:48 blueness Exp $ - -inherit eutils - -# pax flags are not strip safe. -RESTRICT="strip" - -DESCRIPTION="PaX regression test suite" -HOMEPAGE="http://pageexec.virtualave.net/" -#SRC_URI="http://pageexec.virtualave.net/paxtest-${PV}.tar.gz" -SRC_URI="mirror://gentoo/paxtest-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~amd64" -IUSE="" - -DEPEND=">=sys-apps/chpax-0.5" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/paxtest-0.9.5.1.diff - - # paxtest includes crt1S.S, which is great if you're on x86, but not so - # much if you're not... - use !x86 && epatch "${FILESDIR}"/paxtest-0.9.5-use-fPIE.patch - - cp Makefile{,.orig} - cp Makefile{.Gentoo-hardened,} -} - -src_compile() { - emake DESTDIR="${D}" BINDIR="${D}"/usr/bin RUNDIR=/usr/lib/paxtest || die -} - -src_install() { - emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/lib/paxtest install - for doc in Changelog README ;do - [ -f "${doc}" ] && dodoc ${doc} - done -} diff --git a/app-admin/paxtest/paxtest-0.9.6.ebuild b/app-admin/paxtest/paxtest-0.9.6.ebuild deleted file mode 100644 index 97c1dbfc259b..000000000000 --- a/app-admin/paxtest/paxtest-0.9.6.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.6.ebuild,v 1.20 2010/09/18 17:33:48 blueness Exp $ - -inherit eutils multilib - -DESCRIPTION="PaX regression test suite" -HOMEPAGE="http://www.adamantix.org/paxtest/" -#SRC_URI="http://www.adamantix.org/paxtest/paxtest-${PV}.tar.gz" -SRC_URI="mirror://gentoo/paxtest-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86" -IUSE="" -# pax flags are not strip safe. -RESTRICT="strip" - -DEPEND=">=sys-apps/chpax-0.5" - -src_unpack() { - unpack ${A} - cp "${FILESDIR}"/Makefile-portable "${S}"/Makefile -} - -src_compile() { - emake DESTDIR="${D}" BINDIR="${D}"/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest || die -} - -src_install() { - make DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die - for doc in Changelog README ;do - [[ -f ${doc} ]] && dodoc ${doc} - done -} diff --git a/app-admin/paxtest/paxtest-0.9.7_pre4.ebuild b/app-admin/paxtest/paxtest-0.9.7_pre4.ebuild deleted file mode 100644 index 43712b1f2589..000000000000 --- a/app-admin/paxtest/paxtest-0.9.7_pre4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.7_pre4.ebuild,v 1.4 2009/10/11 23:39:34 halcy0n Exp $ - -inherit eutils multilib - -MY_P=${P/_/-} -DESCRIPTION="PaX regression test suite" -HOMEPAGE="http://www.adamantix.org/paxtest/" -#SRC_URI="http://www.adamantix.org/paxtest/${MY_P}.tar.gz" -SRC_URI="http://pax.grsecurity.net/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="" -# EI_PAX flags are not strip safe. -RESTRICT="strip" -S=${WORKDIR}/${MY_P} - -RDEPEND="" -DEPEND="${RDEPEND} - >=sys-apps/chpax-0.7 - sys-apps/paxctl" - -src_unpack() { - unpack ${A} - cd "${S}" - cp "${FILESDIR}"/Makefile.psm5 "${S}"/Makefile || die - sed -i 's:-O2:${CFLAGS}:' "${S}"/Makefile -} - -src_compile() { - emake DESTDIR="${D}" BINDIR="${D}"/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest || die -} - -src_install() { - make DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die - for doc in Changelog README ; do - [[ -f ${doc} ]] && dodoc ${doc} - done -} |