Sun Aug 18 08:06:38 2013 UTC ()
Updated naxsi to 0.51-1, fixing a mistake leading to possible build error
with 0.51


(imil)
diff -r1.30 -r1.31 pkgsrc/www/nginx/distinfo
diff -r1.21 -r1.22 pkgsrc/www/nginx/options.mk

cvs diff -r1.30 -r1.31 pkgsrc/www/nginx/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nginx/distinfo 2013/08/18 08:03:19 1.30
+++ pkgsrc/www/nginx/distinfo 2013/08/18 08:06:38 1.31
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.30 2013/08/18 08:03:19 imil Exp $ 1$NetBSD: distinfo,v 1.31 2013/08/18 08:06:38 imil Exp $
2 2
3SHA1 (naxsi-core-0.51.tgz) = f439ec453415d427c8dc3a3f43abb52a62773119 3SHA1 (naxsi-core-0.51-1.tgz) = e6b97c599955d1b7dc3559c5e391a551174abe91
4RMD160 (naxsi-core-0.51.tgz) = 3a6e846d758bf21ae1ccd6784ee16d69f7812c12 4RMD160 (naxsi-core-0.51-1.tgz) = ce29bf13805fb512f2099c2599fe705f17bf3c2d
5Size (naxsi-core-0.51.tgz) = 54004 bytes 5Size (naxsi-core-0.51-1.tgz) = 53908 bytes
6SHA1 (nginx-1.4.2.tar.gz) = 8f006dc773840b6624a137a584ff8850d5155e3f 6SHA1 (nginx-1.4.2.tar.gz) = 8f006dc773840b6624a137a584ff8850d5155e3f
7RMD160 (nginx-1.4.2.tar.gz) = b8aa3d96aa991a0eb4f5d520073815ba4f55f7c4 7RMD160 (nginx-1.4.2.tar.gz) = b8aa3d96aa991a0eb4f5d520073815ba4f55f7c4
8Size (nginx-1.4.2.tar.gz) = 767688 bytes 8Size (nginx-1.4.2.tar.gz) = 767688 bytes
9SHA1 (nginx_http_push_module-0.692.tar.gz) = 72103084cad8f4d3d9a49a6b04cf780e4541605d 9SHA1 (nginx_http_push_module-0.692.tar.gz) = 72103084cad8f4d3d9a49a6b04cf780e4541605d
10RMD160 (nginx_http_push_module-0.692.tar.gz) = 9d2be16074cf28115af0f1d8f3646937cda649ad 10RMD160 (nginx_http_push_module-0.692.tar.gz) = 9d2be16074cf28115af0f1d8f3646937cda649ad
11Size (nginx_http_push_module-0.692.tar.gz) = 29119 bytes 11Size (nginx_http_push_module-0.692.tar.gz) = 29119 bytes
12SHA1 (nginx_upload_module-2.2.0.tar.gz) = 93d6e83e613a0ce2ed057a434b344fa1b6609b47 12SHA1 (nginx_upload_module-2.2.0.tar.gz) = 93d6e83e613a0ce2ed057a434b344fa1b6609b47
13RMD160 (nginx_upload_module-2.2.0.tar.gz) = 5734af837be3fe8ec444a7e5e7f6707118594098 13RMD160 (nginx_upload_module-2.2.0.tar.gz) = 5734af837be3fe8ec444a7e5e7f6707118594098
14Size (nginx_upload_module-2.2.0.tar.gz) = 25796 bytes 14Size (nginx_upload_module-2.2.0.tar.gz) = 25796 bytes
15SHA1 (patch-aa) = adf433d1b56a88c6c2ed09c4bd54fdb1a336582f 15SHA1 (patch-aa) = adf433d1b56a88c6c2ed09c4bd54fdb1a336582f
16SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191 16SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191

cvs diff -r1.21 -r1.22 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2013/08/18 08:03:19 1.21
+++ pkgsrc/www/nginx/options.mk 2013/08/18 08:06:38 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.21 2013/08/18 08:03:19 imil Exp $ 1# $NetBSD: options.mk,v 1.22 2013/08/18 08:06:38 imil Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache naxsi pcre \ 4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache naxsi pcre \
5 push realip ssl sub uwsgi image-filter upload debug \ 5 push realip ssl sub uwsgi image-filter upload debug \
6 status nginx-autodetect-cflags spdy 6 status nginx-autodetect-cflags spdy
7PKG_SUGGESTED_OPTIONS= inet6 pcre ssl 7PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
8 8
9PLIST_VARS+= naxsi uwsgi 9PLIST_VARS+= naxsi uwsgi
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13# documentation says naxsi must be the first module 13# documentation says naxsi must be the first module
14.if !empty(PKG_OPTIONS:Mnaxsi) 14.if !empty(PKG_OPTIONS:Mnaxsi)
@@ -52,27 +52,27 @@ CONFIGURE_ARGS+= --with-http_sub_module @@ -52,27 +52,27 @@ CONFIGURE_ARGS+= --with-http_sub_module
52.if !empty(PKG_OPTIONS:Mgtools) 52.if !empty(PKG_OPTIONS:Mgtools)
53CONFIGURE_ARGS+= --with-google_perftools_module 53CONFIGURE_ARGS+= --with-google_perftools_module
54.endif 54.endif
55 55
56.if !empty(PKG_OPTIONS:Mmail-proxy) 56.if !empty(PKG_OPTIONS:Mmail-proxy)
57CONFIGURE_ARGS+= --with-mail 57CONFIGURE_ARGS+= --with-mail
58.endif 58.endif
59 59
60.if empty(PKG_OPTIONS:Mmemcache) 60.if empty(PKG_OPTIONS:Mmemcache)
61CONFIGURE_ARGS+= --without-http_memcached_module 61CONFIGURE_ARGS+= --without-http_memcached_module
62.endif 62.endif
63 63
64.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) 64.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum)
65NAXSI= naxsi-core-0.51 65NAXSI= naxsi-core-0.51-1
66NAXSI_DISTFILE= ${NAXSI}.tgz 66NAXSI_DISTFILE= ${NAXSI}.tgz
67SITES.${NAXSI_DISTFILE}= http://naxsi.googlecode.com/files/ 67SITES.${NAXSI_DISTFILE}= http://naxsi.googlecode.com/files/
68DISTFILES+= ${NAXSI_DISTFILE} 68DISTFILES+= ${NAXSI_DISTFILE}
69.endif 69.endif
70 70
71.if !empty(PKG_OPTIONS:Mrealip) 71.if !empty(PKG_OPTIONS:Mrealip)
72CONFIGURE_ARGS+= --with-http_realip_module 72CONFIGURE_ARGS+= --with-http_realip_module
73.endif 73.endif
74 74
75.if !empty(PKG_OPTIONS:Minet6) 75.if !empty(PKG_OPTIONS:Minet6)
76CONFIGURE_ARGS+= --with-ipv6 76CONFIGURE_ARGS+= --with-ipv6
77.endif 77.endif
78 78