7 files changed, 47 insertions, 57 deletions
diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile
index 0bf494877f1..8d42f2dc3d7 100644
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.19 2014/10/09 14:05:51 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2016/03/05 15:08:30 bsiegert Exp $
 #
 
-DISTNAME=	fastjar-0.93
-PKGREVISION=	3
+DISTNAME=	fastjar-0.98
 CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fastjar/}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://download.savannah.gnu.org/releases/fastjar/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://fastjar.sourceforge.net/
+HOMEPAGE=	https://savannah.nongnu.org/projects/fastjar
 COMMENT=	C language version of the 'jar' archiver normally used by Java
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	YES
 
+INFO_FILES=	YES
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 post-install:
diff --git a/archivers/fastjar/PLIST b/archivers/fastjar/PLIST
index b6f02f41fee..48726402245 100644
--- a/archivers/fastjar/PLIST
+++ b/archivers/fastjar/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/14 04:34:39 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/03/05 15:08:30 bsiegert Exp $
 bin/fastjar
 bin/grepjar
+info/fastjar.info
+lib/charset.alias
 man/man1/fastjar.1
 man/man1/grepjar.1
diff --git a/archivers/fastjar/distinfo b/archivers/fastjar/distinfo
index 6f75ea38bfc..2d49370dc97 100644
--- a/archivers/fastjar/distinfo
+++ b/archivers/fastjar/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.14 2016/03/05 15:08:30 bsiegert Exp $
 
-SHA1 (fastjar-0.93.tgz) = 74acc8e8a920ea6da18a180cd0a691c5d7c4699f
-RMD160 (fastjar-0.93.tgz) = 1627f2316cc7bca6a477011d1b812b140900d987
-SHA512 (fastjar-0.93.tgz) = c2bf3d5d37bc93f24ffc7284eca45e8c268f4b5bf4787f1f407c6b9818f18f15bc902887995c751982aebbc8829c9d0408ab658e94d1ca99849d74393de1cbdf
-Size (fastjar-0.93.tgz) = 62419 bytes
-SHA1 (patch-aa) = 12cc5397a89c18d239164caa3955121ca6d01de0
-SHA1 (patch-ab) = c13f46e1a3e60a3bbe656af609a5c9fb047a4ca3
-SHA1 (patch-ac) = ce8eefb978a93d0043f8b98fbf4049f022ce663c
-SHA1 (patch-ad) = 7fe6657b18090e0d12c8a3b528370314e6ddca97
+SHA1 (fastjar-0.98.tar.gz) = c240a9e2115aad486329360d9166514261149af2
+RMD160 (fastjar-0.98.tar.gz) = 593ed2dfcc02599a3540028a0f0b5c77d6be7071
+Size (fastjar-0.98.tar.gz) = 717984 bytes
+SHA1 (patch-aa) = cdb20f779b32f423a49bcf3a7c64901aef5228c8
+SHA1 (patch-ab) = da635a3a6ce6c3f3406371e02a376e1d728f8b7e
+SHA1 (patch-ad) = bdb8f3c1affbcf3cc373f7b5d731b8122eaf4018
diff --git a/archivers/fastjar/patches/patch-aa b/archivers/fastjar/patches/patch-aa
index ed4448b3a54..7c009e8146d 100644
--- a/archivers/fastjar/patches/patch-aa
+++ b/archivers/fastjar/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2002/12/14 04:34:39 jschauma Exp $
+$NetBSD: patch-aa,v 1.3 2016/03/05 15:08:30 bsiegert Exp $
+
+Add man page
 
 --- /dev/null	Fri Dec 13 23:11:57 2002
 +++ fastjar.1	Fri Dec 13 23:22:03 2002
diff --git a/archivers/fastjar/patches/patch-ab b/archivers/fastjar/patches/patch-ab
index 0f95089ed72..b939990979f 100644
--- a/archivers/fastjar/patches/patch-ab
+++ b/archivers/fastjar/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2002/12/14 04:34:40 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2016/03/05 15:08:30 bsiegert Exp $
+
+Add man page
 
 --- /dev/null	Fri Dec 13 23:11:57 2002
 +++ grepjar.1	Fri Dec 13 23:21:48 2002
diff --git a/archivers/fastjar/patches/patch-ac b/archivers/fastjar/patches/patch-ac
deleted file mode 100644
index 64315ab04aa..00000000000
--- a/archivers/fastjar/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/05/17 14:54:57 minskim Exp $
-
---- jargrep.c.orig	2001-01-11 02:38:15.000000000 -0600
-+++ jargrep.c
-@@ -572,7 +572,7 @@ static void jargrep(regex_t *exp, regex_
- 					floop = FALSE;
- 					break;
- 				case 2:
--					/* fall through continue */
-+					; /* fall through continue */
- 				}
- 			}
- 		} while(floop);
diff --git a/archivers/fastjar/patches/patch-ad b/archivers/fastjar/patches/patch-ad
index 88e7a1ba46d..2b15ccef20c 100644
--- a/archivers/fastjar/patches/patch-ad
+++ b/archivers/fastjar/patches/patch-ad
@@ -1,13 +1,16 @@
-$NetBSD: patch-ad,v 1.6 2006/05/17 06:12:27 rillig Exp $
+$NetBSD: patch-ad,v 1.7 2016/03/05 15:08:30 bsiegert Exp $
 
---- jartool.c.orig	2001-01-11 09:38:15.000000000 +0100
-+++ jartool.c
-@@ -171,4 +171,2 @@
- 
--extern int errno;
--
- void usage(char*);
-@@ -1143,2 +1141,27 @@ int create_central_header(int fd){
+date: 2006-03-14 23:02:01 +0900;  author: joerg;  state: Exp;  lines: +51 -3;
+Normalise path names as relative under cwd as if they would have been
+extracted under chroot. Don't attempt to deal with existing symlinks
+to directories. This prevents directory traversal and therefore the
+creation of arbitrary files. Bump revision.
+     
+--- jartool.c.orig	2009-09-07 07:10:47.000000000 +0900
++++ jartool.c	2014-12-15 18:35:25.000000000 +0900
+@@ -1512,6 +1512,31 @@ int create_central_header(int fd){
+   return 0;
+ }
  
 +static void canonical_filename(char *filename)
 +{
@@ -34,24 +37,20 @@ $NetBSD: patch-ad,v 1.6 2006/05/17 06:12:27 rillig Exp $
 +    }
 +}
 +
- int extract_jar(int fd, char **files, int file_num){
-@@ -1251,2 +1274,9 @@ int extract_jar(int fd, char **files, in
+ int extract_jar(int fd, const char **files, int file_num){
+   size_t rdamt;
+   int out_a, in_a;
+@@ -1628,6 +1653,13 @@ int extract_jar(int fd, const char **fil
+     pb_read(&pbf, filename, fnlen);
+     filename[fnlen] = '\0';
  
-+     canonical_filename(filename);
++    canonical_filename(filename);
 +
-+     if (*filename == '\0') {
-+        fprintf(stderr, "Error extracting JAR archive, empty file name!\n");
-+        exit(1);
-+      }
++    if (*filename == '\0') {
++	 fprintf(stderr, "Error extracting JAR archive, empty file name!\n");
++	 exit(1);
++     }
 +
  #ifdef DEBUG    
-@@ -1563,2 +1593,9 @@ int list_jar(int fd, char **files, int f
-       filename[fnlen] = '\0';
-+
-+      canonical_filename(filename);
-+      if (*filename == '\0') {
-+          fprintf(stderr, "Error extracting JAR archive, empty file name!\n");
-+          exit(1);
-+      }
-+
-     
+     printf("filename is %s\n", filename);
+ #endif