[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#990139: marked as done (unblock: debian-edu-config/2.11.56)



Your message dated Mon, 21 Jun 2021 18:30:33 +0000
with message-id <E1lvOgr-00063G-VK@respighi.debian.org>
and subject line unblock debian-edu-config
has caused the Debian Bug report #990139,
regarding unblock: debian-edu-config/2.11.56
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
990139: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990139
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package debian-edu-config 2.11.56 containing three small and targeded fixes
for three bugs concerning Debian Edu only, thus with no impact outside Debian Edu.

The diff is:

$ debdiff debian-edu-config_2.11.55.dsc debian-edu-config_2.11.56.dsc|diffstat
 cf3/cf.exim                                               |    6 +++
 debian/changelog                                          |   24 ++++++++++++++
 sbin/debian-edu-ltsp-install                              |    7 ++--
 share/debian-edu-config/isc-dhcp-server.service           |    2 -
 share/debian-edu-config/isc-dhcp-server.service.eth1_only |    2 -
 5 files changed, 36 insertions(+), 5 deletions(-)
$ debdiff debian-edu-config_2.11.55.dsc debian-edu-config_2.11.56.dsc
diff -Nru debian-edu-config-2.11.55/debian/changelog debian-edu-config-2.11.56/debian/changelog
--- debian-edu-config-2.11.55/debian/changelog	2021-04-29 15:27:17.000000000 +0200
+++ debian-edu-config-2.11.56/debian/changelog	2021-06-05 00:06:13.000000000 +0200
@@ -1,3 +1,27 @@
+debian-edu-config (2.11.56) unstable; urgency=medium
+
+  [ Wolfgang Schweer ]
+  * Adjust workaround for isc-dhcp-server-ldap bug #971275. (Closes: #989340)
+    - share/debian-edu-config/isc-dhcp-server.{service,service.eth1_only}:
+      Use ExecStartPre command inspired by the isc-dhcp-server init script
+      instead of a sleep command.
+  * Adjust Exim configuration on client systems. (Closes: #989338)
+    - cf3/cf.exim:
+      Use exim-ldap-client-v4.conf file as exim4.conf on client machines instead
+      of preseeded configuration. This way sending system emails to the main
+      server is working again after the exim4 4.94 changes.
+  * Adjust sbin/debian-edu-ltsp-install. (Closes: #989342)
+    - Drop line containing the cp command (/var/cache/apt doesn't contain .bin
+      files in all use cases and the benefit is minimal if they exist; also, the
+      pkgcache.bin and srcpkgcache.bin files might contain outdated data).
+    - Use the BD ISO image to setup X2Go thin client support only if the script
+      is run inside the Debian Installer environment. There are too many ways
+      to install a combined server (with or without Internet connection, with
+      or without adjusting the sources list, with or without running apt update)
+      to cover all these cases.
+
+ -- Holger Levsen <holger@debian.org>  Sat, 05 Jun 2021 00:06:13 +0200
+
 debian-edu-config (2.11.55) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff -Nru debian-edu-config-2.11.55/cf3/cf.exim debian-edu-config-2.11.56/cf3/cf.exim
--- debian-edu-config-2.11.55/cf3/cf.exim	2019-02-15 11:58:02.000000000 +0100
+++ debian-edu-config-2.11.56/cf3/cf.exim	2021-06-02 14:00:53.000000000 +0200
@@ -10,6 +10,12 @@
       move_obstructions => "true";
     "/etc/default/exim4"
       edit_line => exim_default;
+
+  debian.!server.(workstation|minimal).installation::
+
+    "/etc/exim4/exim4.conf"
+      link_from => ln_s("/etc/exim4/exim-ldap-client-v4.conf"),
+      move_obstructions => "true";
 }
 
 bundle edit_line exim_default
diff -Nru debian-edu-config-2.11.55/sbin/debian-edu-ltsp-install debian-edu-config-2.11.56/sbin/debian-edu-ltsp-install
--- debian-edu-config-2.11.55/sbin/debian-edu-ltsp-install	2021-04-26 23:38:21.000000000 +0200
+++ debian-edu-config-2.11.56/sbin/debian-edu-ltsp-install	2021-06-02 23:20:03.000000000 +0200
@@ -341,8 +341,10 @@
 show=false
 EOF
 
-# Specific settings needed if BD ISO image is used for installation.
-if grep -q BD /etc/apt/sources.list ; then
+# Specific settings needed if BD ISO image is used for installation inside d-i.
+# First part of next condition: Looking for file created by base-installer and
+# removed at the end of the d-i run.
+if [ -e /etc/apt/apt.conf.d/00IgnoreTimeConflict ] && grep -q BD /etc/apt/sources.list ; then
 	BD_ISO="true";
 	device="$(grep media/cdrom /etc/fstab | cut -d' ' -f1)"
 	mirror="file:///media/cdrom/"
@@ -365,7 +367,6 @@
 	if [ "true" == "$BD_ISO" ] ; then
 		mkdir -p /srv/ltsp/thin/"$thin_type"-"$arch"/media/cdrom
 		mount $device /srv/ltsp/thin/"$thin_type"-"$arch"/media/cdrom
-		cp /var/cache/apt/*.bin /srv/ltsp/thin/"$thin_type"-"$arch"/var/cache/apt/
 		echo "deb [trusted=yes] $mirror $dist main" > /srv/ltsp/thin/"$thin_type"-"$arch"/etc/apt/sources.list
 	fi
 	chroot /srv/ltsp/thin/"$thin_type"-"$arch"/ apt -y -qq install education-thin-client p910nd
diff -Nru debian-edu-config-2.11.55/share/debian-edu-config/isc-dhcp-server.service debian-edu-config-2.11.56/share/debian-edu-config/isc-dhcp-server.service
--- debian-edu-config-2.11.55/share/debian-edu-config/isc-dhcp-server.service	2021-01-31 18:38:48.000000000 +0100
+++ debian-edu-config-2.11.56/share/debian-edu-config/isc-dhcp-server.service	2021-06-02 14:00:54.000000000 +0200
@@ -7,7 +7,7 @@
 Type=forking
 RestartSec=2s
 Restart=on-failure
-ExecStartPre=-sleep 2
+ExecStartPre=-/usr/bin/touch /var/lib/dhcp/dhcpd.leases
 ExecStart=/usr/sbin/dhcpd -4 -q -cf /etc/dhcp/dhcpd.conf
 
 [Install]
diff -Nru debian-edu-config-2.11.55/share/debian-edu-config/isc-dhcp-server.service.eth1_only debian-edu-config-2.11.56/share/debian-edu-config/isc-dhcp-server.service.eth1_only
--- debian-edu-config-2.11.55/share/debian-edu-config/isc-dhcp-server.service.eth1_only	2021-01-31 18:38:48.000000000 +0100
+++ debian-edu-config-2.11.56/share/debian-edu-config/isc-dhcp-server.service.eth1_only	2021-06-02 14:00:54.000000000 +0200
@@ -7,7 +7,7 @@
 Type=forking
 RestartSec=2s
 Restart=on-failure
-ExecStartPre=-sleep 2
+ExecStartPre=-/usr/bin/touch /var/lib/dhcp/dhcpd.leases
 ExecStart=/usr/sbin/dhcpd -4 -q -cf /etc/dhcp/dhcpd.conf eth1
 
 [Install]



unblock debian-edu-config/2.11.56

Thanks for your work on bullseye!


-- 
cheers,
	Holger

 ⢀⣴⠾⠻⢶⣦⠀
 ⣾⠁⢠⠒⠀⣿⡁  holger@(debian|reproducible-builds|layer-acht).org
 ⢿⡄⠘⠷⠚⠋⠀  OpenPGP: B8BF54137B09D35CF026FE9D 091AB856069AAA1C
 ⠈⠳⣄

"Climate change" is an euphenism. "Global warming" as well.

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message ---
Unblocked.

--- End Message ---

Reply to: