Merge lp:~racb/ubuntu/precise/cobbler/858860 into lp:ubuntu/precise/cobbler

[Robie Basak]

I have upgrade tested this from Oneiric and previous Precise and also tested a fresh installation on Precise.

This is also needed for the security fix in Oneiric - see https://bugs.launchpad.net/ubuntu/+source/cobbler/+bug/858878/comments/5

[Alex Muntada (alex.muntada)]

Change proposed addresses both new installs and upgrades as requested.

review: Approve

[lp:~racb/ubuntu/precise/cobbler/858860]

68. By Robie Basak on 2012-01-05

debian/cobbler.preinst: fix /etc/cobbler/users.digest if upgrading from a
version that set it world readable (LP: #858860).

[Robie Basak (racb)]

Rebased against latest trunk.

[Alex Muntada (alex.muntada)]

Rebase approved, too.

review: Approve

[Robie Basak (racb)]

Thanks for the review, Alex! I've just added Andres as he has upload access.

[lp:~racb/ubuntu/precise/cobbler/858860]

69. By Robie Basak on 2012-01-05

Remove inadvertent change to debian/cobbler-ubuntu-import

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-04 14:23:54 +0000
+++ debian/changelog	2012-01-05 13:31:19 +0000
@@ -1,3 +1,10 @@
+cobbler (2.2.2-0ubuntu14) precise; urgency=low
+
+  * debian/cobbler.preinst: fix /etc/cobbler/users.digest if upgrading from a
+    version that set it world readable (LP: #858860).
+
+ -- Robie Basak <[e-mail]>  Thu, 05 Jan 2012 09:13:13 +0000
+
 cobbler (2.2.2-0ubuntu13) precise; urgency=low
 
   * debian/patches/62_profile_hostname_no_underscore.patch: Replace

=== added file 'debian/cobbler.preinst'
--- debian/cobbler.preinst	1970-01-01 00:00:00 +0000
+++ debian/cobbler.preinst	2012-01-05 13:31:19 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+# Fix world-readable permissions on /etc/cobbler/users.digest if upgrading
+# from a version which had it set incorrectly by default, the file is still
+# there and still has the original incorrect permissions (LP: #858860).
+
+if [ "$1" = "upgrade" ] \
+     && dpkg --compare-versions "$2" lt "2.2.2-0ubuntu14" \
+     && [ -f /etc/cobbler/users.digest \
+     -a `stat -c%a /etc/cobbler/users.digest` = "644" ]; then
+	chmod 600 /etc/cobbler/users.digest
+fi
+
+#DEBHELPER#