From 94025eea725540aa43ec82f25b85b3b9c477cc23 Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 12 Mar 2006 21:09:13 +0000 Subject: [PATCH] =?utf8?q?Hinzugef=C3=BCgt:=20=20=20=20=20*=20Postfix=202.?= =?utf8?q?2.9=20=20=20=20=20*=20PostGreSQL=20Gefixt=20und=20neu=20implemen?= =?utf8?q?tiert:=20=20=20=20=20*=20PAM=20=20=20=20=20*=20Berkeley-DB=20=20?= =?utf8?q?=20=20=20*=20XAMPP=20+=20PostGreSQL=20=20=20=20=20*=20SASLAUTHD?= =?utf8?q?=20/opt/lampp/lib=20und=20/opt/lampp/lib/mysql=20befinden=20sich?= =?utf8?q?=20im=20Lib-Cache=20leichtes=20aufr=C3=A4umen=20in=20der=20make.?= =?utf8?q?sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@79 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/etc/group | 2 + config/etc/ld.so.conf | 4 +- config/etc/passwd | 1 + doc/packages-list.txt | 1 + lfs/Config | 1 - lfs/berkeley-DB | 8 ++- lfs/pam | 11 +++- lfs/postfix | 87 +++++++++++++++++++++++++++ lfs/saslauthd | 6 +- lfs/xampp | 12 +++- make.sh | 32 +++++----- src/ROOTFILES.i386 | 135 ++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 276 insertions(+), 24 deletions(-) create mode 100644 lfs/postfix diff --git a/config/etc/group b/config/etc/group index 65a91368f8..05706d0ec1 100644 --- a/config/etc/group +++ b/config/etc/group @@ -28,3 +28,5 @@ dnsmasq:x:103: cron:x:104: syslogd:x:105: klogd:x:106: +postfix:x:107: +postdrop:x:108: diff --git a/config/etc/ld.so.conf b/config/etc/ld.so.conf index 75451432cb..2c5046a040 100644 --- a/config/etc/ld.so.conf +++ b/config/etc/ld.so.conf @@ -1,3 +1,5 @@ # Begin /etc/ld.so.conf - +# Lampp-LIBS +/opt/lampp/lib +/opt/lampp/lib/mysql # End /etc/ld.so.conf diff --git a/config/etc/passwd b/config/etc/passwd index b570f33c56..90d078268d 100644 --- a/config/etc/passwd +++ b/config/etc/passwd @@ -12,3 +12,4 @@ dnsmasq:x:103:103::/:/bin/false cron:x:104:104::/:/bin/false syslogd:x:105:105:/var/empty:/bin/false klogd:x:106:106:/var/empty:/bin/false +postfix:x:1000:100::/var/spool/postfix:/bin/false diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 4b13b1e66c..ce96d5647a 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -128,6 +128,7 @@ * pcre-4.5 * perl-5.8.5 * popt-1.7 +* postfix-2.2.9 * ppp-2.4.2 * pptp-1.6.0 * procinfo-18 diff --git a/lfs/Config b/lfs/Config index bf72efb7d1..e75967803b 100644 --- a/lfs/Config +++ b/lfs/Config @@ -49,7 +49,6 @@ DIR_INFO = $(LFS_BASEDIR)/log DIR_TMP = /tmp KGCC = ccache /usr/bin/gcc -#KVER = 2.4.31 ############################################################################### # Common Macro Definitions diff --git a/lfs/berkeley-DB b/lfs/berkeley-DB index 431184f340..1632cb9762 100644 --- a/lfs/berkeley-DB +++ b/lfs/berkeley-DB @@ -78,8 +78,10 @@ $(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)/build_unix && ../dist/configure --prefix=/usr - cd $(DIR_APP)/build_unix && make - cd $(DIR_APP)/build_unix && make install + cd $(DIR_APP)/build_unix && ../dist/configure --prefix=/usr --enable-compat185 --enable-cxx + cd $(DIR_APP)/build_unix && make LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread" + cd $(DIR_APP)/build_unix && make docdir=/usr/share/doc/$(THISAPP) install + chown root:root /usr/bin/db_* /usr/lib/libdb* /usr/include/db* + chown -R root:root /usr/share/doc/$(THISAPP) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/pam b/lfs/pam index c4461cdeaf..85f700dd46 100644 --- a/lfs/pam +++ b/lfs/pam @@ -79,9 +79,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pam-0.99.3.0-hostname.patch - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure --libdir=/usr/lib \ + --sbindir=/lib/security \ + --enable-securedir=/lib/security \ + --enable-docdir=/usr/share/doc/Linux-PAM-0.99.3.0 \ + --enable-read-both-confs cd $(DIR_APP) && make cd $(DIR_APP) && make check cd $(DIR_APP) && make install + mv -v /lib/security/pam_tally /sbin + mv -v /usr/lib/libpam*.so.0* /lib + ln -v -sf ../../lib/libpam.so.0.81.1 /usr/lib/libpam.so + ln -v -sf ../../lib/libpamc.so.0.81.0 /usr/lib/libpamc.so + ln -v -sf ../../lib/libpam_misc.so.0.81.1 /usr/lib/libpam_misc.so @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/postfix b/lfs/postfix new file mode 100644 index 0000000000..f9f68bd918 --- /dev/null +++ b/lfs/postfix @@ -0,0 +1,87 @@ +############################################################################### +# 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 # +# # +# Modifications by: # +# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # +# - Modified Makefile for IPCop build # +# # +# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $ +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.2.9 + +THISAPP = postfix-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = ftp://netmirror.org/postfix.org/official +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = be78631bd9b6bf7735e43abfa54d69f6 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# 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) && make -f Makefile.init makefiles \ + 'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -DUSE_SALS_AUTH -DHAS_PGSQL -I/usr/include/openssl -DHAS_MYSQL -I/opt/lampp/include/mysql -I/usr/include/sasl -I/opt/lampp/include' \ + 'AUXLIBS=-L/usr/lib -L/opt/lampp/lib/mysql -L/opt/lampp/lib -lmysqlclient -lz -lm -lssl -lsasl2 -lcrypto -lpq' + cd $(DIR_APP) && make + cd $(DIR_APP) && sh postfix-install -non-interactive + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/saslauthd b/lfs/saslauthd index 6a8ea4e4a6..95f5421c34 100644 --- a/lfs/saslauthd +++ b/lfs/saslauthd @@ -78,8 +78,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 --with-mysql=/opt/lampp + cd $(DIR_APP) && ./configure --prefix=/usr --enable-sql --with-pam=/usr --with-mysql=/opt/lampp -sysconfdir=/etc --with-dbpath=/var/lib/sasl/sasldb2 --with-saslauthd=/var/run cd $(DIR_APP) && make cd $(DIR_APP) && make install +# install -v -m644 saslauthd/saslauthd.8 /usr/share/man/man8 +# install -v -m755 -d /usr/share/doc/$(THISAPP) +# install -v -m644 doc/{*.{html,txt,fig},ONEWS,TODO} saslauthd/LDAP_SASLAUTHD /usr/share/doc/$(THISAPP) + install -v -m700 -d /var/lib/sasl @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/xampp b/lfs/xampp index 99a152fe4b..3c33cc0cbe 100644 --- a/lfs/xampp +++ b/lfs/xampp @@ -45,13 +45,16 @@ TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### objects = $(DL_FILE) \ - xampp-linux-devel-1.5.1.tar.gz + xampp-linux-devel-1.5.1.tar.gz \ + PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) xampp-linux-devel-$(VER).tar.gz = http://switch.dl.sourceforge.net/sourceforge/xampp/xampp-linux-devel-$(VER).tar.gz +PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz = http://switch.dl.sourceforge.net/sourceforge/xamppaddon/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz $(DL_FILE)_MD5 = baefcf7ac3629a641c7b75c547564a3f xampp-linux-devel-$(VER).tar.gz_MD5 = e4ab1c867551a831ae6af38fa3c4dfd9 +PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz_MD5 = 63171afe553fd557032407e1ba6af477 install : $(TARGET) @@ -80,7 +83,12 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /opt && tar zxf $(DIR_DL)/xampp-linux-devel-$(VER).tar.gz -C /opt + @rm -rf $(DIR_APP) + cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /opt + cd $(DIR_SRC) && tar zxf $(DIR_DL)/xampp-linux-devel-$(VER).tar.gz -C /opt + cd $(DIR_SRC) && tar zxf $(DIR_DL)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz -C /tmp + cd /tmp/PostGreSQL-AddOn-1.0-pgsql8.1 && ./INSTALL + rm -rf /tmp/PostGreSQL-AddOn-1.0-pgsql8.1 chown -R nobody.nobody /opt/lampp/htdocs @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index c72ff8c030..a1f0bfabf8 100644 --- a/make.sh +++ b/make.sh @@ -28,14 +28,14 @@ # $Id: make.sh,v 1.129.2.145 2006/02/01 07:04:09 gespinasse Exp $ # - NAME="IPFire" # Software name - SNAME="ipfire" # Short name + NAME="IPFire" # Software name + SNAME="ipfire" # Short name VERSION="1.4" # Version number PREVIOUSTAG=IPCOP_v1_4_10_FINAL SLOGAN="We save your network" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 - MAX_RETRIES=3 # prefetch/check loop + MAX_RETRIES=3 # prefetch/check loop KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` @@ -79,17 +79,17 @@ # Define immediately stdumount() { umount $BASEDIR/build/dev/pts 2>/dev/null; - umount $BASEDIR/build/proc 2>/dev/null; - umount $BASEDIR/build/install/mnt 2>/dev/null; + umount $BASEDIR/build/proc 2>/dev/null; + umount $BASEDIR/build/install/mnt 2>/dev/null; umount $BASEDIR/build/usr/src/cache 2>/dev/null; umount $BASEDIR/build/usr/src/ccache 2>/dev/null; umount $BASEDIR/build/usr/src/config 2>/dev/null; - umount $BASEDIR/build/usr/src/doc 2>/dev/null; - umount $BASEDIR/build/usr/src/html 2>/dev/null; + umount $BASEDIR/build/usr/src/doc 2>/dev/null; + umount $BASEDIR/build/usr/src/html 2>/dev/null; umount $BASEDIR/build/usr/src/langs 2>/dev/null; - umount $BASEDIR/build/usr/src/lfs 2>/dev/null; - umount $BASEDIR/build/usr/src/log 2>/dev/null; - umount $BASEDIR/build/usr/src/src 2>/dev/null; + umount $BASEDIR/build/usr/src/lfs 2>/dev/null; + umount $BASEDIR/build/usr/src/log 2>/dev/null; + umount $BASEDIR/build/usr/src/src 2>/dev/null; } exiterror() { @@ -622,14 +622,16 @@ buildipcop() { ipcopmake 3c5x9setup echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE ipcopmake berkeley-DB - ipcopmake stund - ipcopmake lpd ipcopmake xampp ipcopmake pam ipcopmake pammysql + ipcopmake saslauthd + ipcopmake postfix + ipcopmake stund + ipcopmake lpd ipcopmake pwlib ipcopmake openh323 - ipcopmake saslauthd + } buildinstaller() { @@ -669,7 +671,7 @@ buildpackages() { echo "`date -u '+%b %e %T'`: Stripping files" | tee -a $LOGFILE find $LFS/lib $LFS/usr/lib $LFS/usr/share/rrdtool-* $LFS/install ! -type l \( -name '*.so' -o -name '*.so[\.0-9]*' \) \ ! -name 'libc.so' ! -name 'libpthread.so' ! -name 'libcrypto.so.0.9.7.sha1' \ - -exec $LFS/tools/bin/strip --strip-all {} \; >> $LOGFILE 2>&1 + -ls -exec $LFS/tools/bin/strip --strip-all {} \; >> $LOGFILE 2>&1 # add -ls before -exec if you want to verify what files are stripped find $LFS/{,s}bin $LFS/usr/{,s}bin $LFS/usr/local/{,s}bin ! -type l \ @@ -1025,4 +1027,4 @@ gettoolchain) cat doc/make.sh-usage exit 1 ;; -esac +esac \ No newline at end of file diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386 index 4764565b57..318562d275 100644 --- a/src/ROOTFILES.i386 +++ b/src/ROOTFILES.i386 @@ -32014,3 +32014,138 @@ usr/local/db-4.4/lib/libdb-4.4.so usr/local/db-4.4/lib/libdb-4.so usr/local/db-4.4/lib/libdb.a usr/local/db-4.4/lib/libdb.so +## +## Postfix +## +#etc/postfix +etc/postfix/LICENSE +etc/postfix/TLS_LICENSE +etc/postfix/access +etc/postfix/aliases +etc/postfix/canonical +etc/postfix/generic +etc/postfix/header_checks +etc/postfix/main.cf +etc/postfix/main.cf.default +etc/postfix/makedefs.out +etc/postfix/master.cf +etc/postfix/post-install +etc/postfix/postfix-files +etc/postfix/postfix-script +etc/postfix/relocated +etc/postfix/transport +etc/postfix/virtual +usr/bin/mailq +usr/bin/newaliases +usr/libexec/postfix +#usr/libexec/postfix/anvil +#usr/libexec/postfix/bounce +#usr/libexec/postfix/cleanup +#usr/libexec/postfix/discard +#usr/libexec/postfix/error +#usr/libexec/postfix/flush +#usr/libexec/postfix/lmtp +#usr/libexec/postfix/local +#usr/libexec/postfix/master +#usr/libexec/postfix/nqmgr +#usr/libexec/postfix/oqmgr +#usr/libexec/postfix/pickup +#usr/libexec/postfix/pipe +#usr/libexec/postfix/proxymap +#usr/libexec/postfix/qmgr +#usr/libexec/postfix/qmqpd +#usr/libexec/postfix/scache +#usr/libexec/postfix/showq +#usr/libexec/postfix/smtp +#usr/libexec/postfix/smtpd +#usr/libexec/postfix/spawn +#usr/libexec/postfix/tlsmgr +#usr/libexec/postfix/trivial-rewrite +#usr/libexec/postfix/verify +#usr/libexec/postfix/virtual +#usr/local/man/man1/mailq.1 +#usr/local/man/man1/newaliases.1 +#usr/local/man/man1/postalias.1 +#usr/local/man/man1/postcat.1 +#usr/local/man/man1/postconf.1 +#usr/local/man/man1/postdrop.1 +#usr/local/man/man1/postfix.1 +#usr/local/man/man1/postkick.1 +#usr/local/man/man1/postlock.1 +#usr/local/man/man1/postlog.1 +#usr/local/man/man1/postmap.1 +#usr/local/man/man1/postqueue.1 +#usr/local/man/man1/postsuper.1 +#usr/local/man/man1/sendmail.1 +#usr/local/man/man5 +#usr/local/man/man5/access.5 +#usr/local/man/man5/aliases.5 +#usr/local/man/man5/body_checks.5 +#usr/local/man/man5/canonical.5 +#usr/local/man/man5/cidr_table.5 +#usr/local/man/man5/generic.5 +#usr/local/man/man5/header_checks.5 +#usr/local/man/man5/ldap_table.5 +#usr/local/man/man5/master.5 +#usr/local/man/man5/mysql_table.5 +#usr/local/man/man5/nisplus_table.5 +#usr/local/man/man5/pcre_table.5 +#usr/local/man/man5/pgsql_table.5 +#usr/local/man/man5/postconf.5 +#usr/local/man/man5/regexp_table.5 +#usr/local/man/man5/relocated.5 +#usr/local/man/man5/transport.5 +#usr/local/man/man5/virtual.5 +#usr/local/man/man8/anvil.8 +#usr/local/man/man8/bounce.8 +#usr/local/man/man8/cleanup.8 +#usr/local/man/man8/defer.8 +#usr/local/man/man8/discard.8 +#usr/local/man/man8/error.8 +#usr/local/man/man8/flush.8 +#usr/local/man/man8/lmtp.8 +#usr/local/man/man8/local.8 +#usr/local/man/man8/master.8 +#usr/local/man/man8/oqmgr.8 +#usr/local/man/man8/pickup.8 +#usr/local/man/man8/pipe.8 +#usr/local/man/man8/proxymap.8 +#usr/local/man/man8/qmgr.8 +#usr/local/man/man8/qmqpd.8 +#usr/local/man/man8/scache.8 +#usr/local/man/man8/showq.8 +#usr/local/man/man8/smtp.8 +#usr/local/man/man8/smtpd.8 +#usr/local/man/man8/spawn.8 +#usr/local/man/man8/tlsmgr.8 +#usr/local/man/man8/trace.8 +#usr/local/man/man8/trivial-rewrite.8 +#usr/local/man/man8/verify.8 +#usr/local/man/man8/virtual.8 +usr/sbin/postalias +usr/sbin/postcat +usr/sbin/postconf +usr/sbin/postdrop +usr/sbin/postfix +usr/sbin/postkick +usr/sbin/postlock +usr/sbin/postlog +usr/sbin/postmap +usr/sbin/postqueue +usr/sbin/postsuper +usr/sbin/sendmail +var/spool/postfix +var/spool/postfix/active +var/spool/postfix/bounce +var/spool/postfix/corrupt +var/spool/postfix/defer +var/spool/postfix/deferred +var/spool/postfix/flush +var/spool/postfix/hold +var/spool/postfix/incoming +var/spool/postfix/maildrop +var/spool/postfix/pid +var/spool/postfix/private +var/spool/postfix/public +var/spool/postfix/saved +var/spool/postfix/trace -- 2.39.2