Einige kleine optische Anpassungen

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

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index df21e8bd5607ebb0572a271f587f775bc990b9af..a8a092592f70e8b901774fbc1c4305cdccd71b80 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -61,7 +61,6 @@
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * db-4.4.20
-* dbus-0.62
 * dhcp-3.0.4
 * dhcpcd-2.0.8
 * diffutils-2.8.1
@@ -106,13 +105,11 @@
 * groff-1.18.1.1
 * grub-0.97
 * gzip-1.3.5
-* hal-0.5.7.1
 * hddtemp-0.3-beta14
 * hdparm-6.6
 * htop-0.6.2
 * httpd-2.2.2
 * hwdata-0.191
-* hwinfo-ipfire
 * iana-etc-2.10
 * ibod
 * iftop-0.17
@@ -123,7 +120,6 @@
 * ipp2p-0.8.2-iptables
 * iproute2-2.6.16-060323
 * iptables-1.3.5
-* iptraf-3.0.0
 * iptstate-2.1
 * iputils-ss020927
 * isapnptools-1.26
@@ -176,7 +172,6 @@
 * mpg123-0.59r
 * mtools-3.9.10
 * mysql-5.0.24a
-* nagios-2.5
 * nano-1.2.5
 * nash
 * nasm-0.98.39
@@ -191,7 +186,6 @@
 * ntop-3.2
 * ntp-4.2.2
 * ocaml-3.09.2
-* oinkmaster-1.2
 * oinkmaster-2.0
 * openldap-2.3.20
 * openssh-4.3p2
@@ -227,7 +221,6 @@
 * shadow-4.0.15
 * slang-2.0.6
 * smartmontools-5.36
-* snort-2.3.3
 * snort-2.6.1.4
 * sox-12.18.1
 * spandsp-0.0.3pre24
@@ -249,7 +242,6 @@
 * tftp-hpa-0.42
 * tiff-3.8.2
 * traceroute-1.4a12
-* tripwire-2.4.0.1
 * tripwire-2.4.1.2
 * uClibc-0.9.28-pass1
 * uClibc-0.9.28-pass2

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index dadd5f301bd412fb4539f10151dde3669fafca2a..f935a9bc89b87900a052c8fa098b963e8f21eb36 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -36,6 +36,8 @@ Projektleiter - Michael Tremer
 (<a href='mailto:m.s.tremer\@gmail.com'>mitch\@ipfire.org</a>)<br />
 Projektmitglied &amp; Sponsor - Detlef Lampart
 (<a href='mailto:info\@delaco.de'>delaco\@ipfire.org</a>)<br />
+Development & Security Manager - Rene Zingel
+(<a href='mailto:ipfire@firewall-service.com'>info\@firewall-service.com</a>)<br />
 Projektmitglied &amp; Developer - Heiner Schmeling
 (<a href='mailto:cm\@ipfire.eu'>cm\@ipfire.org</a>)<br />
 Projektmitglied &amp; Developer - Christian Schmidt

diff --git a/make.sh b/make.sh
index 5659082fa9a4d375cdd236f9467d0598d406f96c..98b74d93a7563ecd420fc27f3a85672b92d5f2f2 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -450,7 +450,6 @@ buildipfire() {
   ipfiremake fwhits
   ipfiremake noip_updater
   ipfiremake ntp
-  ipfiremake oinkmaster
   ipfiremake openssh
   ipfiremake openswan
   ipfiremake pptpclient
@@ -459,6 +458,7 @@ buildipfire() {
   ipfiremake setup
   ipfiremake snort
   ipfiremake snortsnarf
+  ipfiremake oinkmaster
   ipfiremake squid
   ipfiremake squid-graph
   ipfiremake squidguard