tags 501605 + patch pending
thanks

I've prepared an NMU for sympa (versioned as 5.3.4-6.1) and uploaded it.
Note that the sympa.pl --upgrade call you introduced in your last
upload is wrong when sympa is configured to not have a database (you
ask the user whether he wants to do that, so it must work).

Kind regards

T.

diff -u sympa-5.3.4/debian/changelog sympa-5.3.4/debian/changelog
--- sympa-5.3.4/debian/changelog
+++ sympa-5.3.4/debian/changelog
@@ -1,3 +1,12 @@
+sympa (5.3.4-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix password handling in debian/postinst. Closes: #501605
+  * Don't call sympa.pl --upgrade when no db_type/db_name is specified.
+    Needed for testing the above change.
+
+ -- Thomas Viehmann <[EMAIL PROTECTED]>  Sun, 19 Oct 2008 23:08:14 +0200
+
 sympa (5.3.4-6) unstable; urgency=low
 
   * fix usage of $* Perl variable deprecated in Perl 5.10 
diff -u sympa-5.3.4/debian/postinst sympa-5.3.4/debian/postinst
--- sympa-5.3.4/debian/postinst
+++ sympa-5.3.4/debian/postinst
@@ -207,9 +207,8 @@
     if [ -f /usr/bin/openssl ]; then
        if ! grep -q "^#-- S/MIME configuration" /etc/sympa/sympa.conf ; then
            db_get sympa/key_password
-           key_password="$RET"
-
-           sed -e "s/@KEY_PASSWORD@/$key_password/" \
+           key_password="$RET" \
+           perl -p -e 's/[EMAIL PROTECTED]@/$ENV{key_password}/' \
            /etc/sympa/sympa.conf-smime.in >>/etc/sympa/sympa.conf
            chown sympa:sympa /etc/sympa/sympa.conf
        fi
@@ -481,7 +480,9 @@
 # The upgrade script figures out on its own
 # whether upgrade actions are necessary or not.
 
-/usr/lib/sympa/bin/sympa.pl --upgrade
+if [ $( awk '/^[\t ]*db_type[\t ]/ { a = 1 } /^[\t ]*db_name[\t ]/ { b = 1 }  
END { print a+b }' /etc/sympa/sympa.conf) = 2 ] ; then
+    /usr/lib/sympa/bin/sympa.pl --upgrade
+fi
  
 ## End up with debconf
 db_stop



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to