From owner-svn-ports-all@freebsd.org Wed Sep 2 09:38:10 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1077B3D1EF1; Wed, 2 Sep 2020 09:38:10 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhJlP6gDyz4W7w; Wed, 2 Sep 2020 09:38:09 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7FBB8ABB; Wed, 2 Sep 2020 09:38:09 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0829c9pd084673; Wed, 2 Sep 2020 09:38:09 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0829c9lt084671; Wed, 2 Sep 2020 09:38:09 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202009020938.0829c9lt084671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 2 Sep 2020 09:38:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547350 - in head: net/gnu-dico net/hping security/gnomint/files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head: net/gnu-dico net/hping security/gnomint/files X-SVN-Commit-Revision: 547350 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 09:38:10 -0000 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);