From nobody Fri Nov 10 04:39:01 2023 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 4SRR115lH4z500p5; Fri, 10 Nov 2023 04:39:01 +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 4SRR115Hk3z4Dql; Fri, 10 Nov 2023 04:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699591141; 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=SbDzz/dgEzlcYfJqmZZxwgpA7cRgOEmqUyJE4g50TZE=; b=akxnnbTX6WLsDHp5z9SvyWi2B3KsHxyTcgZQz1u9ZYUME/1F0PFOrSkqYwpR6S3Bi37mbt CS8zEmkPe02soJ4en+Vzh1bkb/678pKrf72ZUk3H0qvSRz8j0w2sg9iPLhYxIHSQwyE9ce UX+lPr9Zsl8oH7Ngq2HpkJg7M1ifTCtb1M15aLTxJ2FpRmmiJPR0Vk50zG7RgloV+0DeG0 k9VOzlDg2v8WJ+GfSCAdlD6Dj0MHNvkRivN3JTALSP0AdHrcUYC3OdCSKhPy9fBYvRMrNu 0hhOFHJViaoXy4xcFnk8JHavpGtdORfDvcETCsXErPsaJHw4kOuRsbcp62fkxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699591141; 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=SbDzz/dgEzlcYfJqmZZxwgpA7cRgOEmqUyJE4g50TZE=; b=p7zNjk/RdRJhM1BlNEpffmzHDDQcg8UJpUwtgiwF95yve9w6mpkNuX/1JfWiHe0YLNL2Fs IP9zMPqNLMPJgzLsXoROmt633YINokIu1j0AOoEfRGGCv4fMck340NUzxZ0ceuC4/TtLO9 yys8v94aW34YIoRpE++SYgRHyLZjFe/6TjLDdLtyipzlIT2zw2o6hKqJZe5YJu7mxoO5gf 96WgvCBK4WtN2BZvc4sDuKjbgdxi0txFUF5MTJTwB2rNYiinxnP4jNC6NDb3ho57qhALG/ U5HqE2tUoKnUkcX1hnBiTDpnih6VL6V5qjFcp2IHhmQjmF5NtzOaZzpD8L7hAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699591141; a=rsa-sha256; cv=none; b=mJTiV3sG2RlaflyfFI57M43g9LiI3LZRed3MD1qlYYzfci6ndOf9+Z39pCZne7iBsnPVBt jlLLsVuOY4emjAZtuH+V1qhVIJeS5wz+fT0LyfD/GpoD/xldjeUzfiuJZuhImvLSv7u+9B G24/Hn2e6aIPSCI0FuzOCCzYHdU1nEKqg53DgRYHLyMJm0JAbVrlpjk317hUP4MH99uQYj ljEjFdHgvwo04qtossgFoYWbpp757xA2Puw00+usq0k762/ODwEVF9CH3rFOhGNj1eAFY2 HWE8Ir52ls4/Kg8Jn8IGMUvOtIt+2uJ0CviQD9OJJkJQs7K2WvsUjEFLaJpooQ== 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 4SRR114LP1zksM; Fri, 10 Nov 2023 04:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA4d1ZD068053; Fri, 10 Nov 2023 04:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA4d1Tm068050; Fri, 10 Nov 2023 04:39:01 GMT (envelope-from git) Date: Fri, 10 Nov 2023 04:39:01 GMT Message-Id: <202311100439.3AA4d1Tm068050@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 1b319a6f2949 - main - security/aide: Update to 0.18.6 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: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b319a6f2949e5b855152e9b1120f534ef022eba Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b319a6f2949e5b855152e9b1120f534ef022eba commit 1b319a6f2949e5b855152e9b1120f534ef022eba Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-11-10 04:35:34 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-11-10 04:38:18 +0000 security/aide: Update to 0.18.6 - Add libacl support - Add e2fsprogs - Remove obsolete patch file PR: 275004 Approved by: cy --- security/aide/Makefile | 13 ++++++++++--- security/aide/distinfo | 6 +++--- security/aide/files/patch-Makefile.in | 11 +++++++++++ security/aide/files/patch-src_commandconf.c | 13 ------------- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/security/aide/Makefile b/security/aide/Makefile index e6b9fb822647..4dc134f60213 100644 --- a/security/aide/Makefile +++ b/security/aide/Makefile @@ -1,5 +1,5 @@ PORTNAME= aide -PORTVERSION= 0.17.4 +PORTVERSION= 0.18.6 CATEGORIES= security MASTER_SITES= https://github.com/aide/aide/releases/download/v${PORTVERSION}/ @@ -8,16 +8,23 @@ COMMENT= File and directory integrity checker WWW= https://aide.github.io/ LIB_DEPENDS= libmhash.so:security/mhash \ - libpcre.so:devel/pcre + libpcre.so:devel/pcre \ + libe2p.so:sysutils/e2fsprogs-core USES= bison gmake localbase GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-mhash \ --with-zlib \ + --with-posix-acl \ + --with-e2fsattrs \ --mandir=${MANPREFIX}/man \ --with-config_file=${PREFIX}/etc/aide.conf -CONFIGURE_ENV= YACC="bison -y" +CONFIGURE_ENV= YACC="bison -y" \ + POSIX_ACL_CFLAGS="-I/usr/include/sys" \ + POSIX_ACL_LIBS="-L/usr/lib" \ + MHASH_CFLAGS="-I${LOCALBASE}/include" \ + MHASH_LIBS="-L${LOCALBASE}/lib -lmhash" LDFLAGS+= -lpthread diff --git a/security/aide/distinfo b/security/aide/distinfo index 73ae932bb832..c9a6802d2c25 100644 --- a/security/aide/distinfo +++ b/security/aide/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642975384 -SHA256 (aide-0.17.4.tar.gz) = c81505246f3ffc2e76036d43a77212ae82895b5881d9b9e25c1361b1a9b7a846 -SIZE (aide-0.17.4.tar.gz) = 331783 +TIMESTAMP = 1699587126 +SHA256 (aide-0.18.6.tar.gz) = 8ff36ce47d37d0cc987762d5d961346d475de74bba8a1832fd006db6edd3c10e +SIZE (aide-0.18.6.tar.gz) = 383127 diff --git a/security/aide/files/patch-Makefile.in b/security/aide/files/patch-Makefile.in new file mode 100644 index 000000000000..2fc6aab8f0fe --- /dev/null +++ b/security/aide/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in 2023-11-09 23:11:13.630766000 -0500 ++++ Makefile.in 2023-11-09 23:11:38.720488000 -0500 +@@ -377,7 +377,7 @@ + CAPABILITIES_LIBS = @CAPABILITIES_LIBS@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ @E2FSATTRS_CFLAGS@ + CHECK_CFLAGS = @CHECK_CFLAGS@ + CHECK_LIBS = @CHECK_LIBS@ + CPP = @CPP@ diff --git a/security/aide/files/patch-src_commandconf.c b/security/aide/files/patch-src_commandconf.c deleted file mode 100644 index d9c980015ee2..000000000000 --- a/security/aide/files/patch-src_commandconf.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/commandconf.c.orig 2022-01-19 12:03:06.000000000 -0800 -+++ src/commandconf.c 2022-01-23 14:49:37.915576000 -0800 -@@ -226,8 +226,8 @@ - c=fgetc(db->fp); - if(c==(unsigned char)'\213'){ - log_msg(LOG_LEVEL_DEBUG,"db_input_wrapper(): handle gzip header"); -- lseek(fileno(db->fp),0L,SEEK_SET); -- db->gzp=gzdopen(fileno(db->fp),"rb"); -+ lseek(fileno((FILE *)(db->fp)),0L,SEEK_SET); -+ db->gzp=gzdopen(fileno((FILE *)(db->fp)),"rb"); - c=gzgetc(db->gzp); - log_msg(LOG_LEVEL_DEBUG, "db_input_wrapper(): first character after gzip header is: %c(%#X)\n",c,c); - if(c==-1) {