lp://staging/~racb/squid-deb-proxy/apt_refresh
- Get this branch:
- bzr branch lp://staging/~racb/squid-deb-proxy/apt_refresh
Branch merges
- Michael Vogt (community): Approve
-
Diff: 1529 lines (+1334/-0) (has conflicts)34 files modified.bzr-builddeb/default.conf (+2/-0)
30autoproxy (+1/-0)
Makefile (+22/-0)
README (+19/-0)
README.autogenerated (+2/-0)
allowed-networks-src.acl (+12/-0)
apt-avahi-discover (+12/-0)
avahi/Makefile (+10/-0)
avahi/README (+2/-0)
avahi/find_squid_deb_proxy.c (+232/-0)
contrib/squid-deb-proxy.init (+185/-0)
debian/changelog (+192/-0)
debian/compat (+1/-0)
debian/control (+52/-0)
debian/copyright (+14/-0)
debian/po/POTFILES.in (+1/-0)
debian/po/templates.pot (+48/-0)
debian/postrm (+12/-0)
debian/preinst (+54/-0)
debian/rules (+8/-0)
debian/squid-deb-proxy-client-udeb.dirs (+1/-0)
debian/squid-deb-proxy-client-udeb.install (+1/-0)
debian/squid-deb-proxy-client.install (+2/-0)
debian/squid-deb-proxy.config (+11/-0)
debian/squid-deb-proxy.install (+1/-0)
debian/squid-deb-proxy.logrotate (+15/-0)
debian/squid-deb-proxy.postinst (+131/-0)
debian/squid-deb-proxy.postrm (+11/-0)
debian/squid-deb-proxy.templates (+16/-0)
debian/squid-deb-proxy.upstart (+105/-0)
mirror-dstdomain.acl (+21/-0)
squid-deb-proxy.conf (+93/-0)
tests/test_acl.sh (+36/-0)
udeb/80squid-deb-proxy-client (+9/-0)
Related bugs
Bug #971820: squid-deb-proxy needs special handling of Release, Packages, Source | Undecided | In Progress |
Related blueprints
Branch information
Recent revisions
- 15. By Michael Vogt
-
[ Adam Gandelman ]
debian/squid-deb- proxy.upstart: Wrap squid execution in a script section.
Also test for location/version of squid there, as the existing test in
pre-start is out of scope but needed in both places. (LP: #893313) - 13. By Michael Vogt
-
* Rework/simplify/fix the udeb based on the input from
Colin Watson (thanks a lot!)
* fix a bunch of lintian errors:
- add missing po-debconf as build-depends
- add debian/po/{POTFILES. in,templates. pot} - 11. By Michael Vogt
-
* merged lp:~lynxman/squid-deb-proxy/debhooks, many thanks
this adds debconf support to enable unrestricted network src
access and access to PPA destinations
* add support for a binary packagename blacklist
* add .d directories for:
- allowed-networks- src.acl. d
- mirror-dstdomain. acl.d
- pkg-blacklist.d
* add squid-deb-proxy-client udeb
* write debconf generated config to
/etc/squid-deb- proxy/allowed- networks- src.acl. d/30-debconf
/etc/squid-deb- proxy/mirror- dstdomain. acl.d/30- debconf
* debian/control:
- add avahi and pkg-config to the build-depends - 8. By Michael Vogt
-
* mirror-
dstdomain. acl:
- add ddebs.ubuntu.com to default mirrors
* apt-avahi-discover:
- use avahi-resolve to workaround the issue that avahi-browse
sometimes hands out ipv6 even when asked for ipv4 only,
many thanks to Andrew Simpson (LP: #686265)
* contrib/squid-deb- proxy.init:
- add sysv init script, thanks to Andrew Simpson
* debian/squid-deb- proxy.upstart:
- write avahi services file on post-start and kill it again
on pre-stop (LP: #695937)
* debian/squid-deb- proxy.squid- deb-proxy- avahi.upstart:
- removed, this is part of squid-deb-proxy.upstart now
* Makefile:
- fix permission of 30autoproxy (LP: #697955)
* debian/squid-deb- proxy.logrotate :
- add logrotate file (LP: #718923), thanks to
Johan van Dijk and Andrew Simpson - 7. By Clint Byrum
-
Removing expect fork and passing -N to squid to prevent upstart
losing track of squid on reload (LP: #573853)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/squid-deb-proxy