pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Remove wip/fastjar after importing into pkgsrc.



Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%NetBSD.org@localhost>
Pushed By:	bsiegert
Date:		Sat Mar 5 16:10:14 2016 +0100
Changeset:	5b5e7bc4676739a261b88d1ac508bdf661dc9f9c

Modified Files:
	Makefile
Removed Files:
	fastjar/ALTERNATIVES
	fastjar/DESCR
	fastjar/Makefile
	fastjar/PLIST
	fastjar/distinfo
	fastjar/patches/patch-aa
	fastjar/patches/patch-ab
	fastjar/patches/patch-ad

Log Message:
Remove wip/fastjar after importing into pkgsrc.

See archivers/fastjar.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5b5e7bc4676739a261b88d1ac508bdf661dc9f9c

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

diffstat:
 Makefile                 |  1 -
 fastjar/ALTERNATIVES     |  1 -
 fastjar/DESCR            | 14 --------
 fastjar/Makefile         | 25 --------------
 fastjar/PLIST            |  7 ----
 fastjar/distinfo         |  8 -----
 fastjar/patches/patch-aa | 87 ------------------------------------------------
 fastjar/patches/patch-ab | 60 ---------------------------------
 fastjar/patches/patch-ad | 56 -------------------------------
 9 files changed, 259 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index a6eb76b..52c94dd 100644
--- a/Makefile
+++ b/Makefile
@@ -688,7 +688,6 @@ SUBDIR+=	farstream
 SUBDIR+=	fasm
 SUBDIR+=	fasta
 SUBDIR+=	fastbit
-SUBDIR+=	fastjar
 SUBDIR+=	fastjet
 SUBDIR+=	fastrpc
 SUBDIR+=	fbida
diff --git a/fastjar/ALTERNATIVES b/fastjar/ALTERNATIVES
deleted file mode 100644
index 5b6c102..0000000
--- a/fastjar/ALTERNATIVES
+++ /dev/null
@@ -1 +0,0 @@
-bin/jar @PREFIX@/bin/fastjar
diff --git a/fastjar/DESCR b/fastjar/DESCR
deleted file mode 100644
index d69090d..0000000
--- a/fastjar/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-Fastjar is a version of Sun's 'jar' utility, written entirely in C,
-and therefore quite a bit faster.  Fastjar can be up to 100x faster
-than the stock 'jar' program running without a JIT.  Currently,
-the author is working on adding all the features present in the sun
-utility.  At the moment, implemented features are:
-
-	* Archive creation
-	* Verbose/quiet output
-	* stdout vs. file output
-	* Manifest file support
-	* Deflation or storage
-	* Changing to a dir and adding files (-C)
-	* Archive content listing (-t)
-	* Archive extraction (-x)
diff --git a/fastjar/Makefile b/fastjar/Makefile
deleted file mode 100644
index 91f8976..0000000
--- a/fastjar/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2014/12/15 09:49:33 makoto Exp $
-#
-
-DISTNAME=	fastjar-0.98
-CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fastjar/}
-MASTER_SITES+=	http://download.savannah.gnu.org/releases/fastjar/
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-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:
-	${INSTALL_MAN} ${WRKSRC}/fastjar.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/grepjar.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/fastjar/PLIST b/fastjar/PLIST
deleted file mode 100644
index 8f3eba7..0000000
--- a/fastjar/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2014/12/15 09:49:33 makoto Exp $
-bin/fastjar
-bin/grepjar
-info/fastjar.info
-lib/charset.alias
-man/man1/fastjar.1
-man/man1/grepjar.1
diff --git a/fastjar/distinfo b/fastjar/distinfo
deleted file mode 100644
index 2fa581e..0000000
--- a/fastjar/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2014/12/15 09:49:33 makoto Exp $
-
-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/fastjar/patches/patch-aa b/fastjar/patches/patch-aa
deleted file mode 100644
index aed3205..0000000
--- a/fastjar/patches/patch-aa
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2014/11/20 05:36:32 makoto Exp $
-
-Add man page
-
---- /dev/null	Fri Dec 13 23:11:57 2002
-+++ fastjar.1	Fri Dec 13 23:22:03 2002
-@@ -0,0 +1,80 @@
-+.TH FASTJAR 1 "August 11, 2001" fastjar "Java User's Manual"
-+.SH NAME
-+fastjar \- a faster jar
-+
-+.SH SYNOPSIS
-+.B fastjar
-+[\fIOPTIONS\fR] [\fIjar-file\fR] [\fImanifest-file\fR] [\fB-C\fR \fIdir\fR] \fIfiles\fR...
-+
-+.SH DESCRIPTION
-+\fBfastjar\fR is an implementation of Sun's jar utility that comes with the JDK,
-+written entirely in C, and runs in a fraction of the time while being 100%
-+feature compatible.
-+
-+.SH USAGE
-+If any file is a directory then it is processed recursively.
-+The manifest file name and the archive file name needs to be specified
-+in the same order the \fI-m\fR and \fI-f\fR flags are specified.
-+
-+.SH OPTIONS
-+A summary of the options supported by \fBfastjar\fR is included below.
-+
-+.TP
-+.B \-@
-+Read names from stdin
-+.TP
-+.B \-C
-+change to the specified directory and include the following file
-+.TP
-+.B \-E
-+don't include the files found in a directory
-+.TP
-+.B \-M
-+Do not create a manifest file for the entries
-+.TP
-+.B \-0
-+store only; use no ZIP compression
-+.TP
-+.B \-V
-+display version information
-+.TP
-+.B \-c
-+create new archive
-+.TP
-+.B \-f
-+specify archive file name
-+.TP
-+.B \-m
-+include manifest information from specified manifest file
-+.TP
-+.B \-t
-+list table of contents for archive
-+.TP
-+.B \-u
-+update existing archive
-+.TP
-+.B \-x
-+extract named (or all) files from archive
-+.TP
-+.B \-v
-+generate verbose output on standard output
-+
-+.SH VERSION
-+0.93
-+
-+.SH BUGS
-+Please mail any bug reports to <toast%users.sourceforge.net@localhost>.
-+
-+.SH "SEE ALSO"
-+.BR grepjar(1)
-+
-+.I http://sourceforge.net/projects/fastjar
-+
-+.SH AUTHOR
-+Bryan Burns <toast%users.sourceforge.net@localhost>
-+.br
-+Cory Jon Hollingsworth
-+
-+This man-page was written by Jan Schaumann <jschauma%netmeister.org@localhost> as part of "The Missing
-+Man Pages Project".  Please see \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR
-+for details.
diff --git a/fastjar/patches/patch-ab b/fastjar/patches/patch-ab
deleted file mode 100644
index c237cc7..0000000
--- a/fastjar/patches/patch-ab
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2014/11/20 05:36:32 makoto Exp $
-
-Add man page
-
---- /dev/null	Fri Dec 13 23:11:57 2002
-+++ grepjar.1	Fri Dec 13 23:21:48 2002
-@@ -0,0 +1,53 @@
-+.TH GREPJAR 1 "December 14, 2002" grepjar "Java User's Manual"
-+.SH NAME
-+grepjar \- search files in a jar file for a pattern
-+
-+.SH SYNOPSIS
-+.B grepjar
-+[\fIOPTIONS\fR] <\fI-e REGEX | REGEX\fR> \fIfiles\fR...
-+
-+.SH DESCRIPTION
-+As the name suggests, \fBgrepjar\fR searches files in a jar file for a
-+regular expression pattern.
-+
-+.SH OPTIONS
-+A summary of the options supported by \fBgrepjar\fR is included below.
-+
-+.TP
-+.B \-b
-+Print byte offset of match.
-+.TP
-+.B \-c
-+Print number of matches.
-+.TP
-+.B \-i
-+Compare case-insensitively.
-+.TP
-+.B \-n
-+Print line number of each match.
-+.TP
-+.B \-s
-+Suppress error messages.
-+.TP
-+.B \-w
-+Match only whole words.
-+
-+.SH VERSION
-+0.93
-+
-+.SH BUGS
-+Please mail any bug reports to <toast%users.sourceforge.net@localhost>.
-+
-+.SH "SEE ALSO"
-+.BR fastjar(1)
-+
-+.I http://sourceforge.net/projects/fastjar
-+
-+.SH AUTHOR
-+Bryan Burns <toast%users.sourceforge.net@localhost>
-+.br
-+Cory Jon Hollingsworth
-+
-+This man-page was written by Jan Schaumann <jschauma%netmeister.org@localhost> as part of "The Missing
-+Man Pages Project".  Please see \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR
-+for details.
diff --git a/fastjar/patches/patch-ad b/fastjar/patches/patch-ad
deleted file mode 100644
index 9953d5b..0000000
--- a/fastjar/patches/patch-ad
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2014/12/15 09:49:33 makoto Exp $
-
-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)
-+{
-+    char *iterator, *iterator2;
-+
-+    for (;;) {
-+	if (*filename == '/')
-+	    memmove(filename, filename + 1, strlen(filename));
-+	else if (filename[0] == '.' && filename[1] == '/')
-+	    memmove(filename, filename + 2, strlen(filename) - 1);
-+	else if (filename[0] == '.' && filename[1] == '.' && filename[2] == '/')
-+	    memmove(filename, filename + 3, strlen(filename) - 2);
-+	else if ((iterator = strstr(filename, "//")) != NULL)
-+	    memmove(iterator, iterator + 1, strlen(iterator));
-+	else if ((iterator = strstr(filename, "/./")) != NULL)
-+	    memmove(iterator, iterator + 2, strlen(iterator) - 1);
-+	else if ((iterator = strstr(filename, "/../")) != NULL) {
-+	    for (iterator2 = iterator - 1; iterator2 > filename && *iterator2 != '/'; --iterator2)
-+		continue;
-+	    /* iterator2 >= filename, handle the initial slash above, if necessary */
-+	    memmove(iterator2, iterator + 3, strlen(iterator) - 2);
-+	} else
-+	    break;
-+    }
-+}
-+
- 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);
-+
-+    if (*filename == '\0') {
-+	 fprintf(stderr, "Error extracting JAR archive, empty file name!\n");
-+	 exit(1);
-+     }
-+
- #ifdef DEBUG    
-     printf("filename is %s\n", filename);
- #endif


Home | Main Index | Thread Index | Old Index