Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=abafb3f6d9d7d4429b28dd40976d2ca25d177dc5
commit abafb3f6d9d7d4429b28dd40976d2ca25d177dc5 Author: Christian Hamar alias krix <[EMAIL PROTECTED]> Date: Thu Aug 2 23:34:14 2007 +0200 dhcp-3.0.6-1-x86_64 * Version bump * Freshed up networkmanager patch - Deleted lease file check from the patch (that part in upstream now) diff --git a/source/network/dhcp/FrugalBuild b/source/network/dhcp/FrugalBuild index d055db6..a4ba3e9 100644 --- a/source/network/dhcp/FrugalBuild +++ b/source/network/dhcp/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: ~0.2 SBU +# Compiling Time: 0.30 SBU # Maintainer: AlexExtreme <[EMAIL PROTECTED]> pkgname=dhcp -pkgver=3.0.5 +pkgver=3.0.6 pkgrel=1 pkgdesc="The ISC DHCP server" url="http://www.isc.org/sw/dhcp/"; @@ -14,12 +14,12 @@ backup=('etc/dhcpd.conf') up2date="lynx -dump $url |grep dhcp-[0-9] |sed -ne 's/.*p-\(.*\).t.*/\1/;1 p'" source=(ftp://ftp.isc.org/isc/$pkgname/$pkgname-$pkgver.tar.gz \ rc.dhcpd rc.dhcpd-hu.po README.Frugalware $pkgname-3.0.4-networkmanager-fixes.patch dhclient.conf) -sha1sums=('6501ba0e3dbd83ff57d3274538c4e4a1848ffc64' \ - '78b0defcc0dbdc85b947bdf9c0037b0530358a32' \ - 'fd70ba41e16c15d69529eeb216be103e042f3437' \ - '0aa3103883d0df5d9aa56defb39b22966af35a60' \ - 'ff249ec72b41dc0050348feb2aa205a63a857f6f' \ - 'ce6545dad5c371b269da8f689f6d3599feefc4da') +sha1sums=('204e509580d57d0cfff23529274612ca8c710efb' \ + '78b0defcc0dbdc85b947bdf9c0037b0530358a32' \ + 'fd70ba41e16c15d69529eeb216be103e042f3437' \ + '0510d9057df9dcf1c476961930f0ac65f7de87f9' \ + '2540c8bbef1d67e1e21ef8ce291cfe7bb85ec4d7' \ + 'ce6545dad5c371b269da8f689f6d3599feefc4da') subpkgs=('dhclient') subdescs=('The ISC DHCP client') subgroups=('network') diff --git a/source/network/dhcp/dhcp-3.0.4-networkmanager-fixes.patch b/source/network/dhcp/dhcp-3.0.4-networkmanager-fixes.patch index e25c820..5614bdd 100644 --- a/source/network/dhcp/dhcp-3.0.4-networkmanager-fixes.patch +++ b/source/network/dhcp/dhcp-3.0.4-networkmanager-fixes.patch @@ -78,7 +78,7 @@ diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c "[-s server]"); log_error (" [-cf config-file] [-lf lease-file]%s", "[-pf pid-file] [-e VAR=val]"); -@@ -869,7 +886,7 @@ +@@ -867,7 +884,7 @@ /* If the BOUND/RENEW code detects another machine using the offered address, it exits nonzero. We need to send a DHCPDECLINE and toss the lease. */ @@ -87,7 +87,7 @@ diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c make_decline (client, client -> new); send_decline (client); destroy_client_lease (client -> new); -@@ -2433,8 +2450,28 @@ +@@ -2447,8 +2464,28 @@ struct envadd_state { struct client_state *client; const char *prefix; @@ -116,7 +116,7 @@ diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c void client_option_envadd (struct option_cache *oc, struct packet *packet, struct lease *lease, struct client_state *client_state, -@@ -2451,6 +2488,31 @@ +@@ -2465,6 +2502,31 @@ in_options, cfg_options, scope, oc, MDL)) { if (data.len) { char name [256]; @@ -148,7 +148,7 @@ diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c if (dhcp_option_ev_name (name, sizeof name, oc -> option)) { client_envadd (es -> client, es -> prefix, -@@ -2479,6 +2541,7 @@ +@@ -2493,6 +2555,7 @@ es.client = client; es.prefix = prefix; @@ -156,21 +156,7 @@ diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c client_envadd (client, prefix, "ip_address", "%s", piaddr (lease -> address)); -@@ -2607,6 +2670,13 @@ - wstatus = 0; - } - } else { -+ /* -+ We don't want to pass an open file descriptor for -+ dhclient.leases when executing dhclient-script. -+ Debian bug #147582 -+ */ -+ if (leaseFile) -+ fclose (leaseFile); - execve (scriptName, argv, envp); - log_error ("execve (%s, ...): %m", scriptName); - exit (0); -@@ -2690,7 +2760,14 @@ +@@ -2709,7 +2772,14 @@ s = option -> name; if (j + 1 == buflen) return 0; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
