summaryrefslogtreecommitdiff
path: root/dhcp
diff options
context:
space:
mode:
authorThomas Penteker <tek@serverop.de>2013-04-05 13:03:12 +0200
committerThomas Penteker <tek@serverop.de>2013-04-05 13:03:12 +0200
commit53b367529521d92ca14ae91dbc65b0be52fd8ff3 (patch)
tree13618d7149150d8cea945107db9e6acfc5290122 /dhcp
parentb6c27a1eea3b7f49aec5abb4ba3c2eb70c5b00d0 (diff)
downloadcontrib-53b367529521d92ca14ae91dbc65b0be52fd8ff3.tar.gz
contrib-53b367529521d92ca14ae91dbc65b0be52fd8ff3.tar.xz
dhcp: 4.2.4-P2 -> 4.2.5-P1
Diffstat (limited to 'dhcp')
-rw-r--r--dhcp/.md5sum4
-rw-r--r--dhcp/Pkgfile4
-rw-r--r--dhcp/default-config.diff12
3 files changed, 11 insertions, 9 deletions
diff --git a/dhcp/.md5sum b/dhcp/.md5sum
index e0ef1daa3..4652d7724 100644
--- a/dhcp/.md5sum
+++ b/dhcp/.md5sum
@@ -1,4 +1,4 @@
-456711bbb2c8fc8b6e0df7c9a514c237 default-config.diff
+157549658aba092b0d26aa1df3943051 default-config.diff
2c0abf8990ab061accefc5d3d0f655d1 dhclient
-fe36056f2d274fa4b82a5422f192e65f dhcp-4.2.4-P2.tar.gz
+f68e3c1f00a9af5742bc5e71d567cf93 dhcp-4.2.5-P1.tar.gz
51665125f8360c6cc1ef59ad6cd8cf84 dhcpd
diff --git a/dhcp/Pkgfile b/dhcp/Pkgfile
index e406a4aae..6f2346cf1 100644
--- a/dhcp/Pkgfile
+++ b/dhcp/Pkgfile
@@ -4,7 +4,7 @@
# Packager: Mark Rosenstand, mark at borkware dot net
name=dhcp
-version=4.2.4-P2
+version=4.2.5-P1
release=1
source=(http://ftp.isc.org/isc/$name/$version/$name-$version.tar.gz dhcpd \
dhclient default-config.diff)
@@ -25,4 +25,6 @@ build() {
install -d -m 0755 $PKG/var/db
touch $PKG/var/state/dhcp/dhcpd.leases
install -D -m 755 $SRC/dhcp-$version/client/scripts/linux $PKG/sbin/dhclient-script
+ mv $PKG/etc/dhclient.conf.example $PKG/etc/dhclient.conf
+ mv $PKG/etc/dhcpd.conf.example $PKG/etc/dhcpd.conf
}
diff --git a/dhcp/default-config.diff b/dhcp/default-config.diff
index 192bb5306..b3b101c47 100644
--- a/dhcp/default-config.diff
+++ b/dhcp/default-config.diff
@@ -1,6 +1,6 @@
-diff -ur dhcp-4.0.0.orig/client/dhclient.conf dhcp-4.0.0/client/dhclient.conf
---- dhcp-4.0.0.orig/client/dhclient.conf 1997-06-03 00:50:44.000000000 +0200
-+++ dhcp-4.0.0/client/dhclient.conf 2008-02-23 23:49:14.538607761 +0100
+diff -ur dhcp-4.0.0.orig/client/dhclient.conf.example dhcp-4.0.0/client/dhclient.conf.example
+--- dhcp-4.0.0.orig/client/dhclient.conf.example 1997-06-03 00:50:44.000000000 +0200
++++ dhcp-4.0.0/client/dhclient.conf.example 2008-02-23 23:49:14.538607761 +0100
@@ -1,3 +1,7 @@
+#
+# /etc/dhclient.conf: DHCP client configuration file, see dhclient.conf(5)
@@ -24,9 +24,9 @@ diff -ur dhcp-4.0.0.orig/client/dhclient.conf dhcp-4.0.0/client/dhclient.conf
}
+
+# End of file
-diff -ur dhcp-4.0.0.orig/server/dhcpd.conf dhcp-4.0.0/server/dhcpd.conf
---- dhcp-4.0.0.orig/server/dhcpd.conf 2002-08-13 02:55:17.000000000 +0200
-+++ dhcp-4.0.0/server/dhcpd.conf 2008-02-23 23:50:52.132354533 +0100
+diff -ur dhcp-4.0.0.orig/server/dhcpd.conf.example dhcp-4.0.0/server/dhcpd.conf.example
+--- dhcp-4.0.0.orig/server/dhcpd.conf.example 2002-08-13 02:55:17.000000000 +0200
++++ dhcp-4.0.0/server/dhcpd.conf.example 2008-02-23 23:50:52.132354533 +0100
@@ -1,11 +1,11 @@
-# dhcpd.conf
#

Generated by cgit