Changes - j0ke.net Open Build Service

Changes of Revision 165

[-] [+]	Changed	nginx.spec
@@ -16,15 +16,16 @@ %define sticky_module_version 1.1 -%define libressl_version 2.1.1 +%define openssl_version 1.0.2 %define modsec_version 2.8.0 Name: nginx -Version: 1.7.6 -Release: libre1 -Summary: Robust, small and high performance http and reverse proxy server - heavy module extended pack incl. a few fixes to make them apply cleanly together. RPM Tag íxhuge from now. +Version: 1.7.9 +Release: 1 +Summary: Robust, small and high performance http and reverse proxy server - heavy module extended pack incl. a few fixes to make them apply cleanly together. + Built against OpenSSL 1.2.x Group: System Environment/Daemons @@ -71,7 +72,7 @@ Source18: ngx_http_auth_pam_module-1.2.tar.gz Source20: GeoIPCountryWhois.csv Source21: nginx-http-rdns.tar.gz -Source22: libressl-%{libressl_version}.tar.gz +Source22: openssl-%{openssl_version}.tar.gz Source100: index.html Source101: poweredby.png @@ -92,8 +93,6 @@ Patch1: nginx-conf-0.7.x.patch Patch2: check_1.2.6+.patch -# make it work with libressl -Patch3: nginx__libressl.patch %description Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3 @@ -113,7 +112,7 @@ * nginx-upstream-carp-read-only * nginx mod security -last but not least this package includes its own libressl +last but not least this package includes its own openssl %prep @@ -125,7 +124,6 @@ %patch0 -p0 %patch1 -p0 %patch2 -p1 -%patch3 -p1 %{__tar} zxvf %{SOURCE5} %{__tar} zxvf %{SOURCE9} @@ -154,10 +152,10 @@ make install-exec-hook \|\| : popd -pushd libressl-2.1.1 -%configure && make -ln -s configure config -popd +#pushd openssl-2.1.1 +#%configure && make +#ln -s configure config +#popd export DESTDIR=%{buildroot} @@ -190,7 +188,7 @@ --with-debug \ --with-ipv6 \ --with-http_spdy_module \ - --with-openssl=%{_builddir}/nginx-%{version}/libressl-%{libressl_version} \ + --with-openssl=%{_builddir}/nginx-%{version}/openssl-%{openssl_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 \
[-] [+]	Deleted	libressl-version.patch ^
@@ -1,11 +0,0 @@ ---- 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
	Deleted	libressl-2.1.1.tar.gz ^
	Added	openssl-1.0.2.tar.gz ^