commit libapparmor

13 Apr 2007

Hello community,

here is the log from the commit of package libapparmor
checked in at Sat Apr 14 01:02:30 CEST 2007.

--------

--- libapparmor/libapparmor.changes	2006-02-25 00:59:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/libapparmor/libapparmor.changes	2007-04-13 18:54:28.586148000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 13 18:51:56 CEST 2007 - sbeattie@suse.de
+
+- Update to 2.0.2 (minor fixes only)
+- Add manpage to package
+
+-------------------------------------------------------------------

Old:
----
  libapparmor-2.0-6288.tar.gz

New:
----
  libapparmor-2.0.2-537.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libapparmor.spec ++++++
--- /var/tmp/diff_new_pack.b13971/_old	2007-04-14 01:02:23.000000000 +0200
+++ /var/tmp/diff_new_pack.b13971/_new	2007-04-14 01:02:23.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package libapparmor (Version 2.0)
+# spec file for package libapparmor (Version 2.0.2)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -25,15 +25,15 @@
   # else anything that doesn't specifically have a lib64 dir
   # i386 i686 mips ppc sparc arm alpha ia64
 Summary:        Immunix Library to provide key AppArmor symbols
-Version:        2.0
-Release:        7
+Version:        2.0.2
+Release:        1
 %if %distro == "suse"
 Group:          System/Libraries
 %else
 Group:          System/Libraries
 %endif
-Source:         %{name}-%{version}-6288.tar.gz
-License:        LGPL, Other License(s), see package
+Source:         %{name}-%{version}-537.tar.gz
+License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 URL:            http://forge.novell.com/modules/xfmod/project/?apparmor
 BuildRequires:  glibc-devel
@@ -101,7 +101,11 @@
   echo "FIXME - disabled 32bit installs on 64bit platforms"
   #make install DESTDIR=${RPM_BUILD_ROOT} LIB=lib -C ../%{name}32/%{name}-%{version}
 %endif
-make install DESTDIR=${RPM_BUILD_ROOT} LIB=%{_lib} VERSION=%{version} RELEASE=%{release}
+make install DESTDIR=${RPM_BUILD_ROOT} LIB=%{_lib} VERSION=%{version} \
+             RELEASE=%{release} MANDIR=%{_mandir}
+
+%clean
+[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 # don't use -p here, breaks slackware package builds
 
 %post
@@ -121,8 +125,14 @@
 %{_libdir}/lib*
 %{_prefix}/include/sys/*.h
 %doc COPYING.LGPL
-
-%changelog -n libapparmor
+%{_mandir}/man*/*
+%doc *.[0-9].html
+%doc common/apparmor.css
+
+%changelog
+* Fri Apr 13 2007 - sbeattie@suse.de
+- Update to 2.0.2 (minor fixes only)
+- Add manpage to package
 * Fri Feb 24 2006 - sbeattie@suse.de
 - use gettid() instead of /proc/self for /proc/pid/attr/current (#153293)
 * Mon Feb 13 2006 - dreynolds@suse.de

++++++ libapparmor-2.0-6288.tar.gz -> libapparmor-2.0.2-537.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/apparmor.h new/libapparmor-2.0.2/apparmor.h
--- old/libapparmor-2.0/apparmor.h	2006-02-03 10:13:46.000000000 +0100
+++ new/libapparmor-2.0.2/apparmor.h	2006-09-28 09:45:55.000000000 +0200
@@ -1,4 +1,4 @@
-/*   $Id: apparmor.h 6203 2006-02-02 22:03:41Z steve $
+/*   $Id: apparmor.h 132 2006-09-28 07:45:55Z steve-beattie $
 
      Copyright (c) 2003, 2004, 2005, 2006 Novell, Inc. (All rights reserved)
 
@@ -13,7 +13,9 @@
 __BEGIN_DECLS
 
 /* Prototype for change_hat as defined by the AppArmor project
- * http://forge.novell.com/modules/xfmod/project/?apparmor */
+   http://forge.novell.com/modules/xfmod/project/?apparmor
+   Please see the change_hat(2) manpage for information. */
+
 extern int change_hat(const char *subprofile, unsigned int magic_token);
 
 __END_DECLS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/change_hat.c new/libapparmor-2.0.2/change_hat.c
--- old/libapparmor-2.0/change_hat.c	2006-02-27 18:29:30.000000000 +0100
+++ new/libapparmor-2.0.2/change_hat.c	2006-04-12 23:43:34.000000000 +0200
@@ -1,4 +1,4 @@
-/*   $Id: change_hat.c 6288 2006-02-27 17:29:04Z steve $
+/*   $Id: change_hat.c 13 2006-04-12 21:43:34Z steve-beattie $
 
      Copyright (c) 2003, 2004, 2005, 2006 Novell, Inc. (All rights reserved)
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/change_hat.pod new/libapparmor-2.0.2/change_hat.pod
--- old/libapparmor-2.0/change_hat.pod	1970-01-01 01:00:00.000000000 +0100
+++ new/libapparmor-2.0.2/change_hat.pod	2007-04-03 22:08:50.000000000 +0200
@@ -0,0 +1,233 @@
+# $Id: change_hat.pod 534 2007-04-03 20:08:50Z steve-beattie $
+# This publication is intellectual property of Novell Inc. Its contents
+# can be duplicated, either in part or in whole, provided that a copyright
+# label is visibly located on each copy.
+# 
+# All information found in this book has been compiled with utmost
+# attention to detail. However, this does not guarantee complete accuracy.
+# Neither SUSE LINUX GmbH, the authors, nor the translators shall be held
+# liable for possible errors or the consequences thereof.
+# 
+# Many of the software and hardware descriptions cited in this book
+# are registered trademarks. All trade names are subject to copyright
+# restrictions and may be registered trade marks. SUSE LINUX GmbH
+# essentially adheres to the manufacturer's spelling.
+# 
+# Names of products and trademarks appearing in this book (with or without
+# specific notation) are likewise subject to trademark and trade protection
+# laws and may thus fall under copyright restrictions.
+# 
+# Please direct suggestions and comments to apparmor-general@forge.novell.com.
+
+
+=pod
+
+=head1 NAME
+
+change_hat  - change to or from a "hat" within a AppArmor profile
+
+=head1 SYNOPSIS
+
+B<#include E<lt>sys/apparmor.hE<gt>>
+
+B
+
+Link with B<-lapparmor> when compiling.
+
+=head1 DESCRIPTION
+
+An AppArmor profile applies to an executable program; if a portion of
+the program needs different access permissions than other portions,
+the program can "change hats" to a different role, also known as a
+subprofile. To change into a new hat, it calls the change_hat() function
+to do so. It passes in a pointer to the I<subprofile> which it wants to
+change into, and a 32bit I.  The I is used to
+return out of the subprofile at a later time.
+
+If a program wants to return out of the current subprofile to the
+original profile, it calls change_hat() with a pointer to NULL as
+the I<subprofile>, and the original I value. If the
+I does not match the original I passed into the
+kernel when the program entered the subprofile, the change back to the
+original profile will not happen, and the current task will be killed.
+If the I matches the original token, then the process will
+change back to the original profile.
+
+If the program wants to change to a subprofile that it can never
+change back out of, the application should call change_hat() with a
+I of I<0>.
+
+As both read(2) and write(2) are mediated, a file must be listed in a
+subprofile definition if the file is to be accessed while the process
+is in a "hat".
+
+=head1 RETURN VALUE
+
+On success zero is returned. On error, -1 is returned, and
+errno(3) is set appropriately.
+
+=head1 ERRORS
+
+=over 4
+
+=item B<EINVAL>
+
+The apparmor kernel module is not loaded or the communication via the
+F file did not conform to protocol.
+
+=item B<ENOMEM>
+
+Insufficient kernel memory was available.
+
+=item B<EPERM>
+
+The calling application is not confined by apparmor.
+
+=item B<ECHILD>
+
+The application's profile has no hats defined for it.
+
+=item B<EACCES>
+
+The specified I<subprofile> does not exist in this profile or the
+process tried to change another process's domain.
+
+=back 
+
+=head1 EXAMPLE
+
+The following code examples shows simple, if contrived, uses of
+change_hat(); a typical use of change_hat() will separate privileged
+portions of a process from unprivileged portions of a process, such as
+keeping unauthenticated network traffic handling separate from
+authenticated network traffic handling in OpenSSH or executing
+user-supplied CGI scripts in apache.
+
+The use of random(3) is simply illustrative. Use of F is
+recommended.
+
+First, a simple high-level overview of change_hat() use:
+
+ void foo (void) {
+ 	int magic_token;
+  
+ 	/* get a random magic token value
+ 	from our huge entropy pool */
+ 	magic_token = random_function();
+ 
+ 	/* change into the subprofile while
+ 	 * we do stuff we don't trust */
+ 	change_hat ("stuff_we_dont_trust", magic_token);
+
+ 	/* Go do stuff we don't trust -- this is all
+ 	 * done in *this* process space, no separate
+ 	 * fork()/exec()'s are done. */
+ 	interpret_perl_stuff(stuff_from_user);
+
+ 	/* now change back to our original profile */
+ 	change_hat (NULL, magic_token);
+ }
+
+Second, an example to show that files not listed in a subprofile
+("hat") aren't accessible after a change_hat() call:
+
+ #include 
+ #include 
+ #include 
+ #include 
+ #include 
+ #include 
+ #include 
+ #include 
+ 
+ 
+ int main(int argc, char *argv[]) {
+        int fd;
+        int tok;
+        char buf[10];
+ 
+        /* random() is a poor choice */
+        tok = random();
+ 
+        /* open /etc/passwd outside of any hat */
+        if ((fd=open("/etc/passwd", O_RDONLY)) < 0)
+                perror("Failure opening /etc/passwd");
+ 
+        /* confirm for ourselves that we can really read /etc/passwd */
+        memset(&buf, 0, 10);
+        if (read(fd, &buf, 10) == -1) {
+                perror("Failure reading /etc/passwd pre-hat");
+                _exit(1);
+        }
+        buf[9] = '\0';
+        printf("/etc/passwd: %s\n", buf);
+ 
+        /* change hat to the "hat" subprofile, which should not have
+         * read access to /etc/passwd -- even though we have a valid
+         * file descriptor at the time of the change_hat() call. */
+        if (change_hat("hat", tok)) {
+                perror("Failure changing hat -- aborting");
+                _exit(1);
+        }
+ 
+        /* confirm that we cannot read /etc/passwd */
+        lseek(fd,0,SEEK_SET);
+        memset(&buf, 0, 10);
+        if (read(fd, &buf, 10) == -1)
+                perror("Failure reading /etc/passwd post-hat");
+        buf[9] = '\0';
+        printf("/etc/passwd: %s\n", buf);
+ 
+        return 0;
+ }
+
+
+This code example requires the following profile to be loaded with
+apparmor_parser(8):
+
+ /tmp/ch {
+   /etc/ld.so.cache               mr,
+   /etc/locale/**                 r,
+   /etc/localtime                 r,
+   /usr/share/locale/**           r,
+   /usr/share/zoneinfo/**         r,
+   /usr/lib/locale/**             mr,
+   /usr/lib/gconv/*.so            mr,
+   /usr/lib/gconv/gconv-modules*  mr,
+
+   /lib/ld-*.so*         mrix,
+   /lib/libc*.so*        mr,
+   /lib/libapparmor*.so* mr,
+   /dev/pts/*            rw,
+   /tmp/ch               mr,
+
+   /etc/passwd           r,
+
+   ^hat {
+     /dev/pts/*     rw,
+   }
+ }
+
+
+The output when run:
+
+ $ /tmp/ch
+ /etc/passwd: root:x:0:
+ Failure reading /etc/passwd post-hat: Permission denied
+ /etc/passwd:
+ $
+
+
+=head1 BUGS
+
+None known. If you find any, please report them to bugzilla at
+Lhttp://bugzilla.novell.com. Note that change_hat(2) provides no 
+memory barriers between different areas of a program; if address space
+separation is required, then separate processes should be used.
+
+=head1 SEE ALSO
+
+apparmor(7), apparmor.d(5), apparmor_parser(8), and
+Lhttp://forge.novell.com/modules/xfmod/project/?apparmor.
+
+=cut
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/common/apparmor.css new/libapparmor-2.0.2/common/apparmor.css
--- old/libapparmor-2.0/common/apparmor.css	1970-01-01 01:00:00.000000000 +0100
+++ new/libapparmor-2.0.2/common/apparmor.css	2007-04-03 21:51:56.000000000 +0200
@@ -0,0 +1,30 @@
+BODY {background:rgb(000,000,000); color:rgb(225,225,225);
+margin-left: 1%; margin-right: 5%}
+H1 {color:rgb(240,240,240); font-size:115%;}
+H2 {color:rgb(240,240,240); font-size:109%;}
+H3 {color:rgb(240,240,240); font-size:104%;}
+TD.sidebar {width:18em; background:rgb(020,020,020); vertical-align:top;}
+TD.main {width:250em; background:rgb(020,020,020); padding-top:5px;
+padding-bottom:5px; padding-left:10px; padding-right:10px; }
+TD.sidebarhead {background:rgb(038,038,038);}
+TD.footer {background:rgb(020,020,020); padding:5px; }
+TD.block {background: #9c9c9c; color:rgb(000,000,000)}
+
+P {font-size:102%}
+P {margin-left:.5em; margin-right:.5em}
+P {color:rgb(225,225,225)}
+
+P.sidebar {font-size:98% }
+P.sidebarhead {font-size:98%; font-weight:bold; }
+
+UL {font-size:102%}
+UL {margin-left:.5em; margin-right:.5em}
+UL {color:rgb(225,225,225)}
+
+IMG {border:none}
+ 
+:link, :visited, :active { text-decoration:underline; }
+
+:link { color: white }
+:visited { color: rgb(225,225,225)}
+:active { color: gray }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/common/Make-po.rules new/libapparmor-2.0.2/common/Make-po.rules
--- old/libapparmor-2.0/common/Make-po.rules	1970-01-01 01:00:00.000000000 +0100
+++ new/libapparmor-2.0.2/common/Make-po.rules	2006-11-15 10:22:15.000000000 +0100
@@ -0,0 +1,45 @@
+# 	$Id: Make-po.rules 238 2006-11-15 09:22:15Z steve-beattie $
+# ------------------------------------------------------------------
+#
+#    Copyright (C) 2002-2005 Novell/SUSE
+#
+#    This program is free software; you can redistribute it and/or
+#    modify it under the terms of version 2 of the GNU General Public 
+#    License published by the Free Software Foundation.
+#
+# ------------------------------------------------------------------
+#
+# The including makefile needs to define LANG, which lists the lang
+# files to include; e.g. LANG=en_US de_DE, where en_US.po and de_DE.po
+# exist
+LOCALEDIR=/usr/share/locale
+
+XGETTEXT_ARGS=--copyright-holder="NOVELL, Inc." --msgid-bugs-address=apparmor-general@forge.novell.com -d ${NAME}
+
+# When making the .pot file, it's expected that the parent Makefile will
+# pass in the list of sources in the SOURCES variable
+PARENT_SOURCES=$(foreach source, ${SOURCES}, ../${source})
+
+LANGS=$(patsubst %.po, %, $(wildcard *.po))
+TARGET_MOS=$(foreach lang, $(filter-out $(DISABLED_LANGS),$(LANGS)), ${lang}.mo)
+
+.PHONY: all
+all: ${TARGET_MOS}
+
+${NAME}.pot: ${PARENT_SOURCES}
+	xgettext ${XGETTEXT_ARGS} ${PARENT_SOURCES} -o $@
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+.PHONY: install
+install: ${TARGET_MOS}
+	mkdir -p $(DESTDIR)/${LOCALEDIR}
+	for lang in ${LANGS} ; do \
+		mkdir -p ${DESTDIR}/${LOCALEDIR}/$${lang}/LC_MESSAGES ; \
+		install -m 644 $${lang}.mo ${DESTDIR}/${LOCALEDIR}/$${lang}/LC_MESSAGES/${NAME}.mo ; \
+	done
+
+.PHONY: clean
+clean:
+	rm -f *.mo Make.rules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/common/Make.rules new/libapparmor-2.0.2/common/Make.rules
--- old/libapparmor-2.0/common/Make.rules	1970-01-01 01:00:00.000000000 +0100
+++ new/libapparmor-2.0.2/common/Make.rules	2007-04-03 23:12:16.000000000 +0200
@@ -0,0 +1,287 @@
+# $Id: Make.rules 537 2007-04-03 21:12:16Z steve-beattie $
+# ------------------------------------------------------------------
+#
+#    Copyright (C) 2002-2005 Novell/SUSE
+#
+#    This program is free software; you can redistribute it and/or
+#    modify it under the terms of version 2 of the GNU General Public 
+#    License published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, contact Novell, Inc.
+# ------------------------------------------------------------------
+# Make.rules - common make targets and variables for building the SHASS
+# product.
+#
+# NOTES:
+#   - must define the package NAME before including this file.
+#   - After checking in to cvs, you'll need to delele the hardlinked
+#     Make.rules files that already exist in the individual application
+#     directories
+
+DISTRIBUTION=AppArmor
+VERSION=2.0.2
+
+# OVERRIDABLE variables
+# Set these variables before including Make.rules to change its behavior
+#   SPECFILE - for packages that have a non-standard specfile name
+#   EXTERNAL_PACKAGE - for packages that have upstream versions that
+#   	we're locally modifying (e.g. imnxcerttool/gnutls).
+#
+# use 'make BUILDIR=/some/where/else/' to override the /usr/src/redhat
+# location -- it *should* pick out the right thing to do based on the
+# .rpmmacros file, but you can still use BUILDDIR to override that.
+TESTBUILDDIR=$(shell [ -f ${HOME}/.rpmmacros ] && awk '/^%_topdir/ {print $$2}' ${HOME}/.rpmmacros)
+ifndef BUILDDIR
+BUILDDIR=$(shell if [ -d "${TESTBUILDDIR}" ] ; then \
+		    echo ${TESTBUILDDIR} | sed "s^/$$^^" ; \
+		  elif [ -d "/usr/src/redhat" ] ; then \
+		    echo "/usr/src/redhat" ; \
+		  elif [ -d "/usr/src/packages" ] ; then \
+		    echo "/usr/src/packages" ; \
+		  else \
+		    echo "/tmp/${NAME}"  ; \
+		  fi ;)
+endif
+RPMHOSTVENDOR=$(shell rpm --eval "%{_host_vendor}")
+ifndef DISTRO
+DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \
+		  echo slackware ; \
+	       elif [ -f /etc/debian_version ] ; then \
+	       	  echo debian ;\
+	       elif [ ${RPMHOSTVENDOR} = "suse" ] ; then \
+	          echo suse ;\
+	       elif [ ${RPMHOSTVENDOR} = "redhat" ] ; then \
+	          echo rhel4 ;\
+	       else \
+	          echo unknown ;\
+	       fi)
+endif
+RPMARG=--define "_topdir $(BUILDDIR:/=)" \
+        --define "vendor NOVELL, Inc." \
+	--define "distribution ${DISTRIBUTION}" \
+	--define "debug_package %{nil}" \
+	--define "immunix_version ${VERSION}" \
+	$(shell [ -d ${BUILDDIR}/BUILDROOT ] && echo --define \"buildroot $(BUILDDIR:/=)/BUILDROOT\") \
+	$(shell [ -n "${DISTRO}" ] && echo --define \"distro ${DISTRO}\")
+
+#REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \
+#			if ! /usr/bin/svn info -r HEAD . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; then \
+#				/usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \
+#			fi ; \
+#		      fi)
+REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \
+				/usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \
+		      fi)
+REPO_URL=$(shell if [ -x /usr/bin/svn ] ; then \
+			/usr/bin/svn info . 2> /dev/null | grep "^URL:" | sed "s/^URL: //" ; \
+		 fi)
+COMMON_REPO_URL=$(shell if [ -x /usr/bin/svn ] ; then \
+			/usr/bin/svn info $(COMMONDIR)  2> /dev/null | grep "^URL:" | sed "s/^URL: //" ; \
+		 fi)
+
+ifdef EXTERNAL_PACKAGE
+RPMARG+=--define "_sourcedir $(shell pwd)"
+endif
+
+ifndef SPECFILE
+SPECFILE        = $(NAME).spec
+endif
+RELEASE = $(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{RELEASE}" ${SPECFILE})
+RELEASE_DIR	= $(NAME)-$(VERSION)
+TARBALL		= $(NAME)-$(VERSION)-${REPO_VERSION}.tar.gz
+TAR		= /bin/tar czvp -h --exclude .svn --exclude CVS --exclude .cvsignore --exclude ${TARBALL} --exclude ${RELEASE_DIR}/${RELEASE_DIR}  $(shell test -f ${NAME}.exclude && echo "-X ${NAME}.exclude")
+LDCONFIG	= /sbin/ldconfig
+
+CVSPKG_VERSION=$(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} ${SPECFILE} | head -1 | tr "." "_")
+
+RPMSUBDIRS=SOURCES SPECS BUILD BUILDROOT SRPMS RPMS/i386 RPMS/i586 \
+        RPMS/i686 RPMS/athlon RPMS/noarch RPMS/x86_64
+BUILDRPMSUBDIRS=$(foreach subdir, $(RPMSUBDIRS), $(BUILDDIR:/=)/$(subdir))
+
+.PHONY: cvs_tag
+cvs_tag:
+	cvs tag IMMUNIX-${CVSPKG_VERSION}
+
+.PHONY: checkin
+checkin:
+	if cvs -q up -d | grep -q "^\?" ; then echo "Hey! You have" \
+		"files in the directory you have not added into cvs."; exit 1; \
+	fi
+	cvs ci
+	make cvs_tag
+
+ifdef EXTERNAL_PACKAGE
+.PHONY: rpm
+rpm: clean $(BUILDRPMSUBDIRS)
+	rpmbuild -ba ${RPMARG} ${SPECFILE}
+
+else
+.PHONY: rpm
+rpm: clean $(TARBALL) $(BUILDRPMSUBDIRS)
+	cp $(TARBALL) $(BUILDDIR)/SOURCES/
+	cp ${SPECFILE} $(BUILDDIR)/SPECS/
+	rpmbuild -ba ${RPMARG} ${SPECFILE}
+
+.PHONY: ${SPECFILE}
+${SPECFILE}: ${SPECFILE}.in
+	sed -e "s/@@immunix_version@@/${VERSION}/g" \
+	    -e "s/@@repo_version@@/${REPO_VERSION}/g" $< > $@
+
+${TARBALL}: clean ${SPECFILE}
+	-rm -rf $(RELEASE_DIR)
+	mkdir $(RELEASE_DIR)
+	$(TAR) . | tar xz -C $(RELEASE_DIR)
+	$(TAR) -f $@ $(RELEASE_DIR)
+	rm -rf $(RELEASE_DIR)
+
+.PHONY: tarball
+tarball: clean $(TARBALL)
+
+.PHONY: dist
+dist: clean $(SPECFILE)
+	-rm -rf $(RELEASE_DIR)
+	svn export -r $(REPO_VERSION) $(REPO_URL) $(RELEASE_DIR)
+	svn export $(COMMON_REPO_URL) $(RELEASE_DIR)/common
+	make -C $(RELEASE_DIR) $(SPECFILE) REPO_VERSION=${REPO_VERSION} COMMONDIR_EXISTS=false
+	$(TAR) -f $(TARBALL) $(RELEASE_DIR)
+	rm -rf $(RELEASE_DIR)
+
+endif
+
+.PHONY: version
+.SILENT: version
+version:
+	 rpm -q --define "_sourcedir ." ${RPMARG} --specfile ${SPECFILE}
+
+.PHONY: build_dir 
+build_dir: $(BUILDRPMSUBDIRS)
+
+$(BUILDRPMSUBDIRS):
+	mkdir -p $(BUILDRPMSUBDIRS)
+
+.PHONY: _clean
+.SILENT: _clean
+_clean:
+	-rm -f ${NAME}-${VERSION}-*.tar.gz
+	-rm -f ${MANPAGES} ${HTMLMANPAGES} pod2htm*.tmp
+
+# =====================
+# manpages
+# =====================
+
+POD2MAN                         = /usr/bin/pod2man
+POD2HTML                        = /usr/bin/pod2html
+MANDIR                          = /usr/share/man
+DOCDIR                          = /usr/share/doc/${NAME}-${VERSION}
+
+# get list of directory numbers based on definition of MANPAGES variable
+MANDIRS=$(sort $(foreach dir, 1 2 3 4 5 6 7 8, $(patsubst %.${dir}, ${dir}, $(filter %.${dir}, ${MANPAGES}))))
+HTMLMANPAGES=$(foreach manpage, ${MANPAGES}, ${manpage}.html)
+
+.PHONY: install_manpages
+install_manpages: $(MANPAGES)
+	$(foreach dir, ${MANDIRS}, \
+	     install -d ${DESTDIR}/${MANDIR}/man${dir} ; \
+	     install -m 644 $(filter %.${dir}, ${MANPAGES}) ${DESTDIR}/${MANDIR}/man${dir}; \
+	     $(foreach aa_page, $(filter %.${dir}, ${AA_MANPAGES}), \
+	     	ln -sf $(aa_page) ${DESTDIR}/${MANDIR}/man${dir}/${aa_page:%=aa-%};))
+
+%.1: %.pod
+	$(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=1 > $@
+
+%.2: %.pod
+	$(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=2 > $@
+
+%.3: %.pod
+	$(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=3 > $@
+
+%.4: %.pod
+	$(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=4 > $@
+
+%.5: %.pod
+	$(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=5 > $@
+
+%.6: %.pod
+	$(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=6 > $@
+
+%.7: %.pod
+	$(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=7 > $@
+
+%.8: %.pod
+	$(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=8 > $@
+
+%.1.html: %.pod
+	$(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@
+
+%.2.html: %.pod
+	$(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@
+
+%.3.html: %.pod
+	$(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@
+
+%.4.html: %.pod
+	$(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@
+
+%.5.html: %.pod
+	$(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@
+
+%.6.html: %.pod
+	$(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@
+
+%.7.html: %.pod
+	$(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@
+
+%.8.html: %.pod
+	$(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@
+
+# =====================
+# Slackware poo
+# =====================
+.PHONY: slack
+slack: 
+	rm -rf ${BUILDDIR}
+	mkdir -p ${BUILDDIR}/install
+	make install DESTDIR=${BUILDDIR} DISTRO=slackware
+	# comment line is there so grep always has something to match
+	( echo "# install script pulled from ${SPECFILE}" ; rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{POSTIN}\n" ${SPECFILE}) | grep -v "^(none)$$" >> ${BUILDDIR}/install/doinst.sh
+	( cd ${BUILDDIR} && makepkg -l y -c y -p ${PWD}/${NAME}-${VERSION}-${RELEASE}.tgz )
+
+# =====================
+# Debian poo
+# =====================
+.PHONY: deb
+deb: ${TARBALL}
+	rm -rf ${BUILDDIR}
+	mkdir -p ${BUILDDIR}
+	tar -xvzf ${TARBALL} -C ${BUILDDIR} 
+	( cd ${BUILDDIR}/${RELEASE_DIR} && sh -c "DEBFULLNAME='NOVELL, Inc' dh_make -e apparmor-general@forge.novell.com --library -f ~/svn/immunix/immunix/libimmunix/libimmunix-2.0.tar.gz << EOM \
+\
+EOM" )
+	make ${NAME}-deb -C ${BUILDDIR}/${RELEASE_DIR}
+	# ( cd ${BUILDDIR}/${RELEASE_DIR} && dpkg-buildpackage -b -sd -rfakeroot)
+
+DEBIAN_DISTRO=stable
+
+DEB_CHANGELOG_OUTPUT="${NAME} (${VERSION}-${RELEASE}) ${DEBIAN_DISTRO}; urgency=low\n\
+    \n   * Automatically generated by the AppArmor Build System.\n\
+    \n -- AppArmor Development Team  $(shell date -R)"
+
+
+.PHONY: debian/changelog
+debian/changelog: 
+	echo -e ${DEB_CHANGELOG_OUTPUT} > $@ 
+
+A2PS_ARGS=-Ec -g --line-numbers=1
+ENSCRIPT_ARGS=-C -2jGr -f Courier6 -E
+%.c.ps: %.c
+	#a2ps ${A2PS_ARGS} $< -o $@
+	enscript ${ENSCRIPT_ARGS} -o $@ $<
+
+%.pm.ps: %.pm
+	enscript ${ENSCRIPT_ARGS} -o $@ $<
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/libapparmor.spec new/libapparmor-2.0.2/libapparmor.spec
--- old/libapparmor-2.0/libapparmor.spec	2006-02-27 18:29:45.000000000 +0100
+++ new/libapparmor-2.0.2/libapparmor.spec	2007-04-13 00:57:55.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: libapparmor.spec.in 6284 2006-02-24 17:11:53Z steve $
+# $Id: libapparmor.spec.in 534 2007-04-03 20:08:50Z steve-beattie $
 # ----------------------------------------------------------------------
 #    Copyright (c) 2004, 2005, 2006 NOVELL (All rights reserved)
 #
@@ -35,14 +35,14 @@
 
 Name: libapparmor
 Summary: Library to provide key AppArmor symbols
-Version: 2.0
-Release: 6
+Version: 2.0.2
+Release: 537
 %if %distro == "suse"
 Group: System/Libraries
 %else
 Group: System Environment/Libraries
 %endif
-Source: %{name}-%{version}-6288.tar.gz
+Source: %{name}-%{version}-537.tar.gz
 License: LGPL
 BuildRoot: %{?_tmppath:}%{!?_tmppath:/var/tmp}/%{name}-%{version}-build
 URL: http://forge.novell.com/modules/xfmod/project/?apparmor
@@ -62,9 +62,9 @@
 %prep
 %if %{?build64:1}0
 %setup -q -c -n %{name}32
-%setup -D -q 
+%setup -D -q
 %else
-%setup -q 
+%setup -q
 %endif
 
 
@@ -107,7 +107,11 @@
   echo "FIXME - disabled 32bit installs on 64bit platforms"
   #make install DESTDIR=${RPM_BUILD_ROOT} LIB=lib -C ../%{name}32/%{name}-%{version}
 %endif
-make install DESTDIR=${RPM_BUILD_ROOT} LIB=%{_lib} VERSION=%{version} RELEASE=%{release}
+make install DESTDIR=${RPM_BUILD_ROOT} LIB=%{_lib} VERSION=%{version} \
+             RELEASE=%{release} MANDIR=%{_mandir}
+
+%clean
+[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
 # don't use -p here, breaks slackware package builds
 %post
@@ -127,8 +131,15 @@
 %{_libdir}/lib*
 %{_prefix}/include/sys/*.h
 %doc COPYING.LGPL
+%{_mandir}/man*/*
+%doc *.[0-9].html
+%doc common/apparmor.css
 
 %changelog
+* Tue Apr  7 2007 - sbeattie@suse.de
+- Add change_hat manpage to package
+* Thu Jan 18 2007 - sbeattie@suse.de
+- Add a clean stage to remove buildroot to specfile
 * Fri Feb 17 2006 Seth Arnold  2.0-4.1
 - use gettid() instead of /proc/self
 * Fri Feb 10 2006 Steve Beattie  2.0-3.2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/libapparmor.spec.in new/libapparmor-2.0.2/libapparmor.spec.in
--- old/libapparmor-2.0/libapparmor.spec.in	2006-02-24 18:11:53.000000000 +0100
+++ new/libapparmor-2.0.2/libapparmor.spec.in	2007-04-03 22:08:50.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: libapparmor.spec.in 6284 2006-02-24 17:11:53Z steve $
+# $Id: libapparmor.spec.in 534 2007-04-03 20:08:50Z steve-beattie $
 # ----------------------------------------------------------------------
 #    Copyright (c) 2004, 2005, 2006 NOVELL (All rights reserved)
 #
@@ -36,7 +36,7 @@
 Name: libapparmor
 Summary: Library to provide key AppArmor symbols
 Version: @@immunix_version@@
-Release: 6
+Release: @@repo_version@@
 %if %distro == "suse"
 Group: System/Libraries
 %else
@@ -62,9 +62,9 @@
 %prep
 %if %{?build64:1}0
 %setup -q -c -n %{name}32
-%setup -D -q 
+%setup -D -q
 %else
-%setup -q 
+%setup -q
 %endif
 
 
@@ -107,7 +107,11 @@
   echo "FIXME - disabled 32bit installs on 64bit platforms"
   #make install DESTDIR=${RPM_BUILD_ROOT} LIB=lib -C ../%{name}32/%{name}-%{version}
 %endif
-make install DESTDIR=${RPM_BUILD_ROOT} LIB=%{_lib} VERSION=%{version} RELEASE=%{release}
+make install DESTDIR=${RPM_BUILD_ROOT} LIB=%{_lib} VERSION=%{version} \
+             RELEASE=%{release} MANDIR=%{_mandir}
+
+%clean
+[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
 # don't use -p here, breaks slackware package builds
 %post
@@ -127,8 +131,15 @@
 %{_libdir}/lib*
 %{_prefix}/include/sys/*.h
 %doc COPYING.LGPL
+%{_mandir}/man*/*
+%doc *.[0-9].html
+%doc common/apparmor.css
 
 %changelog
+* Tue Apr  7 2007 - sbeattie@suse.de
+- Add change_hat manpage to package
+* Thu Jan 18 2007 - sbeattie@suse.de
+- Add a clean stage to remove buildroot to specfile
 * Fri Feb 17 2006 Seth Arnold  2.0-4.1
 - use gettid() instead of /proc/self
 * Fri Feb 10 2006 Steve Beattie  2.0-3.2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/libimmunix_warning.c new/libapparmor-2.0.2/libimmunix_warning.c
--- old/libapparmor-2.0/libimmunix_warning.c	2006-01-25 18:42:51.000000000 +0100
+++ new/libapparmor-2.0.2/libimmunix_warning.c	2006-04-12 23:43:34.000000000 +0200
@@ -1,4 +1,4 @@
-/*   $Id:$
+/*   $Id: libimmunix_warning.c 13 2006-04-12 21:43:34Z steve-beattie $
 
      Copyright (c) 2006 Novell, Inc. (All rights reserved)
      The libimmunix library is licensed under the terms of the GNU
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/Makefile new/libapparmor-2.0.2/Makefile
--- old/libapparmor-2.0/Makefile	2006-02-11 08:52:50.000000000 +0100
+++ new/libapparmor-2.0.2/Makefile	2007-04-03 23:12:16.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile 6262 2006-02-11 07:30:00Z steve $
+# $Id: Makefile 537 2007-04-03 21:12:16Z steve-beattie $
 # ----------------------------------------------------------------------
 #    Copyright (c) 2004, 2005, 2006 NOVELL (All rights reserved)
 #
@@ -24,18 +24,19 @@
 	             echo "/common_dir_not_found" ; \
 	     fi))
 
-include Make.rules
+include common/Make.rules
 
 COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true))
 ifeq ($(COMMONDIR_EXISTS), true)
-Make.rules: $(COMMONDIR)/Make.rules
-	ln -f $(COMMONDIR)/Make.rules .
+common/Make.rules: $(COMMONDIR)/Make.rules
+	ln -sf $(COMMONDIR) .
 endif
 
 SO_VERS		= 1
-DESTDIR         = 
+DESTDIR         =
 LIB             = lib/
 LIBDIR          = /usr/${LIB}
+MANPAGES	= change_hat.2
 
 TARGET=libapparmor
 TARGETS=${TARGET}.so ${TARGET}.a
@@ -52,7 +53,7 @@
 TEST_CFLAGS=$(CFLAGS) $(CANARY_FLAG) $(FORMATGUARD_FLAG)
 TEST_LDFLAGS= -L. -limmunix
 
-all: ${TARGETS} ${OLDTARGET}
+all: ${TARGETS} ${OLDTARGET} ${MANPAGES} ${HTMLMANPAGES}
 
 %.o: %.c
 	$(CC) ${EXTRA_CFLAGS} -c -shared -o $@ $<
@@ -98,20 +99,21 @@
 	-./tst-sgkey-static
 
 .PHONY: install
-install: $(TARGETS)
+install: $(SPECFILE) $(TARGETS) $(OLDTARGET)
 	install -d $(DESTDIR)/${LIB} $(DESTDIR)${LIBDIR}
 	install -d ${DESTDIR}/usr/include/sys
 	mv -f $(TARGET).so.$(SO_VERS) $(TARGET)-$(VERSION)-$(RELEASE).so.$(SO_VERS)
 	install -m 755 $(TARGET)-$(VERSION)-$(RELEASE).so.$(SO_VERS) ${DESTDIR}/${LIB}
-	ln -sf $(TARGET)-$(VERSION)-$(RELEASE).so.$(SO_VERS) ${DESTDIR}/${LIB}/$(TARGET).so.$(SO_VERS)
+	${LDCONFIG} -n ${DESTDIR}/${LIB}
 	install -m 755 $(TARGET).a ${DESTDIR}${LIBDIR}
 	install -m 644 apparmor.h ${DESTDIR}/usr/include/sys
 	ln -sf /${LIB}/$(TARGET).so.$(SO_VERS) ${DESTDIR}${LIBDIR}/$(TARGET).so
 	# compatability with old libimmunix
 	install -m 755 $(OLDTARGET) ${DESTDIR}/${LIB}
 	ln -sf apparmor.h ${DESTDIR}/usr/include/sys/immunix.h
+	make install_manpages DESTDIR=${DESTDIR}
 
 .PHONY: clean
-clean:
-	rm -f *.o $(TARGET)*.so* ${TARGETS} ${OLDTARGET}
-	rm -f ${NAME}-${VERSION}*.tar.gz ${TESTS} $(NAME)-*.tgz ${SPECFILE}
+clean: _clean
+	rm -f *.o $(TARGET)*.so* ${TARGETS} ${OLDTARGET} Make.rules
+	rm -f ${TESTS} ${SPECFILE}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libapparmor-2.0/Make.rules new/libapparmor-2.0.2/Make.rules
--- old/libapparmor-2.0/Make.rules	2006-01-10 17:13:35.000000000 +0100
+++ new/libapparmor-2.0.2/Make.rules	1970-01-01 01:00:00.000000000 +0100
@@ -1,197 +0,0 @@
-# $Id: Make.rules 6022 2006-01-09 22:06:34Z dominic $
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2002-2005 Novell/SUSE
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public 
-#    License published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, contact Novell, Inc.
-# ------------------------------------------------------------------
-# Make.rules - common make targets and variables for building the SHASS
-# product.
-#
-# NOTES:
-#   - must define the package NAME before including this file.
-#   - After checking in to cvs, you'll need to delele the hardlinked
-#     Make.rules files that already exist in the individual application
-#     directories
-
-DISTRIBUTION=Novell AppArmor
-VERSION=2.0
-
-# OVERRIDABLE variables
-# Set these variables before including Make.rules to change its behavior
-#   SPECFILE - for packages that have a non-standard specfile name
-#   EXTERNAL_PACKAGE - for packages that have upstream versions that
-#   	we're locally modifying (e.g. imnxcerttool/gnutls).
-#
-# use 'make BUILDIR=/some/where/else/' to override the /usr/src/redhat
-# location -- it *should* pick out the right thing to do based on the
-# .rpmmacros file, but you can still use BUILDDIR to override that.
-TESTBUILDDIR=$(shell [ -f ${HOME}/.rpmmacros ] && awk '/^%_topdir/ {print $$2}' ${HOME}/.rpmmacros)
-ifdef BUILDDIR
-#BUILDDIR:=$(BUILDDIR,/=)
-else 
-BUILDDIR=$(shell if [ -d "${TESTBUILDDIR}" ] ; then \
-		    echo ${TESTBUILDDIR} | sed "s^/$$^^" ; \
-		  elif [ -d "/usr/src/redhat" ] ; then \
-		    echo "/usr/src/redhat" ; \
-		  elif [ -d "/usr/src/packages" ] ; then \
-		    echo "/usr/src/packages" ; \
-		  else \
-		    echo "/tmp/${NAME}"  ; \
-		  fi ;)
-endif
-RPMHOSTVENDOR=$(shell rpm --eval "%{_host_vendor}")
-ifndef DISTRO
-DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \
-		  echo slackware ; \
-	       elif [ -f /etc/debian_version ] ; then \
-	       	  echo debian ;\
-	       elif [ ${RPMHOSTVENDOR} = "suse" ] ; then \
-	          echo suse ;\
-	       elif [ ${RPMHOSTVENDOR} = "redhat" ] ; then \
-	          echo rhel4 ;\
-	       else \
-	          echo unknown ;\
-	       fi)
-endif
-RPMARG=--define "_topdir ${BUILDDIR}" \
-        --define "vendor NOVELL, Inc." \
-	--define "distribution ${DISTRIBUTION}" \
-	--define "debug_package %{nil}" \
-	--define "immunix_version ${VERSION}" \
-	$(shell [ -d ${BUILDDIR}/BUILDROOT ] && echo --define \"buildroot ${BUILDDIR}/BUILDROOT\") \
-	$(shell [ -n "${DISTRO}" ] && echo --define \"distro ${DISTRO}\")
-
-#REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \
-#			if ! /usr/bin/svn info -r HEAD . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; then \
-#				/usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \
-#			fi ; \
-#		      fi)
-REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \
-				/usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \
-		      fi)
-
-ifdef EXTERNAL_PACKAGE
-RPMARG+=--define "_sourcedir $(shell pwd)"
-endif
-
-ifndef SPECFILE
-SPECFILE        = $(NAME).spec
-endif 
-RELEASE = $(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{RELEASE}" ${SPECFILE})
-RELEASE_DIR	= $(NAME)-$(VERSION)
-TARBALL		= $(NAME)-$(VERSION)-${REPO_VERSION}.tar.gz
-TAR		= /bin/tar czvp --exclude .svn --exclude CVS --exclude .cvsignore --exclude ${TARBALL} --exclude ${RELEASE_DIR}/${RELEASE_DIR}  $(shell test -f ${NAME}.exclude && echo "-X ${NAME}.exclude")
-
-CVSPKG_VERSION=$(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} ${SPECFILE} | head -1 | tr "." "_")
-
-RPMSUBDIRS=SOURCES SPECS BUILD BUILDROOT SRPMS RPMS/i386 RPMS/i586 \
-        RPMS/i686 RPMS/athlon RPMS/noarch RPMS/x86_64
-BUILDRPMSUBDIRS=$(foreach subdir, $(RPMSUBDIRS), $(BUILDDIR)/$(subdir))
-
-.PHONY: cvs_tag
-cvs_tag:
-	cvs tag IMMUNIX-${CVSPKG_VERSION}
-
-.PHONY: checkin
-checkin:
-	if cvs -q up -d | grep -q "^\?" ; then echo "Hey! You have" \
-		"files in the directory you have not added into cvs."; exit 1; \
-	fi
-	cvs ci
-	make cvs_tag
-
-ifdef EXTERNAL_PACKAGE
-.PHONY: rpm
-rpm: clean $(BUILDRPMSUBDIRS)
-	rpmbuild -ba ${RPMARG} ${SPECFILE}
-
-else
-.PHONY: rpm
-rpm: clean $(TARBALL) $(BUILDRPMSUBDIRS)
-	cp $(TARBALL) $(BUILDDIR)/SOURCES/
-	cp ${SPECFILE} $(BUILDDIR)/SPECS/
-	rpmbuild -ba ${RPMARG} ${SPECFILE}
-
-.PHONY: ${SPECFILE}
-${SPECFILE}: ${SPECFILE}.in
-	sed -e "s/@@immunix_version@@/${VERSION}/g" \
-	    -e "s/@@repo_version@@/${REPO_VERSION}/g" $< > $@
-
-${TARBALL}: clean ${SPECFILE}
-	-rm -rf $(RELEASE_DIR)
-	mkdir $(RELEASE_DIR)
-	$(TAR) . | tar xz -C $(RELEASE_DIR)
-	$(TAR) -f $@ $(RELEASE_DIR)
-	rm -rf $(RELEASE_DIR)
-
-.PHONY: tarball
-tarball: clean $(TARBALL)
-endif
-
-.PHONY: version
-.SILENT: version
-version:
-	 rpm -q --define "_sourcedir ." ${RPMARG} --specfile ${SPECFILE}
-
-.PHONY: build_dir 
-build_dir: $(BUILDRPMSUBDIRS)
-
-$(BUILDRPMSUBDIRS):
-	mkdir -p $(BUILDRPMSUBDIRS)
-
-# =====================
-# Slackware poo
-# =====================
-.PHONY: slack
-slack: 
-	rm -rf ${BUILDDIR}
-	mkdir -p ${BUILDDIR}/install
-	make install DESTDIR=${BUILDDIR} DISTRO=slackware
-	# comment line is there so grep always has something to match
-	( echo "# install script pulled from ${SPECFILE}" ; rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{POSTIN}\n" ${SPECFILE}) | grep -v "^(none)$$" >> ${BUILDDIR}/install/doinst.sh
-	( cd ${BUILDDIR} && makepkg -l y -c y -p ${PWD}/${NAME}-${VERSION}-${RELEASE}.tgz )
-
-# =====================
-# Debian poo
-# =====================
-.PHONY: deb
-deb: ${TARBALL}
-	rm -rf ${BUILDDIR}
-	mkdir -p ${BUILDDIR}
-	tar -xvzf ${TARBALL} -C ${BUILDDIR} 
-	( cd ${BUILDDIR}/${RELEASE_DIR} && sh -c "DEBFULLNAME='NOVELL, Inc' dh_make -e apparmor-general@forge.novell.com --library -f ~/svn/immunix/immunix/libimmunix/libimmunix-2.0.tar.gz << EOM \
-\
-EOM" )
-	make ${NAME}-deb -C ${BUILDDIR}/${RELEASE_DIR}
-	# ( cd ${BUILDDIR}/${RELEASE_DIR} && dpkg-buildpackage -b -sd -rfakeroot)
-
-DEBIAN_DISTRO=stable
-
-DEB_CHANGELOG_OUTPUT="${NAME} (${VERSION}-${RELEASE}) ${DEBIAN_DISTRO}; urgency=low\n\
-    \n   * Automatically generated by the AppArmor Build System.\n\
-    \n -- AppArmor Development Team  $(shell date -R)"
-
-
-.PHONY: debian/changelog
-debian/changelog: 
-	echo -e ${DEB_CHANGELOG_OUTPUT} > $@ 
-
-A2PS_ARGS=-Ec -g --line-numbers=1
-ENSCRIPT_ARGS=-C -2jGr -f Courier6 -E
-%.c.ps: %.c
-	#a2ps ${A2PS_ARGS} $< -o $@
-	enscript ${ENSCRIPT_ARGS} -o $@ $<
-
-%.pm.ps: %.pm
-	enscript ${ENSCRIPT_ARGS} -o $@ $<


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit libapparmor

root＠Hilbert.suse.de