Changes - j0ke.net Open Build Service

Changes of Revision 150

[-] [+]	Changed	nginx.spec
@@ -16,7 +16,7 @@ %define sticky_module_version 1.1 -%define openssl_version 1.0.1j +%define libressl_version 2.1.1 %define modsec_version 2.8.0 @@ -71,7 +71,7 @@ Source18: ngx_http_auth_pam_module-1.2.tar.gz Source20: GeoIPCountryWhois.csv Source21: nginx-http-rdns.tar.gz -Source22: openssl-%{openssl_version}.tar.gz +Source22: libressl-%{openssl_version}.tar.gz Source100: index.html Source101: poweredby.png @@ -92,6 +92,8 @@ Patch1: nginx-conf-0.7.x.patch Patch2: check_1.2.6+.patch +Patch3: libressl-version.patch # modify libressl version output to make nginx happy + %description Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3 proxy server written by Igor Sysoev. @@ -132,7 +134,11 @@ %{__tar} zxvf %{SOURCE16} unzip %{SOURCE17} %{__tar} zxvf %{SOURCE18} -%{__tar} zxvf %{SOURCE22} +%{__tar} zxvf %{SOURCE22} + +cd libressl-{libressl_version} +%patch3 -p1 +cd .. %build @@ -181,7 +187,7 @@ --with-debug \ --with-ipv6 \ --with-http_spdy_module \ - --with-openssl=%{_builddir}/nginx-%{version}/openssl-%{openssl_version} \ + --with-openssl=%{_builddir}/nginx-%{version}/libressl-%{libressl_version} \ --add-module=%{_builddir}/nginx-%{version}/modsecurity-%{modsec_version}/nginx/modsecurity \ --add-module=%{_builddir}/nginx-%{version}/ngx_cache_purge-2.1 \ --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair \
[-] [+]	Added	libressl-version.patch ^
@@ -0,0 +1,11 @@ +--- include/openssl/opensslv.h.orig 2014-10-17 10:44:31.485191132 +0100 ++++ include/openssl/opensslv.h 2014-10-17 10:45:36.353625132 +0100 +@@ -3,7 +3,7 @@ + #define HEADER_OPENSSLV_H + + #define LIBRESSL_VERSION_NUMBER 0x20000000L +-#define OPENSSL_VERSION_NUMBER 0x20000000L ++#define OPENSSL_VERSION_NUMBER 0x1000107fL + #define OPENSSL_VERSION_TEXT "LibreSSL 2.1" + #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT + \ No newline at end of file
	Added	libressl-2.1.1.tar.gz ^