From nobody Thu May 25 07:08:30 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 4QRfKV73R0z4CmKN; Thu, 25 May 2023 07:08:30 +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 4QRfKV6T58z3FMp; Thu, 25 May 2023 07:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684998510; 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=RocraQJZsRnpIyKrId9dhIcexAjfMm4+MGG9hNGmjoI=; b=mwNKQtCxGVBeI9yHqWq0HsH/vj8jJW78PJHB4MSjkTgSXz2BDGvk8lmuSlleIrZsLcIRuV +npIcgcdRZUsNWCs4/NDrmxVD262RMbvdfoe7NT+p7xmRr9ffDaMJYiCBTLqLWIa3vkxRu nteXGma8Gc0YkiRRQlcLPACYZs7h44AQru0eyz3TCxUzhDdlFp4Hl1SeLT6wcYlGVB0FBb r2sbL5xuAaK+0RPoeoGERwc/uPb6CCEqZg6QNriooeq+A/KE1iYe7scUJQ6qwn6H5AyV19 I5pnyKYAxGBBvc5WSfhKbGiSOmTrdmkz63ABXuwtswT9ggO5ZA+1ILPMR4aCWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684998510; 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=RocraQJZsRnpIyKrId9dhIcexAjfMm4+MGG9hNGmjoI=; b=U/K/YTTxK6nSw8OtlkhGU2jW6CyDAQO8H+V7bm3yI7UyMddNQfXqpvhqUyD8oylCTRMXDX kuYf3/afLNPYc728s/tAwbrCWS21/ZHJPb947FXSKRDfqBBKxHyX6ppEFWhrs3r40fi8Zz 27FQwmM99bl4Juyb7gDuAY7OAMH0fjl9vjhTVlSrOOze0ddpsFui9R+lb1onZ2n/3Ns5xw J3lbzMwWULB/zr2U8bjCsiXvskm7O3Zf/JAEz27BnN4cYo6NX2JKGdwgYVU0v+4omhE6Av PfvOudLFlm0O0YW6hBqFdbbxMmtXKsJ3Iw2PJ/u9rh5wKHBYnsPQRbOj/LeLkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684998510; a=rsa-sha256; cv=none; b=asNdS/qOaRobU6JPQu9dCtRf+oW6xPwdr4r8da8leUMYitoOATRcZmAWlHVgnFUn6affwt fG+aJfbSJF0jkTkK93vQ0SUP3WK7L/tpyDEQXheCHx6Iig628BEH9Z05DIzL/DUvXh5s6a DPxTByeidRMHCLughvDQzrk8w8bdV3QI/GugOd/U+z6a5BZC8XrM3QjJK83Z8HwDSbg2aX 5qV/gZrA2Ux285bev+EQQNJbfAe4jeanWnsdriKbMudqo1FaEb0E/nv/vJPju+vnN71sxD hkUMx2eAv1Z8fjaY9j2op1QjCVGM7ImUl3Rm2JKqEAPKE1DCrr+53MeCXiZ4uw== 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 4QRfKV5YwczFxV; Thu, 25 May 2023 07:08:30 +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 34P78UQB037365; Thu, 25 May 2023 07:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34P78Urx037364; Thu, 25 May 2023 07:08:30 GMT (envelope-from git) Date: Thu, 25 May 2023 07:08:30 GMT Message-Id: <202305250708.34P78Urx037364@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 842f5b3996e5 - main - net/nepenthes: modernize 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 842f5b3996e5a9a5e666b4fc28ff75a973b97edd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=842f5b3996e5a9a5e666b4fc28ff75a973b97edd commit 842f5b3996e5a9a5e666b4fc28ff75a973b97edd Author: Baptiste Daroussin AuthorDate: 2023-05-25 07:06:14 +0000 Commit: Baptiste Daroussin CommitDate: 2023-05-25 07:08:18 +0000 net/nepenthes: modernize Remove all usage of pkg-install and pkg-deinstall which can be done via keywords. This makes this port ROOTDIR friendly --- net/nepenthes/Makefile | 9 ++++++++- net/nepenthes/pkg-deinstall | 46 --------------------------------------------- net/nepenthes/pkg-install | 46 --------------------------------------------- net/nepenthes/pkg-plist | 11 ++++++++++- 4 files changed, 18 insertions(+), 94 deletions(-) diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile index 083ab5f9a09e..796364d8734b 100644 --- a/net/nepenthes/Makefile +++ b/net/nepenthes/Makefile @@ -44,7 +44,14 @@ post-patch: s|-R/usr/local/lib||' ${WRKSRC}/configure post-install: - @${MKDIR} ${STAGEDIR}${DATADIR}/signatures + @${MKDIR} ${STAGEDIR}${DATADIR}/signatures \ + ${STAGEDIR}/var/binaries \ + ${STAGEDIR}/var/hexdumps \ + ${STAGEDIR}/var/log/pcap \ + ${STAGEDIR}/var/spool/nepenthes/gotek \ + ${STAGEDIR}/var/spool/nepenthes/submitpostgres \ + ${STAGEDIR}/var/cache/nepenthes/pcap \ + ${STAGEDIR}/var/cache/nepenthes/signatures (cd ${WRKSRC}/modules/shellcode-signatures && ${INSTALL_DATA} \ shellcode-signatures.sc ${STAGEDIR}${DATADIR}/signatures) diff --git a/net/nepenthes/pkg-deinstall b/net/nepenthes/pkg-deinstall deleted file mode 100644 index 671f2981d6f0..000000000000 --- a/net/nepenthes/pkg-deinstall +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -if [ "$2" != "DEINSTALL" ]; then - exit 0 -fi - -if cmp -s ${PKG_PREFIX}/share/nepenthes/signatures/shellcode-signatures.sc \ - /var/cache/nepenthes/signatures/shellcode-signatures.sc; then - rm -f /var/cache/nepenthes/signatures/shellcode-signatures.sc -fi - -if [ -d /var/spool/nepenthes/submitpostgres ]; then - rmdir /var/spool/nepenthes/submitpostgres 2>/dev/null || true -fi - -if [ -d /var/spool/nepenthes/gotek ]; then - rmdir /var/spool/nepenthes/gotek 2>/dev/null || true -fi - -if [ -d /var/spool/nepenthes ]; then - rmdir /var/spool/nepenthes 2>/dev/null || true -fi - -if [ -d /var/log/pcap ]; then - rmdir /var/log/pcap 2>/dev/null || true -fi - -if [ -d /var/hexdumps ]; then - rmdir /var/hexdumps 2>/dev/null || true -fi - -if [ -d /var/cache/nepenthes/signatures ]; then - rmdir /var/cache/nepenthes/signatures 2>/dev/null || true -fi - -if [ -d /var/cache/nepenthes/pcap ]; then - rmdir /var/cache/nepenthes/pcap 2>/dev/null || true -fi - -if [ -d /var/cache/nepenthes ]; then - rmdir /var/cache/nepenthes 2>/dev/null || true -fi - -if [ -d /var/binaries ]; then - rmdir /var/binaries 2>/dev/null || true -fi diff --git a/net/nepenthes/pkg-install b/net/nepenthes/pkg-install deleted file mode 100644 index c62009d06b67..000000000000 --- a/net/nepenthes/pkg-install +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -if [ ! -d /var/binaries ]; then - install -d /var/binaries -fi - -if [ ! -d /var/cache/nepenthes ]; then - install -d /var/cache/nepenthes -fi - -if [ ! -d /var/cache/nepenthes/pcap ]; then - install -d /var/cache/nepenthes/pcap -fi - -if [ ! -d /var/cache/nepenthes/signatures ]; then - install -d /var/cache/nepenthes/signatures -fi - -if [ ! -d /var/hexdumps ]; then - install -d /var/hexdumps -fi - -if [ ! -d /var/log/pcap ]; then - install -d /var/log/pcap -fi - -if [ ! -d /var/binaries ]; then - install -d /var/spool/nepenthes -fi - -if [ ! -d /var/binaries ]; then - install -d /var/spool/nepenthes/gotek -fi - -if [ ! -d /var/binaries ]; then - install -d /var/spool/nepenthes/submitpostgres -fi - -if [ ! -f /var/cache/nepenthes/signatures/shellcode-signatures.sc ]; then - install -c ${PKG_PREFIX}/share/nepenthes/signatures/shellcode-signatures.sc \ - /var/cache/nepenthes/signatures -fi diff --git a/net/nepenthes/pkg-plist b/net/nepenthes/pkg-plist index 243f93b5a1c1..98f1afd47d38 100644 --- a/net/nepenthes/pkg-plist +++ b/net/nepenthes/pkg-plist @@ -163,4 +163,13 @@ man/man8/nepenthes.8.gz %%DATADIR%%/README %%DATADIR%%/README.VFS %%DATADIR%%/logo-shaded.svg -%%DATADIR%%/signatures/shellcode-signatures.sc +@sample %%DATADIR%%/signatures/shellcode-signatures.sc /var/cache/nepenthes/signatures/shellcode-signatures.sc +@dir /var/binaries +@dir /var/cache/nepenthes/ +@dir /var/cache/nepenthes/pcap +@dir /var/cache/nepenthes/signatures +@dir /var/hexdumps +@dir /var/log/pcap +@dir /var/spool/nepenthes/ +@dir /var/spool/nepenthes/gotek +@dir /var/spool/nepenthes/submitpostgres