[pkg-bacula-commits] [bacula] 05/07: remove obsolete code from common-functions.dpkg

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch migrate-files
in repository bacula.

commit bcc4447ad09354befe1542d0a636d741f191163d
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Sep 6 13:19:11 2016 +0200

    remove obsolete code from common-functions.dpkg
---
 debian/additions/common-functions.dpkg | 73 ++--------------------------------
 1 file changed, 3 insertions(+), 70 deletions(-)

diff --git a/debian/additions/common-functions.dpkg b/debian/additions/common-functions.dpkg
index b0c777d..3083035 100644
--- a/debian/additions/common-functions.dpkg
+++ b/debian/additions/common-functions.dpkg
@@ -184,25 +184,12 @@ setup_etc_default() {
     DEFAULTS="/etc/default/$SERVICE"
 
     if [ -n "$3" ]; then
-        if dpkg --compare-versions "$3" lt "5.2.6+dfsg-1"; then
-            if [ -f "/etc/bacula/do_not_run" ]; then
-                ENABLED="no"
-            fi
-        else
-            if [ -f "$DEFAULTS" ]; then
-                ENABLED=$(. $DEFAULTS; echo $ENABLED)
-                CONFIG=$(. $DEFAULTS; echo $CONFIG)
-            fi
+        if [ -f "$DEFAULTS" ]; then
+            ENABLED=$(. $DEFAULTS; echo $ENABLED)
+            CONFIG=$(. $DEFAULTS; echo $CONFIG)
         fi
     fi
 
-
-    #db_get "$PACKAGE/disable-service"
-    #if [ "$RET" = "true" ]; then
-    #    ENABLED="no"
-    #fi
-
-
     tempfile=`tempfile`
     cat >"$tempfile" <<_EOF
 # defaults file for $SERVICE
@@ -236,57 +223,3 @@ _EOF
     ucfr "$PACKAGE" "$DEFAULTS"
     rm -f "$tempfile"
 }
-
-
-check_and_fix_unsafe_director_password()
-{
-  local PACKAGE REGEX
-
-  if [ ! -f /etc/bacula/bacula-dir.conf ]; then
-    return 0
-  fi
-
-  PACKAGE="$1"
-
-  #
-  # There is a list of hardcoded bacula-dir passwords we need to change.
-  # It is a passwords from versions 5.0.2-1, 5.0.2-1~bpo50+1, 5.0.2-2,
-  # 5.0.2-2.1, 5.0.2-2.2, 5.0.2-2.2+b1, 5.0.2-2.2+squeeze1, 5.0.2-3, 5.0.3-1,
-  # 5.0.3-1+b1, 5.0.3+dfsg-0.1
-  #
-  # 0Cv70F6pf01t6pB0opT4vQOnigDrR0v3L              1iEtM8qGBcbEox73tYcMslqh9FHZQWHM5
-  # 2F9QsX5HXAhxMdF/lb9f7HH5kgO4/F6Y7qs4LBIYOIIc   2XfHt5qPm9p1VvoI85k4sxfONLOKyA7oL
-  # 3W445fZe3Rx3RwowRaasfvqAXUwKWrR4               4hOvLQMC3HZyZ0VcbsOoPQ6vhGrbrvHDL
-  # 4qByX84t7faibfxD34UltZ4qJ2USgj6                4QC2dWtqOtpXisWr6FkB6LlxCl5owtM6o
-  # 5Q5f0KkIARGboVoAAEnqRZGKbTvR2b                 6irFJb1VuTw6nqMoJjhVHsPtDCTHMyOQHjQUF9Vk32ca
-  # 6rAFCfK7IbMWPWrcLgji9qbo5sT212L8               6SH38Ric1fyQb6xZ2mdp2nAQtvOGZOLJq
-  # 6wdMnDM4CT8TOW6VOsnSttg2ZsL5iRRn               9rfAm3BrNnS0vNPyQVW6GYH2xG6F1rT
-  # 9UnjMj8qNDQyUL7YJpf6Ooe346e6o7VI               9XWwoB7f45Vb0wdLwXwd2RVEnhls7kuQa
-  # a5Q9WkjZJrI6isbM1B3hrMIjc3jovayg4              aymIYMBgljG7OLD6mynJGsM6kaO1JiWQ
-  # bP64DhKhdE3hFiwyt8ne5ZzWh9xjZvvCWvlB/SMJVtrp   BXROVXNeyF5no12LlPpoCtqSh1g3dHh7c
-  # CDofAhw2nMZpsuNjjoe3sM4XtH3cB19bP              Cv70F6pf1t6pBopT4vQOnigDrR0v3L
-  # DaQaoxNgWMA3lPCI5P8h23Q02Zacdm42G              e9kabod3EiTgx9qbNv4V5RjpF1HDjS9yx
-  # EGNg0Zh0UDFJpO0eq69ol9R4Ig5Bni3Ly              FsrYgGJPETv7sjhhkfU9hfaUlMiov6ssB
-  # GjZK2qGLHJakRp8j6hKxaZmqTsuwKB4nV              gyINS6bKThNm00a1n17m0by3YmI5Vfvmq
-  # hpfaKNMc3FAb6sTSeBQj2rHFZiPoCPx5c              KLKnxeJ9fo9n7XX9l1rZ85gjexJyCW1R
-  # LSI9O4UxSO4C68Sgog7i1UVoIDCX7GmB3              LTQ1ipXsaA6rhZaPqSaC6DNoPMML8L1f
-  # qnjbN71J3NVcv8bCrxuTA6tQG695stXj               rcb82RMxnwMjJX0uPqswTPVPwZBtNviiI
-  # rcCeojyNh8XzyE8noBO6G+u30ur+gIa1YtXPhnUMJ8jJ   S8jSXrIaGjucBQlFuEhmbp2jVEXf3r1v
-  # ShT7MAwYr266OifJZexThUYHLg3F7dkgR              ToNS3inSon4o/Aqeg0xLEFhKcpftFvOtO+xvmS1oNzt5
-  # tSLtGaKpfUumMeY83T2e0bRUvRdPCTynP              TtVEcetNhA2efDyQgHIHUdVObU5CdsI7WcodXdd+bynR
-  # UwPG7aIXF7jQ8IGhQZNhdBc21sT3U9UGA              Uyd4tCavXf2oxjVdNAypHbcql0yW4tW
-  # V06HqWef3HlWOrPhqcwNZSQpSvYdERgB               VFxkQ5mNv61q6uMncr2YjRpkE8sLQ9O
-  # VMnjGGIe1ih6im48HGTouUi4H7ijV74A               wbdPn9gXYLn9PmQ2HiCm1VWHPMSsM5wF
-  # XmOtJg1Adsxp8T73wtCAOKOUJ0r3pEF                ZFjFYMCU6HWWVxMNTQ10BmDUYvFrYwuwM
-  # x9tkKeZdfDjSgJeD1lTarCa32yP8EsfwjSjsIuO9n/J7
-
-  REGEX='Password = "(0Cv70F6pf01t6pB0opT4vQOnigDrR0v3L|1iEtM8qGBcbEox73tYcMslqh9FHZQWHM5|2F9QsX5HXAhxMdF\/lb9f7HH5kgO4\/F6Y7qs4LBIYOIIc|2XfHt5qPm9p1VvoI85k4sxfONLOKyA7oL|3W445fZe3Rx3RwowRaasfvqAXUwKWrR4|4hOvLQMC3HZyZ0VcbsOoPQ6vhGrbrvHDL|4qByX84t7faibfxD34UltZ4qJ2USgj6|4QC2dWtqOtpXisWr6FkB6LlxCl5owtM6o|5Q5f0KkIARGboVoAAEnqRZGKbTvR2b|6irFJb1VuTw6nqMoJjhVHsPtDCTHMyOQHjQUF9Vk32ca|6rAFCfK7IbMWPWrcLgji9qbo5sT212L8|6SH38Ric1fyQb6xZ2mdp2nAQtvOGZOLJq|6wdMnDM4CT8TOW6VOsnSttg2ZsL5iRRn|9rfAm3BrNnS0 [...]
-
-  if grep -Eq "$REGEX" "/etc/bacula/bacula-dir.conf"; then
-    readOrCreatePasswords
-    sed -i -Ee "s/$REGEX/Password = \"$(eval echo \"\$DIRPASSWD\" |sed -e 's/[\/&]/\\&/g')\"/" "/etc/bacula/bacula-dir.conf"
-
-    db_input high $PACKAGE/unsafe-director-password-was-changed || true
-    db_go
-  fi
-}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git