/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

* DBUS-API: Document new "Expires" and "ExtendedTimeout" properties.
* README: Refer to the installed manual page more simply.
* mandos (Client.extended_timeout, Client.expires): New attributes.
  (Client.extended_timeout_milliseconds): New.
  (Client.__init__, Client.enable, Client.disable): Set new attributes.
  (Client.checked_ok): Take new "timeout" argument.
  (ClientDBus.expires): Transform into a property which sends a D-Bus
                        signal when changed.
  (ClientDBus._datetime_to_dbus): Return empty D-Bus string on None.
                                  All callers changed to use this.

  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property,
  ClientDBus.Host_dbus_property, ClientDBus.Timeout_dbus_property,
  ClientDBus.Interval_dbus_property,
  ClientDBus.Checker_dbus_property): Bug fix: Only send D-Bus signal
                                     if new value is different.
  (ClientDBus.Timeout_dbus_property): Use new "expires" attribute.
  (ClientDBus.Expires_dbus_property,
  ClientDBus.ExtendedTimeout_dbus_property): New D-Bus properties.
  (ClientHandler.handle): Bump time using extended_timeout value.
  (main.client_defaults): Change default values of "timeout" and
                          "interval", added new default value for
                          "extended_timeout".
* mandos-clients.conf.xml (OPTIONS): Changed default values of
                                     "interval" and "timeout".  Add
                                     new "extended_timeout" option.
  (EXAMPLE): Updated default values.
* mandos-ctl: Show new "ExtendedTimeout" D-Bus property and change it
              using new "--extended-timeout" option.
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new
                                      "--extended-timeout" option.
* mandos-monitor (MandosClientWidget.update): Use new "Expires" D-Bus
                                              property.
* mandos.xml (DESCRIPTION): Add reference to intro(8mandos) manual
                            page.
  (CHECKING): Refer to the new "extended_timeout" option in
  clients.conf.

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