summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2006-10-07 19:46:06 +0000
committerreed <reed@pkgsrc.org>2006-10-07 19:46:06 +0000
commit675c77c2f8b038f4e8815357f055ce22ddcddf39 (patch)
treedf0c407affe504165e688ddb6f0e06dfda734624
parent7ad267dfac01f5a52e2b230d9ff19f624e4bbaa5 (diff)
downloadpkgsrc-675c77c2f8b038f4e8815357f055ce22ddcddf39.tar.gz
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.
-rw-r--r--sysutils/file/Makefile4
-rw-r--r--sysutils/file/distinfo10
-rw-r--r--sysutils/file/patches/patch-aa19
3 files changed, 15 insertions, 18 deletions
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index 5d5649aa32c..71d0ce0d85a 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:41 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/10/07 19:46:06 reed 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/
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo
index 211a1a1bd24..aa0bf736a64 100644
--- a/sysutils/file/distinfo
+++ b/sysutils/file/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:40:52 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/10/07 19:46:06 reed 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) = 96376c128a1d131c73f7d1bc790030c250f0f1ee
diff --git a/sysutils/file/patches/patch-aa b/sysutils/file/patches/patch-aa
index d45c0f9f947..c4effcc1ea1 100644
--- a/sysutils/file/patches/patch-aa
+++ b/sysutils/file/patches/patch-aa
@@ -1,21 +1,18 @@
-$NetBSD: patch-aa,v 1.2 2005/02/18 19:39:27 reed Exp $
+$NetBSD: patch-aa,v 1.3 2006/10/07 19:46:06 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-10-08 03:41:58.000000000 -0700
++++ src/Makefile.in 2006-10-08 03:42:49.000000000 -0700
+@@ -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