packages: paxtest/paxtest.spec, paxtest/paxtest-Makefile.patch - updated to...

Sun Mar 14 19:20:42 CET 2010

Author: zbyniu                       Date: Sun Mar 14 18:20:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.9.9

---- Files affected:
packages/paxtest:
   paxtest.spec (1.12 -> 1.13) , paxtest-Makefile.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/paxtest/paxtest.spec
diff -u packages/paxtest/paxtest.spec:1.12 packages/paxtest/paxtest.spec:1.13

--- packages/paxtest/paxtest.spec:1.12	Fri Jan  1 23:46:41 2010
+++ packages/paxtest/paxtest.spec	Sun Mar 14 19:20:36 2010
@@ -2,13 +2,12 @@
 Summary:	PaXtest - a tool which tests the protection provided by PaX
 Summary(pl.UTF-8):	PaXtest - narzÄ™dzie testujÄ…ce mechanizm obronny PaX
 Name:		paxtest
-Version:	0.9.7
-%define		pre	pre5
-Release:	0.%{pre}.1
+Version:	0.9.9
+Release:	1
 License:	GPL v2
 Group:		Applications/System
-Source0:	http://www.grsecurity.net/~paxguy1/%{name}-%{version}-%{pre}.tar.gz
-# Source0-md5:	146f941482f1d6e526d9af99723f2c95
+Source0:	http://www.grsecurity.net/~spender/%{name}-%{version}.tgz
+# Source0-md5:	a2f221b4dd19d3d635962bf62767d16b
 Patch0:		%{name}-Makefile.patch
 BuildRequires:	paxctl
 URL:		http://pax.grsecurity.net/
@@ -42,23 +41,24 @@
 wykonaÄ‡ sprytne sztuczki, aby obejÅ›Ä‡ mechanizmy ochrony.
 
 %prep
-%setup -q -n %{name}-%{version}-%{pre}
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 
 %build
 # pass CFLAGS,LDFLAGS in env not as make arguments, so += can work
 CFLAGS="%{rpmcflags}" \
 LDFLAGS="%{rpmldflags}" \
-%{__make} generic \
+%{__make} linux \
 	CC="%{__cc}" \
-	RUNDIR="%{_bindir}"
+	RUNDIR="%{_libdir}/paxtest"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -f Makefile.generic install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=%{_bindir} \
+	RUNDIR="%{_libdir}/paxtest" \
 	LIBDIR=%{_libdir}
 
 %clean
@@ -68,7 +68,7 @@
 %defattr(644,root,root,755)
 %doc README debian/changelog results
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/*.so
+%attr(755,root,root) %{_libdir}/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -76,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/03/14 18:20:36  zbyniu
+- updated to 0.9.9
+
 Revision 1.12  2010/01/01 22:46:41  sparky
 - BuildRoot capitalization
 

================================================================
Index: packages/paxtest/paxtest-Makefile.patch
diff -u packages/paxtest/paxtest-Makefile.patch:1.3 packages/paxtest/paxtest-Makefile.patch:1.4
--- packages/paxtest/paxtest-Makefile.patch:1.3	Wed Mar  5 23:00:26 2008
+++ packages/paxtest/paxtest-Makefile.patch	Sun Mar 14 19:20:36 2010
@@ -1,106 +1,12 @@
-diff -u paxtest-0.9.6.orig/Makefile.generic paxtest-0.9.6/Makefile.generic
---- paxtest-0.9.6.orig/Makefile.generic	2004-03-05 12:50:42.000000000 +0100
-+++ paxtest-0.9.6/Makefile.generic	2004-03-18 00:24:04.027081512 +0100
-@@ -1,8 +1,5 @@
- #!/usr/bin/make
- 
--CC=gcc
--CFLAGS=-O2
--LDFLAGS=
- ifndef RUNDIR
- RUNDIR=.
- endif
-@@ -48,19 +45,10 @@
- 	getstack1 \
- 	getstack2
- 
--CHPAX:=chpax-0.7
--
--CHPAXSRC:=$(CHPAX)/aout.c \
--	$(CHPAX)/chpax.c \
--	$(CHPAX)/elf32.c \
--	$(CHPAX)/elf64.c \
--	$(CHPAX)/flags.c \
--	$(CHPAX)/io.c
--
- SHLIBS=	shlibtest.so \
- 	shlibtest2.so
- 
--all: chpax $(SHLIBS) $(TESTS) $(UTILS) paxtest
-+all: $(SHLIBS) $(TESTS) $(UTILS) paxtest
- 
+--- paxtest-0.9.9/Makefile~	2010-02-20 14:42:40.000000000 +0100
++++ paxtest-0.9.9/Makefile	2010-03-14 17:49:16.789528112 +0100
+@@ -19,6 +19,9 @@ linux64:
+ openbsd:
+ 	gmake -f Makefile.OpenBSD
+ 
++install:
++	make -f Makefile.psm install
++
  clean:
- 	-rm -f *.o $(CHPAX)/*.o *.s *~ core
-@@ -69,13 +57,13 @@
- 
- ifdef DESTDIR
- ifdef BINDIR
--ifdef RUNDIR
-+ifdef LIBDIR
- 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
-+	mkdir -p $(DESTDIR)$(LIBDIR)
-+	cp $(SHLIBS) $(DESTDIR)$(LIBDIR)
-+	mkdir -p $(DESTDIR)$(BINDIR)
-+	cp paxtest $(TESTS) $(UTILS) $(DESTDIR)$(BINDIR)
-+	chmod 755 $(DESTDIR)$(BINDIR)/paxtest
- endif
- endif
- endif
-@@ -85,9 +73,6 @@
- 
- anonmap: body.o anonmap.o
- 
--chpax: $(CHPAXSRC:.c=.o)
--	$(CC) $(LDFLAGS) -o $@ $+
--
- crt1S.o: crt1S.S
- 
- execbss: body.o execbss.o
-@@ -111,7 +96,7 @@
- 
- getmain1: getmain.o
- 	$(CC) $(LDFLAGS) -o $@ $+
--	./chpax -X $@
-+	/sbin/paxctl -X $@
- 
- getmain2: crt1S.o interp.o getmain2.o
- 	$(CC) -shared -o $@ $+
-@@ -123,13 +108,13 @@
- 
- getstack1: getstack.o
- 	$(CC) $(LDFLAGS) -o $@ $+
--	./chpax -S $@
-+	/sbin/paxctl -S $@
- 
--getstack2: getstack1 chpax
-+getstack2: getstack1
- 	rm -f $@
- 	cp getstack1 $@
- 	chmod +x $@
--	./chpax -P $@
-+	/sbin/paxctl -P $@
- 
- mprotanon: body.o mprotanon.o
- 
-@@ -165,13 +150,13 @@
- 
- rettofunc1x: body.o rettofunc1x.o
- 	$(CC) $(LDFLAGS) -o $@ $+
--	./chpax -X $@
-+	/sbin/paxctl -X $@
- 
- rettofunc2: body.o rettofunc2.o
- 
- rettofunc2x: body.o rettofunc2x.o
- 	$(CC) $(LDFLAGS) -o $@ $+
--	./chpax -X $@
-+	/sbin/paxctl -X $@
+ 	make -f Makefile.psm clean
  
- shlibtest.o: shlibtest.c
- 	$(CC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
-Wspólne podkatalogi: paxtest-0.9.6.orig/results i paxtest-0.9.6/results
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/paxtest/paxtest.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/paxtest/paxtest-Makefile.patch?r1=1.3&r2=1.4&f=u

