| Message ID | 1533383340-29361-1-git-send-email-erik.kapfer@ipfire.org |
|---|---|
| State | Accepted |
| Commit | 351567966d83908eb3de7108f79c4eab7a37e1e0 |
| Headers |
Return-Path: <root@web02.i.ipfire.org> Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 94E6161DCD for <patchwork@web02.i.ipfire.org>; Sat, 4 Aug 2018 15:43:32 +0200 (CEST) Received: from web02.i.ipfire.org (web02.i.ipfire.org [172.28.1.105]) by mail01.ipfire.org (Postfix) with ESMTP id 53ECE108E7C6 for <patchwork@ipfire.org>; Sat, 4 Aug 2018 14:43:32 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1533390212; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:list-id:list-unsubscribe:list-subscribe:list-post; bh=AoTz6LVxLHYYj+PhfDqXyqkjr8LUIso2YB0sWtUn07s=; b=bxK2y4ydFriOk3Qe0AePrf+S2RFIo62ioqzKQVac7oe40vtoMaVcMbLTim6N8b0TJK0AaG rLDOYooVdVuDQwT0ryJ8sOHiZS4lEjlcPCQByAC0JQxa5acDs0M9vfHvRurfEciNzcS5I9 IMgvkx0B2HZ4xl5gHHcCu5N6qYgYovWzzsKSlX2iIpuuY3mcfQIG+Jv9etrCO+7chJUwv+ /T6/a9YJxp2apLbmPuaw5vc6ysZad9dCeTT79iAgU4iNUUw51atu9YPxtayxD+kBS2/FzK x/x5TZwGaE6HVN6k5GmdvKAryHo5hvQziN5sKHtMwwVbuKFAY72cAmLbjqljeg== Received: by web02.i.ipfire.org (Postfix, from userid 0) id 1932E61DCE; Sat, 4 Aug 2018 15:43:32 +0200 (CEST) X-Original-To: michael.tremer@ipfire.org Delivered-To: ms@mail01.ipfire.org Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 87DE210ABECA; Sat, 4 Aug 2018 12:49:06 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1533383346; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=AoTz6LVxLHYYj+PhfDqXyqkjr8LUIso2YB0sWtUn07s=; b=PseO4vhRmZezY88qkpUk3sUVGkxge1kq2msxDcT1aaD9xB1QPvxiBZQKE+DVaFAAtt0+75 0V8zssr29IBRqvJvBUISH4RJBqjrvXNj1JBkKSgquoemdGXkoYm+uDotsEvjC9KL+jGDJM 73ehV7rzsU//qnPw+RpE0Yx/utsaw+WHNwbPpy4x3VTVYNSIMeLddG5sqn+8pWBupR5czS BUOJ3vCsx8et2yKbtyUd3C69eXLkRIxJ5pxa/rBOevqwjX2rA1wGIsp2QT6YoCKzBnV4dx 4kw3XEqLF6wWDGIW54BcPOQCoSUHUXytIPR17hosSTguH5jxEM9FTx9cGFq4Iw== Received: from localhost.localdomain (i59F4AB8F.versanet.de [89.244.171.143]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id E5288108E7C7; Sat, 4 Aug 2018 12:49:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1533383344; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=AoTz6LVxLHYYj+PhfDqXyqkjr8LUIso2YB0sWtUn07s=; b=A4t+DkVZFjUsbN/U0KhiZBDHmqRNPVbgye60iHOeXLhJAdRpH7/No1G2si5OYZBEHDGayt IVei+7IjAWRGAut27wbkpYNL4/RGx07efKAa79tE42PUl9KUpSkUBxkUrUPIYWq7eMamsa qwBwlb1PdKDx4N/B8xDm+jW7He2dgTqGFcvjnwdmhvSXGeZ9C4frEVSviTCzc2CzZg5FCe 1HqV+vpj9irv4aP/rG07ssq6wogLGbg2pMm10ND0ddVGNznms+2KRvZjBM5U4h4OPnOJDX 8HxYMdTFnqptk+9M860jgo9y/xX/BHyVx+xsbZXdR+DQE3QPMsTMHPYjDdu7tA== From: Erik Kapfer <erik.kapfer@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] nginx: Update to version 1.15.1 Date: Sat, 4 Aug 2018 13:49:00 +0200 Message-Id: <1533383340-29361-1-git-send-email-erik.kapfer@ipfire.org> X-Mailer: git-send-email 2.7.4 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=ummeegge smtp.mailfrom=erik.kapfer@ipfire.org X-Spamd-Result: default: False [-4.43 / 11.00]; TO_DN_SOME(0.00)[]; NEURAL_HAM(-2.33)[-0.775,0]; RCVD_COUNT_ZERO(0.00)[0]; RCPT_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ASN(0.00)[asn:8881, ipnet:89.244.160.0/20, country:DE]; DKIM_SIGNED(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[] X-Spam-Status: No, score=-4.43 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <https://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> X-Evolution-Source: 1355867052.2751.5@hughes.tremer.info Content-Transfer-Encoding: 8bit Mime-Version: 1.0 X-Spam: Yes |
| Series |
nginx: Update to version 1.15.1
|
|
Commit Message
Erik Kapfer
Aug. 4, 2018, 9:49 p.m. UTC
Deleted last slash in --prefix configure option to prevent such --> https://forum.ipfire.org/viewtopic.php?t=19213#p109787 problems. --- lfs/nginx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Comments
Hello, have you tested if configuration needs any migration? Best, -Michael On Sat, 2018-08-04 at 13:49 +0200, Erik Kapfer wrote: > Deleted last slash in --prefix configure option to prevent such --> > https://forum.ipfire.org/viewtopic.php?t=19213#p109787 problems. > --- > lfs/nginx | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/lfs/nginx b/lfs/nginx > index 0fa6250..ecbe162 100644 > --- a/lfs/nginx > +++ b/lfs/nginx > @@ -1,7 +1,7 @@ > ############################################################################### > # # > # IPFire.org - A linux based firewall # > -# Copyright (C) 2007-14 IPFire Team <info@ipfire.org> # > +# Copyright (C) 2007-18 IPFire Team <info@ipfire.org> # > # # > # This program is free software: you can redistribute it and/or modify # > # it under the terms of the GNU General Public License as published by # > @@ -24,7 +24,7 @@ > > include Config > > -VER = 1.13.7 > +VER = 1.15.1 > > THISAPP = nginx-$(VER) > DL_FILE = $(THISAPP).tar.gz > @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) > DIR_APP = $(DIR_SRC)/$(THISAPP) > TARGET = $(DIR_INFO)/$(THISAPP) > PROG = nginx > -PAK_VER = 7 > +PAK_VER = 8 > > ############################################################################### > # Top-level Rules > @@ -42,7 +42,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = 5fcd056b40cb5c47b053fb14a2a89e7d > +$(DL_FILE)_MD5 = 2dd5a265c54a76b699443931d80a61b9 > > install : $(TARGET) > > @@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > @$(PREBUILD) > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) > cd $(DIR_APP) && ./configure \ > - --prefix=/usr/share/nginx/ \ > + --prefix=/usr/share/nginx \ > --conf-path=/etc/nginx/nginx.conf \ > --sbin-path=/usr/sbin/nginx \ > --pid-path=/var/run/nginx.pid \
Hi Michael, i do have currently a problem to build next completely tar: etc/rc.d/helper/aws-setup: Cannot stat: No such file or directory tar: etc/rc.d/init.d/aws: Cannot stat: No such file or directory tar: etc/rc.d/rcsysinit.d/S74aws: Cannot stat: No such file or directory tar: etc/sudoers.d/setup: Cannot stat: No such file or directory tar: usr/bin/run-setup: Cannot stat: No such file or directory tar: usr/sbin/sendmail: Cannot stat: No such file or directory tar: var/ipfire/aws-functions.pl: Cannot stat: No such file or directory tar: Exiting with failure status due to previous errors make: *** [cdrom:61: /usr/src/log/cdrom] Error 2 so i didn´t do a test with a new package install but i´d installed nginx via Pakfire and replaced the 1.13.7 binary with the new 1.15.1 and it looks pretty much OK. nginx version: nginx/1.15.1 root 6110 0.0 0.0 25980 744 ? Ss 16:39 0:00 nginx: master process /usr/sbin/nginx nobody 6111 0.0 0.1 26420 3000 ? S 16:39 0:00 nginx: worker process tcp 0 0 0.0.0.0:80 0.0.0.0:* LISTEN 6110/nginx checked it also via browser and the default "Welcome to nginx!" index.html appears. So all files are from the current 1.13.7 version where i do only replaced the binary, in my opinion it do not needs any configuration migration. Best, Erik Am Samstag, den 04.08.2018, 14:58 +0100 schrieb Michael Tremer: > Hello, > > have you tested if configuration needs any migration? > > Best, > -Michael > > On Sat, 2018-08-04 at 13:49 +0200, Erik Kapfer wrote: > > Deleted last slash in --prefix configure option to prevent such --> > > https://forum.ipfire.org/viewtopic.php?t=19213#p109787 problems. > > --- > > lfs/nginx | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/lfs/nginx b/lfs/nginx > > index 0fa6250..ecbe162 100644 > > --- a/lfs/nginx > > +++ b/lfs/nginx > > @@ -1,7 +1,7 @@ > > ################################################################## > > ############# > > # > > # > > # IPFire.org - A linux based > > firewall # > > -# Copyright (C) 2007-14 IPFire Team <info@ipfire.org> > > # > > +# Copyright (C) 2007-18 IPFire Team <info@ipfire.org> > > # > > # > > # > > # This program is free software: you can redistribute it and/or > > modify # > > # it under the terms of the GNU General Public License as > > published by # > > @@ -24,7 +24,7 @@ > > > > include Config > > > > -VER = 1.13.7 > > +VER = 1.15.1 > > > > THISAPP = nginx-$(VER) > > DL_FILE = $(THISAPP).tar.gz > > @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > TARGET = $(DIR_INFO)/$(THISAPP) > > PROG = nginx > > -PAK_VER = 7 > > +PAK_VER = 8 > > > > ################################################################## > > ############# > > # Top-level Rules > > @@ -42,7 +42,7 @@ objects = $(DL_FILE) > > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > -$(DL_FILE)_MD5 = 5fcd056b40cb5c47b053fb14a2a89e7d > > +$(DL_FILE)_MD5 = 2dd5a265c54a76b699443931d80a61b9 > > > > install : $(TARGET) > > > > @@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > @$(PREBUILD) > > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf > > $(DIR_DL)/$(DL_FILE) > > cd $(DIR_APP) && ./configure \ > > - --prefix=/usr/share/nginx/ \ > > + --prefix=/usr/share/nginx \ > > --conf-path=/etc/nginx/nginx.conf \ > > --sbin-path=/usr/sbin/nginx \ > > --pid-path=/var/run/nginx.pid \ > >
Hi, I guess you just need to run a clean build. The nightly builds are going through... -Michael On Sat, 2018-08-04 at 16:54 +0200, ummeegge wrote: > Hi Michael, > i do have currently a problem to build next completely > > tar: etc/rc.d/helper/aws-setup: Cannot stat: No such file or directory > tar: etc/rc.d/init.d/aws: Cannot stat: No such file or directory > tar: etc/rc.d/rcsysinit.d/S74aws: Cannot stat: No such file or > directory > tar: etc/sudoers.d/setup: Cannot stat: No such file or directory > tar: usr/bin/run-setup: Cannot stat: No such file or directory > tar: usr/sbin/sendmail: Cannot stat: No such file or directory > tar: var/ipfire/aws-functions.pl: Cannot stat: No such file or > directory > tar: Exiting with failure status due to previous errors > make: *** [cdrom:61: /usr/src/log/cdrom] Error 2 > > so i didn´t do a test with a new package install but i´d installed > nginx via Pakfire and replaced the 1.13.7 binary with the new 1.15.1 > and it looks pretty much OK. > > nginx version: nginx/1.15.1 > > root 6110 0.0 0.0 25980 744 ? Ss 16:39 0:00 nginx: master process /usr/sbin/nginx > nobody 6111 0.0 0.1 26420 3000 ? S 16:39 0:00 nginx: worker process > > tcp 0 0 0.0.0.0:80 0.0.0.0:* LISTEN 6110/nginx > > checked it also via browser and the default "Welcome to nginx!" index.html appears. > So all files are from the current 1.13.7 version where i do only replaced the binary, > in my opinion it do not needs any configuration migration. > > Best, > > Erik > > > > Am Samstag, den 04.08.2018, 14:58 +0100 schrieb Michael Tremer: > > Hello, > > > > have you tested if configuration needs any migration? > > > > Best, > > -Michael > > > > On Sat, 2018-08-04 at 13:49 +0200, Erik Kapfer wrote: > > > Deleted last slash in --prefix configure option to prevent such --> > > > https://forum.ipfire.org/viewtopic.php?t=19213#p109787 problems. > > > --- > > > lfs/nginx | 10 +++++----- > > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > > > diff --git a/lfs/nginx b/lfs/nginx > > > index 0fa6250..ecbe162 100644 > > > --- a/lfs/nginx > > > +++ b/lfs/nginx > > > @@ -1,7 +1,7 @@ > > > ################################################################## > > > ############# > > > # > > > # > > > # IPFire.org - A linux based > > > firewall # > > > -# Copyright (C) 2007-14 IPFire Team <info@ipfire.org> > > > # > > > +# Copyright (C) 2007-18 IPFire Team <info@ipfire.org> > > > # > > > # > > > # > > > # This program is free software: you can redistribute it and/or > > > modify # > > > # it under the terms of the GNU General Public License as > > > published by # > > > @@ -24,7 +24,7 @@ > > > > > > include Config > > > > > > -VER = 1.13.7 > > > +VER = 1.15.1 > > > > > > THISAPP = nginx-$(VER) > > > DL_FILE = $(THISAPP).tar.gz > > > @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) > > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > > TARGET = $(DIR_INFO)/$(THISAPP) > > > PROG = nginx > > > -PAK_VER = 7 > > > +PAK_VER = 8 > > > > > > ################################################################## > > > ############# > > > # Top-level Rules > > > @@ -42,7 +42,7 @@ objects = $(DL_FILE) > > > > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > > > -$(DL_FILE)_MD5 = 5fcd056b40cb5c47b053fb14a2a89e7d > > > +$(DL_FILE)_MD5 = 2dd5a265c54a76b699443931d80a61b9 > > > > > > install : $(TARGET) > > > > > > @@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > > @$(PREBUILD) > > > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf > > > $(DIR_DL)/$(DL_FILE) > > > cd $(DIR_APP) && ./configure \ > > > - --prefix=/usr/share/nginx/ \ > > > + --prefix=/usr/share/nginx \ > > > --conf-path=/etc/nginx/nginx.conf \ > > > --sbin-path=/usr/sbin/nginx \ > > > --pid-path=/var/run/nginx.pid \ > > > >
diff --git a/lfs/nginx b/lfs/nginx index 0fa6250..ecbe162 100644 --- a/lfs/nginx +++ b/lfs/nginx @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-14 IPFire Team <info@ipfire.org> # +# Copyright (C) 2007-18 IPFire Team <info@ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.13.7 +VER = 1.15.1 THISAPP = nginx-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nginx -PAK_VER = 7 +PAK_VER = 8 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5fcd056b40cb5c47b053fb14a2a89e7d +$(DL_FILE)_MD5 = 2dd5a265c54a76b699443931d80a61b9 install : $(TARGET) @@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ - --prefix=/usr/share/nginx/ \ + --prefix=/usr/share/nginx \ --conf-path=/etc/nginx/nginx.conf \ --sbin-path=/usr/sbin/nginx \ --pid-path=/var/run/nginx.pid \