Changes - j0ke.net Open Build Service

Changes of Revision 146

[-] [+]	Changed	nginx.spec
@@ -227,7 +227,6 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALLDIRS=vendor find %{buildroot} -type f -name .packlist -exec rm -f {} \; -#find %{buildroot} -type f -name perllocal.pod -exec rm -f {} \; find %{buildroot} -type f -empty -exec rm -f {} \; find %{buildroot} -type f -exec chmod 0644 {} \; find %{buildroot} -type f -name '.so' -exec chmod 0755 {} \; @@ -289,7 +288,8 @@ %doc mod_zip-master/CHANGES.mod_zip mod_zip-master/README.mod_zip mod_zip-master/t/nginx.conf.mod_zip %doc ngx_http_auth_pam_module-1.2/ChangeLog.ngx_http_auth_pam_module-1.2 ngx_http_auth_pam_module-1.2/README.ngx_http_auth_pam_module-1.2 %doc LICENSE CHANGES README ngx_cache_purge-2.1/CHANGES.ngx_cache_purge ngx_cache_purge-2.1/README.ngx_cache_purge ngx_cache_purge-2.1/LICENSE.ngx_cache_purge -%doc nginx-boilerplate.tar.gz +%doc nginx/nginx-boilerplate.tar.gz + %{_mandir}/man8/nginx-upgrade.8 #%{_mandir}/man3/* @@ -317,17 +317,10 @@ %config(noreplace) %{nginx_confdir}/mime.types %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} -#%dir %{perl_vendorarch}/auto/%{name} -#%{perl_vendorarch}/%{name}.pm -#%{perl_vendorarch}/auto/%{name}/%{name}.so %attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_home} %attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_home_tmp} %attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_logdir} -## ngx_pagespeed -##%config(noreplace) %{nginx_confdir}/conf.d/.conf.sample -#%attr(-,%{nginx_user},%{nginx_group}) %dir %{ngx_pagespeed_cache} - %changelog Thu Sep 25 2014 Juergen Gotteswinter <jg@internetx.com> - 1.7.5-ixuber1
[-] [+]	Deleted	nginx-1.3.12-polarssl-20130217.diff ^
@@ -1,2591 +0,0 @@ -diff -uNr nginx-1.3.12/auto/lib/conf nginx-1.3.12-polarssl/auto/lib/conf ---- nginx-1.3.12/auto/lib/conf 2012-01-18 07:07:43.000000000 -0800 -+++ nginx-1.3.12-polarssl/auto/lib/conf 2013-02-17 00:29:25.000000000 -0800 -@@ -20,9 +20,21 @@ - fi - fi - -+if [ $USE_SSL = YES ]; then -+ if [ $USE_OPENSSL = YES -o $OPENSSL != NONE ]; then -+ . auto/lib/openssl/conf -+ elif [ $USE_POLARSSL = YES -o $POLARSSL != NONE ]; then -+ . auto/lib/polarssl/conf -+ else -+ cat << END -+ -+$0: error: Some modules requires a SSL library. -+You can either disable the modules or you have to enable a SSL -+implementation. - --if [ $USE_OPENSSL = YES ]; then -- . auto/lib/openssl/conf -+END -+ exit 1 -+ fi - fi - - if [ $USE_MD5 = YES ]; then -diff -uNr nginx-1.3.12/auto/lib/make nginx-1.3.12-polarssl/auto/lib/make ---- nginx-1.3.12/auto/lib/make 2012-01-18 07:07:43.000000000 -0800 -+++ nginx-1.3.12-polarssl/auto/lib/make 2013-02-17 04:49:55.000000000 -0800 -@@ -19,6 +19,10 @@ - . auto/lib/openssl/make - fi - -+if [ $POLARSSL != NONE -a $POLARSSL != NO -a $POLARSSL != YES ]; then -+ . auto/lib/polarssl/make -+fi -+ - if [ $ZLIB != NONE -a $ZLIB != NO -a $ZLIB != YES ]; then - . auto/lib/zlib/make - fi -diff -uNr nginx-1.3.12/auto/lib/polarssl/conf nginx-1.3.12-polarssl/auto/lib/polarssl/conf ---- nginx-1.3.12/auto/lib/polarssl/conf 1969-12-31 16:00:00.000000000 -0800 -+++ nginx-1.3.12-polarssl/auto/lib/polarssl/conf 2013-02-17 00:37:06.000000000 -0800 -@@ -0,0 +1,70 @@ -+ -+# Copyright (C) Igor Sysoev -+# Copyright (C) Nginx, Inc. -+ -+ -+if [ $POLARSSL != NONE ]; then -+ -+ case "$CC" in -+ -+ cl \| bcc32) -+ # Someone that cares should support windows. -+ -+cat << END -+ -+$0: error: Ngnix's PolarSSL support requires a non-cl/bcc32 compiler. -+The build infrastructure for PolarSSL support has not been written for cl or -+bcc32. You can either use GCC or try using OpenSSL instead. -+ -+END -+ exit 1 -+ ;; -+ -+ ) -+ have=NGX_POLARSSL . auto/have -+ have=NGX_SSL . auto/have -+ -+ CORE_INCS="$CORE_INCS $POLARSSL/.polarssl/include" -+ CORE_DEPS="$CORE_DEPS $POLARSSL/.polarssl/include/polarssl/config.h" -+ CORE_LIBS="$CORE_LIBS $POLARSSL/.polarssl/lib/libpolarssl.a" -+ CORE_LIBS="$CORE_LIBS $NGX_LIBDL" -+ ;; -+ esac -+ -+else -+ -+ if [ "$NGX_PLATFORM" != win32 ]; then -+ -+ POLARSSL=NO -+ -+ ngx_feature="PolarSSL library" -+ ngx_feature_name="NGX_POLARSSL" -+ ngx_feature_run=no -+ ngx_feature_incs="#include <polarssl/config.h> -+ #include <polarssl/ssl.h>" -+ ngx_feature_path= -+ ngx_feature_libs="-lpolarssl" -+ ngx_feature_test="ssl_context c; ssl_init(&c);" -+ . auto/feature -+ -+ if [ $ngx_found = yes ]; then -+ have=NGX_SSL . auto/have -+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL" -+ POLARSSL=YES -+ fi -+ fi -+ -+ if [ $POLARSSL != YES ]; then -+ -+cat << END -+ -+$0: error: SSL modules require the PolarSSL library. -+You can either do not enable the modules, or install the PolarSSL library -+into the system, or build the PolarSSL library statically from the source -+with nginx by using --with-polarssl=<path> option. -+ -+END -+ exit 1 -+ fi -+ -+fi -diff -uNr nginx-1.3.12/auto/lib/polarssl/make nginx-1.3.12-polarssl/auto/lib/polarssl/make ---- nginx-1.3.12/auto/lib/polarssl/make 1969-12-31 16:00:00.000000000 -0800 -+++ nginx-1.3.12-polarssl/auto/lib/polarssl/make 2013-02-17 00:11:52.000000000 -0800 -@@ -0,0 +1,31 @@ -+ -+# Copyright (C) Igor Sysoev -+# Copyright (C) Nginx, Inc. -+ -+ -+case "$CC" in -+ -+ # TODO: Someone that cares should write this for cl/BCC. -+ -+ cl) -+ exit 1 -+ ;; -+ -+ bcc32) -+ exit 1 -+ ;; -+ -+ ) -+ cat << END >> $NGX_MAKEFILE -+ -+$POLARSSL/.polarssl/include/polarssl/config.h: $NGX_MAKEFILE -+ cd $POLARSSL \\ -+ && \$(MAKE) clean \\ -+ && \$(MAKE) no_test \\ -+ && \$(MAKE) install DESTDIR=.polarssl -+ -+END -+ -+ ;; -+ -+esac -diff -uNr nginx-1.3.12/auto/modules nginx-1.3.12-polarssl/auto/modules ---- nginx-1.3.12/auto/modules 2012-09-10 09:52:47.000000000 -0700 -+++ nginx-1.3.12-polarssl/auto/modules 2013-02-17 04:52:21.000000000 -0800 -@@ -275,7 +275,7 @@ - fi - - if [ $HTTP_SSL = YES ]; then -- USE_OPENSSL=YES -+ USE_SSL=YES - have=NGX_HTTP_SSL . auto/have - HTTP_MODULES="$HTTP_MODULES $HTTP_SSL_MODULE" - HTTP_DEPS="$HTTP_DEPS $HTTP_SSL_DEPS" -@@ -399,17 +399,24 @@ - - if [ $MAIL_SSL = YES ]; then - have=NGX_MAIL_SSL . auto/have -- USE_OPENSSL=YES -+ USE_SSL=YES - fi - - - modules="$CORE_MODULES $EVENT_MODULES" - -+if [ $USE_SSL = YES ]; then -+ if [ $OPENSSL != NONE -o $USE_OPENSSL = YES ]; then -+ modules="$modules $OPENSSL_MODULE" -+ CORE_DEPS="$CORE_DEPS $OPENSSL_DEPS" -+ CORE_SRCS="$CORE_SRCS $OPENSSL_SRCS" -+ fi - --if [ $USE_OPENSSL = YES ]; then -- modules="$modules $OPENSSL_MODULE" -- CORE_DEPS="$CORE_DEPS $OPENSSL_DEPS" -- CORE_SRCS="$CORE_SRCS $OPENSSL_SRCS" -+ if [ $POLARSSL != NONE -o $USE_POLARSSL = YES ]; then -+ modules="$modules $POLARSSL_MODULE" -+ CORE_DEPS="$CORE_DEPS $POLARSSL_DEPS" -+ CORE_SRCS="$CORE_SRCS $POLARSSL_SRCS" -+ fi - fi - - if [ $USE_PCRE = YES ]; then -diff -uNr nginx-1.3.12/auto/options nginx-1.3.12-polarssl/auto/options ---- nginx-1.3.12/auto/options 2012-09-26 09:39:38.000000000 -0700 -+++ nginx-1.3.12-polarssl/auto/options 2013-02-17 04:55:03.000000000 -0800 -@@ -117,9 +117,14 @@ - PCRE_CONF_OPT= - PCRE_JIT=NO -
	Deleted	nginx-1.5.12.tar.gz ^
	Deleted	nginx-1.5.7.tar.gz ^