From nobody Wed Jan 26 20:34:08 2022 X-Original-To: dev-commits-ports-all@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 EAA4119721BC; Wed, 26 Jan 2022 20:34:08 +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 4Jkb6S6L6Yz3LHW; Wed, 26 Jan 2022 20:34:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643229248; 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=qbj8k2bBvGrUw1u9Pnub4DTStCoMVmkErD/kVSX5wIw=; b=XubVOWmluciByEcvO4QKgIYJ+lsVpDt7Uf6m5EYAhrfXJCB8FJt6UwBqpMjrwRdcDo7rHw jhU63qGmz+zyS/Rvcy5hUyFPHfsmkEuQHiRl8qrpnILYN+pNzX2hpWcD4WYPtMsUTVW3I6 lUn2Ot7i93bPI0fgqjxsmzZ8Qw4JhqpcqmS52DB8STaGyYvItJh7kCLusckVi4GDdfqzxX lkYTuW044R3KD4uo0t1rWks5rZO+dtT0UYYPORuwHU20BZigVGuAQzqMp12f99CYzQl+VL UaGbPwbdJnlhyR1XBlKlq5NEGizLbLc71os6q44qLWoyGg/jiRHDb3fy7+FMYw== 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 AEA401560; Wed, 26 Jan 2022 20:34:08 +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 20QKY8pa006749; Wed, 26 Jan 2022 20:34:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QKY8Yc006748; Wed, 26 Jan 2022 20:34:08 GMT (envelope-from git) Date: Wed, 26 Jan 2022 20:34:08 GMT Message-Id: <202201262034.20QKY8Yc006748@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 988b1738fb00 - main - net/proxychains-ng: Adapt port to use upstream patch List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 988b1738fb00ffd4bbd1cf5522d9b1f457d5da1e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643229248; 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=qbj8k2bBvGrUw1u9Pnub4DTStCoMVmkErD/kVSX5wIw=; b=lxYZdew7WUWuOZP2j2KgAaAFItNHZqGWXYqwDz7kXKrgQn/toJF45vv3yBFFjWowuhV/R6 ilNcnBCRikJB45+5mbsXbfIU57tRFB+FR7pEUCrNY7FD4z4D9lNLAIX6KSbjUfXYIGnRML WY3AmMVcQOgZ9LBKha/vgkziVRKAP2PqR7h6EKYb5Hp8ovRc/Aq+Cs08UvJ9HiE2bd/tJD JV7rXlMwYYayo2+l7Gm9VhM2p4Rkt1scl2NxTxoCUGzmLBQD4+AxTD2+W+1Zuk6M9WcDf4 5wAwFMbTFEdRCSVGIPLf+g5Rj25vwfjY0vaukx643EZYlncvk+AW4kPUWXes4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643229248; a=rsa-sha256; cv=none; b=cU+6b7vWoSlHyWd6YZPgDKv92ynDFPhBu10k2dNFFfJ7aC4zT6tEul8WMsoCnE9MphEX9+ bPYcHXU9QDbP6DnSIh77J4CQm8UQALMyjrJMDy3EJf/8GVoLJHDtDwXkte8bIET9X+6WSc SYiKyfCrAkftKep2jVq7BO8D3XSrPkw0HcG7FUROm7PxyKS5RtHKShKLZrbQiJ7wUgdAie 5pEMx3+0K8TYoL7tP4fq9HQMRs6Yaza6oh/yXVUQUXs8ZbOUNnO1VVfqwvWpNqf7Y8Chap Dyt7xHGS4vrlnlqbbkfcC6y+9ztycQ7AoSnkL1djvbY4MwhVpOM9ufyqm780dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=988b1738fb00ffd4bbd1cf5522d9b1f457d5da1e commit 988b1738fb00ffd4bbd1cf5522d9b1f457d5da1e Author: Emanuel Haupt AuthorDate: 2022-01-26 20:26:50 +0000 Commit: Emanuel Haupt CommitDate: 2022-01-26 20:26:50 +0000 net/proxychains-ng: Adapt port to use upstream patch Adapt port to use upstream patch for initial build failure. Pull Request: https://github.com/rofl0r/proxychains-ng/pull/429 --- net/proxychains-ng/Makefile | 9 ++++++--- net/proxychains-ng/distinfo | 4 +++- net/proxychains-ng/files/patch-src_daemon_sblist.h | 11 ----------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/net/proxychains-ng/Makefile b/net/proxychains-ng/Makefile index 12038d0cfd74..99fb2c237e72 100644 --- a/net/proxychains-ng/Makefile +++ b/net/proxychains-ng/Makefile @@ -2,10 +2,14 @@ PORTNAME= proxychains-ng DISTVERSION= 4.16 +PORTREVISION= 1 CATEGORIES= net security MASTER_SITES= https://github.com/rofl0r/${PORTNAME}/releases/download/v${DISTVERSION}/ \ http://ftp.barfooze.de/pub/sabotage/tarballs/ +PATCH_SITES= https://github.com/rofl0r/proxychains-ng/commit/ +PATCHFILES= 07c15a0.patch:-p1 + MAINTAINER= ehaupt@FreeBSD.org COMMENT= Redirect connection through proxy servers @@ -13,10 +17,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake tar:xz -HAS_CONFIGURE= yes USE_LDCONFIG= yes - -CFLAGS+= -DMONTEREY_HOOKING +HAS_CONFIGURE= yes CONFLICTS= proxychains @@ -41,6 +43,7 @@ post-install: ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/proxychains + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/proxychains4-daemon ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libproxychains-4.so .include diff --git a/net/proxychains-ng/distinfo b/net/proxychains-ng/distinfo index f6557d8a7566..0c2547b44680 100644 --- a/net/proxychains-ng/distinfo +++ b/net/proxychains-ng/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1643027306 +TIMESTAMP = 1643228306 SHA256 (proxychains-ng-4.16.tar.xz) = 37a9983d995857cc398cfeefb96739827b3d86a71e03a5193b99f1b097046812 SIZE (proxychains-ng-4.16.tar.xz) = 43808 +SHA256 (07c15a0.patch) = 4718680d486cc8b34feddcad61924caca0156e7191d91ebda3c62164a7193a50 +SIZE (07c15a0.patch) = 3640 diff --git a/net/proxychains-ng/files/patch-src_daemon_sblist.h b/net/proxychains-ng/files/patch-src_daemon_sblist.h deleted file mode 100644 index 2401828080e2..000000000000 --- a/net/proxychains-ng/files/patch-src_daemon_sblist.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/daemon/sblist.h.orig 2022-01-23 14:16:56 UTC -+++ src/daemon/sblist.h -@@ -87,6 +87,8 @@ size_t sblist_insert_sorted(sblist* l, void* o, int (* - } - #endif - -+/* - #pragma RcB2 DEP "sblist.c" "sblist_delete.c" -+*/ - - #endif