[Midnightbsd-cvs] mports [24694] trunk/www/lighttpd: update lighttpd to 1.4.50
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Nov 24 15:45:58 EST 2018
Revision: 24694
http://svnweb.midnightbsd.org/mports/?rev=24694
Author: laffer1
Date: 2018-11-24 15:45:57 -0500 (Sat, 24 Nov 2018)
Log Message:
-----------
update lighttpd to 1.4.50
Modified Paths:
--------------
trunk/www/lighttpd/Makefile
trunk/www/lighttpd/distinfo
trunk/www/lighttpd/files/lighttpd.in
trunk/www/lighttpd/pkg-plist
Removed Paths:
-------------
trunk/www/lighttpd/files/README.mysqlauth
trunk/www/lighttpd/files/extra-patch-mysqlauth
trunk/www/lighttpd/files/extra-patch-nodelay
trunk/www/lighttpd/files/extra-patch-remoteuser
trunk/www/lighttpd/files/mysql_auth.sql
trunk/www/lighttpd/files/patch-configure.ac
trunk/www/lighttpd/files/patch-src-fdevent.h
trunk/www/lighttpd/files/pkg-descr.mod_geoip
trunk/www/lighttpd/files/pkg-descr.mod_h264_streaming
trunk/www/lighttpd/files/pkg-plist.mod_geoip
trunk/www/lighttpd/files/pkg-plist.mod_h264_streaming
Property Changed:
----------------
trunk/www/lighttpd/files/COPYING.mod_h264_streaming
trunk/www/lighttpd/files/h264_streaming.conf
trunk/www/lighttpd/files/lighttpd.in
Modified: trunk/www/lighttpd/Makefile
===================================================================
--- trunk/www/lighttpd/Makefile 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/Makefile 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME?= lighttpd
-PORTVERSION= 1.4.39
-PORTREVISION= 0
+PORTVERSION= 1.4.50
CATEGORIES?= www
MASTER_SITES?= http://download.lighttpd.net/lighttpd/releases-1.4.x/
@@ -14,42 +13,85 @@
LICENSE_FILE= ${WRKSRC}/COPYING
.endif
-LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+= libpcre.so:devel/pcre
GNU_CONFIGURE= yes
-USES= gmake libtool pkgconfig tar:xz
+USES= autoreconf gmake libtool localbase pkgconfig tar:xz
+USE_CSTD= gnu99
-USE_AUTOTOOLS= autoconf autoheader aclocal automake
-AUTOMAKE_ARGS= -a -c -f
+.if !defined(_BUILDING_LIGHTTPD_MODULE)
+USES+= cpe
+.endif
+
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/lighttpd
INSTALL_TARGET= install-strip
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+.if !defined(_BUILDING_LIGHTTPD_MODULE)
+TEST_TARGET= check
-.if !defined(_BUILDING_LIGHTTPD_MODULE)
+PORTDOCS= AUTHORS COPYING INSTALL NEWS README
+
USE_RC_SUBR= lighttpd
+REQUIRE= DAEMON
-OPTIONS_DEFINE= BZIP2 DOCS FAM GDBM IPV6 LIBEV LUA MEMCACHE MYSQL MYSQLAUTH \
- NODELAY LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV
+OPTIONS_DEFINE= ATTR BZIP2 DOCS FAM GDBM GEOIP IPV6 KRB5 LIBEV LUA MEMCACHED \
+ MYSQL LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV
-OPTIONS_DEFAULT= IPV6 OPENSSL
+OPTIONS_DEFAULT= LUA OPENSSL
+OPTIONS_SUB= yes
+ATTR_DESC= extended attributes support
BZIP2_DESC= bzip2 support (mod_compress)
GDBM_DESC= gdbm storage (mod_trigger_b4_dl)
-LDAP_DESC= LDAP authentication
+KRB5_DESC= Kerberos authentication (mod_authn_gssapi)
+LDAP_DESC= LDAP authentication (mod_authn_ldap)
+LIBEV_DESC= Fast events support via libev (disables kqueue)
LUA_DESC= lua support (mod_cml, mod_magnet)
-MEMCACHE_DESC= memcached storage (mod_trigger_b4_dl)
-MYSQL_DESC= MySQL support (mod_mysql_vhost)
-MYSQLAUTH_DESC= MySQL authentication (requires WITH_MYSQL)
-NODELAY_DESC= Set TCP_NODELAY on listening sockets
+MEMCACHED_DESC= memcached storage (mod_trigger_b4_dl)
+MYSQL_DESC= MySQL support (mod_authn_mysql, mod_mysql_vhost)
SPAWNFCGI_DESC= Depend on spawn-fcgi utility
VALGRIND_DESC= valgrind support
WEBDAV_DESC= WebDAV support
-FAM_USES= fam
+ATTR_CONFIGURE_WITH= attr
+BZIP2_CONFIGURE_WITH= bzip2
+FAM_USES= fam
FAM_CONFIGURE_ON= --with-fam
FAM_CONFIGURE_ENV= FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"
+GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
+GDBM_CONFIGURE_WITH= gdbm
+GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
+GEOIP_CONFIGURE_WITH= geoip
+IPV6_CONFIGURE_OFF= --disable-ipv6
+KRB5_CONFIGURE_WITH= krb5
+KRB5_CPPFLAGS= ${GSSAPICPPFLAGS}
+KRB5_LDFLAGS= ${GSSAPILDFLAGS}
+KRB5_LIBS= ${GSSAPILIBS}
+KRB5_USES= gssapi:mit
+LDAP_CONFIGURE_WITH= ldap
+LDAP_USE= openldap=yes
+LDAP_VARS= REQUIRE+=slapd
+LIBEV_CONFIGURE_WITH= libev=${LOCALBASE}
+LIBEV_LIB_DEPENDS= libev.so:devel/libev
+LUA_USES= lua
+LUA_CONFIGURE_WITH= lua
+LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
+MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
+MEMCACHED_CONFIGURE_WITH=memcached
+MYSQL_CONFIGURE_WITH= mysql
+MYSQL_USES= mysql
+MYSQL_VARS= REQUIRE+=mysql
+OPENSSL_USES= ssl
+OPENSSL_CONFIGURE_WITH= openssl
+OPENSSL_CONFIGURE_ON= --with-openssl-includes=${OPENSSLINC} --with-openssl-libs=${OPENSSLLIB}
+SPAWNFCGI_RUN_DEPENDS= spawn-fcgi:www/spawn-fcgi
+VALGRIND_BUILD_DEPENDS= valgrind:devel/valgrind
+VALGRIND_RUN_DEPENDS= valgrind:devel/valgrind
+VALGRIND_CONFIGURE_WITH=valgrind
+WEBDAV_USE= GNOME=libxml2
+WEBDAV_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+ libsqlite3.so:databases/sqlite3
+WEBDAV_CONFIGURE_WITH= webdav-props webdav-locks
LIGHTTPD_CONF_FILES= lighttpd.conf modules.conf
@@ -62,125 +104,38 @@
simple_vhost.conf ssi.conf status.conf \
trigger_b4_dl.conf userdir.conf webdav.conf
-LIGHTTPD_LOGROOT?= /var/log/lighttpd
-LIGHTTPD_WEBROOT?= ${PREFIX}/www/data
-LIGHTTPD_USER?= www
-LIGHTTPD_GROUP?= www
+USERS= ${WWWOWN}
+GROUPS= ${WWWGRP}
+CACHEDIR= /var/cache/${PORTNAME}
+LOGDIR= /var/log/${PORTNAME}
+HOMEDIR= /var/run/${PORTNAME}
+PLIST_SUB+= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
+PLIST_SUB+= CACHEDIR="${CACHEDIR}" HOMEDIR="${HOMEDIR}" LOGDIR="${LOGDIR}"
-PLIST_SUB+= LOGROOT="${LIGHTTPD_LOGROOT}" \
- USER="${LIGHTTPD_USER}" \
- GROUP="${LIGHTTPD_GROUP}" \
- MKDIR="${MKDIR}" \
- CHOWN="${CHOWN}"
-
.endif # !defined(_BUILDING_LIGHTTPD_MODULE)
.include <bsd.mport.options.mk>
.if !defined(_BUILDING_LIGHTTPD_MODULE)
-# Default REQUIRE to rc.d script
-_REQUIRE= DAEMON
-.if ${PORT_OPTIONS:MDOCS}
-DOCS= AUTHORS COPYING INSTALL NEWS README
-PORTDOCS= ${DOCS}
-.endif
+SUB_LIST= REQUIRE="${REQUIRE}"
-.if ${PORT_OPTIONS:MOPENSSL}
-EXTENSIONS+= ssl
-CONFIGURE_ARGS+= --with-openssl \
- --with-openssl-includes=${OPENSSLINC} \
- --with-openssl-libs=${OPENSSLLIB}
-.endif
-
-.if ${PORT_OPTIONS:MBZIP2}
-CONFIGURE_ARGS+= --with-bzip2
-.endif
-
-.if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+= --with-gdbm
-.endif
-
-.if empty(PORT_OPTIONS:MIPV6)
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MLIBEV}
-CONFIGURE_ARGS+= --with-libev=${LOCALBASE}
-LIB_DEPENDS+= libev.so:${PORTSDIR}/devel/libev
-.endif
-
-.if ${PORT_OPTIONS:MLUA}
-USES+= lua:51
-CONFIGURE_ARGS+= --with-lua
-CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
-.endif
-
-.if ${PORT_OPTIONS:MMEMCACHE}
-LIB_DEPENDS+= libmemcache.so:${PORTSDIR}/databases/libmemcache
-CONFIGURE_ARGS+= --with-memcache
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL= yes
-CONFIGURE_ARGS+= --with-mysql
-_REQUIRE+= mysql
-.endif
-
-.if ${PORT_OPTIONS:MMYSQLAUTH} && empty(PORT_OPTIONS:MMYSQL)
-IGNORE= option WITH_MYSQLAUTH requires WITH_MYSQL
-.endif
-
-.if ${PORT_OPTIONS:MMYSQLAUTH}
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysqlauth
-PORTDOCS+= README.mysqlauth mysql_auth.sql
-.endif
-
-.if ${PORT_OPTIONS:MNODELAY}
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nodelay
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+= --with-ldap
-_REQUIRE+= slapd
-.endif
-
-.if ${PORT_OPTIONS:MSPAWNFCGI}
-RUN_DEPENDS+= spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
-.endif
-
-.if ${PORT_OPTIONS:MVALGRIND}
-BUILD_DEPENDS+= valgrind:${PORTSDIR}/devel/valgrind
-RUN_DEPENDS+= valgrind:${PORTSDIR}/devel/valgrind
-CONFIGURE_ARGS+= --with-valgrind
-.endif
-
-.if ${PORT_OPTIONS:MWEBDAV}
-USE_GNOME+= libxml2
-LIB_DEPENDS+= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
- libsqlite3.so:${PORTSDIR}/databases/sqlite3
-CONFIGURE_ARGS+= --with-webdav-props --with-webdav-locks
-.endif
-
-SUB_LIST+= REQUIRE="${_REQUIRE}"
-
post-patch:
@${REINPLACE_CMD} -e 's|-std=gnu99||' \
${WRKSRC}/configure ${WRKSRC}/configure.ac
@${REINPLACE_CMD} -E -e \
- 's|^(server.document-root.*=).*|\1 "${PREFIX}/www/data/"|' \
- -e "s|/etc/lighttpd|${PREFIX}/etc/lighttpd|g" \
+ 's|^(server.document-root.*=).*|\1 "${PREFIX}/www" + "/data"|' \
+ -e "s|/etc/lighttpd|${ETCDIR}|g" \
-e 's|^(server.event-handler.*=).*|\1 "freebsd-kqueue"|' \
-e 's|^(server.network-backend.*=).*|\1 "writev"|' \
- -e "s|^(server.username.*=).*|\1 \"${LIGHTTPD_USER}\"|" \
- -e "s|^(server.groupname.*=).*|\1 \"${LIGHTTPD_GROUP}\"|" \
- -e "s|^(var.log_root.*=).*|\1 \"${LIGHTTPD_LOGROOT}\"|" \
- -e "s|^(var.home_dir.*=).*|\1 \"/var/spool/lighttpd\"|" \
- -e "s|^(var.server_root.*=).*|\1 \"${LIGHTTPD_WEBROOT}\"|" \
+ -e "s|^(server.username.*=).*|\1 \"${WWWOWN}\"|" \
+ -e "s|^(server.groupname.*=).*|\1 \"${WWWGRP}\"|" \
+ -e "s|^(var.log_root.*=).*|\1 \"${LOGDIR}\"|" \
+ -e "s|^(var.server_root.*=).*|\1 \"${WWWDIR}\"|" \
+ -e "s|^(var.home_dir.*=).*|\1 \"${HOMEDIR}\"|" \
+ -e "s|^(var.cache_dir.*=).*|\1 \"${CACHEDIR}\"|" \
${WRKSRC}/doc/config/lighttpd.conf
- @${REINPLACE_CMD} -e "s|/etc/lighttpd|${PREFIX}/etc/lighttpd|g" \
+ @${REINPLACE_CMD} -e "s|/etc/lighttpd|${ETCDIR}|g" \
${WRKSRC}/doc/config/conf.d/auth.conf
@${REINPLACE_CMD} -e "s|/usr/bin/python|${LOCALBASE}/bin/python|" \
${WRKSRC}/doc/config/conf.d/cgi.conf \
@@ -192,38 +147,24 @@
${WRKSRC}/doc/config/lighttpd.conf
post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d ${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d ${STAGEDIR}${ETCDIR}/vhosts.d
.for FILE in ${LIGHTTPD_CONF_FILES}
- @${INSTALL_DATA} ${WRKSRC}/doc/config/${FILE} \
- ${STAGEDIR}${PREFIX}/etc/lighttpd/${FILE}.sample
+ ${INSTALL_DATA} ${WRKSRC}/doc/config/${FILE} \
+ ${STAGEDIR}${ETCDIR}/${FILE}.sample
.endfor
.for FILE in ${LIGHTTPD_CONF_D_FILES}
- @${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/${FILE} \
- ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/${FILE}.sample
+ ${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/${FILE} \
+ ${STAGEDIR}${ETCDIR}/conf.d/${FILE}.sample
.endfor
- @${INSTALL_DATA} ${WRKSRC}/doc/config/vhosts.d/vhosts.template \
- ${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d/vhosts.template
-
-.if ${PORT_OPTIONS:MDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/doc/config/vhosts.d/vhosts.template \
+ ${STAGEDIR}${ETCDIR}/vhosts.d/vhosts.template
+ @${MKDIR} ${STAGEDIR}${WWWDIR}
+ @${MKDIR} -m 0700 ${STAGEDIR}${CACHEDIR}
+ @${MKDIR} -m 0700 ${STAGEDIR}${HOMEDIR}/sockets
+ @${MKDIR} -m 0700 ${STAGEDIR}${LOGDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
-. for FILE in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
-. endfor
-.endif
-.if ${PORT_OPTIONS:MMYSQLAUTH}
-. for FILE in README.mysqlauth mysql_auth.sql
- @${INSTALL_DATA} ${FILESDIR}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
-. endfor
-.endif
- @${MKDIR} -m 0700 ${STAGEDIR}${LIGHTTPD_LOGROOT}
+ (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-test: build
- @cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE} \
- ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \
- check-TESTS
-
-regression-test: test
-
.endif # !defined(_BUILDING_LIGHTTPD_MODULE)
.include <bsd.port.mk>
Modified: trunk/www/lighttpd/distinfo
===================================================================
--- trunk/www/lighttpd/distinfo 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/distinfo 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,6 +1,5 @@
-SHA256 (lighttpd-1.4.39.tar.xz) = 7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b
-SIZE (lighttpd-1.4.39.tar.xz) = 579180
-SHA256 (lighttpd-1.4.26_mod_geoip.patch) = 2858036310b778852d9f039a81629902edffc368658e13bf4779f3642ee1a5ba
-SIZE (lighttpd-1.4.26_mod_geoip.patch) = 15173
-SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = bc0e1b97289a89b827ea84e64b614933cc14d67c64d6b727e4928aeec516489c
-SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242421
+TIMESTAMP = 1534189436
+SHA256 (lighttpd-1.4.50.tar.xz) = 29378312d8887cbc14ffe8a7fadef2d5a08c7e7e1be942795142346ad95629eb
+SIZE (lighttpd-1.4.50.tar.xz) = 718480
+SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = dc9bd6e26755cc2e3ccf6eaf8cc89e5d697f5a876f71318be67b28225368fd4e
+SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242037
Index: trunk/www/lighttpd/files/COPYING.mod_h264_streaming
===================================================================
--- trunk/www/lighttpd/files/COPYING.mod_h264_streaming 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/COPYING.mod_h264_streaming 2018-11-24 20:45:57 UTC (rev 24694)
Property changes on: trunk/www/lighttpd/files/COPYING.mod_h264_streaming
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/www/lighttpd/files/README.mysqlauth
===================================================================
--- trunk/www/lighttpd/files/README.mysqlauth 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/README.mysqlauth 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,45 +0,0 @@
-References:
-http://redmine.lighttpd.net/issues/752
-http://redmine.lighttpd.net/attachments/1012/03_all_lighttpd-1.4.23-mysql_auth.diff
-http://redmine.lighttpd.net/attachments/download/1012/03_all_lighttpd-1.4.23-mysql_auth.diff
-
-This patch allows lighttpd to authenticate users against mySQL DBbr
-NOTE: Only basic auth is implemented. Passwords are stored as MD5 hash in DB
-
-make mysql db and user (read mySQL doc's if you don't know how)
-import lighttpd-1.4.11-mysql_auth.sql
-
-open lighttpd.conf and add
-(be sure that you comment out any other auth - according to lighttpd docs)
-
-auth.backend = "mysql"
-auth.backend.mysql.host = "localhost"
-auth.backend.mysql.user = "db_user"
-auth.backend.mysql.pass = "db_pass"
-auth.backend.mysql.db = "db_name"
-auth.backend.mysql.port = "0" # (for default port 0, always needed)
-auth.backend.mysql.socket = "" # (for default leave blank, always needed)
-auth.backend.mysql.users_table = "users_table"
-auth.backend.mysql.col_user = "col_name_username"
-auth.backend.mysql.col_pass = "col_name_password" # (md5 hash of password)
-auth.backend.mysql.col_realm = "col_realm_name"
-
-configure lighttpd to use it (same as every other auth)
-
-auth.require = ( "/some_path" =>
- (
- "method" => "basic",
- "realm" => "some_realm",
- "require" => "some_user",
- )
-)
-
-start lighttpd
-
-P.S. patch include more complicated setup with separate table for domains.
-If you are interested please contact with me to obtain more information.
-
-Bugs, Patches and Suggestions
-Send me E-Mail: drJeckyll at Jeckyll.net
-
--- drJeckyll
Deleted: trunk/www/lighttpd/files/extra-patch-mysqlauth
===================================================================
--- trunk/www/lighttpd/files/extra-patch-mysqlauth 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/extra-patch-mysqlauth 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,455 +0,0 @@
-diff -Naur new/lighttpd-1.4.23/src/http_auth.c old/lighttpd-1.4.23/src/http_auth.c
---- src/http_auth.c 2009-06-11 14:05:06.000000000 +0400
-+++ src/http_auth.c 2009-10-08 10:10:15.000000000 +0400
-@@ -24,6 +24,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <ctype.h>
-+#include <mysql/mysql.h>
-
- #include "server.h"
- #include "log.h"
-@@ -291,6 +292,117 @@
- stream_close(&f);
- } else if (p->conf.auth_backend == AUTH_BACKEND_LDAP) {
- ret = 0;
-+ } else if (p->conf.auth_backend == AUTH_BACKEND_MYSQL) {
-+ MYSQL_RES *result;
-+ MYSQL_ROW row;
-+ int port = atoi(p->conf.auth_mysql_port->ptr);
-+ char q[255];
-+
-+ if (p->conf.auth_mysql_socket->ptr != NULL)
-+ if (0 == strcmp(p->conf.auth_mysql_socket->ptr, "")) p->conf.auth_mysql_socket->ptr = NULL;
-+
-+ p->conf.mysql_conn = mysql_init(NULL);
-+
-+ if (mysql_real_connect(p->conf.mysql_conn, p->conf.auth_mysql_host->ptr, p->conf.auth_mysql_user->ptr, p->conf.auth_mysql_pass->ptr, p->conf.auth_mysql_db->ptr, port, p->conf.auth_mysql_socket->ptr, 0))
-+ {
-+//#define MY_HOSTING
-+
-+#ifdef MY_HOSTING
-+ char my_full_realm[255];
-+ char *my_realm = NULL;
-+ char *my_domain = NULL;
-+
-+ char *uname;
-+ size_t unamelen;
-+
-+ unamelen = strlen(username->ptr);
-+ uname = malloc(unamelen*2+1);
-+
-+ mysql_real_escape_string(p->conf.mysql_conn,
-+ uname, username->ptr,
-+ (unsigned long)unamelen);
-+
-+ strcpy(my_full_realm, realm->ptr);
-+ my_realm = strtok(my_full_realm, "@");
-+
-+ if (my_realm != NULL)
-+ my_domain = strtok(NULL, "@");
-+
-+ sprintf(q, "SELECT %s FROM %s, %s WHERE %s='%s' AND %s='%s' AND %s='%s' AND %s=%s",
-+ p->conf.auth_mysql_col_pass->ptr,
-+
-+ p->conf.auth_mysql_users_table->ptr,
-+ p->conf.auth_mysql_domains_table->ptr,
-+
-+ p->conf.auth_mysql_col_user->ptr,
-+ uname,
-+
-+ p->conf.auth_mysql_col_realm->ptr,
-+ my_realm,
-+
-+ p->conf.auth_mysql_col_domain->ptr,
-+ my_domain,
-+
-+ p->conf.auth_mysql_domains_table_col_domain_id->ptr,
-+ p->conf.auth_mysql_users_table_col_domain_id->ptr
-+ );
-+
-+ free(uname);
-+#else
-+ // sanitize username & realm by taguchi at ff.iij4u.or.jp
-+ char *uname, *urealm;
-+ size_t unamelen, urealmlen;
-+
-+ unamelen = strlen(username->ptr);
-+ urealmlen = strlen(realm->ptr);
-+ uname = malloc(unamelen*2+1);
-+ urealm = malloc(urealmlen*2+1);
-+
-+ mysql_real_escape_string(p->conf.mysql_conn,
-+ uname, username->ptr,
-+ (unsigned long)unamelen);
-+
-+ mysql_real_escape_string(p->conf.mysql_conn,
-+ urealm, realm->ptr,
-+ (unsigned long)unamelen);
-+
-+ mysql_real_escape_string(p->conf.mysql_conn,
-+ urealm, realm->ptr,
-+ (unsigned long)urealmlen);
-+
-+ sprintf(q, "SELECT %s FROM %s WHERE %s='%s' AND %s='%s'",
-+ p->conf.auth_mysql_col_pass->ptr,
-+ p->conf.auth_mysql_users_table->ptr,
-+ p->conf.auth_mysql_col_user->ptr,
-+ uname,
-+ p->conf.auth_mysql_col_realm->ptr,
-+ urealm
-+ );
-+
-+ free(uname);
-+ free(urealm);
-+#endif
-+
-+ mysql_query(p->conf.mysql_conn, q);
-+ result = mysql_store_result(p->conf.mysql_conn);
-+ if (mysql_num_rows(result) == 1)
-+ {
-+ /* found */
-+ row = mysql_fetch_row(result);
-+ buffer_copy_string_len(password, row[0], strlen(row[0]));
-+
-+ ret = 0;
-+ } else
-+ {
-+ /* not found */
-+ ret = -1;
-+ }
-+
-+ mysql_free_result(result);
-+ mysql_close(p->conf.mysql_conn);
-+
-+ p->conf.mysql_conn = NULL;
-+ }
- } else {
- return -1;
- }
-@@ -831,6 +943,60 @@
-
- return 0;
- #endif
-+ } else if (p->conf.auth_backend == AUTH_BACKEND_MYSQL) {
-+ /*
-+ we check for md5 crypt() now
-+ request by Nicola Tiling <nti at w4w.net>
-+ */
-+ if (password->ptr[0] == '$' && password->ptr[2] == '$')
-+ {
-+ char salt[32];
-+ char *crypted;
-+ size_t salt_len = 0;
-+ char *dollar = NULL;
-+
-+ if (NULL == (dollar = strchr(password->ptr + 3, '$'))) {
-+ fprintf(stderr, "%s.%d\n", __FILE__, __LINE__);
-+ return -1;
-+ }
-+
-+ salt_len = dollar - password->ptr;
-+
-+ if (salt_len > sizeof(salt) - 1)
-+ {
-+ fprintf(stderr, "%s.%d\n", __FILE__, __LINE__);
-+ return -1;
-+ }
-+
-+ strncpy(salt, password->ptr, salt_len);
-+
-+ salt[salt_len] = '\0';
-+
-+ crypted = crypt(pw, salt);
-+
-+ if (0 == strcmp(password->ptr, crypted))
-+ {
-+ return 0;
-+ } else {
-+ fprintf(stderr, "%s.%d\n", __FILE__, __LINE__);
-+ }
-+ } else
-+ /* plain md5 check now */
-+ {
-+ li_MD5_CTX Md5Ctx;
-+ HASH HA1;
-+ char a1[256];
-+
-+ li_MD5_Init(&Md5Ctx);
-+ li_MD5_Update(&Md5Ctx, (unsigned char *)pw, strlen(pw));
-+ li_MD5_Final(HA1, &Md5Ctx);
-+
-+ CvtHex(HA1, a1);
-+
-+ if (0 == strcmp(password->ptr, a1)) {
-+ return 0;
-+ }
-+ }
- }
- return -1;
- }
-diff -Naur new/lighttpd-1.4.23/src/http_auth.h old/lighttpd-1.4.23/src/http_auth.h
---- src/http_auth.h 2009-03-31 02:16:59.000000000 +0400
-+++ src/http_auth.h 2009-10-08 10:13:56.000000000 +0400
-@@ -8,13 +8,15 @@
- # define USE_LDAP
- # include <ldap.h>
- #endif
-+#include <mysql/mysql.h>
-
- typedef enum {
- AUTH_BACKEND_UNSET,
- AUTH_BACKEND_PLAIN,
- AUTH_BACKEND_LDAP,
- AUTH_BACKEND_HTPASSWD,
-- AUTH_BACKEND_HTDIGEST
-+ AUTH_BACKEND_HTDIGEST,
-+ AUTH_BACKEND_MYSQL
- } auth_backend_t;
-
- typedef struct {
-@@ -49,6 +51,22 @@
- buffer *ldap_filter_pre;
- buffer *ldap_filter_post;
- #endif
-+
-+ MYSQL *mysql_conn;
-+ buffer *auth_mysql_host;
-+ buffer *auth_mysql_user;
-+ buffer *auth_mysql_pass;
-+ buffer *auth_mysql_db;
-+ buffer *auth_mysql_port;
-+ buffer *auth_mysql_socket;
-+ buffer *auth_mysql_users_table;
-+ buffer *auth_mysql_col_user;
-+ buffer *auth_mysql_col_pass;
-+ buffer *auth_mysql_col_realm;
-+ buffer *auth_mysql_domains_table;
-+ buffer *auth_mysql_col_domain;
-+ buffer *auth_mysql_domains_table_col_domain_id;
-+ buffer *auth_mysql_users_table_col_domain_id;
- } mod_auth_plugin_config;
-
- typedef struct {
-diff -Naur new/lighttpd-1.4.23/src/Makefile.am old/lighttpd-1.4.23/src/Makefile.am
---- src/Makefile.am 2009-06-16 17:45:42.000000000 +0400
-+++ src/Makefile.am 2009-10-08 10:26:56.000000000 +0400
-@@ -242,7 +242,7 @@
- lib_LTLIBRARIES += mod_auth.la
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
--mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_LIBADD = $(MYSQL_LIBS) $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
-diff -Naur lighttpd-1.4.23/src/Makefile.in old/lighttpd-1.4.23/src/Makefile.in
---- src/Makefile.in 2009-06-19 23:19:22.000000000 +0400
-+++ src/Makefile.in 2009-10-08 10:26:25.000000000 +0400
-@@ -706,7 +706,7 @@
- mod_compress_la_LIBADD = $(Z_LIB) $(BZ_LIB) $(common_libadd)
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
--mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_LIBADD = $(MYSQL_LIBS) $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
- mod_rewrite_la_SOURCES = mod_rewrite.c
- mod_rewrite_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_rewrite_la_LIBADD = $(PCRE_LIB) $(common_libadd)
-diff -Naur new/lighttpd-1.4.23/src/mod_auth.c old/lighttpd-1.4.23/src/mod_auth.c
---- src/mod_auth.c 2009-04-11 16:08:19.000000000 +0400
-+++ src/mod_auth.c 2009-10-08 10:24:13.000000000 +0400
-@@ -6,6 +6,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <mysql/mysql.h>
-
- #include "plugin.h"
- #include "http_auth.h"
-@@ -83,6 +84,20 @@
- if (s->ldap) ldap_unbind_s(s->ldap);
- #endif
-
-+ buffer_free(s->auth_mysql_host);
-+ buffer_free(s->auth_mysql_user);
-+ buffer_free(s->auth_mysql_pass);
-+ buffer_free(s->auth_mysql_db);
-+ buffer_free(s->auth_mysql_socket);
-+ buffer_free(s->auth_mysql_users_table);
-+ buffer_free(s->auth_mysql_col_user);
-+ buffer_free(s->auth_mysql_col_pass);
-+ buffer_free(s->auth_mysql_col_realm);
-+ buffer_free(s->auth_mysql_domains_table);
-+ buffer_free(s->auth_mysql_col_domain);
-+ buffer_free(s->auth_mysql_domains_table_col_domain_id);
-+ buffer_free(s->auth_mysql_users_table_col_domain_id);
-+
- free(s);
- }
- free(p->config_storage);
-@@ -120,6 +135,21 @@
- PATCH(ldap_filter_post);
- #endif
-
-+ PATCH(auth_mysql_host);
-+ PATCH(auth_mysql_user);
-+ PATCH(auth_mysql_pass);
-+ PATCH(auth_mysql_db);
-+ PATCH(auth_mysql_port);
-+ PATCH(auth_mysql_socket);
-+ PATCH(auth_mysql_users_table);
-+ PATCH(auth_mysql_col_user);
-+ PATCH(auth_mysql_col_pass);
-+ PATCH(auth_mysql_col_realm);
-+ PATCH(auth_mysql_domains_table);
-+ PATCH(auth_mysql_col_domain);
-+ PATCH(auth_mysql_domains_table_col_domain_id);
-+ PATCH(auth_mysql_users_table_col_domain_id);
-+
- /* skip the first, the global context */
- for (i = 1; i < srv->config_context->used; i++) {
- data_config *dc = (data_config *)srv->config_context->data[i];
-@@ -169,6 +199,34 @@
- PATCH(auth_ldap_bindpw);
- } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.allow-empty-pw"))) {
- PATCH(auth_ldap_allow_empty_pw);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.host"))) {
-+ PATCH(auth_mysql_host);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.user"))) {
-+ PATCH(auth_mysql_user);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.pass"))) {
-+ PATCH(auth_mysql_pass);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.db"))) {
-+ PATCH(auth_mysql_db);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.port"))) {
-+ PATCH(auth_mysql_port);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.socket"))) {
-+ PATCH(auth_mysql_user);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.users_table"))) {
-+ PATCH(auth_mysql_users_table);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.col_user"))) {
-+ PATCH(auth_mysql_col_user);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.col_pass"))) {
-+ PATCH(auth_mysql_col_pass);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.col_realm"))) {
-+ PATCH(auth_mysql_col_realm);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.domains_table"))) {
-+ PATCH(auth_mysql_domains_table);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.col_domain"))) {
-+ PATCH(auth_mysql_col_domain);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.domains_table_col_domain_id"))) {
-+ PATCH(auth_mysql_domains_table_col_domain_id);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.users_table_col_domain_id"))) {
-+ PATCH(auth_mysql_users_table_col_domain_id);
- }
- }
- }
-@@ -323,10 +381,24 @@
- { "auth.backend.ldap.starttls", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 8 */
- { "auth.backend.ldap.bind-dn", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 9 */
- { "auth.backend.ldap.bind-pw", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 10 */
-- { "auth.backend.ldap.allow-empty-pw", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 11 */
-+ { "auth.backend.ldap.allow-empty-pw", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },
- { "auth.backend.htdigest.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 12 */
- { "auth.backend.htpasswd.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 13 */
- { "auth.debug", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 14 */
-+ { "auth.backend.mysql.host", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.user", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.pass", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.db", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.port", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.socket", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.users_table", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.col_user", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.col_pass", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.col_realm", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 23 */
-+ { "auth.backend.mysql.domains_table", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.col_domain", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.domains_table_col_domain_id", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.mysql.users_table_col_domain_id", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 27 */
- { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
- };
-
-@@ -355,6 +427,22 @@
- s->auth_debug = 0;
-
- s->auth_require = array_init();
-+ s->mysql_conn = NULL;
-+ s->auth_mysql_host = buffer_init();
-+ s->auth_mysql_user = buffer_init();
-+ s->auth_mysql_pass = buffer_init();
-+ s->auth_mysql_db = buffer_init();
-+ s->auth_mysql_port = buffer_init();
-+ s->auth_mysql_socket = buffer_init();
-+ s->auth_mysql_users_table = buffer_init();
-+ s->auth_mysql_col_user = buffer_init();
-+ s->auth_mysql_col_pass = buffer_init();
-+ s->auth_mysql_col_realm = buffer_init();
-+ s->auth_mysql_domains_table = buffer_init();
-+ s->auth_mysql_col_domain = buffer_init();
-+ s->auth_mysql_domains_table_col_domain_id = buffer_init();
-+ s->auth_mysql_users_table_col_domain_id = buffer_init();
-+
-
- #ifdef USE_LDAP
- s->ldap_filter_pre = buffer_init();
-@@ -377,7 +465,20 @@
- cv[12].destination = s->auth_htdigest_userfile;
- cv[13].destination = s->auth_htpasswd_userfile;
- cv[14].destination = &(s->auth_debug);
--
-+ cv[15].destination = s->auth_mysql_host;
-+ cv[16].destination = s->auth_mysql_user;
-+ cv[17].destination = s->auth_mysql_pass;
-+ cv[18].destination = s->auth_mysql_db;
-+ cv[19].destination = s->auth_mysql_port;
-+ cv[20].destination = s->auth_mysql_socket;
-+ cv[21].destination = s->auth_mysql_users_table;
-+ cv[22].destination = s->auth_mysql_col_user;
-+ cv[23].destination = s->auth_mysql_col_pass;
-+ cv[24].destination = s->auth_mysql_col_realm;
-+ cv[25].destination = s->auth_mysql_domains_table;
-+ cv[26].destination = s->auth_mysql_col_domain;
-+ cv[27].destination = s->auth_mysql_domains_table_col_domain_id;
-+ cv[28].destination = s->auth_mysql_users_table_col_domain_id;
- p->config_storage[i] = s;
- ca = ((data_config *)srv->config_context->data[i])->value;
-
-@@ -394,6 +495,8 @@
- s->auth_backend = AUTH_BACKEND_PLAIN;
- } else if (0 == strcmp(s->auth_backend_conf->ptr, "ldap")) {
- s->auth_backend = AUTH_BACKEND_LDAP;
-+ } else if (0 == strcmp(s->auth_backend_conf->ptr, "mysql")) {
-+ s->auth_backend = AUTH_BACKEND_MYSQL;
- } else {
- log_error_write(srv, __FILE__, __LINE__, "sb", "auth.backend not supported:", s->auth_backend_conf);
-
-@@ -534,6 +637,28 @@
- return (ret);
- break;
- }
-+ case AUTH_BACKEND_MYSQL: {
-+ int port = atoi(s->auth_mysql_port->ptr);
-+
-+ if (p->conf.auth_mysql_socket->ptr != NULL)
-+ if (0 == strcmp(s->auth_mysql_socket->ptr, "")) s->auth_mysql_socket->ptr = NULL;
-+
-+ s->mysql_conn = mysql_init(NULL);
-+ if (!mysql_real_connect(s->mysql_conn, s->auth_mysql_host->ptr, s->auth_mysql_user->ptr, s->auth_mysql_pass->ptr, s->auth_mysql_db->ptr, port, NULL, 0))
-+ {
-+ log_error_write(srv, __FILE__, __LINE__, "sbsbsbsbss",
-+ "opening connection to mysql:", s->auth_mysql_host,
-+ "user:", s->auth_mysql_user,
-+ "pass:", s->auth_mysql_pass,
-+ "db:", s->auth_mysql_db,
-+ "failed:", strerror(errno));
-+
-+ return HANDLER_ERROR;
-+ }
-+ mysql_close(s->mysql_conn);
-+
-+ break;
-+ }
- default:
- break;
- }
Deleted: trunk/www/lighttpd/files/extra-patch-nodelay
===================================================================
--- trunk/www/lighttpd/files/extra-patch-nodelay 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/extra-patch-nodelay 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,15 +0,0 @@
---- src/network.c.orig Tue Jan 26 14:33:01 2010
-+++ src/network.c Tue Jan 26 14:37:39 2010
-@@ -226,6 +226,12 @@
- log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt failed:", strerror(errno));
- goto error_free_socket;
- }
-+ if(srv_socket->addr.plain.sa_family == AF_INET || srv_socket->addr.plain.sa_family == AF_INET6 ) {
-+ if (setsockopt(srv_socket->fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)) < 0) {
-+ log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt failed:", strerror(errno));
-+ goto error_free_socket;
-+ }
-+ }
-
- switch(srv_socket->addr.plain.sa_family) {
- #ifdef HAVE_IPV6
Deleted: trunk/www/lighttpd/files/extra-patch-remoteuser
===================================================================
--- trunk/www/lighttpd/files/extra-patch-remoteuser 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/extra-patch-remoteuser 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,64 +0,0 @@
-diff -urN src/array.h src/array.h
---- src/array.h 2010-02-01 18:28:20.000000000 -0500
-+++ src/array.h 2012-04-22 13:25:16.000000000 -0400
-@@ -96,6 +96,7 @@
- COMP_HTTP_QUERY_STRING,
- COMP_HTTP_SCHEME,
- COMP_HTTP_REQUEST_METHOD,
-+ COMP_HTTP_REMOTE_USER,
-
- COMP_LAST_ELEMENT
- } comp_key_t;
-diff -urN src/configfile-glue.c src/configfile-glue.c
---- src/configfile-glue.c 2010-08-17 05:04:38.000000000 -0400
-+++ src/configfile-glue.c 2012-04-22 13:25:16.000000000 -0400
-@@ -455,6 +455,14 @@
- }
- break;
- }
-+ case COMP_HTTP_REMOTE_USER: {
-+ if (NULL != con->authed_user) {
-+ l = con->authed_user;
-+ } else {
-+ l = srv->empty_string;
-+ }
-+ break;
-+ }
- default:
- return COND_RESULT_FALSE;
- }
-diff -urN src/configparser.c src/configparser.c
---- src/configparser.c 2011-12-18 09:54:21.000000000 -0500
-+++ src/configparser.c 2012-04-22 13:25:16.000000000 -0400
-@@ -1221,6 +1221,8 @@
- { COMP_HTTP_QUERY_STRING, CONST_STR_LEN("HTTP[\"query-string\"]") },
- { COMP_HTTP_REQUEST_METHOD, CONST_STR_LEN("HTTP[\"request-method\"]") },
- { COMP_HTTP_SCHEME, CONST_STR_LEN("HTTP[\"scheme\"]" ) },
-+ { COMP_HTTP_REMOTE_USER, CONST_STR_LEN("HTTP[\"remoteuser\"]" ) },
-+ { COMP_HTTP_REMOTE_USER, CONST_STR_LEN("HTTP[\"remote-user\"]" ) },
- { COMP_UNSET, NULL, 0 },
- };
- size_t i;
-diff -urN src/configparser.y src/configparser.y
---- src/configparser.y 2010-02-01 18:28:20.000000000 -0500
-+++ src/configparser.y 2012-04-22 13:25:16.000000000 -0400
-@@ -435,6 +435,8 @@
- { COMP_HTTP_QUERY_STRING, CONST_STR_LEN("HTTP[\"query-string\"]") },
- { COMP_HTTP_REQUEST_METHOD, CONST_STR_LEN("HTTP[\"request-method\"]") },
- { COMP_HTTP_SCHEME, CONST_STR_LEN("HTTP[\"scheme\"]" ) },
-+ { COMP_HTTP_REMOTE_USER, CONST_STR_LEN("HTTP[\"remoteuser\"]" ) },
-+ { COMP_HTTP_REMOTE_USER, CONST_STR_LEN("HTTP[\"remote-user\"]" ) },
- { COMP_UNSET, NULL, 0 },
- };
- size_t i;
-diff -urN src/response.c src/response.c
---- src/response.c 2010-08-17 05:04:38.000000000 -0400
-+++ src/response.c 2012-04-22 13:25:30.000000000 -0400
-@@ -280,6 +280,7 @@
- config_patch_connection(srv, con, COMP_HTTP_LANGUAGE); /* Accept-Language: */
- config_patch_connection(srv, con, COMP_HTTP_COOKIE); /* Cookie: */
- config_patch_connection(srv, con, COMP_HTTP_REQUEST_METHOD); /* REQUEST_METHOD */
-+ config_patch_connection(srv, con, COMP_HTTP_REMOTE_USER); /* REMOTE_USER */
-
- /** their might be a fragment which has to be cut away */
- if (NULL != (qstr = strchr(con->request.uri->ptr, '#'))) {
Index: trunk/www/lighttpd/files/h264_streaming.conf
===================================================================
--- trunk/www/lighttpd/files/h264_streaming.conf 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/h264_streaming.conf 2018-11-24 20:45:57 UTC (rev 24694)
Property changes on: trunk/www/lighttpd/files/h264_streaming.conf
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/lighttpd/files/lighttpd.in
===================================================================
--- trunk/www/lighttpd/files/lighttpd.in 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/lighttpd.in 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD$
+# $FreeBSD: head/www/lighttpd/files/lighttpd.in 454615 2017-11-21 15:33:35Z arved $
#
# PROVIDE: lighttpd
# REQUIRE: %%REQUIRE%%
@@ -11,7 +11,7 @@
# lighttpd_enable (bool): Set it to "YES" to enable lighttpd
# Default is "NO".
# lighttpd_conf (path): Set full path to configuration file.
-# Default is "%%PREFIX%%/etc/lighttpd/lighttpd.conf".
+# Default is "%%ETCDIR%%/lighttpd.conf".
# lighttpd_pidfile (path): Set full path to pid file.
# Default is "/var/run/lighttpd.pid".
#
@@ -21,7 +21,7 @@
# lighttpd_instances (string): Instances of lighttpd
# Default is "" (no instances).
# lighttpd_${i}_conf (path): Set full path to instance configuration file.
-# Default is "%%PREFIX%%/etc/lighttpd/${i}.conf".
+# Default is "%%ETCDIR%%/${i}.conf".
# lighttpd_${i}_pidfile (path): Set full path to instance pid file
# Default is "/var/run/lighttpd_${i}.pid".
#
@@ -43,7 +43,7 @@
deprecated_conf=1
lighttpd_conf="%%PREFIX%%/etc/lighttpd.conf"
else
- lighttpd_conf="%%PREFIX%%/etc/lighttpd/lighttpd.conf"
+ lighttpd_conf="%%ETCDIR%%/lighttpd.conf"
fi
fi
@@ -65,7 +65,7 @@
echo ""
echo "*** NOTICE: ***"
echo "The default location of %%PREFIX%%/etc/lighttpd.conf is deprecated"
- echo "Please consider moving to %%PREFIX%%/etc/lighttpd/lighttpd.conf"
+ echo "Please consider moving to %%ETCDIR%%/lighttpd.conf"
echo ""
fi
}
@@ -73,7 +73,7 @@
lighttpd_checkconfig()
{
echo "Performing sanity check on ${name} configuration:"
- eval "${command} ${command_args} -t"
+ eval "${command} ${command_args} -tt"
}
lighttpd_gracefulstop()
@@ -96,7 +96,7 @@
_rcmd="$2"
name=${_orig_name}_${_i}
eval ${name}_enable=${lighttpd_enable}
- eval lighttpd_conf=\"\${lighttpd_${_i}_conf:-"%%PREFIX%%/etc/lighttpd/${_i}.conf"}\"
+ eval lighttpd_conf=\"\${lighttpd_${_i}_conf:-"%%ETCDIR%%/${_i}.conf"}\"
eval lighttpd_pidfile=\"\${lighttpd_${_i}_pidfile:-"/var/run/lighttpd_${_i}.pid"}\"
command_args="-f ${lighttpd_conf}"
pidfile=${lighttpd_pidfile}
Property changes on: trunk/www/lighttpd/files/lighttpd.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/www/lighttpd/files/mysql_auth.sql
===================================================================
--- trunk/www/lighttpd/files/mysql_auth.sql 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/mysql_auth.sql 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,10 +0,0 @@
-CREATE TABLE `vhosts_secure`(
- vhost_secure_id bigint(20) NOT NULL AUTO_INCREMENT,
- vhost_secure_username varchar(255) NOT NULL,
- vhost_secure_password varchar(255) NOT NULL,
- vhost_secure_realm varchar(255) NOT NULL
- PRIMARY KEY (vhost_secure_id),
- INDEX i_username (vhost_secure_username),
- INDEX i_password (vhost_secure_password),
- INDEX i_realm (vhost_secure_realm)
-);
Deleted: trunk/www/lighttpd/files/patch-configure.ac
===================================================================
--- trunk/www/lighttpd/files/patch-configure.ac 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/patch-configure.ac 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,22 +0,0 @@
---- configure.ac.orig 2012-11-19 11:05:29.000000000 +0100
-+++ configure.ac 2012-11-21 14:22:53.723233779 +0100
-@@ -16,6 +16,7 @@
- dnl Checks for programs.
- AC_PROG_CC
- AM_PROG_CC_C_O
-+AM_PROG_AR
- AC_PROG_LD
- AC_PROG_INSTALL
- AC_PROG_AWK
-@@ -30,11 +31,6 @@
- dnl AM_PROG_AR requires automake 1.11 (and uses AC_COMPILE_IFELSE which wants AC_USE_SYSTEM_EXTENSIONS)
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-
--dnl check environment
--AC_AIX
--AC_ISC_POSIX
--AC_MINIX
--
- dnl AC_CANONICAL_HOST
- case $host_os in
- *darwin*|*cygwin*|*aix*|*mingw* ) NO_RDYNAMIC=yes;;
Deleted: trunk/www/lighttpd/files/patch-src-fdevent.h
===================================================================
--- trunk/www/lighttpd/files/patch-src-fdevent.h 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/patch-src-fdevent.h 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,11 +0,0 @@
---- src/fdevent.h.orig 2011-12-19 07:41:33.183877666 +0100
-+++ src/fdevent.h 2011-12-19 07:42:01.457863868 +0100
-@@ -54,7 +54,7 @@
- # include <port.h>
- #endif
-
--#if defined HAVE_SYS_EVENT_H && defined HAVE_KQUEUE
-+#if defined HAVE_SYS_EVENT_H && defined HAVE_KQUEUE && !defined HAVE_LIBEV
- # define USE_FREEBSD_KQUEUE
- # include <sys/event.h>
- #endif
Deleted: trunk/www/lighttpd/files/pkg-descr.mod_geoip
===================================================================
--- trunk/www/lighttpd/files/pkg-descr.mod_geoip 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/pkg-descr.mod_geoip 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,4 +0,0 @@
-mod_geoip is a lighttpd module that looks up the country code
-for the IP address making the request without using reverse DNS.
-
-WWW: http://redmine.lighttpd.net/wiki/1/Docs:ModGeoip
Deleted: trunk/www/lighttpd/files/pkg-descr.mod_h264_streaming
===================================================================
--- trunk/www/lighttpd/files/pkg-descr.mod_h264_streaming 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/pkg-descr.mod_h264_streaming 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,9 +0,0 @@
-This is the H264 Streaming Module for the lighttpd webserver.
-Its features are as follows:
-
- * Timeshifting seek
- * Virtual video clips
- * Network efficiency
- * Encoding
-
-WWW: http://h264.code-shop.com/trac/wiki/Mod-H264-Streaming-Lighttpd-Version2
Deleted: trunk/www/lighttpd/files/pkg-plist.mod_geoip
===================================================================
--- trunk/www/lighttpd/files/pkg-plist.mod_geoip 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/pkg-plist.mod_geoip 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,6 +0,0 @@
- at unexec if cmp -s %D/etc/lighttpd/conf.d/geoip.conf %D/etc/lighttpd/conf.d/geoip.conf.sample; then rm -f %D/etc/lighttpd/conf.d/geoip.conf; fi
-etc/lighttpd/conf.d/geoip.conf.sample
- at exec [ -f %B/geoip.conf ] || cp %B/%f %B/geoip.conf
-lib/lighttpd/mod_geoip.a
-lib/lighttpd/mod_geoip.la
-lib/lighttpd/mod_geoip.so
Deleted: trunk/www/lighttpd/files/pkg-plist.mod_h264_streaming
===================================================================
--- trunk/www/lighttpd/files/pkg-plist.mod_h264_streaming 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/files/pkg-plist.mod_h264_streaming 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,6 +0,0 @@
- at unexec if cmp -s %D/etc/lighttpd/conf.d/h264_streaming.conf %D/etc/lighttpd/conf.d/h264_streaming.conf.sample; then rm -f %D/etc/lighttpd/conf.d/h264_streaming.conf; fi
-etc/lighttpd/conf.d/h264_streaming.conf.sample
- at exec [ -f %B/h264_streaming.conf ] || cp %B/%f %B/h264_streaming.conf
-lib/lighttpd/mod_h264_streaming.a
-lib/lighttpd/mod_h264_streaming.la
-lib/lighttpd/mod_h264_streaming.so
Modified: trunk/www/lighttpd/pkg-plist
===================================================================
--- trunk/www/lighttpd/pkg-plist 2018-11-24 20:19:51 UTC (rev 24693)
+++ trunk/www/lighttpd/pkg-plist 2018-11-24 20:45:57 UTC (rev 24694)
@@ -1,36 +1,41 @@
- at sample etc/lighttpd/lighttpd.conf.sample
- at sample etc/lighttpd/modules.conf.sample
- at sample etc/lighttpd/conf.d/access_log.conf.sample
- at sample etc/lighttpd/conf.d/auth.conf.sample
- at sample etc/lighttpd/conf.d/cml.conf.sample
- at sample etc/lighttpd/conf.d/cgi.conf.sample
- at sample etc/lighttpd/conf.d/compress.conf.sample
- at sample etc/lighttpd/conf.d/debug.conf.sample
- at sample etc/lighttpd/conf.d/dirlisting.conf.sample
- at sample etc/lighttpd/conf.d/evhost.conf.sample
- at sample etc/lighttpd/conf.d/expire.conf.sample
- at sample etc/lighttpd/conf.d/fastcgi.conf.sample
- at sample etc/lighttpd/conf.d/magnet.conf.sample
- at sample etc/lighttpd/conf.d/mime.conf.sample
- at sample etc/lighttpd/conf.d/mysql_vhost.conf.sample
- at sample etc/lighttpd/conf.d/proxy.conf.sample
- at sample etc/lighttpd/conf.d/rrdtool.conf.sample
- at sample etc/lighttpd/conf.d/scgi.conf.sample
- at sample etc/lighttpd/conf.d/secdownload.conf.sample
- at sample etc/lighttpd/conf.d/simple_vhost.conf.sample
- at sample etc/lighttpd/conf.d/ssi.conf.sample
- at sample etc/lighttpd/conf.d/status.conf.sample
- at sample etc/lighttpd/conf.d/trigger_b4_dl.conf.sample
- at sample etc/lighttpd/conf.d/userdir.conf.sample
- at sample etc/lighttpd/conf.d/webdav.conf.sample
-etc/lighttpd/vhosts.d/vhosts.template
+ at sample %%ETCDIR%%/lighttpd.conf.sample
+ at sample %%ETCDIR%%/modules.conf.sample
+ at sample %%ETCDIR%%/conf.d/access_log.conf.sample
+ at sample %%ETCDIR%%/conf.d/auth.conf.sample
+ at sample %%ETCDIR%%/conf.d/cgi.conf.sample
+ at sample %%ETCDIR%%/conf.d/cml.conf.sample
+ at sample %%ETCDIR%%/conf.d/compress.conf.sample
+ at sample %%ETCDIR%%/conf.d/debug.conf.sample
+ at sample %%ETCDIR%%/conf.d/dirlisting.conf.sample
+ at sample %%ETCDIR%%/conf.d/evhost.conf.sample
+ at sample %%ETCDIR%%/conf.d/expire.conf.sample
+ at sample %%ETCDIR%%/conf.d/fastcgi.conf.sample
+ at sample %%ETCDIR%%/conf.d/magnet.conf.sample
+ at sample %%ETCDIR%%/conf.d/mime.conf.sample
+ at sample %%ETCDIR%%/conf.d/mysql_vhost.conf.sample
+ at sample %%ETCDIR%%/conf.d/proxy.conf.sample
+ at sample %%ETCDIR%%/conf.d/rrdtool.conf.sample
+ at sample %%ETCDIR%%/conf.d/scgi.conf.sample
+ at sample %%ETCDIR%%/conf.d/secdownload.conf.sample
+ at sample %%ETCDIR%%/conf.d/simple_vhost.conf.sample
+ at sample %%ETCDIR%%/conf.d/ssi.conf.sample
+ at sample %%ETCDIR%%/conf.d/status.conf.sample
+ at sample %%ETCDIR%%/conf.d/trigger_b4_dl.conf.sample
+ at sample %%ETCDIR%%/conf.d/userdir.conf.sample
+ at sample %%ETCDIR%%/conf.d/webdav.conf.sample
+%%ETCDIR%%/vhosts.d/vhosts.template
lib/lighttpd/mod_access.so
lib/lighttpd/mod_accesslog.so
lib/lighttpd/mod_alias.so
lib/lighttpd/mod_auth.so
+lib/lighttpd/mod_authn_file.so
+%%KRB5%%lib/lighttpd/mod_authn_gssapi.so
+%%LDAP%%lib/lighttpd/mod_authn_ldap.so
+%%MYSQL%%lib/lighttpd/mod_authn_mysql.so
lib/lighttpd/mod_cgi.so
-lib/lighttpd/mod_cml.so
+%%LUA%%lib/lighttpd/mod_cml.so
lib/lighttpd/mod_compress.so
+lib/lighttpd/mod_deflate.so
lib/lighttpd/mod_dirlisting.so
lib/lighttpd/mod_evasive.so
lib/lighttpd/mod_evhost.so
@@ -38,9 +43,11 @@
lib/lighttpd/mod_extforward.so
lib/lighttpd/mod_fastcgi.so
lib/lighttpd/mod_flv_streaming.so
+%%GEOIP%%lib/lighttpd/mod_geoip.so
lib/lighttpd/mod_indexfile.so
-lib/lighttpd/mod_magnet.so
-lib/lighttpd/mod_mysql_vhost.so
+%%LUA%%lib/lighttpd/mod_magnet.so
+%%MYSQL%%lib/lighttpd/mod_mysql_vhost.so
+%%OPENSSL%%lib/lighttpd/mod_openssl.so
lib/lighttpd/mod_proxy.so
lib/lighttpd/mod_redirect.so
lib/lighttpd/mod_rewrite.so
@@ -49,21 +56,25 @@
lib/lighttpd/mod_secdownload.so
lib/lighttpd/mod_setenv.so
lib/lighttpd/mod_simple_vhost.so
+lib/lighttpd/mod_sockproxy.so
lib/lighttpd/mod_ssi.so
lib/lighttpd/mod_staticfile.so
lib/lighttpd/mod_status.so
-lib/lighttpd/mod_trigger_b4_dl.so
+%%MEMCACHED%%lib/lighttpd/mod_trigger_b4_dl.so
+lib/lighttpd/mod_uploadprogress.so
lib/lighttpd/mod_userdir.so
lib/lighttpd/mod_usertrack.so
+lib/lighttpd/mod_vhostdb.so
+%%LDAP%%lib/lighttpd/mod_vhostdb_ldap.so
+%%MYSQL%%lib/lighttpd/mod_vhostdb_mysql.so
lib/lighttpd/mod_webdav.so
+lib/lighttpd/mod_wstunnel.so
man/man8/lighttpd.8.gz
+%%KRB5%%man/man8/lighttpd-angel.8.gz
sbin/lighttpd
sbin/lighttpd-angel
- at dirrm lib/lighttpd
- at dirrmtry etc/lighttpd/vhosts.d
- at dirrmtry etc/lighttpd/conf.d
- at dirrmtry etc/lighttpd
- at cwd /
- at exec %%MKDIR%% -m 0700 %%LOGROOT%%
- at exec %%CHOWN%% %%USER%%:%%GROUP%% %%LOGROOT%%
- at unexec rmdir %%LOGROOT%% >/dev/null 2>&1 || :
+ at dir %%WWWDIR%%
+ at dir(%%WWWOWN%%,%%WWWGRP%%,700) %%CACHEDIR%%
+ at dir(%%WWWOWN%%,%%WWWGRP%%,700) %%HOMEDIR%%/sockets
+ at dir(%%WWWOWN%%,%%WWWGRP%%,700) %%HOMEDIR%%
+ at dir(%%WWWOWN%%,%%WWWGRP%%,700) %%LOGDIR%%
More information about the Midnightbsd-cvs
mailing list