Revision: 26700
http://sourceforge.net/p/gar/code/26700
Author: dmichelsen
Date: 2020-09-09 08:20:43 +0000 (Wed, 09 Sep 2020)
Log Message:
-----------
file/trunk: Update to 5.39
Modified Paths:
--------------
csw/mgar/pkg/file/trunk/Makefile
csw/mgar/pkg/file/trunk/checksums
csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch
Removed Paths:
-------------
csw/mgar/pkg/file/trunk/files/0001-Add-missing-include.patch
Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile 2020-09-09 06:33:22 UTC (rev 26699)
+++ csw/mgar/pkg/file/trunk/Makefile 2020-09-09 08:20:43 UTC (rev 26700)
@@ -1,7 +1,7 @@
# $Id$
NAME = file
-VERSION = 5.18
+VERSION = 5.39
GARTYPE = v2
define BLURB
@@ -13,15 +13,11 @@
endef
MASTER_SITES = ftp://ftp.astron.com/pub/file/
-DISTFILES = $(DISTNAME).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
-PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
PATCHFILES += 0001-Use-PCRE.patch
+# PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
-# Use patch until this is fixed:
-# http://bugs.gw.com/view.php?id=353
-PATCHFILES += 0001-Add-missing-include.patch
-
VENDOR_URL = http://www.darwinsys.com/file/
EXTRA_MODULATORS += PYTHON_VERSION
@@ -71,6 +67,7 @@
RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibmagic-data
RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibpcreposix0
+RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibbz2-1-0
CHECKPKG_OVERRIDES_CSWlibmagic1 += surplus-dependency|CSWlibmagic-data
OBSOLETED_BY_CSWlibmagic1 += CSWlibmagic
Modified: csw/mgar/pkg/file/trunk/checksums
===================================================================
--- csw/mgar/pkg/file/trunk/checksums 2020-09-09 06:33:22 UTC (rev 26699)
+++ csw/mgar/pkg/file/trunk/checksums 2020-09-09 08:20:43 UTC (rev 26700)
@@ -1 +1 @@
-d420d8f2990cd344673acfbf8d76ff5a file-5.18.tar.gz
+1c450306053622803a25647d88f80f25 file-5.39.tar.gz
Deleted: csw/mgar/pkg/file/trunk/files/0001-Add-missing-include.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-Add-missing-include.patch
2020-09-09 06:33:22 UTC (rev 26699)
+++ csw/mgar/pkg/file/trunk/files/0001-Add-missing-include.patch
2020-09-09 08:20:43 UTC (rev 26700)
@@ -1,24 +0,0 @@
-From b5dc5a6163074a7d92a4a239eafdeedce4fb07f6 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Tue, 13 May 2014 10:25:27 +0200
-Subject: [PATCH] Add missing include
-
----
- src/strcasestr.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/strcasestr.c b/src/strcasestr.c
-index 546ed3f..38d9012 100644
---- a/src/strcasestr.c
-+++ b/src/strcasestr.c
-@@ -40,6 +40,7 @@ __RCSID("$NetBSD: strncasecmp.c,v 1.2 2007/06/04 18:19:27
christos Exp $");
- #include <assert.h>
- #include <ctype.h>
- #include <string.h>
-+#include <sys/types.h>
-
- static int
- _strncasecmp(const char *s1, const char *s2, size_t n)
---
-1.8.4.1
-
Modified: csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch 2020-09-09 06:33:22 UTC
(rev 26699)
+++ csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch 2020-09-09 08:20:43 UTC
(rev 26700)
@@ -1,6 +1,6 @@
-From d54a5b9bf5d91b42e4c3fd01229a5123e22a6019 Mon Sep 17 00:00:00 2001
+From 750a9c1248a39cc21781dcceee6953683332ad5f Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <d...@opencsw.org>
-Date: Thu, 16 May 2013 14:58:54 +0200
+Date: Wed, 9 Sep 2020 09:39:15 +0200
Subject: [PATCH] Use PCRE
---
@@ -8,18 +8,18 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/file.h b/src/file.h
-index 2b64399..364a067 100644
+index 28ebc0c..4d3c031 100644
--- a/src/file.h
+++ b/src/file.h
-@@ -61,7 +61,7 @@
- #ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
- #endif
+@@ -79,7 +79,7 @@
+ #include <stdio.h> /* Include that here, to make sure __P gets defined */
+ #include <errno.h>
+ #include <fcntl.h> /* For open and flags */
-#include <regex.h>
+#include <pcreposix.h>
#include <time.h>
#include <sys/types.h>
- #include <sys/param.h>
+ #ifndef WIN32
--
-1.8.1.4
+2.4.0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
