lp:ubuntu/raring/squid3
- Get this branch:
- bzr branch lp:ubuntu/raring/squid3
Branch merges
Branch information
- Owner:
- Ubuntu branches
- Status:
- Mature
Recent revisions
- 41. By Stefan Bader
-
* Merge from Debian testing (LP: #1016560). Remaining changes:
+ debian/control:
- Update maintainer.
- Suggests apparmor (>= 2.3)
- Depends on ssl-cert ((>= 1.0-11ubuntu1)
- Add transitional dummy packages
+ debian/squid3. upstart
- Move ulimit command to script section so that it applies
to the started squid daemon. Thanks to Timur Irmatov (LP: 986159)
- Work around squid not handling SIGHUP by adding respawn to
upstart job. (LP: 978356)
+ debian/NEWS.Debian: Rename NEWS.debian, add note regarding squid3
transition in 12.04 (LP: 924739)
+ debian/rules
- Re-enable all hardening options lost in the squid->squid3
transition (LP: 986314)
+ squid3.resolvconf, debian/squid3. postinst, debian/ squid3. postrm,
debian/squid3. preinst, debian/ squid3. prerm:
- Convert init script to upstart
+ debian/patches/ 99-ubuntu- ssl-cert- snakeoil:
- Use snakeoil certificates.
+ debian/logrotate
- Use sar-reports rather than sarg-maint. (LP: 26616)
+ debian/patches/ 90-cf.data. ubuntu. dpatch:
- Add an example refresh pattern for debs.
(foundations- lucid-local- report spec)
+ Add disabled by default AppArmor profile (LP: 497790)
- debian/squid3. upstart: load profile in pre-start stanza
- add debian/usr.sbin. squid3 profile
- debian/rules:
+ install debian/usr.sbin. squid3, etc/apparmor. d/force- complain and
etc/apparmor. d/disable into $(INSTALLDIR)
+ use dh_apparmor
- debian/squid3. install: install etc/apparmor. d/disable, force-complain
and usr.sbin.squid3
- debian/squid3. preinst: disable profile on clean install or upgrades
from earlier than when we shipped the profile - 40. By Clint Byrum
-
d/squid3.upstart: Work around squid not handling SIGHUP by
adding respawn to upstart job. (LP: #978356) - 39. By Jamie Strandboge
-
* Add disabled by default AppArmor profile (LP: #497790)
- debian/squid3. upstart: load profile in pre-start stanza
- add debian/usr.sbin. squid3 profile
- debian/rules:
+ install debian/usr.sbin. squid3, etc/apparmor. d/force- complain and
etc/apparmor. d/disable into $(INSTALLDIR)
+ use dh_apparmor
- debian/control: suggests apparmor (>= 2.3)
- debian/squid3. install: install etc/apparmor. d/disable, force-complain
and usr.sbin.squid3
- debian/squid3. preinst: disable profile on clean install or upgrades
from earlier than when we shipped the profile - 38. By Jamie Strandboge
-
* debian/rules: re-enable all hardening options lost in the
squid->squid3 transition (LP: #986314)
* debian/squid3. upstart: move ulimit command to script section
so that it applies to the started squid daemon. Thanks to Timur
Irmatov (LP: #986159) - 37. By Adam Gandelman
-
debian/NEWS.Debian: Rename NEWS.debian, add note regarding squid3
transition in 12.04 (LP: #924739) - 36. By Chris Halse Rogers
-
* Merge from Debian testing. Remaining changes:
+ debian/control:
- Update maintainer.
+ debian/squid3. upstart, debian/rules, squid3.resolvconf,
debian/squid3. postinst, debian/ squid3. postrm, debian/ squid3. preinst,
debian/squid3. prerm: Convert init script to upstart
+ debian/control, debian/patches/ 99-ubuntu- ssl-cert- snakeoil: Use
snakeoil certificates.
+ debian/logrotate: Use sar-reports rather than sarg-maint. (LP: 26616)
+ debian/patches/ 90-cf.data. ubuntu. dpatch: Add an example refresh pattern
for debs. (foundations-lucid-local- report spec)
+ Add transitional dummy packages
* New upstream bugfix release fixes swap.state corruption, so squid will
now start after a reboot. (LP: #930252) - 35. By Chuck Short
-
[ Ubuntu Merge-o-Matic ]
* Merge from Debian testing. Remaining changes:
+ debian/control:
- Update maintainer.
+ debian/squid3. upstart, debian/rules, squid3.resolvconf,
debian/squid3. postinst, debian/ squid3. postrm, debian/ squid3. preinst,
debian/squid3. prerm: Convert init script to upstart
+ debian/control, debian/patches/ 99-ubuntu- ssl-cert- snakeoil: Use
snakeoil certificates.
+ debian/logrotate: Use sar-reports rather than sarg-maint. (LP: #26616)
+ debian/patches/ 90-cf.data. ubuntu. dpatch: Add an example refresh pattern
for debs. (foundations-lucid-local- report spec)
+ Add transitional dummy packages - 34. By Chuck Short
-
* Merge from Debian testing. Remaining changes:
+ debian/control:
- Update maintainer.
+ debian/squid3. upstart, debian/rules, squid3.resolvconf,
debian/squid3. postinst, debian/ squid3. postrm, debian/ squid3. preinst,
debian/squid3. prerm: Convert init script to upstart
+ debian/control, debian/patches/ 99-ubuntu- ssl-cert- snakeoil: Use
snakeoil certificates.
+ debian/logrotate: Use sar-reports rather than sarg-maint. (LP: #26616)
+ debian/patches/ 90-cf.data. ubuntu. dpatch: Add an example refresh pattern
for debs. (foundations-lucid-local- report spec)
+ Add transitional dummy packages - 33. By Adam Gandelman
-
* debian/
squid3. upstart: Properly return 0 from maxfds() if $SQUID_MAXFD is
unset, else pre-start will fail as well. Also fix paths to config file.
(LP: #891445)
* debian/squid3. upstart: Modify to better reflect functionality of Debian's
squid3.rc
* debian/rules: Fix permissions on upstart job
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/saucy/squid3