From: Dragan Dosen <ddosen@ffzg.hr>
Date: Mon, 3 May 2010 14:19:53 +0000 (+0200)
Subject: Uklonjen dio za modificiranje change_pass konfiguracije.
X-Git-Tag: v3.0.2~2
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=c542531c967ceef31b70ae910c6d882d54e57687;p=squirrelmail-change-pass-cn.git

Uklonjen dio za modificiranje change_pass konfiguracije.
---

diff --git a/README.CARNet b/README.CARNet
index 124ed6e..5a3b025 100644
--- a/README.CARNet
+++ b/README.CARNet
@@ -8,9 +8,9 @@ Izvorni kod change_pass dodatka moze se preuzeti na lokaciji:
 
   http://www.squirrelmail.org/plugin_view.php?id=21
 
-squirrelmail-change-pass-cn paket vrsi konfiguraciju change_pass
-dodatka, aktivira isti unutar SquirrelMail konfiguracije, te
-podesava poppassd servis.
+squirrelmail-change-pass-cn paket vrsi aktivaciju change_pass
+dodatka unutar SquirrelMail konfiguracije, te podesava poppassd
+servis.
 
 Konfiguracija poppassd servisa nalazi se u datoteci:
 
@@ -32,9 +32,6 @@ odnosno
 
   /usr/share/squirrelmail/plugins/change_pass/config.php
 
-Paket automatski podesava minimalnu duzinu zaporke na 8 znakova u
-slucaju kada navedene konfiguracijske datoteke ne postoje.
-
 Minimalna duzina zaporke nije odredjena PAM konfiguracijom, vec je
 zadana u konfiguracijskoj datoteci change_pass dodatka (varijabla
 $min_pass_length).
diff --git a/debian/changelog b/debian/changelog
index b0f0ba0..68d68c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,9 @@ squirrelmail-change-pass-cn (3.0.2) stable; urgency=low
 
   * Dio paketa koji sadrzi sam change_pass dodatak odvojen je
     u zasebni paket - squirrelmail-change-pass.
-  * U slucaju kada ne postoji konfiguracija za change_pass dodatak
-    vrsi se automatsko generiranje nove konfiguracije, te
-    podesavanje minimalne duzine zaporke (8 znakova).
-    (rijeseno: #9565)
+  * Minimalna duzina zaporke (8 znakova) odredjena je unutar
+    konfiguracije koja dolazi zajedno sa novim paketom
+    squirrelmail-change-pass. (rijeseno: #9565)
   * Izmjene unutar datoteka: debian/postinst, debian/prerm i
     debian/control.
   * Azurirana datoteka README.CARNet.
diff --git a/debian/postinst b/debian/postinst
index 8319893..3717821 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -50,60 +50,6 @@ if [ $done_backup -eq 1 ]; then
 fi
 
 
-# Remove change_pass 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."
-    for cpconf_file in $SQCPCONF $CPCONF; do
-        if [ -f "$cpconf_file" ] || [ -L "$cpconf_file" ]; then
-            rm -f $cpconf_file
-            cp_echo "CN: Removed old $cpconf_file"
-        fi
-    done
-fi
-
-
-# Check for change_pass configuration files and notify user about
-# minimum password length configuration.
-#
-if egrep -q '^\$plugins\[[0-9]+\][\ ]*=[\ ]*'\''change_pass'\' "$SQCONF"; then
-    /usr/sbin/squirrelmail-configure --remove-plugin change_pass
-fi
-
-if [ ! -f "$SQCPCONF" ]; then
-
-    if [ -f "$CPCONF" ]; then
-        cp -f "$CPCONF" "$SQCPCONF"
-        cp_echo "CN: $CPCONF copied to $SQCPCONF"
-    else
-
-        # Configuration file does not exist.
-        cp_echo "CN: Generating new file $SQCPCONF"
-        cat > "$SQCPCONF" <<EOF
-<?php
-    // The default server is the configured IMAP server
-    #\$poppass_server = 'localhost';
-
-    // The default port is 106
-    #\$poppass_port = 106;
-
-    \$min_pass_length = 8;
-    \$max_pass_length = 9999999;
-EOF
-        min_pass_changed=1
-    fi
-fi
-
-# Just to be sure.
-ln -sf "$SQCPCONF" "$CPCONF"
-
-if [ $min_pass_changed -eq 1 ]; then
-    cp_echo "CN: Minimum password length has been set to 8 characters."
-fi
-
-
 # Enable change_pass plugin in SquirrelMail config.php.
 #
 if ! egrep -q '^\$plugins\[[0-9]+\][\ ]*=[\ ]*'\''change_pass'\' "$SQCONF"; then