[arch-commits] Commit in dhcp/repos (4 files)
Daniel Isenmann
daniel at archlinux.org
Sun Jan 17 14:59:52 UTC 2010
Date: Sunday, January 17, 2010 @ 09:59:52
Author: daniel
Revision: 63460
Merged revisions 51490,53791,63447,63454 via svnmerge from
svn+ssh://daniel@gerolde.archlinux.org/srv/svn-packages/dhcp/trunk
........
r51490 | kevin | 2009-09-09 05:50:29 +0200 (Wed, 09 Sep 2009) | 2 lines
upgpkg: dhcp 4.1.0.p1-1
Updated version and added no ipv6 patch for x86_64
........
r53791 | roman | 2009-10-03 12:36:02 +0200 (Sat, 03 Oct 2009) | 3 lines
Fixed install file
........
r63447 | daniel | 2010-01-17 15:53:08 +0100 (Sun, 17 Jan 2010) | 2 lines
upgpkg: dhcp 4.1.0.p1-2
Merged PKGBUILD from dhclient and dhcp. Push dchlient to newest version.
........
r63454 | daniel | 2010-01-17 15:54:36 +0100 (Sun, 17 Jan 2010) | 1 line
needed patch
........
Added:
dhcp/repos/extra-i686/dhclient-script-pathFixes.patch
(from rev 63454, dhcp/trunk/dhclient-script-pathFixes.patch)
Modified:
dhcp/repos/extra-i686/ (properties)
dhcp/repos/extra-i686/PKGBUILD
dhcp/repos/extra-i686/dhcp.install
---------------------------------+
PKGBUILD | 60 ++++++++++++----
dhclient-script-pathFixes.patch | 139 ++++++++++++++++++++++++++++++++++++++
dhcp.install | 6 -
3 files changed, 186 insertions(+), 19 deletions(-)
Property changes on: dhcp/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /dhcp/trunk:1-46924
+ /dhcp/trunk:1-63454
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2010-01-17 14:59:46 UTC (rev 63459)
+++ extra-i686/PKGBUILD 2010-01-17 14:59:52 UTC (rev 63460)
@@ -1,41 +1,73 @@
# $Id$
# Maintainer: judd <jvinet at zeroflux.org>
-pkgname=dhcp
+pkgbase=dhcp
+pkgname=('dhcp'
+ 'dhclient')
# separate patch levels with a period to maintain proper versioning.
pkgver=4.1.0.p1
_pkgver=4.1.0p1
-pkgrel=1
-pkgdesc="A DHCP server, client, and relay agent"
-arch=(i686 x86_64)
+pkgrel=2
+arch=('i686' 'x86_64')
license=('custom:isc-dhcp')
url="https://www.isc.org/software/dhcp"
-depends=('openssl>=0.9.8a')
-backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
-install=dhcp.install
source=(http://ftp.isc.org/isc/${pkgname}/${pkgname}-${_pkgver}.tar.gz
-dhcpd dhcp.conf.d dhcp-4.1.0-missing-ipv6-not-fatal.patch)
-md5sums=('325ff8338c5a21f89d5304ac13ffebdf' 'df22cffa7d7415ece7bb025b7bf774dd'
- '49da3192e5c885e3c7d02f447c2dea5e' '401eb8819fc1d10fda3f8e02ad9fe421')
+dhcpd dhcp.conf.d dhcp-4.1.0-missing-ipv6-not-fatal.patch dhclient-script-pathFixes.patch)
+md5sums=('325ff8338c5a21f89d5304ac13ffebdf'
+ 'df22cffa7d7415ece7bb025b7bf774dd'
+ '49da3192e5c885e3c7d02f447c2dea5e'
+ 'edf327eabb82e54b1e9d80b2750134ed'
+ '4dbce386a6cb4fd7c8cebd4fb432b5db')
build() {
cd ${srcdir}/${pkgname}-${_pkgver}
# Define _GNU_SOURCE to fix IPV6.
sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure
# Make not having ipv6 non-fatal.
- patch -Np1 -i ${srcdir}/dhcp-4.1.0-missing-ipv6-not-fatal.patch
+ patch -Np0 -i ${srcdir}/dhcp-4.1.0-missing-ipv6-not-fatal.patch
./configure --prefix=/usr --sysconfdir=/etc \
--with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
--with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases
make || return 1
+}
+
+package_dhcp(){
+ pkgdesc="A DHCP server, client, and relay agent"
+ depends=('openssl>=0.9.8a')
+ backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
+ install=dhcp.install
+
+ cd ${srcdir}/${pkgname}-${_pkgver}
make DESTDIR=${pkgdir} install
-
install -D -m755 ${srcdir}/dhcpd ${pkgdir}/etc/rc.d/dhcpd
- install -D -m644 ${srcdir}/dhcp.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+ install -D -m644 ${srcdir}/dhcp.conf.d ${pkgdir}/etc/conf.d/${pkgbase}
mkdir -p ${pkgdir}/var/state/dhcp
rm -f ${pkgdir}/etc/dhclient.conf
rm -f ${pkgdir}/usr/sbin/dhclient
rm -f ${pkgdir}/usr/share/man/man{5,8}/dhclient*
+
# install licenses
- install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \
+ install -m644 -D ${srcdir}/${pkgbase}-${_pkgver}/LICENSE \
${pkgdir}/usr/share/licenses/dhcp/LICENSE
}
+
+package_dhclient(){
+
+ pkgdesc="dhclient is standalone client from the dhcp package"
+ depends=('bash')
+
+ cd ${srcdir}/${pkgname}-${_pkgver}/client/scripts
+ patch -Np1 -i ${srcdir}/dhclient-script-pathFixes.patch linux || return 1
+ cd ${srcdir}/${pkgname}-${_pkgver}/client
+ make DESTDIR=${pkgdir} install
+ install -m755 -d ${startdir}/pkg/var/lib/dhclient
+
+ #not needed after fresh install
+ rm -f ${pkgdir}/var/lib/dhclient/dhcpd.leases
+
+ # install dhclient linux script
+ install -m755 -D ${srcdir}/${pkgname}-${_pkgver}/client/scripts/linux \
+ ${pkgdir}/etc/dhclient-script
+ # install licenses
+ install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \
+ ${pkgdir}/usr/share/licenses/dhclient/LICENSE
+}
Copied: dhcp/repos/extra-i686/dhclient-script-pathFixes.patch (from rev 63454, dhcp/trunk/dhclient-script-pathFixes.patch)
===================================================================
--- extra-i686/dhclient-script-pathFixes.patch (rev 0)
+++ extra-i686/dhclient-script-pathFixes.patch 2010-01-17 14:59:52 UTC (rev 63460)
@@ -0,0 +1,139 @@
+--- linux 2008-05-23 15:56:07.000000000 +0200
++++ linux_new 2010-01-17 15:40:45.000000000 +0100
+@@ -8,7 +8,7 @@
+
+ # 0. This script is based on the netbsd script supplied with dhcp-970306.
+
+-# 1. ifconfig down apparently deletes all relevant routes and flushes
++# 1. /sbin/ifconfig down apparently deletes all relevant routes and flushes
+ # the arp cache, so this doesn't need to be done explicitly.
+
+ # 2. The alias address handling here has not been tested AT ALL.
+@@ -111,16 +111,16 @@
+ if [ x$reason = xPREINIT ]; then
+ if [ x$alias_ip_address != x ]; then
+ # Bring down alias interface. Its routes will disappear too.
+- ifconfig $interface:0- inet 0
++ /sbin/ifconfig $interface:0- inet 0
+ fi
+ if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
+ then
+- ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
++ /sbin/ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
+ broadcast 255.255.255.255 up
+- # Add route to make broadcast work. Do not omit netmask.
+- route add default dev $interface netmask 0.0.0.0
++ # Add /sbin/route to make broadcast work. Do not omit netmask.
++ /sbin/route add default dev $interface netmask 0.0.0.0
+ else
+- ifconfig $interface 0 up
++ /sbin/ifconfig $interface 0 up
+ fi
+
+ # We need to give the kernel some time to get the interface up.
+@@ -147,36 +147,36 @@
+ if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+ [ x$alias_ip_address != x$old_ip_address ]; then
+ # Possible new alias. Remove old alias.
+- ifconfig $interface:0- inet 0
++ /sbin/ifconfig $interface:0- inet 0
+ fi
+ if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+ # IP address changed. Bringing down the interface will delete all routes,
+ # and clear the ARP cache.
+- ifconfig $interface inet 0 down
++ /sbin/ifconfig $interface inet 0 down
+
+ fi
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+
+- ifconfig $interface inet $new_ip_address $new_subnet_arg \
++ /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ $new_broadcast_arg
+- # Add a network route to the computed network address.
++ # Add a network /sbin/route to the computed network address.
+ if [ $relmajor -lt 2 ] || \
+ ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+- route add -net $new_network_number $new_subnet_arg dev $interface
++ /sbin/route add -net $new_network_number $new_subnet_arg dev $interface
+ fi
+ for router in $new_routers; do
+ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+- route add -host $router dev $interface
++ /sbin/route add -host $router dev $interface
+ fi
+- route add default gw $router
++ /sbin/route add default gw $router
+ done
+ fi
+ if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+ then
+- ifconfig $interface:0- inet 0
+- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+- route add -host $alias_ip_address $interface:0
++ /sbin/ifconfig $interface:0- inet 0
++ /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
++ /sbin/route add -host $alias_ip_address $interface:0
+ fi
+ make_resolv_conf
+ exit_with_hooks 0
+@@ -186,46 +186,46 @@
+ || [ x$reason = xSTOP ]; then
+ if [ x$alias_ip_address != x ]; then
+ # Turn off alias interface.
+- ifconfig $interface:0- inet 0
++ /sbin/ifconfig $interface:0- inet 0
+ fi
+ if [ x$old_ip_address != x ]; then
+ # Shut down interface, which will delete routes and clear arp cache.
+- ifconfig $interface inet 0 down
++ /sbin/ifconfig $interface inet 0 down
+ fi
+ if [ x$alias_ip_address != x ]; then
+- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+- route add -host $alias_ip_address $interface:0
++ /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
++ /sbin/route add -host $alias_ip_address $interface:0
+ fi
+ exit_with_hooks 0
+ fi
+
+ if [ x$reason = xTIMEOUT ]; then
+ if [ x$alias_ip_address != x ]; then
+- ifconfig $interface:0- inet 0
++ /sbin/ifconfig $interface:0- inet 0
+ fi
+- ifconfig $interface inet $new_ip_address $new_subnet_arg \
++ /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ $new_broadcast_arg
+ set $new_routers
+ if ping -q -c 1 $1; then
+ if [ x$new_ip_address != x$alias_ip_address ] && \
+ [ x$alias_ip_address != x ]; then
+- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+- route add -host $alias_ip_address dev $interface:0
++ /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
++ /sbin/route add -host $alias_ip_address dev $interface:0
+ fi
+ if [ $relmajor -lt 2 ] || \
+ ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+- route add -net $new_network_number
++ /sbin/route add -net $new_network_number
+ fi
+ for router in $new_routers; do
+ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+- route add -host $router dev $interface
++ /sbin/route add -host $router dev $interface
+ fi
+- route add default gw $router
++ /sbin/route add default gw $router
+ done
+ make_resolv_conf
+ exit_with_hooks 0
+ fi
+- ifconfig $interface inet 0 down
++ /sbin/ifconfig $interface inet 0 down
+ exit_with_hooks 1
+ fi
+
Modified: extra-i686/dhcp.install
===================================================================
--- extra-i686/dhcp.install 2010-01-17 14:59:46 UTC (rev 63459)
+++ extra-i686/dhcp.install 2010-01-17 14:59:52 UTC (rev 63460)
@@ -1,7 +1,7 @@
# arg 1: the new package version
post_install() {
[ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases
- echo "If dhcpd doesn' start ensure the ipv6 kernel module is loaded."
+ echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded."
}
# arg 1: the new package version
@@ -9,7 +9,3 @@
post_upgrade() {
post_install $1
}
-
-op=$1
-shift
-$op $*
More information about the arch-commits
mailing list