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.postinst.in | |
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.postinst.in')
-rw-r--r-- | debian/openssh-server.postinst.in | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/debian/openssh-server.postinst.in b/debian/openssh-server.postinst.in index 9aa568292..9869c9b48 100644 --- a/debian/openssh-server.postinst.in +++ b/debian/openssh-server.postinst.in | |||
@@ -440,13 +440,6 @@ setup_init() { | |||
440 | esac | 440 | esac |
441 | } | 441 | } |
442 | 442 | ||
443 | commit_transfer_conffile () { | ||
444 | CONFFILE="$1" | ||
445 | if [ -e "$CONFFILE.moved-by-preinst" ]; then | ||
446 | rm -f "$CONFFILE.moved-by-preinst" | ||
447 | fi | ||
448 | } | ||
449 | |||
450 | commit_mv_conffile () { | 443 | commit_mv_conffile () { |
451 | OLDCONFFILE="$1" | 444 | OLDCONFFILE="$1" |
452 | NEWCONFFILE="$2" | 445 | NEWCONFFILE="$2" |
@@ -477,9 +470,6 @@ if dpkg --compare-versions "$2" lt 1:5.2p1-1; then | |||
477 | remove_old_init_links | 470 | remove_old_init_links |
478 | fi | 471 | fi |
479 | setup_init | 472 | setup_init |
480 | commit_transfer_conffile /etc/default/ssh | ||
481 | commit_transfer_conffile /etc/init.d/ssh | ||
482 | commit_transfer_conffile /etc/pam.d/ssh | ||
483 | commit_mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd | 473 | commit_mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd |
484 | # Renamed to /etc/ssh/moduli in 2.9.9 (!) | 474 | # Renamed to /etc/ssh/moduli in 2.9.9 (!) |
485 | if dpkg --compare-versions "$2" lt 1:4.7p1-1; then | 475 | if dpkg --compare-versions "$2" lt 1:4.7p1-1; then |