Hi, On Tue, Jul 13, 2004 at 12:26:12AM -0500, Branden Robinson wrote: > On Mon, Jul 12, 2004 at 02:04:34AM +0200, Michael Banck wrote: > > It would be nice if hurd-i386 could be back on line with the next > > upload. > > Yes it would. > > I glanced over your patch and it looks fine. I'll take a closer look > before committing. I've made another patch against current svn. It's much smaller now, thanks to Branden's resyncing. Defining libpng and groff in gnu.cf results in some stuff getting built, so MANIFEST.hurd-i386.all is obsolete now and the diff between MANIFEST.i386.in and MANIFEST.hurd-i386.in only includes stuff like DRI, glide and so on. I'm no PAM guru, so I don't know about that change (I've seen Branden has marked it as TODO on top of #800), but I merged that back from my intial diff and the build was fine (I did not try building without 'define PamLibraries'). Changing the cpp command line is only needed for k*BSD AFAIK, but it does not hurt to sync that with linux.cf as well. #803 and #804 are needed to properly build on GNU and are taken out of Robert Millan's k*BSD tree. I've attached the updated fix. It applies and debian/rules setup runs throught fine. Note that I did not include the diff to remove MANIFEST.hurd-i386.all in order to not bloat it unnecessary. That file should just be removed. I can resend the full diff if necessary. cheers, Michael
diff -Naur debian/MANIFEST.hurd-i386.in debian.new/MANIFEST.hurd-i386.in
--- debian/MANIFEST.hurd-i386.in 2004-07-28 13:27:31.000000000 +0200
+++ debian.new/MANIFEST.hurd-i386.in 2004-07-28 13:26:16.000000000 +0200
@@ -505,6 +505,7 @@
usr/X11R6/bin/xclock
usr/X11R6/bin/xcmsdb
usr/X11R6/bin/xconsole
+usr/X11R6/bin/xcursorgen
usr/X11R6/bin/xcutsel
usr/X11R6/bin/xditview
usr/X11R6/bin/xdm
@@ -1142,6 +1143,131 @@
usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
usr/X11R6/lib/X11/fonts/util/map-KOI8-R
+usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
+usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
+usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
+usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_left_corner
+usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_right_corner
+usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_side
+usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_tee
+usr/X11R6/lib/X11/icons/handhelds/cursors/center_ptr
+usr/X11R6/lib/X11/icons/handhelds/cursors/circle
+usr/X11R6/lib/X11/icons/handhelds/cursors/cross
+usr/X11R6/lib/X11/icons/handhelds/cursors/dot
+usr/X11R6/lib/X11/icons/handhelds/cursors/dotbox
+usr/X11R6/lib/X11/icons/handhelds/cursors/double_arrow
+usr/X11R6/lib/X11/icons/handhelds/cursors/draped_box
+usr/X11R6/lib/X11/icons/handhelds/cursors/fleur
+usr/X11R6/lib/X11/icons/handhelds/cursors/gumby
+usr/X11R6/lib/X11/icons/handhelds/cursors/hand2
+usr/X11R6/lib/X11/icons/handhelds/cursors/left_ptr
+usr/X11R6/lib/X11/icons/handhelds/cursors/left_ptr_watch
+usr/X11R6/lib/X11/icons/handhelds/cursors/left_side
+usr/X11R6/lib/X11/icons/handhelds/cursors/left_tee
+usr/X11R6/lib/X11/icons/handhelds/cursors/ll_angle
+usr/X11R6/lib/X11/icons/handhelds/cursors/pencil
+usr/X11R6/lib/X11/icons/handhelds/cursors/right_ptr
+usr/X11R6/lib/X11/icons/handhelds/cursors/right_side
+usr/X11R6/lib/X11/icons/handhelds/cursors/right_tee
+usr/X11R6/lib/X11/icons/handhelds/cursors/sb_h_double_arrow
+usr/X11R6/lib/X11/icons/handhelds/cursors/sb_right_arrow
+usr/X11R6/lib/X11/icons/handhelds/cursors/sb_up_arrow
+usr/X11R6/lib/X11/icons/handhelds/cursors/sb_v_double_arrow
+usr/X11R6/lib/X11/icons/handhelds/cursors/shuttle
+usr/X11R6/lib/X11/icons/handhelds/cursors/top_left_corner
+usr/X11R6/lib/X11/icons/handhelds/cursors/top_right_corner
+usr/X11R6/lib/X11/icons/handhelds/cursors/top_side
+usr/X11R6/lib/X11/icons/handhelds/cursors/top_tee
+usr/X11R6/lib/X11/icons/handhelds/cursors/watch
+usr/X11R6/lib/X11/icons/handhelds/cursors/xterm
+usr/X11R6/lib/X11/icons/redglass/cursors/X_cursor
+usr/X11R6/lib/X11/icons/redglass/cursors/based_arrow_down
+usr/X11R6/lib/X11/icons/redglass/cursors/based_arrow_up
+usr/X11R6/lib/X11/icons/redglass/cursors/bottom_left_corner
+usr/X11R6/lib/X11/icons/redglass/cursors/bottom_right_corner
+usr/X11R6/lib/X11/icons/redglass/cursors/bottom_side
+usr/X11R6/lib/X11/icons/redglass/cursors/bottom_tee
+usr/X11R6/lib/X11/icons/redglass/cursors/center_ptr
+usr/X11R6/lib/X11/icons/redglass/cursors/circle
+usr/X11R6/lib/X11/icons/redglass/cursors/cross
+usr/X11R6/lib/X11/icons/redglass/cursors/dot
+usr/X11R6/lib/X11/icons/redglass/cursors/dotbox
+usr/X11R6/lib/X11/icons/redglass/cursors/double_arrow
+usr/X11R6/lib/X11/icons/redglass/cursors/draped_box
+usr/X11R6/lib/X11/icons/redglass/cursors/fleur
+usr/X11R6/lib/X11/icons/redglass/cursors/gumby
+usr/X11R6/lib/X11/icons/redglass/cursors/hand2
+usr/X11R6/lib/X11/icons/redglass/cursors/left_ptr
+usr/X11R6/lib/X11/icons/redglass/cursors/left_ptr_watch
+usr/X11R6/lib/X11/icons/redglass/cursors/left_side
+usr/X11R6/lib/X11/icons/redglass/cursors/left_tee
+usr/X11R6/lib/X11/icons/redglass/cursors/ll_angle
+usr/X11R6/lib/X11/icons/redglass/cursors/pencil
+usr/X11R6/lib/X11/icons/redglass/cursors/right_ptr
+usr/X11R6/lib/X11/icons/redglass/cursors/right_side
+usr/X11R6/lib/X11/icons/redglass/cursors/right_tee
+usr/X11R6/lib/X11/icons/redglass/cursors/sb_h_double_arrow
+usr/X11R6/lib/X11/icons/redglass/cursors/sb_right_arrow
+usr/X11R6/lib/X11/icons/redglass/cursors/sb_up_arrow
+usr/X11R6/lib/X11/icons/redglass/cursors/sb_v_double_arrow
+usr/X11R6/lib/X11/icons/redglass/cursors/shuttle
+usr/X11R6/lib/X11/icons/redglass/cursors/top_left_corner
+usr/X11R6/lib/X11/icons/redglass/cursors/top_right_corner
+usr/X11R6/lib/X11/icons/redglass/cursors/top_side
+usr/X11R6/lib/X11/icons/redglass/cursors/top_tee
+usr/X11R6/lib/X11/icons/redglass/cursors/watch
+usr/X11R6/lib/X11/icons/redglass/cursors/xterm
+usr/X11R6/lib/X11/icons/whiteglass/cursors/X_cursor
+usr/X11R6/lib/X11/icons/whiteglass/cursors/base_arrow_down
+usr/X11R6/lib/X11/icons/whiteglass/cursors/base_arrow_up
+usr/X11R6/lib/X11/icons/whiteglass/cursors/boat
+usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_left_corner
+usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_right_corner
+usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_side
+usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_tee
+usr/X11R6/lib/X11/icons/whiteglass/cursors/center_ptr
+usr/X11R6/lib/X11/icons/whiteglass/cursors/circle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/cross
+usr/X11R6/lib/X11/icons/whiteglass/cursors/dot
+usr/X11R6/lib/X11/icons/whiteglass/cursors/dot_box_mask
+usr/X11R6/lib/X11/icons/whiteglass/cursors/double_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/draped_box
+usr/X11R6/lib/X11/icons/whiteglass/cursors/exchange
+usr/X11R6/lib/X11/icons/whiteglass/cursors/fleur
+usr/X11R6/lib/X11/icons/whiteglass/cursors/gumby
+usr/X11R6/lib/X11/icons/whiteglass/cursors/hand1
+usr/X11R6/lib/X11/icons/whiteglass/cursors/hand2
+usr/X11R6/lib/X11/icons/whiteglass/cursors/left_ptr
+usr/X11R6/lib/X11/icons/whiteglass/cursors/left_ptr_watch
+usr/X11R6/lib/X11/icons/whiteglass/cursors/left_side
+usr/X11R6/lib/X11/icons/whiteglass/cursors/left_tee
+usr/X11R6/lib/X11/icons/whiteglass/cursors/ll_angle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/lr_angle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/pencil
+usr/X11R6/lib/X11/icons/whiteglass/cursors/pirate
+usr/X11R6/lib/X11/icons/whiteglass/cursors/question_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/right_ptr
+usr/X11R6/lib/X11/icons/whiteglass/cursors/right_side
+usr/X11R6/lib/X11/icons/whiteglass/cursors/right_tee
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sailboat
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_down_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_h_double_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_left_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_right_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_up_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_v_double_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/shuttle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sizing
+usr/X11R6/lib/X11/icons/whiteglass/cursors/target
+usr/X11R6/lib/X11/icons/whiteglass/cursors/top_left_corner
+usr/X11R6/lib/X11/icons/whiteglass/cursors/top_right_corner
+usr/X11R6/lib/X11/icons/whiteglass/cursors/top_side
+usr/X11R6/lib/X11/icons/whiteglass/cursors/top_tee
+usr/X11R6/lib/X11/icons/whiteglass/cursors/trek
+usr/X11R6/lib/X11/icons/whiteglass/cursors/ul_angle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/ur_angle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/watch
+usr/X11R6/lib/X11/icons/whiteglass/cursors/xterm
usr/X11R6/lib/X11/locale/C/XI18N_OBJS
usr/X11R6/lib/X11/locale/C/XLC_LOCALE
usr/X11R6/lib/X11/locale/armscii-8/Compose
@@ -1590,6 +1716,7 @@
usr/X11R6/man/man1/xclock.1x
usr/X11R6/man/man1/xcmsdb.1x
usr/X11R6/man/man1/xconsole.1x
+usr/X11R6/man/man1/xcursorgen.1x
usr/X11R6/man/man1/xcutsel.1x
usr/X11R6/man/man1/xditview.1x
usr/X11R6/man/man1/xdm.1x
diff -Naur debian/patches/800_gnu_config.diff debian.new/patches/800_gnu_config.diff
--- debian/patches/800_gnu_config.diff 2004-07-28 13:28:43.000000000 +0200
+++ debian.new/patches/800_gnu_config.diff 2004-07-27 21:48:54.000000000 +0200
@@ -1,4 +1,4 @@
-$Id: 800_gnu_config.diff 1681 2004-07-21 19:20:49Z branden $
+$Id$
Add Debian-specific configuration to gnu.cf (mostly derived from linux.cf).
@@ -13,8 +13,8 @@
# define HasKatmaiSupport NO
#endif
---- xc/config/cf/gnu.cf~ 2004-07-21 01:21:38.000000000 -0500
-+++ xc/config/cf/gnu.cf 2004-07-21 01:29:06.000000000 -0500
+--- xc/config/cf/gnu.cf~ 2004-07-27 13:17:07.000000000 +0200
++++ xc/config/cf/gnu.cf 2004-07-27 17:14:26.000000000 +0200
@@ -18,6 +18,154 @@
#endif
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
@@ -170,3 +170,44 @@
#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
-D_POSIX_SOURCE -D_XOPEN_SOURCE \
-D_BSD_SOURCE -D_SVID_SOURCE
+@@ -66,6 +214,14 @@
+ #define HasNCurses YES
+ #endif
+
++#ifndef HasGroff
++#define HasGroff YES
++#endif
++
++#ifndef HasLibpng
++#define HasLibpng YES
++#endif
++
+ #define AvoidNullMakeCommand YES
+ #ifndef DebuggableLibraries
+ #define DebuggableLibraries NO
+@@ -108,8 +264,8 @@
+ #ifndef DoLoadableServer
+ #define DoLoadableServer YES
+ #endif
+-#ifndef
+-#define CppCmd /lib/cpp
++#ifndef CppCmd
++#define CppCmd /usr/bin/cpp
+ #endif
+ #define YaccCmd bison -y
+ #define LexCmd flex -l
+@@ -144,6 +300,14 @@
+
+ #define ServerExtraSysLibs /**/
+
++#ifndef PamLibraries
++#define PamLibraries -lpam DlLibrary
++#endif
++
++#ifndef PamMiscLibraries
++#define PamMiscLibraries -lpam_misc
++#endif
++
+ #define ConnectionFlags -DUNIXCONN -DTCPCONN
+
+ #ifndef StaticLibrary
diff -Naur debian/patches/803_gnu_xterm_openpty.diff debian.new/patches/803_gnu_xterm_openpty.diff
--- debian/patches/803_gnu_xterm_openpty.diff 1970-01-01 01:00:00.000000000 +0100
+++ debian.new/patches/803_gnu_xterm_openpty.diff 2004-07-27 19:03:23.000000000 +0200
@@ -0,0 +1,13 @@
+
+ on Glibc-based systems, openpty needs -lutil
+
+--- xc/programs/xterm/Imakefile~ 2004-03-15 01:22:17.000000000 +0100
++++ xc/programs/xterm/Imakefile 2004-03-15 02:01:31.000000000 +0100
+@@ -58,6 +58,7 @@
+ #endif
+
+ #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
++ defined(GNUArchitecture) || \
+ (defined(LinuxArchitecture) && \
+ (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
+ PTYLIB = -lutil
diff -Naur debian/patches/804_gnu_xdm.diff debian.new/patches/804_gnu_xdm.diff
--- debian/patches/804_gnu_xdm.diff 1970-01-01 01:00:00.000000000 +0100
+++ debian.new/patches/804_gnu_xdm.diff 2004-07-27 19:03:23.000000000 +0200
@@ -0,0 +1,92 @@
+
+ merged upstream (4.4)
+
+diff -ur xc/programs/xdm.old/chooser.c xc/programs/xdm/chooser.c
+--- xc/programs/xdm.old/chooser.c 2003-11-29 16:07:50.000000000 +0100
++++ xc/programs/xdm/chooser.c 2003-11-29 16:11:30.000000000 +0100
+@@ -130,9 +130,7 @@
+ # include <sync/queue.h>
+ # include <sync/sema.h>
+ #endif
+-#ifndef __GNU__
+-# include <net/if.h>
+-#endif /* __GNU__ */
++#include <net/if.h>
+ #endif /* hpux */
+
+ #include <netdb.h>
+@@ -550,8 +548,6 @@
+ * addresses on the local host.
+ */
+
+-#if !defined(__GNU__)
+-
+ /* Handle variable length ifreq in BNR2 and later */
+ #ifdef VARIABLE_IFREQ
+ #define ifr_size(p) (sizeof (struct ifreq) + \
+@@ -712,53 +708,6 @@
+ QUERY);
+ }
+ }
+-#else /* __GNU__ */
+-static void
+-RegisterHostname (char *name)
+-{
+- struct hostent *hostent;
+- struct sockaddr_in in_addr;
+-
+- if (!strcmp (name, BROADCAST_HOSTNAME))
+- {
+- in_addr.sin_addr.s_addr= htonl(0xFFFFFFFF);
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- BROADCAST_QUERY);
+- }
+- else
+- {
+-
+- /* address as hex string, e.g., "12180022" (deprecated) */
+- if (strlen(name) == 8 &&
+- FromHex(name, (char *)&in_addr.sin_addr, strlen(name)) == 0)
+- {
+- in_addr.sin_family = AF_INET;
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- QUERY);
+- } else {
+- /* Per RFC 1123, check first for IP address in dotted-decimal form */
+- else if ((in_addr.sin_addr.s_addr = inet_addr(name)) != -1)
+- in_addr.sin_family = AF_INET;
+- else
+- {
+- hostent = gethostbyname (name);
+- if (!hostent)
+- return;
+- if (hostent->h_addrtype != AF_INET || hostent->h_length != 4)
+- return;
+- in_addr.sin_family = hostent->h_addrtype;
+- memmove( &in_addr.sin_addr, hostent->h_addr, 4);
+- }
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- QUERY);
+- }
+-
+- }
+-}
+-#endif /* __GNU__ */
+
+ static ARRAYofARRAY8 AuthenticationNames;
+
+diff -ur xc/programs/xdm.old/config/Imakefile xc/programs/xdm/config/Imakefile
+--- xc/programs/xdm.old/config/Imakefile 2003-11-29 16:07:56.000000000 +0100
++++ xc/programs/xdm/config/Imakefile 2003-11-29 16:09:08.000000000 +0100
+@@ -9,7 +9,7 @@
+
+ all:: Xservers.ws xdm-config Xservers Xresources
+
+-#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture))
++#if defined(i386Architecture) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture))
+ DEFAULTVT=vt05
+ #endif
+
Attachment:
signature.asc
Description: Digital signature