From: Arne Fitzenreiter Date: Fri, 18 Feb 2011 19:33:00 +0000 (+0100) Subject: Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.9-core47~9 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=48a2495afd78163adfd984689ab1c08091fdd2d3;hp=abcbbd1fd7d11549b7c44e301f17a4b9596a04b5 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x Conflicts: config/rootfiles/core/47/filelists/files --- diff --git a/config/backup/include b/config/backup/include index a5097a980c..8806640cff 100644 --- a/config/backup/include +++ b/config/backup/include @@ -15,6 +15,7 @@ /var/ipfire/auth/users /var/ipfire/dhcp/* /var/ipfire/main/* +/var/ipfire/outgoing/groups /var/ipfire/outgoing/rules /var/ipfire/outgoing/p2protocols /var/ipfire/ovpn diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index fee8ee2b06..adbbd2970a 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -2,3 +2,5 @@ etc/system-release etc/rc.d/init.d/sshd srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/remote.cgi +srv/web/ipfire/cgi-bin/ids.cgi +var/ipfire/backup/include diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 734e7dc886..7da270c97e 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -264,11 +264,11 @@ if (-e "/etc/snort/snort.conf") { if ($snortsettings{'RULES'} eq 'subscripted') { #$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}"; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902_s.tar.gz/$snortsettings{'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903_s.tar.gz/$snortsettings{'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz"; } elsif ($snortsettings{'RULES'} eq 'registered') { #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}"; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902.tar.gz/$snortsettings{'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903.tar.gz/$snortsettings{'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz"; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; diff --git a/lfs/fireinfo b/lfs/fireinfo index 6c502e1ff5..6c2177a5f8 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@ include Config -VER = 2.0.4 +VER = 2.0.5 THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7433e108cce180980189339886621539 +$(DL_FILE)_MD5 = e0e959a6891262f45fc1cedc225a662b install : $(TARGET) diff --git a/lfs/icecc b/lfs/icecc index a5b7af411d..d661b193b4 100644 --- a/lfs/icecc +++ b/lfs/icecc @@ -24,15 +24,15 @@ include Config -VER = 0.9.4.8 +VER = 0.9.6 -THISAPP = icecream-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = icecc-$(VER) +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = icecc -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f304865d3f68d0d5ee2c2084571b7b28 +$(DL_FILE)_MD5 = c6dacb3f28eade45f603a99245cde4fd install : $(TARGET) @@ -76,7 +76,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/icecream-rename-scheduler.patch cd $(DIR_APP) && ./configure \ --prefix=/opt/icecream cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/src/initscripts/init.d/icecream b/src/initscripts/init.d/icecream index 6ce466003d..f8fa4e3330 100644 --- a/src/initscripts/init.d/icecream +++ b/src/initscripts/init.d/icecream @@ -15,24 +15,32 @@ . /etc/sysconfig/rc . ${rc_functions} -SCHEDULER=minerva.ipfire.org +#SCHEDULER=minerva.ipfire.org +ENABLE_SCHEDULER=on JOBS=8 -PORT=10244 case "${1}" in start) boot_mesg "Starting Icecream Daemon..." - /opt/icecream/sbin/iceccd -d -s ${SCHEDULER} -m ${JOBS} -p ${PORT} + ARGS="-d -m ${JOBS}" + if [ -n "${SCHEDULER}" ]; then + ARGS="${ARGS} -s ${SCHEDULER}" + fi + /opt/icecream/sbin/iceccd ${ARGS} evaluate_retval - if ! grep -q "${PORT}" /var/ipfire/xtaccess/config ; then - echo "tcp,0.0.0.0/0,${PORT},on,0.0.0.0,Icecream" >> /var/ipfire/xtaccess/config - /usr/local/bin/setxtaccess + + if [ "${ENABLE_SCHEDULER}" = "on" ]; then + /opt/icecream/sbin/icecc-scheduler -d fi ;; stop) boot_mesg "Stopping Icecream Daemon..." killproc /opt/icecream/sbin/iceccd + + if [ "${ENABLE_SCHEDULER}" = "on" ]; then + killproc /opt/icecream/sbin/icecc-scheduler + fi ;; restart) diff --git a/src/patches/icecream-rename-scheduler.patch b/src/patches/icecream-rename-scheduler.patch new file mode 100644 index 0000000000..5de773838f --- /dev/null +++ b/src/patches/icecream-rename-scheduler.patch @@ -0,0 +1,107 @@ +Index: icecc-0.9.6/doc/man-scheduler.1.docbook +=================================================================== +--- icecc-0.9.6.orig/doc/man-scheduler.1.docbook ++++ icecc-0.9.6/doc/man-scheduler.1.docbook +@@ -23,13 +23,13 @@ + + + +- scheduler ++ icecc-scheduler + Icecream scheduler + + + + +-scheduler ++icecc-scheduler + + + +@@ -151,7 +151,7 @@ need to run the scheduler with root righ + + + See Also +-icecream, scheduler, iceccd, icemon ++icecream, icecc-scheduler, iceccd, icemon + + + +Index: icecc-0.9.6/services/Makefile.am +=================================================================== +--- icecc-0.9.6.orig/services/Makefile.am ++++ icecc-0.9.6/services/Makefile.am +@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h + noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h + icedir = $(includedir)/icecc + +-sbin_PROGRAMS = scheduler +-scheduler_SOURCES = scheduler.cpp +-scheduler_LDADD = libicecc.la ++sbin_PROGRAMS = icecc-scheduler ++icecc_scheduler_SOURCES = scheduler.cpp ++icecc_scheduler_LDADD = libicecc.la + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = icecc.pc +Index: icecc-0.9.6/services/Makefile.in +=================================================================== +--- icecc-0.9.6.orig/services/Makefile.in ++++ icecc-0.9.6/services/Makefile.in +@@ -37,7 +37,7 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-sbin_PROGRAMS = scheduler$(EXEEXT) ++sbin_PROGRAMS = icecc-scheduler$(EXEEXT) + subdir = services + DIST_COMMON = $(ice_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/icecc.pc.in +@@ -82,9 +82,9 @@ libicecc_la_LINK = $(LIBTOOL) --tag=CXX + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libicecc_la_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + PROGRAMS = $(sbin_PROGRAMS) +-am_scheduler_OBJECTS = scheduler.$(OBJEXT) +-scheduler_OBJECTS = $(am_scheduler_OBJECTS) +-scheduler_DEPENDENCIES = libicecc.la ++am_icecc_scheduler_OBJECTS = scheduler.$(OBJEXT) ++icecc_scheduler_OBJECTS = $(am_icecc_scheduler_OBJECTS) ++icecc_scheduler_DEPENDENCIES = libicecc.la + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -107,8 +107,8 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES) +-DIST_SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES) ++SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES) ++DIST_SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES) + DATA = $(pkgconfig_DATA) + HEADERS = $(ice_HEADERS) $(noinst_HEADERS) + ETAGS = etags +@@ -242,8 +242,8 @@ libicecc_la_CXXFLAGS = -fPIC -DPIC + ice_HEADERS = job.h comm.h + noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h + icedir = $(includedir)/icecc +-scheduler_SOURCES = scheduler.cpp +-scheduler_LDADD = libicecc.la ++icecc_scheduler_SOURCES = scheduler.cpp ++icecc_scheduler_LDADD = libicecc.la + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = icecc.pc + all: all-am +@@ -358,9 +358,9 @@ clean-sbinPROGRAMS: + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +-scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES) +- @rm -f scheduler$(EXEEXT) +- $(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS) ++icecc-scheduler$(EXEEXT): $(icecc_scheduler_OBJECTS) $(icecc_scheduler_DEPENDENCIES) ++ @rm -f icecc-scheduler$(EXEEXT) ++ $(CXXLINK) $(icecc_scheduler_OBJECTS) $(icecc_scheduler_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT)