X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=cd144c9d0cb9b8c6166b36d066e1ea9c38ba596d;hb=HEAD;hp=f515ad7d70354eca9ee90ea55599266b60f93e78;hpb=849101efcfa61514aed2280735a17d8551bca5af;p=squirrelmail-change-pass-cn.git

diff --git a/debian/postinst b/debian/postinst
index f515ad7..cd144c9 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,54 +5,37 @@ set -e
 [ "$1" = "configure" ] || exit 0
 [ $DEBIAN_SCRIPT_DEBUG ] && set -vx
 
-
-# Load debconf
-. /usr/share/debconf/confmodule
-
 # Include CARNet functions
 . /usr/share/carnet-tools/functions.sh
 
 PKG="squirrelmail-change-pass-cn"
-VERSION="3.0-2"
+VERSION="3.1.4.1"
 SQCONFDIR="/etc/squirrelmail"
 SQCONF="$SQCONFDIR/config.php"
-SQCPCONF="$SQCONFDIR/config_change_pass.php"
-CPCONF="/usr/share/squirrelmail/plugins/change_pass/config.php"
 need_restart=0
-min_pass_changed=0
-temp_files=
-
-set_min_pass_length () {
-
-    local sed_re conf_file
-    conf_re="$1"
-    conf_file="$2"
-    temp_files="$temp_files $conf_file.dpkg-tmp"
 
-    sed "$conf_re" "$conf_file" > "$conf_file.dpkg-tmp"
-
-    if ! cmp -s "$conf_file" "$conf_file.dpkg-tmp" 2>&1 >/dev/null; then
-        cp_mv "$conf_file.dpkg-tmp" "$conf_file"
-        min_pass_changed=1
-    else
-        rm -f "$conf_file.dpkg-tmp"
-    fi
-}
 
-cleanup () {
-
-    if [ -n "$temp_files" ]; then
-        for temp_item in $temp_files; do
-            if [ -e "$temp_item" ]; then
-                rm -f $temp_item
-            fi
-        done
+# chk_conf_tag ()
+#
+#   Check if configuration file has CARNet package info lines.
+#   return:  $RET => 0 - tagged
+#                    1 - file does not exists
+#                    2 - file exists, but it is not tagged
+#
+chk_conf_tag () {
+    local conf_file
+    conf_file="$1"
+    RET=1
+
+    if [ -f "$conf_file" ]; then
+        if egrep -q "^## Begin - Generated by CARNet package ${PKG}$" "$conf_file"; then
+            RET=0
+        else
+            RET=2
+        fi
     fi
 }
 
-trap cleanup 0 1 2 15
-
-
 # Configure poppassd to refuse connection from all hosts
 # but localhost (127.0.0.1).
 #
@@ -70,146 +53,50 @@ if ! egrep -q '^poppassd:' /etc/hosts.allow; then
 fi
 
 
-# Configure SquirrelMail change_pass plugin - using defaults,
-# no configuration files if earlier version is older than 3.0-1.
-#
-if [ "$2" ] && dpkg --compare-versions $2 lt 3.0-1; then
-
-    cp_echo "CN: This version of change_pass plugin contains major changes."
-    cp_echo "CN: For detailed description, see documentation in /usr/share/doc/$PKG/."
-
-    if [ -f "$SQCPCONF" ]; then
-        mv -f "$SQCPCONF" "$SQCPCONF.cn-old"
-        cp_echo "CN: Old $SQCPCONF disabled and renamed to $SQCPCONF.cn-old."
-    fi
-    if [ -f "$CPCONF" ]; then
-        mv -f "$CPCONF" "$CPCONF.cn-old"
-        cp_echo "CN: Old $CPCONF disabled and renamed to $CPCONF.cn-old."
-    fi
-fi
-
-
-# Check for change_pass configuration file and notify user about
-# minimum password length configuration.
-#
-if [ ! -f "$SQCPCONF" ] && [ ! -f "$CPCONF" ]; then
-
-    # Configuration file does not exist.
-    cp_echo "CN: Generating new file $CPCONF"
-    cat > "$CPCONF" <<EOF
-<?php
-//// Begin - Generated by CARNet package $PKG
-//
-//  REMOVE this whole block if you DON'T WANT $PKG
-//  to edit your configuration file.
-//
-//// End - Generated by CARNet package $PKG
-    \$min_pass_length = 8;
-
-    // The default server is the configured IMAP server
-    #\$poppass_server = 'localhost';
-
-    // The default port is 106
-    #\$poppass_port = 106;
-
-    \$max_pass_length = 9999999;
-EOF
-    min_pass_changed=1
-else
-
-    # Checking for configuration file/s and minimum password length.
-    echo "CN: Checking for minimum password length configuration."
-    cn_tag_re="^\/\/\/\/ Begin - Generated by CARNet package $PKG$"
-
-    for cpconf_file in $SQCPCONF $CPCONF; do
-
-        min_pass_changed=0
-        if [ -f "$cpconf_file" ]; then
-
-            seddef="/^[[:space:]]*\\\$min_pass_length[[:space:]]*=[^;]*;[[:space:]]*$/d;
-                    s/\\\$min_pass_length[[:space:]]*=[^;]*;//g;"
-
-            if egrep -q "$cn_tag_re" "$cpconf_file"; then
-
-                # Configuration file is tagged by CARNet.
-                seddef="$seddef /^\/\/\/\/ End - Generated by CARNet package $PKG$/s/\(.*\)/\1\n"
-                seddef="$seddef    \\\$min_pass_length = 8;/"
-
-                set_min_pass_length "$seddef" "$cpconf_file"
-            else
-
-                if [ "$2" ] && dpkg --compare-versions $2 lt 3.0-2; then
-
-                    # Add CARNet package info lines to config's header and set up $min_pass_length.
-                    seddef="$seddef 0,/?>/s/^[[:space:]]*\(<?php\|<?\)\(.*\)/\1\n"
-                    seddef="$seddef\/\/\/\/ Begin - Generated by CARNet $PKG\n\/\/\n"
-                    seddef="$seddef\/\/  REMOVE this whole block if you DON'T WANT $PKG\n"
-                    seddef="$seddef\/\/  to edit your configuration file.\n\/\/\n"
-                    seddef="$seddef\/\/\/\/ End - Generated by CARNet package $PKG\n"
-                    seddef="$seddef    \\\$min_pass_length = 8;\n\2/"
-
-                    set_min_pass_length "$seddef" "$cpconf_file"
-                fi
-            fi
-        fi
-    done
-fi
-
-if [ $min_pass_changed -eq 1 ]; then
-    db_fset squirrelmail-change-pass-cn/min_pass_length seen false
-    db_title squirrelmail-change-pass-cn - konfiguracija
-    db_input critical squirrelmail-change-pass-cn/min_pass_length || true
-    db_go || true
-    cp_echo "CN: Minimum password length has been set to 8 characters."
-fi
-
-db_stop || true
-
-
 # Enable change_pass plugin in SquirrelMail config.php.
 #
 if ! egrep -q '^\$plugins\[[0-9]+\][\ ]*=[\ ]*'\''change_pass'\' "$SQCONF"; then
-
-    if cp_check_and_backup "$SQCONF"; then
-        cp_echo "CN: Old $SQCONF saved as \"/var/backups/${SQCONF##*/}.bak\"."
-    fi
-
-    cp_echo "CN: Enabling SquirrelMail change_pass plugin in $SQCONF"
-    /usr/sbin/squirrelmail-configure --install-plugin change_pass
+    squirrelmail-configure --install-plugin change_pass
 fi
 
 
 # Convert poppassd service from inetd.conf to xinetd.conf type.
 # Service configuration is saved in /etc/xinetd.d/ directory.
 #
-if [ -x /etc/init.d/xinetd -a -d /etc/xinetd.d -a -x /usr/sbin/itox ]; then
+chk_conf_tag /etc/xinetd.d/poppassd
+if [ $RET -lt 2 ]; then
+    cp_echo "CN: Enabling poppassd in /etc/xinetd.d/poppassd"
 
-  if egrep -q '^poppassd' /etc/inetd.conf && \
-     [ ! -f /etc/xinetd.d/poppassd ]; then
-
-	cp_echo "CN: Enabling poppassd in /etc/xinetd.d/poppassd"
-
-	touch /etc/xinetd.d/poppassd.$$
-	grep "^poppassd" /etc/inetd.conf  | \
-		itox -daemon_dir /usr/sbin | cp-update "$PKG" /etc/xinetd.d/poppassd.$$
-	cp_mv /etc/xinetd.d/poppassd.$$ /etc/xinetd.d/poppassd
+    if [ ! -d /etc/xinetd.d ]; then
+        mkdir -p /etc/xinetd.d/
+    fi
+    touch /etc/xinetd.d/poppassd.$$
+    cp-update "$PKG" /etc/xinetd.d/poppassd.$$ <<EOF
+service poppassd
+{
+	socket_type     = stream
+	protocol        = tcp
+	wait            = no
+	user            = root
+	server          = /usr/sbin/poppassd
+}
+EOF
+    cp_mv /etc/xinetd.d/poppassd.$$ /etc/xinetd.d/poppassd
 
-	need_restart=1
-  fi
+    need_restart=1
 fi
 
 
 # Restart xinetd if needed.
 #
 if [ $need_restart -eq 1 ]; then
-
-	if [ -x "/etc/init.d/xinetd" ]; then
-	        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-	                invoke-rc.d xinetd restart || exit $?
-	        else
-	                /etc/init.d/xinetd restart || exit $?
-	        fi
-	fi
+    if [ -x "/etc/init.d/xinetd" ]; then
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+            invoke-rc.d xinetd restart || exit $?
+        else
+            /etc/init.d/xinetd restart || exit $?
+        fi
+    fi
 fi
 
 
@@ -217,4 +104,6 @@ fi
 #
 cp_mail "$PKG"
 
+#DEBHELPER#
+
 exit 0