X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenldap;h=320b1abd4055b112293977522ef2502a5c186f8e;hb=c09758302b419c13246f41b9b0be9dfe1e0b1d14;hp=f0989a2a1e33d115a9ac66425d57f038f9c6cefd;hpb=e713200c6908011dee322cd64dfb94f31f405495;p=ipfire-2.x.git

diff --git a/lfs/openldap b/lfs/openldap
index f0989a2a1e..320b1abd40 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-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# 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    = ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release
+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,8 +56,8 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-	make-packages.sh openldap $(THISAPP)
+dist :
+	$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -75,15 +79,25 @@ $(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 --disable-nls
-	cd $(DIR_APP) && make depend
-	cd $(DIR_APP) && make
-#	cd $(DIR_APP) && make test
+	$(UPDATE_AUTOMAKE)
+	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.*
-#	install -v -m755 -d /usr/share/doc/$(THISAPP)/{drafts,guide,rfc}
-#	install -v -m644 doc/drafts/* /usr/share/doc/$(THISAPP)/drafts
-#	install -v -m644 doc/rfc/*    /usr/share/doc/$(THISAPP)/rfc
-#	cp -v -R doc/guide/*          /usr/share/doc/$(THISAPP)/guide
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)