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

2017-08-03 Thread Clemens Gruber 
Also update patches from buildroot and replace the missing --with-ipv6
flag by overriding the feature build test results for IPv6 depending on
the GLOBAL_IPV6_OPTION in PTXdist.

Signed-off-by: Clemens Gruber 
---

Changes since v1:
- Do not depend on build-time autodetection and force IPv6 test result
- Readd buildroot git-ptx-patches tag after base

 ...izeof-rework-autotest-to-be-cross-compila.patch | 20 +++--
 ...e-add-mechanism-allowing-to-force-feature.patch |  2 +-
 ...x_feature_run_force_result-for-each-featu.patch | 30 ++--
 ...0004-auto-lib-libxslt-conf-use-pkg-config.patch |  0
 ...nix-make-sys_nerr-guessing-cross-friendly.patch |  6 ++--
 ...0006-auto-lib-openssl-conf-use-pkg-config.patch |  4 +--
 .../0007-auto-lib-libgd-conf-use-pkg-config.patch  |  2 +-
 ...-ngx_linux_config.h-only-include-dlfcn.h-.patch |  0
 ...nf-fix-PCRE-condition-WRT-the-http-and-ht.patch | 29 +++
 ...ness-add-mechanism-allowing-to-force-resu.patch |  2 +-
 ...unix-allow-overriding-the-IPv6-build-test.patch | 33 ++
 patches/{nginx-1.10.3 => nginx-1.12.1}/series  |  6 ++--
 rules/nginx.make   | 10 +++
 13 files changed, 105 insertions(+), 39 deletions(-)
 rename patches/{nginx-1.10.3 => 
nginx-1.12.1}/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch 
(85%)
 rename patches/{nginx-1.10.3 => 
nginx-1.12.1}/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch 
(99%)
 rename patches/{nginx-1.10.3 => 
nginx-1.12.1}/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch 
(89%)
 rename patches/{nginx-1.10.3 => 
nginx-1.12.1}/0004-auto-lib-libxslt-conf-use-pkg-config.patch (100%)
 rename patches/{nginx-1.10.3 => 
nginx-1.12.1}/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch (95%)
 rename patches/{nginx-1.10.3 => 
nginx-1.12.1}/0006-auto-lib-openssl-conf-use-pkg-config.patch (93%)
 rename patches/{nginx-1.10.3 => 
nginx-1.12.1}/0007-auto-lib-libgd-conf-use-pkg-config.patch (95%)
 rename patches/{nginx-1.10.3 => 
nginx-1.12.1}/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch 
(100%)
 create mode 100644 
patches/nginx-1.12.1/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
 rename patches/{nginx-1.10.3 => 
nginx-1.12.1}/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch 
(94%)
 create mode 100644 
patches/nginx-1.12.1/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
 rename patches/{nginx-1.10.3 => nginx-1.12.1}/series (74%)

diff --git 
a/patches/nginx-1.10.3/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
 
b/patches/nginx-1.12.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
similarity index 85%
rename from 
patches/nginx-1.10.3/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
rename to 
patches/nginx-1.12.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
index ae79e1c99..bc4c8d527 100644
--- 
a/patches/nginx-1.10.3/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
+++ 
b/patches/nginx-1.12.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
@@ -1,5 +1,5 @@
 From: Samuel Martin 
-Date: Thu, 24 Apr 2014 23:27:32 +0200
+Date: Tue, 4 Jul 2017 11:09:20 -0400
 Subject: [PATCH] auto/type/sizeof: rework autotest to be cross-compilation
  friendly
 
@@ -14,12 +14,14 @@ Refresh for 1.8.0.
 Signed-off-by: Danomi Manchego 
 [mar...@barkynet.com: Updated for 1.10.0]
 Signed-off-by: Martin Bark 
+Signed-off-by: Adam Duskett 
+Refresh for 1.12.0
 ---
- auto/types/sizeof | 38 --
- 1 file changed, 28 insertions(+), 10 deletions(-)
+ auto/types/sizeof | 37 -
+ 1 file changed, 28 insertions(+), 9 deletions(-)
 
 diff --git a/auto/types/sizeof b/auto/types/sizeof
-index b5b71bb98275..8528490109ae 100644
+index 480d8cfa49aa..61dcd2de5d44 100644
 --- a/auto/types/sizeof
 +++ b/auto/types/sizeof
 @@ -14,7 +14,7 @@ END
@@ -31,11 +33,11 @@ index b5b71bb98275..8528490109ae 100644
  
  #include 
  #include 
-@@ -25,22 +25,40 @@ $NGX_INCLUDE_UNISTD_H
+@@ -25,22 +25,41 @@ $NGX_INCLUDE_UNISTD_H
  $NGX_INCLUDE_INTTYPES_H
  $NGX_INCLUDE_AUTO_CONFIG_H
  
--int main() {
+-int main(void) {
 -printf("%d", (int) sizeof($ngx_type));
 +#if !defined( PASTE)
 +#define PASTE2( x, y) x##y
@@ -56,6 +58,9 @@ index b5b71bb98275..8528490109ae 100644
 -END
 +_EOF
  
+ 
+-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
+-  -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
 +_ngx_typename=`echo "$ngx_type" | sed 's/ /_/g;s/\*/p/'`
 +ngx_size="-1"
 +ngx_size=`for i in 1 2 4 8 16 ; do \
@@ -65,9 +70,6 @@ index b5b71bb98275..8528490109ae 100644
 +$NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 || continue ;\
 +echo $i ; break ; done`
  
--ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
--  -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
--
 -eval "$ngx_test >> $NGX_AUTOCONF_ER

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

2017-08-03 Thread Clemens Gruber 
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 
> > ---
> [...]
> > 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- |
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] libwebsockets: version bump to 1.7.9

2017-08-03 Thread Ladislav Michl 
Hi Roland!

On Thu, Aug 03, 2017 at 02:35:47PM +0200, Roland Hieber wrote:

I guess here is a line missing:
From: Denis Osterland 

But with respect to original footer reading things like:
"...This e-mail contains confidential and/or legally protected information..."
I doubt it is safe to apply this patch ;-)

> Signed-off-by: Denis Osterland 
> [rhi: fixed whitespace issues]
> Signed-off-by: Roland Hieber 
> ---
>  rules/libwebsockets.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
> index ffaede3bc..fe1d1c40f 100644
> --- a/rules/libwebsockets.make
> +++ b/rules/libwebsockets.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBWEBSOCKETS) += libwebsockets
>  #
>  # Paths and names
>  #
> -LIBWEBSOCKETS_VERSION:= v1.3-chrome37-firefox30
> -LIBWEBSOCKETS_MD5:= 63117f35174a5fe4ec062f6baa411638
> +LIBWEBSOCKETS_VERSION:= v1.7.9
> +LIBWEBSOCKETS_MD5:= 7b3692ead5ae00fd0e1d56c080170f07
>  LIBWEBSOCKETS:= libwebsockets-$(LIBWEBSOCKETS_VERSION)
>  LIBWEBSOCKETS_SUFFIX := tar.gz
>  LIBWEBSOCKETS_URL:= 
> https://github.com/warmcat/libwebsockets/archive/$(LIBWEBSOCKETS_VERSION).$(LIBWEBSOCKETS_SUFFIX)
> -- 
> 2.11.0
> 
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2] libwebsockets: version bump to 1.7.9

2017-08-03 Thread Roland Hieber 
Signed-off-by: Denis Osterland 
[rhi: fixed whitespace issues]
Signed-off-by: Roland Hieber 
---
 rules/libwebsockets.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
index ffaede3bc..fe1d1c40f 100644
--- a/rules/libwebsockets.make
+++ b/rules/libwebsockets.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBWEBSOCKETS) += libwebsockets
 #
 # Paths and names
 #
-LIBWEBSOCKETS_VERSION  := v1.3-chrome37-firefox30
-LIBWEBSOCKETS_MD5  := 63117f35174a5fe4ec062f6baa411638
+LIBWEBSOCKETS_VERSION  := v1.7.9
+LIBWEBSOCKETS_MD5  := 7b3692ead5ae00fd0e1d56c080170f07
 LIBWEBSOCKETS  := libwebsockets-$(LIBWEBSOCKETS_VERSION)
 LIBWEBSOCKETS_SUFFIX   := tar.gz
 LIBWEBSOCKETS_URL  := 
https://github.com/warmcat/libwebsockets/archive/$(LIBWEBSOCKETS_VERSION).$(LIBWEBSOCKETS_SUFFIX)
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] libwebsockets: version bump to 1.7.9

2017-08-03 Thread Denis OSTERLAND 
Hi Michael,

git send-email with local postfix fails:
Aug  2 08:50:40 cwpc1435 postfix/smtp[6846]: E0E243E81D7: 
to=, relay=mail.pengutronix.de[92.198.50.35]:25, 
delay=5.3,
delays=0.02/0.01/5.2/0.04, dsn=5.0.0, status=bounced (host 
mail.pengutronix.de[92.198.50.35] said: 550-Verification failed for 
 550-Unrouteable address 550 Sender verification failed (in reply to 
RCPT TO command))

Our Windows admins don´t open SMTP port on Exchange server and I found no way 
to connect git-send-email using MAPI.

Evolution seems to use unicode 0xA0 instead of ASCII 0x20 for ' ' and Windows 
line ending (CRLF).

I have tried to send it to my account and foreward it using Outlook Web App, 
but it fails too.

Seems like the only option is to use my private account, what I don´t want.

Best regards
Denis
Am Donnerstag, den 03.08.2017, 08:58 +0200 schrieb Michael Olbrich:
> On Wed, Aug 02, 2017 at 06:59:42AM +, Denis OSTERLAND wrote:
> > 
> > Signed-off-by: Denis Osterland 
> > ---
> >  rules/libwebsockets.make | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
> > index ffaede3..fe1d1c4 100644
> > --- a/rules/libwebsockets.make
> > +++ b/rules/libwebsockets.make
> > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBWEBSOCKETS) += libwebsockets
> >  #
> >  # Paths and names
> >  #
> > -LIBWEBSOCKETS_VERSION  := v1.3-chrome37-firefox30
> > -LIBWEBSOCKETS_MD5  := 63117f35174a5fe4ec062f6baa411638
> > +LIBWEBSOCKETS_VERSION  := v1.7.9
> > +LIBWEBSOCKETS_MD5  := 7b3692ead5ae00fd0e1d56c080170f07
> >  LIBWEBSOCKETS  := libwebsockets-$(LIBWEBSOCKETS_VERSION)
> >  LIBWEBSOCKETS_SUFFIX   := tar.gz
> >  LIBWEBSOCKETS_URL  := 
> > https://github.com/warmcat/libwebsockets/archive/$(LIBWEBSOCKETS_VERSION).$(LIBWEBSOCKETS_SUFFIX)
> You mailer broke the white-spaces. Please resent. There are a lot of
> tutorials out there, how to send patches with various email clients.
> If all fails, sending the patch as attachment works too. But it may take me
> longer to apply it because it's more work for me.
> 
> Michael
> 
> > 
> > -- 
> > 2.7.4
> > Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
> > Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner 
> > (Mitglied)
> > Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 
> > 620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-
> > Stiftung – Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 
> > –
> > Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr 
> > Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), 
> > Dipl.-Kfm.
> > Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, Dr.-Ing. 
> > Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH)
> > Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
> > ___
> > Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese 
> > E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
> > Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise 
> > erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede
> > unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung 
> > und/oder Publikation dieser E-Mail ist strengstens untersagt.
> > The contents of the above mentioned e-mail is not legally binding. This 
> > e-mail contains confidential and/or legally protected information. Please
> > inform us if you have received this e-mail by mistake and delete it in such 
> > a case. Each unauthorized reproduction, disclosure, alteration,
> > distribution and/or publication of this e-mail is strictly prohibited.
> > ___
> > ptxdist mailing list
> > ptxdist@pengutronix.de
Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner 
(Mitglied)
Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 
620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – 
Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr 
Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), 
Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, 
Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) 
Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
___
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail 
enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail fae