Hi,
totally untested, but this builds... add the ldap auth module from
https://github.com/kvspb/nginx-auth-ldap (tested on linux, works), i'm
hosting the tarball as git has no tags/releases
git clone https://github.com/kvspb/nginx-auth-ldap.git
tar czf /var/www/htdocs/stuff/nginx_auth_ldap_module-20140609.tar.gz
nginx-auth-ldap
and while here, lets try to update stable to 1.6.0 and devel to 1.7.3,
built some flavors without issues. The upstream check patch doesnt apply
anymore, so i had to comment out that part, since i dont really
understand all the bits - that's a separate module, but it needs a patch
against nginx ? Where's upstream, besides dlg's dropbox, is it
https://github.com/yaoweibin/nginx_upstream_check_module ? it has some
releases there so could be used as a source.
Anyway, both diffs are independant, ldap can go separately. If you want
to take that as a start and polish the update, be my guest...
Landry
? nginx_add_ldapauth_flavor.diff
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile.inc,v
retrieving revision 1.13
diff -u -r1.13 Makefile.inc
--- Makefile.inc 28 Jun 2014 20:31:10 -0000 1.13
+++ Makefile.inc 10 Jul 2014 12:01:47 -0000
@@ -8,6 +8,7 @@
MASTER_SITES= http://nginx.org/download/
MASTER_SITES0= http://dropbox.eait.uq.edu.au/uqdgwynn/distfiles/
MASTER_SITES1= https://github.com/nbs-system/naxsi/archive/
+MASTER_SITES2= http://rhaalovely.net/stuff/
HOMEPAGE= http://nginx.org/
@@ -23,7 +24,7 @@
NGINX_DIR= /var/nginx
SUBST_VARS= NGINX_DIR
-FLAVORS= lua naxsi passenger
+FLAVORS= lua naxsi passenger ldap
FLAVOR?=
# must be first option on configure line ?
@@ -66,6 +67,7 @@
LUADISTFILES+= lua-nginx-module-${LUAV}.tar.gz:0
SUBSTFILES= conf/nginx.conf
NAXSIDISTFILES+= naxsi-0.53-1.tar.gz{0.53-1.tar.gz}:1
+LDAPDISTFILES= nginx_auth_ldap_module-20140609.tar.gz:2
DISTNAME0= nginx_upstream_check_module-20130212.tar.gz
DISTFILES+= ${DISTNAME0}:0
@@ -78,6 +80,15 @@
BUILD_DEPENDS+= ruby20-passenger-*:www/ruby-passenger,-main
RUN_DEPENDS+=
ruby-passenger-*|ruby19-passenger-*|ruby20-passenger-*|ruby21-passenger-*:www/ruby-passenger,-main
WANTLIB+= m pthread stdc++
+.endif
+
+.if ${FLAVOR:Mldap}
+DISTFILES+= ${LDAPDISTFILES}
+CONFIGURE_ARGS+= --add-module=${WRKSRC}/../nginx-auth-ldap/
+LIB_DEPENDS += databases/openldap
+WANTLIB+= lber-2.4 ldap
+.else
+SUPDISTFILES+= ${LDAPDISTFILES}
.endif
.if ${FLAVOR:Mlua}
Index: devel/distinfo
===================================================================
RCS file: /cvs/ports/www/nginx/devel/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- devel/distinfo 25 Nov 2013 04:34:27 -0000 1.4
+++ devel/distinfo 10 Jul 2014 12:01:47 -0000
@@ -1,10 +1,12 @@
SHA256 (lua-nginx-module-0.8.1.tar.gz) =
G0+9z1V2X6chTQDT1w+cAtaSKXCwBWSWImEkduZemU8=
SHA256 (naxsi-0.53-1.tar.gz) = zeF1+UDNLoxZW5VRJkLNP4rm88Si7hDC/aIU/+uAgnQ=
SHA256 (nginx-1.5.7.tar.gz) = lqWshmMj5P71Aud00Ji0Rd2JjkTNrqavpopoq13i5/E=
+SHA256 (nginx_auth_ldap_module-20140609.tar.gz) =
8O02O3Y8FKkS7Axox5TNmfEjKd+FAGpTQCqt4jCCmC8=
SHA256 (nginx_upstream_check_module-20130212.tar.gz) =
L0BJQ4OQFsaqAexYnIQ12CXhI+d2Mdi6I5donCIEj2c=
SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) =
v1VA120YZ7RBEJHxbGx4b9ZnWQmcWUg8dsaENAIP2wI=
SIZE (lua-nginx-module-0.8.1.tar.gz) = 478976
SIZE (naxsi-0.53-1.tar.gz) = 165627
SIZE (nginx-1.5.7.tar.gz) = 779985
+SIZE (nginx_auth_ldap_module-20140609.tar.gz) = 114923
SIZE (nginx_upstream_check_module-20130212.tar.gz) = 116269
SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964
Index: stable/distinfo
===================================================================
RCS file: /cvs/ports/www/nginx/stable/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- stable/distinfo 25 Mar 2014 02:38:26 -0000 1.6
+++ stable/distinfo 10 Jul 2014 12:01:47 -0000
@@ -1,10 +1,12 @@
SHA256 (lua-nginx-module-0.8.1.tar.gz) =
G0+9z1V2X6chTQDT1w+cAtaSKXCwBWSWImEkduZemU8=
SHA256 (naxsi-0.53-1.tar.gz) = zeF1+UDNLoxZW5VRJkLNP4rm88Si7hDC/aIU/+uAgnQ=
SHA256 (nginx-1.4.7.tar.gz) = I7j/SnaBcJBnj5Gw77/O9ZqTSS9mEtyDcMRMHxzhtiY=
+SHA256 (nginx_auth_ldap_module-20140609.tar.gz) =
8O02O3Y8FKkS7Axox5TNmfEjKd+FAGpTQCqt4jCCmC8=
SHA256 (nginx_upstream_check_module-20130212.tar.gz) =
L0BJQ4OQFsaqAexYnIQ12CXhI+d2Mdi6I5donCIEj2c=
SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) =
v1VA120YZ7RBEJHxbGx4b9ZnWQmcWUg8dsaENAIP2wI=
SIZE (lua-nginx-module-0.8.1.tar.gz) = 478976
SIZE (naxsi-0.53-1.tar.gz) = 165627
SIZE (nginx-1.4.7.tar.gz) = 769153
+SIZE (nginx_auth_ldap_module-20140609.tar.gz) = 114923
SIZE (nginx_upstream_check_module-20130212.tar.gz) = 116269
SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964
? nginx_add_ldapauth_flavor.diff
? nginx_update+add_ldap_flavor.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- Makefile 6 Jan 2014 16:47:32 -0000 1.54
+++ Makefile 10 Jul 2014 12:13:33 -0000
@@ -2,10 +2,12 @@
SUBDIR =
SUBDIR += devel
+ SUBDIR += devel,ldap
SUBDIR += devel,lua
SUBDIR += devel,naxsi
SUBDIR += devel,passenger
SUBDIR += stable
+ SUBDIR += stable,ldap
SUBDIR += stable,lua
SUBDIR += stable,naxsi
SUBDIR += stable,passenger
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile.inc,v
retrieving revision 1.13
diff -u -r1.13 Makefile.inc
--- Makefile.inc 28 Jun 2014 20:31:10 -0000 1.13
+++ Makefile.inc 10 Jul 2014 12:13:33 -0000
@@ -8,6 +8,7 @@
MASTER_SITES= http://nginx.org/download/
MASTER_SITES0= http://dropbox.eait.uq.edu.au/uqdgwynn/distfiles/
MASTER_SITES1= https://github.com/nbs-system/naxsi/archive/
+MASTER_SITES2= http://rhaalovely.net/stuff/
HOMEPAGE= http://nginx.org/
@@ -23,7 +24,7 @@
NGINX_DIR= /var/nginx
SUBST_VARS= NGINX_DIR
-FLAVORS= lua naxsi passenger
+FLAVORS= lua naxsi passenger ldap
FLAVOR?=
# must be first option on configure line ?
@@ -50,6 +51,7 @@
--user=www \
--group=www \
--with-http_gzip_static_module \
+ --with-http_auth_request_module \
--with-http_ssl_module \
--with-http_stub_status_module \
--with-http_mp4_module \
@@ -66,6 +68,7 @@
LUADISTFILES+= lua-nginx-module-${LUAV}.tar.gz:0
SUBSTFILES= conf/nginx.conf
NAXSIDISTFILES+= naxsi-0.53-1.tar.gz{0.53-1.tar.gz}:1
+LDAPDISTFILES= nginx_auth_ldap_module-20140609.tar.gz:2
DISTNAME0= nginx_upstream_check_module-20130212.tar.gz
DISTFILES+= ${DISTNAME0}:0
@@ -80,6 +83,15 @@
WANTLIB+= m pthread stdc++
.endif
+.if ${FLAVOR:Mldap}
+DISTFILES+= ${LDAPDISTFILES}
+CONFIGURE_ARGS+= --add-module=${WRKSRC}/../nginx-auth-ldap/
+LIB_DEPENDS += databases/openldap
+WANTLIB+= lber-2.4 ldap
+.else
+SUPDISTFILES+= ${LDAPDISTFILES}
+.endif
+
.if ${FLAVOR:Mlua}
CONFIGURE_ARGS+= --add-module=${WRKSRC}/simpl-ngx_devel_kit
CONFIGURE_ARGS+= --add-module=${WRKSRC}/lua-nginx-module
@@ -114,7 +126,7 @@
pre-configure:
@cd ${WRKSRC} && ${SUBST_CMD} ${SUBSTFILES}
- @${PATCH} -d ${WRKSRC} -p1 <
${WRKDIR}/nginx_upstream_check_module-master/${NGX_UPSTREAM_CHECK_PATCH}
+# @${PATCH} -d ${WRKSRC} -p1 <
${WRKDIR}/nginx_upstream_check_module-master/${NGX_UPSTREAM_CHECK_PATCH}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/nginx/
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/devel/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- devel/Makefile 28 Jun 2014 20:31:10 -0000 1.9
+++ devel/Makefile 10 Jul 2014 12:13:33 -0000
@@ -1,8 +1,5 @@
# $OpenBSD: Makefile,v 1.9 2014/06/28 20:31:10 kili Exp $
-VERSION= 1.5.7
-REVISION= 3
-
-CONFIGURE_ARGS+= --with-http_auth_request_module
+VERSION= 1.7.3
.include <bsd.port.mk>
Index: devel/distinfo
===================================================================
RCS file: /cvs/ports/www/nginx/devel/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- devel/distinfo 25 Nov 2013 04:34:27 -0000 1.4
+++ devel/distinfo 10 Jul 2014 12:13:33 -0000
@@ -1,10 +1,12 @@
SHA256 (lua-nginx-module-0.8.1.tar.gz) =
G0+9z1V2X6chTQDT1w+cAtaSKXCwBWSWImEkduZemU8=
SHA256 (naxsi-0.53-1.tar.gz) = zeF1+UDNLoxZW5VRJkLNP4rm88Si7hDC/aIU/+uAgnQ=
-SHA256 (nginx-1.5.7.tar.gz) = lqWshmMj5P71Aud00Ji0Rd2JjkTNrqavpopoq13i5/E=
+SHA256 (nginx-1.7.3.tar.gz) = M3OAyeLGne3oLHCcEQwDaurT/+cIe7JRhe2I5/k6lQQ=
+SHA256 (nginx_auth_ldap_module-20140609.tar.gz) =
8O02O3Y8FKkS7Axox5TNmfEjKd+FAGpTQCqt4jCCmC8=
SHA256 (nginx_upstream_check_module-20130212.tar.gz) =
L0BJQ4OQFsaqAexYnIQ12CXhI+d2Mdi6I5donCIEj2c=
SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) =
v1VA120YZ7RBEJHxbGx4b9ZnWQmcWUg8dsaENAIP2wI=
SIZE (lua-nginx-module-0.8.1.tar.gz) = 478976
SIZE (naxsi-0.53-1.tar.gz) = 165627
-SIZE (nginx-1.5.7.tar.gz) = 779985
+SIZE (nginx-1.7.3.tar.gz) = 816455
+SIZE (nginx_auth_ldap_module-20140609.tar.gz) = 114923
SIZE (nginx_upstream_check_module-20130212.tar.gz) = 116269
SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964
Index: devel/patches/patch-src_http_ngx_http_spdy_c
===================================================================
RCS file: devel/patches/patch-src_http_ngx_http_spdy_c
diff -N devel/patches/patch-src_http_ngx_http_spdy_c
--- devel/patches/patch-src_http_ngx_http_spdy_c 20 May 2014 10:17:02
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_http_ngx_http_spdy_c,v 1.2 2014/05/20 10:17:02 sthen Exp $
-
-Fix for CVE-2014-0133, http://nginx.org/download/patch.2014.spdy2.txt
-
---- src/http/ngx_http_spdy.c.orig Tue Nov 19 05:03:48 2013
-+++ src/http/ngx_http_spdy.c Fri Mar 21 22:11:30 2014
-@@ -1478,7 +1478,7 @@ static u_char *
- ngx_http_spdy_state_save(ngx_http_spdy_connection_t *sc,
- u_char *pos, u_char *end, ngx_http_spdy_handler_pt handler)
- {
--#if (NGX_DEBUG)
-+#if 1
- if (end - pos > NGX_SPDY_STATE_BUFFER_SIZE) {
- ngx_log_error(NGX_LOG_ALERT, sc->connection->log, 0,
- "spdy state buffer overflow: "
Index: stable/Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/stable/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- stable/Makefile 28 Jun 2014 20:31:10 -0000 1.9
+++ stable/Makefile 10 Jul 2014 12:13:33 -0000
@@ -1,6 +1,5 @@
# $OpenBSD: Makefile,v 1.9 2014/06/28 20:31:10 kili Exp $
-VERSION= 1.4.7
-REVISION= 0
+VERSION= 1.6.0
.include <bsd.port.mk>
Index: stable/distinfo
===================================================================
RCS file: /cvs/ports/www/nginx/stable/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- stable/distinfo 25 Mar 2014 02:38:26 -0000 1.6
+++ stable/distinfo 10 Jul 2014 12:13:33 -0000
@@ -1,10 +1,12 @@
SHA256 (lua-nginx-module-0.8.1.tar.gz) =
G0+9z1V2X6chTQDT1w+cAtaSKXCwBWSWImEkduZemU8=
SHA256 (naxsi-0.53-1.tar.gz) = zeF1+UDNLoxZW5VRJkLNP4rm88Si7hDC/aIU/+uAgnQ=
-SHA256 (nginx-1.4.7.tar.gz) = I7j/SnaBcJBnj5Gw77/O9ZqTSS9mEtyDcMRMHxzhtiY=
+SHA256 (nginx-1.6.0.tar.gz) = lDrXV6HD6LPfLVxN2sxQiGGSLjb6EOpvjjo0j8mr/Bo=
+SHA256 (nginx_auth_ldap_module-20140609.tar.gz) =
8O02O3Y8FKkS7Axox5TNmfEjKd+FAGpTQCqt4jCCmC8=
SHA256 (nginx_upstream_check_module-20130212.tar.gz) =
L0BJQ4OQFsaqAexYnIQ12CXhI+d2Mdi6I5donCIEj2c=
SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) =
v1VA120YZ7RBEJHxbGx4b9ZnWQmcWUg8dsaENAIP2wI=
SIZE (lua-nginx-module-0.8.1.tar.gz) = 478976
SIZE (naxsi-0.53-1.tar.gz) = 165627
-SIZE (nginx-1.4.7.tar.gz) = 769153
+SIZE (nginx-1.6.0.tar.gz) = 802956
+SIZE (nginx_auth_ldap_module-20140609.tar.gz) = 114923
SIZE (nginx_upstream_check_module-20130212.tar.gz) = 116269
SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964
