From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Thu, 14 Nov 2019 18:03:46 +0000 (+0100)
Subject: calamaris: Bug fix for proxy reports staying empty after Core 136 upgrade
X-Git-Tag: v2.23-core139~3^2~34
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=ee506d5027783757a775e3aad6982d1698719023

calamaris: Bug fix for proxy reports staying empty after Core 136 upgrade

After upgrading to Core 136, 'calamaris' "Proxy reports" stayed empty.
GUI always show "No reports available".

Tested manually on console stops and throws an error:

...
root@ipfire: ~ # /usr/bin/perl /var/ipfire/proxy/calamaris/bin/mkreport
1 0 2019 8 10 2019 -d 10 -P 30 -t 10 -D 2 -u -r -1 -R 100 -s
Can't use 'defined(%hash)' (Maybe you should just omit the defined()?)
at /var/ipfire/proxy/calamaris/bin/calamaris line 2609.
...

Line 2609 was changed and reports are built again.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/calamaris b/lfs/calamaris
index 2022f84f86..32858526a7 100644
--- a/lfs/calamaris
+++ b/lfs/calamaris
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -70,6 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/calamaris/01_calamaris_cant_use_defined_hash.patch
+
 	cd $(DIR_APP) && cp -f calamaris $(DIR_SRC)/config/calamaris/mkreport \
 			/var/ipfire/proxy/calamaris/bin/
 	chmod 755 /var/ipfire/proxy/calamaris/bin/{calamaris,mkreport}
diff --git a/src/patches/calamaris/01_calamaris_cant_use_defined_hash.patch b/src/patches/calamaris/01_calamaris_cant_use_defined_hash.patch
new file mode 100644
index 0000000000..64d66276c2
--- /dev/null
+++ b/src/patches/calamaris/01_calamaris_cant_use_defined_hash.patch
@@ -0,0 +1,12 @@
+diff U3 a/calamaris b/calamaris
+--- a/calamaris	Sun Jun  6 18:26:14 2004
++++ b/calamaris	Wed Nov 13 19:59:15 2019
+@@ -2606,7 +2606,7 @@
+ 	    100, 100 * $tcp_hit / $tcp );
+   }
+   outstop(10);
+-  if ( defined(%tcp_content) ) {
++  if (%tcp_content) {
+     outstart(11);
+     if ( $tcp == 0 ) {
+       outline( 11, 'no matching requests' );