The upstream code had some bugfixes.

2 files changed, 23 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a54da418b7e7..cb7fffb44544 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Feb  2 10:34:11 UTC 2016
+# Sun Feb 14 11:34:58 UTC 2016
 pkgbase = wwwoffle-svn
 	pkgdesc = Simple caching proxy server with special features (request, recursive fetch, ...) for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd.
-	pkgver = 2.9j.r2202
-	pkgrel = 2
+	pkgver = 2.9j.r2210
+	pkgrel = 1
 	url = http://www.gedanken.org.uk/software/wwwoffle/
 	install = wwwoffle.install
 	arch = i686
@@ -14,18 +14,18 @@ pkgbase = wwwoffle-svn
 	depends = zlib
 	depends = gnutls
 	depends = libgcrypt
-	provides = wwwoffle=2.9j.r2202
-	provides = wwwoffle-sysvinit=2.9j.r2202
-	provides = wwwoffle-openrc=2.9j.r2202
-	provides = wwwoffle-systemd=2.9j.r2202
+	provides = wwwoffle=2.9j.r2210
+	provides = wwwoffle-sysvinit=2.9j.r2210
+	provides = wwwoffle-openrc=2.9j.r2210
+	provides = wwwoffle-systemd=2.9j.r2210
 	conflicts = wwwoffle
 	conflicts = wwwoffle-sysvinit
 	conflicts = wwwoffle-openrc
 	conflicts = wwwoffle-systemd
-	replaces = wwwoffle<=2.9j.r2202
-	replaces = wwwoffle-sysvinit<=2.9j.r2202
-	replaces = wwwoffle-openrc<=2.9j.r2202
-	replaces = wwwoffle-systemd<=2.9j.r2202
+	replaces = wwwoffle<=2.9j.r2210
+	replaces = wwwoffle-sysvinit<=2.9j.r2210
+	replaces = wwwoffle-openrc<=2.9j.r2210
+	replaces = wwwoffle-systemd<=2.9j.r2210
 	backup = etc/wwwoffle/wwwoffle.conf
 	source = wwwoffle::svn+http://gedanken.org.uk/svn/wwwoffle/trunk
 	source = conf_d_wwwoffle
diff --git a/PKGBUILD b/PKGBUILD
index 5543c4ee5368..5afaf5a57299 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 _pkgname=wwwoffle
 pkgname="${_pkgname}-svn"
 # _pkgver=2.9i
-pkgver=2.9j.r2202
-pkgrel=2
+pkgver=2.9j.r2210
+pkgrel=1
 pkgdesc="Simple caching proxy server with special features (request, recursive fetch, ...) for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd."
 arch=('i686' 'x86_64' 'arm' 'arm64')
 url="http://www.gedanken.org.uk/software/wwwoffle/"
@@ -59,7 +59,6 @@ sha256sums=(
 
 _pgmver() {
   _unpackeddir="${srcdir}/${_pkgname}"
-  
   # Well, this _is_ useless use of cat, but to make it more clear to see in which order things are going on I do the cat first and then the grep.
   _ver="$(cat "${_unpackeddir}/conf/wwwoffle.conf.template" | \
             grep -E '^#.*WWWOFFLE.*[Vv]ersion' | \
@@ -76,7 +75,6 @@ _pgmver() {
 
 _svnrelease() {
   _unpackeddir="${srcdir}/${_pkgname}"
-  
   _rev="$(svn info "${_unpackeddir}" | grep '^Revision' | cut -d' ' -f2)"
   
   echo "${_rev}"
@@ -87,10 +85,8 @@ _svnrelease() {
 }
 
 pkgver() {
-  # Format: RELEASE.rREVISION, e.g. 2.9j.r2202
-  
   _unpackeddir="${srcdir}/${_pkgname}"
-  
+  # Format: RELEASE.rREVISION, e.g. 2.9j.r2202
   _ver="$(_pgmver)"
   _rev="$(_svnrelease)"
   
@@ -111,6 +107,15 @@ pkgver() {
   echo "${_ver}.r${_rev}"
 }
 
+prepare() {
+  _unpackeddir="${srcdir}/${_pkgname}"
+  cd "${_unpackeddir}"
+  find "${srcdir}"/*.patch -xtype f 2>/dev/null | while read _patch; do
+    msg "Applying patch '${_patch}' ..."
+    patch -p1 < "${_patch}" || exit "$?"
+  done
+}
+
 build() {
   _unpackeddir="${srcdir}/${_pkgname}"
   cd "${_unpackeddir}"