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

Bug#944238: marked as done (buster-pu: package debian-edu-config/2.10.65+deb10u2)

Your message dated Sat, 16 Nov 2019 10:08:47 +0000
with message-id <83c9ffab6f08361485f70dda4733a7a24aeec09b.camel@adam-barratt.org.uk>
and subject line Closing bugs for 10.2 point release fixes
has caused the Debian Bug report #944238,
regarding buster-pu: package debian-edu-config/2.10.65+deb10u2
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.)


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

We'd like to update debian-edu-config in buster to fix one important
(#944013 debian-edu-config: adjusted ini files needed to match changed
behaviour of firefox-esr 68.2.0esr) and one normal bug:

debian-edu-config (2.10.65+deb10u2) UNRELEASED; urgency=medium

  * Adjust share/debian-edu-config/d-i/finish-install: (Closes: #941574)
    - Use 'dpkg-reconfigure -u --no-reload debian-edu-config' to add post-up
      stanza to /etc/network/interfaces eth0 entry conditionally.
  * Cope with Firefox-ESR ini files that need to be different (as of version
    68.2.0esr) to further allow centralized configuration: (Closes: #944013)
    - Add share/debian-edu-config/profiles.ini.ff (Firefox-ESR profiles.ini).
    - Add share/debian-edu-config/installs.ini (now needed in addition for users
      that don't have a Firefox-ESR profile, i.e. new users).
    - Adjust share/debian-edu-config/tools/gosa-create which is used to copy
      the related Firefox-ESR ini files.
    - Ajust Makefile.
    - Adjust ldap-tools/ldap-debian-edu-install (fix for the first user).

$ git diff 2.10.65+deb10u1..buster|diffstat
 Makefile                                   |    2 ++
 debian/changelog                           |   17 +++++++++++++++++
 ldap-tools/ldap-debian-edu-install         |    3 ++-
 share/debian-edu-config/d-i/finish-install |    5 +++++
 share/debian-edu-config/installs.ini       |    4 ++++
 share/debian-edu-config/profiles.ini.ff    |   13 +++++++++++++
 share/debian-edu-config/tools/gosa-create  |    3 ++-
 7 files changed, 45 insertions(+), 2 deletions(-)

The full debdiff is attached.

I havent uploaded yet.

Thanks for your work on buster!


-- 
cheers,
	Holger

-------------------------------------------------------------------------------
               holger@(debian|reproducible-builds|layer-acht).org
       PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C


diff --git a/Makefile b/Makefile
index 0a6d8c5b..3e73c2d4 100644
--- a/Makefile
+++ b/Makefile
@@ -378,7 +378,9 @@ install: install-testsuite
 		share/debian-edu-config/sslCA.cnf \
 		share/debian-edu-config/v3.cnf \
 		share/debian-edu-config/v3CA.cnf \
+		share/debian-edu-config/installs.ini \
 		share/debian-edu-config/profiles.ini \
+		share/debian-edu-config/profiles.ini.ff \
 		share/debian-edu-config/debian-edu.addmachine.template \
 		share/debian-edu-config/debian-edu.ldapscripts.passwd \
 		share/debian-edu-config/passwords_stub.dat \
diff --git a/debian/changelog b/debian/changelog
index 73f9b7c9..fea3f164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+debian-edu-config (2.10.65+deb10u2) UNRELEASED; urgency=medium
+
+  * Adjust share/debian-edu-config/d-i/finish-install: (Closes: #941574)
+    - Use 'dpkg-reconfigure -u --no-reload debian-edu-config' to add post-up
+      stanza to /etc/network/interfaces eth0 entry conditionally.
+  * Cope with Firefox-ESR ini files that need to be different (as of version
+    68.2.0esr) to further allow centralized configuration: (Closes: #944013)
+    - Add share/debian-edu-config/profiles.ini.ff (Firefox-ESR profiles.ini).
+    - Add share/debian-edu-config/installs.ini (now needed in addition for users
+      that don't have a Firefox-ESR profile, i.e. new users).
+    - Adjust share/debian-edu-config/tools/gosa-create which is used to copy
+      the related Firefox-ESR ini files.
+    - Ajust Makefile.
+    - Adjust ldap-tools/ldap-debian-edu-install (fix for the first user).
+
+ -- Wolfgang Schweer <wschweer@arcor.de>  Wed, 02 Oct 2019 10:53:42 +0200
+
 debian-edu-config (2.10.65+deb10u1) buster; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/ldap-tools/ldap-debian-edu-install b/ldap-tools/ldap-debian-edu-install
index 1b393a8f..affd02e7 100755
--- a/ldap-tools/ldap-debian-edu-install
+++ b/ldap-tools/ldap-debian-edu-install
@@ -599,7 +599,8 @@ fi
 if [ -x /usr/bin/certutil ] ; then
   mkdir -p /skole/tjener/home0/"$FIRSTUSERNAME"/.mozilla/firefox/debian-edu.default
   chmod -R 700 /skole/tjener/home0/"$FIRSTUSERNAME"/.mozilla/firefox/debian-edu.default
-  cp /usr/share/debian-edu-config/profiles.ini /skole/tjener/home0/"$FIRSTUSERNAME"/.mozilla/firefox
+  cp /usr/share/debian-edu-config/profiles.ini.ff /skole/tjener/home0/"$FIRSTUSERNAME"/.mozilla/firefox/profiles.ini
+  cp /usr/share/debian-edu-config/installs.ini /skole/tjener/home0/"$FIRSTUSERNAME"/.mozilla/firefox/installs.ini
   mkdir -p /skole/tjener/home0/"$FIRSTUSERNAME"/.thunderbird/debian-edu.default
   chmod -R 700 /skole/tjener/home0/"$FIRSTUSERNAME"/.thunderbird/debian-edu.default
   cp /usr/share/debian-edu-config/profiles.ini /skole/tjener/home0/"$FIRSTUSERNAME"/.thunderbird
diff --git a/share/debian-edu-config/d-i/finish-install b/share/debian-edu-config/d-i/finish-install
index 3422ecdd..23d60063 100644
--- a/share/debian-edu-config/d-i/finish-install
+++ b/share/debian-edu-config/d-i/finish-install
@@ -88,6 +88,11 @@ in-target /usr/lib/education-tasks/edu-tasksel-setup teardown
 preserve_network_interfaces
 deconfigure_network
 
+# Adjust /etc/network/interfaces eth0 entry once available (d-e-c postinst is
+# run too early). Adds 'post-up /usr/sbin/update-hostname-from-ip' conditionally
+# via the postinst script to the eth0 entry.
+in-target /usr/sbin/dpkg-reconfigure -u --no-reload debian-edu-config || true
+
 edu-etcvcs commit
 
 # For non-Main-Server profiles, try to submit to sitesummary at the
diff --git a/share/debian-edu-config/installs.ini b/share/debian-edu-config/installs.ini
new file mode 100644
index 00000000..c89e8cf7
--- /dev/null
+++ b/share/debian-edu-config/installs.ini
@@ -0,0 +1,4 @@
+[3B6073811A6ABF12]
+Default=debian-edu.default
+Locked=1
+
diff --git a/share/debian-edu-config/profiles.ini.ff b/share/debian-edu-config/profiles.ini.ff
new file mode 100644
index 00000000..9a67e6cd
--- /dev/null
+++ b/share/debian-edu-config/profiles.ini.ff
@@ -0,0 +1,13 @@
+[Profile0]
+Name=debian-edu
+IsRelative=1
+Path=debian-edu.default
+
+[General]
+StartWithLastProfile=1
+Version=2
+
+[Install3B6073811A6ABF12]
+Default=debian-edu.default
+Locked=1
+
diff --git a/share/debian-edu-config/tools/gosa-create b/share/debian-edu-config/tools/gosa-create
index 2448d668..636a166f 100755
--- a/share/debian-edu-config/tools/gosa-create
+++ b/share/debian-edu-config/tools/gosa-create
@@ -44,7 +44,8 @@ while read KEY VALUE ; do
             chmod -R 700 $HOMEDIR/.thunderbird/debian-edu.default
             mkdir -p $HOMEDIR/.pki/nssdb
             chmod -R 700 $HOMEDIR/.pki/nssdb
-            cp /usr/share/debian-edu-config/profiles.ini $HOMEDIR/.mozilla/firefox
+            cp /usr/share/debian-edu-config/profiles.ini.ff $HOMEDIR/.mozilla/firefox/profiles.ini
+            cp /usr/share/debian-edu-config/installs.ini $HOMEDIR/.mozilla/firefox/installs.ini
             cp /usr/share/debian-edu-config/profiles.ini $HOMEDIR/.thunderbird
             certutil  -A -d dbm:$HOMEDIR/.mozilla/firefox/debian-edu.default/ -t "CT,CT," -n "DebianEdu" -i /etc/ssl/certs/Debian-Edu_rootCA.crt
             certutil  -A -d dbm:$HOMEDIR/.thunderbird/debian-edu.default/ -t "CT,CT," -n "DebianEdu" -i /etc/ssl/certs/Debian-Edu_rootCA.crt

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Package: release.debian.org
Version: 10.2

Hi,

The fixes referenced by these bugs were included in today's 10.2 stable
point release.

Regards,

Adam

--- End Message ---
Reply to: