Geändert:

* (experimentelle) httpd.conf * Portproblem gefixt * snort wieder zurückgesetzt auf die alte Version, da für die neue keine freien Regeln da sind. * Rechtschreibfehler im Installer behoben. * mpg123 wieder hinzugefügt. * fwhits-Graphs - Kleinigkeit vergessen. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@173 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-09 18:45:54 +02:00 · 2006-06-13 14:15:51 +00:00
parent c7acba4a59
commit 894c6feb3e
12 changed files with 1061 additions and 1055 deletions
--- a/config/cfgroot/xtaccess-config
+++ b/config/cfgroot/xtaccess-config
@@ -1 +1 @@
-tcp,0.0.0.0/0,113,off,0.0.0.0
+tcp,0.0.0.0/0,113,on,0.0.0.0
--- a/config/httpd/httpd.conf
+++ b/config/httpd/httpd.conf
@@ -18,8 +18,7 @@ MaxSpareServers 2
 StartServers 2
 MaxClients 10
 MaxRequestsPerChild 100
-Port 81
-Listen 81
+Port 444
 Listen 444
 User nobody
 Group nobody
@@ -44,14 +43,14 @@ RewriteRule .* - [F]
 <DirectoryMatch "/home/httpd/html/(graphs|sgraph)">
    AuthName "Restricted"
    AuthType Basic
-    AuthUserFile CONFIG_ROOT/auth/users
+    AuthUserFile /var/ipfire/auth/users
    require user admin
 </DirectoryMatch>
 ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
 <Directory /home/httpd/cgi-bin>
    AllowOverride None
    Options None
-    AuthName "Restricted"
+    AuthName "IPFire - Restricted"
    AuthType Basic
    AuthUserFile /var/ipfire/auth/users
    Require user admin
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -151,6 +151,7 @@
  * misc-progs
  * mktemp-1.5
  * modutils-2.4.27
+  * mpg123-0.59r
  * mtools-3.9.9
  * nano-1.2.4
  * nash
--- a/langs/de/install/lang_de.c
+++ b/langs/de/install/lang_de.c
--- a/langs/en/install/lang_en.c
+++ b/langs/en/install/lang_en.c
--- a/lfs/mpg123
+++ b/lfs/mpg123
@@ -81,7 +81,7 @@ $(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) && patch -Np1 -i $(DIR_SRC)/patch/mpg123-0.59r-security-1.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/mpg123-0.59r-security-1.patch
 	cd $(DIR_APP) && make PREFIX=/usr linux
 	cd $(DIR_APP) && make PREFIX=/usr install
 	@rm -rf $(DIR_APP)
--- a/lfs/snort
+++ b/lfs/snort
@@ -26,7 +26,7 @@

 include Config

-VER        = 2.4.5
+VER        = 2.3.3

 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 108b3c20dcbaf3cdb17ea9203342eaaa
+$(DL_FILE)_MD5 = 06bf140893e7cb120aaa9372d10a0100

 install : $(TARGET)

@@ -79,9 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make install
 	mv /usr/bin/snort /usr/sbin/
 	-mkdir /etc/snort
-	# Keine Rules zum Kopieren vorhanden. M<>ssen <20>ber das Webinterface geladen werden.
-	#cd $(DIR_APP) && install -m 0644 rules/*.rules \
-	#    etc/unicode.map etc/reference.config etc/classification.config /etc/snort
+	cd $(DIR_APP) && install -m 0644 rules/*.rules \
+	    etc/unicode.map etc/reference.config etc/classification.config /etc/snort
 	install -m 0644 $(DIR_SRC)/config/snort/snort.conf /etc/snort
 	chown -R nobody:nobody /etc/snort
 	-mkdir -p /var/log/snort
--- a/lfs/xampp
+++ b/lfs/xampp
@@ -41,17 +41,23 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 objects = $(DL_FILE) \
 	xampp-linux-devel-$(VER).tar.gz \
 	PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz \
-	Python-AddOn-1.3.tar.gz
+	Python-AddOn-1.3.tar.gz \
+	wwget-beta-for-ipfire.tar.gz \
+	wwget.dump

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 xampp-linux-devel-$(VER).tar.gz 	= $(URL_IPFIRE)/xampp-linux-devel-$(VER).tar.gz
 PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz = $(URL_IPFIRE)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz
 Python-AddOn-1.3.tar.gz = $(URL_IPFIRE)/Python-AddOn-1.3.tar.gz
+wwget-beta-for-ipfire.tar.gz = $(URL_IPFIRE)/wwget-beta-for-ipfire.tar.gz
+wwget.dump = $(URL_IPFIRE)/wwget.dump

 $(DL_FILE)_MD5 = 422ab1faa4ab7afb3be8918ab8223b6b
 xampp-linux-devel-$(VER).tar.gz_MD5 = 30b4bce92ec389adf61cbf67246efd1f
 PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz_MD5 = 63171afe553fd557032407e1ba6af477
 Python-AddOn-1.3.tar.gz_MD5 = 5a962ea63c3e502227c8cca30e0ce786
+wwget-beta-for-ipfire.tar.gz_MD5 = 6591e663cf911cc745b44ca0ab38d24c
+wwget.dump_MD5 = 1d3d78214da692284e15b617b3bdd6e2

 install : $(TARGET)

@@ -88,18 +94,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_SRC) && tar zxf $(DIR_DL)/xampp-linux-devel-$(VER).tar.gz -C /opt
 	cd $(DIR_SRC) && tar zxf $(DIR_DL)/Python-AddOn-1.3.tar.gz -C /tmp
 	cd $(DIR_SRC) && tar zxf $(DIR_DL)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz -C /tmp
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/wwget-beta-for-ipfire.tar.gz -C /opt/lampp/htdocs
 	cd /tmp/PostGreSQL-AddOn-1.0-pgsql8.1 && ./INSTALL
 	rm -rf /tmp/PostGreSQL-AddOn-1.0-pgsql8.1
-	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/bin /opt/lampp
-	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/cgi-bin /opt/lampp
-	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/etc /opt/lampp
-	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/htdocs /opt/lampp
-	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/include /opt/lampp
-	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/lib /opt/lampp
-	# cd /tmp/Python-AddOn-1.3 && cp -frv lampp/licenses /opt/lampp
-	# cd /tmp/Python-AddOn-1.3 && cp -frv lampp/man /opt/lampp
-	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/modules /opt/lampp
-	# cd /tmp/Python-AddOn-1.3 && cp -frv lampp/share /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -fr lampp/bin /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -fr lampp/cgi-bin /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -fr lampp/etc /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -fr lampp/htdocs /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -fr lampp/include /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -fr lampp/lib /opt/lampp
+	# cd /tmp/Python-AddOn-1.3 && cp -fr lampp/licenses /opt/lampp
+	# cd /tmp/Python-AddOn-1.3 && cp -fr lampp/man /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -fr lampp/modules /opt/lampp
+	# cd /tmp/Python-AddOn-1.3 && cp -fr lampp/share /opt/lampp
 	rm -rf /tmp/Python-AddOn-1.3
 	grep etc/python.conf /opt/lampp/etc/httpd.conf || echo -e "Include etc/python.conf" /opt/lampp/etc/httpd.conf
 	chown -R nobody.nobody /opt/lampp/htdocs
--- a/make.sh
+++ b/make.sh
@@ -666,7 +666,7 @@ buildipcop() {
  #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!
@@ -711,21 +711,22 @@ 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
--- a/src/paks/asterisk/ROOTFILES
+++ b/src/paks/asterisk/ROOTFILES
@@ -97,8 +97,8 @@ sbin/zttool
 #usr/include/linux/torisa.h
 #usr/include/linux/zaptel.h
 #usr/include/tonezone.h
-usr/lib/asterisk
-usr/lib/asterisk/modules
+#usr/lib/asterisk
+#usr/lib/asterisk/modules
 usr/lib/asterisk/modules/app_adsiprog.so
 usr/lib/asterisk/modules/app_alarmreceiver.so
 usr/lib/asterisk/modules/app_authenticate.so
@@ -263,25 +263,25 @@ usr/sbin/streamplayer
 #usr/share/man/man8/safe_asterisk.8
 #usr/share/man/man8/ztcfg.8
 #usr/share/man/man8/zttool.8
-var/lib/asterisk
-var/lib/asterisk/agi-bin
+#var/lib/asterisk
+#var/lib/asterisk/agi-bin
 var/lib/asterisk/agi-bin/agi-test.agi
 var/lib/asterisk/agi-bin/eagi-sphinx-test
 var/lib/asterisk/agi-bin/eagi-test
 var/lib/asterisk/agi-bin/xagi-test
-var/lib/asterisk/firmware
+#var/lib/asterisk/firmware
 var/lib/asterisk/firmware/iax
 var/lib/asterisk/firmware/iax/iaxy.bin
-var/lib/asterisk/images
+#var/lib/asterisk/images
 var/lib/asterisk/images/asterisk-intro.jpg
-var/lib/asterisk/keys
+#var/lib/asterisk/keys
 var/lib/asterisk/keys/freeworlddialup.pub
 var/lib/asterisk/keys/iaxtel.pub
-var/lib/asterisk/mohmp3
+#var/lib/asterisk/mohmp3
 var/lib/asterisk/mohmp3/fpm-calm-river.mp3
 var/lib/asterisk/mohmp3/fpm-sunshine.mp3
 var/lib/asterisk/mohmp3/fpm-world-mix.mp3
-var/lib/asterisk/sounds
+#var/lib/asterisk/sounds
 var/lib/asterisk/sounds/agent-alreadyon.gsm
 var/lib/asterisk/sounds/agent-incorrect.gsm
 var/lib/asterisk/sounds/agent-loggedoff.gsm
@@ -636,10 +636,10 @@ var/lib/asterisk/sounds/vm-unknown-caller.gsm
 var/lib/asterisk/sounds/vm-whichbox.gsm
 var/lib/asterisk/sounds/vm-youhave.gsm
 var/lib/asterisk/sounds/voicemail
-var/log/asterisk
+#var/log/asterisk
 var/log/asterisk/cdr-csv
 var/log/asterisk/cdr-custom
-var/spool/asterisk
+#var/spool/asterisk
 var/spool/asterisk/dictate
 var/spool/asterisk/meetme
 var/spool/asterisk/monitor
@@ -651,7 +651,7 @@ var/spool/asterisk/voicemail/default/1234
 var/spool/asterisk/voicemail/default/1234/INBOX
 var/spool/asterisk/voicemail/default/1234/busy.gsm
 var/spool/asterisk/voicemail/default/1234/unavail.gsm
-var/ipfire/asterisk
+#var/ipfire/asterisk
 var/ipfire/asterisk/adsi.conf
 var/ipfire/asterisk/adtranvofr.conf
 var/ipfire/asterisk/agents.conf
@@ -705,4 +705,3 @@ var/ipfire/asterisk/watchdog.conf
 var/ipfire/asterisk/zapata.conf
 var/ipfire/modules.conf.bak
 var/ipfire/zaptel.conf
-
--- a/src/scripts/make-packages.sh
+++ b/src/scripts/make-packages.sh
@@ -15,7 +15,7 @@ cp -f /usr/src/src/paks/$1/{,un}install.sh /paks/$1
 chmod 755 /paks/$1/{,un}install.sh

 # This tar+untar+tar is for removing files compressed twice
-tar -c -C / --files-from=/usr/src/src/paks/$1/ROOTFILES -f /paks/$1/filestmp.tar --exclude='#*'
+tar -c -C / --files-from=/usr/src/src/paks/$1/ROOTFILES -f /paks/$1/filestmp.tar --exclude=#*
 tar -x -C /paks/$1/ROOT -f /paks/$1/filestmp.tar
 rm -f /paks/$1/filestmp.tar
 cd /paks/$1/ROOT && tar zcf /paks/$1/files.tgz *
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -525,7 +525,7 @@ sub updatefwhitsgraph {
 		"LINE2:amount#6464FF:firewallhits",
 		"GPRINT:amount:MAX:   $tr{'maximal'}\\: %2.2lf %S",
 		"GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
-		"GPRINT:amount:LAST: Current\\: %2.2lf %Shits/5 min\\n",
+		"GPRINT:amount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min\\n",
 		"DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
 		"LINE2:portamount#FF6464:portscans",
 		"GPRINT:portamount:MAX:      $tr{'maximal'}\\: %2.2lf %S",