/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: 2012-05-12 15:45:57 UTC
  • Revision ID: teddy@recompile.se-20120512154557-r1yzcb8su8byp4us
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call
                    self.send_changedstate() after change, not before.
  (Client.disable): Bug fix: Handle disable_initiator_tag and
                    checker_initiator_tag of 0.
  (Client.init_checker): Bug fix: Remove old checker_initiator_tag and
                         disable_initiator_tag, if any.
  (Client.bump_timeout): Bug fix: Remove old disable_initiator_tag, if
                         any.
  (ClientDBus.Timeout_dbus_property): Bug fix: Use self.expires.
  (ClientHandler.handle): Bug fix: timedelta_to_milliseconds is a
                          global function, not a class method.
* mandos-monitor (MandosClientWidget._update_timer_callback_lock):
  Removed.  All users changed.
  (MandosClientWidget.last_checked_ok): Removed (unused).
  (MandosClientWidget.__init__): Don't call self.using_timer().
  (MandosClientWidget.property_changed): Removed unused version.
  (MandosClientWidget.using_timer): Stop using the counter
                                    self._update_timer_callback_lock;
                                    be strictly boolean.
  (MandosClientWidget.need_approval): Don't call self.using_timer().
  (MandosClientWidget.update): Call self.using_timer() throughout.
                               Bug fix: Never show negative timers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.postinst
34
34
                --home /nonexistent --no-create-home --group \
35
35
                --disabled-password --gecos "Mandos password system" \
36
36
                _mandos
37
 
        elif dpkg --compare-versions "$2" eq 1.7.4-1 \
38
 
                || dpkg --compare-versions "$2" eq "1.7.4-1~bpo8+1"
39
 
        then
40
 
            start=no
41
 
            if ! [ -f /var/lib/mandos/clients.pickle ]; then
42
 
                invoke-rc.d mandos stop
43
 
                start=yes
44
 
            fi
45
 
            chown _mandos:_mandos /var/lib/mandos/clients.pickle \
46
 
                  2>/dev/null || :
47
 
            if [ "$start" = yes ]; then
48
 
                invoke-rc.d mandos start
49
 
            fi
50
 
        fi
51
 
        if ! dpkg-statoverride --list "/var/lib/mandos" >/dev/null \
52
 
             2>&1; then
53
 
            chown _mandos:_mandos /var/lib/mandos
54
 
            chmod u=rwx,go= /var/lib/mandos
55
 
        fi
 
37
        fi
 
38
        chown _mandos:_mandos /var/lib/mandos
56
39
        ;;
57
40
    
58
41
    abort-upgrade|abort-deconfigure|abort-remove)
64
47
        ;;
65
48
esac
66
49
 
67
 
# Avahi version 0.6.31-2 and older provides "avahi" (instead of
68
 
# "avahi-daemon") in its /etc/init.d script header.  To make
69
 
# insserv(8) happy, we edit our /etc/init.d script header to contain
70
 
# the correct string before the code added by dh_installinit calls
71
 
# update.rc-d, which calls insserv.
72
 
avahi_version="`dpkg-query --showformat='${Version}' --show avahi-daemon`"
73
 
if dpkg --compare-versions "$avahi_version" le 0.6.31-2; then
74
 
    sed --in-place --expression='/^### BEGIN INIT INFO$/,/^### END INIT INFO$/s/^\(# Required-\(Stop\|Start\):.*avahi\)-daemon\>/\1/g' /etc/init.d/mandos
75
 
fi
76
 
 
77
50
#DEBHELPER#
78
51
 
79
52
exit 0