Changeset 24103

Show
Ignore:
Timestamp:
10/20/09 11:04:59 (5 weeks ago)
Author:
broder
Message:

In kerberos-config:

  • Only configure krb4 on systems that have it. (Trac: #379)
Location:
trunk/debathena/config/kerberos-config/debian
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/debathena/config/kerberos-config/debian/changelog

    r24099 r24103  
    44    shouldn't exist). (Trac: #319) 
    55  * Reload apparmor on upgrades (Trac: #326) 
     6  * Only configure krb4 on systems that have it. (Trac: #379) 
    67 
    7  -- Evan Broder <broder@mit.edu>  Sat, 17 Oct 2009 14:54:13 -0400 
     8 -- Evan Broder <broder@mit.edu>  Sat, 17 Oct 2009 15:16:45 -0400 
    89 
    910debathena-kerberos-config (1.7.1) unstable; urgency=low 

  • trunk/debathena/config/kerberos-config/debian/control.in

    r23766 r24103  
    33Priority: extra 
    44Maintainer: Debathena Project <debathena@mit.edu> 
    5 Build-Depends: @cdbs@, krb5-config, krb4-config, debathena-maybe-apparmor, debathena-cups 
     5Build-Depends: @cdbs@, krb5-config, debathena-maybe-krb4-config, debathena-maybe-apparmor, debathena-cups 
    66Standards-Version: 3.7.2 
    77 
    88Package: debathena-kerberos-config 
    99Architecture: all 
    10 Depends: krb5-config, krb4-config, krb5-user, krb5-clients, ntp | ntp-server | time-daemon, ntpdate | time-daemon, ${misc:Depends} 
     10Depends: krb5-config, krb5-user, krb5-clients, ntp | ntp-server | time-daemon, ntpdate | time-daemon, ${misc:Depends}, ${debathena-krb4-depends} 
    1111Provides: ${diverted-files} 
    1212Conflicts: ${diverted-files} 

  • trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst

    r24099 r24103  
    1818# the debian-policy package 
    1919 
     20package=debathena-kerberos-config 
     21ours=.debathena 
     22theirs=.debathena-orig 
     23 
     24undivert_unlink_symlink() 
     25{ 
     26    file="$1" 
     27    ourfile="$2" 
     28    theirfile="$3" 
     29    if [ ! -L "$file" ] || \ 
     30        [ "$(readlink "$file")" != "$(basename "$ourfile")" -a \ 
     31          "$(readlink "$file")" != "$(basename "$theirfile")" ]; then 
     32        echo "*** OMINOUS WARNING ***: $file is not linked to either $(basename "$ourfile") or $(basename "$theirfile")" >&2 
     33    else 
     34        rm -f "$file" 
     35    fi 
     36} 
     37 
     38undivert_unlink_divert() 
     39{ 
     40    file="$1" 
     41    if [ ! -L "$file" ] && [ ! -e "$file" ]; then 
     42        dpkg-divert --remove --rename --package "$package" "$file" 
     43    else 
     44        echo "Not removing diversion of $file by $package" >&2 
     45    fi 
     46} 
     47 
     48undivert_unlink() 
     49{ 
     50    prefix=$1 
     51    suffix=$2 
     52 
     53    file=$prefix$suffix 
     54    ourfile=$prefix$ours$suffix 
     55    theirfile=$prefix$theirs$suffix 
     56 
     57    undivert_unlink_symlink "$file" "$ourfile" "$theirfile" 
     58    undivert_unlink_divert "$file" "$package" 
     59} 
     60 
     61cleanup_old_diversion() { 
     62    file="$1" 
     63    if dpkg-divert --list "${file}" | grep -Fxq "diversion of ${file} to ${file}${theirs} by ${package}"; then 
     64        undivert_unlink "$file" 
     65    fi 
     66} 
    2067 
    2168case "$1" in 
    … …  
    2370        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 
    2471            rm -f /etc/apparmor.d/usr.sbin.cups.debathena 
     72        fi 
     73 
     74        # Handle upgrading from a system with krb4 to one without 
     75        krb5_version="$(dpkg-query -W -f '${Version}' krb5-clients)" 
     76        if dpkg --compare-versions "$krb5_version" ge "1.7~"; then 
     77            cleanup_old_diversion /etc/krb.conf 
     78            cleanup_old_diversion /etc/krb.realms 
    2579        fi 
    2680 

  • trunk/debathena/config/kerberos-config/debian/rules

    r24098 r24103  
    33DEB_DIVERT_EXTENSION = .debathena 
    44DEB_TRANSFORM_FILES_debathena-kerberos-config += \ 
    5         /etc/krb5.conf.debathena \ 
    6         /etc/krb.conf.debathena \ 
    7         /etc/krb.realms.debathena 
     5        /etc/krb5.conf.debathena 
    86DEB_CHECK_FILES_SOURCE_/etc/krb5.conf.debathena = \ 
    97        /usr/share/kerberos-configs/krb5.conf.template 
    10 DEB_CHECK_FILES_SOURCE_/etc/krb.conf.debathena = \ 
    11         /usr/share/kerberos-configs/krb.conf.template 
    128include /usr/share/cdbs/1/rules/debhelper.mk 
    139include /usr/share/cdbs/1/rules/config-package.mk 
    1410 
     11ifneq ($(wildcard /usr/share/kerberos-configs/krb.conf.template),) 
     12    DEB_TRANSFORM_FILES_debathena-kerberos-config += \ 
     13        /etc/krb.conf.debathena \ 
     14        /etc/krb.realms.debathena 
     15    DEB_CHECK_FILES_SOURCE_/etc/krb.conf.debathena = \ 
     16        /usr/share/kerberos-configs/krb.conf.template 
     17 
     18    binary-predeb/debathena-kerberos-config:: debathena-krberos-config-substvars 
     19    debathena-krberos-config-substvars:: 
     20        echo "debathena-krb4-depends=krb4-config" \ 
     21          >> debian/debathena-kerberos-config.substvars 
     22endif 
    1523ifneq ($(wildcard /etc/apparmor.d/usr.sbin.cupsd),) 
    1624    common-build-indep:: debian/usr.sbin.cupsd.debathena