webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-14 13:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tripwire aktualisiert.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@516 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-05-03 07:49:22 +00:00
parent 5057b6110c
commit 822c5bd04c
7 changed files with 21 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/packages/clamav
View File

@@ -28,4 +28,4 @@ usr/share/clamav/main.cvd
var/ipfire/clamav/clamd.conf
var/ipfire/clamav/freshclam.conf
etc/rc.d/init.d/clamav
/usr/local/bin/clamavctrl
usr/local/bin/clamavctrl

9
doc/packages-list.txt
View File

@@ -60,7 +60,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
@@ -105,13 +104,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
@@ -122,7 +119,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
@@ -175,7 +171,6 @@
* mpg123-0.59r
* mtools-3.9.10
* mysql-5.0.24a
* nagios-2.5
* nano-1.2.5
* nash
* nasm-0.98.39
@@ -190,7 +185,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
@@ -226,7 +220,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
@@ -248,7 +241,7 @@
* 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
* uClibc-0.9.28-pass3

1
lfs/configroot
View File

@@ -94,6 +94,7 @@ $(TARGET) :
cp $(DIR_SRC)/config/cfgroot/nfs-server $(CONFIG_ROOT)/nfs/nfs-server
cp $(DIR_SRC)/config/cfgroot/p2protocols $(CONFIG_ROOT)/outgoing/p2protocols
cp $(DIR_SRC)/config/outgoingfw/outgoingfw.pl $(CONFIG_ROOT)/outgoing/bin/
cp $(DIR_SRC)/config/outgoingfw/defaultservices $(CONFIG_ROOT)/outgoing/
cp $(DIR_SRC)/config/cfgroot/proxy-acl $(CONFIG_ROOT)/proxy/acl-1.4
cp $(DIR_SRC)/config/qos/* $(CONFIG_ROOT)/qos/bin/
cp $(DIR_SRC)/config/cfgroot/ssh-settings $(CONFIG_ROOT)/remote/settings

25
lfs/tripwire
View File

@@ -26,7 +26,7 @@
include Config
VER = 2.4.0.1
VER = 2.4.1.2
THISAPP = tripwire-$(VER)
DL_FILE = $(THISAPP)-src.tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b371f79ac23cacc9ad40b1da76b4a0c4
$(DL_FILE)_MD5 = 8a1147c278b528ed593023912c4b649a
install : $(TARGET)
@@ -76,22 +76,21 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ln -s contrib install
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/tripwire-2.4.0.1-gcc4_build_fixes-1.patch
cd $(DIR_APP) && sed -i -e 's@TWDB="$${prefix}@TWDB="/var@' \
@rm -rf $(DIR_APP)* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP)-src && ln -fs contrib install
cd $(DIR_APP)-src && sed -i -e 's@TWDB="$${prefix}@TWDB="/var@' \
-e 's@^CLOBBER="false"@CLOBBER="true"@' install/install.cfg
cd $(DIR_APP) && sed -i -e 's@^PROMPT="true"@PROMPT="false"@' \
cd $(DIR_APP)-src && sed -i -e 's@^PROMPT="true"@PROMPT="false"@' \
-e 's@^TW_SITE_PASS=""@TW_SITE_PASS="ipfire"@' \
-e 's@^TW_LOCAL_PASS=""@TW_LOCAL_PASS="ipfire"@' \
install/install.sh
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/tripwire
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
cd $(DIR_APP)-src && ./configure --prefix=/usr --sysconfdir=/var/ipfire/tripwire
cd $(DIR_APP)-src && make $(MAKETUNING)
cd $(DIR_APP)-src && for i in siggen tripwire twadmin twprint; do \
cp -vf $(DIR_APP)-src/bin/$$i /usr/sbin; \
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
@rm -rf $(DIR_APP)
@rm -rf $(DIR_APP)*
@$(POSTBUILD)

10
make.sh
View File

@@ -650,7 +650,7 @@ ipfirepackages() {
# ipfiredist spamassassin
# ipfiredist webcyradm
test -d $BASEDIR/packages || mkdir $BASEDIR/packages
mv -f $LFS/install/packages/*.{ipfire,md5} $BASEDIR/packages >> $LOGFILE 2>&1
mv -f $LFS/install/packages/*.ipfire $BASEDIR/packages >> $LOGFILE 2>&1
rm -rf $BASEDIR/build/install/packages/*
}
@@ -983,15 +983,15 @@ EOF
;;
paks)
cat <<EOF > .ftp-commands
mkdir $IPFIRE_FTP_PATH_PAK
mkdir -p $FTP_ISO_PATH/$SVN_REVISION/paks
ls -lah
quit
EOF
ncftp -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK < .ftp-commands
ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands
rm -f .ftp-commands
ncftpput -z -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK $IPFIRE_FTP_PATH_PAK/ packages/*
ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/*
if [ "$?" -eq "0" ]; then
echo -e "The packages were successfully uploaded to $IPFIRE_FTP_URL_PAK$IPFIRE_FTP_PATH_PAK/."
echo -e "The packages were successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/."
else
echo -e "There was an error while uploading the packages to the ftp server."
exit 1

41
src/patches/tripwire-2.4.0.1-gcc4_build_fixes-1.patch
View File

@@ -1,41 +0,0 @@
Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: 2006-04-12
Initial Package Version: 2.4.0.1
Origin: Mandrake CVS
Description: This patch contains gcc-4 fixes developed by me.
diff -Naur tripwire-2.4.0.1/src/fco/fconame.h tw-new/src/fco/fconame.h
--- tripwire-2.4.0.1/src/fco/fconame.h 2005-09-15 22:12:38.000000000 -0500
+++ tw-new/src/fco/fconame.h 2006-04-11 21:52:53.000000000 -0500
@@ -49,6 +49,7 @@
///////////////////////////////////////////////////////////////////////////////
class cFCONameTblNode;
class cFCONameIter;
+class cFCOName_i;
class cFCOName : public iTypedSerializable
{
diff -Naur tripwire-2.4.0.1/src/fco/fcosetimpl.h tw-new/src/fco/fcosetimpl.h
--- tripwire-2.4.0.1/src/fco/fcosetimpl.h 2005-09-15 22:12:38.000000000 -0500
+++ tw-new/src/fco/fcosetimpl.h 2006-04-11 22:02:16.000000000 -0500
@@ -46,6 +46,8 @@
#include "fconame.h"
#endif
+class cFCOIterImpl;
+
class cFCOSetImpl : public iFCOSet
{
friend class cFCOIterImpl;
diff -Naur tripwire-2.4.0.1/src/tw/fcoreport.h tw-new/src/tw/fcoreport.h
--- tripwire-2.4.0.1/src/tw/fcoreport.h 2005-09-15 22:12:37.000000000 -0500
+++ tw-new/src/tw/fcoreport.h 2006-04-11 22:05:24.000000000 -0500
@@ -85,6 +85,7 @@
class cFileHeaderID;
class cErrorQueue;
class cFCOReportGenreHeader;
+class cFCOReportSpecIter;
class cFCOReport : public iTypedSerializable
{

1
tools/make-functions
View File

@@ -487,6 +487,7 @@ batch_script() {
evaluate 1 mail_me ISO
echo -ne "### UPLOADING PAKS"
$0 packages sign
$0 upload paks
evaluate 1 mail_me PAKS