Update ddclient-git

Pull PKBUILD from the latest upstream. Make the build pass by removing
README.ssl references. Uncomment check() since it's passing currently.

4 files changed, 26 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38e0f1881845..98ee7f43033b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = ddclient-git
 	pkgdesc = Update dynamic DNS entries for accounts on many dynamic DNS services
-	pkgver = v3.10.0.r0.g3e2cb0a
+	pkgver = v3.10.0.r48.g841ffcb
 	pkgrel = 1
 	url = https://github.com/ddclient/ddclient
 	arch = any
 	license = GPL2
+	makedepends = git
 	depends = perl-io-socket-inet6
 	depends = perl-io-socket-ssl
 	depends = perl-digest-sha1
 	depends = net-tools
-	depends = perl-data-validate-ip
 	optdepends = smtp-forwarder: email support requires sendmail binary
 	provides = ddclient
 	conflicts = ddclient
 	backup = etc/ddclient/ddclient.conf
 	source = git+https://github.com/ddclient/ddclient.git
-	source = ddclient.service
-	sha256sums = SKIP
-	sha256sums = 6133eefbb4315ee2a7b24044ba9c2d5c4f9d19381eab8071415bf4dc73c1cf09
+	validpgpkeys = 53B26AEDC08246715E15504B236B6291555E8401
+	sha512sums = SKIP
 
 pkgname = ddclient-git
diff --git a/PKGBUILD b/PKGBUILD
index 57e2ac3c6ded..bcdf594acb25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,28 @@
 # Maintainer: Denton Liu <liu.denton@gmail.com>
 # Contributor: Johannes Löthberg <johannes@kyriasis.com>
+# Contributor: T.J. Townsend <blakkheim@archlinux.org>
 # Contributor: Jonathan Steel <jsteel at archlinux.org>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: David Rosenstrauch <darose@darose.net>
 
 pkgname=ddclient-git
 _gitname="${pkgname%-git}"
-pkgver=v3.10.0.r0.g3e2cb0a
+pkgver=v3.10.0.r48.g841ffcb
 pkgrel=1
-
 pkgdesc="Update dynamic DNS entries for accounts on many dynamic DNS services"
 url="https://github.com/ddclient/ddclient"
 arch=('any')
 license=('GPL2')
 provides=("$_gitname")
 conflicts=("$_gitname")
-
 backup=('etc/ddclient/ddclient.conf')
-
 depends=('perl-io-socket-inet6' 'perl-io-socket-ssl' 'perl-digest-sha1'
-         'net-tools' 'perl-data-validate-ip')
+         'net-tools')
+makedepends=('git')
 optdepends=('smtp-forwarder: email support requires sendmail binary')
-
-source=(git+https://github.com/ddclient/ddclient.git
-        ddclient.service)
-
-sha256sums=('SKIP'
-            '6133eefbb4315ee2a7b24044ba9c2d5c4f9d19381eab8071415bf4dc73c1cf09')
+source=("git+https://github.com/ddclient/ddclient.git")
+sha512sums=('SKIP')
+validpgpkeys=('53B26AEDC08246715E15504B236B6291555E8401') # Sandro Jäckel
 
 pkgver() {
   cd "$_gitname"
@@ -34,7 +30,7 @@ pkgver() {
 }
 
 build() {
-  cd ddclient
+  cd ${_gitname}
   ./autogen
   ./configure \
     --prefix=/usr \
@@ -44,27 +40,23 @@ build() {
 }
 
 check() {
-  cd ddclient
-  make check
+  cd ${_gitname}
+  make VERBOSE=1 check
 }
 
 package() {
   # hack so that we can merge in changes from upstream without changing all the
   # $pkgname to $_gitname
-  (
   pkgname="$_gitname"
 
-  cd ddclient
+  cd ${pkgname}
+  make DESTDIR="${pkgdir}" install
 
-  make DESTDIR="$pkgdir/" install
-  install -Dm644 "$srcdir"/ddclient.service "$pkgdir"/usr/lib/systemd/system/ddclient.service
+  install -Dm644 sample-etc_systemd.service "$pkgdir"/usr/lib/systemd/system/ddclient.service
+  install -d "$pkgdir"/var/cache/ddclient
 
   install -Dm644 README.cisco "$pkgdir"/usr/share/doc/ddclient/README.cisco
   install -Dm644 README.md "$pkgdir"/usr/share/doc/ddclient/README.md
-  install -Dm644 README.ssl "$pkgdir"/usr/share/doc/ddclient/README.ssl
-  install -Dm644 sample-etc_cron.d_ddclient "$pkgdir"/usr/share/doc/ddclient/sample-etc_cron.d_ddclient
   install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
   install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
-
-  )
 }
diff --git a/ddclient.service b/ddclient.service
deleted file mode 100644
index 0163f228bfc0..000000000000
--- a/ddclient.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Dynamic DNS Update Client
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/ddclient.pid
-ExecStart=/usr/bin/ddclient
-
-[Install]
-WantedBy=multi-user.target
diff --git a/update-branch.sh b/update-branch.sh
index aedb88d4837e..f089966cc905 100755
--- a/update-branch.sh
+++ b/update-branch.sh
@@ -7,12 +7,18 @@ LOCAL_BRANCH=upstream
 git fetch "$REMOTE_URL" "$REMOTE_BRANCH"
 git checkout -B "$LOCAL_BRANCH" FETCH_HEAD
 FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f --subdirectory-filter trunk \
-	--tree-filter 'git rm -rf keys; { makepkg --printsrcinfo && echo; } >.SRCINFO || rm .SRCINFO' \
+	--tree-filter '(makepkg --printsrcinfo; status=$?; echo; exit $status) >.SRCINFO || rm .SRCINFO' \
 	--commit-filter '
 		if [ -e .SRCINFO ]
 		then
 			git commit-tree "$@"
 		else
-			skip_commit "$@"
+			shift
+			while [ -n "$1" ]
+			do
+				shift
+				map "$1"
+				shift
+			done
 		fi'
 git checkout -