Date: Friday, November 4, 2011 @ 02:51:06
Author: ronald
Revision: 142023
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
dhcpcd/repos/testing-i686/PKGBUILD
(from rev 142022, dhcpcd/trunk/PKGBUILD)
dhcpcd/repos/testing-i686/dhcpcd.conf.d
(from rev 142022, dhcpcd/trunk/dhcpcd.conf.d)
dhcpcd/repos/testing-i686/remove_ifconfig.patch
(from rev 142022, dhcpcd/trunk/remove_ifconfig.patch)
dhcpcd/repos/testing-x86_64/PKGBUILD
(from rev 142022, dhcpcd/trunk/PKGBUILD)
dhcpcd/repos/testing-x86_64/dhcpcd.conf.d
(from rev 142022, dhcpcd/trunk/dhcpcd.conf.d)
dhcpcd/repos/testing-x86_64/remove_ifconfig.patch
(from rev 142022, dhcpcd/trunk/remove_ifconfig.patch)
Deleted:
dhcpcd/repos/testing-i686/PKGBUILD
dhcpcd/repos/testing-i686/dhcpcd.conf.d
dhcpcd/repos/testing-x86_64/PKGBUILD
dhcpcd/repos/testing-x86_64/dhcpcd.conf.d
--------------------------------------+
testing-i686/PKGBUILD | 104 +++++++++++++++++----------------
testing-i686/dhcpcd.conf.d | 12 +--
testing-i686/remove_ifconfig.patch | 20 ++++++
testing-x86_64/PKGBUILD | 104 +++++++++++++++++----------------
testing-x86_64/dhcpcd.conf.d | 12 +--
testing-x86_64/remove_ifconfig.patch | 20 ++++++
6 files changed, 160 insertions(+), 112 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2011-11-04 06:49:33 UTC (rev 142022)
+++ testing-i686/PKGBUILD 2011-11-04 06:51:06 UTC (rev 142023)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tom Killian <tom.archlinux.org>
-# Contributor: Judd Vinet <jvinet.zeroflux.org>
-
-pkgname=dhcpcd
-pkgver=5.2.12
-pkgrel=2
-pkgdesc="RFC2131 compliant DHCP client daemon"
-url="http://roy.marples.name/dhcpcd/";
-arch=('i686' 'x86_64')
-license=('BSD')
-groups=('base')
-depends=('glibc' 'sh' 'inetutils' 'net-tools')
-backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
-options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
-source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"; \
- 'dhcpcd.conf.d')
-sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
- 'b67b9ce6a2faaca75fea356966a16be2283b7db0')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # configure variables
- ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
-
- # Build
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # Create Binary Symlink
- install -d ${pkgdir}/usr/sbin
- ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd
-
- # Install Configuration File used in /etc/rc.d/network
- install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
-
- # Install License
- install -d $pkgdir/usr/share/licenses/$pkgname
- awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
- >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
- # Set Options in /etc/dhcpcd.conf
- echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
-}
Copied: dhcpcd/repos/testing-i686/PKGBUILD (from rev 142022,
dhcpcd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-11-04 06:51:06 UTC (rev 142023)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Tom Killian <tom.archlinux.org>
+# Contributor: Judd Vinet <jvinet.zeroflux.org>
+
+pkgname=dhcpcd
+pkgver=5.2.12
+pkgrel=3
+pkgdesc="RFC2131 compliant DHCP client daemon"
+url="http://roy.marples.name/dhcpcd/";
+arch=('i686' 'x86_64')
+license=('BSD')
+groups=('base')
+depends=('glibc' 'sh' 'inetutils' 'iproute2')
+backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
+options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
+source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"; \
+ 'dhcpcd.conf.d' 'remove_ifconfig.patch')
+sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
+ 'b67b9ce6a2faaca75fea356966a16be2283b7db0'
+ 'de3e14a24b479b2832c6671ba12586444bd86ebe')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # remove ifconfig call but use ip (iproute2) instead
+ patch -Np0 -i ${srcdir}/remove_ifconfig.patch
+
+ # configure variables
+ ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
+
+ # Build
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # Create Binary Symlink
+ install -d ${pkgdir}/usr/sbin
+ ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd
+
+ # Install Configuration File used in /etc/rc.d/network
+ install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
+
+ # Install License
+ install -d $pkgdir/usr/share/licenses/$pkgname
+ awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
+ >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+ # Set Options in /etc/dhcpcd.conf
+ echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
+}
Deleted: testing-i686/dhcpcd.conf.d
===================================================================
--- testing-i686/dhcpcd.conf.d 2011-11-04 06:49:33 UTC (rev 142022)
+++ testing-i686/dhcpcd.conf.d 2011-11-04 06:51:06 UTC (rev 142023)
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP client daemon
-#
-
-DHCPCD_ARGS="-q"
-
Copied: dhcpcd/repos/testing-i686/dhcpcd.conf.d (from rev 142022,
dhcpcd/trunk/dhcpcd.conf.d)
===================================================================
--- testing-i686/dhcpcd.conf.d (rev 0)
+++ testing-i686/dhcpcd.conf.d 2011-11-04 06:51:06 UTC (rev 142023)
@@ -0,0 +1,6 @@
+#
+# Arguments to be passed to the DHCP client daemon
+#
+
+DHCPCD_ARGS="-q"
+
Copied: dhcpcd/repos/testing-i686/remove_ifconfig.patch (from rev 142022,
dhcpcd/trunk/remove_ifconfig.patch)
===================================================================
--- testing-i686/remove_ifconfig.patch (rev 0)
+++ testing-i686/remove_ifconfig.patch 2011-11-04 06:51:06 UTC (rev 142023)
@@ -0,0 +1,20 @@
+--- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100
++++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100
+@@ -7,7 +7,7 @@
+ elif [ -n "$new_interface_mtu" ] && $if_up; then
+ # The smalled MTU dhcpcd can work with is 576
+ if [ "$new_interface_mtu" -ge 576 ]; then
+- if ifconfig "$interface" mtu "$new_interface_mtu"; then
++ if ip link set "$interface" mtu "$new_interface_mtu"; then
+ syslog info "$interface: MTU set to $new_interface_mtu"
+ # Save the MTU so we can restore it later
+ if [ ! -e "$mtu_dir/$interface" ]; then
+@@ -21,7 +21,7 @@
+ # No MTU in this state, so restore the prior MTU
+ mtu=$(cat "$mtu_dir/$interface")
+ syslog info "$interface: MTU restored to $mtu"
+- ifconfig "$interface" mtu "$mtu"
++ ip link set "$interface" mtu "$new_interface_mtu"
+ rm "$mtu_dir/$interface"
+ fi
+ fi
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2011-11-04 06:49:33 UTC (rev 142022)
+++ testing-x86_64/PKGBUILD 2011-11-04 06:51:06 UTC (rev 142023)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tom Killian <tom.archlinux.org>
-# Contributor: Judd Vinet <jvinet.zeroflux.org>
-
-pkgname=dhcpcd
-pkgver=5.2.12
-pkgrel=2
-pkgdesc="RFC2131 compliant DHCP client daemon"
-url="http://roy.marples.name/dhcpcd/";
-arch=('i686' 'x86_64')
-license=('BSD')
-groups=('base')
-depends=('glibc' 'sh' 'inetutils' 'net-tools')
-backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
-options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
-source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"; \
- 'dhcpcd.conf.d')
-sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
- 'b67b9ce6a2faaca75fea356966a16be2283b7db0')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # configure variables
- ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
-
- # Build
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # Create Binary Symlink
- install -d ${pkgdir}/usr/sbin
- ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd
-
- # Install Configuration File used in /etc/rc.d/network
- install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
-
- # Install License
- install -d $pkgdir/usr/share/licenses/$pkgname
- awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
- >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
- # Set Options in /etc/dhcpcd.conf
- echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
-}
Copied: dhcpcd/repos/testing-x86_64/PKGBUILD (from rev 142022,
dhcpcd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-11-04 06:51:06 UTC (rev 142023)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Tom Killian <tom.archlinux.org>
+# Contributor: Judd Vinet <jvinet.zeroflux.org>
+
+pkgname=dhcpcd
+pkgver=5.2.12
+pkgrel=3
+pkgdesc="RFC2131 compliant DHCP client daemon"
+url="http://roy.marples.name/dhcpcd/";
+arch=('i686' 'x86_64')
+license=('BSD')
+groups=('base')
+depends=('glibc' 'sh' 'inetutils' 'iproute2')
+backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
+options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
+source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"; \
+ 'dhcpcd.conf.d' 'remove_ifconfig.patch')
+sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
+ 'b67b9ce6a2faaca75fea356966a16be2283b7db0'
+ 'de3e14a24b479b2832c6671ba12586444bd86ebe')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # remove ifconfig call but use ip (iproute2) instead
+ patch -Np0 -i ${srcdir}/remove_ifconfig.patch
+
+ # configure variables
+ ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
+
+ # Build
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # Create Binary Symlink
+ install -d ${pkgdir}/usr/sbin
+ ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd
+
+ # Install Configuration File used in /etc/rc.d/network
+ install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
+
+ # Install License
+ install -d $pkgdir/usr/share/licenses/$pkgname
+ awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
+ >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+ # Set Options in /etc/dhcpcd.conf
+ echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
+}
Deleted: testing-x86_64/dhcpcd.conf.d
===================================================================
--- testing-x86_64/dhcpcd.conf.d 2011-11-04 06:49:33 UTC (rev 142022)
+++ testing-x86_64/dhcpcd.conf.d 2011-11-04 06:51:06 UTC (rev 142023)
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP client daemon
-#
-
-DHCPCD_ARGS="-q"
-
Copied: dhcpcd/repos/testing-x86_64/dhcpcd.conf.d (from rev 142022,
dhcpcd/trunk/dhcpcd.conf.d)
===================================================================
--- testing-x86_64/dhcpcd.conf.d (rev 0)
+++ testing-x86_64/dhcpcd.conf.d 2011-11-04 06:51:06 UTC (rev 142023)
@@ -0,0 +1,6 @@
+#
+# Arguments to be passed to the DHCP client daemon
+#
+
+DHCPCD_ARGS="-q"
+
Copied: dhcpcd/repos/testing-x86_64/remove_ifconfig.patch (from rev 142022,
dhcpcd/trunk/remove_ifconfig.patch)
===================================================================
--- testing-x86_64/remove_ifconfig.patch (rev 0)
+++ testing-x86_64/remove_ifconfig.patch 2011-11-04 06:51:06 UTC (rev
142023)
@@ -0,0 +1,20 @@
+--- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100
++++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100
+@@ -7,7 +7,7 @@
+ elif [ -n "$new_interface_mtu" ] && $if_up; then
+ # The smalled MTU dhcpcd can work with is 576
+ if [ "$new_interface_mtu" -ge 576 ]; then
+- if ifconfig "$interface" mtu "$new_interface_mtu"; then
++ if ip link set "$interface" mtu "$new_interface_mtu"; then
+ syslog info "$interface: MTU set to $new_interface_mtu"
+ # Save the MTU so we can restore it later
+ if [ ! -e "$mtu_dir/$interface" ]; then
+@@ -21,7 +21,7 @@
+ # No MTU in this state, so restore the prior MTU
+ mtu=$(cat "$mtu_dir/$interface")
+ syslog info "$interface: MTU restored to $mtu"
+- ifconfig "$interface" mtu "$mtu"
++ ip link set "$interface" mtu "$new_interface_mtu"
+ rm "$mtu_dir/$interface"
+ fi
+ fi
