Neuen Tux von Alex bekommen! Merci beaucoup :D

Ein bisschen Tripwire aufgeraeumt. Leere Dateien sollten nicht ins Repository :D

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

diff --git a/config/tripwire/oldbin/siggen b/config/tripwire/oldbin/siggen
deleted file mode 100755 (executable)
index d35a3e2..0000000
Binary files a/config/tripwire/oldbin/siggen and /dev/null differ

diff --git a/config/tripwire/oldbin/tripwire b/config/tripwire/oldbin/tripwire
deleted file mode 100755 (executable)
index 87c5dbe..0000000
Binary files a/config/tripwire/oldbin/tripwire and /dev/null differ

diff --git a/config/tripwire/oldbin/twadmin b/config/tripwire/oldbin/twadmin
deleted file mode 100755 (executable)
index 1c3c27f..0000000
Binary files a/config/tripwire/oldbin/twadmin and /dev/null differ

diff --git a/config/tripwire/oldbin/twprint b/config/tripwire/oldbin/twprint
deleted file mode 100755 (executable)
index 11df259..0000000
Binary files a/config/tripwire/oldbin/twprint and /dev/null differ

diff --git a/doc/Flamme Entuxee.png b/doc/Flamme Entuxee.png
new file mode 100644 (file)
index 0000000..cf6826b
Binary files /dev/null and b/doc/Flamme Entuxee.png differ

diff --git a/lfs/configroot b/lfs/configroot
index 312c1fa15851aecae788de4d3651e709d5a25908..a747f14781095db66944ee7534ce52f3ba0100b2 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -55,7 +55,7 @@ $(TARGET) :
        for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes \
            ethernet extrahd/bin fwlogs isdn key langs logging main mbmon menu.d modem net-traffic \
                        nfs optionsfw outgoing/bin patches pakfire portfw \
        for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes \
            ethernet extrahd/bin fwlogs isdn key langs logging main mbmon menu.d modem net-traffic \
                        nfs optionsfw outgoing/bin patches pakfire portfw \

-           ppp private proxy/advanced qos/bin red remote snort time \
+           ppp private proxy/advanced qos/bin red remote snort time tripwire/report \

                        updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
            wakeonlan wireless xtaccess ; do \
                mkdir -p $(CONFIG_ROOT)/$$i; \
                        updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
            wakeonlan wireless xtaccess ; do \
                mkdir -p $(CONFIG_ROOT)/$$i; \


@@ -69,7 +69,7 @@ $(TARGET) :
            isdn/settings main/hosts main/settings optionsfw/settings outgoing/settings outgoing/rules pakfire/settings \
            portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
            ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
            isdn/settings main/hosts main/settings optionsfw/settings outgoing/settings outgoing/rules pakfire/settings \
            portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
            ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \

-           qos/tosconfig snort/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
+           qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \

            vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
                touch $(CONFIG_ROOT)/$$i; \
        done
            vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
                touch $(CONFIG_ROOT)/$$i; \
        done

diff --git a/lfs/tripwire b/lfs/tripwire
index 859ba5808b4343958d725e61dcf38a638c997913..743cfc420a918cb6727379feceb648370359e683 100644 (file)
--- a/lfs/tripwire
+++ b/lfs/tripwire
@@ -89,9 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && for i in siggen tripwire twadmin twprint; do \
                                                                                        cp -vf $(DIR_APP)/bin/$$i /usr/sbin; \
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && for i in siggen tripwire twadmin twprint; do \
                                                                                        cp -vf $(DIR_APP)/bin/$$i /usr/sbin; \

-                                                                               done 
-       @rm -rf $(DIR_APP)
+                                                                               done

        cp -vrf $(DIR_SRC)/config/tripwire/* /var/ipfire/tripwire/
        cp -vfp /var/ipfire/tripwire/twcfg.txt /var/ipfire/tripwire/twcfg.default
        cp -vfp /var/ipfire/tripwire/twpol.txt /var/ipfire/tripwire/twpol.default
        cp -vrf $(DIR_SRC)/config/tripwire/* /var/ipfire/tripwire/
        cp -vfp /var/ipfire/tripwire/twcfg.txt /var/ipfire/tripwire/twcfg.default
        cp -vfp /var/ipfire/tripwire/twpol.txt /var/ipfire/tripwire/twpol.default

+       @rm -rf $(DIR_APP)

        @$(POSTBUILD)
        @$(POSTBUILD)