Bug#771586: unblock: debian-lan-config/0.18
Control: tags -1 - moreinfo + patch
Control: retitle -1 unblock: debian-lan-config/0.18
Hi,
On Wed, Dec 03, 2014 at 07:51:56PM +0100, Ivo De Decker wrote:
[...]
> It's probably best to create a version based on what
> you know now and upload it to unstable before the weekend. Ideally, the
> changes should work with the packages currently in testing and with the
> packages fixing the bugs you listed above.
A new debian-lan-config package is available in unstable now (0.18).
It addresses the issues discussed above. Please unblock the package.
Thanks and best regards,
Andi -- looking forward to the jessie release ... :-)
The final patch looks like this:
$ debdiff debian-lan-config_0.17.dsc debian-lan-config_0.18.dsc
diff -Nru debian-lan-config-0.17/debian/changelog debian-lan-config-0.18/debian/changelog
--- debian-lan-config-0.17/debian/changelog 2014-10-23 08:47:11.000000000 +0200
+++ debian-lan-config-0.18/debian/changelog 2014-12-05 14:04:45.000000000 +0100
@@ -1,3 +1,12 @@
+debian-lan-config (0.18) unstable; urgency=medium
+
+ * Work around broken di-netboot-assistant only if necessary to avoid
+ problems with the (expected) fixed di-netboot-assistant package.
+ * Enable SSL for the dovecot imap server. The dovecot package switched
+ to no SSL by default.
+
+ -- Andreas B. Mundt <andi@debian.org> Fri, 05 Dec 2014 14:02:20 +0100
+
debian-lan-config (0.17) unstable; urgency=medium
* Update package selection: Standard Gnome desktop on clients.
diff -Nru debian-lan-config-0.17/fai/config/scripts/FAISERVER/50-di-netboot debian-lan-config-0.18/fai/config/scripts/FAISERVER/50-di-netboot
--- debian-lan-config-0.17/fai/config/scripts/FAISERVER/50-di-netboot 2014-10-23 08:47:11.000000000 +0200
+++ debian-lan-config-0.18/fai/config/scripts/FAISERVER/50-di-netboot 2014-12-05 14:04:45.000000000 +0100
@@ -106,11 +106,11 @@
$ROOTCMD di-netboot-assistant rebuild-menu
# FIXME: Bug #759424
-$ROOTCMD cp /usr/lib/syslinux/modules/bios/ldlinux.c32 /srv/tftp/debian-installer/
-$ROOTCMD cp /usr/lib/syslinux/modules/bios/libcom32.c32 /srv/tftp/debian-installer/
-$ROOTCMD cp /usr/lib/syslinux/modules/bios/libutil.c32 /srv/tftp/debian-installer/
-$ROOTCMD cp /usr/lib/syslinux/modules/bios/chain.c32 /srv/tftp/debian-installer/
-
+for FILE in ldlinux.c32 libcom32.c32 libutil.c32 ; do
+ if [ ! -e $target/srv/tftp/debian-installer/$FILE ] ; then
+ $ROOTCMD cp /usr/lib/syslinux/modules/bios/$FILE /srv/tftp/debian-installer/
+ fi
+done
#wheezy:
#d-i preseed/late_command string mkdir -p /target/var/lib/fai/config; \
diff -Nru debian-lan-config-0.17/fai/config/scripts/MAIL_SERVER/30-certs debian-lan-config-0.18/fai/config/scripts/MAIL_SERVER/30-certs
--- debian-lan-config-0.17/fai/config/scripts/MAIL_SERVER/30-certs 2014-10-23 08:47:11.000000000 +0200
+++ debian-lan-config-0.18/fai/config/scripts/MAIL_SERVER/30-certs 2014-12-05 14:04:45.000000000 +0100
@@ -40,6 +40,10 @@
$ROOTCMD openssl req -config $CONF -new -x509 -days 7000 -nodes -out $CERT -keyout $KEY
$ROOTCMD chmod 640 $KEY $CERT $CONF
$ROOTCMD chown root:dovecot $KEY $CERT
+ ## Switch on SSL:
+ $ROOTCMD sed -i -e "s/^ssl = no/ssl = yes/" \
+ -e "s/^#ssl_cert =/ssl_cert =/" \
+ -e "s/^#ssl_key =/ssl_key =/" /etc/dovecot/conf.d/10-ssl.conf
else
echo "${target}/$CONF exists, nothing done!"
fi
Reply to: