[24033] in Source-Commits
/svn/athena r23642 - trunk/debathena/config/kerberos-config/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Mon Mar 23 01:26:58 2009
Date: Mon, 23 Mar 2009 01:26:48 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <200903230526.n2N5Qm1S004687@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2009-03-23 01:26:48 -0400 (Mon, 23 Mar 2009)
New Revision: 23642
Added:
trunk/debathena/config/kerberos-config/debian/transform_kerberosclient.debathena
trunk/debathena/config/kerberos-config/debian/transform_usr.bin.cups.debathena
Modified:
trunk/debathena/config/kerberos-config/debian/changelog
trunk/debathena/config/kerberos-config/debian/rules
Log:
In kerberos-config:
* Transform things in /etc/apparmor.d, if they exist, to permit
reading /etc/krb5.conf.debathena in addition to /etc/krb5.conf. This
should suppress audit errors on Intrepid with cupsd.
Modified: trunk/debathena/config/kerberos-config/debian/changelog
===================================================================
--- trunk/debathena/config/kerberos-config/debian/changelog 2009-03-20 21:20:55 UTC (rev 23641)
+++ trunk/debathena/config/kerberos-config/debian/changelog 2009-03-23 05:26:48 UTC (rev 23642)
@@ -1,3 +1,11 @@
+debathena-kerberos-config (1.6) unstable; urgency=low
+
+ * Transform things in /etc/apparmor.d, if they exist, to permit
+ reading /etc/krb5.conf.debathena in addition to /etc/krb5.conf. This
+ should suppress audit errors on Intrepid with cupsd.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Mon, 23 Mar 2009 01:17:26 -0400
+
debathena-kerberos-config (1.5) unstable; urgency=low
* Add support for ATHENA.MIT.EDU being the default realm in
Modified: trunk/debathena/config/kerberos-config/debian/rules
===================================================================
--- trunk/debathena/config/kerberos-config/debian/rules 2009-03-20 21:20:55 UTC (rev 23641)
+++ trunk/debathena/config/kerberos-config/debian/rules 2009-03-23 05:26:48 UTC (rev 23642)
@@ -5,6 +5,14 @@
/etc/krb5.conf.debathena \
/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
+endif
+ifneq ($(wildcard /etc/apparmor.d/abstractions/kerberosclient),)
+ DEB_TRANSFORM_FILES_debathena-kerberos-config += \
+ /etc/apparmor.d/abstractions/kerberosclient
+endif
DEB_CHECK_FILES_SOURCE_/etc/krb5.conf.debathena = \
/usr/share/kerberos-configs/krb5.conf.template
DEB_CHECK_FILES_SOURCE_/etc/krb.conf.debathena = \
Added: trunk/debathena/config/kerberos-config/debian/transform_kerberosclient.debathena
===================================================================
--- trunk/debathena/config/kerberos-config/debian/transform_kerberosclient.debathena 2009-03-20 21:20:55 UTC (rev 23641)
+++ trunk/debathena/config/kerberos-config/debian/transform_kerberosclient.debathena 2009-03-23 05:26:48 UTC (rev 23642)
@@ -0,0 +1,2 @@
+#!/usr/bin/perl -p0
+s|^([ \t]*/etc/krb5.conf)( .*)$|\1\2\n\1.debathena\2|m;
Property changes on: trunk/debathena/config/kerberos-config/debian/transform_kerberosclient.debathena
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/config/kerberos-config/debian/transform_usr.bin.cups.debathena
===================================================================
--- trunk/debathena/config/kerberos-config/debian/transform_usr.bin.cups.debathena 2009-03-20 21:20:55 UTC (rev 23641)
+++ trunk/debathena/config/kerberos-config/debian/transform_usr.bin.cups.debathena 2009-03-23 05:26:48 UTC (rev 23642)
@@ -0,0 +1,2 @@
+#!/usr/bin/perl -p0
+s|^([ \t]*/etc/krb5.conf)( .*)$|\1\2\n\1.debathena\2|m;
Property changes on: trunk/debathena/config/kerberos-config/debian/transform_usr.bin.cups.debathena
___________________________________________________________________
Name: svn:executable
+ *
