[debian-edu-commits] r80471 - in trunk/src/debian-edu-config: bin debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-09 21:31:46 +0000 (Sun, 09 Jun 2013)
New Revision: 80471

Modified:
   trunk/src/debian-edu-config/bin/debconf-set-selections-edu
   trunk/src/debian-edu-config/debian/changelog
Log:
* Next upload to squeeze-test.
* Changing debconf-set-selections-edu to not set the debconf
  template default value for passwords, to avoid storing the root
  and first user passwords in templates.dat (Closes: #711251).

Modified: trunk/src/debian-edu-config/bin/debconf-set-selections-edu
===================================================================
--- trunk/src/debian-edu-config/bin/debconf-set-selections-edu	2013-06-09 21:27:40 UTC (rev 80470)
+++ trunk/src/debian-edu-config/bin/debconf-set-selections-edu	2013-06-09 21:31:46 UTC (rev 80471)
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This file was copied from debconf version 1.5.36.1 to fix BTS
-# #636219.  It should be removed when this bug is fixed in Squeeze or
-# we upgrade to Wheezy.
+# #636219 (fixed in wheezy).  Later bug #711693 was fixed for wheezy.
+# FIXME: This script should be removed when these bugsare fixed in
+# FIXME: Wheezy or we upgrade to Jessie.
 
 
 sub usage {
@@ -51,7 +52,9 @@
 		$template->extended_description("This is a fake template used to pre-seed the debconf database. If you are seeing this, something is probably wrong.");
 	}
 	else {
-		$template->default($content);
+		if ("password" ne $type) {
+			$template->default($content);
+		}
 	}
 	$template->type($type);
 	

Modified: trunk/src/debian-edu-config/debian/changelog
===================================================================
--- trunk/src/debian-edu-config/debian/changelog	2013-06-09 21:27:40 UTC (rev 80470)
+++ trunk/src/debian-edu-config/debian/changelog	2013-06-09 21:31:46 UTC (rev 80471)
@@ -1,3 +1,14 @@
+debian-edu-config (1.456) UNRELEASED; urgency=low
+
+  * Next upload to squeeze-test.
+
+  [ Petter Reinholdtsen ]
+  * Changing debconf-set-selections-edu to not set the debconf
+    template default value for passwords, to avoid storing the root
+    and first user passwords in templates.dat (Closes: #711251).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 09 Jun 2013 23:31:09 +0200
+
 debian-edu-config (1.455) squeeze; urgency=low
 
   [ Wolfgang Schweer ]