/mandos/release

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

« back to all changes in this revision

Viewing changes to debian/mandos.postinst

More consistent terminology: Clients are no longer "invalid" - they
are "disabled".  All code and documentation changed to reflect this.

D=Bus API change: The "properties" argument was removed from the
"ClientAdded" signal on interface "se.bsnet.fukt.Mandos".  All code in
both "mandos" and "mandos-monitor" changed to reflect this.

* mandos: Replaced "with closing(F)" with simply "with F" in all
          places where F is a file object.
  (Client.still_valid): Removed.  All callers changed to look at
                        "Client.enabled" instead.
  (dbus_service_property): Check for unsupported signatures with the
                           "byte_arrays" option.
  (DBusObjectWithProperties.Set): - '' -
  (ClientHandler.handle): Use the reverse pipe to receive the
                          "Client.enabled" attribute instead of the
                          now-removed "Client.still_valid()" method.
  (ForkingMixInWithPipe): Renamed to "ForkingMixInWithPipes" (all
                          users changed).  Now also create a reverse
                          pipe for sending data to the child process.
  (ForkingMixInWithPipes.add_pipe): Now takes two pipe fd's as
                                    arguments.  All callers changed.
  (IPv6_TCPServer.handle_ipc): Take an additional "reply_fd" argument
                               (all callers changed).  Close the reply
                               pipe when the child data pipe is
                               closed.  New "GETATTR" IPC method; will
                               pickle client attribute and send it
                               over the reply pipe FD.
  (MandosDBusService.ClientAdded): Removed "properties" argument.  All
                                   emitters changed.
* mandos-clients.conf.xml (DESCRIPTION, OPTIONS): Use
                                                  "enabled/disabled"
                                                  terminology.
* mandos-ctl: Option "--is-valid" renamed to "--is-enabled".
* mandos-monitor: Enable user locale.  Try to log exceptions.
  (MandosClientPropertyCache.__init__): Removed "properties" argument.
                                        All callers changed.
  (UserInterface.add_new_client): Remove "properties" argument.  All
                                  callers changed.  Supply "logger"
                                  argument to MandosClientWidget().
  (UserInterface.add_client): New "logger" argument.  All callers
                              changed.
* mandos.xml (BUGS, SECURITY/CLIENTS): Use "enabled/disabled"
                                       terminology.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.postinst
1
 
#!/bin/sh
 
1
#!/bin/sh -e
2
2
# This script can be called in the following ways:
3
3
#
4
4
# After the package was installed:
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
 
set -e
21
 
 
22
18
case "$1" in
23
19
    configure)
24
20
        # Rename old "mandos" user and group
36
32
                --home /nonexistent --no-create-home --group \
37
33
                --disabled-password --gecos "Mandos password system" \
38
34
                _mandos
39
 
        elif dpkg --compare-versions "$2" eq 1.7.4-1 \
40
 
                || dpkg --compare-versions "$2" eq "1.7.4-1~bpo8+1"
41
 
        then
42
 
            start=no
43
 
            if ! [ -f /var/lib/mandos/clients.pickle ]; then
44
 
                invoke-rc.d mandos stop
45
 
                start=yes
46
 
            fi
47
 
            chown _mandos:_mandos /var/lib/mandos/clients.pickle \
48
 
                  2>/dev/null || :
49
 
            if [ "$start" = yes ]; then
50
 
                invoke-rc.d mandos start
51
 
            fi
52
 
        fi
53
 
        if ! dpkg-statoverride --list "/var/lib/mandos" >/dev/null \
54
 
             2>&1; then
55
 
            chown _mandos:_mandos /var/lib/mandos
56
 
            chmod u=rwx,go= /var/lib/mandos
57
 
        fi
58
 
 
59
 
        if dpkg --compare-versions "$2" eq "1.8.0-1" \
60
 
                || dpkg --compare-versions "$2" eq "1.8.0-1~bpo9+1"; then
61
 
            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
62
 
                sed --in-place \
63
 
                    --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' \
64
 
                    /etc/mandos/clients.conf
65
 
                invoke-rc.d mandos restart
66
 
                db_version 2.0
67
 
                db_fset mandos/removed_bad_key_ids seen false
68
 
                db_reset mandos/removed_bad_key_ids
69
 
                db_input critical mandos/removed_bad_key_ids || true
70
 
                db_go
71
 
                db_stop
72
 
            fi
73
 
        fi
74
 
 
75
 
        gnutls_version=$(dpkg-query --showformat='${Version}' \
76
 
                                    --show libgnutls30 \
77
 
                                    2>/dev/null || :)
78
 
        if [ -n "$gnutls_version" ] \
79
 
               && dpkg --compare-versions $gnutls_version ge 3.6.6; then
80
 
            db_version 2.0
81
 
            db_input critical mandos/key_id || true
82
 
            db_go
83
 
            db_stop
84
35
        fi
85
36
        ;;
86
 
    
 
37
 
87
38
    abort-upgrade|abort-deconfigure|abort-remove)
88
39
        ;;
89
 
    
 
40
 
90
41
    *)
91
42
        echo "$0 called with unknown argument '$1'" 1>&2
92
43
        exit 1
93
44
        ;;
94
45
esac
95
46
 
96
 
# Avahi version 0.6.31-2 and older provides "avahi" (instead of
97
 
# "avahi-daemon") in its /etc/init.d script header.  To make
98
 
# insserv(8) happy, we edit our /etc/init.d script header to contain
99
 
# the correct string before the code added by dh_installinit calls
100
 
# update.rc-d, which calls insserv.
101
 
avahi_version="`dpkg-query --showformat='${Version}' --show avahi-daemon`"
102
 
if dpkg --compare-versions "$avahi_version" le 0.6.31-2; then
103
 
    sed --in-place --expression='/^### BEGIN INIT INFO$/,/^### END INIT INFO$/s/^\(# Required-\(Stop\|Start\):.*avahi\)-daemon\>/\1/g' /etc/init.d/mandos
104
 
fi
105
 
 
106
47
#DEBHELPER#
107
48
 
108
49
exit 0