Your message dated Fri, 02 Jun 2017 05:50:00 +0000
with message-id <[email protected]>
and subject line Re: Bug#863895: unblock: squid3/3.5.23-3.1 (pre-approval)
has caused the Debian Bug report #863895,
regarding unblock: squid3/3.5.23-3.1 (pre-approval)
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 [email protected]
immediately.)
--
863895: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863895
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package squid3
Hi,
I'd like to NMU squid3 to fix an upgrade issue with the migration of the
configuration dating back to squid 2.7, I have tested this in piuparts
and it is already applied to the package maintainer's repository.
There was also another bugfix in git, that is included as well.
Since time is running quickly and I haven't heard back from the
maintainer, I'll NMU squid to get this fix into stretch.
Proposed diff attached.
Andreas
unblock squid3/3.5.23-3.1
diff -Nru squid3-3.5.23/debian/changelog squid3-3.5.23/debian/changelog
--- squid3-3.5.23/debian/changelog 2017-04-08 02:52:28.000000000 +0200
+++ squid3-3.5.23/debian/changelog 2017-06-01 18:11:48.000000000 +0200
@@ -1,3 +1,16 @@
+squid3 (3.5.23-3.1) unstable; urgency=medium
+
+ [ Andreas Beckmann <[email protected]> ]
+ * Non-maintainer upload.
+ * debian/squid.postinst
+ - Fix another upgrade edge case from 2.7 default install (Closes: #801564)
+
+ [ Amos Jeffries <[email protected]> ]
+ * debian/squid.logrotate
+ - Add missing piece of fix for sarg daily reports (LP: #1414754)
+
+ -- Andreas Beckmann <[email protected]> Thu, 01 Jun 2017 18:11:48 +0200
+
squid3 (3.5.23-3) unstable; urgency=medium
[ Amos Jeffries <[email protected]> ]
diff -Nru squid3-3.5.23/debian/squid.logrotate squid3-3.5.23/debian/squid.logrotate
--- squid3-3.5.23/debian/squid.logrotate 2017-03-21 22:49:57.000000000 +0100
+++ squid3-3.5.23/debian/squid.logrotate 2017-06-01 18:11:48.000000000 +0200
@@ -10,7 +10,7 @@
nocreate
sharedscripts
prerotate
- test ! -x /usr/sbin/sarg-reports || /usr/sbin/sarg-reports
+ test ! -x /usr/sbin/sarg-reports || /usr/sbin/sarg-reports daily
endscript
postrotate
test ! -e /var/run/squid.pid || test ! -x /usr/sbin/squid || /usr/sbin/squid -k rotate
diff -Nru squid3-3.5.23/debian/squid.postinst squid3-3.5.23/debian/squid.postinst
--- squid3-3.5.23/debian/squid.postinst 2017-04-08 02:03:35.000000000 +0200
+++ squid3-3.5.23/debian/squid.postinst 2017-06-01 18:11:48.000000000 +0200
@@ -60,19 +60,27 @@
# Use '< 2.8' version to catch backports and security versions >2.7.
#
if dpkg --compare-versions "$2" lt '2.8' && test -f /etc/squid/squid.conf.pre3.5_upgrade; then
+ md5pre35=$(md5sum /etc/squid/squid.conf.pre3.5_upgrade | awk '{ print $1 }')
+ if [ "$md5pre35" = "6d674d5f9842b50a2c691a135007c804" ] || \
+ [ "$md5pre35" = "5d85f7dce9a84082e23a656b3cb0c984" ]; then
+ # The old configuration file was unchanged from the version shipped
+ # with squid 2.7, keep the new one in place and delete the old one.
+ rm -f /etc/squid/squid.conf.pre3.5_upgrade
+ else
+ #
+ # Our special 2.x protection left squid.conf absent,
+ # so the new package installing put its own there.
+ # It would normally have just created a *.dpkg-dist
+ #
+ mv /etc/squid/squid.conf /etc/squid/squid.conf.dpkg-dist
- #
- # Our special 2.x protection left squid.conf absent,
- # so the new package installing put its own there.
- # It would normally have just created a *.dpkg-dist
- #
- mv /etc/squid/squid.conf /etc/squid/squid.conf.dpkg-dist
-
- #
- # Restore the old user file as main squid.conf
- #
- mv /etc/squid/squid.conf.pre3.5_upgrade /etc/squid/squid.conf
+ #
+ # Restore the old user file as main squid.conf
+ #
+ mv /etc/squid/squid.conf.pre3.5_upgrade /etc/squid/squid.conf
+ fi
fi
+
#
# Chown the directories.
#
--- End Message ---
--- Begin Message ---
Niels Thykier:
> Control: tags -1 confirmed moreinfo
>
> Andreas Beckmann:
>> Package: release.debian.org
>> Severity: normal
>> User: [email protected]
>> Usertags: unblock
>>
>> Please unblock package squid3
>>
>> Hi,
>>
>> I'd like to NMU squid3 to fix an upgrade issue with the migration of the
>> configuration dating back to squid 2.7, I have tested this in piuparts
>> and it is already applied to the package maintainer's repository.
>> There was also another bugfix in git, that is included as well.
>> Since time is running quickly and I haven't heard back from the
>> maintainer, I'll NMU squid to get this fix into stretch.
>> Proposed diff attached.
>>
>>
>> Andreas
>>
>> unblock squid3/3.5.23-3.1
>>
>
> Please go ahead.
>
> Thanks,
> ~Niels
>
Uploaded as squid3/3.5.23-4 and now unblocked.
Thanks,
~Niels
--- End Message ---
