Control: tags -1 + patch
Hi,
Kees Cook wrote (05 May 2012 22:46:02 GMT) :
> Thanks for the testing and details. I've got the needed changes staged
> in experimental now.
FWIW the attached debdiff against 2.7.103-4 builds fine in my unstable
+ experimental chroot. It's mostly the same as the patch Kees applied
when he uploaded a candidate package for this transition in
experimental last year.
The resulting libapache2-mod-apparmor package looks good (same files
list, seemingly sensible control differences). I haven't tested
it though.
Cheers,
--
intrigeri
| GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
| OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc
diff -Nru apparmor-2.7.103/debian/changelog apparmor-2.7.103/debian/changelog
--- apparmor-2.7.103/debian/changelog 2012-07-16 20:54:14.000000000 +0200
+++ apparmor-2.7.103/debian/changelog 2013-05-20 15:17:58.000000000 +0200
@@ -1,3 +1,10 @@
+apparmor (2.7.103-5~0apache24.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Apache 2.4 transition.
+
+ -- intrigeri <intrig...@debian.org> Mon, 20 May 2013 15:16:58 +0200
+
apparmor (2.7.103-4) unstable; urgency=low
* debian/apparmor-profiles.dirs: add directories we might collide
diff -Nru apparmor-2.7.103/debian/control apparmor-2.7.103/debian/control
--- apparmor-2.7.103/debian/control 2012-06-29 07:47:02.000000000 +0200
+++ apparmor-2.7.103/debian/control 2013-05-20 15:15:08.000000000 +0200
@@ -8,7 +8,7 @@
dejagnu,
swig,
bzip2,
- apache2-prefork-dev,
+ dh-apache2, apache2-dev,
libpam-dev,
texlive-latex-base, texlive-latex-recommended,
python-all-dev, python,
@@ -87,7 +87,7 @@
Package: libapache2-mod-apparmor
Section: libs
Architecture: any
-Depends: apache2.2-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: apache2-api-20120211, ${shlibs:Depends}, ${misc:Depends}
Description: changehat AppArmor library as an Apache module
This provides the Apache module needed to declare various differing
confinement policies when running virtual hosts in the webserver
diff -Nru apparmor-2.7.103/debian/libapache2-mod-apparmor.apache2 apparmor-2.7.103/debian/libapache2-mod-apparmor.apache2
--- apparmor-2.7.103/debian/libapache2-mod-apparmor.apache2 1970-01-01 01:00:00.000000000 +0100
+++ apparmor-2.7.103/debian/libapache2-mod-apparmor.apache2 2013-05-20 15:15:08.000000000 +0200
@@ -0,0 +1,2 @@
+mod debian/tmp/usr/lib/apache2/modules/mod_apparmor.so
+mod debian/etc/apache2/mods-available/apparmor.load
diff -Nru apparmor-2.7.103/debian/libapache2-mod-apparmor.install apparmor-2.7.103/debian/libapache2-mod-apparmor.install
--- apparmor-2.7.103/debian/libapache2-mod-apparmor.install 2012-06-29 07:17:27.000000000 +0200
+++ apparmor-2.7.103/debian/libapache2-mod-apparmor.install 2013-05-20 15:15:08.000000000 +0200
@@ -1,4 +1,2 @@
-debian/etc/apache2/* /etc/apache2/
-usr/lib/apache2/*
etc/apparmor.d/usr.lib.apache2.mpm-prefork.apache2
etc/apparmor.d/local/usr.lib.apache2.mpm-prefork.apache2
diff -Nru apparmor-2.7.103/debian/rules apparmor-2.7.103/debian/rules
--- apparmor-2.7.103/debian/rules 2012-06-29 09:42:30.000000000 +0200
+++ apparmor-2.7.103/debian/rules 2013-05-20 15:15:08.000000000 +0200
@@ -150,6 +150,7 @@
dh_fixperms
dh_perl
dh_python2 -p python-libapparmor -p apparmor -p apparmor-utils --no-guessing-versions
+ dh_apache2 -p libapache2-mod-apparmor
dh_makeshlibs
dh_installdeb
dh_shlibdeps
