Bug#573878: netcfg: hurd-i386 Fixes

[Samuel Thibault]

Package: netcfg
Version: 1.52
Severity: important
Tags: patch

Hello,

Here is some fixes for netcfg on hurd-i386.

Samuel

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 
'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.33 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- 
Samuel Thibault <samuel.thiba...@fnac.net>
 RR> Ce que je cherche � d�montrer, c'est qu'il est injuste de faire
 RR> l'amalgame entre du bulk mail et du courrier non-solicit� tr�s cibl�
 un suppositoire non reclam�, meme tres bien cibl�, reste un suppositoire.
 -+-OS in : Guide du Neuneu d'Usenet - Plein le cul de la pub � neuneu -+-

--- debian/control.orig 2010-03-14 18:13:51.000000000 +0000
+++ debian/control      2010-03-14 18:07:18.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Joey Hess <jo...@debian.org>, Colin Watson <cjwat...@debian.org>, 
Christian Perrier <bubu...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.9.0), 
libdebconfclient0-dev (>= 0.46), libdebian-installer4-dev (>= 0.41), po-debconf 
(>= 0.5.0), libiw-dev (>= 27+28pre9) [!s390 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.9.0), 
libdebconfclient0-dev (>= 0.46), libdebian-installer4-dev (>= 0.41), po-debconf 
(>= 0.5.0), libiw-dev (>= 27+28pre9) [!s390 !kfreebsd-i386 !kfreebsd-amd64 
!hurd-i386]
 Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/netcfg
 
 Package: netcfg
--- static.c.orig       2010-03-14 18:11:43.000000000 +0000
+++ static.c    2010-03-14 18:13:38.000000000 +0000
@@ -274,12 +274,10 @@
     char ptr1[INET_ADDRSTRLEN];
     
 #ifdef __GNU__
-    /* I had to do something like this ? */
-    /*  di_exec_shell_log ("settrans /servers/socket/2 -fg");  */
-    di_exec_shell_log("settrans /servers/socket/2 --goaway");
+    di_exec_shell_log("settrans /servers/socket/2 -fg");
     snprintf(buf, sizeof(buf),
-             "settrans -fg /servers/socket/2 /hurd/pfinet --interface=%s 
--address=%s",
-             interface, inet_ntop (AF_INET, &ipaddress));
+             "settrans -fgap /servers/socket/2 /hurd/pfinet --interface=%s 
--address=%s",
+             interface, inet_ntop (AF_INET, &ipaddress, ptr1, sizeof (ptr1)));
     di_snprintfcat(buf, sizeof(buf), " --netmask=%s",
                    inet_ntop (AF_INET, &netmask, ptr1, sizeof (ptr1)));
     buf[sizeof(buf) - 1] = '\0';
--- dhcp.c.orig 2010-03-14 18:15:54.000000000 +0000
+++ dhcp.c      2010-03-14 18:16:31.000000000 +0000
@@ -453,6 +453,9 @@
                  * Set defaults for domain name and hostname
                  */
                 
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 63
+#endif
                 char buf[MAXHOSTNAMELEN + 1] = { 0 };
                 char *ptr = NULL;
                 FILE *d = NULL;