varnish-modules: update for 6.6.0, cleanup

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: varnish-modules: update for 6.6.0, cleanup
From: Tobias Nygren <tnn%NetBSD.org@localhost>
Date: Wed, 23 Jun 2021 22:11:34 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Jun 24 00:11:34 2021 +0200
Changeset:	54f1f06a97de8839b4e40bbab7925452ebceed51

Modified Files:
	varnish-modules/Makefile
	varnish-modules/PLIST
	varnish-modules/distinfo
Added Files:
	varnish-modules/patches/patch-src_vmod__tcp.c
Removed Files:
	varnish-modules/TODO
	varnish-modules/patches/patch-configure.ac-rst2man

Log Message:
varnish-modules: update for 6.6.0, cleanup

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=54f1f06a97de8839b4e40bbab7925452ebceed51

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 varnish-modules/Makefile                           | 22 +++++++-------------
 varnish-modules/PLIST                              | 10 ++++-----
 varnish-modules/TODO                               |  2 --
 varnish-modules/distinfo                           | 10 ++++-----
 varnish-modules/patches/patch-configure.ac-rst2man | 21 -------------------
 varnish-modules/patches/patch-src_vmod__tcp.c      | 24 ++++++++++++++++++++++
 6 files changed, 41 insertions(+), 48 deletions(-)

diffs:
diff --git a/varnish-modules/Makefile b/varnish-modules/Makefile
index d5bda698fc..fac5d14454 100644
--- a/varnish-modules/Makefile
+++ b/varnish-modules/Makefile
@@ -1,11 +1,9 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	varnish-modules
-DISTNAME=	0.12.1
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
+DISTNAME=	varnish-modules-0.18.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=varnish/}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	sasha-pkgsrc%arcocene.org@localhost
@@ -13,18 +11,17 @@ HOMEPAGE=	https://github.com/varnish/varnish-modules/
 COMMENT=	Collection of modules extending Varnish VCL
 LICENSE=	2-clause-bsd
 
-WRKSRC=	${WRKDIR}/varnish-modules-0.12.1
+#WRKSRC=	${WRKDIR}/varnish-modules-0.12.1
 
-DEPENDS+=	varnish>=4.1.4:../../wip/varnish
 BUILD_DEPENDS+=	${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
 
-USE_LANGUAGES=		c
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-USE_TOOLS+=		automake
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		aclocal autoconf automake gmake pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
+CONFIGURE_ENV+=		RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
+
+# not signed/unsigned char safe
+BUILDLINK_TRANSFORM+=	rm:-Werror
 
 pre-configure:
 	cd ${WRKSRC} && ./bootstrap
@@ -32,8 +29,3 @@ pre-configure:
 .include "../../wip/varnish/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mgcc)
-DEPENDS+=       ${_GCC_DEPENDENCY}
-.endif
diff --git a/varnish-modules/PLIST b/varnish-modules/PLIST
index 34f9df2e23..d02589b892 100644
--- a/varnish-modules/PLIST
+++ b/varnish-modules/PLIST
@@ -1,21 +1,21 @@
 @comment $NetBSD$
+lib/varnish/vmods/libvmod_accept.la
 lib/varnish/vmods/libvmod_bodyaccess.la
-lib/varnish/vmods/libvmod_cookie.la
 lib/varnish/vmods/libvmod_header.la
 lib/varnish/vmods/libvmod_saintmode.la
-lib/varnish/vmods/libvmod_softpurge.la
+lib/varnish/vmods/libvmod_str.la
 lib/varnish/vmods/libvmod_tcp.la
 lib/varnish/vmods/libvmod_var.la
 lib/varnish/vmods/libvmod_vsthrottle.la
 lib/varnish/vmods/libvmod_xkey.la
+man/man3/vmod_accept.3
 man/man3/vmod_bodyaccess.3
-man/man3/vmod_cookie.3
 man/man3/vmod_header.3
 man/man3/vmod_saintmode.3
-man/man3/vmod_softpurge.3
+man/man3/vmod_str.3
 man/man3/vmod_tcp.3
 man/man3/vmod_var.3
 man/man3/vmod_vsthrottle.3
 man/man3/vmod_xkey.3
 share/doc/varnish-modules/LICENSE
-share/doc/varnish-modules/README.rst
+share/doc/varnish-modules/README.md
diff --git a/varnish-modules/TODO b/varnish-modules/TODO
deleted file mode 100644
index 88df6d45c2..0000000000
--- a/varnish-modules/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-This package has known vulnerabilities, please investigate and fix if possible:
-  CVE-2021-28543
diff --git a/varnish-modules/distinfo b/varnish-modules/distinfo
index 7907225ca6..62253a2fdf 100644
--- a/varnish-modules/distinfo
+++ b/varnish-modules/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (varnish-modules/0.12.1.zip) = 7512a6c9cc41c5bc01b1f6bb6aa87c50ad556893
-RMD160 (varnish-modules/0.12.1.zip) = 05380db0236b0db54e122844abe7df30db724b30
-SHA512 (varnish-modules/0.12.1.zip) = 07a2e01adc0dcaea6a96c3f8b8cef9aa24296ae4fca7f6491e5e6db26c5e9e009baf7f6eccd0ab4c24cfea91b465bd81ce6b9f41cab6c7a27cf467ee28810098
-Size (varnish-modules/0.12.1.zip) = 110195 bytes
-SHA1 (patch-configure.ac-rst2man) = 91947f4d74c9f97c482512bd3c6e67e35245ac07
+SHA1 (varnish-modules/varnish-modules-0.18.0.tar.gz) = ff070e6529cbe53974d42a0ac309631cc6516079
+RMD160 (varnish-modules/varnish-modules-0.18.0.tar.gz) = f0a0937741c97801f0cace9d6f0433fc4a60a4cf
+SHA512 (varnish-modules/varnish-modules-0.18.0.tar.gz) = a6a56ea371ebe8183926e5411f8b4ee7bb47cc45464cfffb2f4a8d17b04b156889bcbe254845058ded2e712ed21ee73e6e98eb29f72d922f1fbbfc1cc506d9f1
+Size (varnish-modules/varnish-modules-0.18.0.tar.gz) = 53830 bytes
+SHA1 (patch-src_vmod__tcp.c) = c7c1d8803c281b55c01d562f7f7d11cf65237973
diff --git a/varnish-modules/patches/patch-configure.ac-rst2man b/varnish-modules/patches/patch-configure.ac-rst2man
deleted file mode 100644
index b2cae82754..0000000000
--- a/varnish-modules/patches/patch-configure.ac-rst2man
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-Allow passing in location of rst2man.
-
---- configure.ac.orig	2017-05-24 08:46:02.000000000 +0000
-+++ configure.ac
-@@ -18,7 +18,13 @@ AX_PTHREAD(,[AC_MSG_ERROR([Could not con
- AX_CODE_COVERAGE
- 
- # Check for rst utilities
--AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
-+AC_ARG_WITH([rst2man],
-+  AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]),
-+  [RST2MAN="$withval"],
-+  AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [no]))
-+if test "x$RST2MAN" = "xno"; then
-+  AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
-+fi
- if test "x$RST2MAN" = "xno"; then
- 	AC_MSG_WARN([rst2man not found - not building man pages])
- 	RST2MAN=: # no-op
diff --git a/varnish-modules/patches/patch-src_vmod__tcp.c b/varnish-modules/patches/patch-src_vmod__tcp.c
new file mode 100644
index 0000000000..b795a3372f
--- /dev/null
+++ b/varnish-modules/patches/patch-src_vmod__tcp.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fix build on NetBSD
+
+--- src/vmod_tcp.c.orig	2021-03-16 10:53:49.000000000 +0000
++++ src/vmod_tcp.c
+@@ -46,6 +46,17 @@
+ 
+ #define TCP_CA_NAME_MAX 16
+ 
++#ifdef __NetBSD__
++#define tcpi_lost __tcpi_lost
++#define tcpi_retrans __tcpi_retrans
++#define tcpi_pmtu __tcpi_pmtu
++#define tcpi_advmss __tcpi_advmss
++#define tcpi_reordering __tcpi_reordering
++#ifndef SOL_TCP
++#define SOL_TCP IPPROTO_TCP
++#endif
++#endif
++
+ /*
+  * Based on the information found here:
+  *   http://linuxgazette.net/136/pfeiffer.html
Prev by Date: varnish: include libvarnishapi dependencies in bl3
Next by Date: varnish-modules: more cleanup
Previous by Thread: varnish: include libvarnishapi dependencies in bl3
Next by Thread: varnish-modules: more cleanup
Indexes:
Home | Main Index | Thread Index | Old Index