bump to 3.3.1

5 files changed, 27 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd81beb7357b..8c974ac7835b 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 = 2
+	pkgver = 3.3.1
+	pkgrel = 1
 	url = http://www.unix-ag.uni-kl.de/~bloch/acng/
 	install = apt-cacher-ng.install
 	arch = i686
@@ -17,13 +17,13 @@ pkgbase = apt-cacher-ng
 	depends = libwrap
 	depends = libevent
 	backup = etc/apt-cacher-ng/acng.conf
-	source = http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.3.orig.tar.xz
+	source = http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.3.1.orig.tar.xz
 	source = acng.conf.patch
 	source = apt-cacher-ng.service.patch
 	source = apt-cacher-ng.tmpfile
-	md5sums = 8f9f99056e3e9969c4ce570611cb5216
-	md5sums = 060f1278f9446437cc70da335cd24b19
-	md5sums = 9645bdcd30a6b0ddc956c2a48c7a27ff
+	md5sums = cc673b249a72562969089512e85396d6
+	md5sums = 615f24677e35a346990c9a040293bb9a
+	md5sums = 814ce1d0820f1a42d6aab483a6961fc6
 	md5sums = 29979b8064ff52aa24017b42c37e6bfb
 
 pkgname = apt-cacher-ng
diff --git a/PKGBUILD b/PKGBUILD
index 41f2d6371ece..35933c306cde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 # Contributor: Christian Schwarz <me et cschwarz punkt com>
 
 pkgname=apt-cacher-ng
-pkgver=3.3
-pkgrel=2
+pkgver=3.3.1
+pkgrel=1
 pkgdesc="A caching proxy specialized for package files."
 url="http://www.unix-ag.uni-kl.de/~bloch/acng/"
 arch=('i686' 'x86_64' 'armv7h')
@@ -23,9 +23,9 @@ source=("http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${
 )
 
 backup=('etc/apt-cacher-ng/acng.conf')
-md5sums=('8f9f99056e3e9969c4ce570611cb5216' # package
-         '060f1278f9446437cc70da335cd24b19' # acng.conf.patch
-         '9645bdcd30a6b0ddc956c2a48c7a27ff' # apt-cacher-ng.service.patch
+md5sums=('cc673b249a72562969089512e85396d6' # package
+         '615f24677e35a346990c9a040293bb9a' # acng.conf.patch
+         '814ce1d0820f1a42d6aab483a6961fc6' # 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 04b2dff130f0..b96e0fe3dd87 100644
--- a/acng.conf.patch
+++ b/acng.conf.patch
@@ -1,15 +1,15 @@
---- 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 @@
+--- conf/acng.conf	2020-02-05 14:59:30.934092728 +0800
++++ conf/acng.conf.arch	2020-02-05 15:03:00.233717419 +0800
+@@ -92,7 +92,7 @@
  #
- # Default: not set, UNIX socket bridge is disabled.
+ # Default: /run/apt-cacher-ng/socket
  #
--# SocketPath:/var/run/apt-cacher-ng/socket
-+SocketPath:/run/apt-cacher-ng/socket
+-# 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,
-@@ -111,7 +111,7 @@
+@@ -112,7 +112,7 @@
  # Store the pid of the daemon process in the specified text file.
  # Default: disabled
  #
@@ -18,7 +18,7 @@
 
  # Forbid outgoing connections and work without an internet connection or
  # respond with 503 error where it's not possible.
-@@ -234,6 +234,7 @@
+@@ -235,6 +235,7 @@
  # To see examples of the expected syntax, run: apt-cacher-ng -p debug=1
  #
  # PfilePatternEx:
diff --git a/apt-cacher-ng.install b/apt-cacher-ng.install
index 0bb7402185d2..ae069e0b9a0b 100644
--- a/apt-cacher-ng.install
+++ b/apt-cacher-ng.install
@@ -1,5 +1,5 @@
 pre_install() {
-  groupadd apt-cacher-ng
+  groupadd -r apt-cacher-ng
   useradd -d /var/cache/apt-cacher-ng -g apt-cacher-ng -r -s /usr/bin/nologin apt-cacher-ng
 }
 
diff --git a/apt-cacher-ng.service.patch b/apt-cacher-ng.service.patch
index 4eb88cffa4c8..d712046c98aa 100644
--- a/apt-cacher-ng.service.patch
+++ b/apt-cacher-ng.service.patch
@@ -1,11 +1,11 @@
---- systemd/apt-cacher-ng.service	2014-10-20 22:44:16.000000000 +0200
-+++ systemd/apt-cacher-ng.service.arch	2014-11-03 12:55:24.633172795 +0100
-@@ -4,7 +4,7 @@
- 
+--- systemd/apt-cacher-ng.service	2020-02-05 15:20:30.368488828 +0800
++++ systemd/apt-cacher-ng.service.arch	2020-02-05 15:20:50.328452488 +0800
+@@ -9,7 +9,7 @@
+
  [Service]
  # the SocketPath option can be removed if the inetd bridge functionality is not needed
--ExecStart=/usr/sbin/apt-cacher-ng SocketPath=/run/apt-cacher-ng/socket -c /etc/apt-cacher-ng ForeGround=1
-+ExecStart=/usr/bin/apt-cacher-ng SocketPath=/run/apt-cacher-ng/socket -c /etc/apt-cacher-ng ForeGround=1
+-ExecStart=/usr/sbin/apt-cacher-ng -c "/etc/apt-cacher-ng" ForeGround=1
++ExecStart=/usr/bin/apt-cacher-ng -c "/etc/apt-cacher-ng" ForeGround=1
  User=apt-cacher-ng
  Group=apt-cacher-ng
- # this can be changed to notify if the support was enabled at build time
+ # This can be changed to notify if the support was enabled at build time