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
This commit is contained in:
ms
2006-06-13 14:15:51 +00:00
parent c7acba4a59
commit 894c6feb3e
12 changed files with 1061 additions and 1055 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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