diff -urNp openssl-openssl-3.0.12-quic1.orig/Configurations/unix-Makefile.tmpl openssl-openssl-3.0.12-quic1/Configurations/unix-Makefile.tmpl --- openssl-openssl-3.0.12-quic1.orig/Configurations/unix-Makefile.tmpl 2023-11-03 00:57:34.435101136 +0100 +++ openssl-openssl-3.0.12-quic1/Configurations/unix-Makefile.tmpl 2023-11-03 00:59:55.866292250 +0100 @@ -507,7 +507,7 @@ build_man_docs: $(MANDOCS1) $(MANDOCS3) build_html_docs: $(HTMLDOCS1) $(HTMLDOCS3) $(HTMLDOCS5) $(HTMLDOCS7) build_generated: $(GENERATED_MANDATORY) -build_libs_nodep: libcrypto.pc libssl.pc openssl.pc +build_libs_nodep: libcrypto-quic.pc libssl-quic.pc openssl-quic.pc build_modules_nodep: $(MODULES) build_programs_nodep: $(PROGRAMS) $(SCRIPTS) @@ -590,7 +590,7 @@ clean: libclean $(RM) tags TAGS doc-nits md-nits $(RM) -r test/test-runs $(RM) providers/fips*.new - $(RM) openssl.pc libcrypto.pc libssl.pc + $(RM) openssl-quic.pc libcrypto-quic.pc libssl-quic.pc -find . -type l \! -name '.*' -exec $(RM) {} \; distclean: clean @@ -756,15 +756,15 @@ install_dev: install_runtime_libs done @ : {- output_on() if $disabled{shared}; "" -} @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(libdir)/pkgconfig" - @$(ECHO) "install libcrypto.pc -> $(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc" - @cp libcrypto.pc "$(DESTDIR)$(libdir)/pkgconfig" - @chmod 644 "$(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc" - @$(ECHO) "install libssl.pc -> $(DESTDIR)$(libdir)/pkgconfig/libssl.pc" - @cp libssl.pc "$(DESTDIR)$(libdir)/pkgconfig" - @chmod 644 "$(DESTDIR)$(libdir)/pkgconfig/libssl.pc" - @$(ECHO) "install openssl.pc -> $(DESTDIR)$(libdir)/pkgconfig/openssl.pc" - @cp openssl.pc "$(DESTDIR)$(libdir)/pkgconfig" - @chmod 644 "$(DESTDIR)$(libdir)/pkgconfig/openssl.pc" + @$(ECHO) "install libcrypto-quic.pc -> $(DESTDIR)$(libdir)/pkgconfig/libcrypto-quic.pc" + @cp libcrypto-quic.pc "$(DESTDIR)$(libdir)/pkgconfig" + @chmod 644 "$(DESTDIR)$(libdir)/pkgconfig/libcrypto-quic.pc" + @$(ECHO) "install libssl-quic.pc -> $(DESTDIR)$(libdir)/pkgconfig/libssl-quic.pc" + @cp libssl-quic.pc "$(DESTDIR)$(libdir)/pkgconfig" + @chmod 644 "$(DESTDIR)$(libdir)/pkgconfig/libssl-quic.pc" + @$(ECHO) "install openssl-quic.pc -> $(DESTDIR)$(libdir)/pkgconfig/openssl-quic.pc" + @cp openssl-quic.pc "$(DESTDIR)$(libdir)/pkgconfig" + @chmod 644 "$(DESTDIR)$(libdir)/pkgconfig/openssl-quic.pc" uninstall_dev: uninstall_runtime_libs @$(ECHO) "*** Uninstalling development files" @@ -808,9 +808,9 @@ uninstall_dev: uninstall_runtime_libs : {- output_on() unless windowsdll(); "" -}; \ done @ : {- output_on() if $disabled{shared}; "" -} - $(RM) "$(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc" - $(RM) "$(DESTDIR)$(libdir)/pkgconfig/libssl.pc" - $(RM) "$(DESTDIR)$(libdir)/pkgconfig/openssl.pc" + $(RM) "$(DESTDIR)$(libdir)/pkgconfig/libcrypto-quic.pc" + $(RM) "$(DESTDIR)$(libdir)/pkgconfig/libssl-quic.pc" + $(RM) "$(DESTDIR)$(libdir)/pkgconfig/openssl-quic.pc" -$(RMDIR) "$(DESTDIR)$(libdir)/pkgconfig" -$(RMDIR) "$(DESTDIR)$(libdir)" @@ -1389,9 +1389,9 @@ FORCE: # Building targets ################################################### -libcrypto.pc libssl.pc openssl.pc: Makefile $(LIBS) {- join(" ",map { platform->sharedlib_simple($_) // platform->sharedlib_import($_) // platform->sharedlib($_) // () } @{$unified_info{libraries}}) -} +libcrypto-quic.pc libssl-quic.pc openssl-quic.pc: Makefile $(LIBS) {- join(" ",map { platform->sharedlib_simple($_) // platform->sharedlib_import($_) // platform->sharedlib($_) // () } @{$unified_info{libraries}}) -} -libcrypto.pc: +libcrypto-quic.pc: @ ( echo 'prefix=$(INSTALLTOP)'; \ echo 'exec_prefix=$${prefix}'; \ if [ -n "$(LIBDIR)" ]; then \ @@ -1400,17 +1400,17 @@ libcrypto.pc: echo 'libdir=$(libdir)'; \ fi; \ echo 'includedir=$${prefix}/include'; \ - echo 'enginesdir=$${libdir}/engines-{- $sover_dirname -}'; \ - echo 'modulesdir=$${libdir}/ossl-modules'; \ + echo 'enginesdir=$${libdir}/engines-quic-{- $sover_dirname -}'; \ + echo 'modulesdir=$${libdir}/ossl-quic-modules'; \ echo ''; \ - echo 'Name: OpenSSL-libcrypto'; \ + echo 'Name: OpenSSL-libcrypto-quic'; \ echo 'Description: OpenSSL cryptography library'; \ echo 'Version: '$(VERSION); \ - echo 'Libs: -L$${libdir} -lcrypto'; \ + echo 'Libs: -L$${libdir} -lcrypto-quic'; \ echo 'Libs.private: $(LIB_EX_LIBS)'; \ - echo 'Cflags: -I$${includedir}' ) > libcrypto.pc + echo 'Cflags: -I$${includedir}' ) > libcrypto-quic.pc -libssl.pc: +libssl-quic.pc: @ ( echo 'prefix=$(INSTALLTOP)'; \ echo 'exec_prefix=$${prefix}'; \ if [ -n "$(LIBDIR)" ]; then \ @@ -1420,14 +1420,14 @@ libssl.pc: fi; \ echo 'includedir=$${prefix}/include'; \ echo ''; \ - echo 'Name: OpenSSL-libssl'; \ + echo 'Name: OpenSSL-libssl-quic'; \ echo 'Description: Secure Sockets Layer and cryptography libraries'; \ echo 'Version: '$(VERSION); \ - echo 'Requires.private: libcrypto'; \ - echo 'Libs: -L$${libdir} -lssl'; \ - echo 'Cflags: -I$${includedir}' ) > libssl.pc + echo 'Requires.private: libcrypto-quic'; \ + echo 'Libs: -L$${libdir} -lssl-quic'; \ + echo 'Cflags: -I$${includedir}' ) > libssl-quic.pc -openssl.pc: +openssl-quic.pc: @ ( echo 'prefix=$(INSTALLTOP)'; \ echo 'exec_prefix=$${prefix}'; \ if [ -n "$(LIBDIR)" ]; then \ @@ -1440,7 +1440,7 @@ openssl.pc: echo 'Name: OpenSSL'; \ echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ echo 'Version: '$(VERSION); \ - echo 'Requires: libssl libcrypto' ) > openssl.pc + echo 'Requires: libssl-quic libcrypto-quic' ) > openssl-quic.pc Makefile: configdata.pm \ {- join(" \\\n" . ' ' x 10,