NetBSD Problem Report #33067

From oishi@alef.ims.ac.jp  Mon Mar 13 03:55:43 2006
Return-Path: <oishi@alef.ims.ac.jp>
Received: from alef.ims.ac.jp (alef.ims.ac.jp [133.48.153.110])
	by narn.netbsd.org (Postfix) with ESMTP id 7FC6363B863
	for <gnats-bugs@gnats.NetBSD.org>; Mon, 13 Mar 2006 03:55:43 +0000 (UTC)
Message-Id: <200603131258.k2DCwIpF001172@alef.ims.ac.jp>
Date: Mon, 13 Mar 2006 12:58:18 GMT
From: Osamu OISHI <oishi@alef.ims.ac.jp>
Reply-To: oishi@ims.ac.jp
To: gnats-bugs@netbsd.org
Subject: patches of misc/fd
X-Send-Pr-Version: 3.95

>Number:         33067
>Category:       pkg
>Synopsis:       misc/fd cannot be compiled on NetBSD-3.0.
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    taca
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 13 04:00:00 +0000 2006
>Closed-Date:    Wed Dec 20 15:26:02 +0000 2006
>Last-Modified:  Wed Dec 20 15:26:02 +0000 2006
>Originator:     Osamu OISHI
>Release:        NetBSD 2.0
>Organization:

>Environment:


System: NetBSD alef.ims.ac.jp 2.0 NetBSD 2.0 (alef) #2: Fri Apr 15 18:15:17 UTC 2005 root@alef.ims.ac.jp:/usr/src/sys/arch/i386/compile/alef i386
Architecture: i386
Machine: i386
>Description:
Since the description of "statfs" in /usr/include/sys/mount.h was changed, 
misc/fd cannot be compiled on NetBSD-3.0. 
Therefore, patch-ab and patch-ac were added. 

change files: patches/patch-ab, patches/patch-ac, distinfo

diff -Nur fd.orig/distinfo fd/distinfo
--- fd.orig/distinfo	2005-02-24 11:02:51.000000000 +0000
+++ fd/distinfo	2006-03-11 08:49:18.000000000 +0000
@@ -4,3 +4,5 @@
 RMD160 (FD-1.03u.tar.gz) = 943a706dc64c81397c71babe7eab332341b3cc09
 Size (FD-1.03u.tar.gz) = 340097 bytes
 SHA1 (patch-aa) = 7877fcbf53da90e6d10fa57e3c6f55c761e9f11c
+SHA1 (patch-ab) = 874fd3b374b808710feed6d335985ae419774005
+SHA1 (patch-ac) = 5fe721e63dc2ed51df659b2a6f705fb595f16aef
diff -Nur fd.orig/patches/patch-ab fd/patches/patch-ab
--- fd.orig/patches/patch-ab	1970-01-01 00:00:00.000000000 +0000
+++ fd/patches/patch-ab	2006-03-13 12:28:55.000000000 +0000
@@ -0,0 +1,60 @@
+$NetBSD:$
+--- info.c.orig	2001-12-18 00:00:00.000000000 +0900
++++ info.c	2006-03-11 17:42:36.000000000 +0900
+@@ -10,6 +10,7 @@
+ #include "funcno.h"
+ #include "kctype.h"
+ #include "kanji.h"
++#include "machine.h"
+ 
+ #ifdef	NOERRNO
+ extern int errno;
+@@ -144,7 +145,11 @@
+ 
+ #ifdef	USEMOUNTH
+ #include <sys/mount.h>
++#if defined(__LIBC12_SOURCE__)
++typedef struct statfs12	statfs_t;
++#else
+ typedef struct statfs	statfs_t;
++#endif
+ #define	blocksize(fs)	(fs).f_bsize
+ #endif	/* USEMOUNTH */
+ 
+@@ -480,7 +485,11 @@
+ static FILE *NEAR setmntent(file, mode)
+ char *file, *mode;
+ {
++#if defined(__LIBC12_SOURCE__)
++	struct statfs12 *buf;
++#else
+ 	struct statfs *buf;
++#endif
+ 	int size;
+ 
+ 	buf = NULL;
+@@ -512,7 +521,11 @@
+ 	static char *fsname = NULL;
+ 	static char *dir = NULL;
+ 	static char *type = NULL;
++#if defined(__LIBC12_SOURCE__)
++	struct statfs12 *buf;
++#else
+ 	struct statfs *buf;
++#endif
+ #ifdef	USEMNTINFO
+ # ifdef	USEVFCNAME
+ 	struct vfsconf *conf;
+@@ -541,7 +554,11 @@
+ 	int len;
+ 
+ 	if (mnt_ptr >= mnt_size) return(NULL);
+-	buf = (struct statfs *)fp;
++#if defined(__LIBC12_SOURCE__)
++	buf = (struct statfs12 *)fp;
++#else
++	buf = (struct statfs12 *)fp;
++#endif
+ 
+ 	len = strlen(buf[mnt_ptr].f_mntfromname) + 1;
+ 	fsname = realloc2(fsname, len);
diff -Nur fd.orig/patches/patch-ac fd/patches/patch-ac
--- fd.orig/patches/patch-ac	1970-01-01 00:00:00.000000000 +0000
+++ fd/patches/patch-ac	2006-03-13 12:29:08.000000000 +0000
@@ -0,0 +1,13 @@
+$NetBSD:$
+--- machine.h.orig	2006-03-11 12:24:23.000000000 +0900
++++ machine.h	2006-03-11 12:25:17.000000000 +0900
+@@ -503,6 +503,9 @@
+ #define	GETPGRPVOID
+ #define	USESETPGID
+ #define	SIGFNCINT
+ #include <sys/param.h>
++#if		(__NetBSD_Version__ >= 300000000)
++#define	__LIBC12_SOURCE__
++#endif
+ # if	defined (NetBSD1_0) && (NetBSD1_0 < 1)
+ # define	USEFFSIZE

>How-To-Repeat:

>Fix:


>Release-Note:

>Audit-Trail:
From: Takahiro Kambe <taca@back-street.net>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/33067: patches of misc/fd
Date: Mon, 13 Mar 2006 17:50:57 +0900 (JST)

 In message <20060313040001.0FEDD63B8C3@narn.netbsd.org>
 	on Mon, 13 Mar 2006 04:00:01 +0000 (UTC),
 	Osamu OISHI <oishi@alef.ims.ac.jp> wrote:
 > >Description:
 > Since the description of "statfs" in /usr/include/sys/mount.h was changed, 
 > misc/fd cannot be compiled on NetBSD-3.0. 
 There is a newer version 2.08a which supports NetBSD 3.0.

 -- 
 Takahiro Kambe <taca@back-street.net>

From: Osamu OISHI <oishi@ims.ac.jp>
To: gnats-bugs@netbsd.org
Cc: pkg-manager@netbsd.org, gnats-admin@netbsd.org,
	pkgsrc-bugs@netbsd.org
Subject: Re: pkg/33067: patches of misc/fd
Date: Mon, 13 Mar 2006 19:19:08 +0900

 Takahiro Kambe wrote:
 >  > >Description:
 >  > Since the description of "statfs" in /usr/include/sys/mount.h was changed,
 >  > misc/fd cannot be compiled on NetBSD-3.0.
 >  There is a newer version 2.08a which supports NetBSD 3.0.
 I think that FD-1.xx and FD-2.xx are functionally different quite.
 The executed states (top) of 1.03u and 2.08a are as follows. 
  5484 oishi      2    0   780K 1148K RUN        0:00  0.00%  0.00% fd2
  5485 oishi      2    0   388K  884K RUN        0:00  0.00%  0.00% fd

 (After fd-2 had been opened to the public, fd-1 was used in pkgsrc, 
  though four years had passed up since fd-2 was opened.)

From: Takahiro Kambe <taca@back-street.net>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/33067: patches of misc/fd
Date: Mon, 13 Mar 2006 22:52:50 +0900 (JST)

 In message <20060313111503.D1E1863B863@narn.netbsd.org>
 	on Mon, 13 Mar 2006 11:15:03 +0000 (UTC),
 	Osamu OISHI <oishi@ims.ac.jp> wrote:
 >  >  > >Description:
 >  >  > Since the description of "statfs" in /usr/include/sys/mount.h was changed,
 >  >  > misc/fd cannot be compiled on NetBSD-3.0.
 >  >  There is a newer version 2.08a which supports NetBSD 3.0.
 >  I think that FD-1.xx and FD-2.xx are functionally different quite.
 Yes, sure.  FD-1.xx is file management utility, but FD-2.xx is a kind
 of shell program.  FreeBSD's ports put FD to "shell" category.

 But is there any reason to keep FD-1.xx?  I don't use neither, so
 I might not understand the situation.

 -- 
 Takahiro Kambe <taca@back-street.net>

From: Osamu OISHI <oishi@ims.ac.jp>
To: gnats-bugs@netbsd.org
Cc: pkg-manager@netbsd.org, gnats-admin@netbsd.org,
	pkgsrc-bugs@netbsd.org
Subject: Re: pkg/33067: patches of misc/fd
Date: Thu, 16 Mar 2006 13:08:43 +0900

 Takahiro Kambe wrote:
 >  But is there any reason to keep FD-1.xx?  I don't use neither, so
 >  I might not understand the situation.
 I am using FD in the following situations. 
 1.It is a program that is smaller than tcsh, 
   and there is a purpose to use an equal function 
   at the installation and the restoration of system.
 2.In the environment of the embeded systems to which the resource is limited,
   it is used with the serial console. 
   (The capacity of RAM is 16Mbyte - 64Mbyte. )
 --
 Osamu OISHI

From: Takahiro Kambe <taca@back-street.net>
To: oishi@ims.ac.jp
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/33067: patches of misc/fd
Date: Thu, 16 Mar 2006 13:54:06 +0900 (JST)

 In message <20060316041003.7E3B863B8C2@narn.netbsd.org>
 	on Thu, 16 Mar 2006 04:10:03 +0000 (UTC),
 	Osamu OISHI <oishi@ims.ac.jp> wrote:
 >  Takahiro Kambe wrote:
 >  >  But is there any reason to keep FD-1.xx?  I don't use neither, so
 >  >  I might not understand the situation.
 >  I am using FD in the following situations. 
 >  1.It is a program that is smaller than tcsh, 
 >    and there is a purpose to use an equal function 
 >    at the installation and the restoration of system.
 >  2.In the environment of the embeded systems to which the resource is limited,
 >    it is used with the serial console. 
 >    (The capacity of RAM is 16Mbyte - 64Mbyte. )
 I see.  Then FD-2.xx should be imported as separete package as
 shells/fd2 or shells/fd.  Anyway, pkgsrc freeze begins now, I'll check
 this PR.

 -- 
 Takahiro Kambe <taca@back-street.net>

Responsible-Changed-From-To: pkg-manager->taca
Responsible-Changed-By: taca@netbsd.org
Responsible-Changed-When: Thu, 30 Nov 2006 04:13:59 +0000
Responsible-Changed-Why:
I'll take it.


From: Takahiro Kambe <taca@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: PR/33067 CVS commit: pkgsrc/misc/fd
Date: Wed,  6 Dec 2006 15:36:32 +0000 (UTC)

 Module Name:	pkgsrc
 Committed By:	taca
 Date:		Wed Dec  6 15:36:32 UTC 2006

 Modified Files:
 	pkgsrc/misc/fd: DESCR Makefile PLIST distinfo
 	pkgsrc/misc/fd/patches: patch-aa
 Added Files:
 	pkgsrc/misc/fd: PLIST.common_end options.mk
 	pkgsrc/misc/fd/patches: patch-ae
 Removed Files:
 	pkgsrc/misc/fd: MESSAGE

 Log Message:
 Update FD utility to 2.09a.

 FD 2.09a has many improvement for functionality and portability from
 previous 1.03u.  And it has a built-in Bourne-shell compatible shell
 and also runs stand-alone shell under the name of 'fdsh', too.

 And fd-small PKG_OPTION will build smaller and FD 1.x compatible
 binary.

 Fixed PR pkg/33067.


 To generate a diff of this commit:
 cvs rdiff -r1.2 -r1.3 pkgsrc/misc/fd/DESCR
 cvs rdiff -r1.3 -r0 pkgsrc/misc/fd/MESSAGE
 cvs rdiff -r1.22 -r1.23 pkgsrc/misc/fd/Makefile
 cvs rdiff -r1.1 -r1.2 pkgsrc/misc/fd/PLIST
 cvs rdiff -r0 -r1.1 pkgsrc/misc/fd/PLIST.common_end pkgsrc/misc/fd/options.mk
 cvs rdiff -r1.6 -r1.7 pkgsrc/misc/fd/distinfo
 cvs rdiff -r1.5 -r1.6 pkgsrc/misc/fd/patches/patch-aa
 cvs rdiff -r0 -r1.1 pkgsrc/misc/fd/patches/patch-ae

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->feedback
State-Changed-By: taca@netbsd.org
State-Changed-When: Wed, 06 Dec 2006 15:42:20 +0000
State-Changed-Why:
I've updated to latest release.


State-Changed-From-To: feedback->closed
State-Changed-By: taca@netbsd.org
State-Changed-When: Wed, 20 Dec 2006 15:26:02 +0000
State-Changed-Why:
Submitter reports the problem has solved.


>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.