[csw-devel] SF.net SVN: gar:[13508] csw/mgar/pkg/lighttpd/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Mar 1 17:14:33 CET 2011


Revision: 13508
          http://gar.svn.sourceforge.net/gar/?rev=13508&view=rev
Author:   dmichelsen
Date:     2011-03-01 16:14:33 +0000 (Tue, 01 Mar 2011)

Log Message:
-----------
lighttpd: Fix mod-compress and add packaging things

Modified Paths:
--------------
    csw/mgar/pkg/lighttpd/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lighttpd/trunk/files/0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch

Removed Paths:
-------------
    csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch

Modified: csw/mgar/pkg/lighttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/Makefile	2011-03-01 10:36:18 UTC (rev 13507)
+++ csw/mgar/pkg/lighttpd/trunk/Makefile	2011-03-01 16:14:33 UTC (rev 13508)
@@ -3,7 +3,7 @@
 VERSION = 1.4.28
 CATEGORIES = devel
 
-DESCRIPTION = lighttpd - Security, speed, compliance, and flexibility http server
+DESCRIPTION = HTTP server built for security, speed, compliance, and flexibility
 define BLURB
   Security, speed, compliance, and flexibility -- all of these describe lighttpd
   (pron. lighty) which is rapidly redefining efficiency of a webserver; as it is
@@ -17,27 +17,37 @@
 
 MASTER_SITES = http://download.lighttpd.net/lighttpd/releases-1.4.x/
 DISTFILES    = $(NAME)-$(VERSION).tar.gz
-EXTRA_LIB = $(prefix)/lib
-EXTRA_LDFLAGS += -lsendfile
 
-# To fix undefined symbol 'dlopen' on Solaris 9
-EXTRA_LDFLAGS_5.9 += -ldl
-EXTRA_LDFLAGS += $(EXTRA_LDFLAGS_$(GAROSREL))
-
 PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch
 
-# The module compilation ignores LDFLAGS by default, let's force them to
-# inject the right -R flag.
-PATCHFILES += 0002-Force-LDFLAGS-on-mod_compress.patch
-
+# When mkdir is issued on an automounted directory like /home/<someuser> errno is
+# set to ENOSYS halting recursive directory generation. This patches handles
+# ENOSYS similar to EEXIST and just continues with the creation which then may
+# or may not work later on.
+#
 # There's a thread started on lighttpd forums about the issue:
-# http://redmine.lighttpd.net/boards/2/topics/4163
+#   http://redmine.lighttpd.net/boards/2/topics/4163
+PATCHFILES += 0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch
 
+PACKAGES += CSWlighttpd
+CATALOGNAME_CSWlighttpd = lighttpd
+SPKG_DESC_CSWlighttpd = HTTP server built for security, speed, compliance, and flexibility
+RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWlighttpd += CSWbzip2
+RUNTIME_DEP_PKGS_CSWlighttpd += CSWzlib
+
+EXTRA_LINKER_FLAGS += -lsendfile
+
+# To fix undefined symbol 'dlopen' on Solaris 9
+EXTRA_LINKER_FLAGS_5.9 += -ldl
+EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(GAROSREL))
+
 # lighttpd puts its modules under libdir, so we pass libdir as a subdirectory,
 # because modules are not supposed to be in /opt/csw/lib.
 libdir = $(prefix)/lib/lighttpd
 
 CONFIGURE_ARGS  = $(DIRPATHS)
+
 # Solaris 9 does not have IPV6_V6ONLY.
 # IPv6 support only works on Solaris 10.
 CONFIGURE_ARGS_5.9 = --disable-ipv6

Deleted: csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch	2011-03-01 10:36:18 UTC (rev 13507)
+++ csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch	2011-03-01 16:14:33 UTC (rev 13508)
@@ -1,24 +0,0 @@
-From fa3fa5796150b4c381a3b6c8b5a0dc20b26a82bd Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sun, 27 Feb 2011 19:10:12 +0100
-Subject: [PATCH] Force LDFLAGS on mod_compress
-
----
- src/Makefile.in          |    2 +-
- src/configparser.c       |  240 +++++++++++++++++++++++-----------------------
- src/mod_ssi_exprparser.c |   56 ++++++------
- 3 files changed, 148 insertions(+), 150 deletions(-)
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 5b7cb63..1362f2c 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -762,7 +762,7 @@ mod_access_la_SOURCES = mod_access.c
- mod_access_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_access_la_LIBADD = $(common_libadd)
- mod_compress_la_SOURCES = mod_compress.c
--mod_compress_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-+mod_compress_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined $(LDFLAGS)
- 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

Added: csw/mgar/pkg/lighttpd/trunk/files/0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/files/0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch	                        (rev 0)
+++ csw/mgar/pkg/lighttpd/trunk/files/0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch	2011-03-01 16:14:33 UTC (rev 13508)
@@ -0,0 +1,43 @@
+From f34169598371696ff983dcd7b1ae38a2ef8fafdc Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 1 Mar 2011 16:12:53 +0100
+Subject: [PATCH] Ignore ENOSYS on mkdir which happens on automounted dirs
+
+---
+ src/mod_compress.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/mod_compress.c b/src/mod_compress.c
+index 748fc65..7e80e26 100644
+--- a/src/mod_compress.c
++++ b/src/mod_compress.c
+@@ -113,7 +113,7 @@ static int mkdir_recursive(char *dir) {
+ 	while ((p = strchr(p + 1, '/')) != NULL) {
+ 
+ 		*p = '\0';
+-		if ((mkdir(dir, 0700) != 0) && (errno != EEXIST)) {
++		if ((mkdir(dir, 0700) != 0) && (errno != EEXIST) && (errno != ENOSYS)) {
+ 			*p = '/';
+ 			return -1;
+ 		}
+@@ -122,7 +122,7 @@ static int mkdir_recursive(char *dir) {
+ 		if (!*p) return 0; /* Ignore trailing slash */
+ 	}
+ 
+-	return (mkdir(dir, 0700) != 0) && (errno != EEXIST) ? -1 : 0;
++	return (mkdir(dir, 0700) != 0) && (errno != EEXIST) && (errno != ENOSYS) ? -1 : 0;
+ }
+ 
+ /* 0 on success, -1 for error */
+@@ -135,7 +135,7 @@ static int mkdir_for_file(char *filename) {
+ 	while ((p = strchr(p + 1, '/')) != NULL) {
+ 
+ 		*p = '\0';
+-		if ((mkdir(filename, 0700) != 0) && (errno != EEXIST)) {
++		if ((mkdir(filename, 0700) != 0) && (errno != EEXIST) && (errno != ENOSYS)) {
+ 			*p = '/';
+ 			return -1;
+ 		}
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list