Attachment #174921 for bug #212340




# $FreeBSD$

PORTNAME=	rndpassw
PORTVERSION=	0.2.2
CATEGORIES=	security
MASTER_SITES=	SF

MAINTAINER=	melanhit@gmail.com
COMMENT=	CLI password generator

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

USE_GITHUB=	yes
GH_ACCOUNT=	melanhit

USES=		cmake:outsource

PLIST_FILES=	bin/rndpassw \
		man/man1/rndpassw.1.gz


Lines 1-2 Link Here

(-)/usr/ports/security/rndpassw/distinfo (-2 / +3 lines)
1	SHA256 (rndpassw-0.2.tar.bz2) = 5b65072a311a7f325947113322d18078aa079263025c1db59c6db1f4363eece0	1	TIMESTAMP = 1473213814
2	SIZE (rndpassw-0.2.tar.bz2) = 4216	2	SHA256 (melanhit-rndpassw-0.2.2_GH0.tar.gz) = 2657c42515e624e3f19694648bdcabeb8ef070fc367ecde716d6fabbb9b3584c
		3	SIZE (melanhit-rndpassw-0.2.2_GH0.tar.gz) = 4404




--- Makefile.org	2014-02-21 17:59:00.973237401 +0800
+++ Makefile	2014-02-21 17:59:53.848746216 +0800
@@ -1,4 +1,4 @@
-PREFIX?=/usr/local
+PREFIX?=$(DESTDIR)$(PREFIX)
 
 CC?=	cc
 CFLAGS?=-O2 -fno-strict-aliasing -pipe
@@ -18,11 +18,11 @@
 	@rm -f $(PROG) $(PROG).o
 
 install: build
-	@install -d $(PREFIX)/bin
-	@install -d $(PREFIX)/man/man1
-	install -c $(PROG) $(PREFIX)/bin/$(PROG)
-	install -c doc/man/$(PROG).1 $(PREFIX)/man/man1/$(PROG).1
+	@install -d $(DESTDIR)$(PREFIX)/bin
+	@install -d $(DESTDIR)$(PREFIX)/man/man1
+	install -c $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
+	install -c doc/man/$(PROG).1 $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1
 
 uninstall:
-	rm -f $(PREFIX)/bin/$(PROG)
-	rm -f $(PREFIX)/man/man1/$(PROG).1.gz
+	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROG)
+	rm -f $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1.gz




--- src/rndpassw.c.orig	2014-03-02 18:22:27.000000000 -0500
+++ src/rndpassw.c	2014-08-30 13:24:58.742060993 -0400
@@ -24,7 +24,7 @@
 
 int main(int argc, char **argv)
 {
-    flags_t flags = { 0 };
+    flags_t flags = { 0, 0, 0, 0 };
     int passlen = -1, passcnt = -1;
     int opt, mixlen = 0, entlen, fd;
     unsigned i, y, baselen = 0;
@@ -133,7 +133,7 @@
 
     entoff = entbuf = malloc(entlen);
     if(entbuf == NULL) {
-        fprintf(stderr, "Could not allocate %zd bytes\n", entlen);
+        fprintf(stderr, "Could not allocate %zd bytes\n", (size_t)entlen);
         return (1);
     }
 
@@ -148,7 +148,7 @@
     /* create and fill dictionary */
     mixbuf = malloc(mixlen);
     if(mixbuf == NULL) {
-        fprintf(stderr, "Could not allocate %zd bytes of memory\n", mixlen);
+        fprintf(stderr, "Could not allocate %zd bytes of memory\n", (size_t)mixlen);
         return (1);
     }
 

Lines 1-3 Link Here

(-)/usr/ports/security/rndpassw/pkg-descr (-1 / +1 lines)
1	Command line password generator	1	Command line password generator
2		2
3	WWW: http://sourceforge.net/projects/rndpassw	3	WWW: https://github.com/melanhit/rndpassw

Return to bug 212340

Lines 1-17 Link Here

(-)/usr/ports/security/rndpassw/Makefile (-3 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= rndpassw	3	PORTNAME= rndpassw
4	PORTVERSION= 0.2	4	PORTVERSION= 0.2.2
5	CATEGORIES= security	5	CATEGORIES= security
6	MASTER_SITES= SF
7		6
8	MAINTAINER= melanhit@gmail.com	7	MAINTAINER= melanhit@gmail.com
9	COMMENT= CLI password generator	8	COMMENT= CLI password generator
10		9
11	LICENSE= BSD3CLAUSE	10	LICENSE= BSD3CLAUSE
		11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
13	USES= tar:bzip2	13	USE_GITHUB= yes
		14	GH_ACCOUNT= melanhit
14		15
		16	USES= cmake:outsource
		17
15	PLIST_FILES= bin/rndpassw \	18	PLIST_FILES= bin/rndpassw \
16	man/man1/rndpassw.1.gz	19	man/man1/rndpassw.1.gz
17		20

Lines 1-26 Link Here

(-)/usr/ports/security/rndpassw/files/patch-Makefile (-26 lines)
1	--- Makefile.org 2014-02-21 17:59:00.973237401 +0800
2	+++ Makefile 2014-02-21 17:59:53.848746216 +0800
3	@@ -1,4 +1,4 @@
4	-PREFIX?=/usr/local
5	+PREFIX?=$(DESTDIR)$(PREFIX)
6
7	CC?= cc
8	CFLAGS?=-O2 -fno-strict-aliasing -pipe
9	@@ -18,11 +18,11 @@
10	@rm -f $(PROG) $(PROG).o
11
12	install: build
13	- @install -d $(PREFIX)/bin
14	- @install -d $(PREFIX)/man/man1
15	- install -c $(PROG) $(PREFIX)/bin/$(PROG)
16	- install -c doc/man/$(PROG).1 $(PREFIX)/man/man1/$(PROG).1
17	+ @install -d $(DESTDIR)$(PREFIX)/bin
18	+ @install -d $(DESTDIR)$(PREFIX)/man/man1
19	+ install -c $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
20	+ install -c doc/man/$(PROG).1 $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1
21
22	uninstall:
23	- rm -f $(PREFIX)/bin/$(PROG)
24	- rm -f $(PREFIX)/man/man1/$(PROG).1.gz
25	+ rm -f $(DESTDIR)$(PREFIX)/bin/$(PROG)
26	+ rm -f $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1.gz

Lines 1-29 Link Here

(-)/usr/ports/security/rndpassw/files/patch-src_rndpassw.c (-29 lines)
1	--- src/rndpassw.c.orig 2014-03-02 18:22:27.000000000 -0500
2	+++ src/rndpassw.c 2014-08-30 13:24:58.742060993 -0400
3	@@ -24,7 +24,7 @@
4
5	int main(int argc, char **argv)
6	{
7	- flags_t flags = { 0 };
8	+ flags_t flags = { 0, 0, 0, 0 };
9	int passlen = -1, passcnt = -1;
10	int opt, mixlen = 0, entlen, fd;
11	unsigned i, y, baselen = 0;
12	@@ -133,7 +133,7 @@
13
14	entoff = entbuf = malloc(entlen);
15	if(entbuf == NULL) {
16	- fprintf(stderr, "Could not allocate %zd bytes\n", entlen);
17	+ fprintf(stderr, "Could not allocate %zd bytes\n", (size_t)entlen);
18	return (1);
19	}
20
21	@@ -148,7 +148,7 @@
22	/* create and fill dictionary */
23	mixbuf = malloc(mixlen);
24	if(mixbuf == NULL) {
25	- fprintf(stderr, "Could not allocate %zd bytes of memory\n", mixlen);
26	+ fprintf(stderr, "Could not allocate %zd bytes of memory\n", (size_t)mixlen);
27	return (1);
28	}
29