Hinzugefügt:

* Razor - Spamkiller
  * ./make.sh make - Holt erst die Pakete und kompiliert dann...
Geändert:
  * Asterisk - Compiler-Optionen
  * Postfix - nur optische Änderungen
  * ROOTFILES.i386 - Wegen saslauthd-Änderungen einige Dateien gestrichen
  * ./make.sh changelog bearbeitet
  * ChangeLog-Update


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

doc/ChangeLog

@@ -1,3 +1,22 @@
+------------------------------------------------------------------------
+r121 | ms | 2006-05-17 19:04:11 +0200 (Mi, 17 Mai 2006) | 3 lines
+
+Hinzugef<EFBFBD>gt:
+  * Procmail
+
+------------------------------------------------------------------------
+r120 | ms | 2006-05-17 14:44:06 +0200 (Mi, 17 Mai 2006) | 4 lines
+
+Ge<EFBFBD>ndert:
+  * CyrusIMAPd auf den neuesten Stand gebracht.
+  * Saslauthd <20>berarbeitet.
+
+------------------------------------------------------------------------
+r119 | ms | 2006-05-17 13:25:29 +0200 (Mi, 17 Mai 2006) | 3 lines
+
+Ge<EFBFBD>ndert:
+  * Asterisk jetzt in der Version 1.2.7.1 mit Bristuff 0.3.0-PRE-1o und Florz-Patch
+
 ------------------------------------------------------------------------
 r118 | ms | 2006-05-16 13:12:49 +0200 (Di, 16 Mai 2006) | 7 lines
 
@@ -89,6 +108,11 @@ r108 | ms | 2006-05-01 21:47:04 +0200 (Mo, 01 Mai 2006) | 2 lines
 
 Quellenupdate! wireless, ntp, shadow, uClibc
 
+------------------------------------------------------------------------
+r107 | ms | 2006-05-01 21:02:50 +0200 (Mo, 01 Mai 2006) | 2 lines
+
+EmbCop-Sources gel<65>scht!
+
 ------------------------------------------------------------------------
 r106 | ms | 2006-04-28 16:57:32 +0200 (Fr, 28 Apr 2006) | 7 lines
 
@@ -249,6 +273,10 @@ Erste Version des Paketerstellers.
 Bisher nur Postfix. :(
 
 
+------------------------------------------------------------------------
+r83 | guest | 2006-03-24 16:47:00 +0100 (Fr, 24 M<>r 2006) | 1 line
+
+nomsg
 ------------------------------------------------------------------------
 r82 | ms | 2006-03-22 20:11:17 +0100 (Mi, 22 M<>r 2006) | 8 lines
 
@@ -339,6 +367,10 @@ r66 | ms | 2006-02-21 19:55:53 +0100 (Di, 21 Feb 2006) | 1 line
 
 immernoch das alte Problem...
 ------------------------------------------------------------------------
+r65 | ms | 2006-02-21 17:55:11 +0100 (Di, 21 Feb 2006) | 1 line
+
+EmbCop-V0.1-1.4.10 in branches eingef<65>gt
+------------------------------------------------------------------------
 r64 | ms | 2006-02-20 22:23:51 +0100 (Mo, 20 Feb 2006) | 2 lines
 
 Kernel Config f<>r SMP angepasst...
@@ -436,6 +468,10 @@ r44 | ms | 2006-02-19 13:19:49 +0100 (So, 19 Feb 2006) | 2 lines
 
 make.sh gefixt
 
+------------------------------------------------------------------------
+r43 | ms | 2006-02-19 13:01:48 +0100 (So, 19 Feb 2006) | 1 line
+
+IPCOP SOURCE Version 1.4.10 hinzugef<65>gt
 ------------------------------------------------------------------------
 r42 | ms | 2006-02-19 12:34:16 +0100 (So, 19 Feb 2006) | 1 line
 
@@ -450,6 +486,10 @@ r40 | ms | 2006-02-18 22:39:37 +0100 (Sa, 18 Feb 2006) | 1 line
 
 Ordnerstruktur 3. Teil 
 ------------------------------------------------------------------------
+r39 | ms | 2006-02-18 22:33:11 +0100 (Sa, 18 Feb 2006) | 1 line
+
+Ordnerstruktur 2-ter Teil
+------------------------------------------------------------------------
 r38 | ms | 2006-02-18 22:26:02 +0100 (Sa, 18 Feb 2006) | 1 line
 
 Vern<EFBFBD>nftige Ordnerstruktur
@@ -470,6 +510,14 @@ r34 | ms | 2006-02-16 20:07:58 +0100 (Do, 16 Feb 2006) | 1 line
 
 Renamed remotely
 ------------------------------------------------------------------------
+r33 | admin | 2006-02-16 20:04:42 +0100 (Do, 16 Feb 2006) | 1 line
+
+Removed file/folder
+------------------------------------------------------------------------
+r32 | admin | 2006-02-16 20:04:37 +0100 (Do, 16 Feb 2006) | 1 line
+
+Removed file/folder
+------------------------------------------------------------------------
 r31 | ipfire | 2006-02-16 13:20:54 +0100 (Do, 16 Feb 2006) | 1 line
 
 
@@ -500,6 +548,10 @@ Removed file/folder
 ------------------------------------------------------------------------
 r24 | ipfire | 2006-02-15 22:36:15 +0100 (Mi, 15 Feb 2006) | 1 line
 
+Removed file/folder
+------------------------------------------------------------------------
+r23 | ipfire | 2006-02-15 22:35:46 +0100 (Mi, 15 Feb 2006) | 1 line
+
 Removed file/folder
 ------------------------------------------------------------------------
 r22 | ipfire | 2006-02-15 22:33:28 +0100 (Mi, 15 Feb 2006) | 1 line
@@ -516,13 +568,77 @@ Removed file/folder
 ------------------------------------------------------------------------
 r19 | ipfire | 2006-02-15 22:31:56 +0100 (Mi, 15 Feb 2006) | 1 line
 
+Removed file/folder
+------------------------------------------------------------------------
+r18 | ipfire | 2006-02-15 22:31:26 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Removed file/folder
+------------------------------------------------------------------------
+r17 | ipfire | 2006-02-15 22:31:06 +0100 (Mi, 15 Feb 2006) | 1 line
+
 Removed file/folder
 ------------------------------------------------------------------------
 r16 | ipfire | 2006-02-15 22:15:54 +0100 (Mi, 15 Feb 2006) | 1 line
 
 
+------------------------------------------------------------------------
+r15 | ipfire | 2006-02-15 22:21:38 +0100 (Mi, 15 Feb 2006) | 1 line
+
+
 ------------------------------------------------------------------------
 r14 | ipfire | 2006-02-15 22:07:30 +0100 (Mi, 15 Feb 2006) | 1 line
 
 
 ------------------------------------------------------------------------
+r13 | ipfire | 2006-02-15 11:46:10 +0100 (Mi, 15 Feb 2006) | 1 line
+
+
+------------------------------------------------------------------------
+r12 | ipfire | 2006-02-15 11:31:15 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Created folder remotely
+------------------------------------------------------------------------
+r11 | ipfire | 2006-02-15 11:28:40 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Removed file/folder
+------------------------------------------------------------------------
+r10 | ipfire | 2006-02-15 11:27:18 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Added a folder remotely
+------------------------------------------------------------------------
+r9 | ipfire | 2006-02-15 11:26:47 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Moved remotely
+------------------------------------------------------------------------
+r8 | ipfire | 2006-02-15 11:26:18 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Added a folder remotely
+------------------------------------------------------------------------
+r7 | ipfire | 2006-02-15 11:25:16 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Added a file remotely
+------------------------------------------------------------------------
+r6 | ipfire | 2006-02-15 11:24:03 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Added a folder remotely
+------------------------------------------------------------------------
+r5 | ipfire | 2006-02-15 10:27:58 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Removed file/folder
+------------------------------------------------------------------------
+r4 | ipfire | 2006-02-15 10:27:47 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Created folder remotely
+------------------------------------------------------------------------
+r3 | admin | 2006-02-15 01:27:59 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Ordner im Projektarchiv angelegt
+------------------------------------------------------------------------
+r2 | admin | 2006-02-15 01:14:05 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Ordner im Projektarchiv angelegt
+------------------------------------------------------------------------
+r1 | admin | 2006-02-15 01:13:56 +0100 (Mi, 15 Feb 2006) | 1 line
+
+Ordner im Projektarchiv angelegt
+------------------------------------------------------------------------

doc/make.sh-usage

@@ -18,6 +18,7 @@ Maintainer / advanced commands
 		another time
          dist : Mainly produce a diff from previous version to track wich
 		files have been changed
+         make : Does a complete compile with fetching source packages.
 newpak <name> : Create a new package with name: <name>.
     toolchain : Create our own toolchain package to save 20% of build time.
         shell : Enter a shell inside the chroot, used to tune lfs script

doc/packages-list.txt

@@ -20,6 +20,7 @@
   * arping-2.05
   * as86-0.16.17
   * asterisk-1.2.7.1
+  * asterisk-1.2.7.1_1st
   * autoconf-2.59
   * automake-1.8.4
   * bash-2.05b
@@ -38,7 +39,6 @@
   * coreutils-5.93
   * cups-1.1.23-source
   * cxacru-2003-10-05
-  * cyrus-imapd-2.2.12
   * cyrus-imapd-2.2.13
   * cyrus-sasl-2.1.21
   * cyrus-sasl-2.1.21-ldap

lfs/asterisk

@@ -171,22 +171,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	install -D -m 644 zaphfc.o /lib/modules/$(KVER)/misc/zaphfc.o
 
 	# Build Asterisk
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && \
+	cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && 	patch -Np1 < $(DIR_SRC)/src/patches/asterisk.patch
-	patch -Np1 < $(DIR_SRC)/src/patches/asterisk.patch # && \
 	### FAX geht noch nicht mit Asterisk 1.2.7.1
 	# cp -fv $(DIR_DL)/app_{r,t}xfax.c $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && \
-	# cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && \
+	# cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && patch < $(DIR_DL)/apps_Makefile.patch
-	# patch < $(DIR_DL)/apps_Makefile.patch && \
+	cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && 	make clean
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && \
+	cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && 	make all
-	make clean && \
+	cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && 	make install
-	make all && \
+	cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && 	make samples
-	make install && \
-	make samples
 
 	# Build OH323
 	cd $(DIR_SRC)/$(BRISTUFF)/$(OH323) && \
 	make ASTERISKINCDIR=$(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/include OH323WRAPLIBDIR=/usr/lib && \
 	make install ASTERISKINCDIR=$(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/include OH323WRAPLIBDIR=/usr/lib
-	@rm -rf $(DIR_SRC)/$(BRISTUFF) $(DIR_SRC)/{pwlib,openh323}
+	@rm -rf $(DIR_SRC)/$(BRISTUFF) ## Do not delete any more cause to save time on a recompile: $(DIR_SRC)/{pwlib,openh323}
 	@$(POSTBUILD)
 

lfs/postfix

@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# 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 $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################

lfs/razor

@@ -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 <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.81
+
+THISAPP    = razor-agents-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_SFNET)/razor
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE) \
+	razor-agents-sdk-2.07.tar.bz2
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+razor-agents-sdk-2.07.tar.bz2 = $(DL_FROM)/razor-agents-sdk-2.07.tar.bz2
+
+$(DL_FILE)_MD5 = 1a21d84f3a8291f73e7f1d3dd36d9d7f
+razor-agents-sdk-2.07.tar.bz2_MD5 = 3b36f65f85400ee5428afae4a15f7673
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	make-packages.sh razor $(THISAPP)-ipfire-beta-1
+
+###############################################################################
+# 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 jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && perl Makefile.PL
+	cd $(DIR_APP) && make && make install
+	cd $(DIR_SRC) && tar jxf $(DIR_DL)/razor-agents-sdk-2.07.tar.bz2
+	cd $(DIR_SRC)/razor-agents-sdk-2.07 && perl Makefile.PL
+	cd $(DIR_SRC)/razor-agents-sdk-2.07 && make && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)

make.sh

@@ -661,6 +661,7 @@ buildipcop() {
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
+#  ipcopmake lpd
   ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
@@ -668,20 +669,23 @@ buildipcop() {
   ipcopmake openh323
   ipcopmake wget
   ipcopmake bridge-utils
+  echo -ne "`date -u '+%b %e %T'`: Building Mailserver \n" | tee -a $LOGFILE
   ipcopmake postfix
   ipcopmake fetchmail
   ipcopmake cyrusimap
   ipcopmake procmail
+  ipcopmake clamav
+  ipcopmake razor
+#  ipcopmake spamassassin
+  echo -ne "`date -u '+%b %e %T'`: Building VoIP-Server \n" | tee -a $LOGFILE
   ipcopmake stund
-#  ipcopmake lpd
-  ipcopmake openvpn
   ipcopmake asterisk
+  ipcopmake openvpn
   ipcopmake edonkeyclc
   ipcopmake sane
+  echo -ne "`date -u '+%b %e %T'`: Building MP3-Server \n" | tee -a $LOGFILE
   ipcopmake lame
   ipcopmake gnump3d
-  ipcopmake clamav
-#  ipcopmake spamassassin
   ipcopmake rsync
   ipcopmake tcpwrapper
   ipcopmake portmap
@@ -853,7 +857,7 @@ shell)
 	;;
 changelog)
 	echo -n "Loading new Changelog from SVN: "
-	svn log > doc/ChangeLog
+	svn log http://svn.ipfire.eu/svn/ipfire > doc/ChangeLog
 	echo "Finished!"
 	;;
 check)
@@ -902,8 +906,8 @@ clean)
 	done
 	rm -rf $BASEDIR/build
 	rm -rf $BASEDIR/cdrom
+	rm -rf $BASEDIR/packages
 	rm -rf $BASEDIR/log
-	rm -f $BASEDIR/updates/$VERSION/patch.tar.gz;
 	if [ -h /tools ]; then
 		rm -f /tools
 	fi
@@ -1039,6 +1043,7 @@ gettoolchain)
 			echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
 			echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
 			cd $BASEDIR && tar xvfz cache/$PACKAGE.tar.gz -C .
+			rm -vf $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
 		else
 			exiterror "$PACKAGE.md5 did not match, check downloaded package"
 		fi
@@ -1053,8 +1058,13 @@ commit)
 	svn commit
 	svn up > /dev/null
 	;;
+make)
+	echo "Do a complete compile:"	
+	./make.sh prefetch
+	./make.sh build
+	;;
 *)
-	echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|dist|gettoolchain|newpak|prefetch|shell|toolchain|update}"
+	echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|dist|gettoolchain|make|newpak|prefetch|shell|toolchain|update}"
 	cat doc/make.sh-usage
 	exit 1
 	;;

src/ROOTFILES.i386

@@ -23266,7 +23266,7 @@ usr/sbin/pppoa3
 ##usr/lib/perl5/site_perl/5.8.5/alpha-linux/auto/CGI/SpeedyCGI/.packlist
 #usr/lib/perl5/site_perl/5.8.5/CGI/SpeedyCGI.pm
 ##
-## squid-2.5.STABLE12
+## squid-2.5.STABLE13
 ##
 #etc/squid
 #etc/squid/cachemgr.conf
@@ -24911,35 +24911,7 @@ usr/lib/libsasl2.la
 usr/lib/libsasl2.so
 usr/lib/libsasl2.so.2
 usr/lib/libsasl2.so.2.0.21
-#usr/lib/sasl2
+usr/lib/sasl2
-usr/lib/sasl2/libanonymous.la
-usr/lib/sasl2/libanonymous.so
-usr/lib/sasl2/libanonymous.so.2
-usr/lib/sasl2/libanonymous.so.2.0.21
-usr/lib/sasl2/libcrammd5.la
-usr/lib/sasl2/libcrammd5.so
-usr/lib/sasl2/libcrammd5.so.2
-usr/lib/sasl2/libcrammd5.so.2.0.21
-usr/lib/sasl2/libdigestmd5.la
-usr/lib/sasl2/libdigestmd5.so
-usr/lib/sasl2/libdigestmd5.so.2
-usr/lib/sasl2/libdigestmd5.so.2.0.21
-usr/lib/sasl2/libotp.la
-usr/lib/sasl2/libotp.so
-usr/lib/sasl2/libotp.so.2
-usr/lib/sasl2/libotp.so.2.0.21
-usr/lib/sasl2/libplain.la
-usr/lib/sasl2/libplain.so
-usr/lib/sasl2/libplain.so.2
-usr/lib/sasl2/libplain.so.2.0.21
-usr/lib/sasl2/libsasldb.la
-usr/lib/sasl2/libsasldb.so
-usr/lib/sasl2/libsasldb.so.2
-usr/lib/sasl2/libsasldb.so.2.0.21
-usr/lib/sasl2/libsql.la
-usr/lib/sasl2/libsql.so
-usr/lib/sasl2/libsql.so.2
-usr/lib/sasl2/libsql.so.2.0.21
 usr/sbin/saslauthd
 usr/sbin/sasldblistusers2
 usr/sbin/saslpasswd2

src/paks/razor/install.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Extract the files
+tar xfz files.tgz -C /
+cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2

src/paks/razor/uninstall.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Delete the files
+## Befehl fehlt noch
+rm -f /opt/pakfire/installed/ROOTFILES.$2