[arch-commits] Commit in ipv6calc/trunk (3 files)

[Konstantin Gizdov]

    Date: Thursday, August 12, 2021 @ 08:26:05
  Author: kgizdov
Revision: 997501

upgpkg: ipv6calc 3.2.0-1

Modified:
  ipv6calc/trunk/PKGBUILD
  ipv6calc/trunk/anti-dos_test.patch
Deleted:
  ipv6calc/trunk/cache_lru_limit.patch

-----------------------+
 PKGBUILD              |   11 ++++-------
 anti-dos_test.patch   |   17 +++++++----------
 cache_lru_limit.patch |   25 -------------------------
 3 files changed, 11 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-12 08:21:19 UTC (rev 997500)
+++ PKGBUILD	2021-08-12 08:26:05 UTC (rev 997501)
@@ -3,8 +3,8 @@
 # Contributor: mortzu
 
 pkgname=ipv6calc
-pkgver=2.2.0
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc='Small utility to manipulate, convert and calculate (more than) IPv6 addresses'
 url='https://www.deepspace6.net/projects/ipv6calc.html'
 license=('GPL2')
@@ -17,18 +17,15 @@
 checkdepends=('perl-digest-sha1' 'perl-uri' 'perl-html-parser' 'perl-proc-processtable')
 source=("ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${pkgname}-${pkgver}.tar.gz"{,.asc}
         "ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/CODE-GPG-KEY-bieringer.de-2013"
-        'cache_lru_limit.patch'
         'anti-dos_test.patch')
-sha256sums=('1935352f6171b07f18ce0487ee95ffcc006ea3f653f7cba564d2d8e135f04ca1'
+sha256sums=('c73e1488a344d5ce3acdd009fb48068eec1bdf7562698011bdbbc7aaf33aa8f7'
             'SKIP'
             '59a84dfb8bef98fc801f374bf3f1c19adb5d8cda1a2233eb3366a71c6b1fd154'
-            '28a76581cdadecd73d2179be6fdef1e45349a809aa72e35c037f8b6b9c746d18'
-            '22a9897ca52a46a896b440cf8a441b72579730d72759cac1edd2af1a8f33a4ca')
+            '032636601c1b792e95e2da3de048fac5040fb06e5f7235021a7ee2f5012fdde9')
 validpgpkeys=('AAB38CB797C750C778C608C6DDEB141DF7380F61') # Peter Bieringer (Code Signing Key 2013) <code at bieringer.de>
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/cache_lru_limit.patch"
   patch -Np1 -i "${srcdir}/anti-dos_test.patch"
 
   autoconf

Modified: anti-dos_test.patch
===================================================================
--- anti-dos_test.patch	2021-08-12 08:21:19 UTC (rev 997500)
+++ anti-dos_test.patch	2021-08-12 08:26:05 UTC (rev 997501)
@@ -1,9 +1,9 @@
-diff --color -aur ipv6calc-2.2.0-old/ipv6calcweb/test_ipv6calcweb.sh ipv6calc-2.2.0-new/ipv6calcweb/test_ipv6calcweb.sh
---- ipv6calc-2.2.0-old/ipv6calcweb/test_ipv6calcweb.sh	2020-09-01 19:04:28.447748048 +0300
-+++ ipv6calc-2.2.0-new/ipv6calcweb/test_ipv6calcweb.sh	2020-09-01 19:06:15.351080494 +0300
-@@ -194,7 +194,7 @@
+diff --color -aur --color ipv6calc-3.2.0-old/ipv6calcweb/test_ipv6calcweb.sh ipv6calc-3.2.0-new/ipv6calcweb/test_ipv6calcweb.sh
+--- ipv6calc-3.2.0-old/ipv6calcweb/test_ipv6calcweb.sh	2021-08-12 11:14:36.825444667 +0300
++++ ipv6calc-3.2.0-new/ipv6calcweb/test_ipv6calcweb.sh	2021-08-12 11:17:24.962118731 +0300
+@@ -199,7 +199,7 @@
  
- 	output=$(./ipv6calcweb.cgi)
+ 	output=$(perl -w $perlopt ipv6calcweb.cgi)
  	rc=$?
 -	if [ $rc -ne 1 ];then
 +	if [[ $rc -lt 0 || $rc -gt 1 ]];then
@@ -10,14 +10,11 @@
  		echo "ERROR : Anti-DoS test reports unexpected error: rc=$rc"
  		echo "$output"
  		exit 1
-diff --color -aur ipv6calc-2.2.0-old/ipv6calcweb/test_ipv6calcweb.sh ipv6calc-2.2.0-new/ipv6calcweb/test_ipv6calcweb.sh
---- ipv6calc-2.2.0-old/ipv6calcweb/test_ipv6calcweb.sh	2020-09-01 19:14:36.081076286 +0300
-+++ ipv6calc-2.2.0-new/ipv6calcweb/test_ipv6calcweb.sh	2020-09-01 19:15:27.614409188 +0300
-@@ -202,6 +202,7 @@
+@@ -207,6 +207,7 @@
  	if echo "$output" | grep -q "System overloaded"; then
  		true
  	else
-+                exit 0  # ignore this case, fails because we have lots of CPUs on build machine
++		exit 0  # ignore this case, fails because we have lots of CPUs on build machine
  		echo "ERROR : Anti-DoS test output not expected"
  		echo "$output" | head -5
  		exit 1

Deleted: cache_lru_limit.patch
===================================================================
--- cache_lru_limit.patch	2021-08-12 08:21:19 UTC (rev 997500)
+++ cache_lru_limit.patch	2021-08-12 08:26:05 UTC (rev 997501)
@@ -1,25 +0,0 @@
-diff --color -aur ipv6calc-2.2.0-old/ipv6logconv/ipv6logconv.c ipv6calc-2.2.0-new/ipv6logconv/ipv6logconv.c
---- ipv6calc-2.2.0-old/ipv6logconv/ipv6logconv.c	2019-10-11 08:15:53.000000000 +0300
-+++ ipv6calc-2.2.0-new/ipv6logconv/ipv6logconv.c	2020-09-01 18:28:10.697766271 +0300
-@@ -58,7 +58,7 @@
- /* 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 --color -aur ipv6calc-2.2.0-old/ipv6logconv/ipv6logconv.h ipv6calc-2.2.0-new/ipv6logconv/ipv6logconv.h
---- ipv6calc-2.2.0-old/ipv6logconv/ipv6logconv.h	2019-10-11 08:15:53.000000000 +0300
-+++ ipv6calc-2.2.0-new/ipv6logconv/ipv6logconv.h	2020-09-01 18:28:24.011099499 +0300
-@@ -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;