Sat Jan 23 16:32:11 2010 UTC ()
Update to nginx-0.8.32. Way too many changes to list after two years of
development. Based on wip/nginx.


(joerg)
diff -r1.6 -r1.7 pkgsrc/www/nginx/Makefile
diff -r1.2 -r1.3 pkgsrc/www/nginx/PLIST
diff -r1.3 -r1.4 pkgsrc/www/nginx/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/www/nginx/options.mk
diff -r1.1.1.1 -r1.2 pkgsrc/www/nginx/files/nginx.sh
diff -r1.1.1.1 -r1.2 pkgsrc/www/nginx/patches/patch-aa
cvs diff -r1.6 -r1.7 pkgsrc/www/nginx/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nginx/Makefile 2010/01/22 13:44:06 1.6
+++ pkgsrc/www/nginx/Makefile 2010/01/23 16:32:11 1.7
@@ -1,63 +1,92 @@ @@ -1,63 +1,92 @@
1# $NetBSD: Makefile,v 1.6 2010/01/22 13:44:06 ghen Exp $ 1# $NetBSD: Makefile,v 1.7 2010/01/23 16:32:11 joerg Exp $
2 2
3DISTNAME= nginx-0.5.35 3DISTNAME= nginx-0.8.32
4PKGREVISION= 1 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= http://sysoev.ru/nginx/ 5MASTER_SITES= http://sysoev.ru/nginx/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://nginx.net/ 8HOMEPAGE= http://nginx.net/
10COMMENT= Lightweight HTTP server and mail proxy server 9COMMENT= Lightweight HTTP server and mail proxy server
 10LICENSE= 2-clause-bsd
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
 14.include "../../mk/bsd.prefs.mk"
 15
 16NGINX_USER?= nginx
 17NGINX_GROUP?= nginx
 18NGINX_DATADIR?= ${VARBASE}/db/nginx
 19NGINX_LOGDIR?= ${VARBASE}/log/nginx
 20NGINX_PIDDIR?= ${VARBASE}/run
 21
 22BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR
 23
 24PKG_USERS_VARS+= NGINX_USER
 25PKG_GROUPS_VARS+= NGINX_GROUP
 26PKG_GROUPS= ${NGINX_GROUP}
 27PKG_USERS= ${NGINX_USER}:${NGINX_GROUP}
 28
 29PKG_GECOS.${NGINX_USER}=NGINX server user
 30PKG_HOME.${NGINX_USER}= ${NGINX_DATADIR}
 31PKG_SHELL.${NGINX_USER}=${NOLOGIN}
 32
14USE_PKGLOCALEDIR= yes 33USE_PKGLOCALEDIR= yes
15HAS_CONFIGURE= yes 34HAS_CONFIGURE= yes
 35CONFIGURE_ARGS+= --user=${NGINX_USER}
 36CONFIGURE_ARGS+= --group=${NGINX_GROUP}
16CONFIGURE_ARGS+= --with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib 37CONFIGURE_ARGS+= --with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib
17CONFIGURE_ARGS+= --prefix=${PREFIX} 38CONFIGURE_ARGS+= --prefix=${PREFIX}
18CONFIGURE_ARGS+= --sbin-path=${PREFIX}/sbin 39CONFIGURE_ARGS+= --sbin-path=${PREFIX}/sbin
19CONFIGURE_ARGS+= --conf-path=${PKG_SYSCONFDIR}/nginx.conf 40CONFIGURE_ARGS+= --conf-path=${PKG_SYSCONFDIR}/nginx.conf
20CONFIGURE_ARGS+= --pid-path=${VARBASE}/run/nginx.pid 41CONFIGURE_ARGS+= --pid-path=${NGINX_PIDDIR}/nginx.pid
 42CONFIGURE_ARGS+= --lock-path=${NGINX_DATADIR}/nginx.lock
21CONFIGURE_ARGS+= --error-log-path=${NGINX_LOGDIR}/error.log 43CONFIGURE_ARGS+= --error-log-path=${NGINX_LOGDIR}/error.log
22CONFIGURE_ARGS+= --http-log-path=${NGINX_LOGDIR}/access.log 44CONFIGURE_ARGS+= --http-log-path=${NGINX_LOGDIR}/access.log
23CONFIGURE_ARGS+= --with-mail 45CONFIGURE_ARGS+= --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp
 46CONFIGURE_ARGS+= --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp
 47CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
24 48
25.include "../../mk/bsd.prefs.mk" 49.include "../../mk/bsd.prefs.mk"
26 50
27PKG_SYSCONFSUBDIR= nginx 51PKG_SYSCONFSUBDIR= nginx
28NGINX_LOGDIR?= ${VARBASE}/log/nginx 
29 52
30EGDIR= ${PREFIX}/share/examples/nginx 53EGDIR= ${PREFIX}/share/examples/nginx
31EGFILES= fastcgi_params koi-utf koi-win mime.types nginx.conf win-utf 54EGFILES= fastcgi.conf fastcgi_params koi-utf koi-win \
 55 mime.types nginx.conf win-utf
32 56
33.for file in ${EGFILES} 57.for file in ${EGFILES}
34CONF_FILES+= ${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file} 58CONF_FILES+= ${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file}
35.endfor 59.endfor
36 60
37RCD_SCRIPTS= nginx 61RCD_SCRIPTS= nginx
38 62
39INSTALLATION_DIRS= sbin share/examples/nginx/conf share/examples/nginx/html 63INSTALLATION_DIRS= sbin share/examples/nginx/conf share/examples/nginx/html
40OWN_DIRS= ${NGINX_LOGDIR} 64OWN_DIRS= ${NGINX_LOGDIR}
41 65OWN_DIRS_PERMS+= ${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700
42BUILD_DEFS+= PKG_SYSCONFBASE NGINX_LOGDIR VARBASE 
43 66
44BUILD_TARGET= build 67BUILD_TARGET= build
45 68
46SUBST_CLASSES+= paths 69SUBST_CLASSES+= paths
47SUBST_STAGE.paths= pre-configure 70SUBST_STAGE.paths= pre-configure
48SUBST_FILES.paths= conf/nginx.conf 71SUBST_FILES.paths= conf/nginx.conf
49SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g' 72SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g'
50SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g' 73SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g'
 74SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g'
 75SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g'
 76SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g'
 77
 78MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR}
 79MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR}
51 80
52do-install: 81do-install:
53 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx 82 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
54.for file in ${EGFILES} 83.for file in ${EGFILES}
55 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file} 84 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file}
56.endfor 85.endfor
57 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html 86 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html
58 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html 87 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
59 88
60.include "options.mk" 89.include "options.mk"
61 90
62.include "../../devel/zlib/buildlink3.mk" 91.include "../../devel/zlib/buildlink3.mk"
63.include "../../mk/bsd.pkg.mk" 92.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/www/nginx/PLIST (expand / switch to unified diff)

--- pkgsrc/www/nginx/PLIST 2009/06/14 22:00:29 1.2
+++ pkgsrc/www/nginx/PLIST 2010/01/23 16:32:11 1.3
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:29 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2010/01/23 16:32:11 joerg Exp $
2sbin/nginx 2sbin/nginx
 3share/examples/nginx/conf/fastcgi.conf
3share/examples/nginx/conf/fastcgi_params 4share/examples/nginx/conf/fastcgi_params
4share/examples/nginx/conf/koi-utf 5share/examples/nginx/conf/koi-utf
5share/examples/nginx/conf/koi-win 6share/examples/nginx/conf/koi-win
6share/examples/nginx/conf/mime.types 7share/examples/nginx/conf/mime.types
7share/examples/nginx/conf/nginx.conf 8share/examples/nginx/conf/nginx.conf
8share/examples/nginx/conf/win-utf 9share/examples/nginx/conf/win-utf
9share/examples/nginx/html/50x.html 10share/examples/nginx/html/50x.html
10share/examples/nginx/html/index.html 11share/examples/nginx/html/index.html
11share/examples/rc.d/nginx 12share/examples/rc.d/nginx
cvs diff -r1.3 -r1.4 pkgsrc/www/nginx/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nginx/distinfo 2008/01/09 14:42:54 1.3
+++ pkgsrc/www/nginx/distinfo 2010/01/23 16:32:11 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.3 2008/01/09 14:42:54 ghen Exp $ 1$NetBSD: distinfo,v 1.4 2010/01/23 16:32:11 joerg Exp $
2 2
3SHA1 (nginx-0.5.35.tar.gz) = 9e97e6723ee605db14d9cde54053496729f73c18 3SHA1 (nginx-0.8.32.tar.gz) = 03c8177ec4943a9f7c33dbd20b1ef5d8dd5a0f9b
4RMD160 (nginx-0.5.35.tar.gz) = b6f78c584ed430212428276c69e9748a962bc013 4RMD160 (nginx-0.8.32.tar.gz) = 4abacc587bf5fb400933d48bbbd7e92283de8683
5Size (nginx-0.5.35.tar.gz) = 488926 bytes 5Size (nginx-0.8.32.tar.gz) = 619865 bytes
6SHA1 (patch-aa) = ffc4de0134bd3d1808bdd1462e4602a11159d996 6SHA1 (patch-aa) = 1ef1a800f0d7dffe182b8a74f115105ded205f8e
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2007/12/11 09:12:26 1.1.1.1
+++ pkgsrc/www/nginx/options.mk 2010/01/23 16:32:11 1.2
@@ -1,19 +1,49 @@ @@ -1,19 +1,49 @@
1# $NetBSD: options.mk,v 1.1.1.1 2007/12/11 09:12:26 ghen Exp $ 1# $NetBSD: options.mk,v 1.2 2010/01/23 16:32:11 joerg Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
4PKG_SUPPORTED_OPTIONS= ssl pcre 4PKG_SUPPORTED_OPTIONS= ssl pcre dav flv sub gtools mail-proxy memcache realip
5PKG_SUGGESTED_OPTIONS= ssl pcre 5PKG_SUGGESTED_OPTIONS= ssl pcre
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mssl) 9.if !empty(PKG_OPTIONS:Mssl)
10.include "../../security/openssl/buildlink3.mk" 10.include "../../security/openssl/buildlink3.mk"
11CONFIGURE_ARGS+= --with-mail_ssl_module 11CONFIGURE_ARGS+= --with-mail_ssl_module
 12CONFIGURE_ARGS+= --with-http_ssl_module
12.endif 13.endif
13 14
14.if !empty(PKG_OPTIONS:Mpcre) 15.if !empty(PKG_OPTIONS:Mpcre)
15.include "../../devel/pcre/buildlink3.mk" 16.include "../../devel/pcre/buildlink3.mk"
16.else 17.else
17CONFIGURE_ARGS+= --without-pcre 18CONFIGURE_ARGS+= --without-pcre
18CONFIGURE_ARGS+= --without-http_rewrite_module 19CONFIGURE_ARGS+= --without-http_rewrite_module
19.endif 20.endif
 21
 22.if !empty(PKG_OPTIONS:Mdav)
 23CONFIGURE_ARGS+= --with-http_dav_module
 24.endif
 25
 26.if !empty(PKG_OPTIONS:Mflv)
 27CONFIGURE_ARGS+= --with-http_flv_module
 28.endif
 29
 30.if !empty(PKG_OPTIONS:Msub)
 31CONFIGURE_ARGS+= --with-http_sub_module
 32.endif
 33
 34.if !empty(PKG_OPTIONS:Mgtools)
 35CONFIGURE_ARGS+= --with-google_perftools_module
 36.endif
 37
 38.if !empty(PKG_OPTIONS:Mmail-proxy)
 39CONFIGURE_ARGS+= --with-mail
 40.endif
 41
 42.if empty(PKG_OPTIONS:Mmemcache)
 43CONFIGURE_ARGS+= --without-http_memcached_module
 44.endif
 45
 46.if !empty(PKG_OPTIONS:Mrealip)
 47CONFIGURE_ARGS+= --with-http_realip_module
 48.endif
 49
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/nginx/files/nginx.sh (expand / switch to unified diff)

--- pkgsrc/www/nginx/files/nginx.sh 2007/12/11 09:12:26 1.1.1.1
+++ pkgsrc/www/nginx/files/nginx.sh 2010/01/23 16:32:11 1.2
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: nginx.sh,v 1.1.1.1 2007/12/11 09:12:26 ghen Exp $ 3# $NetBSD: nginx.sh,v 1.2 2010/01/23 16:32:11 joerg Exp $
4# 4#
5# PROVIDE: nginx 5# PROVIDE: nginx
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7 7
8. /etc/rc.subr 8. /etc/rc.subr
9 9
10name="nginx" 10name="nginx"
11rcvar=${name} 11rcvar=${name}
12command="@PREFIX@/sbin/${name}" 12command="@PREFIX@/sbin/${name}"
13required_files="@PKG_SYSCONFDIR@/${name}.conf" 13required_files="@PKG_SYSCONFDIR@/${name}.conf"
14pidfile="@VARBASE@/run/${name}.pid" 14pidfile="@VARBASE@/run/${name}.pid"
 15start_precmd="ulimit -n 2048"
 16extra_commands="reload"
15 17
16load_rc_config $name 18load_rc_config $name
17run_rc_command "$1" 19run_rc_command "$1"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/nginx/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/nginx/patches/Attic/patch-aa 2007/12/11 09:12:26 1.1.1.1
+++ pkgsrc/www/nginx/patches/Attic/patch-aa 2010/01/23 16:32:11 1.2
@@ -1,86 +1,91 @@ @@ -1,86 +1,91 @@
1$NetBSD: patch-aa,v 1.1.1.1 2007/12/11 09:12:26 ghen Exp $ 1$NetBSD: patch-aa,v 1.2 2010/01/23 16:32:11 joerg Exp $
2 2
3--- conf/nginx.conf.orig 2007-01-18 08:08:18.000000000 +0100 3This patch provides config file adapted to pkgsrc settings.
 4--- conf/nginx.conf.orig 2008-02-28 22:44:16.000000000 +0200
4+++ conf/nginx.conf 5+++ conf/nginx.conf
5@@ -2,11 +2,11 @@ 6@@ -2,12 +2,13 @@
6 #user nobody; 7-#user nobody;
 8+user %%NGINX_USER%% %%NGINX_GROUP%%;
7 worker_processes 1; 9 worker_processes 1;
8  10
9-#error_log logs/error.log; 11-#error_log logs/error.log;
10-#error_log logs/error.log notice; 12-#error_log logs/error.log notice;
11-#error_log logs/error.log info; 13-#error_log logs/error.log info;
12+#error_log %%NGINX_LOGDIR%%/error.log; 14-
13+#error_log %%NGINX_LOGDIR%%/error.log notice; 
14+#error_log %%NGINX_LOGDIR%%/error.log info; 
15  
16-#pid logs/nginx.pid; 15-#pid logs/nginx.pid;
17+#pid %%NGINX_LOGDIR%%/nginx.pid; 16+#error_log %%NGINX_LOGDIR%%/error.log;
 17+#error_log %%NGINX_LOGDIR%%/error.log notice;
 18+#error_log %%NGINX_LOGDIR%%/error.log info;
18  19
 20+#pid %%NGINX_PIDDIR%%/nginx.pid;
19  21
20 events { 22 events {
21@@ -15,14 +15,14 @@ events { 23+ # After increasing this value You probably should increase limit
 24+ # of file descriptors (for example in start_precmd in startup script)
 25 worker_connections 1024;
 26@@ -15,14 +14,14 @@
22  27
23  28
24 http { 29 http {
25- include conf/mime.types; 30- include mime.types;
26+ include %%PKG_SYSCONFDIR%%/mime.types; 31+ include %%PKG_SYSCONFDIR%%/mime.types;
27 default_type application/octet-stream; 32 default_type application/octet-stream;
28  33
29 #log_format main '$remote_addr - $remote_user [$time_local] $request ' 34 #log_format main '$remote_addr - $remote_user [$time_local] "$request" '
30 # '"$status" $body_bytes_sent "$http_referer" ' 35 # '$status $body_bytes_sent "$http_referer" '
31 # '"$http_user_agent" "$http_x_forwarded_for"'; 36 # '"$http_user_agent" "$http_x_forwarded_for"';
32  37
33- #access_log logs/access.log main; 38- #access_log logs/access.log main;
34+ #access_log %%NGINX_LOGDIR%%/access.log main; 39+ #access_log %%NGINX_LOGDIR%%/access.log main;
35  40
36 sendfile on; 41 sendfile on;
37 #tcp_nopush on; 42 #tcp_nopush on;
38@@ -38,10 +38,10 @@ http { 43@@ -38,10 +37,10 @@
39  44
40 #charset koi8-r; 45 #charset koi8-r;
41  46
42- #access_log logs/host.access.log main; 47- #access_log logs/host.access.log main;
43+ #access_log %%NGINX_LOGDIR%%/host.access.log main; 48+ #access_log %%NGINX_LOGDIR%%/host.access.log main;
44  49
45 location / { 50 location / {
46- root html; 51- root html;
47+ root share/examples/nginx/html; 52+ root share/examples/nginx/html;
48 index index.html index.htm; 53 index index.html index.htm;
49 } 54 }
50  55
51@@ -51,7 +51,7 @@ http { 56@@ -51,7 +50,7 @@
52 # 57 #
53 error_page 500 502 503 504 /50x.html; 58 error_page 500 502 503 504 /50x.html;
54 location = /50x.html { 59 location = /50x.html {
55- root html; 60- root html;
56+ root share/examples/nginx/html; 61+ root share/examples/nginx/html;
57 } 62 }
58  63
59 # proxy the PHP scripts to Apache listening on 127.0.0.1:80 64 # proxy the PHP scripts to Apache listening on 127.0.0.1:80
60@@ -66,7 +66,7 @@ http { 65@@ -67,7 +66,7 @@
61 # fastcgi_pass 127.0.0.1:9000; 66 # fastcgi_pass 127.0.0.1:9000;
62 # fastcgi_index index.php; 67 # fastcgi_index index.php;
63 # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; 68 # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
64- # include conf/fastcgi_params; 69- # include fastcgi_params;
65+ # include %%PKG_SYSCONFDIR%%/fastcgi_params; 70+ # include %%PKG_SYSCONFDIR%%/fastcgi_params;
66 #} 71 #}
67  72
68 # deny access to .htaccess files, if Apache's document root 73 # deny access to .htaccess files, if Apache's document root
69@@ -86,7 +86,7 @@ http { 74@@ -87,7 +86,7 @@
70 # server_name somename alias another.alias; 75 # server_name somename alias another.alias;
71  76
72 # location / { 77 # location / {
73- # root html; 78- # root html;
74+ # root share/examples/nginx/html; 79+ # root share/examples/nginx/html;
75 # index index.html index.htm; 80 # index index.html index.htm;
76 # } 81 # }
77 #} 82 #}
78@@ -109,7 +109,7 @@ http { 83@@ -110,7 +109,7 @@
79 # ssl_prefer_server_ciphers on; 84 # ssl_prefer_server_ciphers on;
80  85
81 # location / { 86 # location / {
82- # root html; 87- # root html;
83+ # root share/examples/nginx/html; 88+ # root share/examples/nginx/html;
84 # index index.html index.htm; 89 # index index.html index.htm;
85 # } 90 # }
86 #} 91 #}