[Merge] ~lucaskanashiro/ubuntu/+source/squid:merge_4.9-2 into ubuntu/+source/squid:debian/sid
Lucas Kanashiro
kanashiro at riseup.net
Thu Nov 14 21:44:27 UTC 2019
Lucas Kanashiro has proposed merging ~lucaskanashiro/ubuntu/+source/squid:merge_4.9-2 into ubuntu/+source/squid:debian/sid.
Requested reviews:
Canonical Server Team (canonical-server)
Ubuntu Server Developers (ubuntu-server-dev)
Related bugs:
Bug #1843325 in squid (Ubuntu): "FTBFS with glibc 2.30: sysctl.h is deprecated"
https://bugs.launchpad.net/ubuntu/+source/squid/+bug/1843325
For more details, see:
https://code.launchpad.net/~lucaskanashiro/ubuntu/+source/squid/+git/squid/+merge/375575
Merge version 4.9-2 from Debian. Following are the remaining changes:
- Use snakeoil certificates.
- Add an example refresh pattern for debs.
- d/usr.sbin.squid: Add sections for maas-proxy, squid-deb-proxy,
squidguard
- d/rules: Add -Wno-format-truncation to CXXFLAGS as a workaround if
building for ppc64el. On that arch, dpkg-buildflags sets -O3 instead of
-O2 and that triggers a format-truncation error on pcon.cc. See
See https://bugs.squid-cache.org/show_bug.cgi?id=4875
- d/p/drop-sysctl_h.patch: no longer include sysctl.h as it was
deprecated in glibc 2.30 (LP #1843325)
And here are the changes dropped because they were applied by upstream:
- d/rules: Only use -latomic with the intended architectures, instead of
all of them. This matches what was suggested in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907106#5
[Fixed upstream]
- d/NEWS.debian: rename d/NEWS.debian to d/NEWS so that
dh_installchangelogs can pick it up. dh_installchangelogs handles
d/NEWS or d/<package>.NEWS, but not NEWS.debian.
[Fixed upstream]
- debian/patches/more-gcc-9-fixes.patch: switch to xstrncpy in
lib/smblib/smblib-util.c. (LP #1835831)
[Fixed upstream]
- d/t/test-squid.py: test_zz_apparmor(): bail early if securityfs isn't
mounted
[Fixed upstream]
Thanks Andreas for upstreaming all those changes!
The package was uploaded to this PPA (with all architectures enabled): https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-squid-merge
The DEP-8 tests are passing successfully:
autopkgtest [18:41:07]: test squid: - - - - - - - - - - results - - - - - - - - - -
squid PASS
autopkgtest [18:41:08]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-test-suite PASS
squid PASS
I also tried to do a basic setup in a LXD container and it worked fine.
--
Your team Ubuntu Server Developers is requested to review the proposed merge of ~lucaskanashiro/ubuntu/+source/squid:merge_4.9-2 into ubuntu/+source/squid:debian/sid.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 22166 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20191114/b45bd010/attachment-0001.diff>
More information about the Ubuntu-reviews
mailing list