[Frugalware-darcs] frugalware-current: frugalwareutils-0.6.6-1-i686

[VMiklos]

Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061029223553-e2957-7aa705d2350a8af4099fa63f3026fcf28cd42be1.gz;

[frugalwareutils-0.6.6-1-i686
VMiklos <vmiklos at frugalware.org>**20061029223553
 version bump
] {
hunk ./source/base/frugalwareutils/20060908180509-46e39-08f4f59293e9432c55e023318259bd352ded8312.patch 1
-Fri Sep  8 20:05:09 CEST 2006  AlexExtreme <alex at alex-smith.me.uk>
-  * libfwnetconfig: reverted to dhcpcd as dhcp client, dhclient isn't working right and we need this to work flawlessly for 0.5 ;)
-diff -rN -u old-frugalwareutils/libfwnetconfig/libfwnetconfig.c new-frugalwareutils/libfwnetconfig/libfwnetconfig.c
---- old-frugalwareutils/libfwnetconfig/libfwnetconfig.c	2006-09-08 19:34:24.000000000 +0200
-+++ new-frugalwareutils/libfwnetconfig/libfwnetconfig.c	2006-09-08 19:34:25.000000000 +0200
-@@ -229,10 +229,10 @@
- 	if(dhcp)
- 	{
- 		char line[7];
--		if (!strcmp("dhcpcd", iface->dhcpclient)) {
--			ptr = g_strdup_printf("/etc/dhcpc/dhcpcd-%s.pid", iface->name);
--		} else
-+		if (!strcmp("dhclient", iface->dhcpclient)) {
- 			ptr = g_strdup_printf("/var/run/dhclient-%s.pid", iface->name);
-+		} else
-+			ptr = g_strdup_printf("/etc/dhcpc/dhcpcd-%s.pid", iface->name);
- 		fp = fopen(ptr, "r");
- 		FWUTIL_FREE(ptr);
- 		if(fp != NULL)
-@@ -245,8 +245,8 @@
- 			else if (i>0)
- 				printf("kill(%d, 15);\n", i);
- 			
--			// if we're not using dhcpcd...
--			if (strcmp("dhcpcd", iface->dhcpclient)) {
-+			// if we're using dhclient...
-+			if (!strcmp("dhclient", iface->dhcpclient)) {
- 				ptr = g_strdup_printf("ifconfig %s down", iface->name);
- 				fwutil_system(ptr);
- 				FWUTIL_FREE(ptr);
-@@ -376,13 +376,13 @@
- 	// set up the interface
- 	if(dhcp)
- 	{
--		if (!strcmp(iface->dhcpclient, "dhcpcd"))
-+		if (!strcmp(iface->dhcpclient, "dhclient"))
-+			ptr = g_strdup_printf("dhclient -pf /var/run/dhclient-%s.pid -lf /var/lib/dhclient/dhclient-%s.leases -q %s", iface->name, iface->name, iface->name);
-+		else {
- 			if(strlen(iface->dhcp_opts))
- 				ptr = g_strdup_printf("dhcpcd %s %s", iface->dhcp_opts, iface->name);
- 			else
- 				ptr = g_strdup_printf("dhcpcd -t 10 %s", iface->name);
--		else {
--			ptr = g_strdup_printf("dhclient -pf /var/run/dhclient-%s.pid -lf /var/lib/dhclient/dhclient-%s.leases -q %s", iface->name, iface->name, iface->name);
- 		}
- 		
- 		ret += fwutil_system(ptr);
-
rmfile ./source/base/frugalwareutils/20060908180509-46e39-08f4f59293e9432c55e023318259bd352ded8312.patch
hunk ./source/base/frugalwareutils/20060908180914-46e39-c174f32d71c8f09c8e607d25635d60c59ee3f3a1.patch 1
-Fri Sep  8 20:09:14 CEST 2006  AlexExtreme <alex at alex-smith.me.uk>
-  * netconfig: forgot to change docs accordingly
-diff -rN -u old-frugalwareutils/netconfig/doc/netconfig.5 new-frugalwareutils/netconfig/doc/netconfig.5
---- old-frugalwareutils/netconfig/doc/netconfig.5	2006-09-08 19:38:07.000000000 +0200
-+++ new-frugalwareutils/netconfig/doc/netconfig.5	2006-09-08 19:38:07.000000000 +0200
-@@ -100,7 +100,7 @@
- specify here the dhcp hostname, then you'll need "-t 10 -h <hostname>".
- .TP
- .B "dhcpclient = <dhcp client>"
--This specifies the dhcp client to use. It can be either dhcpcd or dhclient (default).
-+This specifies the dhcp client to use. It can be either dhcpcd (default) or dhclient.
- .SH AUTHORS
- Written by Miklos Vajna.
- .SH "REPORTING BUGS"
-
rmfile ./source/base/frugalwareutils/20060908180914-46e39-c174f32d71c8f09c8e607d25635d60c59ee3f3a1.patch
hunk ./source/base/frugalwareutils/FrugalBuild 5
-pkgver=0.6.5
-pkgrel=3
+pkgver=0.6.6
+pkgrel=1
hunk ./source/base/frugalwareutils/FrugalBuild 14
-source=($url/$pkgname-$pkgver.tar.gz \
-	20060908180509-46e39-08f4f59293e9432c55e023318259bd352ded8312.patch \
-	20060908180914-46e39-c174f32d71c8f09c8e607d25635d60c59ee3f3a1.patch)
-signatures=(${source[0]}.asc '' '')
+source=($url/$pkgname-$pkgver.tar.gz)
+signatures=(${source[0]}.asc)
}