X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fopenldap;h=a18d7e16200c48f22b9c6ea48f54e18216ec4cb2;hp=34f77058332f34288d371393bba98d6f0ee960f0;hb=5fe5aedd2a809f1eac79eacd7b138e487a53b60c;hpb=c8ead4a543859582497e107173c650cec4203d4f

diff --git a/lfs/openldap b/lfs/openldap
index 34f770583..a18d7e162 100644
--- a/lfs/openldap
+++ b/lfs/openldap
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -30,9 +28,15 @@ VER        = 2.3.20
 
 THISAPP    = openldap-$(VER)
 DL_FILE    = $(THISAPP).tgz
-DL_FROM    = $(UTL_IPFIRE)
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = openldap
+PAK_VER    = 3
+
+DEPS       = ""
+
+export CPPFLAGS = -D_GNU_SOURCE
 
 ###############################################################################
 # Top-level Rules
@@ -52,6 +56,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist :
+	$(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -72,23 +79,24 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr \
-		            --libexecdir=/usr/sbin \
-		            --sysconfdir=/etc \
-		            --localstatedir=/srv/ldap \
-		            --disable-debug \
-		            --enable-dynamic \
-		            --enable-crypt \
-		            --enable-modules \
-		            --enable-ldap \
-		            --enable-ldbm \
-		            --enable-dyngroup \
-		            --enable-dynlist \
-		            --enable-ppolicy \
-		            --enable-valsort
-	cd $(DIR_APP) && make depend
-	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/openldap-gcc44-fixes.patch
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--localstatedir=/srv/ldap \
+		--with-threads=posix \
+		--disable-perl \
+		--enable-dynamic \
+		--enable-crypt \
+		--enable-modules \
+		--enable-rlookups \
+		--enable-backends=mod \
+		--enable-overlays=mod \
+		--enable-sql=no \
+		--enable-ndb=no \
+		--disable-static
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
-	chmod -v 755 /usr/lib/libl*-2.3.so.0.2.8
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)