restore versioning patch from Fedora [release 1.0.2u-2mamba;Mon Jan 03 2022]
This commit is contained in:
parent
335aa48cc2
commit
4c37b9fd8b
@ -1,245 +0,0 @@
|
|||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
|
||||||
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
|
|
||||||
<head>
|
|
||||||
<title>rpms/openssl.git - openssl</title>
|
|
||||||
<meta name='generator' content='cgit v0.12'/>
|
|
||||||
<meta name='robots' content='index, nofollow'/>
|
|
||||||
<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
|
|
||||||
<link rel='shortcut icon' href='/favicon.ico'/>
|
|
||||||
<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/openssl.git/atom/openssl-1.0.2a-version.patch?h=master' type='application/atom+xml'/>
|
|
||||||
<link rel='vcs-git' href='git://pkgs.fedoraproject.org/rpms/openssl.git' title='rpms/openssl.git Git repository'/>
|
|
||||||
<link rel='vcs-git' href='ssh://pkgs.fedoraproject.org/rpms/openssl.git' title='rpms/openssl.git Git repository'/>
|
|
||||||
<link rel='vcs-git' href='http://pkgs.fedoraproject.org/git/rpms/openssl.git' title='rpms/openssl.git Git repository'/>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>
|
|
||||||
<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
var base = 'https://apps.fedoraproject.org/';
|
|
||||||
var tokens = window.location.href.split('/');
|
|
||||||
var repo = null;
|
|
||||||
if (tokens.length > 4 && tokens[4] != '') {
|
|
||||||
repo = tokens[4].split('.')[0];
|
|
||||||
}
|
|
||||||
fedmenu({
|
|
||||||
'url': base + 'js/data.js',
|
|
||||||
'mimeType': 'application/javascript',
|
|
||||||
'position': 'bottom-right',
|
|
||||||
'package': repo,
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
<div id='cgit'><table id='header'>
|
|
||||||
<tr>
|
|
||||||
<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
|
|
||||||
<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/openssl.git' href='/cgit/rpms/openssl.git/'>rpms/openssl.git</a></td><td class='form'><form method='get' action=''>
|
|
||||||
<select name='h' onchange='this.form.submit();'>
|
|
||||||
<option value='f10'>f10</option>
|
|
||||||
<option value='f11'>f11</option>
|
|
||||||
<option value='f12'>f12</option>
|
|
||||||
<option value='f13'>f13</option>
|
|
||||||
<option value='f14'>f14</option>
|
|
||||||
<option value='f15'>f15</option>
|
|
||||||
<option value='f16'>f16</option>
|
|
||||||
<option value='f17'>f17</option>
|
|
||||||
<option value='f18'>f18</option>
|
|
||||||
<option value='f19'>f19</option>
|
|
||||||
<option value='f20'>f20</option>
|
|
||||||
<option value='f21'>f21</option>
|
|
||||||
<option value='f22'>f22</option>
|
|
||||||
<option value='f23'>f23</option>
|
|
||||||
<option value='f24'>f24</option>
|
|
||||||
<option value='f7'>f7</option>
|
|
||||||
<option value='f8'>f8</option>
|
|
||||||
<option value='f9'>f9</option>
|
|
||||||
<option value='master' selected='selected'>master</option>
|
|
||||||
</select> <input type='submit' name='' value='switch'/></form></td></tr>
|
|
||||||
<tr><td class='sub'>openssl</td><td class='sub right'>Jesse Keating</td></tr></table>
|
|
||||||
<table class='tabs'><tr><td>
|
|
||||||
<a href='/cgit/rpms/openssl.git/'>summary</a><a href='/cgit/rpms/openssl.git/refs/'>refs</a><a href='/cgit/rpms/openssl.git/log/openssl-1.0.2a-version.patch'>log</a><a class='active' href='/cgit/rpms/openssl.git/tree/openssl-1.0.2a-version.patch'>tree</a><a href='/cgit/rpms/openssl.git/commit/openssl-1.0.2a-version.patch'>commit</a><a href='/cgit/rpms/openssl.git/diff/openssl-1.0.2a-version.patch'>diff</a><a href='/cgit/rpms/openssl.git/stats/openssl-1.0.2a-version.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/openssl.git/log/openssl-1.0.2a-version.patch'>
|
|
||||||
<select name='qt'>
|
|
||||||
<option value='grep'>log msg</option>
|
|
||||||
<option value='author'>author</option>
|
|
||||||
<option value='committer'>committer</option>
|
|
||||||
<option value='range'>range</option>
|
|
||||||
</select>
|
|
||||||
<input class='txt' type='text' size='10' name='q' value=''/>
|
|
||||||
<input type='submit' value='search'/>
|
|
||||||
</form>
|
|
||||||
</td></tr></table>
|
|
||||||
<div class='path'>path: <a href='/cgit/rpms/openssl.git/tree/'>root</a>/<a href='/cgit/rpms/openssl.git/tree/openssl-1.0.2a-version.patch'>openssl-1.0.2a-version.patch</a></div><div class='content'>blob: 25dfff51b067efd41d92d3b67c9c8fad820efff5 (<a href='/cgit/rpms/openssl.git/plain/openssl-1.0.2a-version.patch'>plain</a>)
|
|
||||||
<table summary='blob content' class='blob'>
|
|
||||||
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
|
|
||||||
<a id='n2' href='#n2'>2</a>
|
|
||||||
<a id='n3' href='#n3'>3</a>
|
|
||||||
<a id='n4' href='#n4'>4</a>
|
|
||||||
<a id='n5' href='#n5'>5</a>
|
|
||||||
<a id='n6' href='#n6'>6</a>
|
|
||||||
<a id='n7' href='#n7'>7</a>
|
|
||||||
<a id='n8' href='#n8'>8</a>
|
|
||||||
<a id='n9' href='#n9'>9</a>
|
|
||||||
<a id='n10' href='#n10'>10</a>
|
|
||||||
<a id='n11' href='#n11'>11</a>
|
|
||||||
<a id='n12' href='#n12'>12</a>
|
|
||||||
<a id='n13' href='#n13'>13</a>
|
|
||||||
<a id='n14' href='#n14'>14</a>
|
|
||||||
<a id='n15' href='#n15'>15</a>
|
|
||||||
<a id='n16' href='#n16'>16</a>
|
|
||||||
<a id='n17' href='#n17'>17</a>
|
|
||||||
<a id='n18' href='#n18'>18</a>
|
|
||||||
<a id='n19' href='#n19'>19</a>
|
|
||||||
<a id='n20' href='#n20'>20</a>
|
|
||||||
<a id='n21' href='#n21'>21</a>
|
|
||||||
<a id='n22' href='#n22'>22</a>
|
|
||||||
<a id='n23' href='#n23'>23</a>
|
|
||||||
<a id='n24' href='#n24'>24</a>
|
|
||||||
<a id='n25' href='#n25'>25</a>
|
|
||||||
<a id='n26' href='#n26'>26</a>
|
|
||||||
<a id='n27' href='#n27'>27</a>
|
|
||||||
<a id='n28' href='#n28'>28</a>
|
|
||||||
<a id='n29' href='#n29'>29</a>
|
|
||||||
<a id='n30' href='#n30'>30</a>
|
|
||||||
<a id='n31' href='#n31'>31</a>
|
|
||||||
<a id='n32' href='#n32'>32</a>
|
|
||||||
<a id='n33' href='#n33'>33</a>
|
|
||||||
<a id='n34' href='#n34'>34</a>
|
|
||||||
<a id='n35' href='#n35'>35</a>
|
|
||||||
<a id='n36' href='#n36'>36</a>
|
|
||||||
<a id='n37' href='#n37'>37</a>
|
|
||||||
<a id='n38' href='#n38'>38</a>
|
|
||||||
<a id='n39' href='#n39'>39</a>
|
|
||||||
<a id='n40' href='#n40'>40</a>
|
|
||||||
<a id='n41' href='#n41'>41</a>
|
|
||||||
<a id='n42' href='#n42'>42</a>
|
|
||||||
<a id='n43' href='#n43'>43</a>
|
|
||||||
<a id='n44' href='#n44'>44</a>
|
|
||||||
<a id='n45' href='#n45'>45</a>
|
|
||||||
<a id='n46' href='#n46'>46</a>
|
|
||||||
<a id='n47' href='#n47'>47</a>
|
|
||||||
<a id='n48' href='#n48'>48</a>
|
|
||||||
<a id='n49' href='#n49'>49</a>
|
|
||||||
<a id='n50' href='#n50'>50</a>
|
|
||||||
<a id='n51' href='#n51'>51</a>
|
|
||||||
<a id='n52' href='#n52'>52</a>
|
|
||||||
<a id='n53' href='#n53'>53</a>
|
|
||||||
<a id='n54' href='#n54'>54</a>
|
|
||||||
<a id='n55' href='#n55'>55</a>
|
|
||||||
<a id='n56' href='#n56'>56</a>
|
|
||||||
<a id='n57' href='#n57'>57</a>
|
|
||||||
<a id='n58' href='#n58'>58</a>
|
|
||||||
<a id='n59' href='#n59'>59</a>
|
|
||||||
<a id='n60' href='#n60'>60</a>
|
|
||||||
<a id='n61' href='#n61'>61</a>
|
|
||||||
<a id='n62' href='#n62'>62</a>
|
|
||||||
<a id='n63' href='#n63'>63</a>
|
|
||||||
<a id='n64' href='#n64'>64</a>
|
|
||||||
<a id='n65' href='#n65'>65</a>
|
|
||||||
<a id='n66' href='#n66'>66</a>
|
|
||||||
<a id='n67' href='#n67'>67</a>
|
|
||||||
<a id='n68' href='#n68'>68</a>
|
|
||||||
<a id='n69' href='#n69'>69</a>
|
|
||||||
<a id='n70' href='#n70'>70</a>
|
|
||||||
<a id='n71' href='#n71'>71</a>
|
|
||||||
<a id='n72' href='#n72'>72</a>
|
|
||||||
<a id='n73' href='#n73'>73</a>
|
|
||||||
<a id='n74' href='#n74'>74</a>
|
|
||||||
<a id='n75' href='#n75'>75</a>
|
|
||||||
<a id='n76' href='#n76'>76</a>
|
|
||||||
<a id='n77' href='#n77'>77</a>
|
|
||||||
<a id='n78' href='#n78'>78</a>
|
|
||||||
<a id='n79' href='#n79'>79</a>
|
|
||||||
<a id='n80' href='#n80'>80</a>
|
|
||||||
<a id='n81' href='#n81'>81</a>
|
|
||||||
<a id='n82' href='#n82'>82</a>
|
|
||||||
<a id='n83' href='#n83'>83</a>
|
|
||||||
</pre></td>
|
|
||||||
<td class='lines'><pre><code>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;
|
|
||||||
</code></pre></td></tr></table>
|
|
||||||
</div> <!-- class=content -->
|
|
||||||
<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2016-04-30 09:59:51 (GMT)</div>
|
|
||||||
</div> <!-- id=cgit -->
|
|
||||||
</body>
|
|
||||||
</html>
|
|
89
openssl-1.0.2u-version.patch
Normal file
89
openssl-1.0.2u-version.patch
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
--- 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,8 +151,8 @@ DO_GNU_SO=$(CALC_VERSIONS); \
|
||||||
|
SHLIB=lib$(LIBNAME).so; \
|
||||||
|
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) -Wl,-rpath,$(LIBRPATH)"
|
||||||
|
|
||||||
|
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;
|
||||||
|
</code></pre></td></tr></table>
|
||||||
|
</div> <!-- class=content -->
|
||||||
|
<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2016-04-30 09:59:51 (GMT)</div>
|
||||||
|
</div> <!-- id=cgit -->
|
||||||
|
</body>
|
||||||
|
</html>
|
26
openssl102-1.0.2u-ssl3-test-failure.patch
Normal file
26
openssl102-1.0.2u-ssl3-test-failure.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From: Kurt Roeckx <kurt@roeckx.be>
|
||||||
|
Date: Sun, 6 Sep 2015 16:04:11 +0200
|
||||||
|
Subject: Disable SSLv3 test in test suite
|
||||||
|
|
||||||
|
When testing SSLv3 the test program returns 0 for skip. The test for weak DH
|
||||||
|
expects a failure, but gets success.
|
||||||
|
|
||||||
|
It should probably be changed to return something other than 0 for a skipped
|
||||||
|
test.
|
||||||
|
---
|
||||||
|
test/testssl | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/test/testssl b/test/testssl
|
||||||
|
index 747e4ba..1e4370b 100644
|
||||||
|
--- a/test/testssl
|
||||||
|
+++ b/test/testssl
|
||||||
|
@@ -160,7 +160,7 @@ test_cipher() {
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "Testing ciphersuites"
|
||||||
|
-for protocol in TLSv1.2 SSLv3; do
|
||||||
|
+for protocol in TLSv1.2; do
|
||||||
|
echo "Testing ciphersuites for $protocol"
|
||||||
|
for cipher in `../util/shlib_wrap.sh ../apps/openssl ciphers "RSA+$protocol" | tr ':' ' '`; do
|
||||||
|
test_cipher $cipher $protocol
|
4667
openssl102-1.0.2u-versioned-symbols.patch
Normal file
4667
openssl102-1.0.2u-versioned-symbols.patch
Normal file
File diff suppressed because it is too large
Load Diff
124
openssl102.spec
124
openssl102.spec
@ -1,24 +1,22 @@
|
|||||||
Name: openssl102
|
Name: openssl102
|
||||||
Version: 1.0.2q
|
Version: 1.0.2u
|
||||||
Release: 2mamba
|
Release: 2mamba
|
||||||
Summary: Secure Sockets Layer communications libs and utils
|
Summary: Secure Sockets Layer communications libs and utils
|
||||||
Group: Network/Security
|
Group: Network/Security
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
Distribution: openmamba
|
Distribution: openmamba
|
||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||||
URL: http://www.openssl.org
|
URL: https://www.openssl.org/
|
||||||
Source: http://www.openssl.org/source/openssl-%{version}.tar.gz
|
Source: http://www.openssl.org/source/openssl-%{version}.tar.gz
|
||||||
Source1: openssl-makecerts
|
Source1: openssl-makecerts
|
||||||
Patch1: openssl-1.0.2a-version.patch
|
Patch1: openssl-1.0.2u-version.patch
|
||||||
|
Patch2: openssl102-1.0.2u-versioned-symbols.patch
|
||||||
|
Patch3: openssl102-1.0.2u-ssl3-test-failure.patch
|
||||||
License: BSD
|
License: BSD
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
BuildRequires: libperl
|
|
||||||
BuildRequires: perl-WWW-Curl
|
|
||||||
BuildRequires: perl-devel
|
|
||||||
## AUTOBUILDREQ-END
|
## AUTOBUILDREQ-END
|
||||||
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The openssl certificate management tool and the shared libraries that provide various encryption and decription algorithms and protocols, including DES, RC4, RSA and SSL.
|
The openssl certificate management tool and the shared libraries that provide various encryption and decription algorithms and protocols, including DES, RC4, RSA and SSL.
|
||||||
@ -39,7 +37,7 @@ This product includes software written by Tim Hudson (tjh@cryptsoft.com).
|
|||||||
%package -n lib%{name}-devel
|
%package -n lib%{name}-devel
|
||||||
Summary: Library Devel for OpenSSL
|
Summary: Library Devel for OpenSSL
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: lib%{name} = %{version}-%{release}
|
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||||
|
|
||||||
%description -n lib%{name}-devel
|
%description -n lib%{name}-devel
|
||||||
Library symlinks and include files needed to compile apps with support for various cryptographic algorithms and protocols, including DES, RC4, RSA and SSL.
|
Library symlinks and include files needed to compile apps with support for various cryptographic algorithms and protocols, including DES, RC4, RSA and SSL.
|
||||||
@ -60,16 +58,23 @@ Static libraries needed to compile apps with support for various cryptographic a
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n openssl-%{version}
|
%setup -q -n openssl-%{version}
|
||||||
|
#-D -T
|
||||||
|
#:<< _EOF
|
||||||
# Using Fedora versioning patch
|
# Using Fedora versioning patch
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
sed -i 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' crypto/opensslv.h
|
sed -i 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' crypto/opensslv.h
|
||||||
|
|
||||||
|
## Using Arch Linux versioning patch
|
||||||
|
#%patch2 -p1 -b .versioned-symbols
|
||||||
|
%patch3 -p1 -b .ssl3-test-failure
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
#:<< _EOF
|
||||||
|
|
||||||
# FIXME: --openssldir=%{_libdir}/ssl
|
# FIXME: --openssldir=%{_libdir}/ssl
|
||||||
# (FHS: no executable files should be installed in /etc)
|
# (FHS: no executable files should be installed in /etc)
|
||||||
./Configure \
|
./Configure \
|
||||||
%ifarch ppc
|
%ifarch ppc+
|
||||||
linux-ppc \
|
linux-ppc \
|
||||||
%endif
|
%endif
|
||||||
%ifarch i586
|
%ifarch i586
|
||||||
@ -83,8 +88,14 @@ sed -i 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' crypt
|
|||||||
linux-generic32 \
|
linux-generic32 \
|
||||||
%endif
|
%endif
|
||||||
shared \
|
shared \
|
||||||
|
no-ssl3-method \
|
||||||
enable-md2 \
|
enable-md2 \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
|
%ifarch x86_64 aarch64
|
||||||
|
--libdir=lib64/openssl-1.0 \
|
||||||
|
%else
|
||||||
|
--libdir=lib/openssl-1.0 \
|
||||||
|
%endif
|
||||||
--openssldir=/etc/ssl
|
--openssldir=/etc/ssl
|
||||||
|
|
||||||
%ifarch ppc
|
%ifarch ppc
|
||||||
@ -97,37 +108,38 @@ sed -i 's|\(.*\)chmod 644\(.*/lib/pkgconfig\)|\1chmod 755\2|' Makefile
|
|||||||
%make -j1 CC=%{_host}-gcc rehash
|
%make -j1 CC=%{_host}-gcc rehash
|
||||||
|
|
||||||
#export LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
#export LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||||
%if "%{_host}" == "%{_build}"
|
#%if "%{_host}" == "%{_build}"
|
||||||
make test
|
#make test
|
||||||
%endif
|
#%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
make install CC=%{_host}-gcc INSTALL_PREFIX=%{buildroot} MANDIR=%{_mandir}
|
make install CC=%{_host}-gcc INSTALL_PREFIX=%{buildroot} MANDIR=%{_mandir}
|
||||||
|
|
||||||
chmod 755 %{buildroot}%{_libdir}/pkgconfig
|
# Legacy package
|
||||||
chmod 644 %{buildroot}%{_libdir}/pkgconfig/*.pc
|
rm -rf %{buildroot}%{_mandir}
|
||||||
|
rm -rf %{buildroot}%{_sysconfdir}
|
||||||
mv %{buildroot}%{_mandir}/man1/passwd.* \
|
|
||||||
%{buildroot}%{_mandir}/man1/openssl-passwd.*
|
|
||||||
mv %{buildroot}%{_mandir}/man3/err.* \
|
|
||||||
%{buildroot}%{_mandir}/man3/openssl-err.*
|
|
||||||
mv %{buildroot}%{_mandir}/man3/rand.* \
|
|
||||||
%{buildroot}%{_mandir}/man3/openssl-rand.*
|
|
||||||
# rpmbuild can't correctly handle spaces in symlink names
|
|
||||||
rm -f %{buildroot}%{_mandir}/man7/Modes\ of\ DES.7
|
|
||||||
|
|
||||||
mkdir -p %{buildroot}/var/ssl/{certs,newcerts,private,crl}
|
|
||||||
touch %{buildroot}/var/ssl/index.txt
|
|
||||||
echo "01" > %{buildroot}/var/ssl/serial
|
|
||||||
|
|
||||||
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
|
||||||
rm -f %{buildroot}%{_libdir}/fips_premain.c.sha1
|
rm -f %{buildroot}%{_libdir}/fips_premain.c.sha1
|
||||||
rm -f %{buildroot}%{_mandir}/man3/.3*
|
rm -f %{buildroot}%{_mandir}/man3/.3*
|
||||||
|
|
||||||
install -m 0755 -D %{SOURCE1} %{buildroot}%{_sbindir}/openssl-makecerts
|
install -m 0755 -D %{SOURCE1} %{buildroot}%{_sbindir}/openssl-1.0-makecerts
|
||||||
|
|
||||||
|
# Move some files around
|
||||||
|
install -m755 -d %{buildroot}%{_includedir}/openssl-1.0
|
||||||
|
mv %{buildroot}%{_includedir}/openssl %{buildroot}%{_includedir}/openssl-1.0/
|
||||||
|
mv %{buildroot}%{_libdir}/openssl-1.0/libcrypto.so.1.0.2 %{buildroot}%{_libdir}
|
||||||
|
mv %{buildroot}%{_libdir}/openssl-1.0/libssl.so.1.0.2 %{buildroot}%{_libdir}
|
||||||
|
chmod 755 %{buildroot}%{_libdir}/libcrypto.so.1.0.2
|
||||||
|
chmod 755 %{buildroot}%{_libdir}/libssl.so.1.0.2
|
||||||
|
chmod 755 %{buildroot}%{_libdir}/openssl-1.0/engines/*.so
|
||||||
|
ln -sf ../libssl.so.1.0.0 %{buildroot}%{_libdir}/openssl-1.0/libssl.so
|
||||||
|
ln -sf ../libcrypto.so.1.0.0 %{buildroot}%{_libdir}/openssl-1.0/libcrypto.so
|
||||||
|
mv %{buildroot}%{_bindir}/openssl %{buildroot}%{_bindir}/openssl-1.0
|
||||||
|
mv %{buildroot}%{_bindir}/c_rehash %{buildroot}%{_bindir}/c_rehash-1.0
|
||||||
|
|
||||||
|
# Update includedir in .pc files
|
||||||
|
sed -e 's|/include$|/include/openssl-1.0|' -i %{buildroot}%{_libdir}/openssl-1.0/pkgconfig/*.pc
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
@ -137,48 +149,40 @@ install -m 0755 -D %{SOURCE1} %{buildroot}%{_sbindir}/openssl-makecerts
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%config(noreplace) %{_sysconfdir}/ssl/openssl.cnf
|
%{_bindir}/c_rehash-1.0
|
||||||
%dir %{_sysconfdir}/ssl/private
|
%{_bindir}/openssl-1.0
|
||||||
%{_sysconfdir}/ssl/misc
|
%{_sbindir}/openssl-1.0-makecerts
|
||||||
%{_bindir}/c_rehash
|
|
||||||
#%{_bindir}/fipsld
|
|
||||||
%{_bindir}/openssl
|
|
||||||
%{_sbindir}/openssl-makecerts
|
|
||||||
#%{_bindir}/openssl_fips_fingerprint
|
|
||||||
%{_mandir}/man1/*
|
|
||||||
%{_mandir}/man5/*
|
|
||||||
%{_mandir}/man7/*
|
|
||||||
%dir /var/ssl
|
|
||||||
%dir /var/ssl/certs
|
|
||||||
%dir /var/ssl/crl
|
|
||||||
%dir /var/ssl/newcerts
|
|
||||||
%dir %attr(0700,root,root) /var/ssl/private
|
|
||||||
%config(noreplace) /var/ssl/index.txt
|
|
||||||
%config(noreplace) /var/ssl/serial
|
|
||||||
|
|
||||||
%files -n lib%{name}
|
%files -n lib%{name}
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/libcrypto.so.*
|
%{_libdir}/libcrypto.so.*
|
||||||
%{_libdir}/libssl.so.*
|
%{_libdir}/libssl.so.*
|
||||||
%{_libdir}/engines/lib*.so
|
%dir %{_libdir}/openssl-1.0
|
||||||
|
%{_libdir}/openssl-1.0/engines/lib*.so
|
||||||
%doc LICENSE
|
%doc LICENSE
|
||||||
|
|
||||||
%files -n lib%{name}-devel
|
%files -n lib%{name}-devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%dir %{_includedir}/openssl
|
%dir %{_includedir}/openssl-1.0
|
||||||
%{_includedir}/openssl/*
|
%dir %{_includedir}/openssl-1.0/openssl
|
||||||
%{_libdir}/*.so
|
%{_includedir}/openssl-1.0/openssl/*
|
||||||
%{_libdir}/pkgconfig/libcrypto.pc
|
%{_libdir}/openssl-1.0/lib*.so
|
||||||
%{_libdir}/pkgconfig/libssl.pc
|
%{_libdir}/openssl-1.0/pkgconfig/libcrypto.pc
|
||||||
%{_libdir}/pkgconfig/openssl.pc
|
%{_libdir}/openssl-1.0/pkgconfig/libssl.pc
|
||||||
%{_mandir}/man3/*
|
%{_libdir}/openssl-1.0/pkgconfig/openssl.pc
|
||||||
%doc CHANGES* FAQ NEWS PROBLEMS README*
|
%doc CHANGES* FAQ NEWS PROBLEMS README*
|
||||||
|
|
||||||
%files -n lib%{name}-static
|
%files -n lib%{name}-static
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/*.a
|
%{_libdir}/openssl-1.0/lib*.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 03 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.2u-2mamba
|
||||||
|
- restore versioning patch from Fedora
|
||||||
|
|
||||||
|
* Sun Jan 02 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.2u-1mamba
|
||||||
|
- update to 1.0.2u
|
||||||
|
|
||||||
* Sat Dec 08 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.2q-2mamba
|
* Sat Dec 08 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.2q-2mamba
|
||||||
- legacy package
|
- legacy package
|
||||||
|
|
||||||
@ -389,5 +393,5 @@ install -m 0755 -D %{SOURCE1} %{buildroot}%{_sbindir}/openssl-makecerts
|
|||||||
* Wed Apr 30 2003 Silvan Calarco <silvan.calarco@qinet.it>
|
* Wed Apr 30 2003 Silvan Calarco <silvan.calarco@qinet.it>
|
||||||
- err, rand and passwd manpages renamed to openssl-* to avoid conflicts with other versions
|
- err, rand and passwd manpages renamed to openssl-* to avoid conflicts with other versions
|
||||||
|
|
||||||
* Tue Apr 16 2003 Luca Tinelli <luca.tinelli@qinet.it>
|
* Wed Apr 16 2003 Luca Tinelli <luca.tinelli@qinet.it>
|
||||||
- first build
|
- first build
|
||||||
|
Loading…
Reference in New Issue
Block a user