/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to debian/mandos.postinst

  • Committer: Teddy Hogeborn
  • Date: 2014-07-25 23:16:04 UTC
  • mto: This revision was merged to the branch mainline in revision 724.
  • Revision ID: teddy@recompile.se-20140725231604-f5c4f82rn2o5ll1k
Use the .items() method instead of .iteritems().

This is strictly not a Python 2.7 change, but Python 2.7 backported
the new .viewitems() from Python 3, and instead of changing .items()
to .viewitems() and later having to change them all into .items()
again in Python 3, I opted to just change all .iteritems() to .items()
so the code will work both now and with Python 3.  The slowdown with
Python 2 is not significant, and with Python 3 it will again be fast.

* mandos (Client.__init__): Use .items() instead of .iteritems().
  (DBusObjectWithProperties.Introspect): - '' -
  (alternate_dbus_interfaces/wrapper): - '' -
  (main): - '' -
* mandos-ctl (main): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.postinst
15
15
# If prerm fails during replacement due to conflict:
16
16
#       <postinst> abort-remove in-favour <new-package> <version>
17
17
 
18
 
. /usr/share/debconf/confmodule
19
 
 
20
18
set -e
21
19
 
22
20
case "$1" in
27
25
                *:Mandos\ password\ system,,,:/nonexistent:/bin/false)
28
26
                    usermod --login _mandos mandos
29
27
                    groupmod --new-name _mandos mandos
30
 
                    # Reload D-Bus daemon to be aware of the _mandos
31
 
                    # user & group
32
 
                    if [ -x /etc/init.d/dbus ]; then
33
 
                        invoke-rc.d dbus force-reload || :
34
 
                    fi
35
28
                    ;;
36
29
            esac
37
30
        fi
41
34
                --home /nonexistent --no-create-home --group \
42
35
                --disabled-password --gecos "Mandos password system" \
43
36
                _mandos
44
 
            # Reload D-Bus daemon to be aware of the _mandos user &
45
 
            # group
46
 
            if [ -x /etc/init.d/dbus ]; then
47
 
                invoke-rc.d dbus force-reload || :
48
 
            fi
49
 
        elif dpkg --compare-versions "$2" eq 1.7.4-1 \
50
 
                || dpkg --compare-versions "$2" eq "1.7.4-1~bpo8+1"
51
 
        then
52
 
            start=no
53
 
            if ! [ -f /var/lib/mandos/clients.pickle ]; then
54
 
                invoke-rc.d mandos stop
55
 
                start=yes
56
 
            fi
57
 
            chown _mandos:_mandos /var/lib/mandos/clients.pickle \
58
 
                  2>/dev/null || :
59
 
            if [ "$start" = yes ]; then
60
 
                invoke-rc.d mandos start
61
 
            fi
62
 
        fi
63
 
        if ! dpkg-statoverride --list "/var/lib/mandos" >/dev/null \
64
 
             2>&1; then
65
 
            chown _mandos:_mandos /var/lib/mandos
66
 
            chmod u=rwx,go= /var/lib/mandos
67
 
        fi
68
 
 
69
 
        if dpkg --compare-versions "$2" eq "1.8.0-1" \
70
 
                || dpkg --compare-versions "$2" eq "1.8.0-1~bpo9+1"; then
71
 
            if grep --quiet --regexp='^[[:space:]]*key_id[[:space:]]*=[[:space:]]*[Ee]3[Bb]0[Cc]44298[Ff][Cc]1[Cc]149[Aa][Ff][Bb][Ff]4[Cc]8996[Ff][Bb]92427[Aa][Ee]41[Ee]4649[Bb]934[Cc][Aa]495991[Bb]7852[Bb]855[[:space:]]*$' /etc/mandos/clients.conf; then
72
 
                sed --in-place \
73
 
                    --expression='/^[[:space:]]*key_id[[:space:]]*=[[:space:]]*[Ee]3[Bb]0[Cc]44298[Ff][Cc]1[Cc]149[Aa][Ff][Bb][Ff]4[Cc]8996[Ff][Bb]92427[Aa][Ee]41[Ee]4649[Bb]934[Cc][Aa]495991[Bb]7852[Bb]855[[:space:]]*$/d' \
74
 
                    /etc/mandos/clients.conf
75
 
                invoke-rc.d mandos restart
76
 
                db_version 2.0
77
 
                db_fset mandos/removed_bad_key_ids seen false
78
 
                db_reset mandos/removed_bad_key_ids
79
 
                db_input critical mandos/removed_bad_key_ids || true
80
 
                db_go
81
 
                db_stop
82
 
            fi
83
 
        fi
84
 
 
85
 
        gnutls_version=$(dpkg-query --showformat='${Version}' \
86
 
                                    --show libgnutls30 \
87
 
                                    2>/dev/null || :)
88
 
        if [ -n "$gnutls_version" ] \
89
 
               && dpkg --compare-versions $gnutls_version ge 3.6.6; then
90
 
            db_version 2.0
91
 
            db_input critical mandos/key_id || true
92
 
            db_go
93
 
            db_stop
94
 
        fi
 
37
        fi
 
38
        chown _mandos:_mandos /var/lib/mandos
95
39
        ;;
96
40
    
97
41
    abort-upgrade|abort-deconfigure|abort-remove)