Bug#985390: Uploaded -9 to try to fix the concerns
Hi!
I have just uploaded -9 which tries to fix the things that we've talked that
you didn't like.
I'm attaching the debdiff.
Hope this helps getting -9 on Bullseye.
Regards.
--
Manty/BestiaTester -> http://manty.net
diff -Nru squid-4.13/debian/changelog squid-4.13/debian/changelog
--- squid-4.13/debian/changelog 2021-03-21 00:58:29.000000000 +0100
+++ squid-4.13/debian/changelog 2021-03-23 00:18:11.000000000 +0100
@@ -1,3 +1,11 @@
+squid (4.13-9) unstable; urgency=medium
+
+ * Clarify on NEWS and scripts that we no longer remove logs on purge.
+ * Clarify on postrm script that the debhelper code was put manually.
+ * Add README.Debian to squid-openssl.
+
+ -- Santiago Garcia Mantinan <manty@debian.org> Tue, 23 Mar 2021 00:18:11 +0100
+
squid (4.13-8) unstable; urgency=medium
* Add SQUID-2020_11.patch to fix HTTP Request Smuggling.
diff -Nru squid-4.13/debian/NEWS squid-4.13/debian/NEWS
--- squid-4.13/debian/NEWS 2021-03-08 22:32:47.000000000 +0100
+++ squid-4.13/debian/NEWS 2021-03-23 00:18:11.000000000 +0100
@@ -1,3 +1,13 @@
+squid (4.13-9) unstable; urgency=medium
+
+ Current package flavours: squid (GnuTLS) and squid-openssl share config,
+ logs and cache. Since 4.13-6 none of them removes the logs on purge, so
+ that you can purge one flavour when switching to the other without loosing
+ the logs. If you don't need them anymore and want them removed you'll
+ have to do it yourself.
+
+ -- Santiago Garcia Mantinan <manty@debian.org> Tue, 23 Mar 2021 00:07:36 +0100
+
squid (4.13-6) unstable; urgency=medium
If you want to transition from squid to squid-openssl or vice versa you
diff -Nru squid-4.13/debian/README.Debian squid-4.13/debian/README.Debian
--- squid-4.13/debian/README.Debian 2021-03-08 22:32:47.000000000 +0100
+++ squid-4.13/debian/README.Debian 2021-03-23 00:18:11.000000000 +0100
@@ -1,18 +1,43 @@
-This is the next-generation Squid. In version 3.x squid has been ported to C++
-for code manageability. Since squid 2.x is not developed anymore except for bug
-fixing, this package is where new features will be added.
-
-Squid 3.5 supports IPv6, WCCPv2, ICAP, Edge Side Include, SSL offloading, etc. Please
-note that not all of the new feature have been enabled in Debian package.
-
-Squid 3.5 is configured by the /etc/squid/squid.conf file. Syntax of that
-file is the same of previous versions of squid and each directive is largely
-commented there. Configuration files from 2.x versions of squid will mostly
-work in squid 3.5. Changes to the configuration file are reported in
+This is the next-generation Squid. In version 3.x squid has been ported to
+C++ for code manageability.
+
+Squid supports IPv6, WCCPv2, ICAP, Edge Side Include, SSL offloading, etc.
+
+Squid in Debian now comes in two flavours, the GnuTLS flavour, which is the
+one that has been tratitionally supplied by Debian's squid package and a new
+OpenSSL flavour which is provided by the squid-openssl package.
+
+Each flavour has its features, that's why we provide the two. The
+traditional one is better at handling multiple certificates, while the
+openssl flavour comes with SSL-Bump which allows full proxy transparency.
+
+Both flavours have their own specific options to be setup at config files,
+but they share the same config files, both /etc/squid/squid.conf file, as
+well as the new /etc/squid/conf.d/ directory. Syntax of those files is the
+same of previous versions of squid and each directive is largely commented
+there. Configuration files from 2.x versions of squid will mostly work in
+later versions of squid. Changes to the configuration files are reported in
/usr/share/doc/squid-common/RELEASENOTES.html
+Both flavours of squid share not only the config files but also the log
+files and the cache. When purging squid, the package didn't remove the
+cache files, typically at /var/spool/squid, and now, since version 4.13-6,
+it also doesn't remove the logs at /var/log/squid, this means that if you
+want to migrate to squid-openssl and, afterwards, purge squid, you must make
+sure you have at least version 4.13-6 of squid installed, this way you won't
+loose the logs when you purge squid. So, if you have version 4.13-6 or
+later of the squid packages, you can switch flavours and try each flavour's
+own features without any problem, but first make sure you have at least
+version 4.13-6 of the squid packages, otherwise you'll probably loose the
+config file and the logs.
+
+This also means that if you want to fully purge all squid stuff from your
+system, you must remove by yourself /var/spool/squid (to save time you can
+use mkfs if you have them on a separate filesystem) and /var/log/squid if
+you are completely sure that you don't need those files anymore.
+
The squid homepage is at http://www.squid-cache.org/
Squid was downloaded from that site with HTTP.
- -- Luigi Gangitano <luigi@debian.org>, Wed 22 Jul 2015 15:57:00 +0200
+ -- The Debian Squid Maintainers <squid@packages.debian.org>, Tue, 23 Mar 2021 11:28:15 +0100
diff -Nru squid-4.13/debian/squid-openssl.postrm squid-4.13/debian/squid-openssl.postrm
--- squid-4.13/debian/squid-openssl.postrm 2021-03-10 09:17:36.000000000 +0100
+++ squid-4.13/debian/squid-openssl.postrm 2021-03-23 00:18:11.000000000 +0100
@@ -11,31 +11,25 @@
# take a lot of time. Most of the time it is on a seperate
# disk anyway and it is faster to do a mkfs on it..
#
- echo "Please, remove logs (/var/log/squid) and cache (/var/spool/squid) yourself."
+ echo "Log and cache files are not automatically removed."
+ echo "These files are used by squid and squid-openssl flavours."
+ echo "Remove logs (/var/log/squid) and cache (/var/spool/squid) yourself"
+ echo "if you no longer need them."
;;
failed-upgrade|abort-upgrade|upgrade|abort-install|disappear)
;;
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-# Automatically added by dh_installinit/13.3.4
+# Manually added while we don't solve #984897 on debhelper
if [ "$1" = "purge" ] && ! [ -e /etc/init.d/squid ]; then
update-rc.d squid remove >/dev/null
fi
-# End automatically added section
-# Automatically added by dh_installdeb/13.3.4
dpkg-maintscript-helper rm_conffile /etc/squid3/msntauth.conf 3.5.4-1\~ squid3 -- "$@"
dpkg-maintscript-helper mv_conffile /etc/squid3/squid.conf /etc/squid/squid.conf 3.5.4-1\~ squid3 -- "$@"
dpkg-maintscript-helper mv_conffile /etc/squid3/errorpage.css /etc/squid/errorpage.css 3.5.4-1\~ squid3 -- "$@"
-# End automatically added section
-# Automatically added by dh_installsystemd/13.3.4
if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
systemctl --system daemon-reload >/dev/null || true
fi
-# End automatically added section
-# Automatically added by dh_installsystemd/13.3.4
if [ "$1" = "remove" ]; then
if [ -x "/usr/bin/deb-systemd-helper" ]; then
deb-systemd-helper mask 'squid.service' >/dev/null || true
@@ -48,8 +42,6 @@
deb-systemd-helper unmask 'squid.service' >/dev/null || true
fi
fi
-# End automatically added section
-# Automatically added by dh_apparmor/2.13.6-9
if [ "$1" = "purge" ] && ! [ -e "/etc/apparmor.d/usr.sbin.squid" ] ; then
rm -f "/etc/apparmor.d/disable/usr.sbin.squid" || true
rm -f "/etc/apparmor.d/force-complain/usr.sbin.squid" || true
@@ -59,7 +51,7 @@
rmdir /etc/apparmor.d/local 2>/dev/null || true
rmdir /etc/apparmor.d 2>/dev/null || true
fi
-# End automatically added section
+# End manually added section
exit 0
diff -Nru squid-4.13/debian/squid-openssl.README.Debian squid-4.13/debian/squid-openssl.README.Debian
--- squid-4.13/debian/squid-openssl.README.Debian 1970-01-01 01:00:00.000000000 +0100
+++ squid-4.13/debian/squid-openssl.README.Debian 2021-03-23 00:18:11.000000000 +0100
@@ -0,0 +1,43 @@
+
+This is the next-generation Squid. In version 3.x squid has been ported to
+C++ for code manageability.
+
+Squid supports IPv6, WCCPv2, ICAP, Edge Side Include, SSL offloading, etc.
+
+Squid in Debian now comes in two flavours, the GnuTLS flavour, which is the
+one that has been tratitionally supplied by Debian's squid package and a new
+OpenSSL flavour which is provided by the squid-openssl package.
+
+Each flavour has its features, that's why we provide the two. The
+traditional one is better at handling multiple certificates, while the
+openssl flavour comes with SSL-Bump which allows full proxy transparency.
+
+Both flavours have their own specific options to be setup at config files,
+but they share the same config files, both /etc/squid/squid.conf file, as
+well as the new /etc/squid/conf.d/ directory. Syntax of those files is the
+same of previous versions of squid and each directive is largely commented
+there. Configuration files from 2.x versions of squid will mostly work in
+later versions of squid. Changes to the configuration files are reported in
+/usr/share/doc/squid-common/RELEASENOTES.html
+
+Both flavours of squid share not only the config files but also the log
+files and the cache. When purging squid, the package didn't remove the
+cache files, typically at /var/spool/squid, and now, since version 4.13-6,
+it also doesn't remove the logs at /var/log/squid, this means that if you
+want to migrate to squid-openssl and, afterwards, purge squid, you must make
+sure you have at least version 4.13-6 of squid installed, this way you won't
+loose the logs when you purge squid. So, if you have version 4.13-6 or
+later of the squid packages, you can switch flavours and try each flavour's
+own features without any problem, but first make sure you have at least
+version 4.13-6 of the squid packages, otherwise you'll probably loose the
+config file and the logs.
+
+This also means that if you want to fully purge all squid stuff from your
+system, you must remove by yourself /var/spool/squid (to save time you can
+use mkfs if you have them on a separate filesystem) and /var/log/squid if
+you are completely sure that you don't need those files anymore.
+
+The squid homepage is at http://www.squid-cache.org/
+Squid was downloaded from that site with HTTP.
+
+ -- The Debian Squid Maintainers <squid@packages.debian.org>, Tue, 23 Mar 2021 11:28:15 +0100
diff -Nru squid-4.13/debian/squid.postrm squid-4.13/debian/squid.postrm
--- squid-4.13/debian/squid.postrm 2021-03-10 09:16:55.000000000 +0100
+++ squid-4.13/debian/squid.postrm 2021-03-23 00:18:11.000000000 +0100
@@ -11,31 +11,25 @@
# take a lot of time. Most of the time it is on a seperate
# disk anyway and it is faster to do a mkfs on it..
#
- echo "Please, remove logs (/var/log/squid) and cache (/var/spool/squid) yourself."
+ echo "Log and cache files are not automatically removed."
+ echo "These files are used by squid and squid-openssl flavours."
+ echo "Remove logs (/var/log/squid) and cache (/var/spool/squid) yourself"
+ echo "if you no longer need them."
;;
failed-upgrade|abort-upgrade|upgrade|abort-install|disappear)
;;
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-# Automatically added by dh_installinit/13.3.4
+# Manually added while we don't solve #984897 on debhelper
if [ "$1" = "purge" ] && ! [ -e /etc/init.d/squid ]; then
update-rc.d squid remove >/dev/null
fi
-# End automatically added section
-# Automatically added by dh_installdeb/13.3.4
dpkg-maintscript-helper rm_conffile /etc/squid3/msntauth.conf 3.5.4-1\~ squid3 -- "$@"
dpkg-maintscript-helper mv_conffile /etc/squid3/squid.conf /etc/squid/squid.conf 3.5.4-1\~ squid3 -- "$@"
dpkg-maintscript-helper mv_conffile /etc/squid3/errorpage.css /etc/squid/errorpage.css 3.5.4-1\~ squid3 -- "$@"
-# End automatically added section
-# Automatically added by dh_installsystemd/13.3.4
if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
systemctl --system daemon-reload >/dev/null || true
fi
-# End automatically added section
-# Automatically added by dh_installsystemd/13.3.4
if [ "$1" = "remove" ]; then
if [ -x "/usr/bin/deb-systemd-helper" ]; then
deb-systemd-helper mask 'squid.service' >/dev/null || true
@@ -48,8 +42,6 @@
deb-systemd-helper unmask 'squid.service' >/dev/null || true
fi
fi
-# End automatically added section
-# Automatically added by dh_apparmor/2.13.6-9
if [ "$1" = "purge" ] && ! [ -e "/etc/apparmor.d/usr.sbin.squid" ] ; then
rm -f "/etc/apparmor.d/disable/usr.sbin.squid" || true
rm -f "/etc/apparmor.d/force-complain/usr.sbin.squid" || true
@@ -59,7 +51,7 @@
rmdir /etc/apparmor.d/local 2>/dev/null || true
rmdir /etc/apparmor.d 2>/dev/null || true
fi
-# End automatically added section
+# End manually added section
exit 0
Reply to: