summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD23
-rwxr-xr-xupdate-branch.sh24
3 files changed, 48 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 928cdf769d63..b09f9d48270b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = ddclient
+pkgbase = ddclient-git
pkgdesc = Update dynamic DNS entries for accounts on many dynamic DNS services
- pkgver = 3.9.1
+ pkgver = v3.8.3.r317.g7a99919
pkgrel = 1
url = https://github.com/ddclient/ddclient
arch = any
@@ -11,11 +11,13 @@ pkgbase = ddclient
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 = https://github.com/ddclient/ddclient/archive/v3.9.1.tar.gz
+ source = git+https://github.com/ddclient/ddclient.git
source = ddclient.service
- sha512sums = a8a4d6cb94e4239a7b7b4fc7d9ebef703cbd6c45fc3394b644694a053b5b8aa8d109410b5b8b3676a5f30b18474d24c7feb16c65c30b28bd7d941d8a214b1346
- sha512sums = f2d1fe68fb6e358c15ca9bd2e2c4a8b26239607fa71ff2b9aa301a3f54d16c6858e81603e5c0638e89e3da85b7c77ebaca88d38882740a9a8a09e98b38e9b510
+ sha256sums = SKIP
+ sha256sums = 6133eefbb4315ee2a7b24044ba9c2d5c4f9d19381eab8071415bf4dc73c1cf09
-pkgname = ddclient
+pkgname = ddclient-git
diff --git a/PKGBUILD b/PKGBUILD
index a9f0d1440034..3f96fd4b9e43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,20 @@
-# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
+# Maintainer: Denton Liu <liu.denton@gmail.com>
+# Contributor: Johannes Löthberg <johannes@kyriasis.com>
# Contributor: Jonathan Steel <jsteel at archlinux.org>
# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
# Contributor: David Rosenstrauch <darose@darose.net>
-pkgname=ddclient
-pkgver=3.9.1
+pkgname=ddclient-git
+_gitname="${pkgname%-git}"
+pkgver=v3.8.3.r317.g7a99919
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')
@@ -18,14 +22,19 @@ depends=('perl-io-socket-inet6' 'perl-io-socket-ssl' 'perl-digest-sha1'
'net-tools' 'perl-data-validate-ip')
optdepends=('smtp-forwarder: email support requires sendmail binary')
-source=(https://github.com/ddclient/ddclient/archive/v$pkgver.tar.gz
+source=(git+https://github.com/ddclient/ddclient.git
ddclient.service)
-sha512sums=('a8a4d6cb94e4239a7b7b4fc7d9ebef703cbd6c45fc3394b644694a053b5b8aa8d109410b5b8b3676a5f30b18474d24c7feb16c65c30b28bd7d941d8a214b1346'
- 'f2d1fe68fb6e358c15ca9bd2e2c4a8b26239607fa71ff2b9aa301a3f54d16c6858e81603e5c0638e89e3da85b7c77ebaca88d38882740a9a8a09e98b38e9b510')
+sha256sums=('SKIP'
+ '6133eefbb4315ee2a7b24044ba9c2d5c4f9d19381eab8071415bf4dc73c1cf09')
+
+pkgver() {
+ cd "$_gitname"
+ git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
package() {
- cd ddclient-$pkgver
+ cd ddclient
install -Dm755 ddclient "$pkgdir"/usr/bin/$pkgname
install -Dm600 sample-etc_ddclient.conf "$pkgdir"/etc/ddclient/ddclient.conf
diff --git a/update-branch.sh b/update-branch.sh
new file mode 100755
index 000000000000..652469336e3e
--- /dev/null
+++ b/update-branch.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+REMOTE_URL=https://git.archlinux.org/svntogit/community.git
+REMOTE_BRANCH=packages/ddclient
+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 'makepkg --printsrcinfo > .SRCINFO || rm .SRCINFO' \
+ --commit-filter '
+ if [ -e .SRCINFO ]
+ then
+ git commit-tree "$@"
+ else
+ shift
+ while [ -n "$1" ]
+ do
+ shift
+ map "$1"
+ shift
+ done
+ fi'
+git checkout -