Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock x-debbugs-cc: debian-edu@lists.debian.org Dear release team, This is an unblock request as previously discussed (*) for debian-edu-config, fixing two important bugs (adding support for migration to squid3 is actually a serious issue, as squid was removed and thus doesnt receive security updates anymore), plus contributing to another important bugfix. The sugar changes are just nice to have and harmless. (*) see https://lists.debian.org/20141107121705.GF3095@coloquinte.cristau.org debian-edu-config (1.818) unstable; urgency=high [ Holger Levsen ] * testsuite/taskpkgs, kdm and network: drop tests for the Sugar profile as Sugar has been removed from Jessie, see #782504. [ Wolfgang Schweer ] * Remove Debian-custom/099-mount-cdrom cause this script might possibly conflict with ltsp-client-builder.udeb postinst. (Closes: #780740). * Add Debian-custom/080-eatmydata to enable the usage of eatmydata as default for all possible LTSP installation methods. Partially addresses #781515. * Add support for squid to squid3 migration: - Add share/debian-edu-config/tools/migrate-squid-to-squid3. - Adjust cf/cf.squid to run this script. (Closes: #779649). -- Holger Levsen <holger@debian.org> Tue, 14 Apr 2015 19:49:34 +0200 $ debdiff debian-edu-config_1.817.dsc debian-edu-config_1.818.dsc |diffstat Makefile | 3 - cf/cf.squid | 2 debian/changelog | 19 ++++++ share/debian-edu-config/tools/migrate-squid-to-squid3 | 14 +++++ share/ltsp/plugins/ltsp-build-client/Debian-custom/080-eatmydata | 22 +++++++ share/ltsp/plugins/ltsp-build-client/Debian-custom/099-mount-cdrom | 28 ---------- testsuite/kdm | 4 - testsuite/network | 4 - testsuite/taskpkgs | 3 - 9 files changed, 61 insertions(+), 38 deletions(-) The full debdiff is attached and the package has been accepted into unstable. cheers, Holger
diff -Nru debian-edu-config-1.817/cf/cf.squid debian-edu-config-1.818/cf/cf.squid --- debian-edu-config-1.817/cf/cf.squid 2014-10-13 19:57:41.000000000 +0200 +++ debian-edu-config-1.818/cf/cf.squid 2015-04-14 19:48:30.000000000 +0200 @@ -36,6 +36,8 @@ # Update Squid to use all the available space (aka 80% of the partition) "/usr/share/debian-edu-config/tools/squid-update-cachedir /etc/squid3/squid-debian-edu.conf" + # Migrate to squid3 when ugrading to jessie. + "/usr/share/debian-edu-config/tools/migrate-squid-to-squid3" debian.!server.!standalone.fifthpass:: diff -Nru debian-edu-config-1.817/debian/changelog debian-edu-config-1.818/debian/changelog --- debian-edu-config-1.817/debian/changelog 2015-02-03 12:57:42.000000000 +0100 +++ debian-edu-config-1.818/debian/changelog 2015-04-14 19:49:38.000000000 +0200 @@ -1,3 +1,22 @@ +debian-edu-config (1.818) unstable; urgency=high + + [ Holger Levsen ] + * testsuite/taskpkgs, kdm and network: drop tests for the Sugar profile as + Sugar has been removed from Jessie, see #782504. + + [ Wolfgang Schweer ] + * Remove Debian-custom/099-mount-cdrom cause this script might + possibly conflict with ltsp-client-builder.udeb postinst. + (Closes: #780740). + * Add Debian-custom/080-eatmydata to enable the usage of eatmydata + as default for all possible LTSP installation methods. Partially + addresses #781515. + * Add support for squid to squid3 migration: + - Add share/debian-edu-config/tools/migrate-squid-to-squid3. + - Adjust cf/cf.squid to run this script. (Closes: #779649). + + -- Holger Levsen <holger@debian.org> Tue, 14 Apr 2015 19:49:34 +0200 + debian-edu-config (1.817) unstable; urgency=medium [ Wolfgang Schweer ] diff -Nru debian-edu-config-1.817/Makefile debian-edu-config-1.818/Makefile --- debian-edu-config-1.817/Makefile 2014-12-13 10:56:55.000000000 +0100 +++ debian-edu-config-1.818/Makefile 2015-04-14 19:48:30.000000000 +0200 @@ -394,6 +394,7 @@ share/debian-edu-config/tools/workaround-udev-bug-765577 \ share/debian-edu-config/tools/wpad-extract \ share/debian-edu-config/tools/debian-edu-dovecot-create-cert \ + share/debian-edu-config/tools/migrate-squid-to-squid3 \ share/debian-edu-config/ltspfs-mounter-kde \ share/ltsp/get-ldap-ltsp-config \ share/ltsp/init-ltsp.d/08-edu-hostname \ @@ -437,9 +438,9 @@ share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs \ share/ltsp/plugins/ltsp-build-client/Debian-custom/045-remove-udev-net-rules \ share/ltsp/plugins/ltsp-build-client/Debian-custom/050-nbdquery \ + share/ltsp/plugins/ltsp-build-client/Debian-custom/080-eatmydata \ share/ltsp/plugins/ltsp-build-client/Debian-custom/095-umount-error \ share/ltsp/plugins/ltsp-build-client/Debian-custom/098-etckeeper \ - share/ltsp/plugins/ltsp-build-client/Debian-custom/099-mount-cdrom \ ; do \ $(INSTALL_DATA) $$f $(DESTDIR)/usr/$$f ; \ done diff -Nru debian-edu-config-1.817/share/debian-edu-config/tools/migrate-squid-to-squid3 debian-edu-config-1.818/share/debian-edu-config/tools/migrate-squid-to-squid3 --- debian-edu-config-1.817/share/debian-edu-config/tools/migrate-squid-to-squid3 1970-01-01 01:00:00.000000000 +0100 +++ debian-edu-config-1.818/share/debian-edu-config/tools/migrate-squid-to-squid3 2015-04-14 19:48:30.000000000 +0200 @@ -0,0 +1,14 @@ +#!/bin/bash +# +# Takes effect after squid3 has been installed after upgrade from wheezy. +# The existing cache is reused. +# +if [ -f /usr/sbin/squid ] && [ -f /usr/sbin/squid3 ] ; then + service squid3 stop + service squid stop + umount /var/spool/squid + sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab + mount /var/spool/squid3 + service squid3 start + apt-get -y purge squid squid-common +fi diff -Nru debian-edu-config-1.817/share/ltsp/plugins/ltsp-build-client/Debian-custom/080-eatmydata debian-edu-config-1.818/share/ltsp/plugins/ltsp-build-client/Debian-custom/080-eatmydata --- debian-edu-config-1.817/share/ltsp/plugins/ltsp-build-client/Debian-custom/080-eatmydata 1970-01-01 01:00:00.000000000 +0100 +++ debian-edu-config-1.818/share/ltsp/plugins/ltsp-build-client/Debian-custom/080-eatmydata 2015-04-14 19:35:26.000000000 +0200 @@ -0,0 +1,22 @@ +case "$MODE" in + commandline) + add_option "eatmydata" "`eval_gettext "use eatmydata to speed up build times, at risk of data not getting written to disk"`" "advanced" "true" + ;; + configure) + if [ -n "$option_eatmydata_value" ]; then + # load libeatmydata + libeatmydata=libeatmydata.so + if [ -n "$LD_PRELOAD" ]; then + export LD_PRELOAD="$libeatmydata $LD_PRELOAD" + else + export LD_PRELOAD="$libeatmydata" + fi + # install eatmydata package early during debootstrap + if [ -z "$INCLUDE" ]; then + INCLUDE="eatmydata" + else + INCLUDE="$INCLUDE,eatmydata" + fi + fi + ;; +esac diff -Nru debian-edu-config-1.817/share/ltsp/plugins/ltsp-build-client/Debian-custom/099-mount-cdrom debian-edu-config-1.818/share/ltsp/plugins/ltsp-build-client/Debian-custom/099-mount-cdrom --- debian-edu-config-1.817/share/ltsp/plugins/ltsp-build-client/Debian-custom/099-mount-cdrom 2014-09-04 21:01:59.000000000 +0200 +++ debian-edu-config-1.818/share/ltsp/plugins/ltsp-build-client/Debian-custom/099-mount-cdrom 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -# Replacement for the Debian/099-mount-cdrom script in the official ltsp -# package. Having the file here is a workaround for #606313, -# triggered when using USB sticks with CD isos. -case "$MODE" in - commandline) - add_option "mount-cdrom" "`eval_gettext "mounts CDROM before installation"`" "advanced" "false" - ;; - configure) - if [ -n "$option_mount_cdrom_value" ]; then - MOUNT_CDROM="true" - fi - ;; - before-install) - if [ "$MOUNT_CDROM" = "true" ]; then - if mount /media/cdrom ; then - : - else - echo "unble to mount cdrom, trying to continue" - MOUNT_CDROM=false - fi - fi - ;; - finalization) - if [ "$MOUNT_CDROM" = "true" ]; then - umount /media/cdrom - fi - ;; -esac diff -Nru debian-edu-config-1.817/testsuite/kdm debian-edu-config-1.818/testsuite/kdm --- debian-edu-config-1.817/testsuite/kdm 2014-09-04 21:01:59.000000000 +0200 +++ debian-edu-config-1.818/testsuite/kdm 2015-04-14 19:35:23.000000000 +0200 @@ -8,8 +8,8 @@ . /etc/debian-edu/config fi -# Standalone Main-Server and Sugar do not install kdm -if [ "$PROFILE" = Main-Server ] || [ "$PROFILE" = Sugar ] ; then +# Standalone Main-Server does not install kdm +if [ "$PROFILE" = Main-Server ] ; then exit 0 fi diff -Nru debian-edu-config-1.817/testsuite/network debian-edu-config-1.818/testsuite/network --- debian-edu-config-1.817/testsuite/network 2014-12-01 14:47:49.000000000 +0100 +++ debian-edu-config-1.818/testsuite/network 2015-04-14 19:35:23.000000000 +0200 @@ -94,10 +94,6 @@ Minimal) networked=true ;; - Sugar) - networked=false - standalone=true - ;; *) error "unknown profile '$profile'" ;; diff -Nru debian-edu-config-1.817/testsuite/taskpkgs debian-edu-config-1.818/testsuite/taskpkgs --- debian-edu-config-1.817/testsuite/taskpkgs 2014-10-12 12:51:32.000000000 +0200 +++ debian-edu-config-1.818/testsuite/taskpkgs 2015-04-14 19:35:23.000000000 +0200 @@ -80,9 +80,6 @@ Main-Server|Server) check_installed_task education-main-server ;; - Sugar) - check_installed_task education-desktop-sugar - ;; Minimal) check_installed_task education-networked ;;
Attachment:
signature.asc
Description: This is a digitally signed message part.