packages: apparmor-parser/apparmor-parser-make.patch, apparmor-parser/appar...

[arekm]

Author: arekm                        Date: Tue Mar 16 21:46:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.5

---- Files affected:
packages/apparmor-parser:
   apparmor-parser-make.patch (1.2 -> 1.3) , apparmor-parser.spec (1.24 -> 1.25) , apparmor-parser-init-args.patch (1.2 -> NONE)  (REMOVED), apparmor-parser-limits.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/apparmor-parser/apparmor-parser-make.patch
diff -u packages/apparmor-parser/apparmor-parser-make.patch:1.2 packages/apparmor-parser/apparmor-parser-make.patch:1.3
--- packages/apparmor-parser/apparmor-parser-make.patch:1.2	Thu Oct 30 12:41:19 2008
+++ packages/apparmor-parser/apparmor-parser-make.patch	Tue Mar 16 22:46:40 2010
@@ -1,30 +1,17 @@
---- Makefile.org	2008-06-09 14:59:57.328617929 +0200
-+++ Makefile	2008-06-09 15:01:37.766461285 +0200
+--- parser.org/Makefile	2010-03-11 08:28:38.000000000 +0100
++++ parser/Makefile	2010-03-16 22:42:34.830028680 +0100
 @@ -125,9 +125,12 @@
  techdoc.txt: techdoc/index.html
  	w3m -dump $< > $@
  
--all: 	$(TOOLS) $(MANPAGES) ${HTMLMANPAGES} techdoc.pdf techdoc/index.html
-+main:	$(TOOLS) $(MANPAGES)
+-all: 	$(TOOLS) $(MANPAGES) ${HTMLMANPAGES} techdoc.pdf
++main: 	$(TOOLS)
  	$(Q)make -C po all
 -	$(Q)make -s tests
 +
-+docs:	$(MANPAGES) ${HTMLMANPAGES} techdoc.pdf techdoc/index.html
++docs:	$(MANPAGES) ${HTMLMANPAGES}
 +
-+all: 	main docs tests
++all:	main docs tests
  
  apparmor_parser: $(OBJECTS) $(PCREOBJECTS) $(AAREOBJECTS)
  	rm -f ./libstdc++.a
---- parser_misc.c.org	2008-10-30 12:38:06.708188523 +0100
-+++ parser_misc.c	2008-10-30 12:38:35.619310902 +0100
-@@ -31,6 +31,10 @@
- #include <arpa/inet.h>
- #include <linux/capability.h>
- 
-+#ifndef AF_ISDN
-+#define	AF_ISDN 34
-+#endif
-+
- #include "parser.h"
- #include "parser_yacc.h"
- 

================================================================
Index: packages/apparmor-parser/apparmor-parser.spec
diff -u packages/apparmor-parser/apparmor-parser.spec:1.24 packages/apparmor-parser/apparmor-parser.spec:1.25
--- packages/apparmor-parser/apparmor-parser.spec:1.24	Tue Jun 10 00:17:57 2008
+++ packages/apparmor-parser/apparmor-parser.spec	Tue Mar 16 22:46:40 2010
@@ -2,24 +2,19 @@
 
 %bcond_without	tests
 
-%define		_ver 2.3
-%define		_svnrel 1286
 Summary:	AppArmor userlevel parser utility
 Summary(pl.UTF-8):	Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:		apparmor-parser
-Version:	%{_ver}.%{_svnrel}
+Version:	2.5
 Release:	1
 Epoch:		1
 License:	GPL
 Group:		Applications/System
-# Source0:	http://forge.novell.com/modules/xfcontent/private.php/apparmor/AppArmor-%{_ver}/%{name}-%{_ver}-%{_svnrel}.tar.gz
-Source0:	%{name}-%{_ver}-%{_svnrel}.tar.bz2
-# Source0-md5:	b3e94387d4f6be3932616d79eea03461
+Source0:	http://kernel.org/pub/linux/security/apparmor/AppArmor-%{version}/AppArmor-%{version}.tgz
+# Source0-md5:	4a747d1a1f85cb272d55b52c7e8a4a02
 Source1:	%{name}.init
-Patch0:		%{name}-init-args.patch
-Patch1:		%{name}-make.patch
-Patch2:		%{name}-limits.patch
-URL:		http://forge.novell.com/modules/xfmod/project/?apparmor
+Patch0:		%{name}-make.patch
+URL:		http://apparmor.wiki.kernel.org/
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gettext-devel
@@ -41,21 +36,21 @@
 SubDomain.
 
 %prep
-%setup -q -n %{name}-%{_ver}
-%patch0 -p2
-%patch1 -p0
-%patch2 -p1
+%setup -q -n AppArmor-%{version}
+cd parser
+%patch0 -p1
 
 %build
-%{__make} main \
+%{__make} -C parser main \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
-	CFLAGS="%{rpmcflags}"
+	CFLAGS="%{rpmcflags} %{rpmcppflags}"
 
-%{?with_tests:%{__make} tests}
+%{?with_tests:%{__make} -C parser tests}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd parser
 
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{apparmor,rc.d/init.d},/sbin,/subdomain,/var/lib/apparmor}
 
@@ -68,6 +63,7 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	NAME=%{name}
 
+cd ..
 %find_lang %{name}
 
 %clean
@@ -83,7 +79,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README
+%doc parser/README
 %attr(755,root,root) /sbin/apparmor_parser
 %dir %{_sysconfdir}/apparmor
 %{_sysconfdir}/apparmor/rc.apparmor.functions
@@ -99,6 +95,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/03/16 21:46:40  arekm
+- up to 2.5
+
 Revision 1.24  2008/06/09 22:17:57  arekm
 - up to 2.3.1286
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apparmor-parser/apparmor-parser-make.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apparmor-parser/apparmor-parser.spec?r1=1.24&r2=1.25&f=u