[arch-commits] Commit in ipv6calc/repos/community-x86_64 (5 files)
Konstantin Gizdov
kgizdov at gemini.archlinux.org
Thu Aug 12 08:26:12 UTC 2021
Date: Thursday, August 12, 2021 @ 08:26:11
Author: kgizdov
Revision: 997502
archrelease: copy trunk to community-x86_64
Added:
ipv6calc/repos/community-x86_64/PKGBUILD
(from rev 997501, ipv6calc/trunk/PKGBUILD)
ipv6calc/repos/community-x86_64/anti-dos_test.patch
(from rev 997501, ipv6calc/trunk/anti-dos_test.patch)
Deleted:
ipv6calc/repos/community-x86_64/PKGBUILD
ipv6calc/repos/community-x86_64/anti-dos_test.patch
ipv6calc/repos/community-x86_64/cache_lru_limit.patch
-----------------------+
PKGBUILD | 123 +++++++++++++++++++++++-------------------------
anti-dos_test.patch | 43 +++++++---------
cache_lru_limit.patch | 25 ---------
3 files changed, 80 insertions(+), 111 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-08-12 08:26:05 UTC (rev 997501)
+++ PKGBUILD 2021-08-12 08:26:11 UTC (rev 997502)
@@ -1,63 +0,0 @@
-# Maintainer: Konstantin Gizdov <arch at kge dot pw>
-# Co-Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-# Contributor: mortzu
-
-pkgname=ipv6calc
-pkgver=2.2.0
-pkgrel=2
-pkgdesc='Small utility to manipulate, convert and calculate (more than) IPv6 addresses'
-url='https://www.deepspace6.net/projects/ipv6calc.html'
-license=('GPL2')
-arch=('x86_64')
-# See https://www.deepspace6.net/projects/ipv6calc.html#idm140634407144416
-makedepends=('geoip')
-optdepends=('geoip: for country GeoIP support'
- 'geoip-database-extra: for city-level GeoIP support'
- 'perl: to run the provided scripts')
-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'
- 'SKIP'
- '59a84dfb8bef98fc801f374bf3f1c19adb5d8cda1a2233eb3366a71c6b1fd154'
- '28a76581cdadecd73d2179be6fdef1e45349a809aa72e35c037f8b6b9c746d18'
- '22a9897ca52a46a896b440cf8a441b72579730d72759cac1edd2af1a8f33a4ca')
-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
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
-
- ./configure \
- --prefix="/usr" \
- --libdir="/usr/lib" \
- --datarootdir="/usr/share" \
- --enable-shared \
- --enable-bundled-md5 \
- --enable-geoip \
- --with-geoip-dynamic=yes
- make
-}
-
-check() {
- cd "${pkgname}-${pkgver}"
-
- make test-minimal
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ipv6calc/repos/community-x86_64/PKGBUILD (from rev 997501, ipv6calc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-08-12 08:26:11 UTC (rev 997502)
@@ -0,0 +1,60 @@
+# Maintainer: Konstantin Gizdov <arch at kge dot pw>
+# Co-Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: mortzu
+
+pkgname=ipv6calc
+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')
+arch=('x86_64')
+# See https://www.deepspace6.net/projects/ipv6calc.html#idm140634407144416
+makedepends=('geoip')
+optdepends=('geoip: for country GeoIP support'
+ 'geoip-database-extra: for city-level GeoIP support'
+ 'perl: to run the provided scripts')
+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"
+ 'anti-dos_test.patch')
+sha256sums=('c73e1488a344d5ce3acdd009fb48068eec1bdf7562698011bdbbc7aaf33aa8f7'
+ 'SKIP'
+ '59a84dfb8bef98fc801f374bf3f1c19adb5d8cda1a2233eb3366a71c6b1fd154'
+ '032636601c1b792e95e2da3de048fac5040fb06e5f7235021a7ee2f5012fdde9')
+validpgpkeys=('AAB38CB797C750C778C608C6DDEB141DF7380F61') # Peter Bieringer (Code Signing Key 2013) <code at bieringer.de>
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/anti-dos_test.patch"
+
+ autoconf
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+
+ ./configure \
+ --prefix="/usr" \
+ --libdir="/usr/lib" \
+ --datarootdir="/usr/share" \
+ --enable-shared \
+ --enable-bundled-md5 \
+ --enable-geoip \
+ --with-geoip-dynamic=yes
+ make
+}
+
+check() {
+ cd "${pkgname}-${pkgver}"
+
+ make test-minimal
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: anti-dos_test.patch
===================================================================
--- anti-dos_test.patch 2021-08-12 08:26:05 UTC (rev 997501)
+++ anti-dos_test.patch 2021-08-12 08:26:11 UTC (rev 997502)
@@ -1,23 +0,0 @@
-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 @@
-
- output=$(./ipv6calcweb.cgi)
- rc=$?
-- if [ $rc -ne 1 ];then
-+ if [[ $rc -lt 0 || $rc -gt 1 ]];then
- 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 @@
- 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
- echo "ERROR : Anti-DoS test output not expected"
- echo "$output" | head -5
- exit 1
Copied: ipv6calc/repos/community-x86_64/anti-dos_test.patch (from rev 997501, ipv6calc/trunk/anti-dos_test.patch)
===================================================================
--- anti-dos_test.patch (rev 0)
+++ anti-dos_test.patch 2021-08-12 08:26:11 UTC (rev 997502)
@@ -0,0 +1,20 @@
+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=$(perl -w $perlopt ipv6calcweb.cgi)
+ rc=$?
+- if [ $rc -ne 1 ];then
++ if [[ $rc -lt 0 || $rc -gt 1 ]];then
+ echo "ERROR : Anti-DoS test reports unexpected error: rc=$rc"
+ echo "$output"
+ exit 1
+@@ -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
+ 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:26:05 UTC (rev 997501)
+++ cache_lru_limit.patch 2021-08-12 08:26:11 UTC (rev 997502)
@@ -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;
More information about the arch-commits
mailing list