diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-21 23:41:23 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-21 23:41:23 +0100 |
commit | 1fa04ebf122aec5ecbbdb6c7e001665b238e4c62 (patch) | |
tree | 3d228c46959931802ddcc289bd658ccda5ab4738 /debian/openssh-server.postrm | |
parent | cc7c64fe532ac804ce6c65d701a32b614cc0b26a (diff) |
Drop conffile handling for upgrades from pre-split ssh package; this was
originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a truly ghastly
hack around a misbehaviour in sarge's dpkg. Since this is now four
Debian releases ago, we can afford to drop this and simplify the
packaging.
Diffstat (limited to 'debian/openssh-server.postrm')
-rw-r--r-- | debian/openssh-server.postrm | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm index 655c1ae17..bc55df118 100644 --- a/debian/openssh-server.postrm +++ b/debian/openssh-server.postrm | |||
@@ -22,23 +22,11 @@ finish_mv_conffile () { | |||
22 | fi | 22 | fi |
23 | } | 23 | } |
24 | 24 | ||
25 | abort_transfer_conffile () { | ||
26 | CONFFILE="$1" | ||
27 | if [ -e "$CONFFILE.moved-by-preinst" ]; then | ||
28 | echo >&2 "Aborting ownership transfer of conffile $CONFFILE ..." | ||
29 | mv -f "$CONFFILE.moved-by-preinst" "$CONFFILE" | ||
30 | return 0 | ||
31 | fi | ||
32 | } | ||
33 | |||
34 | case $1 in | 25 | case $1 in |
35 | abort-install|abort-upgrade) | 26 | abort-install|abort-upgrade) |
36 | if dpkg --compare-versions "$2" lt 1:4.7p1-4; then | 27 | if dpkg --compare-versions "$2" lt 1:4.7p1-4; then |
37 | abort_mv_conffile /etc/pam.d/ssh | 28 | abort_mv_conffile /etc/pam.d/ssh |
38 | fi | 29 | fi |
39 | abort_transfer_conffile /etc/default/ssh | ||
40 | abort_transfer_conffile /etc/init.d/ssh | ||
41 | abort_transfer_conffile /etc/pam.d/ssh | ||
42 | ;; | 30 | ;; |
43 | purge) | 31 | purge) |
44 | # Remove all non-conffiles that ssh might create, so that we | 32 | # Remove all non-conffiles that ssh might create, so that we |