From 91dc1bfc543ff1b561579070c4d5938bf9f634ca Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 10 Jan 2007 21:38:07 +0000 Subject: [PATCH] Der taegliche Commit am Abend :D git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@389 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/ntp | 13 ++++++ config/rootfiles/common/snort | 56 +++++++++++++++++++++++ doc/packages-list.txt | 1 + lfs/squid-graph | 8 ++-- src/initscripts/init.d/ntp | 38 ++++++++++++++++ src/initscripts/init.d/red | 1 - src/misc-progs/restartntpd.c | 84 +++++++++++++++++------------------ 7 files changed, 154 insertions(+), 47 deletions(-) create mode 100644 config/rootfiles/common/ntp create mode 100644 config/rootfiles/common/snort create mode 100644 src/initscripts/init.d/ntp diff --git a/config/rootfiles/common/ntp b/config/rootfiles/common/ntp new file mode 100644 index 0000000000..5190231949 --- /dev/null +++ b/config/rootfiles/common/ntp @@ -0,0 +1,13 @@ +#etc/ntp +etc/ntp.conf +usr/bin/ntpd +usr/bin/ntpdate +usr/bin/ntpdc +usr/bin/sntp +#usr/man/man1/sntp.1 +usr/sbin/ntp-keygen +usr/sbin/ntp-wait +usr/sbin/ntpq +usr/sbin/ntptime +usr/sbin/ntptrace +usr/sbin/tickadj diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort new file mode 100644 index 0000000000..5e78f2ebbb --- /dev/null +++ b/config/rootfiles/common/snort @@ -0,0 +1,56 @@ +#etc/snort +etc/snort/attack-responses.rules +etc/snort/backdoor.rules +etc/snort/bad-traffic.rules +etc/snort/chat.rules +etc/snort/classification.config +etc/snort/ddos.rules +etc/snort/deleted.rules +etc/snort/dns.rules +etc/snort/dos.rules +etc/snort/experimental.rules +etc/snort/exploit.rules +etc/snort/finger.rules +etc/snort/ftp.rules +etc/snort/icmp-info.rules +etc/snort/icmp.rules +etc/snort/imap.rules +etc/snort/info.rules +etc/snort/local.rules +etc/snort/misc.rules +etc/snort/multimedia.rules +etc/snort/mysql.rules +etc/snort/netbios.rules +etc/snort/nntp.rules +etc/snort/oracle.rules +etc/snort/other-ids.rules +etc/snort/p2p.rules +etc/snort/policy.rules +etc/snort/pop2.rules +etc/snort/pop3.rules +etc/snort/porn.rules +etc/snort/reference.config +etc/snort/rpc.rules +etc/snort/rservices.rules +etc/snort/scan.rules +etc/snort/shellcode.rules +etc/snort/smtp.rules +etc/snort/snmp.rules +etc/snort/snort.conf +etc/snort/sql.rules +etc/snort/telnet.rules +etc/snort/tftp.rules +etc/snort/unicode.map +etc/snort/virus.rules +etc/snort/web-attacks.rules +etc/snort/web-cgi.rules +etc/snort/web-client.rules +etc/snort/web-coldfusion.rules +etc/snort/web-frontpage.rules +etc/snort/web-iis.rules +etc/snort/web-misc.rules +etc/snort/web-php.rules +etc/snort/x11.rules +#usr/man/man8/snort.8 +usr/sbin/snort +var/log/snort diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 7afbc7a354..cc2aca8296 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -212,6 +212,7 @@ * 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 diff --git a/lfs/squid-graph b/lfs/squid-graph index 26b6cb8895..c82ac20876 100644 --- a/lfs/squid-graph +++ b/lfs/squid-graph @@ -26,12 +26,12 @@ include Config -VER = 3.1 +VER = 3.2 THISAPP = squid-graph-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DIR_APP = $(DIR_SRC)/squid-graph TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e9565daabc23599094ed2d0e9a984d5e +$(DL_FILE)_MD5 = 7ed7d187f87bde1ec9dabe05f07053b5 install : $(TARGET) @@ -77,7 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e "s/\$$color{'hit'} .*$$/\$$color{'hit'} = ['99','33','33']; # graph hit line color/" \ -e "s/\$$color{'miss'} .*$$/\$$color{'miss'} = ['33','99','33']; # graph miss line color/" \ -e "s/\$$color{'ims'} .*$$/\$$color{'ims'} = ['99','33','99']; # graph ims hit line color/" \ - bin/squid-graph > /usr/bin/squid-graph + squid-graph > /usr/bin/squid-graph chmod 755 /usr/bin/squid-graph -mkdir -p /srv/web/ipfire/html/sgraph @rm -rf $(DIR_APP) diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp new file mode 100644 index 0000000000..5cb6782ad7 --- /dev/null +++ b/src/initscripts/init.d/ntp @@ -0,0 +1,38 @@ +#!/bin/sh +# Begin $rc_base/init.d/ntp + +#$LastChangedBy: bdubbs $ +#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + boot_mesg "Starting ntpd..." + ntpd -gqx + loadproc /usr/bin/ntpd + ;; + + stop) + boot_mesg "Stopping ntpd..." + killproc /usr/bin/ntpd + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc /usr/bin/ntpd + ;; + + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/ntp diff --git a/src/initscripts/init.d/red b/src/initscripts/init.d/red index 3be287aa9a..a119a6cbe9 100644 --- a/src/initscripts/init.d/red +++ b/src/initscripts/init.d/red @@ -83,7 +83,6 @@ sub doupdatesettings { # erase in case it was created once with 'persistent' selected but rc.red stop never used : SF1171610 unlink ("${General::swroot}/red/iface"); - } } # No output should be sent to the webclient diff --git a/src/misc-progs/restartntpd.c b/src/misc-progs/restartntpd.c index ed04686737..b89916ce13 100644 --- a/src/misc-progs/restartntpd.c +++ b/src/misc-progs/restartntpd.c @@ -1,42 +1,42 @@ -/* Ipcop helper program - restartntpd - * - * Starts or stops the ntpd daemon - * - * (c) Darren Critchley 2003 - * - * $Id: restartntpd.c,v 1.5 2003/12/19 14:29:09 riddles Exp $ - * - */ - -#include -#include -#include -#include -#include -#include -#include "setuid.h" - - -int main(void) -{ - int fd = -1; - int enable = 0; - - if (!(initsetuid())) - exit(1); - - safe_system("/bin/killall ntpd 2> /dev/null"); - sleep(3); - - if ((fd = open(CONFIG_ROOT "/time/allowclients", O_RDONLY)) != -1) - { - close(fd); - enable = 1; - } - - if (enable) - { - safe_system("/usr/bin/ntpd -Ap /var/run/ntpd.pid -u ntp:ntp"); - } - return 0; -} +/* Ipcop helper program - restartntpd + * + * Starts or stops the ntpd daemon + * + * (c) Darren Critchley 2003 + * + * $Id: restartntpd.c,v 1.5 2003/12/19 14:29:09 riddles Exp $ + * + */ + +#include +#include +#include +#include +#include +#include +#include "setuid.h" + + +int main(void) +{ + int fd = -1; + int enable = 0; + + if (!(initsetuid())) + exit(1); + + safe_system("/etc/rc.d/init.d/ntp stop 2> /dev/null"); + sleep(3); + + if ((fd = open(CONFIG_ROOT "/time/allowclients", O_RDONLY)) != -1) + { + close(fd); + enable = 1; + } + + if (enable) + { + safe_system("/etc/rc.d/init.d/ntp start"); + } + return 0; +} -- 2.39.2