Merge remote-tracking branch 'ummeegge/lynis' into next

Conflicts:
	make.sh

diff --combined lfs/squid-accounting
index 184c9227fb170da74777ed2744e8a27a3c2c854d,9ef8324110ead048ba52f379518bbac781bc972c..7eae4fbb624e7e865a0aebc5a0f2d732fc86e002
--- 1/lfs/squid-accounting
--- 2/lfs/squid-accounting
+++ b/lfs/squid-accounting
@@@ -9,13 -9,13 +9,13 @@@
  
  include Config
  
 -VER        = 1.0.1
 +VER        = 1.0.2
  
  THISAPP    = squid-accounting-$(VER)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = squid-accounting
- PAK_VER    = 3
+ PAK_VER    = 4
  
  DEPS       = "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards perl-PDF-API2 sendEmail"
  

diff --combined make.sh
index 575380dbe12547248f29a3423016b8ad19330783,18ac3dac2a2e30f868cdccba2a98699d4eb7c094..f42dc25004cc5e155adab2a00e6c39def35654c7
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.17"                                                        # Version number
 -CORE="86-beta1"                                                       # Core Level (Filename)
 +CORE="87"                                                     # Core Level (Filename)
  PAKFIRE_CORE="86"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -408,6 -408,7 +408,7 @@@ buildipfire() 
        i586)
                # x86-pae (Native and new XEN) kernel build
                ipfiremake linux                        KCFG="-pae"
+               ipfiremake backports                    KCFG="-pae"
                ipfiremake cryptodev                    KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
                ipfiremake igb                          KCFG="-pae"
@@@ -416,6 -417,7 +417,7 @@@
  
                # x86 kernel build
                ipfiremake linux                        KCFG=""
+               ipfiremake backports                    KCFG=""
                ipfiremake cryptodev                    KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
@@@ -426,11 -428,13 +428,13 @@@
        armv5tel)
                # arm-rpi (Raspberry Pi) kernel build
                ipfiremake linux                        KCFG="-rpi"
+               ipfiremake backports                    KCFG="-rpi"
                ipfiremake cryptodev                    KCFG="-rpi"
                ipfiremake linux-initrd                 KCFG="-rpi"
  
                # arm multi platform (Panda, Wandboard ...) kernel build
                ipfiremake linux                        KCFG="-multi"
+               ipfiremake backports                    KCFG="-multi"
                ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
                ipfiremake igb                          KCFG="-multi"
@@@ -439,6 -443,7 +443,7 @@@
  
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                ipfiremake linux                        KCFG="-kirkwood"
+               ipfiremake backports                    KCFG="-kirkwood"
                ipfiremake cryptodev                    KCFG="-kirkwood"
                ipfiremake e1000e                       KCFG="-kirkwood"
                ipfiremake igb                          KCFG="-kirkwood"
@@@ -731,7 -736,6 +736,7 @@@
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri
 +  ipfiremake libsrtp
    ipfiremake asterisk
    ipfiremake lcr
    ipfiremake usb_modeswitch

diff --combined src/squid-accounting/acct-lib.pl
index 826be26b148234aaa0263fd2187caf848bb5a549,bac1e3632fb3f2b4b0cdec4804179884e0b210de..7969a5023908b9c3e5dc402e57d5f5b45f1a618b
--- 1/src/squid-accounting/acct-lib.pl
--- 2/src/squid-accounting/acct-lib.pl
+++ b/src/squid-accounting/acct-lib.pl
@@@ -337,12 -337,7 +337,12 @@@ sub getmonth
                my $monat=$_[0]-1 if($_[0]);
                my $tag=1;
                my $time1=timelocal(0,0,0,$tag,$monat,$jahr);
 -              my $time2=timelocal(0,0,0,$tag,($monat+1),$jahr);
 +              my $time2=0;
 +              if (($monat+1) == 12){
 +                      $time2=timelocal(0,0,0,$tag,0,$jahr+1);
 +              }else{
 +                      $time2=timelocal(0,0,0,$tag,$monat+1,$jahr);
 +              }
                --$time2;
                return ($time1,$time2);
  }
@@@ -392,6 -387,7 +392,7 @@@ sub pdf2 
        my @billar              = @{$_[0]}; #DATA from sendbill (just host/values)
        my $month               = $_[1];
        $month                  = '0'.$month if $month < 10;
+       $month                  = '12' if $month == 0;
        my $year                = $_[2];
        my $mwst                = $_[3];
        my @address_cust= @{$_[4]}; #Array which contains customer and hoster adresses and some additional info from billgroup