Hinzugefügt:

    * OpenLDAP
Geändert:
    * SASLAUTHD kann jetzt OpenLDAP.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@93 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 73937afa8162f2abd2a43dc31c2a5006c6670eb1..64c7f91714426ca89788b1207089112cd99a507d 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -37,6 +37,7 @@
   * coreutils-5.93
   * cxacru-2003-10-05
   * cyrus-sasl-2.1.21
+  * cyrus-sasl-2.1.21-ldap
   * db-4.4.20
   * dhcp-3.0.2
   * dhcpcd-1.3.22-pl4
@@ -120,6 +121,7 @@
   * ntp-4.2.0
   * oinkmaster-1.2
   * openh323_1.12.2
+  * openldap-2.3.20
   * openssh-3.9p1
   * openssl-0.9.7i
   * openswan-1.0.10

diff --git a/lfs/openldap b/lfs/openldap
new file mode 100644 (file)
index 0000000..9e0a790
--- /dev/null
+++ b/lfs/openldap
@@ -0,0 +1,89 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop 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           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop 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>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.3.20
+
+THISAPP    = openldap-$(VER)
+DL_FILE    = $(THISAPP).tgz
+DL_FROM    = ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 49d2c5b9378a7b57e1fb03948acb8e32
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       make-packages.sh openldap $(THISAPP)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(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
+       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)

diff --git a/lfs/saslauthd b/lfs/saslauthd
index 238461d7a51bad14fe0f19221e781b0cb5e4dfe5..c34c1f244f924e7ff13d2b300aba6647ec52aad3 100644 (file)
--- a/lfs/saslauthd
+++ b/lfs/saslauthd
@@ -38,7 +38,11 @@ THISAPP    = cyrus-sasl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = http://ftp.andrew.cmu.edu/pub/cyrus-mail
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+ifeq "$(PASS)" "1"
+       TARGET     = $(DIR_INFO)/$(THISAPP)
+else
+       TARGET     = $(DIR_INFO)/$(THISAPP)-ldap
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -78,7 +82,12 @@ $(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 --enable-sql --with-pam=/usr --without-pgsql --with-mysql=/opt/lampp -sysconfdir=/etc --with-dbpath=/var/lib/sasl/sasldb2 --with-saslauthd=/var/run
+ifeq "$(PASS)" "1"
+       cd $(DIR_APP) && ./configure --prefix=/usr --enable-sql --with-pam=/usr --without-pgsql --with-mysql=/opt/lampp --sysconfdir=/etc --with-dbpath=/var/lib/sasl/sasldb2 --with-saslauthd=/var/run
+else
+       # WITH LDAP SUPPORT AT THIS TIME
+       cd $(DIR_APP) && ./configure --prefix=/usr --with-ldap=/usr --enable-sql --with-pam=/usr --without-pgsql --with-mysql=/opt/lampp --sysconfdir=/etc --with-dbpath=/var/lib/sasl/sasldb2 --with-saslauthd=/var/run
+endif
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
 #      install -v -m644 saslauthd/saslauthd.8 /usr/share/man/man8

diff --git a/make.sh b/make.sh
index a543f1ecdfdf32fc62f74a8135f8ba4a2ff02361..ef84f17fb5be2bd9e57ec65d645d0deadd0f5e85 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -658,13 +658,15 @@ buildipcop() {
   ipcopmake bridge-utils
   ipcopmake pam
   ipcopmake pammysql
-  ipcopmake saslauthd
+  ipcopmake saslauthd PASS=1
+  ipcopmake openldap
+  ipcopmake saslauthd PASS=2
   ipcopmake postfix
   ipcopmake stund
   ipcopmake lpd
   ipcopmake pwlib
   ipcopmake openh323
-  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
+#  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
   ipcopmake hddtemp
 
 }

diff --git a/src/paks/postfix/CONFFILES b/src/paks/postfix/CONFFILES
index 803253a3a8187261b12e7769532e7d2be84fb50e..b823c4af03fee4172060f105a3a133195b629723 100644 (file)
--- a/src/paks/postfix/CONFFILES
+++ b/src/paks/postfix/CONFFILES
@@ -16,4 +16,4 @@ etc/postfix/postfix-files
 etc/postfix/postfix-script
 etc/postfix/relocated
 etc/postfix/transport
-etc/postfix/virtual
\ No newline at end of file
+etc/postfix/virtual