Attachment 13479 Details for Bug 31066 – fix for quictls patch 3/6

[patch] fix for quictls patch 3/6

openssl-3.0.5+quic-change-includedir-openssl.patch (text/plain), 4.12 KB, created by Giuseppe Ghibò on 2022-11-04 14:27:35 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ghibò

Created: 2022-11-04 14:27:35 CET

Size: 4.12 KB

patch

obsolete

>diff -up openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl.incdir openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl
>--- openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl.incdir	2022-11-04 11:39:41.276149154 +0100
>+++ openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl	2022-11-04 11:40:21.500462974 +0100
>@@ -698,18 +698,18 @@ install_ssldirs:
> install_dev: install_runtime_libs
> 	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
> 	@$(ECHO) "*** Installing development files"
>-	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl
>+	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl
> 	@ : {- output_off() if $disabled{uplink}; "" -}
>-	@$(ECHO) "install $(SRCDIR)/ms/applink.c -> $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
>-	@cp $(SRCDIR)/ms/applink.c $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
>-	@chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
>+	@$(ECHO) "install $(SRCDIR)/ms/applink.c -> $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/applink.c"
>+	@cp $(SRCDIR)/ms/applink.c $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/applink.c
>+	@chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/applink.c
> 	@ : {- output_on() if $disabled{uplink}; "" -}
> 	@set -e; for i in $(SRCDIR)/include/openssl/*.h \
> 			  $(BLDDIR)/include/openssl/*.h; do \
> 		fn=`basename $$i`; \
>-		$(ECHO) "install $$i -> $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
>-		cp $$i $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
>-		chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
>+		$(ECHO) "install $$i -> $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/$$fn"; \
>+		cp $$i $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/$$fn; \
>+		chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/$$fn; \
> 	done
> 	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)
> 	@set -e; for l in $(INSTALL_LIBS); do \
>@@ -774,16 +774,17 @@ install_dev: install_runtime_libs
> uninstall_dev: uninstall_runtime_libs
> 	@$(ECHO) "*** Uninstalling development files"
> 	@ : {- output_off() if $disabled{uplink}; "" -}
>-	@$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
>-	@$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
>+	@$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/applink.c"
>+	@$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/applink.c
> 	@ : {- output_on() if $disabled{uplink}; "" -}
> 	@set -e; for i in $(SRCDIR)/include/openssl/*.h \
> 			  $(BLDDIR)/include/openssl/*.h; do \
> 		fn=`basename $$i`; \
>-		$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
>-		$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
>+		$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/$$fn"; \
>+		$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/$$fn; \
> 	done
>-	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl
>+	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl
>+	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic
> 	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include
> 	@set -e; for l in $(INSTALL_LIBS); do \
> 		fn=`basename $$l`; \
>@@ -1403,7 +1404,7 @@ libcrypto-quic.pc:
> 	    else \
> 	        echo 'libdir=$(libdir)'; \
> 	    fi; \
>-	    echo 'includedir=$${prefix}/include'; \
>+	    echo 'includedir=$${prefix}/include/openssl-quic'; \
> 	    echo 'enginesdir=$${libdir}/engines-quic-{- $sover_dirname -}'; \
> 	    echo 'modulesdir=$${libdir}/ossl-quic-modules'; \
> 	    echo ''; \
>@@ -1422,7 +1423,7 @@ libssl-quic.pc:
> 	    else \
> 	        echo 'libdir=$(libdir)'; \
> 	    fi; \
>-	    echo 'includedir=$${prefix}/include'; \
>+	    echo 'includedir=$${prefix}/include/openssl-quic'; \
> 	    echo ''; \
> 	    echo 'Name: OpenSSL-libssl-quic'; \
> 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
>@@ -1439,7 +1440,7 @@ openssl-quic.pc:
> 	    else \
> 	        echo 'libdir=$(libdir)'; \
> 	    fi; \
>-	    echo 'includedir=$${prefix}/include'; \
>+	    echo 'includedir=$${prefix}/include/openssl-quic'; \
> 	    echo ''; \
> 	    echo 'Name: OpenSSL'; \
> 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \

diff -up openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl.incdir openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl
--- openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl.incdir	2022-11-04 11:39:41.276149154 +0100
+++ openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl	2022-11-04 11:40:21.500462974 +0100
@@ -698,18 +698,18 @@ install_ssldirs:
 install_dev: install_runtime_libs
 	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
 	@$(ECHO) "*** Installing development files"
-	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl
+	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl
 	@ : {- output_off() if $disabled{uplink}; "" -}
-	@$(ECHO) "install $(SRCDIR)/ms/applink.c -> $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
-	@cp $(SRCDIR)/ms/applink.c $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
-	@chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
+	@$(ECHO) "install $(SRCDIR)/ms/applink.c -> $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/applink.c"
+	@cp $(SRCDIR)/ms/applink.c $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/applink.c
+	@chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/applink.c
 	@ : {- output_on() if $disabled{uplink}; "" -}
 	@set -e; for i in $(SRCDIR)/include/openssl/*.h \
 			  $(BLDDIR)/include/openssl/*.h; do \
 		fn=`basename $$i`; \
-		$(ECHO) "install $$i -> $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
-		cp $$i $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
-		chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
+		$(ECHO) "install $$i -> $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/$$fn"; \
+		cp $$i $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/$$fn; \
+		chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/$$fn; \
 	done
 	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)
 	@set -e; for l in $(INSTALL_LIBS); do \
@@ -774,16 +774,17 @@ install_dev: install_runtime_libs
 uninstall_dev: uninstall_runtime_libs
 	@$(ECHO) "*** Uninstalling development files"
 	@ : {- output_off() if $disabled{uplink}; "" -}
-	@$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
-	@$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
+	@$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/applink.c"
+	@$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/applink.c
 	@ : {- output_on() if $disabled{uplink}; "" -}
 	@set -e; for i in $(SRCDIR)/include/openssl/*.h \
 			  $(BLDDIR)/include/openssl/*.h; do \
 		fn=`basename $$i`; \
-		$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
-		$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
+		$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/$$fn"; \
+		$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl/$$fn; \
 	done
-	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl
+	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic/openssl
+	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl-quic
 	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include
 	@set -e; for l in $(INSTALL_LIBS); do \
 		fn=`basename $$l`; \
@@ -1403,7 +1404,7 @@ libcrypto-quic.pc:
 	    else \
 	        echo 'libdir=$(libdir)'; \
 	    fi; \
-	    echo 'includedir=$${prefix}/include'; \
+	    echo 'includedir=$${prefix}/include/openssl-quic'; \
 	    echo 'enginesdir=$${libdir}/engines-quic-{- $sover_dirname -}'; \
 	    echo 'modulesdir=$${libdir}/ossl-quic-modules'; \
 	    echo ''; \
@@ -1422,7 +1423,7 @@ libssl-quic.pc:
 	    else \
 	        echo 'libdir=$(libdir)'; \
 	    fi; \
-	    echo 'includedir=$${prefix}/include'; \
+	    echo 'includedir=$${prefix}/include/openssl-quic'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL-libssl-quic'; \
 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
@@ -1439,7 +1440,7 @@ openssl-quic.pc:
 	    else \
 	        echo 'libdir=$(libdir)'; \
 	    fi; \
-	    echo 'includedir=$${prefix}/include'; \
+	    echo 'includedir=$${prefix}/include/openssl-quic'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL'; \
 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \

Actions: View | Diff

Attachments on bug 31066: 13476 | 13477 | 13478 | 13479 | 13480 | 13481 | 13482 | 13498