From mboxrd@z Thu Jan  1 00:00:00 1970
From: ummeegge <ummeegge@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] nginx: Update to version 1.15.1
Date: Sat, 04 Aug 2018 16:54:17 +0200
Message-ID: <f627140df57268be43ef7275be5af77f1ea54cdd.camel@ipfire.org>
In-Reply-To: <9a48c6aa9ffaa31658ef4e7c4530120e22af7006.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2949248393681942123=="
List-Id: <development.lists.ipfire.org>

--===============2949248393681942123==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi Michael,
i do have currently a problem to build next completely=20

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=C2=B4t do a test with a new package install but i=C2=B4d 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: maste=
r process /usr/sbin/nginx
nobody    6111  0.0  0.1  26420  3000 ?        S    16:39   0:00 nginx: worke=
r 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 ap=
pears.
So all files are from the current 1.13.7 version where i do only replaced the=
 binary,=20
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,
>=20
> have you tested if configuration needs any migration?
>=20
> Best,
> -Michael
>=20
> 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=3D19213#p109787 problems.
> > ---
> >  lfs/nginx | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >=20
> > diff --git a/lfs/nginx b/lfs/nginx
> > index 0fa6250..ecbe162 100644
> > --- a/lfs/nginx
> > +++ b/lfs/nginx
> > @@ -1,7 +1,7 @@
> >  ##################################################################
> > #############
> >  #                                                                =20
> >             #
> >  # IPFire.org - A linux based
> > firewall                                         #
> > -# Copyright (C) 2007-14  IPFire Team  <info(a)ipfire.org>          =20
> >             #
> > +# Copyright (C) 2007-18  IPFire Team  <info(a)ipfire.org>          =20
> >             #
> >  #                                                                =20
> >             #
> >  # 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 @@
> > =20
> >  include Config
> > =20
> > -VER        =3D 1.13.7
> > +VER        =3D 1.15.1
> > =20
> >  THISAPP    =3D nginx-$(VER)
> >  DL_FILE    =3D $(THISAPP).tar.gz
> > @@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
> >  DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
> >  TARGET     =3D $(DIR_INFO)/$(THISAPP)
> >  PROG	   =3D nginx
> > -PAK_VER	   =3D 7
> > +PAK_VER	   =3D 8
> > =20
> >  ##################################################################
> > #############
> >  # Top-level Rules
> > @@ -42,7 +42,7 @@ objects =3D $(DL_FILE)
> > =20
> >  $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> > =20
> > -$(DL_FILE)_MD5 =3D 5fcd056b40cb5c47b053fb14a2a89e7d
> > +$(DL_FILE)_MD5 =3D 2dd5a265c54a76b699443931d80a61b9
> > =20
> >  install : $(TARGET)
> > =20
> > @@ -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=3D/usr/share/nginx/ \
> > +		--prefix=3D/usr/share/nginx \
> >  		--conf-path=3D/etc/nginx/nginx.conf \
> >  		--sbin-path=3D/usr/sbin/nginx \
> >  		--pid-path=3D/var/run/nginx.pid \
>=20
>=20

--===============2949248393681942123==--