[24183] in Source-Commits
/svn/athena r23784 - trunk/debathena/config/kerberos-config/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Fri May 15 00:38:50 2009
Date: Fri, 15 May 2009 00:38:41 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <200905150438.n4F4cf23015287@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2009-05-15 00:38:40 -0400 (Fri, 15 May 2009)
New Revision: 23784
Modified:
trunk/debathena/config/kerberos-config/debian/changelog
trunk/debathena/config/kerberos-config/debian/rules
Log:
Minor AppArmor fix in debathena-kerberos-config.
Since it reads /etc/apparmor.d/* regardless of extension, we need to divert the
original file into another directory (DEB_DELETE_FILES) and install a new one,
rather than do the usual DEB_TRANSFORM_FILES trick that leaves a .debathena and
.debathena-orig around.
Modified: trunk/debathena/config/kerberos-config/debian/changelog
===================================================================
--- trunk/debathena/config/kerberos-config/debian/changelog 2009-05-14 17:26:21 UTC (rev 23783)
+++ trunk/debathena/config/kerberos-config/debian/changelog 2009-05-15 04:38:40 UTC (rev 23784)
@@ -1,3 +1,11 @@
+debathena-kerberos-config (1.7.1) unstable; urgency=low
+
+ * Don't have AppArmor attempt to load all three of
+ usr.sbin.cupsd{,.debathena,.debathena-orig}. While it just so happened
+ to get the first one and fail the other two, that's less than ideal.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Thu, 14 May 2009 21:36:46 -0400
+
debathena-kerberos-config (1.7) unstable; urgency=low
* Add missing build-deps for apparmor transformations.
Modified: trunk/debathena/config/kerberos-config/debian/rules
===================================================================
--- trunk/debathena/config/kerberos-config/debian/rules 2009-05-14 17:26:21 UTC (rev 23783)
+++ trunk/debathena/config/kerberos-config/debian/rules 2009-05-15 04:38:40 UTC (rev 23784)
@@ -6,12 +6,22 @@
/etc/krb.conf.debathena \
/etc/krb.realms.debathena
ifneq ($(wildcard /etc/apparmor.d/usr.sbin.cupsd),)
- DEB_TRANSFORM_FILES_debathena-kerberos-config += \
- /etc/apparmor.d/usr.sbin.cupsd.debathena
+ debian/usr.sbin.cups.debathena: $(call debian_check_files,/etc/apparmor.d/usr.sbin.cupsd)
+ debian/transform_usr.sbin.cupsd.debathena < $< > $@
+ clean::
+ -rm debian/usr.sbin.cups.debathen
+ install/debathena-kerberos-config::
+ dh_install debian/usr.sbin.cups.debathena etc/apparmor.d
+ DEB_REMOVE_FILES += /etc/apparmor.d/usr.sbin.cupsd
endif
ifneq ($(wildcard /etc/apparmor.d/abstractions/kerberosclient),)
- DEB_TRANSFORM_FILES_debathena-kerberos-config += \
- /etc/apparmor.d/abstractions/kerberosclient.debathena
+ debian/kerberosclient.debathena: $(call debian_check_files,/etc/apparmor.d/abstractions/kerberosclient)
+ debian/transform_kerberosclient.debathena < $< > $@
+ clean::
+ -rm debian/kerberosclient
+ install/debathena-kerberos-config::
+ dh_install debian/kerberosclient.debathena etc/apparmor.d/abstractions
+ DEB_REMOVE_FILES += /etc/apparmor.d/abstractions/kerberosclient
endif
DEB_CHECK_FILES_SOURCE_/etc/krb5.conf.debathena = \
/usr/share/kerberos-configs/krb5.conf.template
