svn commit: r547350 - in head: net/gnu-dico net/hping security/gnomint/files

[Alexey Dokuchaev]

Author: danfe
Date: Wed Sep  2 09:38:08 2020
New Revision: 547350
URL: https://svnweb.freebsd.org/changeset/ports/547350

Log:
  Ensure that there is only one variable definition per each object, as
  the C (and C++) standards mandated for years and compilers started to
  enforce as of recently (Clang 11, GCC 10).
  
  Reported by:	pkg-fallout

Added:
  head/security/gnomint/files/patch-src_ca__file.h   (contents, props changed)
Modified:
  head/net/gnu-dico/Makefile
  head/net/hping/Makefile

Modified: head/net/gnu-dico/Makefile
==============================================================================
--- head/net/gnu-dico/Makefile	Wed Sep  2 09:36:45 2020	(r547349)
+++ head/net/gnu-dico/Makefile	Wed Sep  2 09:38:08 2020	(r547350)
@@ -59,6 +59,8 @@ post-patch:
 		-e 's/python-config/$${PYTHON_CONFIG}/' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} 's/mergesort/xmergesort/' ${WRKSRC}/lib/mergesort.c
+	@${REINPLACE_CMD} -E '/(dico_markup_list|text_udb_def);/s,^,extern ,' \
+		${WRKSRC}/include/dico/markup.h ${WRKSRC}/dicod/dicod.h
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/dicod.conf ${STAGEDIR}${PREFIX}/etc/dicod.conf.sample

Modified: head/net/hping/Makefile
==============================================================================
--- head/net/hping/Makefile	Wed Sep  2 09:36:45 2020	(r547349)
+++ head/net/hping/Makefile	Wed Sep  2 09:38:08 2020	(r547350)
@@ -31,6 +31,12 @@ OPTIONS_DEFINE=	DOCS
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendip.c
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^struct ars_layer_info ars_linfo/d' \
+		${WRKSRC}/ars.h
+	@${REINPLACE_CMD} -e '/^volatile struct delaytable_element/d' \
+		${WRKSRC}/hping2.h
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hping2 ${STAGEDIR}${PREFIX}/sbin/hping
 	${INSTALL_MAN} ${WRKSRC}/docs/hping2.8 \

Added: head/security/gnomint/files/patch-src_ca__file.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/gnomint/files/patch-src_ca__file.h	Wed Sep  2 09:38:08 2020	(r547350)
@@ -0,0 +1,31 @@
+--- src/ca_file.h.orig	2010-05-31 21:01:37 UTC
++++ src/ca_file.h
+@@ -75,8 +75,7 @@ enum {CA_FILE_CA_COLUMN_ID=0,
+       CA_FILE_CA_COLUMN_DN=3,
+       CA_FILE_CA_COLUMN_PARENT_DN=4,
+       CA_FILE_CA_COLUMN_PEM=5,
+-      CA_FILE_CA_COLUMN_NUMBER=6}
+-        CaFileCAColumns;
++      CA_FILE_CA_COLUMN_NUMBER=6};
+ 
+ enum {CA_FILE_CERT_COLUMN_ID=0,
+       CA_FILE_CERT_COLUMN_IS_CA=1,
+@@ -90,16 +89,14 @@ enum {CA_FILE_CERT_COLUMN_ID=0,
+       CA_FILE_CERT_COLUMN_DN=9,
+       CA_FILE_CERT_COLUMN_PARENT_DN=10,
+       CA_FILE_CERT_COLUMN_PARENT_ROUTE=11,
+-      CA_FILE_CERT_COLUMN_NUMBER=12}
+-        CaFileCertColumns;
++      CA_FILE_CERT_COLUMN_NUMBER=12};
+ 
+ enum {CA_FILE_CSR_COLUMN_ID=0,
+       CA_FILE_CSR_COLUMN_SUBJECT=1,
+       CA_FILE_CSR_COLUMN_PRIVATE_KEY_IN_DB=2,
+       CA_FILE_CSR_COLUMN_PEM=3,
+       CA_FILE_CSR_COLUMN_PARENT_ID=4,
+-      CA_FILE_CSR_COLUMN_NUMBER=5}
+-        CaFileCSRColumns;
++      CA_FILE_CSR_COLUMN_NUMBER=5};
+ 
+ 
+ gboolean ca_file_foreach_ca (CaFileCallbackFunc func, gpointer userdata);