pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/nginx Update to nginx-0.8.32. Way too many changes...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8c29265ee23d
branches: trunk
changeset: 570032:8c29265ee23d
user: joerg <joerg%pkgsrc.org@localhost>
date: Sat Jan 23 16:32:11 2010 +0000
description:
Update to nginx-0.8.32. Way too many changes to list after two years of
development. Based on wip/nginx.
diffstat:
www/nginx/Makefile | 49 ++++++++++++++++++++++++++++++++++++---------
www/nginx/PLIST | 3 +-
www/nginx/distinfo | 10 ++++----
www/nginx/files/nginx.sh | 4 ++-
www/nginx/options.mk | 34 ++++++++++++++++++++++++++++++-
www/nginx/patches/patch-aa | 45 +++++++++++++++++++++++------------------
6 files changed, 106 insertions(+), 39 deletions(-)
diffs (296 lines):
diff -r 27ff5efef064 -r 8c29265ee23d www/nginx/Makefile
--- a/www/nginx/Makefile Sat Jan 23 15:53:04 2010 +0000
+++ b/www/nginx/Makefile Sat Jan 23 16:32:11 2010 +0000
@@ -1,34 +1,58 @@
-# $NetBSD: Makefile,v 1.6 2010/01/22 13:44:06 ghen Exp $
+# $NetBSD: Makefile,v 1.7 2010/01/23 16:32:11 joerg Exp $
-DISTNAME= nginx-0.5.35
-PKGREVISION= 1
+DISTNAME= nginx-0.8.32
CATEGORIES= www
MASTER_SITES= http://sysoev.ru/nginx/
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= joerg%NetBSD.org@localhost
HOMEPAGE= http://nginx.net/
COMMENT= Lightweight HTTP server and mail proxy server
+LICENSE= 2-clause-bsd
PKG_DESTDIR_SUPPORT= user-destdir
+.include "../../mk/bsd.prefs.mk"
+
+NGINX_USER?= nginx
+NGINX_GROUP?= nginx
+NGINX_DATADIR?= ${VARBASE}/db/nginx
+NGINX_LOGDIR?= ${VARBASE}/log/nginx
+NGINX_PIDDIR?= ${VARBASE}/run
+
+BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR
+
+PKG_USERS_VARS+= NGINX_USER
+PKG_GROUPS_VARS+= NGINX_GROUP
+PKG_GROUPS= ${NGINX_GROUP}
+PKG_USERS= ${NGINX_USER}:${NGINX_GROUP}
+
+PKG_GECOS.${NGINX_USER}=NGINX server user
+PKG_HOME.${NGINX_USER}= ${NGINX_DATADIR}
+PKG_SHELL.${NGINX_USER}=${NOLOGIN}
+
USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
+CONFIGURE_ARGS+= --user=${NGINX_USER}
+CONFIGURE_ARGS+= --group=${NGINX_GROUP}
CONFIGURE_ARGS+= --with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --sbin-path=${PREFIX}/sbin
CONFIGURE_ARGS+= --conf-path=${PKG_SYSCONFDIR}/nginx.conf
-CONFIGURE_ARGS+= --pid-path=${VARBASE}/run/nginx.pid
+CONFIGURE_ARGS+= --pid-path=${NGINX_PIDDIR}/nginx.pid
+CONFIGURE_ARGS+= --lock-path=${NGINX_DATADIR}/nginx.lock
CONFIGURE_ARGS+= --error-log-path=${NGINX_LOGDIR}/error.log
CONFIGURE_ARGS+= --http-log-path=${NGINX_LOGDIR}/access.log
-CONFIGURE_ARGS+= --with-mail
+CONFIGURE_ARGS+= --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp
+CONFIGURE_ARGS+= --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp
+CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
.include "../../mk/bsd.prefs.mk"
PKG_SYSCONFSUBDIR= nginx
-NGINX_LOGDIR?= ${VARBASE}/log/nginx
EGDIR= ${PREFIX}/share/examples/nginx
-EGFILES= fastcgi_params koi-utf koi-win mime.types nginx.conf win-utf
+EGFILES= fastcgi.conf fastcgi_params koi-utf koi-win \
+ mime.types nginx.conf win-utf
.for file in ${EGFILES}
CONF_FILES+= ${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file}
@@ -38,8 +62,7 @@
INSTALLATION_DIRS= sbin share/examples/nginx/conf share/examples/nginx/html
OWN_DIRS= ${NGINX_LOGDIR}
-
-BUILD_DEFS+= PKG_SYSCONFBASE NGINX_LOGDIR VARBASE
+OWN_DIRS_PERMS+= ${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700
BUILD_TARGET= build
@@ -48,6 +71,12 @@
SUBST_FILES.paths= conf/nginx.conf
SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g'
SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g'
+SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g'
+SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g'
+SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g'
+
+MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR}
+MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
diff -r 27ff5efef064 -r 8c29265ee23d www/nginx/PLIST
--- a/www/nginx/PLIST Sat Jan 23 15:53:04 2010 +0000
+++ b/www/nginx/PLIST Sat Jan 23 16:32:11 2010 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/01/23 16:32:11 joerg Exp $
sbin/nginx
+share/examples/nginx/conf/fastcgi.conf
share/examples/nginx/conf/fastcgi_params
share/examples/nginx/conf/koi-utf
share/examples/nginx/conf/koi-win
diff -r 27ff5efef064 -r 8c29265ee23d www/nginx/distinfo
--- a/www/nginx/distinfo Sat Jan 23 15:53:04 2010 +0000
+++ b/www/nginx/distinfo Sat Jan 23 16:32:11 2010 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/01/09 14:42:54 ghen Exp $
+$NetBSD: distinfo,v 1.4 2010/01/23 16:32:11 joerg Exp $
-SHA1 (nginx-0.5.35.tar.gz) = 9e97e6723ee605db14d9cde54053496729f73c18
-RMD160 (nginx-0.5.35.tar.gz) = b6f78c584ed430212428276c69e9748a962bc013
-Size (nginx-0.5.35.tar.gz) = 488926 bytes
-SHA1 (patch-aa) = ffc4de0134bd3d1808bdd1462e4602a11159d996
+SHA1 (nginx-0.8.32.tar.gz) = 03c8177ec4943a9f7c33dbd20b1ef5d8dd5a0f9b
+RMD160 (nginx-0.8.32.tar.gz) = 4abacc587bf5fb400933d48bbbd7e92283de8683
+Size (nginx-0.8.32.tar.gz) = 619865 bytes
+SHA1 (patch-aa) = 1ef1a800f0d7dffe182b8a74f115105ded205f8e
diff -r 27ff5efef064 -r 8c29265ee23d www/nginx/files/nginx.sh
--- a/www/nginx/files/nginx.sh Sat Jan 23 15:53:04 2010 +0000
+++ b/www/nginx/files/nginx.sh Sat Jan 23 16:32:11 2010 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: nginx.sh,v 1.1.1.1 2007/12/11 09:12:26 ghen Exp $
+# $NetBSD: nginx.sh,v 1.2 2010/01/23 16:32:11 joerg Exp $
#
# PROVIDE: nginx
# REQUIRE: DAEMON
@@ -12,6 +12,8 @@
command="@PREFIX@/sbin/${name}"
required_files="@PKG_SYSCONFDIR@/${name}.conf"
pidfile="@VARBASE@/run/${name}.pid"
+start_precmd="ulimit -n 2048"
+extra_commands="reload"
load_rc_config $name
run_rc_command "$1"
diff -r 27ff5efef064 -r 8c29265ee23d www/nginx/options.mk
--- a/www/nginx/options.mk Sat Jan 23 15:53:04 2010 +0000
+++ b/www/nginx/options.mk Sat Jan 23 16:32:11 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1.1.1 2007/12/11 09:12:26 ghen Exp $
+# $NetBSD: options.mk,v 1.2 2010/01/23 16:32:11 joerg Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
-PKG_SUPPORTED_OPTIONS= ssl pcre
+PKG_SUPPORTED_OPTIONS= ssl pcre dav flv sub gtools mail-proxy memcache realip
PKG_SUGGESTED_OPTIONS= ssl pcre
.include "../../mk/bsd.options.mk"
@@ -9,6 +9,7 @@
.if !empty(PKG_OPTIONS:Mssl)
.include "../../security/openssl/buildlink3.mk"
CONFIGURE_ARGS+= --with-mail_ssl_module
+CONFIGURE_ARGS+= --with-http_ssl_module
.endif
.if !empty(PKG_OPTIONS:Mpcre)
@@ -17,3 +18,32 @@
CONFIGURE_ARGS+= --without-pcre
CONFIGURE_ARGS+= --without-http_rewrite_module
.endif
+
+.if !empty(PKG_OPTIONS:Mdav)
+CONFIGURE_ARGS+= --with-http_dav_module
+.endif
+
+.if !empty(PKG_OPTIONS:Mflv)
+CONFIGURE_ARGS+= --with-http_flv_module
+.endif
+
+.if !empty(PKG_OPTIONS:Msub)
+CONFIGURE_ARGS+= --with-http_sub_module
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtools)
+CONFIGURE_ARGS+= --with-google_perftools_module
+.endif
+
+.if !empty(PKG_OPTIONS:Mmail-proxy)
+CONFIGURE_ARGS+= --with-mail
+.endif
+
+.if empty(PKG_OPTIONS:Mmemcache)
+CONFIGURE_ARGS+= --without-http_memcached_module
+.endif
+
+.if !empty(PKG_OPTIONS:Mrealip)
+CONFIGURE_ARGS+= --with-http_realip_module
+.endif
+
diff -r 27ff5efef064 -r 8c29265ee23d www/nginx/patches/patch-aa
--- a/www/nginx/patches/patch-aa Sat Jan 23 15:53:04 2010 +0000
+++ b/www/nginx/patches/patch-aa Sat Jan 23 16:32:11 2010 +0000
@@ -1,41 +1,46 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/12/11 09:12:26 ghen Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/23 16:32:11 joerg Exp $
---- conf/nginx.conf.orig 2007-01-18 08:08:18.000000000 +0100
+This patch provides config file adapted to pkgsrc settings.
+--- conf/nginx.conf.orig 2008-02-28 22:44:16.000000000 +0200
+++ conf/nginx.conf
-@@ -2,11 +2,11 @@
- #user nobody;
+@@ -2,12 +2,13 @@
+-#user nobody;
++user %%NGINX_USER%% %%NGINX_GROUP%%;
worker_processes 1;
-#error_log logs/error.log;
-#error_log logs/error.log notice;
-#error_log logs/error.log info;
-+#error_log %%NGINX_LOGDIR%%/error.log;
-+#error_log %%NGINX_LOGDIR%%/error.log notice;
+-
+-#pid logs/nginx.pid;
++#error_log %%NGINX_LOGDIR%%/error.log;
++#error_log %%NGINX_LOGDIR%%/error.log notice;
+#error_log %%NGINX_LOGDIR%%/error.log info;
--#pid logs/nginx.pid;
-+#pid %%NGINX_LOGDIR%%/nginx.pid;
-
++#pid %%NGINX_PIDDIR%%/nginx.pid;
events {
-@@ -15,14 +15,14 @@ events {
++ # After increasing this value You probably should increase limit
++ # of file descriptors (for example in start_precmd in startup script)
+ worker_connections 1024;
+@@ -15,14 +14,14 @@
http {
-- include conf/mime.types;
+- include mime.types;
+ include %%PKG_SYSCONFDIR%%/mime.types;
default_type application/octet-stream;
- #log_format main '$remote_addr - $remote_user [$time_local] $request '
- # '"$status" $body_bytes_sent "$http_referer" '
+ #log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+ # '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"';
-
+
- #access_log logs/access.log main;
+ #access_log %%NGINX_LOGDIR%%/access.log main;
sendfile on;
#tcp_nopush on;
-@@ -38,10 +38,10 @@ http {
+@@ -38,10 +37,10 @@
#charset koi8-r;
@@ -48,7 +53,7 @@
index index.html index.htm;
}
-@@ -51,7 +51,7 @@ http {
+@@ -51,7 +50,7 @@
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
@@ -57,16 +62,16 @@
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -66,7 +66,7 @@ http {
+@@ -67,7 +66,7 @@
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
-- # include conf/fastcgi_params;
+- # include fastcgi_params;
+ # include %%PKG_SYSCONFDIR%%/fastcgi_params;
#}
# deny access to .htaccess files, if Apache's document root
-@@ -86,7 +86,7 @@ http {
+@@ -87,7 +86,7 @@
# server_name somename alias another.alias;
# location / {
@@ -75,7 +80,7 @@
# index index.html index.htm;
# }
#}
-@@ -109,7 +109,7 @@ http {
+@@ -110,7 +109,7 @@
# ssl_prefer_server_ciphers on;
# location / {
Home |
Main Index |
Thread Index |
Old Index