Stuart Henderson, 30 Mar 2015 23:10:
> A no_chroot flavour does seem reasonable, do you fancy sending a diff?
i think it would be logical to add patch-man_nginx_8
to the nginx_chroot* external patch... then i can
remove PATCH_LIST
here is a wip patch, but i am getting stuck
on the upgrade path from nginx 1.7.10:
$ FLAVOR=no_chroot make install
===> Installing nginx-1.7.11p0-no_chroot from /usr/ports/packages/i386/all/
Can't install nginx-1.7.11p0-no_chroot because of conflicts (nginx-1.7.10)
--- nginx-1.7.11p0-no_chroot -------------------
Can't install nginx-1.7.11p0-no_chroot: conflicts
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1961
'/var/db/pkg/nginx-1.7.11p0-no_chroot/+CONTENTS': @if /usr/sbin/pkg_info -e ...)
*** Error 1 in /usr/ports/www/nginx
(/usr/ports/infrastructure/mk/bsd.port.mk:2473 'install')
what am i missing?
also, what is stable and devel in the PLIST?
@pkgpath www/nginx/stable${FLAVOR_COMMA}
@pkgpath www/nginx/devel${FLAVOR_COMMA}
-f
--
nothing is fool-proof to a sufficiently talented fool.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile 31 Mar 2015 18:20:20 -0000 1.73
+++ Makefile 31 Mar 2015 20:50:32 -0000
@@ -4,6 +4,7 @@ COMMENT= robust and small HTTP server an
VERSION= 1.7.11
DISTNAME= nginx-${VERSION}
+REVISION= 0
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
@@ -27,7 +28,7 @@ NGINX_DIR= /var/www
SUBST_VARS= NGINX_DIR
CFLAGS+= -Wall -Wpointer-arith
-FLAVORS= lua naxsi passenger
+FLAVORS= lua naxsi no_chroot passenger
FLAVOR?=
.if !${FLAVOR:Mpassenger}
@@ -72,14 +73,21 @@ CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
--without-mail_smtp_module
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
-PATCHFILES+= nginx_chroot-20140823.patch:2
+
+.if !${FLAVOR:Mno_chroot}
+PATCHFILES+= ${CHROOTDISTFILES}
PATCH_DIST_STRIP= -p1
+.else
+PATCH_LIST= patch-conf*
+SUPDISTFILES+= ${CHROOTDISTFILES}
+.endif
LUAV= 0.9.12
LUADISTFILES+= ngx_devel_kit-0.2.19.tar.gz:0
LUADISTFILES+= lua-nginx-module-${LUAV}.tar.gz:2
SUBSTFILES= conf/nginx.conf
NAXSIDISTFILES+= naxsi-0.53-1.tar.gz{0.53-1.tar.gz}:1
+CHROOTDISTFILES= nginx_chroot-20140823.patch:2
.if ${FLAVOR:Mpassenger}
MODULES+= lang/ruby
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/DESCR,v
retrieving revision 1.5
diff -u -p -r1.5 DESCR
--- pkg/DESCR 26 Aug 2014 19:43:59 -0000 1.5
+++ pkg/DESCR 31 Mar 2015 20:50:32 -0000
@@ -26,3 +26,5 @@ conventions, such as "Don't-Repeat-Yours
naxsi - This Nginx module embeds Naxsi into nginx core. Naxsi is
a high performance, low rules maintenance, Web Application Firewall module.
+
+ no_chroot - Nginx without the OpenBSD chroot patch.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.707
diff -u -p -r1.707 Makefile
--- Makefile 26 Jan 2015 18:50:36 -0000 1.707
+++ Makefile 31 Mar 2015 20:52:00 -0000
@@ -140,6 +140,7 @@
SUBDIR += nginx
SUBDIR += nginx,lua
SUBDIR += nginx,naxsi
+ SUBDIR += nginx,no_chroot
SUBDIR += nginx,passenger
SUBDIR += nostromo
SUBDIR += opengroupware
