[27027] in Source-Commits
/svn/athena r25903 - trunk/debathena/config/kerberos-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Apr 9 14:08:54 2013
Date: Tue, 9 Apr 2013 14:08:48 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304091808.r39I8mk9011754@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-09 14:08:48 -0400 (Tue, 09 Apr 2013)
New Revision: 25903
Added:
trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.unhide
Modified:
trunk/debathena/config/kerberos-config/debian/changelog
trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst
trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.undisplace
Log:
In kerberos-config:
* Punt all the old cleanup code and divert.sh from postinst; simply
undivert/unhide as necessary
Modified: trunk/debathena/config/kerberos-config/debian/changelog
===================================================================
--- trunk/debathena/config/kerberos-config/debian/changelog 2013-04-09 17:20:34 UTC (rev 25902)
+++ trunk/debathena/config/kerberos-config/debian/changelog 2013-04-09 18:08:48 UTC (rev 25903)
@@ -1,4 +1,4 @@
-debathena-kerberos-config (1.15) UNRELEASED; urgency=low
+debathena-kerberos-config (1.15) unstable; urgency=low
* Switch from control.in to control (Trac: #561)
* Bump Standards-Version to 3.9.3
@@ -6,8 +6,10 @@
* Drop Build-dependency on maybe-krb4-config
* Switch from CDBS to dh7
* Fix syntax error in copyright file
+ * Punt all the old cleanup code and divert.sh from postinst; simply
+ undivert/unhide as necessary
- -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 16:39:41 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 09 Apr 2013 14:08:18 -0400
debathena-kerberos-config (1.14) unstable; urgency=low
Modified: trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst
===================================================================
--- trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst 2013-04-09 17:20:34 UTC (rev 25902)
+++ trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst 2013-04-09 18:08:48 UTC (rev 25903)
@@ -22,85 +22,12 @@
#DEBHELPER#
-package=debathena-kerberos-config
-ours=.debathena
-theirs=.debathena-orig
-
-undivert_unlink_symlink()
-{
- file="$1"
- ourfile="$2"
- theirfile="$3"
- if [ ! -L "$file" ] || \
- [ "$(readlink "$file")" != "$(basename "$ourfile")" -a \
- "$(readlink "$file")" != "$(basename "$theirfile")" ]; then
- echo "*** OMINOUS WARNING ***: $file is not linked to either $(basename "$ourfile") or $(basename "$theirfile")" >&2
- else
- rm -f "$file"
- fi
-}
-
-undivert_unlink_divert()
-{
- file="$1"
- if [ ! -L "$file" ] && [ ! -e "$file" ]; then
- dpkg-divert --remove --rename --package "$package" "$file"
- else
- echo "Not removing diversion of $file by $package" >&2
- fi
-}
-
-undivert_unlink()
-{
- prefix=$1
- suffix=$2
-
- file=$prefix$suffix
- ourfile=$prefix$ours$suffix
- theirfile=$prefix$theirs$suffix
-
- undivert_unlink_symlink "$file" "$ourfile" "$theirfile"
- undivert_unlink_divert "$file" "$package"
-}
-
-cleanup_old_diversion() {
- file="$1"
- if dpkg-divert --list "${file}" | grep -Fxq "diversion of ${file} to ${file}${theirs} by ${package}"; then
- undivert_unlink "$file"
- fi
-}
-
-cleanup_old_removal() {
- file="$1"
- removedfile="$2"
- if dpkg-divert --list "${file}" | grep -Fxq "diversion of ${file} to ${removedfile} by ${package}"; then
- undivert_unlink_divert "$file"
- fi
-}
-
-
case "$1" in
configure)
if dpkg-query -f '${Conffiles}\n' -W debathena-kerberos-config | grep '/etc/apparmor.d/usr.sbin.cups.debathena' | awk '{ print $2" "$1 }' | md5sum -c >/dev/null 2>&1; then
rm -f /etc/apparmor.d/usr.sbin.cups.debathena
fi
- # The cupsd config can be removed, but not diverted; the
- # kerberosclient config can be diverted but not removed. Since
- # both files have been both at various points in the package's
- # history, if one of them is wrong, fix it.
- cleanup_old_removal /etc/apparmor.d/usr.sbin.cupsd /usr/share/debathena-kerberos-config/etc++apparmor.d++usr.sbin.cupsd
- cleanup_old_diversion /etc/apparmor.d/usr.sbin.cupsd
- cleanup_old_removal /etc/apparmor.d/abstractions/kerberosclient /usr/share/debathena-kerberos-config/etc++apparmor.d++abstractions++kerberosclient
- cleanup_old_diversion /etc/apparmor.d/abstractions/kerberosclient
-
- # Handle upgrading from a system with krb4 to one without
- krb5_version="$(dpkg-query -W -f '${Version}' krb5-user)"
- if dpkg --compare-versions "$krb5_version" ge "1.7~"; then
- cleanup_old_diversion /etc/krb.conf
- cleanup_old_diversion /etc/krb.realms
- fi
-
if dpkg --compare-versions "$2" lt-nl "1.10~" && \
hash apparmor_status 2>/dev/null && \
apparmor_status --enabled; then
Modified: trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.undisplace
===================================================================
--- trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.undisplace 2013-04-09 17:20:34 UTC (rev 25902)
+++ trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.undisplace 2013-04-09 18:08:48 UTC (rev 25903)
@@ -1,2 +1,5 @@
/etc/krb.conf.debathena
/etc/krb.realms.debathena
+# We used to divert these pre 1.10. See also .unhide
+/etc/apparmor.d/usr.sbin.cupsd
+/etc/apparmor.d/abstractions/kerberosclient
Added: trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.unhide
===================================================================
--- trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.unhide (rev 0)
+++ trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.unhide 2013-04-09 18:08:48 UTC (rev 25903)
@@ -0,0 +1,3 @@
+# We used to hide ("remove") these pre-1.10. See also .undisplace
+/etc/apparmor.d/abstractions/kerberosclient
+/etc/apparmor.d/usr.sbin.cupsd
