Builderror von IPP2P und Apache gefixt.

Sourceforge Bild unnuetze. Da sind we ja eh nich...

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

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index cc2aca829654d8a8c55f507283dc68059eca9f1a..8d4a7eb2bbc1eb43ed0ae3fd6e44a7ebfbceca11 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -211,12 +211,9 @@
 * sox-12.18.1
 * spandsp-0.0.3pre24
 * squid-2.6.STABLE3
-* squid-graph-3.1
 * squid-graph-3.2
 * squidGuard-1.2.0
-* startscripts
 * stund_0.96_Aug13
-* subversion-1.3.1
 * sudo-1.6.8p12
 * sysfsutils-1.3.0
 * sysklogd-1.4.1

diff --git a/lfs/apache2 b/lfs/apache2
index ff45178bbfcfe0a2a9b89f4e2a8855d482046408..cc2e3be6a48561131671c179e0f487bcfb84c214 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -89,7 +89,6 @@ ifeq "$(PASS)" "C"
        mkdir -p /srv/web/ipfire/{cgi-bin,html}
        cp -aR $(DIR_SRC)/html/* /srv/web/ipfire
        -find /srv/web/ipfire -name .svn -exec rm -rf {} \;
-       cp $(DIR_DL)/sflogo.png /srv/web/ipfire/html/images/
 
        # Change CONFIG_ROOT in cgi-scripts
        for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \

diff --git a/lfs/ipp2p b/lfs/ipp2p
index 9e805fc9278c5ad2101b7f894598bed34d28be85..cf206fdc863a04ffff0589c63faba0e607841df3 100644 (file)
--- a/lfs/ipp2p
+++ b/lfs/ipp2p
@@ -62,7 +62,7 @@ $(TARGET) :
        @rm -rf $(DIR_APP) && mkdir -p $(DIR_APP)
        @cp -vf $(DIR_SRC)/src/ipp2p/* $(DIR_APP)
        cd $(DIR_SRC) && rm -rf iptables-*
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/iptables-fixed.tar.gz
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.5.tar.bz2
        cd $(DIR_SRC) && ln -sf iptables-* iptables
 ifeq "$(SMP)" "1"
        cd $(DIR_APP) && make ipt_ipp2p.ko