Bug 78680 - upgrade www/lighttpd to 1.3.13 and add LDAP support knob
Summary: upgrade www/lighttpd to 1.3.13 and add LDAP support knob
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Sergey Matveychuk
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-03-10 20:50 UTC by Rasputin
Modified: 2005-04-05 09:15 UTC (History)
0 users

See Also:


Attachments
lighttpd.patch (2.17 KB, patch)
2005-03-12 16:05 UTC, Marcus Grando
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Rasputin 2005-03-10 20:50:01 UTC
	The attached patch 

  * upgrades to the latest lighttpd
  * adds a build option to use ldap authentication
  * removes an obsolete patch

Fix: 

See patch
How-To-Repeat: 	
diff -Naur www/lighttpd.1.3.12/Makefile www/lighttpd/Makefile
--- www/lighttpd.1.3.12/Makefile	Thu Mar  3 12:14:54 2005
+++ www/lighttpd/Makefile	Thu Mar 10 15:10:42 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lighttpd
-PORTVERSION=	1.3.12
+PORTVERSION=	1.3.13
 CATEGORIES=	www
 MASTER_SITES=	http://www.lighttpd.net/download/ \
 				http://dl.fkb.wormulon.net/lighttpd/ \
@@ -33,12 +33,21 @@
 CONFIGURE_ARGS+=	--with-openssl
 .endif
 
+.if defined(WITH_OPENLDAP)
+USE_OPENLDAP=	yes
+CONFIGURE_ARGS+=	--with-ldap
+.endif
+
 MAN1=		lighttpd.1 spawn-fcgi.1
 
 pre-everything::
 .if !defined(WITHOUT_OPENSSL)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can disable SSL support by defining WITHOUT_OPENSSL"
+.endif
+.if !defined(WITH_OPENLDAP)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable LDAP support by defining WITH_OPENLDAP"
 .endif
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If you want MySQL virtual host support install"
diff -Naur www/lighttpd.1.3.12/distinfo www/lighttpd/distinfo
--- www/lighttpd.1.3.12/distinfo	Thu Mar  3 12:14:54 2005
+++ www/lighttpd/distinfo	Thu Mar 10 14:59:25 2005
@@ -1,2 +1,2 @@
-MD5 (lighttpd-1.3.12.tar.gz) = ffd0bc5802646948e2724060031c05b5
-SIZE (lighttpd-1.3.12.tar.gz) = 677919
+MD5 (lighttpd-1.3.13.tar.gz) = 2f017b936be376ad6f6c2ee26db93467
+SIZE (lighttpd-1.3.13.tar.gz) = 680068
diff -Naur www/lighttpd.1.3.12/files/patch-src::server.c www/lighttpd/files/patch-src::server.c
--- www/lighttpd.1.3.12/files/patch-src::server.c	Thu Mar  3 13:30:48 2005
+++ www/lighttpd/files/patch-src::server.c	Thu Jan  1 01:00:00 1970
@@ -1,38 +0,0 @@
---- src/server.c.orig	Thu Mar  3 10:59:28 2005
-+++ src/server.c	Thu Mar  3 10:59:48 2005
-@@ -71,7 +71,7 @@
- 	case SIGTERM: srv_shutdown = 1; break;
- 	case SIGALRM: handle_sig_alarm = 1; break;
- 	case SIGHUP:  handle_sig_hup = 1; break;
--	case SIGCLD: break;
-+	case SIGCHLD: break;
- 	}
- }
- #elif defined(HAVE_SIGNAL) || defined(HAVE_SIGACTION)
-@@ -80,7 +80,7 @@
- 	case SIGTERM: srv_shutdown = 1; break;
- 	case SIGALRM: handle_sig_alarm = 1; break;
- 	case SIGHUP:  handle_sig_hup = 1; break;
--	case SIGCLD:  break;
-+	case SIGCHLD:  break;
- 	}
- }
- #endif
-@@ -686,7 +686,7 @@
- 	sigaction(SIGTERM, &act, NULL);
- 	sigaction(SIGHUP,  &act, NULL);
- 	sigaction(SIGALRM, &act, NULL);
--	sigaction(SIGCLD, &act, NULL);
-+	sigaction(SIGCHLD, &act, NULL);
- 	
- #elif defined(HAVE_SIGNAL)
- 	/* ignore the SIGPIPE from sendfile() */
-@@ -695,7 +695,7 @@
- 	signal(SIGALRM, signal_handler);
- 	signal(SIGTERM, signal_handler);
- 	signal(SIGHUP,  signal_handler);
--	signal(SIGCLD,  signal_handler);
-+	signal(SIGCHLD,  signal_handler);
- #endif
- 	
- #ifdef USE_ALARM
Comment 1 Sergey Matveychuk freebsd_committer freebsd_triage 2005-03-12 10:53:40 UTC
Dear maintainer!

Please take the PR into account.
-- 
Sem.
Comment 2 Sergey Matveychuk freebsd_committer freebsd_triage 2005-03-12 10:55:04 UTC
State Changed
From-To: open->feedback

Wait for maintainer approval
Comment 3 Hendrik Scholz 2005-03-12 14:15:00 UTC
Hi!

Sergey Matveychuk wrote:
> Dear maintainer!
> 
> Please take the PR into account.

It's looking ok but as I'm on the road this weekend I cannot have a 
closer look ... it'll take until tuesday.

Hendrik
Comment 4 Marcus Grando 2005-03-12 16:05:08 UTC
Hi,

New patch attached.

- Change knobs to OPTIONS
- Add LDAP options from original post.
- Add MYSQL and IPV6 options

-- 
Marcus Grando
Grupos Internet S/A
marcus(at)corp.grupos.com.br
Comment 5 Rasputin 2005-03-12 22:01:53 UTC
Looks good to me...

* Marcus Grando <marcus@corp.grupos.com.br> [0305 16:05]:
> Hi,
> 
> New patch attached.
> 
> - Change knobs to OPTIONS
> - Add LDAP options from original post.
> - Add MYSQL and IPV6 options
> 
> -- 
> Marcus Grando
> Grupos Internet S/A
> marcus(at)corp.grupos.com.br


-- 
'When the door hits you in the ass on the way out, clean off the smudge
 your ass leaves, please'
		-- Alien loves Predator
Rasputin :: Jack of All Trades - Master of Nuns
Comment 6 Sergey Matveychuk freebsd_committer freebsd_triage 2005-03-20 18:09:38 UTC
Responsible Changed
From-To: freebsd-ports-bugs->sem

Take it
Comment 7 Sergey Matveychuk freebsd_committer freebsd_triage 2005-04-04 11:57:30 UTC
So what about the PR?

-- 
Sem.
Comment 8 Sergey Matveychuk freebsd_committer freebsd_triage 2005-04-05 09:15:03 UTC
State Changed
From-To: feedback->closed

Committed, thanks!