Skip to Content.
Sympa Menu

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

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 master grimoire by Vlad Glagolev (e2549218e0d01f72db107f78c67b096c68b436d7)
  • Date: Fri, 13 Aug 2010 12:02:08 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/lighttpd/BUILD | 2 +-
http/lighttpd/CONFIGURE | 2 ++
http/lighttpd/DETAILS | 5 ++---
http/lighttpd/HISTORY | 7 +++++++
http/lighttpd/PRE_BUILD | 4 +---
http/lighttpd/network-ssl.patch | 11 -----------
6 files changed, 13 insertions(+), 18 deletions(-)

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

lighttpd: => 1.4.27

diff --git a/http/lighttpd/BUILD b/http/lighttpd/BUILD
index 44e4f99..1aeaf65 100755
--- a/http/lighttpd/BUILD
+++ b/http/lighttpd/BUILD
@@ -1,2 +1,2 @@
-OPTS="$OPTS --libdir=$INSTALL_ROOT/usr/lib/lighttpd $LIGHTTPD_OPTS" &&
+OPTS="--libdir=$INSTALL_ROOT/usr/lib/lighttpd $LIGHTTPD_OPTS $OPTS" &&
default_build
diff --git a/http/lighttpd/CONFIGURE b/http/lighttpd/CONFIGURE
index 7eb5cbd..841f7f0 100755
--- a/http/lighttpd/CONFIGURE
+++ b/http/lighttpd/CONFIGURE
@@ -1,6 +1,8 @@
config_query LIGHTTPD_EXTAUTH "Do you want to patch in external
authentication program support?" n &&
+
config_query_option LIGHTTPD_OPTS "Do you want WebDAV support?" n \
"--with-webdav-props" "--without-webdav-props" &&
+
if list_find "$LIGHTTPD_OPTS" "--with-webdav-props"; then
config_query_option LIGHTTPD_OPTS "Do you want to enable WebDAV locking
support?" y \
"--with-webdav-locks" "--without-webdav-locks"
diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index 6fd7f4f..374603d 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -1,8 +1,7 @@
SPELL=lighttpd
- VERSION=1.4.26
- PATCHLEVEL=1
+ VERSION=1.4.27
BRANCH=`echo -n $VERSION | cut -d . -f 1,2`
-
SOURCE_HASH=sha512:30e0e48626d6b29406d1efb5ec0efcb7c9a2f803f119c6d2390092e9a8c536c7347c0511db9189cd1149e651ce674a7a72642d1c4d6344450dc1029853ce63bd
+
SOURCE_HASH=sha512:3164eb38c7be7f949e0043e849fb7b3bda6168754d1102c4f6dc93239d57491b30cba56cfcff60e065d9ea47cec45dc640aa1e021e373a23f3e08c5341a71fa0
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://download.lighttpd.net/lighttpd/releases-$BRANCH.x/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index af3a183..b237ec8 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,10 @@
+2010-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.27
+ * CONFIGURE: readability++
+ * BUILD: moved OPTS to the end
+ * PRE_BUILD: removed unneeded patch, quoting paths
+ * network-ssl.patch: removed
+
2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD: OPTS was not being populated correctly (webdav support never
compiled)
* CONFIGURE, DEPENDS: WebDAV locks option added, and sqlite dep made
to pull if its enabled (default)
diff --git a/http/lighttpd/PRE_BUILD b/http/lighttpd/PRE_BUILD
index 6aa59ba..04e9032 100755
--- a/http/lighttpd/PRE_BUILD
+++ b/http/lighttpd/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/network-ssl.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.25.patch"
fi
-
diff --git a/http/lighttpd/network-ssl.patch b/http/lighttpd/network-ssl.patch
deleted file mode 100644
index 0325c5d..0000000
--- a/http/lighttpd/network-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/network.c.orig 2010-02-02 02:28:20.000000000 +0300
-+++ src/network.c 2010-03-27 01:04:58.457237647 +0300
-@@ -525,7 +525,7 @@
-
- if (!s->ssl_use_sslv2) {
- /* disable SSLv2 */
-- if (SSL_OP_NO_SSLv2 !=
SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
-+ if (!(SSL_OP_NO_SSLv2 &
SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) {
- log_error_write(srv, __FILE__, __LINE__,
"ss", "SSL:",
-
ERR_error_string(ERR_get_error(), NULL));
- return -1;



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e2549218e0d01f72db107f78c67b096c68b436d7), Vlad Glagolev, 08/13/2010

Archive powered by MHonArc 2.6.24.

Top of Page