SF.net SVN: gar:[22912] csw/mgar/pkg/lighttpd/trunk

[janholzh at users.sourceforge.net]

Revision: 22912
          http://sourceforge.net/p/gar/code/22912
Author:   janholzh
Date:     2014-01-29 14:24:51 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
lighttpd/trunk: update to 1.4.34. Add solaris-userland patch. Needs some packingfixes to be released

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

Added Paths:
-----------
    csw/mgar/pkg/lighttpd/trunk/files/0002-fix_missing_tcp_nodelay.patch

Modified: csw/mgar/pkg/lighttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/Makefile	2014-01-29 11:00:34 UTC (rev 22911)
+++ csw/mgar/pkg/lighttpd/trunk/Makefile	2014-01-29 14:24:51 UTC (rev 22912)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = lighttpd
-VERSION = 1.4.31
+VERSION = 1.4.34
 GARTYPE = v2
 
 DESCRIPTION = HTTP server built for security, speed, compliance, and flexibility
@@ -19,7 +19,9 @@
 DISTFILES   += $(NAME)-$(VERSION).tar.gz
 DISTFILES   += cswlighttpd
 
-PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch
+#PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch
+#Patch from http://buildfarm.opencsw.org/source/xref/solaris-userland/components/lighttpd/patches/05-network-nodelay.patch
+PATCHFILES += 0002-fix_missing_tcp_nodelay.patch
 
 # When mkdir is issued on an automounted directory like /home/<someuser> errno is
 # set to ENOSYS halting recursive directory generation. This patches handles
@@ -152,6 +154,6 @@
 	ginstall -d -m 755 $(PKGROOT)$(sysconfdir)/pkg/$(NAME)
 	echo "lighttpd:lighttpd:lighttpd web server::::" \
 		> $(PKGROOT)$(sysconfdir)/pkg/$(NAME)/cswusergroup
-	(cd $(PKGROOT)$(libdir_install); ln -s . 32)
-	(cd $(PKGROOT)$(libdir_install); ln -s $(ISA_DEFAULT64) 64)
+	(cd $(PKGROOT)$(libdir_install); gln -s . 32)
+	(cd $(PKGROOT)$(libdir_install); gln -s $(ISA_DEFAULT64) 64)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/lighttpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/checksums	2014-01-29 11:00:34 UTC (rev 22911)
+++ csw/mgar/pkg/lighttpd/trunk/checksums	2014-01-29 14:24:51 UTC (rev 22912)
@@ -1 +1 @@
-7907b7167d639b8a8daab97e223249d5  lighttpd-1.4.31.tar.gz
+64ae57bd90c41bbf31bddb88ba6199fe  lighttpd-1.4.34.tar.gz

Added: csw/mgar/pkg/lighttpd/trunk/files/0002-fix_missing_tcp_nodelay.patch
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/files/0002-fix_missing_tcp_nodelay.patch	                        (rev 0)
+++ csw/mgar/pkg/lighttpd/trunk/files/0002-fix_missing_tcp_nodelay.patch	2014-01-29 14:24:51 UTC (rev 22912)
@@ -0,0 +1,27 @@
+From e908bdfe2c326786152a7cd62a6c4f6fd7d0fa55 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Wed, 29 Jan 2014 15:07:49 +0100
+Subject: [PATCH] fix_missing_tcp_nodelay
+
+---
+ src/network.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/network.c b/src/network.c
+index 14f2ebd..976f54d 100644
+--- a/src/network.c
++++ b/src/network.c
+@@ -274,6 +274,10 @@ static int network_server_init(server *srv, buffer *host_token, specific_config
+ 		log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt(SO_REUSEADDR) failed:", strerror(errno));
+ 		goto error_free_socket;
+ 	}
++        if (setsockopt(srv_socket->fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)) < 0) {
++                log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt(TCP_NODELAY) failed:", strerror(errno));
++                goto error_free_socket;
++        }
+ 
+ 	switch(srv_socket->addr.plain.sa_family) {
+ #ifdef HAVE_IPV6
+-- 
+1.8.4.1
+

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