Mageia Bugzilla – Attachment 13478 Details for
Bug 31066
quictls OpenSSL fork should not have been imported
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
fix for quictls patch 2/6
openssl-3.0.5+quic-change-pkgconfig-pc.patch (text/plain), 5.59 KB, created by
Giuseppe Ghibò
on 2022-11-04 14:27:02 CET
(
hide
)
Description:
fix for quictls patch 2/6
Filename:
MIME Type:
Creator:
Giuseppe Ghibò
Created:
2022-11-04 14:27:02 CET
Size:
5.59 KB
patch
obsolete
>diff -up openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl.quic openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl >--- openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl.quic 2022-11-04 02:43:24.976514318 +0100 >+++ openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl 2022-11-04 03:17:00.611393709 +0100 >@@ -512,7 +512,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) > >@@ -595,7 +595,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 >@@ -761,15 +761,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" >@@ -813,9 +813,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) > >@@ -1393,9 +1393,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 \ >@@ -1404,17 +1404,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 \ >@@ -1424,14 +1424,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 \ >@@ -1444,7 +1444,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,
diff -up openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl.quic openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl --- openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl.quic 2022-11-04 02:43:24.976514318 +0100 +++ openssl-openssl-3.0.5-quic1/Configurations/unix-Makefile.tmpl 2022-11-04 03:17:00.611393709 +0100 @@ -512,7 +512,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) @@ -595,7 +595,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 @@ -761,15 +761,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" @@ -813,9 +813,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) @@ -1393,9 +1393,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 \ @@ -1404,17 +1404,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 \ @@ -1424,14 +1424,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 \ @@ -1444,7 +1444,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,
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 31066
:
13476
|
13477
| 13478 |
13479
|
13480
|
13481
|
13482
|
13498