Attachment #231485 for bug #261645

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




LICENSE=	OpenSSL
LICENSE_FILE=	${WRKSRC}/LICENSE

CPE_VERSION=	1.0.2k

USES=		cpe perl5
CPE_VERSION=	1.0.2k
.if ${MACHINE} == "i386"
USE_GCC=8+
.endif
PLIST_SUB+=	SHLIBVER=${OPENSSL_SHLIBVER}
USE_LDCONFIG=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	PeterMosmans
GH_TAGNAME=	c9ba19c
USE_LDCONFIG=	yes
USE_PERL5=	build
BROKEN_i386=	ld: error: unknown argument: -Bforcearchive
.endif
MAKE_JOBS_UNSAFE=	yes

CONFIGURE_ARGS=	enable-camellia enable-cms enable-ec enable-ec2m \
		enable-ecdh enable-ecdsa enable-gost enable-idea enable-md2 enable-mdc2 \
		enable-rc2 enable-rc5 enable-rfc3779 enable-seed enable-ssl-trace \
		enable-ssl2 enable-ssl2-methods enable-ssl3 enable-weak-ssl-ciphers \
		experimental-jpake experimental-store \
		no-gmp sctp shared threads zlib zlib-dynamic
MAKE_ENV+=	LIBRPATH="${PREFIX}/openssl-unsafe/lib" GREP_OPTIONS= SHLIBVER=${OPENSSL_SHLIBVER}
MAKE_JOBS_UNSAFE=	yes
CFLAGS+=	-fPIC -DPIC
SUB_FILES=	pkg-message
PLIST_SUB+=	SHLIBVER=${OPENSSL_SHLIBVER}

.if ${MACHINE} == "amd64" || ${MACHINE_ARCH} == "mips64el"
CONFIGURE_ARGS+=	enable-ec_nistp_64_gcc_128
.endif


post-patch:
	${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \
		${WRKSRC}/crypto/des/Makefile
	${REINPLACE_CMD} -e 's|all install_docs |all |;s| tools$$||;s| build_tools$$||' ${WRKSRC}/Makefile.org

do-configure:
	${REINPLACE_CMD} -e "s|options 386|options|" \




--- Makefile.org.orig	2017-07-06 01:00:00 UTC
+++ Makefile.org
@@ -139,7 +139,7 @@ FIPSCANLIB=
 
 BASEADDR=
 
-DIRS=   crypto ssl engines apps test tools
+DIRS=   crypto ssl engines apps test
 ENGDIRS= ccgost
 SHLIBDIRS= crypto ssl
 
@@ -278,7 +278,7 @@ reflect:
 
 sub_all: build_all
 
-build_all: build_libs build_apps build_tests build_tools
+build_all: build_libs build_apps build_tests
 
 build_libs: build_libcrypto build_libssl openssl.pc
 
@@ -536,7 +536,7 @@ dist:   
 	@$(MAKE) SDIRS='$(SDIRS)' clean
 	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
 
-install: all install_docs install_sw
+install: all install_sw
 
 install_sw:
 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
@@ -560,7 +560,8 @@ install_sw:
 			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
 			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
 			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+			strip $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
 		fi; \
 	done;
 	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \




--- apps/Makefile.orig	2017-07-06 01:00:00 UTC
+++ apps/Makefile
@@ -107,7 +107,8 @@ install:
 	(echo installing $$i; \
 	 cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
 	 chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
-	 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
+	 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
+	 strip $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
 	 done;
 	@set -e; for i in $(SCRIPTS); \
 	do  \
@@ -118,7 +119,7 @@ install:
 	 done
 	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
 	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \




--- engines/Makefile.orig	2017-07-06 01:00:00 UTC
+++ engines/Makefile
@@ -125,7 +125,8 @@ install:
 				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
 			  fi; \
 			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
-			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx; \
+			  strip $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
 		done; \
 	fi
 	@target=install; $(RECURSIVE_MAKE)

Line 0 Link Here

(-)./files/patch-engines_ccgost_Makefile (+10 lines)
	1	--- engines/ccgost/Makefile.orig 2017-07-06 01:00:00 UTC
	2	+++ engines/ccgost/Makefile
	3	@@ -60,6 +60,7 @@ install:
	4	fi; \
	5	chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
	6	mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
	7	+ strip $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
	8	fi
	9
	10	links:

Return to bug 261645

Lines 11-42 COMMENT= Unsafe SSL and crypto library Link Here

(-)./Makefile (-17 / +13 lines)
11	LICENSE= OpenSSL	11	LICENSE= OpenSSL
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	CPE_VERSION= 1.0.2k
15
16	USES= cpe perl5	14	USES= cpe perl5
17	USE_PERL5= build	15	CPE_VERSION= 1.0.2k
18	MAKE_ENV+= LIBRPATH="${PREFIX}/openssl-unsafe/lib" GREP_OPTIONS= SHLIBVER=${OPENSSL_SHLIBVER}	16	.if ${MACHINE} == "i386"
19	CFLAGS+= -fPIC -DPIC	17	USE_GCC=8+
20	SUB_FILES= pkg-message	18	.endif
21	PLIST_SUB+= SHLIBVER=${OPENSSL_SHLIBVER}
22	USE_LDCONFIG= yes
23
24	USE_GITHUB= yes	19	USE_GITHUB= yes
25	GH_ACCOUNT= PeterMosmans	20	GH_ACCOUNT= PeterMosmans
26	GH_TAGNAME= c9ba19c	21	GH_TAGNAME= c9ba19c
27		22	USE_LDCONFIG= yes
28	.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld	23	USE_PERL5= build
29	BROKEN_i386= ld: error: unknown argument: -Bforcearchive
30	.endif
31	MAKE_JOBS_UNSAFE= yes
32
33	CONFIGURE_ARGS= enable-camellia enable-cms enable-ec enable-ec2m \	24	CONFIGURE_ARGS= enable-camellia enable-cms enable-ec enable-ec2m \
34	enable-ecdh enable-ecdsa enable-gost enable-idea enable-md2 enable-mdc2 \	25	enable-ecdh enable-ecdsa enable-gost enable-idea enable-md2 enable-mdc2 \
35	enable-rc2 enable-rc5 enable-rfc3779 enable-seed enable-ssl-trace \	26	enable-rc2 enable-rc5 enable-rfc3779 enable-seed enable-ssl-trace \
36	enable-ssl2 enable-ssl2-methods enable-ssl3 enable-weak-ssl-ciphers \	27	enable-ssl2 enable-ssl2-methods enable-ssl3 enable-weak-ssl-ciphers \
37	experimental-jpake experimental-store \	28	experimental-jpake experimental-store \
38	no-gmp sctp shared threads zlib zlib-dynamic	29	no-gmp sctp shared threads zlib zlib-dynamic
39	.if ${MACHINE_ARCH} == "amd64" \|\| ${MACHINE_ARCH} == "mips64el"	30	MAKE_ENV+= LIBRPATH="${PREFIX}/openssl-unsafe/lib" GREP_OPTIONS= SHLIBVER=${OPENSSL_SHLIBVER}
		31	MAKE_JOBS_UNSAFE= yes
		32	CFLAGS+= -fPIC -DPIC
		33	SUB_FILES= pkg-message
		34	PLIST_SUB+= SHLIBVER=${OPENSSL_SHLIBVER}
		35
		36	.if ${MACHINE} == "amd64" \|\| ${MACHINE_ARCH} == "mips64el"
40	CONFIGURE_ARGS+= enable-ec_nistp_64_gcc_128	37	CONFIGURE_ARGS+= enable-ec_nistp_64_gcc_128
41	.endif	38	.endif
42		39
Lines 48-54 PLIST_SUB+= OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==} Link Here
48	post-patch:	45	post-patch:
49	${REINPLACE_CMD} -e 's\|m4 -B 8192\|m4\|g' \	46	${REINPLACE_CMD} -e 's\|m4 -B 8192\|m4\|g' \
50	${WRKSRC}/crypto/des/Makefile	47	${WRKSRC}/crypto/des/Makefile
51	${REINPLACE_CMD} -e 's\|all install_docs \|all \|;s\| tools$$\|\|;s\| build_tools$$\|\|' ${WRKSRC}/Makefile.org
52		48
53	do-configure:	49	do-configure:
54	${REINPLACE_CMD} -e "s\|options 386\|options\|" \	50	${REINPLACE_CMD} -e "s\|options 386\|options\|" \

Line 0 Link Here

(-)./files/patch-Makefile.org (+39 lines)
	1	--- Makefile.org.orig 2017-07-06 01:00:00 UTC
	2	+++ Makefile.org
	3	@@ -139,7 +139,7 @@ FIPSCANLIB=
	4
	5	BASEADDR=
	6
	7	-DIRS= crypto ssl engines apps test tools
	8	+DIRS= crypto ssl engines apps test
	9	ENGDIRS= ccgost
	10	SHLIBDIRS= crypto ssl
	11
	12	@@ -278,7 +278,7 @@ reflect:
	13
	14	sub_all: build_all
	15
	16	-build_all: build_libs build_apps build_tests build_tools
	17	+build_all: build_libs build_apps build_tests
	18
	19	build_libs: build_libcrypto build_libssl openssl.pc
	20
	21	@@ -536,7 +536,7 @@ dist:
	22	@$(MAKE) SDIRS='$(SDIRS)' clean
	23	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
	24
	25	-install: all install_docs install_sw
	26	+install: all install_sw
	27
	28	install_sw:
	29	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
	30	@@ -560,7 +560,8 @@ install_sw:
	31	cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
	32	$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
	33	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
	34	- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
	35	+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
	36	+ strip $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
	37	fi; \
	38	done;
	39	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \

Lines 1-6 Link Here

(-)./files/patch-apps_Makefile (-1 / +11 lines)
1	--- apps/Makefile.orig 2017-07-06 01:00:00 UTC	1	--- apps/Makefile.orig 2017-07-06 01:00:00 UTC
2	+++ apps/Makefile	2	+++ apps/Makefile
3	@@ -118,7 +118,7 @@ install:	3	@@ -107,7 +107,8 @@ install:
		4	(echo installing $$i; \
		5	cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
		6	chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
		7	- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
		8	+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
		9	+ strip $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
		10	done;
		11	@set -e; for i in $(SCRIPTS); \
		12	do \
		13	@@ -118,7 +119,7 @@ install:
4	done	14	done
5	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \	15	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
6	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \	16	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \

Line 0 Link Here

(-)./files/patch-engines_Makefile (+12 lines)
	1	--- engines/Makefile.orig 2017-07-06 01:00:00 UTC
	2	+++ engines/Makefile
	3	@@ -125,7 +125,8 @@ install:
	4	cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
	5	fi; \
	6	chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
	7	- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
	8	+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx; \
	9	+ strip $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
	10	done; \
	11	fi
	12	@target=install; $(RECURSIVE_MAKE)