X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=5959202cae67705d479dd97679e0a7e32cbc2081;hb=5ebf3d3ecf6b9feb73d114345ffcb0988bfe2c41;hp=d1fca3a693b27b44185e15b63b7361868f233b59;hpb=3e45cc09a2fa5b28e387ebb8c3f523d3c5fbce1d;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index d1fca3a693..5959202cae 100644
--- a/make.sh
+++ b/make.sh
@@ -335,9 +335,8 @@ ipcopmake() {
 
 ipfiredist() {
 	if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
-	   if [ ! `ls -w1 $BASEDIR/packages/*.tar.gz | grep $1` ]; then
+#	   if [ ! `ls -w1 $BASEDIR/packages/*.tar.gz | grep $1` ]; then
 		echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
-		cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/local/bin
 		chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
 						PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
@@ -353,9 +352,9 @@ ipfiredist() {
 		if [ $? -ne 0 ]; then
 			exiterror "Packaging $1"
 		fi
-	   else
-		echo "`date -u '+%b %e %T'`: Packaging: The package $1 already exists"
-	   fi
+#	   else
+#		echo "`date -u '+%b %e %T'`: Packaging: The package $1 already exists"
+#	   fi
 	else
 		exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
 	fi
@@ -656,16 +655,16 @@ buildipcop() {
   #ipcopmake speedycgi
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
-  ipcopmake saslauthd PASS=2
   ipcopmake squid
   ipcopmake squid-graph
+  ipcopmake squidguard
   ipcopmake tcpdump
   ipcopmake traceroute
   ipcopmake vlan
   #ipcopmake wireless
   ipcopmake libsafe
   ipcopmake 3c5x9setup
-  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
+#  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
   ipcopmake pakfire
   ipcopmake startscripts
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
@@ -681,6 +680,7 @@ buildipcop() {
   ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
+  ipcopmake saslauthd PASS=2
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
@@ -691,6 +691,7 @@ buildipcop() {
   ipcopmake pwlib
   ipcopmake openh323
   ipcopmake wget
+  ipcopmake wput
   ipcopmake bridge-utils
   ipcopmake screen
   ipcopmake hddtemp
@@ -709,23 +710,25 @@ buildipcop() {
   echo -ne "`date -u '+%b %e %T'`: Building ### VoIP-Server ### \n" | tee -a $LOGFILE
   ipcopmake stund
   ipcopmake asterisk
+  ipcopmake mpg123
   echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
   ipcopmake lame
   ipcopmake gnump3d
   echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
   ipcopmake applejuice
   ipcopmake edonkeyclc
-  ipcopmake sane
+#  ipcopmake sane
   echo -ne "`date -u '+%b %e %T'`: Building ### Net-Tools ### \n" | tee -a $LOGFILE
   ipcopmake ntop
-  ipcopmake rsync
+#  ipcopmake rsync
   ipcopmake tcpwrapper
   ipcopmake portmap
+  ipcopmake nfs
   ipcopmake nmap
   ipcopmake iftop
-  ipcopmake nfs
   ipcopmake ncftp
   ipcopmake cftp
+  ipcopmake etherwake
   ipcopmake ethereal
 #  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
@@ -833,8 +836,13 @@ buildpackages() {
 }
 
 ipfirepackages() {
+  for i in `ls $BASEDIR/packages`; do
+	touch $BASEDIR/build/install/packages/$i.empty
+  done
   ipfiredist applejuice
   ipfiredist asterisk
+  ipfiredist clamav
+  ipfiredist cups
   ipfiredist cyrusimap
   ipfiredist fetchmail
   ipfiredist gnump3d
@@ -842,20 +850,15 @@ ipfirepackages() {
   ipfiredist lame
   ipfiredist libtiff
   ipfiredist libxml2
-  ipfiredist mc
   ipfiredist ntop
   ipfiredist postfix
-  ipfiredist pwlib
+  ipfiredist procmail
   ipfiredist samba
-  ipfiredist sane
-  ipfiredist spandsp
-  ipfiredist sudo
   ipfiredist xampp
   ipfiredist xinetd
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
-  rm -rf $LFS/paks
-  rm -rf $BASEDIR/build/tmp/*
+  mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
+  rm -rf  $BASEDIR/build/install/packages/*
 }
 
 # See what we're supposed to do
@@ -1091,8 +1094,8 @@ gettoolchain)
 	;;
 paks)
 	prepareenv
-	buildpackages
-	# ipfirepackages
+	# buildpackages
+	ipfirepackages
 	;;
 update)
 	echo "Load the latest source-files:"
@@ -1116,7 +1119,11 @@ diff)
 	;;
 sync)
 	echo -e "Syncing Cache to FTP:"
-	echo -ne "Password for mirror.ipfire.org: "; read PASS
+	if [ -f .pass ]; then
+		PASS="`cat .pass`"
+	else
+		echo -ne "Password for mirror.ipfire.org: "; read PASS
+	fi
 	rm -f doc/packages-to-remove-from-ftp
 	ncftpls -u web3 -p $PASS ftp://mirror.ipfire.org/html/source-packages/source/ > ftplist
 	for i in `ls -w1 cache/`; do
@@ -1140,7 +1147,11 @@ sync)
 	;;
 pub-iso)
 	echo -e "Upload the ISO to the beta-mirror!"
-	echo -ne "Password for mirror.ipfire.org: "; read PASS
+	if [ -f .pass ]; then
+		PASS="`cat .pass`"
+	else
+		echo -ne "Password for mirror.ipfire.org: "; read PASS
+	fi
 	ncftpls -u web3 -p $PASS ftp://mirror.ipfire.org/html/source-packages/beta/ | grep `svn info | grep Revision | cut -c 11-`
 	if [ "$?" -eq "1" ]; then
 			cp $BASEDIR/ipfire-install-1.4.i386.iso $BASEDIR/ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso
@@ -1159,7 +1170,11 @@ pub-iso)
 	;;
 pub-paks)
 	echo -e "Upload the packages to the beta-mirror!"
-	echo -ne "Password for mirror.ipfire.org: "; read PASS
+	if [ -f .pass ]; then
+		PASS="`cat .pass`"
+	else
+		echo -ne "Password for mirror.ipfire.org: "; read PASS
+	fi
 	ncftpput -z -u web3 -p $PASS mirror.ipfire.org /html/source-packages/packages/ packages/*
 	if [ "$?" -eq "0" ]; then
 		echo -e "The packages were successfully uploaded to the ftp server."