diff options
| author | kim <kim> | 2004-11-24 23:04:41 +0000 |
|---|---|---|
| committer | kim <kim> | 2004-11-24 23:04:41 +0000 |
| commit | 647921635b18c835246ce9f9417b4846c21e0e12 (patch) | |
| tree | 9a34ccdcc1c7736fd0a096464d1dc0e5f83a5ae0 /time | |
| parent | 77c6db5024ca7942ac8e383a24d97e071921a0f3 (diff) | |
| download | pkgsrc-647921635b18c835246ce9f9417b4846c21e0e12.tar.gz | |
Fixed the globbing in patch-ac (thanks Christos), to avoid errors from free.
Closes PR pkg/26612
Diffstat (limited to 'time')
| -rw-r--r-- | time/remind/Makefile | 3 | ||||
| -rw-r--r-- | time/remind/distinfo | 4 | ||||
| -rw-r--r-- | time/remind/patches/patch-ac | 15 |
3 files changed, 12 insertions, 10 deletions
diff --git a/time/remind/Makefile b/time/remind/Makefile index 0231fa765e4..c8df682cfe8 100644 --- a/time/remind/Makefile +++ b/time/remind/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2004/08/11 16:53:59 ben Exp $ +# $NetBSD: Makefile,v 1.5 2004/11/24 23:04:41 kim Exp $ # DISTNAME= remind-03.00.22 PKGNAME= ${DISTNAME:C/0([0-9])/\1/g} +PKGREVISION= 1 CATEGORIES= time MASTER_SITES= http://www.roaringpenguin.com/penguin/ diff --git a/time/remind/distinfo b/time/remind/distinfo index f905a51ee4c..12d0d6a05a3 100644 --- a/time/remind/distinfo +++ b/time/remind/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 14:47:15 agc Exp $ +$NetBSD: distinfo,v 1.3 2004/11/24 23:04:41 kim Exp $ SHA1 (remind-03.00.22.tar.gz) = 064aae86fdaa8d9355dd9c982d3ebf6175d70ab8 Size (remind-03.00.22.tar.gz) = 319556 bytes SHA1 (patch-ab) = 8aa6e4cad20f9dc6aaeb012dc767bde5be78f91b -SHA1 (patch-ac) = 1e50cb45fa9c06e301df9974f67b4a44a154d4e4 +SHA1 (patch-ac) = a88c6fe1951d360fd56294c8756139d0935f897d SHA1 (patch-ad) = 56feacc6f9af5c59197900fe4591e7d54ff9372c SHA1 (patch-ae) = 4e90c971a519d9ac46992fe5e5ab70300c352262 diff --git a/time/remind/patches/patch-ac b/time/remind/patches/patch-ac index e8885d990e7..7d9ea97aa36 100644 --- a/time/remind/patches/patch-ac +++ b/time/remind/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/12/17 23:32:11 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2004/11/24 23:04:41 kim Exp $ ---- src/files.c.orig Mon Apr 5 13:34:48 1999 -+++ src/files.c Wed Mar 1 19:48:52 2000 +--- src/files.c.orig 2000-02-17 22:45:54.000000000 -0500 ++++ src/files.c 2004-11-24 18:01:56.000000000 -0500 @@ -19,6 +19,7 @@ #include <string.h> @@ -10,11 +10,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/12/17 23:32:11 wiz Exp $ #include <sys/stat.h> #ifdef TM_IN_SYS_TIME -@@ -421,16 +422,26 @@ +@@ -421,16 +422,27 @@ { DynamicBuffer buf; int r, e; + glob_t g; ++ char **gp; DBufInit(&buf); + memset(&g, 0, sizeof(g)); @@ -30,12 +31,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/12/17 23:32:11 wiz Exp $ + glob(DBufValue(&buf), GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE, NULL, &g); DBufFree(&buf); + -+ do { -+ if ( (r=IncludeFile(*g.gl_pathv)) ) { ++ for (gp = g.gl_pathv; gp && *gp; gp++) { ++ if ( (r=IncludeFile(*gp)) ) { + globfree(&g); + return r; + } -+ } while (*++g.gl_pathv != NULL); ++ } + + globfree(&g); NumIfs = 0; |