From nobody Fri Sep 09 07:04:31 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MP6Rz2vdQz4bxKl; Fri, 9 Sep 2022 07:04:31 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MP6Rz2VH4z3DM1; Fri, 9 Sep 2022 07:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662707071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UB96jVL/T152sUiGDC4uMVIrAJQhk+6HYzvAS1ePXZE=; b=IWeDAqxFtSWB0jMHRzyz4I69ZcBjMWJc88z4mpPIYEsMtruEHPQuVMJIby3JAU1ODGrbsc 3AaucmiXFPuqplGRwDCgF95XZGVbF0EcUbSPTd6YjXs00A20cgD5nQBwipWFNX2ulCypjl ss/BeRiBPL3Rco5nV2eqO3R6Zo8JtCATA53iQtOpuG/GMtqxuWYKClKu1V4cWH1vJqSe/J JmJ7P6BJxupfp5DhmGeDlAlnz74geZIUFxLLShGYUb1uhU1VmgArpg/T0OhHX0BsRX/9L/ c+ySv6ljLg5ao3kiRZJtBkcXhZZyGGpIrIyTqoHBfhJgR9d9xY7T0YORqYP7zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MP6Rz1bmsz17Xc; Fri, 9 Sep 2022 07:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28974VpX080126; Fri, 9 Sep 2022 07:04:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28974VFQ080125; Fri, 9 Sep 2022 07:04:31 GMT (envelope-from git) Date: Fri, 9 Sep 2022 07:04:31 GMT Message-Id: <202209090704.28974VFQ080125@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: bf93a81b2712 - main - net-mgmt/ipcad: touchup and build fixes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf93a81b271271aa6c62f52adeb9ab3ce2461e13 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662707071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UB96jVL/T152sUiGDC4uMVIrAJQhk+6HYzvAS1ePXZE=; b=px4vWx4AG5EI8Zn8R81dScCcXvHBQqF1NJ2G61npX65yreZkha8Er5rqM5TX6cteBFTaDW F/+0STDB99+3ZqIH52nkX92eJgWxAhxU1Osbi6HcbRO7IZZh4uGU5Daw6X8tNbBBY4ciMz Rg3CLhycjkh8xQnBgJmKmUhKoOFPSaaNV54kk037ln8cIDoeFulOl/alydkAd6cv6Qx9xl n9CQd7YqZMnE++41mjn+FS/1BS6Z4eQVn7Ev3zWIW7bD1FNxEExjaS/oWdPt3UibHKs5ce qBS2h1QwN7psL5p3fOz9IJ44Xrfx04kh/CwFXPznt+6GsP/6lUdEZWTtGPoyug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662707071; a=rsa-sha256; cv=none; b=Z/OI2l5tL53+DjLqS4pDL4oZd0Zozi1pvyWT6epHkzEoIIgmEX9kWudtCq/L0y81ugPiIv iuy+WtNh5jnHkOR6uzn/gmrqoLf2m7pJA4bBlBk+GXsNydKu2ZFbBjNGpmDEN7vRMEf1fD V/DyiU2flA4eLutkaJhNHLEn5ToJEKKLa+6atwJUYWI+wn5F5T4l2ixjZfMwmPj/GaeQqX fQaMi3X9yvQQSRcGlJmoF+4bYXirWUbXbFWNL+MlUlLRswRfZIZV+sTYx+RIAHKZVF+vRR ka0BFlIsXCHMFYKzxew1T3XO6sAcyG+9gNVeSK5y+t3fMicxkPf+kZUpkJZzPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf93a81b271271aa6c62f52adeb9ab3ce2461e13 commit bf93a81b271271aa6c62f52adeb9ab3ce2461e13 Author: Robert Clausecker AuthorDate: 2022-07-30 04:15:06 +0000 Commit: Mikael Urankar CommitDate: 2022-09-09 06:55:49 +0000 net-mgmt/ipcad: touchup and build fixes - fix wrong test(1) option in bpf configure test preventing configuration to succeed when no bpf(4) device is present on the system - add a missing include to avoid undefined behaviour through homegrown artisanal offsetof(3) macro - set LICENSE PR: 265512 Approved by: vlm@lionet.info (maintainer timeout) --- net-mgmt/ipcad/Makefile | 5 ++++- net-mgmt/ipcad/files/patch-configure | 22 ++++++++++++++++++++++ net-mgmt/ipcad/files/patch-headers.h | 10 ++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/net-mgmt/ipcad/Makefile b/net-mgmt/ipcad/Makefile index dcddcc698471..ca3aeba9857a 100644 --- a/net-mgmt/ipcad/Makefile +++ b/net-mgmt/ipcad/Makefile @@ -1,6 +1,6 @@ PORTNAME= ipcad PORTVERSION= 3.7.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ http://ipcad.sourceforge.net/ \ @@ -10,6 +10,9 @@ MAINTAINER= vlm@lionet.info COMMENT= IP accounting daemon with Cisco-like RSH and NetFlow export WWW= http://ipcad.sourceforge.net/ +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + USE_RC_SUBR= ipcad SUB_FILES= pkg-message diff --git a/net-mgmt/ipcad/files/patch-configure b/net-mgmt/ipcad/files/patch-configure new file mode 100644 index 000000000000..459ced6fee0b --- /dev/null +++ b/net-mgmt/ipcad/files/patch-configure @@ -0,0 +1,22 @@ +--- configure.orig 2022-07-30 04:13:00 UTC ++++ configure +@@ -5797,15 +5797,15 @@ if test ! -z "$with_psrc" ; then + PSRC="$withval" + elif test -c /dev/bpf0 ; then + PSRC=bpf +-elif test -a /usr/include/pcap.h; then ++elif test -f /usr/include/pcap.h; then + PSRC=pcap +-elif test -a /usr/include/pcap/pcap.h; then ++elif test -f /usr/include/pcap/pcap.h; then + PSRC=pcap + CFLAGS="$CFLAGS -I/usr/include/pcap" + CPPFLAGS="$CPPFLAGS -I/usr/include/pcap" +-elif test -a ${ac_default_prefix}/include/pcap.h; then ++elif test -f ${ac_default_prefix}/include/pcap.h; then + PSRC=pcap +-elif test -a ${ac_default_prefix}/include/pcap/pcap.h; then ++elif test -f ${ac_default_prefix}/include/pcap/pcap.h; then + CFLAGS="$CFLAGS -I${ac_default_prefix}/include/pcap" + CPPFLAGS="$CPPFLAGS -I${ac_default_prefix}/include/pcap" + PSRC=pcap diff --git a/net-mgmt/ipcad/files/patch-headers.h b/net-mgmt/ipcad/files/patch-headers.h new file mode 100644 index 000000000000..89b49cf79727 --- /dev/null +++ b/net-mgmt/ipcad/files/patch-headers.h @@ -0,0 +1,10 @@ +--- headers.h.orig 2022-07-30 04:07:13 UTC ++++ headers.h +@@ -32,6 +32,7 @@ + #define __need_sig_atomic_t 1 + #endif + ++#include + #include + #include + #include