[arch-commits] Commit in dhcpcd/repos (3 files)

[Ronald van Haren]

    Date: Monday, February 1, 2010 @ 10:15:21
  Author: ronald
Revision: 66797

fix svn merge error

Modified:
  dhcpcd/repos/testing-x86_64/	(properties)
  dhcpcd/repos/testing-x86_64/PKGBUILD
Deleted:
  dhcpcd/repos/testing-x86_64/fs17838.patch

---------------+
 PKGBUILD      |   11 +++++------
 fs17838.patch |   17 -----------------
 2 files changed, 5 insertions(+), 23 deletions(-)


Property changes on: dhcpcd/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /dhcpcd/trunk:1-65264
   + /dhcpcd/trunk:1-66796

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2010-02-01 15:12:58 UTC (rev 66796)
+++ testing-x86_64/PKGBUILD	2010-02-01 15:15:21 UTC (rev 66797)
@@ -4,7 +4,7 @@
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.1.5git20100127
+pkgver=5.1.5
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
@@ -14,14 +14,13 @@
 depends=('glibc' 'sh')
 backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
-#"http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
-source=(http://dev.archlinux.org/~ronald/source/$pkgname-$pkgver.tar.bz2
+source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
         'dhcpcd.conf.d')
-md5sums=('25a587e64f3cbbbfe820fa9a9db99311'
+md5sums=('a0b917dfd03b6416386bca06dd219d9b'
          '372d33485556982b64a97f301e17c5dd')
 
 build() {
-  cd ${srcdir}/${pkgname}
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   # configure variables
   ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
@@ -39,7 +38,7 @@
 
   # Install License
   install -d $pkgdir/usr/share/licenses/$pkgname || return 1
-  awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}/configure.h \
+  awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
 	>> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
 
   # Set Options in /etc/dhcpcd.conf

Deleted: testing-x86_64/fs17838.patch
===================================================================
--- testing-x86_64/fs17838.patch	2010-02-01 15:12:58 UTC (rev 66796)
+++ testing-x86_64/fs17838.patch	2010-02-01 15:15:21 UTC (rev 66797)
@@ -1,17 +0,0 @@
-Index: dhcpcd.c
-===================================================================
---- a/dhcpcd.c
-+++ b/dhcpcd.c
-@@ -404,4 +404,5 @@
-         if (iface->addr.s_addr == 0) {
-                 /* We failed to reboot, so enter discovery. */
-+                iface->state->lease.addr.s_addr = 0;
-                 start_discover(iface);
-                 return;
-@@ -1167,4 +1168,6 @@
-                             now.tv_sec - st.st_mtime)
-                         {
-+                                syslog(LOG_DEBUG,
-+                                    "%s: discarding expired lease", iface->name);
-                                 free(iface->state->offer);
-                                 iface->state->offer = NULL;