sync ports with The Matrix

security/pivy/Makefile

@@ -15,10 +15,14 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		c edit crypto json-c pcsclite util z
 
-MODULES =		gnu
-MODGNU_CONFIG_GUESS_DIRS = openssh
+CONFIGURE_STYLE =	autoconf
+AUTOCONF_VERSION =	2.71
+AUTOCONF_DIR =		${WRKDIST}/openssh
+MODGNU_CONFIG_GUESS_DIRS = ${WRKDIST}/openssh
+WRKCONF =		${WRKDIST}/openssh
 
-LIB_DEPENDS =		security/pcsc-lite devel/json-c
+LIB_DEPENDS =		security/pcsc-lite \
+			devel/json-c
 RUN_DEPENDS =		security/ccid
 
 USE_GMAKE =		Yes
@@ -33,6 +37,10 @@ MAKE_FLAGS =		CC="${CC}" \
 post-extract:
 	rm -Rf ${WRKDIST}/libressl
 
+do-configure:
+	# the configure script is run from ${WRKSRC}/Makefile,
+	# overridden here to avoid running it twice
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pivy
 	${INSTALL_DATA} ${WRKSRC}/README.adoc ${PREFIX}/share/doc/pivy

security/pivy/patches/patch-openssh_configure_ac

@@ -0,0 +1,15 @@
+Fix zlib version check for 1.3 and future version. 
+https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621
+
+Index: openssh/configure.ac
+--- openssh/configure.ac.orig
++++ openssh/configure.ac
+@@ -1464,7 +1464,7 @@ else
+ 	[[
+ 	int a=0, b=0, c=0, d=0, n, v;
+ 	n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d);
+-	if (n != 3 && n != 4)
++	if (n < 1)
+ 		exit(1);
+ 	v = a*1000000 + b*10000 + c*100 + d;
+ 	fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v);