Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (680d8b24f865be4efea84f39eb87c48d05f5fb01)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (680d8b24f865be4efea84f39eb87c48d05f5fb01)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (680d8b24f865be4efea84f39eb87c48d05f5fb01)
  • Date: Fri, 20 Dec 2013 07:09:29 -0600
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/lighttpd/CONFIGURE | 1
http/lighttpd/DETAILS | 2
http/lighttpd/HISTORY | 8 ++
http/lighttpd/PRE_BUILD | 8 ++
http/lighttpd/auth_ldap_port-option+ext.patch | 93
+++++++++++++++++++++++++
http/lighttpd/auth_ldap_port-option.patch | 94
++++++++++++++++++++++++++
libs/geoip/DETAILS | 11 +--
libs/geoip/HISTORY | 3
php-pear/xcache/DETAILS | 11 +--
php-pear/xcache/HISTORY | 3
10 files changed, 223 insertions(+), 11 deletions(-)

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

lighttpd: added patches to use custom ldap port in authentication module

commit a804af74650e937084976b5f585c8391543f73a9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xcache: => 3.1.0

commit f2339a1d2941ec7e07a0129ceeafe03c27cc4fc2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

geoip: => 1.6.0

diff --git a/http/lighttpd/CONFIGURE b/http/lighttpd/CONFIGURE
index 841f7f0..906e478 100755
--- a/http/lighttpd/CONFIGURE
+++ b/http/lighttpd/CONFIGURE
@@ -1,4 +1,5 @@
config_query LIGHTTPD_EXTAUTH "Do you want to patch in external
authentication program support?" n &&
+config_query LIGHTTPD_LDAP_PORT "Do you want to patch in LDAP port
configuration support?" n &&

config_query_option LIGHTTPD_OPTS "Do you want WebDAV support?" n \
"--with-webdav-props" "--without-webdav-props" &&
diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index b51cbb6..4ce87a0 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -3,7 +3,7 @@
BRANCH=`echo -n $VERSION | cut -d . -f 1,2`

SOURCE_HASH=sha512:f380adb20944846340b409290c43d54188f94e7992fe1e90121ab866f75048dfb7c2c1592b07b1df0af3b6d12b60d1d7e5d41de75c8684b8939b3df736f00762
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=http://download.lighttpd.net/lighttpd/releases-$BRANCH.x/$SOURCE
+
SOURCE_URL[0]=http://download.lighttpd.net/$SPELL/releases-$BRANCH.x/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.lighttpd.net/
LICENSE[0]=BSD
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index f6817ba..0075387 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,11 @@
+2013-12-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: use SPELL variable
+ * CONFIGURE: added option for ability specify a custom ldap port in
+ config file
+ * PRE_BUILD: apply patches
+ * auth_ldap_port-option{,+ext}.patch: added, to add custom ldap port
+ option
+
2013-09-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.33

diff --git a/http/lighttpd/PRE_BUILD b/http/lighttpd/PRE_BUILD
index 04e9032..264cfb4 100755
--- a/http/lighttpd/PRE_BUILD
+++ b/http/lighttpd/PRE_BUILD
@@ -3,4 +3,12 @@ cd "$SOURCE_DIRECTORY" &&

if [[ $LIGHTTPD_EXTAUTH == y ]]; then
patch -p0 < "$SPELL_DIRECTORY/external_auth_program-1.4.25.patch"
+fi &&
+
+if [[ $LIGHTTPD_LDAP_PORT == y ]]; then
+ if [[ $LIGHTTPD_EXTAUTH == y ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/auth_ldap_port-option+ext.patch"
+ else
+ patch -p1 < "$SPELL_DIRECTORY/auth_ldap_port-option.patch"
+ fi
fi
diff --git a/http/lighttpd/auth_ldap_port-option+ext.patch
b/http/lighttpd/auth_ldap_port-option+ext.patch
new file mode 100644
index 0000000..7f1d4ce
--- /dev/null
+++ b/http/lighttpd/auth_ldap_port-option+ext.patch
@@ -0,0 +1,93 @@
+From 03f69f8fff3711c925b98f6e17aec4c8321f02b7 Mon Sep 17 00:00:00 2001
+From: Jay Soffian <jaysoffian AT gmail.com>
+Date: Fri, 13 Mar 2009 02:12:43 -0400
+Subject: [PATCH] Add auth.backend.ldap.port option
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/http_auth.c | 2 +-
+ src/http_auth.h | 1 +
+ src/mod_auth.c | 8 +++++++-
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/http_auth.c b/src/http_auth.c
+index ccd087e..ae1a8da 100644
+--- a/src/http_auth.c
++++ b/src/http_auth.c
+@@ -786,7 +786,7 @@ static int http_auth_basic_password_compare(server *srv,
mod_auth_plugin_data *p
+
+
+ /* 3. */
+- if (NULL == (ldap =
ldap_init(p->conf.auth_ldap_hostname->ptr, LDAP_PORT))) {
++ if (NULL == (ldap =
ldap_init(p->conf.auth_ldap_hostname->ptr, p->conf.auth_ldap_port))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "ldap
...", strerror(errno));
+ return -1;
+ }
+diff --git a/src/http_auth.h b/src/http_auth.h
+index 5828a7e..16719fc 100644
+--- a/src/http_auth.h
++++ b/src/http_auth.h
+@@ -35,6 +35,7 @@ typedef struct {
+ buffer *auth_ldap_bindpw;
+ buffer *auth_ldap_filter;
+ buffer *auth_ldap_cafile;
++ unsigned short auth_ldap_port;
+ unsigned short auth_ldap_starttls;
+ unsigned short auth_ldap_allow_empty_pw;
+
+diff --git a/src/mod_auth.c b/src/mod_auth.c
+index 77d30f2..6886779 100644
+--- a/src/mod_auth.c
++++ b/src/mod_auth.c
+@@ -107,6 +107,7 @@ static int mod_auth_patch_connection(server *srv,
connection *con, mod_auth_plug
+ PATCH(auth_require);
+ PATCH(auth_debug);
+ PATCH(auth_ldap_hostname);
++ PATCH(auth_ldap_port);
+ PATCH(auth_ldap_basedn);
+ PATCH(auth_ldap_binddn);
+ PATCH(auth_ldap_bindpw);
+@@ -151,6 +152,8 @@ static int mod_auth_patch_connection(server *srv,
connection *con, mod_auth_plug
+ #ifdef USE_LDAP
+ p->anon_conf = s;
+ #endif
++ } else if (buffer_is_equal_string(du->key,
CONST_STR_LEN("auth.backend.ldap.port"))) {
++ PATCH(auth_ldap_port);
+ } else if (buffer_is_equal_string(du->key,
CONST_STR_LEN("auth.backend.ldap.base-dn"))) {
+ PATCH(auth_ldap_basedn);
+ } else if (buffer_is_equal_string(du->key,
CONST_STR_LEN("auth.backend.ldap.filter"))) {
+@@ -346,6 +346,7 @@
+ { "auth.backend.htpasswd.userfile", NULL, T_CONFIG_STRING,
T_CONFIG_SCOPE_CONNECTION }, /* 13 */
+ { "auth.backend.program.exec", NULL, T_CONFIG_STRING,
T_CONFIG_SCOPE_CONNECTION }, /* 14 */
+ { "auth.debug", NULL, T_CONFIG_SHORT,
T_CONFIG_SCOPE_CONNECTION }, /* 15 */
++ { "auth.backend.ldap.port", NULL, T_CONFIG_SHORT,
T_CONFIG_SCOPE_CONNECTION },
+ { NULL, NULL, T_CONFIG_UNSET,
T_CONFIG_SCOPE_UNSET }
+ };
+
+@@ -346,6 +350,7 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) {
+ s->auth_backend_conf = buffer_init();
+
+ s->auth_ldap_hostname = buffer_init();
++ s->auth_ldap_port = LDAP_PORT;
+ s->auth_ldap_basedn = buffer_init();
+ s->auth_ldap_binddn = buffer_init();
+ s->auth_ldap_bindpw = buffer_init();
+@@ -398,6 +399,7 @@
+ cv[13].destination = s->auth_htpasswd_userfile;
+ cv[14].destination = s->auth_program_exec;
+ cv[15].destination = &(s->auth_debug);
++ cv[16].destination = &(s->auth_ldap_port);
+
+ p->config_storage[i] = s;
+ ca = ((data_config *)srv->config_context->data[i])->value;
+@@ -557,7 +563,7 @@ handler_t auth_ldap_init(server *srv,
mod_auth_plugin_config *s) {
+ /* free old context */
+ if (NULL != s->ldap) ldap_unbind_s(s->ldap);
+
+- if (NULL == (s->ldap = ldap_init(s->auth_ldap_hostname->ptr,
LDAP_PORT))) {
++ if (NULL == (s->ldap = ldap_init(s->auth_ldap_hostname->ptr,
s->auth_ldap_port))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "ldap
...", strerror(errno));
+
+ return HANDLER_ERROR;
diff --git a/http/lighttpd/auth_ldap_port-option.patch
b/http/lighttpd/auth_ldap_port-option.patch
new file mode 100644
index 0000000..2987882
--- /dev/null
+++ b/http/lighttpd/auth_ldap_port-option.patch
@@ -0,0 +1,94 @@
+From 03f69f8fff3711c925b98f6e17aec4c8321f02b7 Mon Sep 17 00:00:00 2001
+From: Jay Soffian <jaysoffian AT gmail.com>
+Date: Fri, 13 Mar 2009 02:12:43 -0400
+Subject: [PATCH] Add auth.backend.ldap.port option
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/http_auth.c | 2 +-
+ src/http_auth.h | 1 +
+ src/mod_auth.c | 8 +++++++-
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/http_auth.c b/src/http_auth.c
+index ccd087e..ae1a8da 100644
+--- a/src/http_auth.c
++++ b/src/http_auth.c
+@@ -786,7 +786,7 @@ static int http_auth_basic_password_compare(server *srv,
mod_auth_plugin_data *p
+
+
+ /* 3. */
+- if (NULL == (ldap =
ldap_init(p->conf.auth_ldap_hostname->ptr, LDAP_PORT))) {
++ if (NULL == (ldap =
ldap_init(p->conf.auth_ldap_hostname->ptr, p->conf.auth_ldap_port))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "ldap
...", strerror(errno));
+ return -1;
+ }
+diff --git a/src/http_auth.h b/src/http_auth.h
+index 5828a7e..16719fc 100644
+--- a/src/http_auth.h
++++ b/src/http_auth.h
+@@ -35,6 +35,7 @@ typedef struct {
+ buffer *auth_ldap_bindpw;
+ buffer *auth_ldap_filter;
+ buffer *auth_ldap_cafile;
++ unsigned short auth_ldap_port;
+ unsigned short auth_ldap_starttls;
+ unsigned short auth_ldap_allow_empty_pw;
+
+diff --git a/src/mod_auth.c b/src/mod_auth.c
+index 77d30f2..6886779 100644
+--- a/src/mod_auth.c
++++ b/src/mod_auth.c
+@@ -107,6 +107,7 @@ static int mod_auth_patch_connection(server *srv,
connection *con, mod_auth_plug
+ PATCH(auth_require);
+ PATCH(auth_debug);
+ PATCH(auth_ldap_hostname);
++ PATCH(auth_ldap_port);
+ PATCH(auth_ldap_basedn);
+ PATCH(auth_ldap_binddn);
+ PATCH(auth_ldap_bindpw);
+@@ -151,6 +152,8 @@ static int mod_auth_patch_connection(server *srv,
connection *con, mod_auth_plug
+ #ifdef USE_LDAP
+ p->anon_conf = s;
+ #endif
++ } else if (buffer_is_equal_string(du->key,
CONST_STR_LEN("auth.backend.ldap.port"))) {
++ PATCH(auth_ldap_port);
+ } else if (buffer_is_equal_string(du->key,
CONST_STR_LEN("auth.backend.ldap.base-dn"))) {
+ PATCH(auth_ldap_basedn);
+ } else if (buffer_is_equal_string(du->key,
CONST_STR_LEN("auth.backend.ldap.filter"))) {
+@@ -341,6 +341,7 @@
+ { "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.ldap.port", NULL, T_CONFIG_SHORT,
T_CONFIG_SCOPE_CONNECTION },
+ { NULL, NULL, T_CONFIG_UNSET,
T_CONFIG_SCOPE_UNSET }
+ };
+
+@@ -346,6 +350,7 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) {
+ s->auth_backend_conf = buffer_init();
+
+ s->auth_ldap_hostname = buffer_init();
++ s->auth_ldap_port = LDAP_PORT;
+ s->auth_ldap_basedn = buffer_init();
+ s->auth_ldap_binddn = buffer_init();
+ s->auth_ldap_bindpw = buffer_init();
+@@ -377,6 +382,7 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) {
+ 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_ldap_port);
+
+ p->config_storage[i] = s;
+ ca = ((data_config *)srv->config_context->data[i])->value;
+@@ -557,7 +563,7 @@ handler_t auth_ldap_init(server *srv,
mod_auth_plugin_config *s) {
+ /* free old context */
+ if (NULL != s->ldap) ldap_unbind_s(s->ldap);
+
+- if (NULL == (s->ldap = ldap_init(s->auth_ldap_hostname->ptr,
LDAP_PORT))) {
++ if (NULL == (s->ldap = ldap_init(s->auth_ldap_hostname->ptr,
s->auth_ldap_port))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "ldap
...", strerror(errno));
+
+ return HANDLER_ERROR;
+--
diff --git a/libs/geoip/DETAILS b/libs/geoip/DETAILS
index 8e70de6..1e39a6d 100755
--- a/libs/geoip/DETAILS
+++ b/libs/geoip/DETAILS
@@ -1,9 +1,10 @@
SPELL=geoip
- VERSION=1.5.1
- SOURCE=GeoIP-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/GeoIP-$VERSION"
- SOURCE_URL[0]=http://www.maxmind.com/download/geoip/api/c/$SOURCE
-
SOURCE_HASH=sha512:aacb59ac7ced106ed420d320ffe6ffbec0d0e49ef3af8c2380c731824413386b6979e13f7a4ba81ba5b8d5ab4792830da232a02caa263752302acf55ac9bcae5
+ SPELLX=GeoIP
+ VERSION=1.6.0
+ SOURCE=$SPELLX-$VERSION.tar.gz
+ SOURCE_URL[0]=http://www.maxmind.com/download/$SPELL/api/c/$SOURCE
+
SOURCE_HASH=sha512:2d43f8b2aca4b4c30f674d5765bc67d9a6da79688fb8559d34e5981016b2553b568ecff554d1efc8ddee937b45eb864def7480f0e13279883082b9c067c88e91
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.maxmind.com/app/c
ENTERED=20050108
LICENSE[0]=GPL
diff --git a/libs/geoip/HISTORY b/libs/geoip/HISTORY
index b7e8fb9..4bb8a3c 100644
--- a/libs/geoip/HISTORY
+++ b/libs/geoip/HISTORY
@@ -1,3 +1,6 @@
+2013-12-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.0
+
2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.5.1
* PRE_BUILD: dropped
diff --git a/php-pear/xcache/DETAILS b/php-pear/xcache/DETAILS
index 234f26b..6d57da6 100755
--- a/php-pear/xcache/DETAILS
+++ b/php-pear/xcache/DETAILS
@@ -1,9 +1,9 @@
SPELL=xcache
- VERSION=3.0.3
+ VERSION=3.1.0
SECURITY_PATCH=1
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://xcache.lighttpd.net/pub/Releases/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:60e48eb6c9c729cec90ae7fc31459c725a5f7c75720015e5659f53e592fa9a67d802bce4c52477f6798ed6cb27c4fde34b76569ec17893b2962b8e3d2aa0e33d
+
SOURCE_HASH=sha512:9f003a7694772ce7e72b2e23ce83d52b31520be1a9f6be2e5195de6dec2bd4e2ec31c4359c7efb9f761e5c80fc5c78d679763ca9a21c74dbab960252c3df13cb
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
xcache.ini"
DOC_DIRS="admin"
@@ -12,7 +12,8 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
ENTERED=20071215
SHORT="fast, stable opcode cacher for PHP"
cat << EOF
-XCache is a fast, stable PHP opcode cacher that has been tested and run on
-production servers under high load. It supports and is tested on all lastest
-PHP CVS branches, such as PHP_4_3, PHP_4_4, PHP_5_1, PHP_5_2, and HEAD (6.x).
+XCache is a fast, stable PHP opcode cacher that has been proven and is now
+running on production servers under high load. It is tested (on linux) and
+supported on all of the latest PHP release branches such as PHP_5_1, PHP_5_2,
+PHP_5_3, PHP_5_4, PHP_5_5.
EOF
diff --git a/php-pear/xcache/HISTORY b/php-pear/xcache/HISTORY
index a39a506..d72bfa7 100644
--- a/php-pear/xcache/HISTORY
+++ b/php-pear/xcache/HISTORY
@@ -1,3 +1,6 @@
+2013-12-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.1.0; updated description
+
2013-06-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.3



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (680d8b24f865be4efea84f39eb87c48d05f5fb01), Vlad Glagolev, 12/20/2013

Archive powered by MHonArc 2.6.24.

Top of Page