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 \
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 \
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 \
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 \
-
Erik Kapfer -
Michael Tremer -
ummeegge