/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: 2011-09-18 15:59:05 UTC
  • mfrom: (24.1.179 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110918155905-ngj2ig0yheralj1s
* 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
 
35
        fi
 
36
        ;;
58
37
 
59
 
        gnutls_version=$(dpkg-query --showformat='${Version}' \
60
 
                                    --show libgnutls30 \
61
 
                                    2>/dev/null || :)
62
 
        if [ -n "$gnutls_version" ] \
63
 
               && dpkg --compare-versions $gnutls_version ge 3.6.6; then
64
 
            db_version 2.0
65
 
            db_input critical mandos/key_id || true
66
 
            db_go
67
 
            db_stop
68
 
        fi
69
 
        ;;
70
 
    
71
38
    abort-upgrade|abort-deconfigure|abort-remove)
72
39
        ;;
73
 
    
 
40
 
74
41
    *)
75
42
        echo "$0 called with unknown argument '$1'" 1>&2
76
43
        exit 1
77
44
        ;;
78
45
esac
79
46
 
80
 
# Avahi version 0.6.31-2 and older provides "avahi" (instead of
81
 
# "avahi-daemon") in its /etc/init.d script header.  To make
82
 
# insserv(8) happy, we edit our /etc/init.d script header to contain
83
 
# the correct string before the code added by dh_installinit calls
84
 
# update.rc-d, which calls insserv.
85
 
avahi_version="`dpkg-query --showformat='${Version}' --show avahi-daemon`"
86
 
if dpkg --compare-versions "$avahi_version" le 0.6.31-2; then
87
 
    sed --in-place --expression='/^### BEGIN INIT INFO$/,/^### END INIT INFO$/s/^\(# Required-\(Stop\|Start\):.*avahi\)-daemon\>/\1/g' /etc/init.d/mandos
88
 
fi
89
 
 
90
47
#DEBHELPER#
91
48
 
92
49
exit 0