[23218] in Source-Commits
/svn/athena r22879 - trunk/debathena/config/kerberos-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 22:13:48 2008
Date: Sun, 6 Apr 2008 22:12:04 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070212.WAA05029@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-06 22:12:04 -0400 (Sun, 06 Apr 2008)
New Revision: 22879
Added:
trunk/debathena/config/kerberos-config/debian/transform_krb.conf.debathena
trunk/debathena/config/kerberos-config/debian/transform_krb.realms.debathena
trunk/debathena/config/kerberos-config/debian/transform_krb5.conf.debathena
Modified:
trunk/debathena/config/kerberos-config/debian/changelog
trunk/debathena/config/kerberos-config/debian/control
trunk/debathena/config/kerberos-config/debian/control.in
trunk/debathena/config/kerberos-config/debian/rules
Log:
Modified: trunk/debathena/config/kerberos-config/debian/changelog
===================================================================
--- trunk/debathena/config/kerberos-config/debian/changelog 2008-04-07 02:05:57 UTC (rev 22878)
+++ trunk/debathena/config/kerberos-config/debian/changelog 2008-04-07 02:12:04 UTC (rev 22879)
@@ -1,3 +1,10 @@
+debathena-kerberos-config (1.1) unstable; urgency=low
+
+ * Changed rules and control files to use new config-package-dev interface.
+ Put 3 transforms in seperate transform files.
+
+ -- Michael Y McCanna <acrefoot@mit.edu> Sun, 6 Apr 2008 18:56:49 -0400
+
debathena-kerberos-config (1.0debathena5) unstable; urgency=low
* Use new check-conffiles interface from debathena-config-build-common
Modified: trunk/debathena/config/kerberos-config/debian/control
===================================================================
--- trunk/debathena/config/kerberos-config/debian/control 2008-04-07 02:05:57 UTC (rev 22878)
+++ trunk/debathena/config/kerberos-config/debian/control 2008-04-07 02:12:04 UTC (rev 22879)
@@ -2,12 +2,14 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debathena-config-build-common, debathena-config-build-common (>= 3.5~), krb5-config, krb4-config
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev, krb5-config, krb4-config
Standards-Version: 3.7.2
Package: debathena-kerberos-config
Architecture: all
Depends: krb5-config, krb4-config, krb5-user, krb5-clients, ntp-server | time-daemon, ntpdate | time-daemon, ${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: Kerberos configuration for Debian-Athena
This packages configures Kerberos to use the Athena realm, and adds a
few other MIT realms to the Kerberos configuration files, by
Modified: trunk/debathena/config/kerberos-config/debian/control.in
===================================================================
--- trunk/debathena/config/kerberos-config/debian/control.in 2008-04-07 02:05:57 UTC (rev 22878)
+++ trunk/debathena/config/kerberos-config/debian/control.in 2008-04-07 02:12:04 UTC (rev 22879)
@@ -8,6 +8,8 @@
Package: debathena-kerberos-config
Architecture: all
Depends: krb5-config, krb4-config, krb5-user, krb5-clients, ntp-server | time-daemon, ntpdate | time-daemon, ${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: Kerberos configuration for Debian-Athena
This packages configures Kerberos to use the Athena realm, and adds a
few other MIT realms to the Kerberos configuration files, by
Modified: trunk/debathena/config/kerberos-config/debian/rules
===================================================================
--- trunk/debathena/config/kerberos-config/debian/rules 2008-04-07 02:05:57 UTC (rev 22878)
+++ trunk/debathena/config/kerberos-config/debian/rules 2008-04-07 02:12:04 UTC (rev 22879)
@@ -1,50 +1,12 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-kerberos-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_REPLACE_FILES_debathena-kerberos-config += \
/etc/krb5.conf.debathena \
/etc/krb.conf.debathena \
/etc/krb.realms.debathena
+DEB_CHECK_FILES_SOURCE_krb5.conf = /usr/share/kerberos-configs/krb5.conf.template
+DEB_CHECK_FILES_SOURCE_krb.conf = /usr/share/kerberos-configs/krb.conf.template
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-divert.mk
-include /usr/share/cdbs/1/rules/debathena-check-conffiles.mk
-
-common-build-indep:: debian/krb5.conf.debathena debian/krb.conf.debathena debian/krb.realms.debathena
-
-debian/krb5.conf.debathena: /usr/share/kerberos-configs/krb5.conf.template
- perl -0pe ' \
- s/^([ \t]*default_realm *=).*$$/\1 ATHENA.MIT.EDU/m or die; \
- s/(\[realms\][^[]*\n)[ \t]*NUMENOR\.MIT\.EDU\s*=\s*\{[^}]*\}\s*\n/\1/; \
- s/(\[realms\]\n)/\1\tNUMENOR.MIT.EDU = {\n\t\tkdc = numenor.mit.edu\n\t\tadmin_server = numenor.mit.edu\n\t}\n/ or die; \
- s/(\[realms\][^[]*\n)[ \t]*CSAIL\.MIT\.EDU\s*=\s*\{[^}]*\}\s*\n/\1/; \
- s/(\[realms\]\n)/\1\tCSAIL.MIT.EDU = {\n\t\tkdc = kerberos-1.csail.mit.edu\n\t\tkdc = kerberos-2.csail.mit.edu\n\t\tadmin_server = kerberos.csail.mit.edu\n\t\tdefault_domain = csail.mit.edu\n\t\tkrb524_server = krb524.csail.mit.edu\n\t}\n/ or die; \
- s/(\[realms\][^[]*\n)[ \t]*ATHENA\.MIT\.EDU\s*=\s*\{[^}]*\}\s*\n/\1/; \
- s/(\[realms\]\n)/\1\tATHENA.MIT.EDU = {\n\t\tkdc = kerberos.mit.edu:88\n\t\tkdc = kerberos-1.mit.edu:88\n\t\tkdc = kerberos-2.mit.edu:88\n\t\tadmin_server = kerberos.mit.edu\n\t\tdefault_domain = mit.edu\n\t}\n/ or die; \
- s/(\[domain_realm\][^[]*\n)[ \t]*numenor\.mit\.edu\s*=[^\n]*\n/\1/; \
- s/(\[domain_realm\]\n)/\1\tnumenor.mit.edu = NUMENOR.MIT.EDU\n/ or die; \
- s/(\[domain_realm\][^[]*\n)[ \t]*csail\.mit\.edu\s*=[^\n]*\n/\1/; \
- s/(\[domain_realm\]\n)/\1\tcsail.mit.edu = CSAIL.MIT.EDU\n/ or die; \
- s/(\[domain_realm\][^[]*\n)[ \t]*\.csail\.mit\.edu\s*=[^\n]*\n/\1/; \
- s/(\[domain_realm\]\n)/\1\t.csail.mit.edu = CSAIL.MIT.EDU\n/ or die; \
- s/(\[domain_realm\][^[]*\n)[ \t]*mit\.edu\s*=[^\n]*\n/\1/; \
- s/(\[domain_realm\]\n)/\1\tmit.edu = ATHENA.MIT.EDU\n/ or die; \
- s/(\[domain_realm\][^[]*\n)[ \t]*\.mit\.edu\s*=[^\n]*\n/\1/; \
- s/(\[domain_realm\]\n)/\1\t.mit.edu = ATHENA.MIT.EDU\n/ or die;' \
- $< > $@
-
-debian/krb.conf.debathena: /usr/share/kerberos-configs/krb.conf.template
- perl -0pe ' \
- s/^ATHENA\.MIT\.EDU[ \t]*.*\n//mg; \
- s/^NUMENOR\.MIT\.EDU[ \t]*.*\n//mg; \
- s/^\@defaultrealm\n/ATHENA.MIT.EDU\nATHENA.MIT.EDU kerberos.mit.edu admin server\nATHENA.MIT.EDU kerberos-1.mit.edu\nATHENA.MIT.EDU kerberos-2.mit.edu\nNUMENOR.MIT.EDU numenor.mit.edu admin server\n/ or die;' \
- $< > $@
-
-debian/krb.realms.debathena: $(call debathena_check_conffiles,/etc/krb.realms)
- perl -0pe ' \
- s/^.*[ \t]*ATHENA\.MIT\.EDU\n//mg; \
- s/^.*[ \t]*NUMENOR\.MIT\.EDU\n//mg; \
- s/^/.mit.edu ATHENA.MIT.EDU\nmit.edu ATHENA.MIT.EDU\nnumenor.mit.edu NUMENOR.MIT.EDU\n/ or die;' \
- $< > $@
-
-clean::
- rm -f debian/krb5.conf.debathena debian/krb.conf.debathena debian/krb.realms.debathena
+include /usr/share/cdbs/1/rules/replace-files.mk
Added: trunk/debathena/config/kerberos-config/debian/transform_krb.conf.debathena
Property changes on: trunk/debathena/config/kerberos-config/debian/transform_krb.conf.debathena
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/config/kerberos-config/debian/transform_krb.realms.debathena
Property changes on: trunk/debathena/config/kerberos-config/debian/transform_krb.realms.debathena
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/config/kerberos-config/debian/transform_krb5.conf.debathena
Property changes on: trunk/debathena/config/kerberos-config/debian/transform_krb5.conf.debathena
___________________________________________________________________
Name: svn:executable
+ *
