View | Details | Raw Unified | Return to bug 226339 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-40 / +63 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	dropbear
4
PORTNAME=	dropbear
5
PORTVERSION=	2017.75
5
PORTVERSION=	2018.76
6
CATEGORIES=	security ipv6
6
CATEGORIES=	security ipv6
7
MASTER_SITES=	http://matt.ucc.asn.au/dropbear/releases/
7
MASTER_SITES=	https://matt.ucc.asn.au/dropbear/releases/
8
8
9
MAINTAINER=	pkubaj@anongoth.pl
9
MAINTAINER=	pkubaj@anongoth.pl
10
COMMENT=	SSH 2 server, designed to be usable in small memory environments
10
COMMENT=	SSH 2 server, designed to be usable in small memory environments
Lines 19-41 Link Here
19
19
20
USE_RC_SUBR=	${PORTNAME}
20
USE_RC_SUBR=	${PORTNAME}
21
21
22
OPTIONS_DEFINE=	DH_GROUP1 SMALL_CODE STATIC
22
OPTIONS_DEFINE=	SMALL_CODE STATIC
23
OPTIONS_DEFAULT=	AES128 AES256 CTR RSA SHA2_256 SHA2_512 SMALL_CODE TWOFISH128 TWOFISH256
23
OPTIONS_DEFAULT=	AES128 AES256 CTR CURVE25519 GROUP14_SHA256 GROUP16 RSA SHA2_256 TWOFISH128 TWOFISH256
24
OPTIONS_MULTI=	ENC KEY MAC MODE
24
OPTIONS_MULTI=		ENC KEY KEX MAC MODE
25
OPTIONS_MULTI_ENC=	AES128 3DES AES256 BLOWFISH TWOFISH256 TWOFISH128
25
OPTIONS_MULTI_ENC=	3DES AES128 AES256 BLOWFISH TWOFISH128 TWOFISH256
26
OPTIONS_MULTI_KEY=	ECDSA DSA RSA
27
OPTIONS_MULTI_KEX=	CURVE25519 ECDH GROUP1 GROUP14_SHA1 GROUP14_SHA256 GROUP16
28
OPTIONS_MULTI_MAC=	MD5 SHA1 SHA1_96 SHA2_256
26
OPTIONS_MULTI_MODE=	CBC CTR
29
OPTIONS_MULTI_MODE=	CBC CTR
27
OPTIONS_MULTI_KEY=	ECDSA DSA RSA
28
OPTIONS_MULTI_MAC=	MD5 SHA1 SHA1_96 SHA2_256 SHA2_512
29
30
30
3DES_DESC=	Enable 3DES-based encryption
31
3DES_DESC=	Enable 3DES-based encryption
31
3DES_IMPLIES=	CTR
32
3DES_IMPLIES=	CTR
32
AES128_DESC=	Enable AES128-based encryption
33
AES128_DESC=	Enable AES128-based encryption
33
AES256_DESC=	Enable AES256-based encryption
34
AES256_DESC=	Enable AES256-based encryption
35
BLOWFISH_DESC=	Enable Blowfish-based encryption
34
TWOFISH128_DESC=	Enable Twofish128-based encryption
36
TWOFISH128_DESC=	Enable Twofish128-based encryption
35
TWOFISH256_DESC=	Enable Twofish256-based encryption
37
TWOFISH256_DESC=	Enable Twofish256-based encryption
36
BLOWFISH_DESC=	Enable Blowfish-based encryption
37
38
38
DH_GROUP1_DESC=	Enable Group1 Diffie-Hellman (less secure)
39
CURVE25519_DESC=	Enable Curve25519
40
ECDH_DESC=	Enable ECDH (insecure)
41
GROUP1_DESC=	Enable Group1 Diffie-Hellman (insecure)
42
GROUP14_SHA1_DESC=	Enable Group14 Diffie-Helman with SHA1 (insecure)
43
GROUP14_SHA256_DESC=	Enable Group14 Diffie-Helman with SHA256
44
GROUP16_DESC=	Enable Group16 Diffie-Hellman
39
45
40
CBC_DESC=	Use CBC mode for ciphers (less secure)
46
CBC_DESC=	Use CBC mode for ciphers (less secure)
41
CTR_DESC=	Use CTR mode for ciphers (more secure)
47
CTR_DESC=	Use CTR mode for ciphers (more secure)
Lines 48-62 Link Here
48
SHA1_DESC=	Enable SHA1 MAC (less secure)
54
SHA1_DESC=	Enable SHA1 MAC (less secure)
49
SHA1_96_DESC=	Enable SHA1_96 MAC (less secure)
55
SHA1_96_DESC=	Enable SHA1_96 MAC (less secure)
50
SHA2_256_DESC=	Enable SHA2_256 MAC
56
SHA2_256_DESC=	Enable SHA2_256 MAC
51
SHA2_512_DESC=	Enable SHA2_512 MAC
52
57
53
SMALL_CODE_DESC=	Make binary smaller in exchange for 50% performance hit
58
SMALL_CODE_DESC=	Make binary smaller in exchange for 50% performance hit
54
59
55
STATIC_LDFLAGS=	-static
60
STATIC_CONFIGURE_ENABLE=	static
56
61
62
CONFIGURE_ARGS=	--disable-harden
63
57
post-patch:
64
post-patch:
58
	@${REINPLACE_CMD} -e "s,_PRIV_FILENAME \"/etc/,_PRIV_FILENAME \"${PREFIX}/etc/,g; \
65
	@${REINPLACE_CMD} -e "s,_PRIV_FILENAME \"/etc/,_PRIV_FILENAME \"${PREFIX}/etc/,g; \
59
		s,/usr/bin/X11/,${LOCALBASE}/,g" ${WRKSRC}/options.h
66
		s,/usr/bin/X11/,${LOCALBASE}/,g" ${WRKSRC}/default_options.h
60
	@${REINPLACE_CMD} -e "s,sys/dir.h,dirent.h," ${WRKSRC}/*.[ch]
67
	@${REINPLACE_CMD} -e "s,sys/dir.h,dirent.h," ${WRKSRC}/*.[ch]
61
	@${REINPLACE_CMD} -e "s,make clean,\$${MAKE} clean," \
68
	@${REINPLACE_CMD} -e "s,make clean,\$${MAKE} clean," \
62
				${WRKSRC}/libtomcrypt/Makefile.in
69
				${WRKSRC}/libtomcrypt/Makefile.in
Lines 63-138 Link Here
63
70
64
post-patch-SMALL_CODE-off:
71
post-patch-SMALL_CODE-off:
65
	@${REINPLACE_CMD} -e "/#define DROPBEAR_SMALL_CODE/d" \
72
	@${REINPLACE_CMD} -e "/#define DROPBEAR_SMALL_CODE/d" \
66
		${WRKSRC}/options.h
73
		${WRKSRC}/default_options.h
67
74
68
post-patch-3DES-off:
75
post-patch-3DES-off:
69
	@${REINPLACE_CMD} -e "/#define DROPBEAR_3DES/d" \
76
	@${REINPLACE_CMD} -e "/#define DROPBEAR_3DES/d" \
70
		${WRKSRC}/options.h
77
		${WRKSRC}/default_options.h
71
78
72
post-patch-AES128-off:
79
post-patch-AES128-off:
73
	@${REINPLACE_CMD} -e "/#define DROPBEAR_AES128/d" \
80
	@${REINPLACE_CMD} -e "/#define DROPBEAR_AES128/d" \
74
		${WRKSRC}/options.h
81
		${WRKSRC}/default_options.h
75
82
76
post-patch-AES256-off:
83
post-patch-AES256-off:
77
	@${REINPLACE_CMD} -e "/#define DROPBEAR_AES256/d" \
84
	@${REINPLACE_CMD} -e "/#define DROPBEAR_AES256/d" \
78
		${WRKSRC}/options.h
85
		${WRKSRC}/default_options.h
79
86
80
post-patch-TWOFISH256-off:
87
post-patch-TWOFISH256-on:
81
	@${REINPLACE_CMD} -e "/#define DROPBEAR_TWOFISH256/d" \
88
	@${REINPLACE_CMD} -e "s,#define DROPBEAR_TWOFISH256 0,#define DROPBEAR_TWOFISH256 1,g" \
82
		${WRKSRC}/options.h
89
		${WRKSRC}/default_options.h
83
90
84
post-patch-TWOFISH128-off:
91
post-patch-TWOFISH128-on:
85
	@${REINPLACE_CMD} -e "/#define DROPBEAR_TWOFISH128/d" \
92
	@${REINPLACE_CMD} -e "s,#define DROPBEAR_TWOFISH128 0,#define DROPBEAR_TWOFISH128 1,g" \
86
		${WRKSRC}/options.h
93
		${WRKSRC}/default_options.h
87
94
88
post-patch-BLOWFISH-on:
95
post-patch-BLOWFISH-on:
89
	@${REINPLACE_CMD} -e "s,/\*#define DROPBEAR_BLOWFISH\*/,#define DROPBEAR_BLOWFISH,g" \
96
	@${REINPLACE_CMD} -e "s,#define DROPBEAR_BLOWFISH 0,#define DROPBEAR_BLOWFISH 1,g" \
90
		${WRKSRC}/options.h
97
		${WRKSRC}/default_options.h
91
98
92
post-patch-CBC-off:
99
post-patch-CBC-off:
93
	@${REINPLACE_CMD} -e "/#define DROPBEAR_ENABLE_CBC_MODE/d" \
100
	@${REINPLACE_CMD} -e "/#define DROPBEAR_ENABLE_CBC_MODE/d" \
94
		${WRKSRC}/options.h
101
		${WRKSRC}/default_options.h
95
102
96
post-patch-CTR-off:
103
post-patch-CTR-off:
97
	@${REINPLACE_CMD} -e "/#define DROPBEAR_ENABLE_CTR_MODE/d" \
104
	@${REINPLACE_CMD} -e "/#define DROPBEAR_ENABLE_CTR_MODE/d" \
98
		${WRKSRC}/options.h
105
		${WRKSRC}/default_options.h
99
106
100
post-patch-DH_GROUP1-off:
107
post-patch-CURVE25519-off:
108
	@${REINPLACE_CMD} -e "/#define DROPBEAR_CURVE25519 1/d" \
109
		${WRKSRC}/default_options.h
110
111
post-patch-ECDH-off:
112
	@${REINPLACE_CMD} -e "/#define DROPBEAR_ECDH 1/d" \
113
		${WRKSRC}/default_options.h
114
115
post-patch-GROUP1-off:
101
	@${REINPLACE_CMD} -e "/#define DROPBEAR_DH_GROUP1 1/d" \
116
	@${REINPLACE_CMD} -e "/#define DROPBEAR_DH_GROUP1 1/d" \
102
		${WRKSRC}/options.h
117
		${WRKSRC}/default_options.h
103
118
119
post-patch-GROUP14_SHA1-off:
120
	@${REINPLACE_CMD} -e "/#define DROPBEAR_DH_GROUP14_SHA1 1/d" \
121
		${WRKSRC}/default_options.h
122
123
post-patch-GROUP14_SHA256-off:
124
	@${REINPLACE_CMD} -e "/#define DROPBEAR_DH_GROUP14_SHA256 1/d" \
125
		${WRKSRC}/default_options.h
126
127
post-patch-GROUP16-on:
128
	@${REINPLACE_CMD} -e "s,#define DROPBEAR_DH_GROUP16 0,#define DROPBEAR_DH_GROUP16 1,g" \
129
		${WRKSRC}/default_options.h
130
104
post-patch-DSA-off:
131
post-patch-DSA-off:
105
	@${REINPLACE_CMD} -e "/#define DROPBEAR_DSS/d" \
132
	@${REINPLACE_CMD} -e "/#define DROPBEAR_DSS/d" \
106
		${WRKSRC}/options.h
133
		${WRKSRC}/default_options.h
107
134
108
post-patch-RSA-off:
135
post-patch-RSA-off:
109
	@${REINPLACE_CMD} -e "/#define DROPBEAR_RSA/d" \
136
	@${REINPLACE_CMD} -e "/#define DROPBEAR_RSA/d" \
110
		${WRKSRC}/options.h
137
		${WRKSRC}/default_options.h
111
138
112
post-patch-ECDSA-off:
139
post-patch-ECDSA-off:
113
	@${REINPLACE_CMD} -e "/#define DROPBEAR_ECDSA/d" \
140
	@${REINPLACE_CMD} -e "/#define DROPBEAR_ECDSA/d" \
114
		${WRKSRC}/options.h
141
		${WRKSRC}/default_options.h
115
142
116
post-patch-MD5-off:
143
post-patch-MD5-off:
117
	@${REINPLACE_CMD} -e "/#define DROPBEAR_MD5_HMAC/d" \
144
	@${REINPLACE_CMD} -e "/#define DROPBEAR_MD5_HMAC/d" \
118
		${WRKSRC}/options.h
145
		${WRKSRC}/default_options.h
119
146
120
post-patch-SHA1-off:
147
post-patch-SHA1-off:
121
	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA1_HMAC/d" \
148
	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA1_HMAC/d" \
122
		${WRKSRC}/options.h
149
		${WRKSRC}/default_options.h
123
150
124
post-patch-SHA1_96-off:
151
post-patch-SHA1_96-off:
125
	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA1_96_HMAC/d" \
152
	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA1_96_HMAC/d" \
126
		${WRKSRC}/options.h
153
		${WRKSRC}/default_options.h
127
154
128
post-patch-SHA2_256-off:
155
post-patch-SHA2_256-off:
129
	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA2_256_HMAC/d" \
156
	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA2_256_HMAC/d" \
130
		${WRKSRC}/options.h
157
		${WRKSRC}/default_options.h
131
158
132
post-patch-SHA2_512-off:
133
	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA2_512_HMAC/d" \
134
		${WRKSRC}/options.h
135
136
do-install:
159
do-install:
137
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dropbear
160
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dropbear
138
	${INSTALL_PROGRAM} ${WRKSRC}/dbclient ${STAGEDIR}${PREFIX}/bin
161
	${INSTALL_PROGRAM} ${WRKSRC}/dbclient ${STAGEDIR}${PREFIX}/bin
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1497947793
1
TIMESTAMP = 1519931080
2
SHA256 (dropbear-2017.75.tar.bz2) = 6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c
2
SHA256 (dropbear-2018.76.tar.bz2) = f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65
3
SIZE (dropbear-2017.75.tar.bz2) = 1623392
3
SIZE (dropbear-2018.76.tar.bz2) = 2688697
(-)files/patch-configure (+16 lines)
Line 0 Link Here
1
--- configure.orig	2018-03-01 21:26:15 UTC
2
+++ configure
3
@@ -3103,13 +3103,6 @@ fi
4
 
5
 
6
 
7
-# set compile flags prior to other tests
8
-if test -z "$OLDCFLAGS" && test "$GCC" = "yes"; then
9
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: No \$CFLAGS set... using \"-Os -W -Wall\" for GCC" >&5
10
-$as_echo "$as_me: No \$CFLAGS set... using \"-Os -W -Wall\" for GCC" >&6;}
11
-	CFLAGS="-Os -W -Wall"
12
-fi
13
-
14
 { $as_echo "$as_me:${as_lineno-$LINENO}: Checking if compiler '$CC' supports -Wno-pointer-sign" >&5
15
 $as_echo "$as_me: Checking if compiler '$CC' supports -Wno-pointer-sign" >&6;}
16
 
(-)pkg-descr (-1 / +1 lines)
Lines 7-10 Link Here
7
	* Compatible with OpenSSH ~/.ssh/authorized_keys public key
7
	* Compatible with OpenSSH ~/.ssh/authorized_keys public key
8
	authentication
8
	authentication
9
9
10
WWW: http://matt.ucc.asn.au/dropbear/dropbear.html
10
WWW: https://matt.ucc.asn.au/dropbear/dropbear.html
(-)pkg-plist (-2 / +2 lines)
Lines 1-9 Link Here
1
bin/dbclient
1
bin/dbclient
2
bin/dropbearconvert
2
bin/dropbearconvert
3
bin/dropbearkey
3
bin/dropbearkey
4
sbin/dropbear
5
man/man1/dbclient.1.gz
4
man/man1/dbclient.1.gz
6
man/man1/dropbearconvert.1.gz
5
man/man1/dropbearconvert.1.gz
7
man/man1/dropbearkey.1.gz
6
man/man1/dropbearkey.1.gz
8
man/man8/dropbear.8.gz
7
man/man8/dropbear.8.gz
9
@dir etc/dropbear
8
sbin/dropbear
9
@dir %%ETCDIR%%

Return to bug 226339