[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: Fix obsolete conffile removal
Wolfgang Schweer (@schweer-guest)
gitlab at salsa.debian.org
Thu Oct 14 19:07:23 BST 2021
Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config
Commits:
905c0517 by Wolfgang Schweer at 2021-10-14T19:59:04+02:00
Fix obsolete conffile removal
debian/debian-edu-config.maintscript:
Drop /etc/ldap/slapd-debian-edu.conf removal; this also affects preinst which is
too early if upgrading from bullseye, breaking the LDAP data base conversion.
debian/debian-edu-config.postinst:
Conditionally remove the now obsolete /etc/slapd-debian-edu.conf file.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
5b66e90c by Wolfgang Schweer at 2021-10-14T20:05:38+02:00
Fix debian/debian-edu-config.lintian-overrides to avoid mismatched entries
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
4 changed files:
- debian/changelog
- debian/debian-edu-config.lintian-overrides
- debian/debian-edu-config.maintscript
- debian/debian-edu-config.postinst
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+debian-edu-config (2.12.6) UNRELEASED; urgency=medium
+
+ * debian/debian-edu-config.maintscript: Drop /etc/ldap/slapd-debian-edu.conf
+ removal; this also affects preinst which is too early if upgrading from
+ bullseye, breaking the LDAP data base conversion.
+ * debian/debian-edu-config.postinst: Conditionally remove the now obsolete
+ /etc/slapd-debian-edu.conf file.
+ * debian/debian-edu-config.lintian-overrides: Fix entries to avoid mismatched
+ overrides, thanks lintian.
+
+ -- Wolfgang Schweer <wschweer at arcor.de> Thu, 14 Oct 2021 15:13:34 +0200
+
debian-edu-config (2.12.5) unstable; urgency=medium
[ Mike Gabriel ]
=====================================
debian/debian-edu-config.lintian-overrides
=====================================
@@ -9,10 +9,10 @@ debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/
debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/tools/kerberos-kdc-init
debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/tools/edu-icinga-setup
debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/tools/run-at-firstboot
-debian-edu-config binary: missing-systemd-service-for-init.d-script chromium-ldapconf
-debian-edu-config binary: missing-systemd-service-for-init.d-script enable-nat
-debian-edu-config binary: missing-systemd-service-for-init.d-script fetch-ldap-cert
-debian-edu-config binary: missing-systemd-service-for-init.d-script fetch-rootca-cert
-debian-edu-config binary: missing-systemd-service-for-init.d-script firefox-ldapconf
+debian-edu-config binary: missing-systemd-service-for-init.d-script etc/init.d/chromium-ldapconf chromium-ldapconf
+debian-edu-config binary: missing-systemd-service-for-init.d-script etc/init.d/enable-nat enable-nat
+debian-edu-config binary: missing-systemd-service-for-init.d-script etc/init.d/fetch-ldap-cert fetch-ldap-cert
+debian-edu-config binary: missing-systemd-service-for-init.d-script etc/init.d/fetch-rootca-cert fetch-rootca-cert
+debian-edu-config binary: missing-systemd-service-for-init.d-script etc/init.d/firefox-ldapconf firefox-ldapconf
debian-edu-config binary: script-not-executable usr/share/debian-edu-config/killer.cron
debian-edu-config binary: possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:153
=====================================
debian/debian-edu-config.maintscript
=====================================
@@ -1 +0,0 @@
-rm_conffile /etc/ldap/slapd-debian-edu.conf 2.12.14
=====================================
debian/debian-edu-config.postinst
=====================================
@@ -161,6 +161,10 @@ configure)
rm -f /etc/ldap/slapd-debian-edu.conf
fi
fi
+ # Remove obsolete conffile.
+ if dpkg --compare-versions "$2" le "2.12.5" && [ -f /var/lib/ldap/data.mdb ] ; then
+ rm -f /etc/ldap/slapd-debian-edu.conf
+ fi
;;
esac
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/c12d8653c6aa245ac29082d1fdb1971a6810a2e4...5b66e90c61fcbfb237c51d65b191049920c14d50
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/c12d8653c6aa245ac29082d1fdb1971a6810a2e4...5b66e90c61fcbfb237c51d65b191049920c14d50
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20211014/35515b3f/attachment-0001.htm>
More information about the debian-edu-commits
mailing list