Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (cb826bfe15e2992345bce80c9db90c812799d7ce)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (cb826bfe15e2992345bce80c9db90c812799d7ce)
  • Date: Mon, 1 Aug 2016 00:46:52 +0000

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/lighttpd/DEPENDS | 92 ++++++++---
http/lighttpd/DETAILS | 11 +
http/lighttpd/HISTORY | 13 +
http/lighttpd/PRE_BUILD | 4
http/lighttpd/external_auth_program-1.4.25.patch | 183
----------------------
http/lighttpd/external_auth_program-1.4.41.patch | 184
+++++++++++++++++++++++
http/lighttpd/lighttpd.gpg |binary
http/lighttpd/lua52.patch | 75 ---------
8 files changed, 273 insertions(+), 289 deletions(-)

New commits:
commit cb826bfe15e2992345bce80c9db90c812799d7ce
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lighttpd: => 1.4.41 [security]

(cherry picked from commit 75b18992b48d5b84bd20cb87230e8beb827ddf1e)

diff --git a/http/lighttpd/DEPENDS b/http/lighttpd/DEPENDS
index 820341b..7a57359 100755
--- a/http/lighttpd/DEPENDS
+++ b/http/lighttpd/DEPENDS
@@ -1,43 +1,85 @@
optional_depends zlib \
- '' '' \
- 'for zlib support' &&
-optional_depends pcre \
- '--with-pcre' '--without-pcre' \
- 'for PCRE support' &&
+ "--with-zlib" \
+ "--without-zlib" \
+ "for zlib support for mod_compress" &&
+
optional_depends bzip2 \
- '--with-bzip2' '--without-bzip2' \
- 'for bzip2 support' &&
+ "--with-bzip2" \
+ "--without-bzip2" \
+ "for bzip2 support for mod_compress" &&
+
+optional_depends pcre \
+ "--with-pcre" \
+ "--without-pcre" \
+ "for PCRE support" &&
+
optional_depends openldap \
- '--with-ldap' '--without-ldap' \
- 'for OpenLDAP support' &&
+ "--with-ldap" \
+ "--without-ldap" \
+ "for OpenLDAP support" &&
+
optional_depends SSL \
- '--with-openssl' '--without-openssl' \
- 'for OpenSSL support' &&
+ "--with-openssl" \
+ "--without-openssl" \
+ "for OpenSSL support" &&
+
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL); then
+ optional_depends krb5 \
+ "--with-kerberos5" \
+ "--without-kerberos5" \
+ "to use Kerberos5 support with OpenSSL"
+fi &&
+
optional_depends MYSQL \
- '--with-mysql' '--without-mysql' \
- 'for MySQL support' &&
-optional_depends gdbm \
- '--with-gdbm' '--without-gdbm' \
- 'gdbm storage for mod_trigger_b4_dl' &&
+ "--with-mysql" \
+ "--without-mysql" \
+ "for MySQL support" &&
+
optional_depends FAM \
- '--with-fam' '--without-fam' \
- 'to reduce number of stat() calls' &&
+ "--with-fam" \
+ "--without-fam" \
+ "to reduce number of stat() calls" &&
+
+optional_depends attr \
+ "--with-attr" \
+ "--without-attr" \
+ "for extended attribute support" &&
+
optional_depends LUA \
- '--with-lua' '--without-lua' \
- 'lua engine for mod_cml' &&
-optional_depends libmemcache \
- '--with-memcache' '--without-memcache' \
- 'memcache storage for mod_trigger_b4_dl' &&
+ "--with-lua" \
+ "--without-lua" \
+ "for Lua engine support for mod_cml" &&
+
+optional_depends gdbm \
+ "--with-gdbm" \
+ "--without-gdbm" \
+ "for GDBM storage for mod_trigger_b4_dl" &&
+
+optional_depends libmemcached \
+ "--with-memcached" \
+ "--without-memcached" \
+ "for memcached storage for mod_trigger_b4_dl" &&

optional_depends libev \
"--with-libev" \
"--without-libev" \
"for fdevent handlers support" &&

+optional_depends libunwind \
+ "--with-libunwind" \
+ "--without-libunwind" \
+ "for libunwind support for backtraces on assert failures" &&
+
+optional_depends valgrind \
+ "--with-valgrind" \
+ "--without-valgrind" \
+ "for internal valgrind support" &&
+
if list_find "$LIGHTTPD_OPTS" "--with-webdav-props"; then
- depends libxml2
+ depends libxml2 '--with-libxml'
+ depends sqlite '--with-sqlite'
fi &&

if list_find "$LIGHTTPD_OPTS" "--with-webdav-locks"; then
- depends sqlite
+ depends util-linux '--with-uuid'
fi
diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index 788cb7c..6931720 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -1,11 +1,16 @@
SPELL=lighttpd
- VERSION=1.4.39
- SECURITY_PATCH=12
+ VERSION=1.4.41
+ SECURITY_PATCH=13
BRANCH=`echo -n $VERSION | cut -d . -f 1,2`
-
SOURCE_HASH=sha512:088ab34a06497f5fa0356dee596f3f31c8439dafdc42909dadde6aa2ac2198ba40afabca69e99e6650195a74a422900c63951eea9a915414c0aa136792d3560e
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc

SOURCE_URL[0]=http://download.lighttpd.net/$SPELL/releases-$BRANCH.x/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=lighttpd.gpg:$SOURCE2:UPSTREAM_KEY
+
sha512:088ab34a06497f5fa0356dee596f3f31c8439dafdc42909dadde6aa2ac2198ba40afabca69e99e6650195a74a422900c63951eea9a915414c0aa136792d3560e
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ DOC_DIRS=""
WEB_SITE=http://www.lighttpd.net/
LICENSE[0]=BSD
ENTERED=20050722
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 513cf0d..56db790 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,16 @@
+2016-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.41; SECURITY_PATCH++; converted to gpg
+ upstream checking; don't do useless doc-ing
+ * DEPENDS: rewritten; switched from libmemcache to libmemcached; added
+ flags for zlib; extended descriptions for gdbm and bzip2; added
+ missing deps (libunwind, attr, valgrind, krb5, util-linux); added
+ missing flags
+ * external_auth_program-1.4.41.patch: renamed from its 1.4.25 version,
+ updated for 1.4.41
+ * lighttpd.gpg: added, 42909B84 public key (Glenn Strauss (A)
+ <gstrauss AT gluelogic.com>)
+ * lua52.patch: dropped, fixed by upstream
+
2016-04-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.39; SECURITY_PATCH++

diff --git a/http/lighttpd/PRE_BUILD b/http/lighttpd/PRE_BUILD
index 829cec6..b145ff5 100755
--- a/http/lighttpd/PRE_BUILD
+++ b/http/lighttpd/PRE_BUILD
@@ -1,10 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/lua52.patch" &&
-
if [[ $LIGHTTPD_EXTAUTH == y ]]; then
- patch -p0 < "$SPELL_DIRECTORY/external_auth_program-1.4.25.patch"
+ patch -p0 < "$SPELL_DIRECTORY/external_auth_program-1.4.41.patch"
fi &&

if [[ $LIGHTTPD_LDAP_PORT == y ]]; then
diff --git a/http/lighttpd/external_auth_program-1.4.25.patch
b/http/lighttpd/external_auth_program-1.4.25.patch
deleted file mode 100644
index c1296c0..0000000
--- a/http/lighttpd/external_auth_program-1.4.25.patch
+++ /dev/null
@@ -1,183 +0,0 @@
---- src/http_auth.h.orig 2010-01-02 17:58:11.000000000 +0100
-+++ src/http_auth.h 2010-01-02 17:59:17.000000000 +0100
-@@ -14,7 +14,8 @@
- AUTH_BACKEND_PLAIN,
- AUTH_BACKEND_LDAP,
- AUTH_BACKEND_HTPASSWD,
-- AUTH_BACKEND_HTDIGEST
-+ AUTH_BACKEND_HTDIGEST,
-+ AUTH_BACKEND_PROGRAM
- } auth_backend_t;
-
- typedef struct {
-@@ -38,6 +39,8 @@
- unsigned short auth_ldap_starttls;
- unsigned short auth_ldap_allow_empty_pw;
-
-+ buffer *auth_program_exec;
-+
- unsigned short auth_debug;
-
- /* generated */
---- src/http_auth.c.orig 2010-01-02 17:58:11.000000000 +0100
-+++ src/http_auth.c 2010-01-02 18:02:34.000000000 +0100
-@@ -287,6 +287,8 @@
- stream_close(&f);
- } else if (p->conf.auth_backend == AUTH_BACKEND_LDAP) {
- ret = 0;
-+ } else if (p->conf.auth_backend == AUTH_BACKEND_PROGRAM) {
-+ ret = 0;
- } else {
- return -1;
- }
-@@ -827,6 +829,57 @@
-
- return 0;
- #endif
-+ } else if (p->conf.auth_backend == AUTH_BACKEND_PROGRAM) {
-+ buffer *progbuf = p->conf.auth_program_exec;
-+ const char *prog;
-+ FILE *pipe;
-+ int ret;
-+
-+ /*
-+ * This is tested when loading configuration,
-+ * but better be paranoid.
-+ */
-+ if(!progbuf || progbuf->used == 0) {
-+ log_error_write(srv, __FILE__, __LINE__, "s",
-+ "Missing 'auth.backend.program.exec'
directive");
-+ return -1;
-+ }
-+ prog = progbuf->ptr;
-+ /*
-+ * Preliminary check, so we can have better error reporting.
-+ * It was tested during configuration reading, but maybe
-+ * something happened to the program since that time.
-+ *
-+ * If someone mess with the program after this test, it
-+ * would simply fail in the popen()/pclose() which we check
anyway.
-+ */
-+ if(access(prog, F_OK | X_OK) < 0) {
-+ log_error_write(srv, __FILE__, __LINE__, "ssss",
-+ "auth.backend.program: Failed
access(",
-+ prog,
-+ "): ",
-+ strerror(errno));
-+ return -1;
-+ }
-+ if((pipe = popen(prog, "w")) == NULL) {
-+ log_error_write(srv, __FILE__, __LINE__, "ssss",
-+ "Failed popen(",
-+ prog,
-+ "): ",
-+ strerror(errno));
-+ return -1;
-+ }
-+ fprintf(pipe, "%s:%s\n", username->ptr, pw);
-+ if((ret = pclose(pipe)) != 0) {
-+ log_error_write(srv, __FILE__, __LINE__, "sssds",
-+ "Failed pclose(", prog, "):", ret,
strerror(errno));
-+ return -1;
-+ }
-+ if (p->conf.auth_debug) {
-+ log_error_write(srv, __FILE__, __LINE__, "ss",
-+ "auth.backend.program success for: ",
username->ptr);
-+ }
-+ return 0;
- }
- return -1;
- }
---- src/mod_auth.c.orig 2010-01-02 17:58:11.000000000 +0100
-+++ src/mod_auth.c 2010-01-02 18:08:14.000000000 +0100
-@@ -82,6 +82,7 @@
-
- if (s->ldap) ldap_unbind_s(s->ldap);
- #endif
-+ buffer_free(s->auth_program_exec);
-
- free(s);
- }
-@@ -119,6 +120,7 @@
- PATCH(ldap_filter_pre);
- PATCH(ldap_filter_post);
- #endif
-+ PATCH(auth_program_exec);
-
- /* skip the first, the global context */
- for (i = 1; i < srv->config_context->used; i++) {
-@@ -169,6 +171,8 @@
- 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.program.exec"))) {
-+ PATCH(auth_program_exec);
- }
- }
- }
-@@ -326,7 +330,8 @@
- { "auth.backend.ldap.allow-empty-pw", NULL,
T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 11 */
- { "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.program.exec", NULL, T_CONFIG_STRING,
T_CONFIG_SCOPE_CONNECTION }, /* 14 */
-+ { "auth.debug", NULL, T_CONFIG_SHORT,
T_CONFIG_SCOPE_CONNECTION }, /* 15 */
- { NULL, NULL, T_CONFIG_UNSET,
T_CONFIG_SCOPE_UNSET }
- };
-
-@@ -352,6 +357,7 @@
- s->auth_ldap_filter = buffer_init();
- s->auth_ldap_cafile = buffer_init();
- s->auth_ldap_starttls = 0;
-+ s->auth_program_exec = buffer_init();
- s->auth_debug = 0;
-
- s->auth_require = array_init();
-@@ -376,7 +382,8 @@
- cv[11].destination = &(s->auth_ldap_allow_empty_pw);
- cv[12].destination = s->auth_htdigest_userfile;
- cv[13].destination = s->auth_htpasswd_userfile;
-- cv[14].destination = &(s->auth_debug);
-+ cv[14].destination = s->auth_program_exec;
-+ cv[15].destination = &(s->auth_debug);
-
- p->config_storage[i] = s;
- ca = ((data_config *)srv->config_context->data[i])->value;
-@@ -394,6 +401,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,
"program")) {
-+ s->auth_backend = AUTH_BACKEND_PROGRAM;
- } else {
- log_error_write(srv, __FILE__, __LINE__,
"sb", "auth.backend not supported:", s->auth_backend_conf);
-
-@@ -534,6 +543,28 @@
- return (ret);
- break;
- }
-+ case AUTH_BACKEND_PROGRAM: {
-+ const char *prog;
-+ /*
-+ * Let's make some sanity checks so we detect
them during
-+ * startup and not only when trying to
authenticate.
-+ */
-+ if(!(s->auth_program_exec) ||
s->auth_program_exec->used == 0) {
-+ log_error_write(srv, __FILE__, __LINE__, "s",
-+ "Missing or empty
auth.backend.program.exec");
-+ return HANDLER_ERROR;
-+ }
-+ prog = s->auth_program_exec->ptr;
-+ if(access(prog, F_OK | X_OK) < 0) {
-+ log_error_write(srv, __FILE__, __LINE__,
"ssss",
-+ "auth.backend.program:
Failed access(",
-+ prog,
-+ "): ",
-+ strerror(errno));
-+ return HANDLER_ERROR;
-+ }
-+ break;
-+ }
- default:
- break;
- }
diff --git a/http/lighttpd/external_auth_program-1.4.41.patch
b/http/lighttpd/external_auth_program-1.4.41.patch
new file mode 100644
index 0000000..020e045
--- /dev/null
+++ b/http/lighttpd/external_auth_program-1.4.41.patch
@@ -0,0 +1,184 @@
+--- src/http_auth.h.orig 2010-01-02 17:58:11.000000000 +0100
++++ src/http_auth.h 2010-01-02 17:59:17.000000000 +0100
+@@ -14,7 +14,8 @@
+ AUTH_BACKEND_PLAIN,
+ AUTH_BACKEND_LDAP,
+ AUTH_BACKEND_HTPASSWD,
+- AUTH_BACKEND_HTDIGEST
++ AUTH_BACKEND_HTDIGEST,
++ AUTH_BACKEND_PROGRAM
+ } auth_backend_t;
+
+ typedef struct {
+@@ -38,6 +39,8 @@
+ unsigned short auth_ldap_starttls;
+ unsigned short auth_ldap_allow_empty_pw;
+
++ buffer *auth_program_exec;
++
+ unsigned short auth_debug;
+
+ /* generated */
+--- src/http_auth.c.orig 2016-07-31 08:42:39.000000000 -0400
++++ src/http_auth.c 2016-07-31 16:24:22.144575820 -0400
+@@ -192,7 +192,8 @@
+ }
+
+ fclose(fp);
+- } else if (p->conf.auth_backend == AUTH_BACKEND_LDAP) {
++ } else if (p->conf.auth_backend == AUTH_BACKEND_LDAP ||
++ p->conf.auth_backend == AUTH_BACKEND_PROGRAM) {
+ return 0;
+ }
+
+@@ -711,6 +712,57 @@
+
+ return 0;
+ #endif
++ } else if (p->conf.auth_backend == AUTH_BACKEND_PROGRAM) {
++ buffer *progbuf = p->conf.auth_program_exec;
++ const char *prog;
++ FILE *pipe;
++ int ret;
++
++ /*
++ * This is tested when loading configuration,
++ * but better be paranoid.
++ */
++ if(!progbuf || progbuf->used == 0) {
++ log_error_write(srv, __FILE__, __LINE__, "s",
++ "Missing 'auth.backend.program.exec'
directive");
++ return -1;
++ }
++ prog = progbuf->ptr;
++ /*
++ * Preliminary check, so we can have better error reporting.
++ * It was tested during configuration reading, but maybe
++ * something happened to the program since that time.
++ *
++ * If someone mess with the program after this test, it
++ * would simply fail in the popen()/pclose() which we check
anyway.
++ */
++ if(access(prog, F_OK | X_OK) < 0) {
++ log_error_write(srv, __FILE__, __LINE__, "ssss",
++ "auth.backend.program: Failed
access(",
++ prog,
++ "): ",
++ strerror(errno));
++ return -1;
++ }
++ if((pipe = popen(prog, "w")) == NULL) {
++ log_error_write(srv, __FILE__, __LINE__, "ssss",
++ "Failed popen(",
++ prog,
++ "): ",
++ strerror(errno));
++ return -1;
++ }
++ fprintf(pipe, "%s:%s\n", username->ptr, pw);
++ if((ret = pclose(pipe)) != 0) {
++ log_error_write(srv, __FILE__, __LINE__, "sssds",
++ "Failed pclose(", prog, "):", ret,
strerror(errno));
++ return -1;
++ }
++ if (p->conf.auth_debug) {
++ log_error_write(srv, __FILE__, __LINE__, "ss",
++ "auth.backend.program success for: ",
username->ptr);
++ }
++ return 0;
+ }
+ return -1;
+ }
+--- src/mod_auth.c.orig 2010-01-02 17:58:11.000000000 +0100
++++ src/mod_auth.c 2010-01-02 18:08:14.000000000 +0100
+@@ -82,6 +82,7 @@
+
+ if (s->ldap) ldap_unbind_s(s->ldap);
+ #endif
++ buffer_free(s->auth_program_exec);
+
+ free(s);
+ }
+@@ -119,6 +120,7 @@
+ PATCH(ldap_filter_pre);
+ PATCH(ldap_filter_post);
+ #endif
++ PATCH(auth_program_exec);
+
+ /* skip the first, the global context */
+ for (i = 1; i < srv->config_context->used; i++) {
+@@ -169,6 +171,8 @@
+ 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.program.exec"))) {
++ PATCH(auth_program_exec);
+ }
+ }
+ }
+@@ -326,7 +330,8 @@
+ { "auth.backend.ldap.allow-empty-pw", NULL,
T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 11 */
+ { "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.program.exec", NULL, T_CONFIG_STRING,
T_CONFIG_SCOPE_CONNECTION }, /* 14 */
++ { "auth.debug", NULL, T_CONFIG_SHORT,
T_CONFIG_SCOPE_CONNECTION }, /* 15 */
+ { NULL, NULL, T_CONFIG_UNSET,
T_CONFIG_SCOPE_UNSET }
+ };
+
+@@ -352,6 +357,7 @@
+ s->auth_ldap_filter = buffer_init();
+ s->auth_ldap_cafile = buffer_init();
+ s->auth_ldap_starttls = 0;
++ s->auth_program_exec = buffer_init();
+ s->auth_debug = 0;
+
+ s->auth_require = array_init();
+@@ -376,7 +382,8 @@
+ cv[11].destination = &(s->auth_ldap_allow_empty_pw);
+ cv[12].destination = s->auth_htdigest_userfile;
+ cv[13].destination = s->auth_htpasswd_userfile;
+- cv[14].destination = &(s->auth_debug);
++ cv[14].destination = s->auth_program_exec;
++ cv[15].destination = &(s->auth_debug);
+
+ p->config_storage[i] = s;
+ ca = ((data_config *)srv->config_context->data[i])->value;
+@@ -394,6 +401,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,
"program")) {
++ s->auth_backend = AUTH_BACKEND_PROGRAM;
+ } else {
+ log_error_write(srv, __FILE__, __LINE__,
"sb", "auth.backend not supported:", s->auth_backend_conf);
+
+@@ -534,6 +543,28 @@
+ return (ret);
+ break;
+ }
++ case AUTH_BACKEND_PROGRAM: {
++ const char *prog;
++ /*
++ * Let's make some sanity checks so we detect
them during
++ * startup and not only when trying to
authenticate.
++ */
++ if(!(s->auth_program_exec) ||
s->auth_program_exec->used == 0) {
++ log_error_write(srv, __FILE__, __LINE__, "s",
++ "Missing or empty
auth.backend.program.exec");
++ return HANDLER_ERROR;
++ }
++ prog = s->auth_program_exec->ptr;
++ if(access(prog, F_OK | X_OK) < 0) {
++ log_error_write(srv, __FILE__, __LINE__,
"ssss",
++ "auth.backend.program:
Failed access(",
++ prog,
++ "): ",
++ strerror(errno));
++ return HANDLER_ERROR;
++ }
++ break;
++ }
+ default:
+ break;
+ }
diff --git a/http/lighttpd/lighttpd.gpg b/http/lighttpd/lighttpd.gpg
new file mode 100644
index 0000000..ac5a7b7
Binary files /dev/null and b/http/lighttpd/lighttpd.gpg differ
diff --git a/http/lighttpd/lua52.patch b/http/lighttpd/lua52.patch
deleted file mode 100644
index 7d4913e..0000000
--- a/http/lighttpd/lua52.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- src/mod_cml_lua.c.orig 2012-10-22 06:17:17.418886286 -0700
-+++ src/mod_cml_lua.c 2012-10-22 06:25:50.289753316 -0700
-@@ -28,6 +28,10 @@
- #include <lualib.h>
- #include <lauxlib.h>
-
-+#if LUA_VERSION_NUM >= 502
-+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
-+#endif
-+
- typedef struct {
- stream st;
- int done;
-@@ -285,7 +285,11 @@
- lua_settable(L, LUA_GLOBALSINDEX);
-
- /* load lua program */
-+#if LUA_VERSION_NUM >= 502
-+ if (lua_load(L, load_file, &rm, fn->ptr, NULL) || lua_pcall(L,0,1,0))
{
-+#else
- if (lua_load(L, load_file, &rm, fn->ptr) || lua_pcall(L,0,1,0)) {
-+#endif
- log_error_write(srv, __FILE__, __LINE__, "s",
- lua_tostring(L,-1));
-
---- src/mod_magnet.c.orig 2014-03-06 18:08:00.000000000 +0400
-+++ src/mod_magnet.c 2014-08-04 00:28:43.515720829 +0400
-@@ -24,6 +24,10 @@
- #define MAGNET_CONFIG_PHYSICAL_PATH "magnet.attract-physical-path-to"
- #define MAGNET_RESTART_REQUEST 99
-
-+#if LUA_VERSION_NUM >= 502
-+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
-+#endif
-+
- /* plugin config for all request/connections */
-
- static jmp_buf exceptionjmp;
-@@ -691,7 +695,11 @@
- * get the environment of the function
- */
-
-+#if LUA_VERSION_NUM >= 502
-+ lua_getupvalue(L, -1, 1); /* -1 is the function, _ENV is the first
upvalue of a chunk */
-+#else
- lua_getfenv(L, -1); /* -1 is the function */
-+#endif
-
- /* lighty.header */
-
-@@ -741,7 +749,11 @@
- */
-
- force_assert(lua_isfunction(L, -1));
-+#if LUA_VERSION_NUM >= 502
-+ lua_getupvalue(L, -1, 1); /* -1 is the function, _ENV is the first
upvalue of a chunk */
-+#else
- lua_getfenv(L, -1); /* -1 is the function */
-+#endif
-
- lua_getfield(L, -1, "lighty"); /* lighty.* from the env */
- force_assert(lua_istable(L, -1));
-@@ -990,8 +1002,11 @@
- lua_setfield(L, -2, "__index"); /* { __index = _G } (sp -=
1) */
- lua_setmetatable(L, -2); /* setmetatable({}, {__index = _G}) (sp -=
1) */
-
--
-+#if LUA_VERSION_NUM >= 502
-+ lua_setupvalue(L, -2, 1); /* on the stack should be a modified env
(sp -= 1), _ENV is the first upvalue of a chunk */
-+#else
- lua_setfenv(L, -2); /* on the stack should be a modified env (sp -=
1) */
-+#endif
-
- errfunc = push_traceback(L, 0);
- if (lua_pcall(L, 0, 1, errfunc)) {



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (cb826bfe15e2992345bce80c9db90c812799d7ce), Vlad Glagolev, 07/31/2016

Archive powered by MHonArc 2.6.24.

Top of Page