Attachment #170989 for bug #210004

View | Details | Raw Unified | Return to bug 210004
Collapse All | Expand All

Lines 1-21 Link Here

(-)Makefile (-9 / +35 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= signify	3	PORTNAME= signify
4	PORTVERSION= 1	4	PORTVERSION= 0.4.2
		5	DISTVERSIONPREFIX= v
		6	PORTEPOCH= 1
5	CATEGORIES= security	7	CATEGORIES= security
6	MASTER_SITES= http://www.fefe.de/signify/
7	DISTNAME= ${PORTNAME}
8		8
9	MAINTAINER= pi@FreeBSD.org	9	MAINTAINER= t@tobik.me
10	COMMENT= OpenBSD signify ported by Felix von Leitner	10	COMMENT= Create and verify cryptographic signatures
11		11
12	LICENSE= BSD2CLAUSE	12	# outils includes signify from OpenBSD's base system which is under an
		13	# ISC license. The parts of liboutils that signify uses are licensed
		14	# under ISCL/BSD3/BSD4.
		15	LICENSE= ISCL BSD4CLAUSE BSD3CLAUSE
		16	LICENSE_COMB= multi
		17	LICENSE_FILE= ${WRKSRC}/LICENSE
13		18
14	USES= gmake compiler:c11	19	# gmake is required on FreeBSD 9.3, on FreeBSD >= 10 we get away with
		20	# regular make with tiny changes in the Makefile.
		21	USES= gmake
		22	USE_GITHUB= yes
		23	GH_ACCOUNT= chneukirchen
		24	GH_PROJECT= outils
15		25
16	PLIST_FILES= bin/signify	26	ALL_TARGET= src/usr.bin/signify/signify
17		27
		28	post-patch:
		29	# sys/cdefs.h and sys/limits.h override is not needed on FreeBSD
		30	${RM} ${WRKSRC}/src/liboutils/include/sys/cdefs.h
		31	${RM} ${WRKSRC}/src/liboutils/include/sys/limits.h
		32	# Replace /etc/signify paths in man page and signify's safe path to
		33	# point to /usr/local/etc/signify
		34	${REINPLACE_CMD} 's\|/etc/signify/\|${ETCDIR}/\|g' \
		35	${WRKSRC}/src/usr.bin/signify/signify.c \
		36	${WRKSRC}/src/usr.bin/signify/signify.1
		37
18	do-install:	38	do-install:
19	${INSTALL_PROGRAM} ${WRKSRC}/signify ${STAGEDIR}${PREFIX}/bin	39	${INSTALL_PROGRAM} ${WRKSRC}/src/usr.bin/signify/signify \
		40	${STAGEDIR}${PREFIX}/bin
		41	${INSTALL_DATA} ${WRKSRC}/src/usr.bin/signify/signify.1 \
		42	${STAGEDIR}${PREFIX}/man/man1
		43	${MKDIR} ${STAGEDIR}${ETCDIR}
		44	${INSTALL_DATA} ${FILESDIR}/openbsd-*.pub \
		45	${STAGEDIR}${ETCDIR}
20		46
21	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (signify.tar.gz) = 72cbe892edbe8e14b314fc91f6422d6cede8f689a2db4d8b34d9bfaed56ff4ec	1	TIMESTAMP = 1464977461
2	SIZE (signify.tar.gz) = 88236	2	SHA256 (chneukirchen-outils-v0.4.2_GH0.tar.gz) = 7eb65dc4734f1db1c2d251f62ac26b6fb947bb68fe177af79107d4ea3d627704
		3	SIZE (chneukirchen-outils-v0.4.2_GH0.tar.gz) = 292388

Line 0 Link Here

(-)files/openbsd-58-base.pub (+2 lines)
	1	untrusted comment: openbsd 5.8 base public key
	2	RWQNNZXtC/MqP3Eiu+6FBz/qrxiWQwDhd+9Yljzp62UP4KzFmmvzVk60

Line 0 Link Here

(-)files/openbsd-58-fw.pub (+2 lines)
	1	untrusted comment: OpenBSD 5.8 firmware public key
	2	RWTpkvg4fhJCDx9yL4bUCou/vtAecPVTfcaaGESQeBruwX/qHToMvWh6

Line 0 Link Here

(-)files/openbsd-58-pkg.pub (+2 lines)
	1	untrusted comment: OpenBSD 5.8 packages public key
	2	RWRlkI2aFHvL/XGqD+lFerD/xUi/jnAXKwdFQwZDekYwDrEPSpSWgpI9

Line 0 Link Here

(-)files/openbsd-59-base.pub (+2 lines)
	1	untrusted comment: openbsd 5.9 base public key
	2	RWQJVNompF3pwfIqbg+5sxfpxmZMa3tTBaW4qbUhWje/H/M7glrA6oVn

Line 0 Link Here

(-)files/openbsd-59-fw.pub (+2 lines)
	1	untrusted comment: OpenBSD 5.9 firmware public key
	2	RWSdmaNkytzh6BApmPSNSDLNg26ZaXlY8g/879UvLdo3rjbsby76Eda1

Line 0 Link Here

(-)files/openbsd-59-pkg.pub (+2 lines)
	1	untrusted comment: OpenBSD 5.9 packages public key
	2	RWSLRYDCTJeWLIScncqwGuXK6JVXDcIyRT0q+0m30MXXG4W2xWS4NZBP

Line 0 Link Here

(-)files/openbsd-60-base.pub (+2 lines)
	1	untrusted comment: openbsd 6.0 base public key
	2	RWSho3oKSqgLQy+NpIhFXZJDtkE65tzlmtC24mStf8DoJd2OPMgna4u8

Line 0 Link Here

(-)files/openbsd-60-fw.pub (+2 lines)
	1	untrusted comment: OpenBSD 6.0 firmware public key
	2	RWRWf7GJKFvJTWEMIaw9wld0DujiqL1mlrC6HisE6i78C+2SRArV1Iyo

Line 0 Link Here

(-)files/openbsd-60-pkg.pub (+2 lines)
	1	untrusted comment: OpenBSD 6.0 packages public key
	2	RWQHIajRlT2mX7tmRgb6oN6mfJu3AgQ/TU38acrWABO8lz90dR3rNmey

Line 0 Link Here

(-)files/openbsd-61-base.pub (+2 lines)
	1	untrusted comment: openbsd 6.1 base public key
	2	RWQEQa33SgQSEsMwwVV1+GjzdcQfRNV2Bgo48Ztd2KiZ9bAodz9c+Maa

Line 0 Link Here

(-)files/openbsd-61-fw.pub (+2 lines)
	1	untrusted comment: OpenBSD 6.1 firmware public key
	2	RWS91POk0QZXfsqi4aI7MotYz8CPzoHjYg4a1IDi56cftacjsq+ZL/KY

Line 0 Link Here

(-)files/openbsd-61-pkg.pub (+2 lines)
	1	untrusted comment: OpenBSD 6.1 packages public key
	2	RWQbTjGFHEvnOckqY7u9iABhXAkEpF/6TQ3Mr6bMrWbT1wOM/HnbV9ov




--- Makefile.orig	2016-04-06 20:14:30 UTC
+++ Makefile
@@ -21,7 +21,7 @@ src/bin/md5/md5: src/bin/md5/md5.o src/b
 SRCS=signify.c ohash.c strlcpy.c base64.c explicit_bzero.c readpassphrase.c bcrypt_pbkdf.c ed25519.c sc25519.c ge25519.c fe25519.c arc4random.c blowfish.c hash.c blocks.c getentropy.c verify.c sha2.c shafile.c
 OBJS=$(patsubst %.c,%.o,$(SRCS))
 
 src/usr.bin/rs/rs: src/usr.bin/rs/rs.o src/usr.bin/rs/utf8.o src/liboutils/pledge.o src/liboutils/strtonum.o src/liboutils/reallocarray.o
-CFLAGS=-Os -pipe
+CFLAGS=-Os -pipe -D_GNU_SOURCE -D_BSD_SOURCE -DHAVE_SYS_SYSCALL_H
 LDFLAGS=-s
 LDLIBS=-lcrypto
 
-src/usr.bin/signify/signify: src/usr.bin/signify/signify.o src/usr.bin/signify/crypto_api.o src/usr.bin/signify/fe25519.o src/usr.bin/signify/mod_ed25519.o src/usr.bin/signify/mod_ge25519.o src/usr.bin/signify/sc25519.o src/usr.bin/signify/smult_curve25519_ref.o src/liboutils/pledge.o src/liboutils/strlcpy.o src/liboutils/base64.o src/liboutils/explicit_bzero.o src/liboutils/ohash.o src/liboutils/arc4random.o src/liboutils/getentropy_linux.o src/liboutils/readpassphrase.o src/liboutils/sha2.o src/liboutils/sha256hl.o src/liboutils/sha512hl.o src/liboutils/timingsafe_bcmp.o src/liboutils/bcrypt_pbkdf.o src/liboutils/blowfish.o
+src/usr.bin/signify/signify: src/usr.bin/signify/signify.o src/usr.bin/signify/crypto_api.o src/usr.bin/signify/fe25519.o src/usr.bin/signify/mod_ed25519.o src/usr.bin/signify/mod_ge25519.o src/usr.bin/signify/sc25519.o src/usr.bin/signify/smult_curve25519_ref.o src/liboutils/pledge.o src/liboutils/base64.o src/liboutils/explicit_bzero.o src/liboutils/ohash.o src/liboutils/readpassphrase.o src/liboutils/sha2.o src/liboutils/sha256hl.o src/liboutils/sha512hl.o src/liboutils/timingsafe_bcmp.o src/liboutils/bcrypt_pbkdf.o src/liboutils/blowfish.o
 
 src/usr.bin/calendar/calendar: src/usr.bin/calendar/calendar.o src/usr.bin/calendar/day.o src/usr.bin/calendar/io.o src/usr.bin/calendar/ostern.o src/usr.bin/calendar/paskha.o src/usr.bin/calendar/pesach.o src/liboutils/arc4random_uniform.o src/liboutils/arc4random.o src/liboutils/getentropy_linux.o src/liboutils/explicit_bzero.o src/liboutils/pledge.o src/liboutils/sha2.o src/liboutils/strtonum.o
 




--- readpassphrase.c-orig	2014-07-15 19:27:23.000000000 +0200
+++ readpassphrase.c	2014-07-15 19:28:20.000000000 +0200
@@ -32,6 +32,10 @@
 #include <unistd.h>
 #include <readpassphrase.h>
 
+#ifndef _NSIG
+#define _NSIG NSIG
+#endif
+
 static volatile sig_atomic_t signo[_NSIG];
 
 static void handler(int);

Line 0 Link Here

(-)files/patch-src_usr.bin_signify_signify.1 (+11 lines)
	1	--- src/usr.bin/signify/signify.1.orig 2016-06-03 19:03:47 UTC
	2	+++ src/usr.bin/signify/signify.1
	3	@@ -156,8 +156,6 @@ Verify a bsd.rd before an upgrade:
	4	$ signify -C -p /etc/signify/openbsd-60-base.pub -x SHA256.sig bsd.rd
	5	.Ed
	6	.Sh SEE ALSO
	7	-.Xr fw_update 1 ,
	8	-.Xr pkg_add 1 ,
	9	.Xr sha256 1
	10	.Sh HISTORY
	11	The

Lines 1-6 Link Here

(-)pkg-descr (-4 / +7 lines)
1	'signify' from OpenBSD as of July 15 2014, with the necessary plumbing	1	The signify utility creates and verifies cryptographic signatures.
2	cobbled together from the OpenBSD CVS to make it compile under Linux.
3		2
4	Since the CVS itself is not signed, the author provides no guarantees.	3	This version of signify is part of outils, a portable collection of
		4	non-standard OpenBSD tools.
5		5
6	WWW: http://www.fefe.de/signify/	6	This port comes with OpenBSD's release public keys allowing you to
		7	verify an OpenBSD release before installation.
		8
		9	WWW: https://github.com/chneukirchen/outils/




bin/signify
%%ETCDIR%%/openbsd-58-base.pub
%%ETCDIR%%/openbsd-58-fw.pub
%%ETCDIR%%/openbsd-58-pkg.pub
%%ETCDIR%%/openbsd-59-base.pub
%%ETCDIR%%/openbsd-59-fw.pub
%%ETCDIR%%/openbsd-59-pkg.pub
%%ETCDIR%%/openbsd-60-base.pub
%%ETCDIR%%/openbsd-60-fw.pub
%%ETCDIR%%/openbsd-60-pkg.pub
%%ETCDIR%%/openbsd-61-base.pub
%%ETCDIR%%/openbsd-61-fw.pub
%%ETCDIR%%/openbsd-61-pkg.pub
man/man1/signify.1.gz

Return to bug 210004

Lines 1-12 Link Here

(-)files/patch-Makefile (-10 / +9 lines)
1	--- Makefile.orig 2014-07-16 16:15:20.000000000 +0200	1	--- Makefile.orig 2016-04-06 20:14:30 UTC
2	+++ Makefile 2014-07-16 16:15:47.000000000 +0200	2	+++ Makefile
3	@@ -3,8 +3,7 @@	3	@@ -21,7 +21,7 @@ src/bin/md5/md5: src/bin/md5/md5.o src/b
4	SRCS=signify.c ohash.c strlcpy.c base64.c explicit_bzero.c readpassphrase.c bcrypt_pbkdf.c ed25519.c sc25519.c ge25519.c fe25519.c arc4random.c blowfish.c hash.c blocks.c getentropy.c verify.c sha2.c shafile.c
5	OBJS=$(patsubst %.c,%.o,$(SRCS))
6		4
7	-CC=gcc -D_GNU_SOURCE -D_BSD_SOURCE -DHAVE_SYS_SYSCALL_H	5	src/usr.bin/rs/rs: src/usr.bin/rs/rs.o src/usr.bin/rs/utf8.o src/liboutils/pledge.o src/liboutils/strtonum.o src/liboutils/reallocarray.o
8	-CFLAGS=-Os -pipe
9	+CFLAGS=-Os -pipe -D_GNU_SOURCE -D_BSD_SOURCE -DHAVE_SYS_SYSCALL_H
10	LDFLAGS=-s
11	LDLIBS=-lcrypto
12		6
		7	-src/usr.bin/signify/signify: src/usr.bin/signify/signify.o src/usr.bin/signify/crypto_api.o src/usr.bin/signify/fe25519.o src/usr.bin/signify/mod_ed25519.o src/usr.bin/signify/mod_ge25519.o src/usr.bin/signify/sc25519.o src/usr.bin/signify/smult_curve25519_ref.o src/liboutils/pledge.o src/liboutils/strlcpy.o src/liboutils/base64.o src/liboutils/explicit_bzero.o src/liboutils/ohash.o src/liboutils/arc4random.o src/liboutils/getentropy_linux.o src/liboutils/readpassphrase.o src/liboutils/sha2.o src/liboutils/sha256hl.o src/liboutils/sha512hl.o src/liboutils/timingsafe_bcmp.o src/liboutils/bcrypt_pbkdf.o src/liboutils/blowfish.o
		8	+src/usr.bin/signify/signify: src/usr.bin/signify/signify.o src/usr.bin/signify/crypto_api.o src/usr.bin/signify/fe25519.o src/usr.bin/signify/mod_ed25519.o src/usr.bin/signify/mod_ge25519.o src/usr.bin/signify/sc25519.o src/usr.bin/signify/smult_curve25519_ref.o src/liboutils/pledge.o src/liboutils/base64.o src/liboutils/explicit_bzero.o src/liboutils/ohash.o src/liboutils/readpassphrase.o src/liboutils/sha2.o src/liboutils/sha256hl.o src/liboutils/sha512hl.o src/liboutils/timingsafe_bcmp.o src/liboutils/bcrypt_pbkdf.o src/liboutils/blowfish.o
		9
		10	src/usr.bin/calendar/calendar: src/usr.bin/calendar/calendar.o src/usr.bin/calendar/day.o src/usr.bin/calendar/io.o src/usr.bin/calendar/ostern.o src/usr.bin/calendar/paskha.o src/usr.bin/calendar/pesach.o src/liboutils/arc4random_uniform.o src/liboutils/arc4random.o src/liboutils/getentropy_linux.o src/liboutils/explicit_bzero.o src/liboutils/pledge.o src/liboutils/sha2.o src/liboutils/strtonum.o
		11

Lines 1-13 Link Here

(-)files/patch-readpassphrase.c (-13 lines)
1	--- readpassphrase.c-orig 2014-07-15 19:27:23.000000000 +0200
2	+++ readpassphrase.c 2014-07-15 19:28:20.000000000 +0200
3	@@ -32,6 +32,10 @@
4	#include <unistd.h>
5	#include <readpassphrase.h>
6
7	+#ifndef _NSIG
8	+#define _NSIG NSIG
9	+#endif
10	+
11	static volatile sig_atomic_t signo[_NSIG];
12
13	static void handler(int);

Line 0 Link Here

(-)pkg-plist (+14 lines)
	1	bin/signify
	2	%%ETCDIR%%/openbsd-58-base.pub
	3	%%ETCDIR%%/openbsd-58-fw.pub
	4	%%ETCDIR%%/openbsd-58-pkg.pub
	5	%%ETCDIR%%/openbsd-59-base.pub
	6	%%ETCDIR%%/openbsd-59-fw.pub
	7	%%ETCDIR%%/openbsd-59-pkg.pub
	8	%%ETCDIR%%/openbsd-60-base.pub
	9	%%ETCDIR%%/openbsd-60-fw.pub
	10	%%ETCDIR%%/openbsd-60-pkg.pub
	11	%%ETCDIR%%/openbsd-61-base.pub
	12	%%ETCDIR%%/openbsd-61-fw.pub
	13	%%ETCDIR%%/openbsd-61-pkg.pub
	14	man/man1/signify.1.gz