Package: apt-cacher-ng Version: 0.8.0-3 Severity: normal Tags: patch Dear Maintainer,
While experimenting with this option, I found that specifying it results in the daemon's failure to start. I have included a patch which fixes it and also tries to improve on the documentation, hopefully making it easier for others to understand this feature. Best regards, Carlos -- Package-specific info: -- System Information: Debian Release: 8.0 APT prefers unstable APT policy: (990, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages apt-cacher-ng depends on: ii adduser 3.113+nmu3 ii debconf [debconf-2.0] 1.5.55 ii dpkg 1.17.24 ii init-system-helpers 1.22 ii libbz2-1.0 1.0.6-7+b2 ii libc6 2.19-17 ii libgcc1 1:4.9.2-10 ii liblzma5 5.1.1alpha+20120614-2+b3 ii libssl1.0.0 1.0.1k-1 ii libstdc++6 4.9.2-10 ii libsystemd0 215-12 ii libwrap0 7.6.q-25 ii zlib1g 1:1.2.8.dfsg-2+b1 Versions of packages apt-cacher-ng recommends: ii ed 1.10-2 Versions of packages apt-cacher-ng suggests: ii avahi-daemon 0.6.31-4+b2 ii curl 7.38.0-4 ii doc-base 0.10.6 ii libfuse2 2.9.3-15+b1 ii wget 1.16-3 -- Configuration Files: /etc/apt-cacher-ng/acng.conf changed [not included] /etc/apt-cacher-ng/security.conf [Errno 13] Permission denied: u'/etc/apt-cacher-ng/security.conf' /etc/cron.daily/apt-cacher-ng [Errno 2] No such file or directory: u'/etc/cron.daily/apt-cacher-ng' -- debconf information excluded
From: Carlos Maddela <madd...@labyrinth.net.au> Date: Mon, 16 Mar 2015 04:55:39 +1100 Subject: Fixed support for SPfilePatternEx and improved documentation Description: Fixed support for SPfilePatternEx and improved documentation Author: Carlos Maddela <madd...@labyrinth.net.au> Origin: vendor Forwarded: no Last-Update: 2015-03-16 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- conf/acng.conf | 36 ++++++++++++++++++++---------------- source/acfg.cc | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/conf/acng.conf b/conf/acng.conf index 02943bd..66a0421 100644 --- a/conf/acng.conf +++ b/conf/acng.conf @@ -170,27 +170,31 @@ ExTreshold: 4 # Pigeonholing files (like static vs. volatile contents) is done by (extended) # regular expressions. # -# There are following patterns for different classes and purposes: -# - static data that doesn't change silently ont he server (PFilePattern) -# - volatile data that can be changed like every hour (VFilePattern) -# - special static data that shared some file names with volatile data, -# and in doubt should be identified as static (SPfilePattern) -# - a "whitelist pattern" with hints for the regular expiration job telling -# to keep the files even if they are not referenced by others, like crypto -# signatures with which clients begin their downloads (WfilePattern) -# -# There are two versions, the pattern variables mentioned above should not be -# set without good reasons because they override the built-in defaults (that -# might impact updates to future versions of apt-cacher-ng). There are also -# versions of those patterns with Ex patterns which should be modified by local -# administrator. They are evaluated in addition to regular patterns at runtime. +# The following patterns are available for the purposes detailed, where +# the latter takes precedence over the former: +# - «PFilePattern» for static data that doesn't change silently on the server. +# - «VFilePattern» for volatile data that may change like every hour. Files +# that match both PFilePattern and VfilePattern will be treated as volatile. +# - Static data with file names that match VFilePattern may be overriden being +# treated as volatile by making it match the special static data pattern, +# «SPfilePattern». +# - «WfilePattern» specifies a "whitelist pattern" for the regular expiration +# job, telling it to keep the files even if they are not referenced by +# others, like crypto signatures with which clients begin their downloads. +# +# There are two versions. The pattern variables mentioned above should not be +# set without good reason, because they would override the built-in defaults +# (that might impact updates to future versions of apt-cacher-ng). There are +# also versions of those patterns ending with Ex, which may be modified by the +# local administrator. They are evaluated in addition to the regular patterns +# at runtime. # # To see examples of the expected syntax, run: apt-cacher-ng -p debug=1 # -# VfilePatternEx: # PfilePatternEx: -# WfilePatternEx: +# VfilePatternEx: # SPfilePatternEx: +# WfilePatternEx: # ############################################################################### diff --git a/source/acfg.cc b/source/acfg.cc index 70deff5..6139a7c 100644 --- a/source/acfg.cc +++ b/source/acfg.cc @@ -102,7 +102,7 @@ MapNameToString n2sTbl[] = { ,{ "VfilePatternEx", &vfilepatEx} ,{ "PfilePatternEx", &pfilepatEx} ,{ "WfilePatternEx", &wfilepatEx} - ,{ "SPfilePattern", &spfilepatEx} + ,{ "SPfilePatternEx", &spfilepatEx} // ,{ "AdminAuth", &adminauth} ,{ "BindAddress", &bindaddr} ,{ "UserAgent", &agentname}
