Re: [ptxdist] [PATCH] nginx: version bump 1.10.3 -> 1.12.1

[Clemens Gruber <clemens.gruber@pqgruber.com>]

On Thu, Aug 03, 2017 at 08:39:28AM +0200, Michael Olbrich wrote:
> On Sun, Jul 16, 2017 at 10:46:06PM +0200, Clemens Gruber wrote:
> > Also update patches from buildroot and remove deprecated --with-ipv6
> > flag.
> 
> Why? Is IPv6 no longer optional?

They removed the "--with-ipv6" configure flag and now do some kind of
auto-detection based on a compile-test of a minimal program with this
function call: setsockopt(0, IPPROTO_IPV6, IPV6_RECVPKTINFO, NULL, 0)

First, I tried to create a ngx_force_have_ipv6 passed through the make
env, but setting it to no broke the build.
However, I think I found the problem. I'll send a v2 shortly.

> 
> > Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> > ---
> [...]
> > diff --git a/patches/nginx-1.10.3/series b/patches/nginx-1.12.1/series
> > similarity index 83%
> > rename from patches/nginx-1.10.3/series
> > rename to patches/nginx-1.12.1/series
> > index fd983089b..563ba718d 100644
> > --- a/patches/nginx-1.10.3/series
> > +++ b/patches/nginx-1.12.1/series
> > @@ -1,6 +1,5 @@
> >  # generated by git-ptx-patches
> >  #tag:base --start-number 1
> > -#tag:buildroot --start-number 1
> 
> This should remain to tell us where the patches come from.

Is it OK that both base and buildroot start at 1 ?
I tried removing base, but it god readded by git-ptx-patches, so I
removed the buildroot tag. I will readd it in my v2!

Clemens

> 
> Michael
> 
> >  0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
> >  0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
> >  0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
> > @@ -9,6 +8,7 @@
> >  0006-auto-lib-openssl-conf-use-pkg-config.patch
> >  0007-auto-lib-libgd-conf-use-pkg-config.patch
> >  0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
> > +0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
> >  #tag:ptxdist --start-number 100
> >  0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
> > -# f7e851b17ea369d52a0840b8e7489232  - git-ptx-patches magic
> > +# 9582ab17ecf817dc622b5d7749a52b32  - git-ptx-patches magic
> > diff --git a/rules/nginx.make b/rules/nginx.make
> > index ef98c0adb..bd21fe1fa 100644
> > --- a/rules/nginx.make
> > +++ b/rules/nginx.make
> > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NGINX) += nginx
> >  #
> >  # Paths and names
> >  #
> > -NGINX_VERSION	:= 1.10.3
> > -NGINX_MD5	:= 204a20cb4f0b0c9db746c630d89ff4ea
> > +NGINX_VERSION	:= 1.12.1
> > +NGINX_MD5	:= a307e74aca95403e5ee00f153807ce58
> >  NGINX		:= nginx-$(NGINX_VERSION)
> >  NGINX_SUFFIX	:= tar.gz
> >  NGINX_URL	:= https://nginx.org/download/$(NGINX).$(NGINX_SUFFIX)
> > @@ -102,8 +102,7 @@ NGINX_CONF_OPT := \
> >  #       If it is off by default, a with option exists.
> >  
> >  # Opt-in
> > -NGINX_CONF_OPTIN-$(PTXCONF_GLOBAL_IPV6)				:= ipv6
> > -NGINX_CONF_OPTIN-$(PTXCONF_NGINX_HTTP_GZIP_STATIC_MODULE)	+= http_gzip_static_module
> > +NGINX_CONF_OPTIN-$(PTXCONF_NGINX_HTTP_GZIP_STATIC_MODULE)	:= http_gzip_static_module
> >  NGINX_CONF_OPTIN-$(PTXCONF_NGINX_HTTP_SSL_MODULE)		+= http_ssl_module
> >  NGINX_CONF_OPTIN-$(PTXCONF_NGINX_HTTP_V2_MODULE)		+= http_v2_module
> >  NGINX_CONF_OPTIN-$(PTXCONF_NGINX_PCRE_JIT)			+= pcre-jit
> > -- 
> > 2.13.3
> > 
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de