Accepting request 824381 from home:dirkmueller:branches:server:http

- update nginx-1.6.1-default_config.patch:
  * remove geoip_module which is no longer compiled (bsc#1156202)

OBS-URL: https://build.opensuse.org/request/show/824381
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=174

check_1.9.2+.patch

@@ -12,7 +12,7 @@ Index: src/http/modules/ngx_http_upstream_hash_module.c
  
  typedef struct {
      uint32_t                            hash;
-@@ -235,6 +238,15 @@ ngx_http_upstream_get_hash_peer(ngx_peer
+@@ -238,6 +241,15 @@ ngx_http_upstream_get_hash_peer(ngx_peer
              goto next;
          }
  
@@ -28,7 +28,7 @@ Index: src/http/modules/ngx_http_upstream_hash_module.c
          if (peer->max_fails
              && peer->fails >= peer->max_fails
              && now - peer->checked <= peer->fail_timeout)
-@@ -538,6 +550,15 @@ ngx_http_upstream_get_chash_peer(ngx_pee
+@@ -560,6 +572,15 @@ ngx_http_upstream_get_chash_peer(ngx_pee
                  continue;
              }
  
@@ -58,7 +58,7 @@ Index: src/http/modules/ngx_http_upstream_ip_hash_module.c
  
  typedef struct {
      /* the round robin data must be first */
-@@ -205,6 +208,15 @@ ngx_http_upstream_get_ip_hash_peer(ngx_p
+@@ -208,6 +211,15 @@ ngx_http_upstream_get_ip_hash_peer(ngx_p
              goto next;
          }
  

nginx-1.6.1-default_config.patch

@@ -1,6 +1,8 @@
---- conf/nginx.conf.orig	2018-03-28 11:56:48.834012377 +0200
-+++ conf/nginx.conf	2018-03-28 13:16:09.978372767 +0200
-@@ -1,16 +1,28 @@
+Index: conf/nginx.conf
+===================================================================
+--- conf/nginx.conf.orig
++++ conf/nginx.conf
+@@ -1,16 +1,26 @@
  
 -#user  nobody;
 +#user  nginx;
@@ -10,14 +12,12 @@
 -#error_log  logs/error.log  notice;
 -#error_log  logs/error.log  info;
 +# load_module #LIBDIR#/nginx/modules/ngx_http_fancyindex_module.so;
-+# load_module #LIBDIR#/nginx/modules/ngx_http_geoip_module.so;
 +# load_module #LIBDIR#/nginx/modules/ngx_http_headers_more_filter_module.so;
 +# load_module #LIBDIR#/nginx/modules/ngx_http_image_filter_module.so;
 +# load_module #LIBDIR#/nginx/modules/ngx_http_perl_module.so;
 +# load_module #LIBDIR#/nginx/modules/ngx_http_xslt_filter_module.so;
 +# load_module #LIBDIR#/nginx/modules/ngx_mail_module.so;
 +# load_module #LIBDIR#/nginx/modules/ngx_rtmp_module.so;
-+# load_module #LIBDIR#/nginx/modules/ngx_stream_geoip_module.so;
 +# load_module #LIBDIR#/nginx/modules/ngx_stream_module.so;
 +
 +#error_log  /var/log/nginx/error.log;
@@ -34,7 +34,7 @@
  }
  
  
-@@ -22,7 +34,7 @@
+@@ -22,7 +32,7 @@ http {
      #                  '$status $body_bytes_sent "$http_referer" '
      #                  '"$http_user_agent" "$http_x_forwarded_for"';
  
@@ -43,7 +43,7 @@
  
      sendfile        on;
      #tcp_nopush     on;
-@@ -32,16 +44,18 @@
+@@ -32,16 +42,18 @@ http {
  
      #gzip  on;
  
@@ -64,7 +64,7 @@
              index  index.html index.htm;
          }
  
-@@ -51,7 +65,7 @@
+@@ -51,7 +63,7 @@ http {
          #
          error_page   500 502 503 504  /50x.html;
          location = /50x.html {
@@ -73,7 +73,7 @@
          }
  
          # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -63,7 +77,7 @@
+@@ -63,7 +75,7 @@ http {
          # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
          #
          #location ~ \.php$ {
@@ -82,7 +82,7 @@
          #    fastcgi_pass   127.0.0.1:9000;
          #    fastcgi_index  index.php;
          #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-@@ -87,7 +101,7 @@
+@@ -87,7 +99,7 @@ http {
      #    server_name  somename  alias  another.alias;
  
      #    location / {
@@ -91,18 +91,18 @@
      #        index  index.html index.htm;
      #    }
      #}
-@@ -101,6 +115,10 @@
- 
+@@ -102,6 +114,10 @@ http {
      #    ssl_certificate      cert.pem;
      #    ssl_certificate_key  cert.key;
-+    
+ 
 +    #    Allow TLS version 1.2 only, which is a recommended default these days
 +    #    by international information security standards.
 +    #    ssl_protocols        TLSv1.2;
- 
++
      #    ssl_session_cache    shared:SSL:1m;
      #    ssl_session_timeout  5m;
-@@ -109,9 +127,11 @@
+ 
+@@ -109,9 +125,11 @@ http {
      #    ssl_prefer_server_ciphers  on;
  
      #    location / {

nginx-aio.patch

@@ -1,8 +1,8 @@
-Index: nginx-1.11.3/auto/unix
+Index: nginx-1.19.1/auto/unix
 ===================================================================
---- nginx-1.11.3.orig/auto/unix
-+++ nginx-1.11.3/auto/unix
-@@ -531,7 +531,12 @@ if [ $NGX_FILE_AIO = YES ]; then
+--- nginx-1.19.1.orig/auto/unix
++++ nginx-1.19.1/auto/unix
+@@ -559,7 +559,12 @@ if [ $NGX_FILE_AIO = YES ]; then
          ngx_feature="Linux AIO support (SYS_eventfd)"
          ngx_feature_incs="#include <linux/aio_abi.h>
                            #include <sys/syscall.h>"
@@ -16,10 +16,10 @@ Index: nginx-1.11.3/auto/unix
                            iocb.aio_lio_opcode = IOCB_CMD_PREAD;
                            iocb.aio_flags = IOCB_FLAG_RESFD;
                            iocb.aio_resfd = -1;
-Index: nginx-1.11.3/src/event/modules/ngx_epoll_module.c
+Index: nginx-1.19.1/src/event/modules/ngx_epoll_module.c
 ===================================================================
---- nginx-1.11.3.orig/src/event/modules/ngx_epoll_module.c
-+++ nginx-1.11.3/src/event/modules/ngx_epoll_module.c
+--- nginx-1.19.1.orig/src/event/modules/ngx_epoll_module.c
++++ nginx-1.19.1/src/event/modules/ngx_epoll_module.c
 @@ -77,9 +77,7 @@ int epoll_wait(int epfd, struct epoll_ev
  
  #if (NGX_HAVE_FILE_AIO)

nginx.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug  4 19:10:24 UTC 2020 - Dirk Mueller <dmueller@suse.com>
+
+- update nginx-1.6.1-default_config.patch:
+  * remove geoip_module which is no longer compiled (bsc#1156202)
+
 -------------------------------------------------------------------
 Wed Jul  8 11:52:53 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>