NetBSD Problem Report #34337

From miwi@FreeBSD.org  Tue Aug 29 14:54:47 2006
Return-Path: <miwi@FreeBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by narn.NetBSD.org (Postfix) with ESMTP id B564F63BC18
	for <gnats-bugs@gnats.netbsd.org>; Tue, 29 Aug 2006 14:54:46 +0000 (UTC)
Message-Id: <1156855795.26314@mwilke.ath.cx>
Date: Tue, 29 Aug 2006 14:49:55 +0200
From: "Martin Wilke" <miwi@FreeBSD.org>
To: "gnats bugs" <gnats-bugs@NetBSD.org>
Subject: [update] sysutils/file 
X-Send-Pr-Version: gtk-send-pr 0.4.7 
X-GNATS-Notify:

>Number:         34337
>Category:       pkg
>Synopsis:       [update] sysutils/file
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    reed
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Aug 29 14:55:06 +0000 2006
>Closed-Date:    Sat Oct 07 19:46:24 +0000 2006
>Last-Modified:  Sat Oct 07 19:50:01 +0000 2006
>Originator:     Martin Wilke
>Release:        NetBSD 4.0_BETA i386
>Organization:
>Environment:


System: NetBSD 4.0_BETA (MIWIBOX) #0: Tue Aug 29 10:29:38 CEST 2006
	miwi@mwilke.ath.cx:/usr/obj/sys/arch/i386/compile/MIWIBOX



>Description:


- Update to 4.17



>How-To-Repeat:





>Fix:


--- file.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/pkgsrc/sysutils/file/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	4 Mar 2006 21:30:41 -0000	1.11
+++ Makefile	29 Aug 2006 06:55:14 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.11 2006/03/04 21:30:41 jlam Exp $

-DISTNAME=		file-4.13
+DISTNAME=		file-4.17
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.gw.com/mirrors/pub/unix/file/
 MASTER_SITES+=		ftp://ftp.astron.com/pub/file/
Index: buildlink3.mk
===================================================================
RCS file: /home/pcvs/pkgsrc/sysutils/file/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- buildlink3.mk	8 Jul 2006 23:11:08 -0000	1.6
+++ buildlink3.mk	29 Aug 2006 07:06:21 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}file

 .if !empty(FILE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.file+=	file>=4.09
-BUILDLINK_ABI_DEPENDS.file+=	file>=4.09nb1
+BUILDLINK_API_DEPENDS.file+=	file>=4.17
+BUILDLINK_ABI_DEPENDS.file+=	file>=4.17nb1
 BUILDLINK_PKGSRCDIR.file?=	../../sysutils/file
 .endif	# FILE_BUILDLINK3_MK

Index: distinfo
===================================================================
RCS file: /home/pcvs/pkgsrc/sysutils/file/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	24 Feb 2005 13:40:52 -0000	1.4
+++ distinfo	29 Aug 2006 07:02:39 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.4 2005/02/24 13:40:52 agc Exp $

-SHA1 (file-4.13.tar.gz) = a643b6e4c00cb7673a4dfd055d972dda0f5e0f53
-RMD160 (file-4.13.tar.gz) = 6ad85982bda00f6d1f037ab85698f4cbcb76970a
-Size (file-4.13.tar.gz) = 420851 bytes
-SHA1 (patch-aa) = 057af6589512876c0c2ad085785d0b7888001714
+SHA1 (file-4.17.tar.gz) = e03710a3fcb95db6d0ee9cfcdf88c19a5e525ee4
+RMD160 (file-4.17.tar.gz) = c5fd11659552f8ac3031badc7c94bb3c83a8e916
+Size (file-4.17.tar.gz) = 556270 bytes
+SHA1 (patch-aa) = 13c553797900deeceeda847187845365d8450093
Index: patches/patch-aa
===================================================================
RCS file: /home/pcvs/pkgsrc/sysutils/file/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patches/patch-aa	18 Feb 2005 19:39:27 -0000	1.2
+++ patches/patch-aa	29 Aug 2006 07:00:53 -0000
@@ -1,21 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2005/02/18 19:39:27 reed Exp $
-
---- src/Makefile.in.orig	2005-01-07 11:17:26.000000000 -0800
-+++ src/Makefile.in
-@@ -84,14 +84,14 @@ am__include = @am__include@
- am__quote = @am__quote@
- fsect = @fsect@
- install_sh = @install_sh@
+--- src/Makefile.in.orig	2006-03-02 23:09:48.000000000 +0100
++++ src/Makefile.in	2006-08-29 08:59:39.000000000 +0200
+@@ -192,11 +192,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -MAGIC = $(pkgdatadir)/magic
 +MAGIC = @sysconfdir@/magic
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h
  EXTRA_DIST = test.c
- 
- bin_PROGRAMS = file
- 
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
- 
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
  	compress.c is_tar.c readelf.c print.c fsmagic.c \
+ 	funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c
--- file.diff ends here ---



>Release-Note:

>Audit-Trail:
From: Joerg Sonnenberger <joerg@britannica.bec.de>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/34337: [update] sysutils/file
Date: Tue, 29 Aug 2006 17:12:42 +0200

 On Tue, Aug 29, 2006 at 02:55:07PM +0000, Martin Wilke wrote:
 > Index: buildlink3.mk
 > ===================================================================
 > RCS file: /home/pcvs/pkgsrc/sysutils/file/buildlink3.mk,v
 > retrieving revision 1.6
 > diff -u -r1.6 buildlink3.mk
 > --- buildlink3.mk	8 Jul 2006 23:11:08 -0000	1.6
 > +++ buildlink3.mk	29 Aug 2006 07:06:21 -0000
 > @@ -13,8 +13,8 @@
 >  BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}file
 >  
 >  .if !empty(FILE_BUILDLINK3_MK:M+)
 > -BUILDLINK_API_DEPENDS.file+=	file>=4.09
 > -BUILDLINK_ABI_DEPENDS.file+=	file>=4.09nb1
 > +BUILDLINK_API_DEPENDS.file+=	file>=4.17
 > +BUILDLINK_ABI_DEPENDS.file+=	file>=4.17nb1
 >  BUILDLINK_PKGSRCDIR.file?=	../../sysutils/file
 >  .endif	# FILE_BUILDLINK3_MK
 >  

 Are you sure that the API *and* ABI changed? To clarify the difference:
 API_DEPENDS means that the programming interface was changed and most
 packages are expected to use the new API. When it is only extended in a
 backward compatible way, it should be left as is.

 ABI_DEPENDS bumps should only occur when e.g. a shared library version
 changed and means that all depending packages need a bump as well.

 I don't remember either of that required.

 Joerg

 > Index: patches/patch-aa
 > ===================================================================
 > RCS file: /home/pcvs/pkgsrc/sysutils/file/patches/patch-aa,v
 > retrieving revision 1.2
 > diff -u -r1.2 patch-aa
 > --- patches/patch-aa	18 Feb 2005 19:39:27 -0000	1.2
 > +++ patches/patch-aa	29 Aug 2006 07:00:53 -0000
 > @@ -1,21 +1,16 @@
 > -$NetBSD: patch-aa,v 1.2 2005/02/18 19:39:27 reed Exp $
 > -
 > ---- src/Makefile.in.orig	2005-01-07 11:17:26.000000000 -0800
 > -+++ src/Makefile.in
 > -@@ -84,14 +84,14 @@ am__include = @am__include@
 > - am__quote = @am__quote@
 > - fsect = @fsect@
 > - install_sh = @install_sh@
 > +--- src/Makefile.in.orig	2006-03-02 23:09:48.000000000 +0100
 > ++++ src/Makefile.in	2006-08-29 08:59:39.000000000 +0200
 > +@@ -192,11 +192,11 @@
 > + sharedstatedir = @sharedstatedir@
 > + sysconfdir = @sysconfdir@
 > + target_alias = @target_alias@
 >  -MAGIC = $(pkgdatadir)/magic
 >  +MAGIC = @sysconfdir@/magic
 >   lib_LTLIBRARIES = libmagic.la
 >   include_HEADERS = magic.h
 >   EXTRA_DIST = test.c
 > - 
 > - bin_PROGRAMS = file
 > - 
 >  -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 >  +AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
 > - 
 >   libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 >   	compress.c is_tar.c readelf.c print.c fsmagic.c \
 > + 	funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c

 Patches should be generated e.g. with pkgtools/pkgdiff.

 Joerg

From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/34337: [update] sysutils/file 
Date: Tue, 29 Aug 2006 10:28:18 -0500 (CDT)

 > -DISTNAME=		file-4.13
 > +DISTNAME=		file-4.17

 ...

 > -BUILDLINK_API_DEPENDS.file+=	file>=4.09
 > -BUILDLINK_ABI_DEPENDS.file+=	file>=4.09nb1
 > +BUILDLINK_API_DEPENDS.file+=	file>=4.17
 > +BUILDLINK_ABI_DEPENDS.file+=	file>=4.17nb1

 The 4.17nb1 should not exist (yet). Remove PKGREVISION if it exists when 
 changing versions (and don't use nb here).

 Also make sure the interfaces actually changes before bumping those.

From: Martin Wilke <netbsd@unixfreunde.de>
To: gnats-bugs@NetBSD.org
Cc: joerg@britannica.bec.de, pkg-manager@netbsd.org,
	gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org,
	"Martin Wilke" <miwi@FreeBSD.org>
Subject: Re: pkg/34337: [update] sysutils/file
Date: Tue, 29 Aug 2006 17:51:32 +0200

 On Tue, 29 Aug 2006 15:15:18 +0000 (UTC)
 Joerg Sonnenberger <joerg@britannica.bec.de> wrote:

 > The following reply was made to PR pkg/34337; it has been noted by
 > GNATS.
 > 
 > From: Joerg Sonnenberger <joerg@britannica.bec.de>
 > To: gnats-bugs@NetBSD.org
 > Cc: 
 > Subject: Re: pkg/34337: [update] sysutils/file
 > Date: Tue, 29 Aug 2006 17:12:42 +0200
 > 
 >  On Tue, Aug 29, 2006 at 02:55:07PM +0000, Martin Wilke wrote:
 >  > Index: buildlink3.mk
 >  > ===================================================================
 >  > RCS file: /home/pcvs/pkgsrc/sysutils/file/buildlink3.mk,v
 >  > retrieving revision 1.6
 >  > diff -u -r1.6 buildlink3.mk
 >  > --- buildlink3.mk	8 Jul 2006 23:11:08 -0000	1.6
 >  > +++ buildlink3.mk	29 Aug 2006 07:06:21 -0000
 >  > @@ -13,8 +13,8 @@
 >  >  BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}file
 >  >  
 >  >  .if !empty(FILE_BUILDLINK3_MK:M+)
 >  > -BUILDLINK_API_DEPENDS.file+=	file>=4.09
 >  > -BUILDLINK_ABI_DEPENDS.file+=	file>=4.09nb1
 >  > +BUILDLINK_API_DEPENDS.file+=	file>=4.17
 >  > +BUILDLINK_ABI_DEPENDS.file+=	file>=4.17nb1
 >  >  BUILDLINK_PKGSRCDIR.file?=	../../sysutils/file
 >  >  .endif	# FILE_BUILDLINK3_MK
 >  >  
 >  
 >  Are you sure that the API *and* ABI changed? To clarify the
 > difference: API_DEPENDS means that the programming interface was
 > changed and most packages are expected to use the new API. When it is
 > only extended in a backward compatible way, it should be left as is.
 >  
 >  ABI_DEPENDS bumps should only occur when e.g. a shared library
 > version changed and means that all depending packages need a bump as
 > well. 
 >  I don't remember either of that required.
 >  

 No, the API *and* ABI is not change on the sources, i have misunderstood
 the handbook :(. Sorry 

 >  Joerg
 >  


 >  > Index: patches/patch-aa
 >  > ===================================================================
 >  > RCS file: /home/pcvs/pkgsrc/sysutils/file/patches/patch-aa,v
 >  > retrieving revision 1.2
 >  > diff -u -r1.2 patch-aa
 >  > --- patches/patch-aa	18 Feb 2005 19:39:27 -0000	1.2
 >  > +++ patches/patch-aa	29 Aug 2006 07:00:53 -0000
 >  > @@ -1,21 +1,16 @@
 >  > -$NetBSD: patch-aa,v 1.2 2005/02/18 19:39:27 reed Exp $
 >  > -
 >  > ---- src/Makefile.in.orig	2005-01-07 11:17:26.000000000
 >  > -0800 -+++ src/Makefile.in
 >  > -@@ -84,14 +84,14 @@ am__include = @am__include@
 >  > - am__quote = @am__quote@
 >  > - fsect = @fsect@
 >  > - install_sh = @install_sh@
 >  > +--- src/Makefile.in.orig	2006-03-02 23:09:48.000000000
 >  > +0100 ++++ src/Makefile.in	2006-08-29 08:59:39.000000000
 >  > +0200 +@@ -192,11 +192,11 @@
 >  > + sharedstatedir = @sharedstatedir@
 >  > + sysconfdir = @sysconfdir@
 >  > + target_alias = @target_alias@
 >  >  -MAGIC = $(pkgdatadir)/magic
 >  >  +MAGIC = @sysconfdir@/magic
 >  >   lib_LTLIBRARIES = libmagic.la
 >  >   include_HEADERS = magic.h
 >  >   EXTRA_DIST = test.c
 >  > - 
 >  > - bin_PROGRAMS = file
 >  > - 
 >  >  -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 >  >  +AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
 >  > - 
 >  >   libmagic_la_SOURCES = magic.c apprentice.c softmagic.c
 >  > ascmagic.c \ compress.c is_tar.c readelf.c print.c fsmagic.c \
 >  > + 	funcs.c file.h names.h patchlevel.h readelf.h tar.h
 >  > apptype.c
 >  
 >  Patches should be generated e.g. with pkgtools/pkgdiff.
 >  
 >  Joerg
 >  


 -- 

 Martin Wilke miwi@FreeBSD.org FreeBSD Commiter

Responsible-Changed-From-To: pkg-manager->reed
Responsible-Changed-By: reed@netbsd.org
Responsible-Changed-When: Sat, 07 Oct 2006 19:38:13 +0000
Responsible-Changed-Why:
I will update this.


State-Changed-From-To: open->closed
State-Changed-By: reed@netbsd.org
State-Changed-When: Sat, 07 Oct 2006 19:46:24 +0000
State-Changed-Why:
Updated.
Thanks for submitting the PR.


From: "Jeremy C. Reed" <reed@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: PR/34337 CVS commit: pkgsrc/sysutils/file
Date: Sat,  7 Oct 2006 19:46:07 +0000 (UTC)

 Module Name:	pkgsrc
 Committed By:	reed
 Date:		Sat Oct  7 19:46:06 UTC 2006

 Modified Files:
 	pkgsrc/sysutils/file: Makefile distinfo
 	pkgsrc/sysutils/file/patches: patch-aa

 Log Message:
 Update to 4.17. This is for PR 34337.

 Recent changes include:

 2006-03-02 16:06 Christos Zoulas <christos@zoulas.com>

 	* Print empty if the file is (Mike Frysinger)

 	* Don't try to read past the end of the buffer (Mike Frysinger)

 	* Sort magic entries by strength [experimental]

 2005-11-29 13:26 Christos Zoulas <christos@zoulas.com>

 	* Use iswprint() to convert the output string.
 	    (Bastien Nocera)

 2005-10-31 8:54 Christos Zoulas <christos@zoulas.com>

 	* Fix regression where the core info was not completely processed
 	    (Radek Vokál)

 2005-10-20 11:15 Christos Zoulas <christos@zoulas.com>

 	* Middle Endian magic (Diomidis Spinellis)

 2005-10-17 11:15 Christos Zoulas <christos@zoulas.com>

 	* Open with O_BINARY for CYGWIN (Corinna Vinschen)

 	* Don't close stdin (Arkadiusz Miskiewicz)

 	* Look for note sections in non executables.

 2005-09-20 13:33 Christos Zoulas <christos@zoulas.com>

 	* Don't print SVR4 Style in core files multiple times
 	    (Radek Vokál)

 2005-08-27 04:09 Christos Zoulas <christos@zoulas.com>

 	* Cygwin changes Corinna Vinschen

 2005-08-18 09:53 Christos Zoulas <christos@zoulas.com>

 	* Remove erroreous mention of /etc/magic in the file man page
 	  This is gentoo bug 101639. (Mike Frysinger)

 	* Cross-compile support and detection (Mike Frysinger)

 2005-08-12 10:17 Christos Zoulas <christos@zoulas.com>

 	* Add -h flag and dereference symlinks if POSIXLY_CORRECT
 	  is set.

 2005-07-29 13:57 Christos Zoulas <christos@zoulas.com>

 	* Avoid search and regex buffer overflows (Kelledin)

 2005-07-12 11:48 Christos Zoulas <christos@zoulas.com>

 	* Provide stub implementations for {v,}nsprintf() for older
 	  OS's that don't have them.
 	* Change mbstate_t autoconf detection macro from AC_MBSTATE_T
 	  to AC_TYPE_MBSTATE_T.

 2005-06-25 11:48 Christos Zoulas <christos@zoulas.com>

 	* Dynamically allocate the string buffers and make the
 	  default read size 256K.

 2005-06-01 00:00 Joerg Sonnenberger <joerg@britannica.bec.de>

 	* Dragonfly ELF note support

 2005-03-14 00:00 Giuliano Bertoletti <gb@symbolic.it>

 	* Avoid NULL pointer dereference in time conversion.

 2005-03-06 00:00  Joerg Walter <jwalt@mail.garni.ch>

 	* Add indirect magic offset support, and search mode.


 To generate a diff of this commit:
 cvs rdiff -r1.11 -r1.12 pkgsrc/sysutils/file/Makefile
 cvs rdiff -r1.4 -r1.5 pkgsrc/sysutils/file/distinfo
 cvs rdiff -r1.2 -r1.3 pkgsrc/sysutils/file/patches/patch-aa

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

>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.