summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbrannon2012-03-14 20:00:12 +0000
committercbrannon2012-03-14 20:00:12 +0000
commit118e8fb5bfdbbabe0b3364ed846bbf501473d5c7 (patch)
treec2cc10a1acd6a21e3adeec703d0a60f98a84c022
parent77015db52df304fdba54b3836db62f9aa9d1078a (diff)
downloadaur-118e8fb5bfdbbabe0b3364ed846bbf501473d5c7.tar.gz
upgpkg: ddclient 3.8.1-3
Fix for FS#28718. ddclient used ifconfig -a to detect the IP address of an interface. I applied a patch so that it uses iproute2s git-svn-id: file:///srv/repos/svn-community/svn@67835 9fca08f4-af9d-4005-b8df-a31f2cc04f65
-rw-r--r--.SRCINFO4
-rw-r--r--ChangeLog4
-rw-r--r--PKGBUILD16
-rw-r--r--iproute2.patch29
4 files changed, 49 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fb06a13cc61..dc81e675b12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ddclient
pkgdesc = Update dynamic DNS entries for accounts on many dynamic DNS services.
pkgver = 3.8.1
- pkgrel = 2
+ pkgrel = 3
url = http://ddclient.sourceforge.net/
install = ddclient.install
arch = any
@@ -13,9 +13,11 @@ pkgbase = ddclient
source = http://downloads.sourceforge.net/sourceforge/ddclient/ddclient-3.8.1.tar.bz2
source = ddclient.rc
source = ddclient.conf.d
+ source = iproute2.patch
md5sums = 7fa417bc65f8f0e6ce78418a4f631988
md5sums = 10af4667b7269132b8f0cdfc26864d89
md5sums = b8f39c82827776da948b76ef83544d33
+ md5sums = e0c8a07e9b7a69e73cecd8626f16e8f0
pkgname = ddclient
diff --git a/ChangeLog b/ChangeLog
index ce428a8aee5..921d429e444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-12 Chris Brannon <chris@the-brannons.com>
+ * ddclient 3.8.1-3
+ Applied a patch to use iproute2, rather than net-tools.
+
2012-02-17 Chris Brannon <chris@the-brannons.com>
* ddclient 3.8.1-2
Signed package.
diff --git a/PKGBUILD b/PKGBUILD
index c39c05742b1..00d2bc39362 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=ddclient
pkgver=3.8.1
-pkgrel=2
+pkgrel=3
pkgdesc="Update dynamic DNS entries for accounts on many dynamic DNS services."
arch=('any')
url="http://ddclient.sourceforge.net/"
@@ -12,7 +12,16 @@ license=('GPL2')
depends=('perl' 'perl-io-socket-ssl')
backup=('etc/ddclient/ddclient.conf' 'etc/conf.d/ddclient')
install=ddclient.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 ddclient.rc ddclient.conf.d)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+ ddclient.rc
+ ddclient.conf.d
+ iproute2.patch)
+
+build() {
+ cd ${srcdir}/ddclient-${pkgver}
+
+ patch -p1 < "$srcdir/iproute2.patch"
+}
package() {
cd ${srcdir}/ddclient-${pkgver}
@@ -32,4 +41,5 @@ package() {
}
md5sums=('7fa417bc65f8f0e6ce78418a4f631988'
'10af4667b7269132b8f0cdfc26864d89'
- 'b8f39c82827776da948b76ef83544d33')
+ 'b8f39c82827776da948b76ef83544d33'
+ 'e0c8a07e9b7a69e73cecd8626f16e8f0')
diff --git a/iproute2.patch b/iproute2.patch
new file mode 100644
index 00000000000..76c81832599
--- /dev/null
+++ b/iproute2.patch
@@ -0,0 +1,29 @@
+--- a/ddclient.orig 2012-02-17 13:12:29.000000000 +0000
++++ b/ddclient 2012-02-27 13:03:02.357329432 +0000
+@@ -588,7 +588,7 @@
+ [ "ip", "=s", "-ip address : set the IP address to 'address'" ],
+ "",
+ [ "if", "=s", "-if interface : obtain IP address from 'interface'" ],
+- [ "if-skip", "=s", "-if-skip pattern : skip any IP addresses before 'pattern' in the output of ifconfig {if}" ],
++ [ "if-skip", "=s", "-if-skip pattern : skip any IP addresses before 'pattern' in the output of ip addr show {if}" ],
+ "",
+ [ "web", "=s", "-web provider|url : obtain IP address from provider's IP checking page" ],
+ [ "web-skip", "=s", "-web-skip pattern : skip any IP addresses before 'pattern' on the web provider|url" ],
+@@ -1316,7 +1316,7 @@
+
+ {
+ local $opt{'use'} = 'if';
+- foreach my $if (grep {/^[a-zA-Z]/} `ifconfig -a`) {
++ foreach my $if (grep {/^[a-zA-Z]/} `ip addr show`) {
+ $if =~ s/:?\s.*//is;
+ local $opt{'if'} = $if;
+ printf "use=if, if=%s address is %s\n", opt('if'), define(get_ip('if'), 'NOT FOUND');
+@@ -1937,7 +1937,7 @@
+
+ } elsif ($use eq 'if') {
+ $skip = opt('if-skip', $h) || '';
+- $reply = `ifconfig $arg 2> /dev/null`;
++ $reply = `ip addr show $arg 2> /dev/null`;
+ $reply = '' if $?;
+
+ } elsif ($use eq 'cmd') {