From 0a82ca4af4f5e0f10efa5ceb7b00164687bdb2d1 Mon Sep 17 00:00:00 2001
From: Dragan Dosen <ddosen@ffzg.hr>
Date: Fri, 23 Apr 2010 19:56:42 +0200
Subject: [PATCH] Dodatna prilagodba paketa, izbacene neke od funkcionalnosti.

Vise se ne koristi debconf, $min_pass_length se podesava
samo u slucaju kada change_pass konfiguracija uopce ne postoji.
---
 README.CARNet    |    8 +++--
 debian/changelog |    6 ++--
 debian/control   |    2 +-
 debian/postinst  |   85 +-----------------------------------------------------
 debian/postrm    |    5 ----
 debian/rules     |    1 -
 debian/templates |   12 --------
 7 files changed, 11 insertions(+), 108 deletions(-)
 delete mode 100644 debian/postrm
 delete mode 100644 debian/templates

diff --git a/README.CARNet b/README.CARNet
index 91974d7..124ed6e 100644
--- a/README.CARNet
+++ b/README.CARNet
@@ -32,9 +32,11 @@ odnosno
 
   /usr/share/squirrelmail/plugins/change_pass/config.php
 
-Paket automatski podesava minimalnu duzinu zaporke na 8 znakova -
-duzina zaporke nije odredjena PAM konfiguracijom, vec je zadana
-u konfiguracijskoj datoteci za change_pass dodatak (varijabla
+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).
 
 Dokumentacija se nalazi unutar direktorija:
diff --git a/debian/changelog b/debian/changelog
index 2a7af64..b0f0ba0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ 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.
-  * Automatsko podesavanje minimalne duzine zaporke (8 znakova)
-    u konfiguraciji change_pass dodatka. (rijeseno: #9565)
+  * 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)
   * Izmjene unutar datoteka: debian/postinst, debian/prerm i
     debian/control.
   * Azurirana datoteka README.CARNet.
diff --git a/debian/control b/debian/control
index bee529c..f1d3d5a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.0
 
 Package: squirrelmail-change-pass-cn
 Architecture: all
-Depends: squirrelmail-cn (>= 2:1.4.15-2lenny1), squirrelmail-change-pass (>= 3.0-1), xinetd-cn (>= 1:2.3.14-3lenny1), poppassd (>= 1.8.5-3.2), carnet-tools-cn (>= 2.8.1), ${misc:Depends}
+Depends: squirrelmail-cn (>= 2:1.4.15-2lenny1), squirrelmail-change-pass (>= 3.0-1), xinetd-cn (>= 1:2.3.14-3lenny1), poppassd (>= 1.8.5-3.2), carnet-tools-cn (>= 2.8.1)
 Description: SquirrelMail plugin: Change Password
  Change passwords using a poppass daemon.
  .
diff --git a/debian/postinst b/debian/postinst
index b35cddc..8319893 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,10 +5,6 @@ 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
 
@@ -20,37 +16,6 @@ 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
-    fi
-}
-
-trap cleanup 0 1 2 15
 
 
 # Configure poppassd to refuse connection from all hosts
@@ -118,78 +83,30 @@ if [ ! -f "$SQCPCONF" ]; then
         cp_echo "CN: Generating new file $SQCPCONF"
         cat > "$SQCPCONF" <<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;
 
+    \$min_pass_length = 8;
     \$max_pass_length = 9999999;
 EOF
         min_pass_changed=1
     fi
 fi
 
-if [ $min_pass_changed -eq 0 ]; then
-
-    echo "CN: Checking for minimum password length configuration."
-
-    cn_tag_re="^\/\/\/\/ Begin - Generated by CARNet package $PKG$"
-    seddef="/^[[:space:]]*\\\$min_pass_length[[:space:]]*=[^;]*;[[:space:]]*$/d;
-            s/\\\$min_pass_length[[:space:]]*=[^;]*;//g;"
-
-    if egrep -q "$cn_tag_re" "$SQCPCONF"; 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" "$SQCPCONF"
-    else
-
-        if 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 package $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" "$SQCPCONF"
-        fi
-    fi
-fi
-
 # Just to be sure.
 ln -sf "$SQCPCONF" "$CPCONF"
 
 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
-
     /usr/sbin/squirrelmail-configure --install-plugin change_pass
 fi
 
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index 0c6b285..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index c22b759..f27dc58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,6 @@ binary-indep: build install
 	dh_link
 	dh_compress
 	dh_fixperms
-	dh_installdebconf
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
diff --git a/debian/templates b/debian/templates
deleted file mode 100644
index e5f1411..0000000
--- a/debian/templates
+++ /dev/null
@@ -1,12 +0,0 @@
-Template: squirrelmail-change-pass-cn/min_pass_length
-Type: note
-Description: Minimalna duzina zaporke podesena je na 8 znakova
- Duzina zaporke nije odredjena PAM konfiguracijom, vec je definirana u
- konfiguracijskoj datoteci za change_pass dodatak (plugin).
- .
- Dokumentaciju za change_pass dodatak mozete pronaci unutar direktorija:
- .
-  /usr/share/doc/squirrelmail-change-pass/
-  
- U slucaju da jos niste, za vecu sigurnost zaporki svakako pogledajte
- programski paket 'libpam-cracklib' i pripadajucu dokumentaciju.
-- 
1.7.10.4