Attachment 231485 Details for Bug 261645 – openssl-unsafe-1.0.2.20170706.patch

[patch] openssl-unsafe-1.0.2.20170706.patch

openssl-unsafe-1.0.2.20170706.patch (text/plain), 6.31 KB, created by takefu on 2022-02-01 05:28:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2022-02-01 05:28:11 UTC

Size: 6.31 KB

patch

obsolete

>diff -udprN /usr/ports/security/openssl-unsafe/Makefile ./Makefile
>--- /usr/ports/security/openssl-unsafe/Makefile	2021-11-24 01:54:07.323224000 +0000
>+++ ./Makefile	2022-02-01 05:16:02.544397000 +0000
>@@ -11,32 +11,29 @@ COMMENT=	Unsafe SSL and crypto library
> LICENSE=	OpenSSL
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-CPE_VERSION=	1.0.2k
>-
> USES=		cpe perl5
>-USE_PERL5=	build
>-MAKE_ENV+=	LIBRPATH="${PREFIX}/openssl-unsafe/lib" GREP_OPTIONS= SHLIBVER=${OPENSSL_SHLIBVER}
>-CFLAGS+=	-fPIC -DPIC
>-SUB_FILES=	pkg-message
>-PLIST_SUB+=	SHLIBVER=${OPENSSL_SHLIBVER}
>-USE_LDCONFIG=	yes
>-
>+CPE_VERSION=	1.0.2k
>+.if ${MACHINE} == "i386"
>+USE_GCC=8+
>+.endif
> USE_GITHUB=	yes
> GH_ACCOUNT=	PeterMosmans
> GH_TAGNAME=	c9ba19c
>-
>-.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
>-BROKEN_i386=	ld: error: unknown argument: -Bforcearchive
>-.endif
>-MAKE_JOBS_UNSAFE=	yes
>-
>+USE_LDCONFIG=	yes
>+USE_PERL5=	build
> 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
>-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "mips64el"
>+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
> 
>@@ -48,7 +45,6 @@ PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
> 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|" \
>diff -udprN /usr/ports/security/openssl-unsafe/files/patch-Makefile.org ./files/patch-Makefile.org
>--- /usr/ports/security/openssl-unsafe/files/patch-Makefile.org	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-Makefile.org	2022-02-01 05:09:44.410477000 +0000
>@@ -0,0 +1,39 @@
>+--- 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 \
>diff -udprN /usr/ports/security/openssl-unsafe/files/patch-apps_Makefile ./files/patch-apps_Makefile
>--- /usr/ports/security/openssl-unsafe/files/patch-apps_Makefile	2021-11-24 01:54:07.324203000 +0000
>+++ ./files/patch-apps_Makefile	2022-02-01 02:36:58.534208000 +0000
>@@ -1,6 +1,16 @@
> --- apps/Makefile.orig	2017-07-06 01:00:00 UTC
> +++ apps/Makefile
>-@@ -118,7 +118,7 @@ install:
>+@@ -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; \
>diff -udprN /usr/ports/security/openssl-unsafe/files/patch-engines_Makefile ./files/patch-engines_Makefile
>--- /usr/ports/security/openssl-unsafe/files/patch-engines_Makefile	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-engines_Makefile	2022-02-01 02:37:13.875542000 +0000
>@@ -0,0 +1,12 @@
>+--- 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)
>diff -udprN /usr/ports/security/openssl-unsafe/files/patch-engines_ccgost_Makefile ./files/patch-engines_ccgost_Makefile
>--- /usr/ports/security/openssl-unsafe/files/patch-engines_ccgost_Makefile	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-engines_ccgost_Makefile	2022-02-01 02:51:45.433052000 +0000
>@@ -0,0 +1,10 @@
>+--- engines/ccgost/Makefile.orig	2017-07-06 01:00:00 UTC
>++++ engines/ccgost/Makefile
>+@@ -60,6 +60,7 @@ install:
>+ 		fi; \
>+ 		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
>+ 		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
>++		strip $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
>+ 	fi
>+ 
>+ links:

Actions: View | Diff

Attachments on bug 261645: 231485