| [2558] | 1 | --- openssl.spec.orig 2013-02-19 16:06:27.000000000 -0500 |
|---|
| 2 | +++ openssl.spec 2014-08-06 20:57:41.043801219 -0400 |
|---|
| 3 | @@ -20,13 +20,13 @@ |
|---|
| 4 | |
|---|
| 5 | Summary: A general purpose cryptography library with TLS implementation |
|---|
| 6 | Name: openssl |
|---|
| 7 | -Version: 1.0.0k |
|---|
| 8 | -Release: 1%{?dist} |
|---|
| 9 | +Version: 1.0.0n |
|---|
| 10 | +Release: 0%{?dist}.scripts.%{scriptsversion} |
|---|
| 11 | Epoch: 1 |
|---|
| 12 | # We have to remove certain patented algorithms from the openssl source |
|---|
| 13 | # tarball with the hobble-openssl script which is included below. |
|---|
| 14 | # The original openssl upstream tarball cannot be shipped in the .src.rpm. |
|---|
| 15 | -Source: openssl-%{version}-usa.tar.xz |
|---|
| 16 | +Source: https://www.openssl.org/source/openssl-%{version}.tar.gz |
|---|
| 17 | Source1: hobble-openssl |
|---|
| 18 | Source2: Makefile.certificate |
|---|
| 19 | Source6: make-dummy-cert |
|---|
| 20 | @@ -44,23 +44,22 @@ |
|---|
| 21 | Patch7: openssl-1.0.0-timezone.patch |
|---|
| 22 | # Bug fixes |
|---|
| 23 | Patch23: openssl-1.0.0-beta4-default-paths.patch |
|---|
| 24 | -Patch25: openssl-1.0.0a-manfix.patch |
|---|
| 25 | # Functionality changes |
|---|
| 26 | Patch32: openssl-0.9.8g-ia64.patch |
|---|
| 27 | Patch33: openssl-1.0.0-beta4-ca-dir.patch |
|---|
| 28 | Patch34: openssl-0.9.6-x509.patch |
|---|
| 29 | Patch35: openssl-0.9.8j-version-add-engines.patch |
|---|
| 30 | -Patch38: openssl-1.0.0-beta5-cipher-change.patch |
|---|
| 31 | -Patch39: openssl-1.0.0b-ipv6-apps.patch |
|---|
| 32 | -Patch40: openssl-1.0.0k-fips.patch |
|---|
| 33 | +Patch38: openssl-1.0.0n-cipher-change.patch |
|---|
| 34 | +Patch39: openssl-1.0.0n-ipv6-apps.patch |
|---|
| 35 | +Patch40: openssl-1.0.0n-fips.patch |
|---|
| 36 | Patch41: openssl-1.0.0-beta3-fipscheck.patch |
|---|
| 37 | Patch43: openssl-1.0.0a-fipsmode.patch |
|---|
| 38 | Patch44: openssl-1.0.0-beta3-fipsrng.patch |
|---|
| 39 | Patch45: openssl-1.0.1e-env-zlib.patch |
|---|
| 40 | Patch47: openssl-1.0.0-beta5-readme-warning.patch |
|---|
| 41 | -Patch49: openssl-1.0.1a-algo-doc.patch |
|---|
| 42 | +Patch49: openssl-1.0.0n-algo-doc.patch |
|---|
| 43 | Patch50: openssl-1.0.0-beta4-dtls1-abi.patch |
|---|
| 44 | -Patch51: openssl-1.0.0k-version.patch |
|---|
| 45 | +Patch51: openssl-1.0.0n-version.patch |
|---|
| 46 | Patch52: openssl-1.0.0b-aesni.patch |
|---|
| 47 | Patch53: openssl-1.0.0-name-hash.patch |
|---|
| 48 | Patch54: openssl-1.0.0c-speed-fips.patch |
|---|
| 49 | @@ -73,13 +72,11 @@ |
|---|
| 50 | Patch61: openssl-1.0.0d-cavs.patch |
|---|
| 51 | Patch62: openssl-1.0.0-fips-aesni.patch |
|---|
| 52 | Patch63: openssl-1.0.0d-xmpp-starttls.patch |
|---|
| 53 | -Patch64: openssl-1.0.0k-intelopts.patch |
|---|
| 54 | Patch65: openssl-1.0.0e-chil-fixes.patch |
|---|
| 55 | Patch66: openssl-1.0.0-sha2test.patch |
|---|
| 56 | Patch67: openssl-1.0.0k-secure-getenv.patch |
|---|
| 57 | # Backported fixes including security fixes |
|---|
| 58 | Patch81: openssl-1.0.0d-padlock64.patch |
|---|
| 59 | -Patch82: openssl-1.0.0k-backports.patch |
|---|
| 60 | |
|---|
| 61 | License: OpenSSL |
|---|
| 62 | Group: System Environment/Libraries |
|---|
| 63 | @@ -143,7 +140,6 @@ |
|---|
| 64 | %patch7 -p1 -b .timezone |
|---|
| 65 | |
|---|
| 66 | %patch23 -p1 -b .default-paths |
|---|
| 67 | -%patch25 -p1 -b .manfix |
|---|
| 68 | |
|---|
| 69 | %patch32 -p1 -b .ia64 |
|---|
| 70 | %patch33 -p1 -b .ca-dir |
|---|
| 71 | @@ -172,13 +168,11 @@ |
|---|
| 72 | %patch61 -p1 -b .cavs |
|---|
| 73 | %patch62 -p1 -b .fips-aesni |
|---|
| 74 | %patch63 -p1 -b .starttls |
|---|
| 75 | -%patch64 -p1 -b .intelopts |
|---|
| 76 | %patch65 -p1 -b .chil |
|---|
| 77 | %patch66 -p1 -b .sha2test |
|---|
| 78 | %patch67 -p1 -b .secure-getenv |
|---|
| 79 | |
|---|
| 80 | %patch81 -p1 -b .padlock64 |
|---|
| 81 | -%patch82 -p1 -b .backports |
|---|
| 82 | |
|---|
| 83 | # Modify the various perl scripts to reference perl in the right location. |
|---|
| 84 | perl util/perlpath.pl `dirname %{__perl}` |
|---|
