From a4a06f6ae1be804aa2044fc6b143586a0c7bd533 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 08:16:19 +0100 Subject: [PATCH] /etc and /var files moved from libopenssl to openssl [release 1.0.2g-3mamba;Sat Apr 30 2016] --- openssl-1.0.1p-symbol_versioning.patch | 53 ------ openssl-1.0.2a-version.patch | 245 +++++++++++++++++++++++++ openssl.spec | 69 +++++-- 3 files changed, 301 insertions(+), 66 deletions(-) delete mode 100644 openssl-1.0.1p-symbol_versioning.patch create mode 100644 openssl-1.0.2a-version.patch diff --git a/openssl-1.0.1p-symbol_versioning.patch b/openssl-1.0.1p-symbol_versioning.patch deleted file mode 100644 index ea664a8..0000000 --- a/openssl-1.0.1p-symbol_versioning.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -up openssl-1.0.1/Makefile.shared.version openssl-1.0.1/Makefile.shared ---- openssl-1.0.1/Makefile.shared.version 2012-03-14 20:58:20.553350959 +0100 -+++ openssl-1.0.1/Makefile.shared 2012-03-14 20:58:20.631352556 +0100 -@@ -151,7 +151,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \ - SHLIB_SUFFIX=; \ - ALLSYMSFLAGS='-Wl,--whole-archive'; \ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ -- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" -+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--default-symver,--version-script=version.map -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - - DO_GNU_APP=LDFLAGS="$(CFLAGS)" - -diff -up openssl-1.0.1/version.map.version openssl-1.0.1/version.map ---- openssl-1.0.1/version.map.version 2012-03-14 20:58:20.631352556 +0100 -+++ openssl-1.0.1/version.map 2012-03-14 20:58:20.631352556 +0100 -@@ -0,0 +1,7 @@ -+OPENSSL_1.0.1 { -+ global: -+ SSLeay; -+ local: -+ _original*; -+ _current*; -+}; ---- openssl-1.0.1p/crypto/cversion.c.orig 2015-08-16 15:44:39.732602452 +0200 -+++ openssl-1.0.1p/crypto/cversion.c 2015-08-16 15:45:16.262509801 +0200 -@@ -97,7 +97,14 @@ - return ("not available"); - } - --unsigned long SSLeay(void) -+unsigned long _original_SSLeay(void) - { -- return (SSLEAY_VERSION_NUMBER); -+ return(0x10000003); - } -+ -+unsigned long _current_SSLeay(void) -+{ -+ return(SSLEAY_VERSION_NUMBER); -+} -+__asm__(".symver _original_SSLeay,SSLeay@"); -+__asm__(".symver _current_SSLeay,SSLeay@@OPENSSL_1.0.1"); ---- openssl-1.0.1p/crypto/opensslv.h.orig 2015-08-16 15:44:39.733602449 +0200 -+++ openssl-1.0.1p/crypto/opensslv.h 2015-08-16 15:47:04.895305120 +0200 -@@ -88,7 +88,7 @@ - * should only keep the versions that are binary compatible with the current. - */ - # define SHLIB_VERSION_HISTORY "" --# define SHLIB_VERSION_NUMBER "1.0.0" -+# define SHLIB_VERSION_NUMBER "1.0.1" - - - #ifdef __cplusplus diff --git a/openssl-1.0.2a-version.patch b/openssl-1.0.2a-version.patch new file mode 100644 index 0000000..c93ffe8 --- /dev/null +++ b/openssl-1.0.2a-version.patch @@ -0,0 +1,245 @@ + + + +rpms/openssl.git - openssl + + + + + + + + + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/openssl-1.0.2a-version.patch
blob: 25dfff51b067efd41d92d3b67c9c8fad820efff5 (plain) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+
diff -up openssl-1.0.2a/crypto/cversion.c.version openssl-1.0.2a/crypto/cversion.c
+--- openssl-1.0.2a/crypto/cversion.c.version	2015-03-19 14:30:36.000000000 +0100
++++ openssl-1.0.2a/crypto/cversion.c	2015-04-21 16:48:56.285535316 +0200
+@@ -62,7 +62,7 @@
+ # include "buildinf.h"
+ #endif
+ 
+-const char *SSLeay_version(int t)
++const char *_current_SSLeay_version(int t)
+ {
+     if (t == SSLEAY_VERSION)
+         return OPENSSL_VERSION_TEXT;
+@@ -101,7 +101,40 @@ const char *SSLeay_version(int t)
+     return ("not available");
+ }
+ 
+-unsigned long SSLeay(void)
++const char *_original_SSLeay_version(int t)
++{
++    if (t == SSLEAY_VERSION)
++        return "OpenSSL 1.0.0-fips 29 Mar 2010";
++    else
++        return _current_SSLeay_version(t);
++}
++
++const char *_original101_SSLeay_version(int t)
++{
++    if (t == SSLEAY_VERSION)
++        return "OpenSSL 1.0.1e-fips 11 Feb 2013";
++    else
++        return _current_SSLeay_version(t);
++}
++
++unsigned long _original_SSLeay(void)
++{
++    return (0x10000003L);
++}
++
++unsigned long _original101_SSLeay(void)
++{
++    return (0x1000105fL);
++}
++
++unsigned long _current_SSLeay(void)
+ {
+     return (SSLEAY_VERSION_NUMBER);
+ }
++
++__asm__(".symver _original_SSLeay,SSLeay@");
++__asm__(".symver _original_SSLeay_version,SSLeay_version@");
++__asm__(".symver _original101_SSLeay,SSLeay@OPENSSL_1.0.1");
++__asm__(".symver _original101_SSLeay_version,SSLeay_version@OPENSSL_1.0.1");
++__asm__(".symver _current_SSLeay,SSLeay@@OPENSSL_1.0.2");
++__asm__(".symver _current_SSLeay_version,SSLeay_version@@OPENSSL_1.0.2");
+diff -up openssl-1.0.2a/Makefile.shared.version openssl-1.0.2a/Makefile.shared
+--- openssl-1.0.2a/Makefile.shared.version	2015-04-21 16:43:02.624170648 +0200
++++ openssl-1.0.2a/Makefile.shared	2015-04-21 16:43:02.676171879 +0200
+@@ -151,7 +151,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \
+ 	SHLIB_SUFFIX=; \
+ 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
++	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--default-symver,--version-script=version.map -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ 
+ DO_GNU_APP=LDFLAGS="$(CFLAGS)"
+ 
+diff -up openssl-1.0.2a/version.map.version openssl-1.0.2a/version.map
+--- openssl-1.0.2a/version.map.version	2015-04-21 16:43:02.676171879 +0200
++++ openssl-1.0.2a/version.map	2015-04-21 16:51:49.621630589 +0200
+@@ -0,0 +1,13 @@
++OPENSSL_1.0.1 {
++    global:
++	    SSLeay;
++	    SSLeay_version;
++    local:
++	    _original*;
++	    _current*;
++};
++OPENSSL_1.0.2 {
++    global:
++	    SSLeay;
++	    SSLeay_version;
++} OPENSSL_1.0.1;
+
+
+
generated by cgit v0.12 at 2016-04-30 09:59:51 (GMT)
+
+ + diff --git a/openssl.spec b/openssl.spec index 8e8f2ad..4b5a0b3 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,6 +1,6 @@ Name: openssl -Version: 1.0.1p -Release: 1mamba +Version: 1.0.2g +Release: 3mamba Summary: Secure Sockets Layer communications libs and utils Group: Network/Security Vendor: openmamba @@ -10,10 +10,13 @@ URL: http://www.openssl.org Source: http://www.openssl.org/source/openssl-%{version}.tar.gz Source1: openssl-makecerts Patch0: %{name}-1.0.1a-fix_non_ia32.patch -Patch1: %{name}-1.0.1p-symbol_versioning.patch +Patch1: openssl-1.0.2a-version.patch License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libperl +BuildRequires: perl-WWW-Curl +BuildRequires: perl-devel ## AUTOBUILDREQ-END Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -60,7 +63,10 @@ Static libraries needed to compile apps with support for various cryptographic a %prep %setup -q -n openssl-%{version} #%patch0 -p1 + +# Using Fedora versioning patch %patch1 -p1 +sed -i 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' crypto/opensslv.h %build # FIXME: --openssldir=%{_libdir}/ssl @@ -122,6 +128,7 @@ sed -i "s|./demoCA|/var/ssl|" %{buildroot}/etc/ssl/openssl.cnf rm -f %{buildroot}%{_libdir}/fips_premain.c rm -f %{buildroot}%{_libdir}/fips_premain.c.sha1 +rm -f %{buildroot}%{_mandir}/man3/.3* install -m 0755 -D %{SOURCE1} %{buildroot}%{_sbindir}/openssl-makecerts @@ -133,6 +140,8 @@ install -m 0755 -D %{SOURCE1} %{buildroot}%{_sbindir}/openssl-makecerts %files %defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/ssl/openssl.cnf +%dir %{_sysconfdir}/ssl/private %{_sysconfdir}/ssl/misc %{_bindir}/c_rehash #%{_bindir}/fipsld @@ -142,14 +151,6 @@ install -m 0755 -D %{SOURCE1} %{buildroot}%{_sbindir}/openssl-makecerts %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man7/* - -%files -n lib%{name} -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ssl/openssl.cnf -%dir %{_sysconfdir}/ssl/private -%{_libdir}/libcrypto.so.* -%{_libdir}/libssl.so.* -%{_libdir}/engines/lib*.so %dir /var/ssl %dir /var/ssl/certs %dir /var/ssl/crl @@ -157,6 +158,12 @@ install -m 0755 -D %{SOURCE1} %{buildroot}%{_sbindir}/openssl-makecerts %dir %attr(0700,root,root) /var/ssl/private %config(noreplace) /var/ssl/index.txt %config(noreplace) /var/ssl/serial + +%files -n lib%{name} +%defattr(-,root,root) +%{_libdir}/libcrypto.so.* +%{_libdir}/libssl.so.* +%{_libdir}/engines/lib*.so %doc LICENSE %files -n lib%{name}-devel @@ -175,8 +182,44 @@ install -m 0755 -D %{SOURCE1} %{buildroot}%{_sbindir}/openssl-makecerts %{_libdir}/*.a %changelog -* Sun Aug 16 2015 Silvan Calarco 1.0.1p-1mamba -- update to 1.0.1p +* Sat Apr 30 2016 Silvan Calarco 1.0.2g-3mamba +- /etc and /var files moved from libopenssl to openssl + +* Sat Apr 30 2016 Silvan Calarco 1.0.2g-2mamba +- rebuilt after updating versioning patch (from Fedora) + +* Tue Mar 01 2016 Automatic Build System 1.0.2g-1mamba +- automatic version update by autodist + +* Thu Jan 28 2016 Automatic Build System 1.0.2f-1mamba +- automatic version update by autodist + +* Fri Dec 04 2015 Automatic Build System 1.0.2e-2mamba +- automatic version update by autodist + +* Fri Dec 04 2015 Automatic Build System 1.0.2e-1mamba +- automatic version update by autodist + +* Thu Jul 09 2015 Automatic Build System 1.0.2d-1mamba +- automatic version update by autodist + +* Sat Jun 13 2015 Automatic Build System 1.0.2c-1mamba +- automatic version update by autodist + +* Fri Jun 12 2015 Automatic Build System 1.0.2b-2mamba +- automatic version update by autodist + +* Fri Jun 12 2015 Automatic Build System 1.0.2b-1mamba +- automatic version update by autodist + +* Mon Apr 27 2015 Automatic Build System 1.0.2a-2mamba +- automatic version update by autodist + +* Mon Apr 27 2015 Automatic Build System 1.0.2a-1mamba +- automatic version update by autodist + +* Tue Mar 10 2015 Automatic Build System 1.0.2-1mamba +- automatic version update by autodist * Fri Jan 16 2015 Automatic Build System 1.0.1l-1mamba - automatic version update by autodist