Bug#1109089: unblock: debian-edu-config/2.12.902

Mike Gabriel <[email protected]> Fri, 11 Jul 2025 08:30:30 +0200
Newsgroups gmane.linux.debian.devel.education
Message-ID <175221543024.17053.15390873967195574458.reportbug__19572.3313883477$1752216580$gmane$org@sunobo> 
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:debian-edu-config
User: [email protected]
Usertags: unblock

Please unblock package debian-edu-config

We have started to adjust Debian Edu packaging for Debian Edu 13. This
package still needs to migrate to testing with the initial set of
required packaging changes. There will be more uploads (also after the
Debian 13 release) to get Debian Edu 13 in shape, but this is the first
round.

[ Reason ]
This should fix Debian Edu 13 workstation installations and also the
src:debian-edu autopkgtests (see #1107714).

[ Impact ]
No Debian Edu 13 ever.

[ Tests ]
Manual tests. Installing Debian Edu 13 workstations via Debian Edu FAI.

[ Risks ]
None, except for Debian Edu.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
Relevant for Debian Edu.

unblock debian-edu-config/2.12.902
debian-edu-config_2.12.46_2.12.902.debdiff (text/plain, 7.2 KB) 
diff -Nru debian-edu-config-2.12.46/cf3/cf.desktop-networked debian-edu-config-2.12.902/cf3/cf.desktop-networked
--- debian-edu-config-2.12.46/cf3/cf.desktop-networked	2019-02-15 11:58:02.000000000 +0100
+++ debian-edu-config-2.12.902/cf3/cf.desktop-networked	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-bundle agent desktop
-{
-# Install desktop related packages, suited only for networked machines.
-
-commands:
-
-  debian.desktopintern.installation::
-
-    "/usr/bin/apt-get install -y jxplorer gosa-desktop krb5-auth-dialog"
-      contain => in_shell;
-}
diff -Nru debian-edu-config-2.12.46/cf3/cf.finalize debian-edu-config-2.12.902/cf3/cf.finalize
--- debian-edu-config-2.12.46/cf3/cf.finalize	2022-10-17 21:55:44.000000000 +0200
+++ debian-edu-config-2.12.902/cf3/cf.finalize	2025-06-11 23:39:21.000000000 +0200
@@ -113,8 +113,6 @@
 
     debian.(server|ltspserver).lxqt.di.installation::
 
-    "/usr/bin/apt-get install -y network-manager-gnome"
-      contain => in_shell;
     "/usr/bin/apt-get purge -y connman"
       contain => in_shell;
 }
diff -Nru debian-edu-config-2.12.46/cf3/cf.homes debian-edu-config-2.12.902/cf3/cf.homes
--- debian-edu-config-2.12.46/cf3/cf.homes	2021-01-25 17:46:26.000000000 +0100
+++ debian-edu-config-2.12.902/cf3/cf.homes	2025-06-02 16:28:21.000000000 +0200
@@ -37,8 +37,9 @@
 {
 vars:
 
-  "fstab"   string => "/skole/tjener/home0	     /srv/nfs4/home0	none	bind	0	0";
-  "autofs"  string => "LDAPURI=ldap://$(edu.ldapserver)";
+  "fstab"   string => "/skole/tjener/home0	/srv/nfs4/home0	none	bind	0	0";
+  "autofs"  slist  => { "LDAPURI=ldap://$(edu.ldapserver)",
+                        "LDAPBASE=\"$(edu.ldapbase)\"" };
 
 files:
 
@@ -55,6 +56,5 @@
 
     "/etc/default/autofs"
       create => "true",
-      edit_line => append_if_no_line("$(autofs)");
+      edit_line => append_if_no_lines("@(editline_homes.autofs)");
 }
-
diff -Nru debian-edu-config-2.12.46/cf3/cf.icinga debian-edu-config-2.12.902/cf3/cf.icinga
--- debian-edu-config-2.12.46/cf3/cf.icinga	2021-01-25 17:46:26.000000000 +0100
+++ debian-edu-config-2.12.902/cf3/cf.icinga	2025-06-11 23:37:18.000000000 +0200
@@ -6,11 +6,6 @@
 
   debian.server.di.installation::
 
-    # Install package needed for Icinga Ido-Mysql functionality.
-    # Needs to be done here and not by the tool below (due to debconf use).
-    "DEBIAN_FRONTEND=noninteractive apt-get install -y icinga2-ido-mysql"
-      contain => in_shell;
-
     # Run the setup tool.
     "/usr/share/debian-edu-config/tools/edu-icinga-setup"
       contain => in_shell;
diff -Nru debian-edu-config-2.12.46/cf3/cf.ntp debian-edu-config-2.12.902/cf3/cf.ntp
--- debian-edu-config-2.12.46/cf3/cf.ntp	2023-11-09 17:25:17.000000000 +0100
+++ debian-edu-config-2.12.902/cf3/cf.ntp	2025-06-11 23:37:45.000000000 +0200
@@ -21,13 +21,4 @@
     "/usr/lib/systemd/timesyncd.conf.d/debian-edu-timesyncd.conf"
       copy_from => local_cp("/usr/share/debian-edu-config/debian-edu-timesyncd.conf"),
       perms => mog("644","root","root");
-
-commands:
-
-  # Make sure ntpsec gets installed
-
-  debian.server.installation::
-
-    "/usr/bin/apt-get install -y ntpsec"
-      contain => in_shell;
 }
diff -Nru debian-edu-config-2.12.46/cf3/promises.cf debian-edu-config-2.12.902/cf3/promises.cf
--- debian-edu-config-2.12.46/cf3/promises.cf	2023-11-09 17:25:17.000000000 +0100
+++ debian-edu-config-2.12.902/cf3/promises.cf	2025-06-11 23:38:30.000000000 +0200
@@ -80,7 +80,6 @@
                   "debian-edu/cf.chromium",
                   "debian-edu/cf.cups",
                   "debian-edu/cf.samba",
-                  "debian-edu/cf.desktop-networked",
                   "debian-edu/cf.dhcpserver",
                   "debian-edu/cf.exim",
                   "debian-edu/cf.firefox-esr",
diff -Nru debian-edu-config-2.12.46/debian/changelog debian-edu-config-2.12.902/debian/changelog
--- debian-edu-config-2.12.46/debian/changelog	2025-03-05 13:08:19.000000000 +0100
+++ debian-edu-config-2.12.902/debian/changelog	2025-06-13 11:16:43.000000000 +0200
@@ -1,3 +1,38 @@
+debian-edu-config (2.12.902) unstable; urgency=medium
+
+  * Makefile: Drop removed file cf.desktop-networked.
+
+ -- Mike Gabriel <[email protected]>  Fri, 13 Jun 2025 11:16:43 +0200
+
+debian-edu-config (2.12.901) unstable; urgency=medium
+
+  * etc/dovecot/local.conf:
+    - Adapt to config setting changes in Dovecot 2.4.x.
+  * cf3/:
+    - Stop installing packages via cfengine3. The required packages should
+      have been pulled in via meta-packages already (and if not, then this
+      needs to be amended in debian-edu src:pkg).
+
+ -- Mike Gabriel <[email protected]>  Fri, 13 Jun 2025 10:03:03 +0200
+
+debian-edu-config (2.12.900) unstable; urgency=medium
+
+  * Debian Edu 13 development has started.
+
+  * debian/control:
+    + Add to D: field: bind9-dnsutils. The 'dig' utility is required by fetch-
+      rootca-cert script and various test scripts.
+    + Drop from D: field: libproxy1-plugin-*. All of them are transitional
+      packages and libproxy has been replaced by libpacparser1 (using its
+      pactester tool) ages ago. (Closes: #1064900).
+    + Add to D: curl. Required by wpad-extract and fetch-rootca-cert scripts.
+  * cf3/cf.homes:
+    - White-space amendments.
+    - Assure that /etc/default/autofs has the LDAPBASE variable configured.
+      This fixes LDAP automounting on workstation hosts.
+
+ -- Mike Gabriel <[email protected]>  Mon, 02 Jun 2025 16:16:08 +0200
+
 debian-edu-config (2.12.46) unstable; urgency=medium
 
   [ Holger Levsen ]
diff -Nru debian-edu-config-2.12.46/debian/control debian-edu-config-2.12.902/debian/control
--- debian-edu-config-2.12.46/debian/control	2025-03-05 13:06:11.000000000 +0100
+++ debian-edu-config-2.12.902/debian/control	2025-06-02 16:15:39.000000000 +0200
@@ -21,7 +21,9 @@
 Depends: ${misc:Depends},
          adduser,
          bind9-host,
+         bind9-dnsutils,
          cfengine3,
+         curl,
          debconf-utils,
          debian-edu-artwork,
          e2fsprogs,
@@ -41,9 +43,6 @@
          libnss3-tools,
          libpacparser1,
          libpam-python (>= 1.1.0~git20220701.1d4e111-0.3~),
-         libproxy1-plugin-kconfig,
-         libproxy1-plugin-webkit,
-         libproxy1-plugin-networkmanager,
          libsitesummary-perl,
          libterm-readkey-perl,
          libtext-unaccent-perl,
diff -Nru debian-edu-config-2.12.46/etc/dovecot/local.conf debian-edu-config-2.12.902/etc/dovecot/local.conf
--- debian-edu-config-2.12.46/etc/dovecot/local.conf	2021-01-25 17:46:26.000000000 +0100
+++ debian-edu-config-2.12.902/etc/dovecot/local.conf	2025-06-13 09:58:17.000000000 +0200
@@ -4,7 +4,9 @@
 auth_krb5_keytab = /etc/krb5.keytab.imap
 auth_mechanisms = gssapi
 auth_gssapi_hostname = postoffice.intern
-mail_location = maildir:~/Maildir:INBOX=/var/mail/%u
+mail_driver = maildir
+mail_path = ~/Maildir
+mail_inbox_path = /var/mail/%u
 passdb {
   args = uid=uid home=homeDirectory
   driver = static
diff -Nru debian-edu-config-2.12.46/Makefile debian-edu-config-2.12.902/Makefile
--- debian-edu-config-2.12.46/Makefile	2023-11-09 17:25:17.000000000 +0100
+++ debian-edu-config-2.12.902/Makefile	2025-06-13 11:16:21.000000000 +0200
@@ -54,7 +54,6 @@
 	cf.apache2 \
 	cf.cfengine3 \
 	cf.cups \
-	cf.desktop-networked \
 	cf.dhcpserver \
 	cf.exim \
 	cf.imap \