NetBSD Problem Report #25642

Received: (qmail 12356 invoked by uid 605); 19 May 2004 15:53:38 -0000
Message-Id: <20040519155336.63D5B11157@narn.netbsd.org>
Date: Wed, 19 May 2004 15:53:36 +0000 (UTC)
From: yui@yui.pe.kr
Sender: gnats-bugs-owner@NetBSD.org
Reply-To: yui@yui.pe.kr
To: gnats-bugs@gnats.NetBSD.org
Subject: misc/gnuls is updated.
X-Send-Pr-Version: www-1.0

>Number:         25642
>Category:       pkg
>Synopsis:       misc/gnuls is updated.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed May 19 15:54:00 +0000 2004
>Closed-Date:    Wed May 19 16:57:26 +0000 2004
>Last-Modified:  Wed May 19 16:57:26 +0000 2004
>Originator:     Kibum Han
>Release:        2.0E
>Organization:
n/a
>Environment:
NetBSD caspar 2.0E NetBSD 2.0E (GENERIC) #1: Tue May  4 12:00:10 KST 2004  root@caspar:/usr/obj/sys/arch/i386/compile/GENERIC i386
>Description:
current misc/gnuls package is out-of-date, even not compiled
due to statfs->statvfs migration.

>How-To-Repeat:
In misc/gnuls directory, do 'make'.

>Fix:
the following patch
  1) updates version from 5.0 to 5.2.1
  2) adds 'misc' to CATEGORIES.
  3) fixes compile error (patch-ac file, which is copied from
                          sysutils/coreutils/patches/patch-ab.)


diff -buNr gnuls.orig/Makefile gnuls/Makefile
--- gnuls.orig/Makefile	2004-04-25 03:21:42.000000000 +0900
+++ gnuls/Makefile	2004-05-20 00:04:46.000000000 +0900
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.8 2004/04/24 18:21:42 snj Exp $
 #

-DISTNAME=	coreutils-5.0
+DISTNAME=	coreutils-5.2.1
 PKGNAME=	${DISTNAME:S/coreutils/gnuls/}
-CATEGORIES=	sysutils
+CATEGORIES=	sysutils misc
 MASTER_SITES=	${MASTER_SITE_GNU:=coreutils/}
 EXTRACT_SUFX=	.tar.bz2

diff -buNr gnuls.orig/distinfo gnuls/distinfo
--- gnuls.orig/distinfo	2004-02-12 08:00:52.000000000 +0900
+++ gnuls/distinfo	2004-05-19 23:52:22.000000000 +0900
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/11 23:00:52 jmmv Exp $
+$NetBSD$

-SHA1 (coreutils-5.0.tar.bz2) = ce67aacedfc917a92b5be62dd32095393c2f220c
-Size (coreutils-5.0.tar.bz2) = 3952653 bytes
-SHA1 (patch-aa) = c3f6def9f66fc3b680529cbdf72b14d9b5d25499
-SHA1 (patch-ab) = efbd6a22ae20bec21d112f39ffeb7434a04c8a8d
+SHA1 (coreutils-5.2.1.tar.bz2) = 1028755ae0fa9be840576e4837004cf5a9981c45
+Size (coreutils-5.2.1.tar.bz2) = 4270776 bytes
+SHA1 (patch-aa) = f0081127f70266b7978d92af9cdd32c3993672ee
+SHA1 (patch-ab) = 23a0f74a242bbf9d29344be117ccabc6dd13d164
+SHA1 (patch-ac) = a38174cf4c85cdddc23f3b59c7c04679c898c232
diff -buNr gnuls.orig/patches/patch-aa gnuls/patches/patch-aa
--- gnuls.orig/patches/patch-aa	2004-02-12 08:06:42.000000000 +0900
+++ gnuls/patches/patch-aa	2004-05-19 23:21:33.000000000 +0900
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2004/02/11 23:06:42 jmmv Exp $
+$NetBSD$

---- Makefile.in.orig	2003-04-02 16:28:41.000000000 +0200
+--- Makefile.in.orig    2004-03-11 17:57:59.000000000 +0900
 +++ Makefile.in
-@@ -149,7 +149,7 @@ sharedstatedir = @sharedstatedir@
+@@ -284,7 +284,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- 
 -SUBDIRS = lib src doc man m4 po tests
 +SUBDIRS = lib src
  EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
    .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
-   announce-gen \
+   .x-sc_space_tab .x-sc_sun_os_names \
diff -buNr gnuls.orig/patches/patch-ab gnuls/patches/patch-ab
--- gnuls.orig/patches/patch-ab	2004-02-12 08:00:52.000000000 +0900
+++ gnuls/patches/patch-ab	2004-05-19 23:48:07.000000000 +0900
@@ -1,24 +1,24 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/11 23:00:52 jmmv Exp $
+$NetBSD$

---- src/Makefile.in.orig	2003-04-02 16:46:19.000000000 +0200
+--- src/Makefile.in.orig	2004-03-11 17:59:23.000000000 +0900
 +++ src/Makefile.in
-@@ -267,7 +267,8 @@ BUILT_SOURCES = dircolors.h false.c whee
- # Tell automake to exempt it from that installcheck test.
- AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false
- 
+@@ -41,7 +41,8 @@ host_triplet = @host@
+ EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
+ 	nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
+ 	uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
+-bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
++bin_PROGRAMS = dircolors$(EXEEXT) ls$(EXEEXT)
++no_bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
+ 	cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
+ 	ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \
+ 	vdir$(EXEEXT) ls$(EXEEXT) mkdir$(EXEEXT) mkfifo$(EXEEXT) \
+@@ -899,7 +900,8 @@ wheel_size = 5
+ # Tell automake to exempt then from that installcheck test.
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false test
+ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 -all_programs = \
 +all_programs = $(bin_PROGRAMS)
 +no_all_programs = \
      $(bin_PROGRAMS) \
      $(bin_SCRIPTS) \
-   $(EXTRA_PROGRAMS) \
-@@ -291,7 +292,8 @@ CONFIG_CLEAN_FILES =
- EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
- 	nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
- 	uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
--bin_PROGRAMS = chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) cp$(EXEEXT) \
-+bin_PROGRAMS = dircolors$(EXEEXT) ls$(EXEEXT)
-+no_bin_PROGRAMS = chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) cp$(EXEEXT) \
- 	dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) ginstall$(EXEEXT) \
- 	link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) vdir$(EXEEXT) \
- 	ls$(EXEEXT) mkdir$(EXEEXT) mkfifo$(EXEEXT) mknod$(EXEEXT) \
+   $(EXTRA_PROGRAMS)
diff -buNr gnuls.orig/patches/patch-ac gnuls/patches/patch-ac
--- gnuls.orig/patches/patch-ac	1970-01-01 09:00:00.000000000 +0900
+++ gnuls/patches/patch-ac	2004-05-19 23:52:17.000000000 +0900
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.5 2004/05/18 19:07:57 tron Exp $
+
+--- lib/mountlist.c.orig	2004-01-26 09:58:12.000000000 +0100
++++ lib/mountlist.c	2004-05-18 20:56:57.000000000 +0200
+@@ -173,6 +173,11 @@
+ 
+ #if MOUNTED_GETMNTINFO
+ 
++# if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000)
++# define statfs				statvfs
++# define HAVE_F_FSTYPENAME_IN_STATFS	1
++# endif
++
+ # if ! HAVE_F_FSTYPENAME_IN_STATFS
+ static char *
+ fstype_to_string (short t)


>Release-Note:
>Audit-Trail:

From: "Julio M. Merino Vidal" <jmmv@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:  
Subject: pr/25642 CVS commit: pkgsrc/misc/gnuls
Date: Wed, 19 May 2004 16:55:25 +0000 (UTC)

 Module Name:	pkgsrc
 Committed By:	jmmv
 Date:		Wed May 19 16:55:25 UTC 2004

 Modified Files:
 	pkgsrc/misc/gnuls: Makefile distinfo
 	pkgsrc/misc/gnuls/patches: patch-aa patch-ab
 Added Files:
 	pkgsrc/misc/gnuls/patches: patch-ac

 Log Message:
 Update to 5.2.1 and fix build under NetBSD current (post 2.0D).  Also change
 categories to 'misc'.  From Kibum Han in PR pkg/25642.

 Changes since 5.0 include:

 * When given -l and similar options, ls now adjusts the output column
   widths to fit the data, so that output lines are shorter and have
   columns that line up better.  This may adversely affect shell
   scripts that expect fixed-width columns, but such shell scripts were
   not portable anyway, even with old GNU ls where the columns became
   ragged when a datum was too wide.

 * ls --width=N (for very large N) is no longer subject to an address
   arithmetic bug that could result in bounds violations.

 * ls --width=N (with -x or -C) no longer allocates more space
   (potentially much more) than necessary for a given directory.


 To generate a diff of this commit:
 cvs rdiff -r1.8 -r1.9 pkgsrc/misc/gnuls/Makefile
 cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/misc/gnuls/distinfo
 cvs rdiff -r1.4 -r1.5 pkgsrc/misc/gnuls/patches/patch-aa
 cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/misc/gnuls/patches/patch-ab
 cvs rdiff -r0 -r1.1 pkgsrc/misc/gnuls/patches/patch-ac

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

State-Changed-From-To: open->closed 
State-Changed-By: jmmv 
State-Changed-When: Wed May 19 16:56:51 UTC 2004 
State-Changed-Why:  
Package updated and fixed.  Thanks! 
>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.