add PfilePattern to acng.conf.patch to ensure zst packages work out of the box

4 files changed, 19 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b05e5da09bea..3a52d74a9048 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = apt-cacher-ng
 	pkgdesc = A caching proxy specialized for package files.
 	pkgver = 3.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.unix-ag.uni-kl.de/~bloch/acng/
 	install = apt-cacher-ng.install
 	arch = i686
@@ -21,7 +21,7 @@ pkgbase = apt-cacher-ng
 	source = apt-cacher-ng.service.patch
 	source = apt-cacher-ng.tmpfile
 	md5sums = 8f9f99056e3e9969c4ce570611cb5216
-	md5sums = 180e14417a70642a53c77bcb6a7b7292
+	md5sums = 060f1278f9446437cc70da335cd24b19
 	md5sums = 9645bdcd30a6b0ddc956c2a48c7a27ff
 	md5sums = 29979b8064ff52aa24017b42c37e6bfb
 
diff --git a/PKGBUILD b/PKGBUILD
index f6d934c2e603..91f524d023b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=apt-cacher-ng
 pkgver=3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A caching proxy specialized for package files."
 url="http://www.unix-ag.uni-kl.de/~bloch/acng/"
 arch=('i686' 'x86_64' 'armv7h')
@@ -23,10 +23,10 @@ source=("http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${
 )
 
 backup=('etc/apt-cacher-ng/acng.conf')
-md5sums=('8f9f99056e3e9969c4ce570611cb5216'
-         '180e14417a70642a53c77bcb6a7b7292'
-         '9645bdcd30a6b0ddc956c2a48c7a27ff'
-         '29979b8064ff52aa24017b42c37e6bfb')
+md5sums=('8f9f99056e3e9969c4ce570611cb5216' # package
+         '060f1278f9446437cc70da335cd24b19' # acng.conf.patch
+         '9645bdcd30a6b0ddc956c2a48c7a27ff' # apt-cacher-ng.service.patch
+         '29979b8064ff52aa24017b42c37e6bfb') # apt-cacher-ng.tmpfile
 
 install=apt-cacher-ng.install
 
diff --git a/acng.conf.patch b/acng.conf.patch
index 847881025c69..04b2dff130f0 100644
--- a/acng.conf.patch
+++ b/acng.conf.patch
@@ -1,20 +1,28 @@
 --- conf/acng.conf	2014-01-04 15:25:29.000000000 +0100
 +++ conf/acng.conf.arch	2014-01-07 14:55:37.491160935 +0100
 @@ -79,7 +79,7 @@
- # used with inetd bridge or cron client.
+ #
  # Default: not set, UNIX socket bridge is disabled.
  #
 -# SocketPath:/var/run/apt-cacher-ng/socket
 +SocketPath:/run/apt-cacher-ng/socket
- 
+
  # If set to 1, makes log files be written to disk on every new line. Default
  # is 0, buffers are flushed after the client disconnects. Technically,
-@@ -99,7 +99,7 @@
+@@ -111,7 +111,7 @@
  # Store the pid of the daemon process in the specified text file.
  # Default: disabled
  #
 -# PidFile: /var/run/apt-cacher-ng/pid
 +PidFile: /run/apt-cacher-ng/pid
- 
+
  # Forbid outgoing connections and work without an internet connection or
  # respond with 503 error where it's not possible.
+@@ -234,6 +234,7 @@
+ # To see examples of the expected syntax, run: apt-cacher-ng -p debug=1
+ #
+ # PfilePatternEx:
++PfilePattern = .(.d?deb|.db|.rpm|.drpm|.dsc|.tar(.gz|.bz2|.lzma|.xz|.zst)(.gpg)?|.diff(.gz|.bz2|.lzma|.zst|.xz)|.jigdo|.template|changelog|copyright|.udeb|.debdelta|.diff/..gz|(Devel)?ReleaseAnnouncement(\?.)?|[a-f0-9]+-(susedata|updateinfo|primary|deltainfo).xml.gz|fonts/(final/)?[a-z]+32.exe(\?download.)?|/dists/./installer-[^/]+/[0-9][^/]+/images/.)$
+ # VfilePatternEx:
+ # SPfilePatternEx:
+ # SVfilePatternEx:
diff --git a/apt-cacher-ng.conf.patch b/apt-cacher-ng.conf.patch
deleted file mode 100644
index abc5adf1ed71..000000000000
--- a/apt-cacher-ng.conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-apt-cacher-ng.service.patch by Jan Was <janek.jan@gmail.com>
-
-Fix paths for socket, pidfile and binaries in default systemd service file.
-
-diff -urNad systemd/apt-cacher-ng.conf systemd/apt-cacher-ng.conf.arch
---- systemd/apt-cacher-ng.conf	2014-10-20 22:44:16.000000000 +0200
-+++ systemd/apt-cacher-ng.conf.arch	2014-11-03 12:58:10.796511172 +0100
-@@ -1,2 +1,2 @@
--Z /var/run/apt-cacher-ng 0755 apt-cacher-ng apt-cacher-ng - -
--D /var/run/apt-cacher-ng 0755 apt-cacher-ng apt-cacher-ng - -
-+Z /run/apt-cacher-ng 0755 apt-cacher-ng apt-cacher-ng - -
-+D /run/apt-cacher-ng 0755 apt-cacher-ng apt-cacher-ng - -