From ec27a8e209b29e7b7fcb78eb1a8c854972720b51 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Jan 24 2020 06:41:03 +0000 Subject: add patch for BZ#1793903 --- diff --git a/ipv6calc-2.2.0-patch-8c7eea58.diff b/ipv6calc-2.2.0-patch-8c7eea58.diff new file mode 100644 index 0000000..2eeb2d3 --- /dev/null +++ b/ipv6calc-2.2.0-patch-8c7eea58.diff @@ -0,0 +1,27 @@ +diff --git a/ipv6logconv/ipv6logconv.c b/ipv6logconv/ipv6logconv.c +index f31f5be..4483757 100644 +--- a/ipv6logconv/ipv6logconv.c ++++ b/ipv6logconv/ipv6logconv.c +@@ -58,7 +58,7 @@ static void lineparser(const long int outputtype); + /* LRU cache */ + + #define CACHE_LRU_SIZE 200 +- ++int cache_lru_limit; + static int cache_lru_max = 0; + static int cache_lru_last = 0; + static char cache_lru_key_token[CACHE_LRU_SIZE][NI_MAXHOST]; +diff --git a/ipv6logconv/ipv6logconv.h b/ipv6logconv/ipv6logconv.h +index 946b042..9699e2c 100644 +--- a/ipv6logconv/ipv6logconv.h ++++ b/ipv6logconv/ipv6logconv.h +@@ -20,8 +20,7 @@ + #define DEBUG_ipv6logconv_general 0x00000001l + #define DEBUG_ipv6logconv_processing 0x00000002l + +-/* prototyping */ +-int cache_lru_limit; ++extern int cache_lru_limit; + + extern int feature_reg; + extern int feature_ieee; diff --git a/ipv6calc.spec b/ipv6calc.spec index bac6a0d..548e381 100644 --- a/ipv6calc.spec +++ b/ipv6calc.spec @@ -16,7 +16,7 @@ Summary: IPv6 address format change and calculation utility Name: ipv6calc Version: 2.2.0 -Release: 38%{?gittag}%{?dist} +Release: 39%{?gittag}%{?dist} URL: http://www.deepspace6.net/projects/%{name}.html License: GPLv2 %if 0%{?gitcommit:1} @@ -37,7 +37,7 @@ Provides: ipv6calc-libs = %{version}-%{release} Conflicts: ipv6calc-libs %endif - +Patch0: ipv6calc-2.2.0-patch-8c7eea58.diff # mod_ipv6calc related %{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}} @@ -195,6 +195,8 @@ By default the module is disabled. %setup -q %endif +%patch0 -p1 + %configure \ %{?enable_ip2location:--enable-ip2location} \ %{?enable_ip2location:--with-ip2location-dynamic --with-ip2location-headers-fallback} \ @@ -349,6 +351,9 @@ rm -rf %{buildroot} %changelog +* Fri Jan 24 2020 Peter Bieringer - 2.2.0-39 +- add patch for BZ#1793903 + * Sat Oct 12 2019 Peter Bieringer - 2.2.0-38 - new release 2.2.0