Merge branch 'guardian-2.0' into next-guardian-geoip

Conflicts:
	make.sh
	src/misc-progs/Makefile

diff --cc html/cgi-bin/ids.cgi
Simple merge

diff --cc langs/de/cgi-bin/de.pl
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc make.sh
index 7d41b591c27ed551fbbd9ccd5dcea31345014005,0074ffd6a464b23076572c877cd0aede90632319..38fc846f2567ce9b41aff28ce4c6ef11ef6001cb
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -808,10 -814,8 +808,12 @@@ buildipfire() 
    ipfiremake batctl
    ipfiremake perl-PDF-API2
    ipfiremake squid-accounting
 +  ipfiremake pigz
 +  ipfiremake tmux
 +  ipfiremake swconfig
 +  ipfiremake haproxy
+   ipfiremake perl-common-sense
+   ipfiremake perl-inotify2
  }
  
  buildinstaller() {

diff --cc src/misc-progs/Makefile
index f5802d26ac2c7918d43e4f998e100fb5f8f1a0a9,08ea0c00bf79b4bf3c4695c9ebce5450472d9f66..cd7bcb9af36eb092d80edf696f42565cca25453a
--- 1/src/misc-progs/Makefile
--- 2/src/misc-progs/Makefile
+++ b/src/misc-progs/Makefile
@@@ -31,12 -32,10 +31,12 @@@ SUID_PROGS = squidctrl sshctrl ipfirere
        redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \
        smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \
        setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \
-       getconntracktable wirelessclient dnsmasqctrl torctrl
+       getconntracktable wirelessclient dnsmasqctrl torctrl guardianctrl
  SUID_UPDX = updxsetperms
  
 -install : all
 +OBJS = $(patsubst %,%.o,$(PROGS) $(SUID_PROGS))
 +
 +install: all
        install -m 755  $(PROGS) /usr/local/bin
        install -m 4750 -g nobody $(SUID_PROGS) /usr/local/bin
  
@@@ -47,11 -46,120 +47,19 @@@ clean
  
  ######
  
 -% : %.c
 -      $(COMPILE) $< setuid.o -o $@
 +%.o: %.c
 +      $(CC) $(CFLAGS) -c $< -o $@
  
  setuid.o: setuid.c setuid.h
 -      $(COMPILE) $< -c -o $@
 -
 -$(SUID_PROGS): setuid.o
 -
 -$(PROGS): setuid.o
 -
 -logwatch: logwatch.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ logwatch.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -openvpnctrl: openvpnctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ openvpnctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -qosctrl: qosctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ qosctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -redctrl: redctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ redctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -extrahdctrl: extrahdctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ extrahdctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -      
 -upnpctrl: upnpctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ upnpctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -sambactrl: sambactrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ sambactrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -tripwirectrl: tripwirectrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ tripwirectrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -      
 -smartctrl: smartctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ smartctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -clamavctrl: clamavctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ clamavctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -firewallctrl: firewallctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ firewallctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -timectrl: timectrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ timectrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -launch-ether-wake: launch-ether-wake.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ launch-ether-wake.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -rebuildhosts: rebuildhosts.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ rebuildhosts.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -applejuicectrl: applejuicectrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ applejuicectrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -dhcpctrl: dhcpctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ dhcpctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -sshctrl: sshctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ sshctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -squidctrl: squidctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ squidctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -snortctrl: snortctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ snortctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -wirelessctrl: wirelessctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ wirelessctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -ipsecctrl: ipsecctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ ipsecctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -getipstat: getipstat.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ getipstat.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -pakfire: pakfire.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ pakfire.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -mpfirectrl: mpfirectrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ mpfirectrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -backupctrl: backupctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ backupctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -addonctrl: addonctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ addonctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -syslogdctrl: syslogdctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ syslogdctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -wlanapctrl: wlanapctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ wlanapctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -setaliases: setaliases.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ setaliases.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -fireinfoctrl: fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -rebuildroutes: rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -getconntracktable: getconntracktable.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ getconntracktable.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -wirelessclient: wirelessclient.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ wirelessclient.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 -
 -dnsmasqctrl: dnsmasqctrl.c setuid.o ../install+setup/libsmooth/varval.o
 -      $(COMPILE) -I../install+setup/libsmooth/ dnsmasqctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 +      $(CC) $(CFLAGS) -c $< -o $@
  
++<<<<<<< HEAD
 +$(PROGS) $(SUID_PROGS): setuid.o | $(OBJS)
 +      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $< $(LIBS)
++=======
+ torctrl: torctrl.c setuid.o ../install+setup/libsmooth/varval.o
+       $(COMPILE) -I../install+setup/libsmooth/ torctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
+ 
+ guardianctrl: guardianctrl.c setuid.o ../install+setup/libsmooth/varval.o
+       $(COMPILE) -I../install+setup/libsmooth/ guardianctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
++>>>>>>> guardian-2.0