From nobody Thu Dec 29 06:28:32 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 4NjJPF1t16z2c7p0; Thu, 29 Dec 2022 06:28:33 +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 4NjJPF1JBjz4RYn; Thu, 29 Dec 2022 06:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672295313; 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=g50F2nr4dPoWBl6V2x3166RhnRiNIIjrdDocxRY6uOA=; b=pCYii/lx4M+YUpeU1aztcUY2lwtEH7/6LsdOvWn9PQr9n9V6hnPYgx1+GyC0VlbObbZrPT OA9I5ikwNxeWuM7vwpUNdW/0S+mp7+1+d1ALiqxmRH2J/ES4Gn9nFnzALEFBm+aEZM5x+h MOAl/l7pBH0hbcU739YxMrP0eZPL7sm0pMCxLKs7dbz1tIxV98nO+Z+MRQ0UetXSAeMhfC HfCRDYqY3ROaeTkoqLlYlYiXZyQd2rl9aOeb2LUcvjXiYfcoGN75mMYVqSfSegOIXVY9Hd 0VEaaMeqQ45ZIjHnRG6w3OenwD1ndb5m71mQvxbhQNlsgwvMVxzNuJ92GMqwlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672295313; 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=g50F2nr4dPoWBl6V2x3166RhnRiNIIjrdDocxRY6uOA=; b=AVwCw62qoesY8sT/iXVDn28QZlDa5myZdsyRFlMDPqHblRksw7+gah0MKsIgOHTKn8X5bu 7vRo+lfhKVYrN3X2boF04tgFZqvzAaVCRrsDk0TkPK2vEQqoZuL3GIqpJj9bEGf9+1/JJk apSB8u9WRFQom5o93rzLrZuik+OsDPaG63KQVIjSgVBMHrh40hU9ExVj9pq1NsUMLYJ1pg bqAILrOHCAbj0anwuGk/MGYeh2PIJOyZFbIH39gJvpH9IvBvTNwqylF1VaINr3hMdy0wf1 TRPbhUjmrTlwmlCbLLhaEq58zx6OJHIO3tm1fn1LNL8bbmTfLjBfvGQ+TNKHcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672295313; a=rsa-sha256; cv=none; b=skSTrDg5eLLNkbO5+EeC+ro3DtpFvANv7F26gE7aduF1c/nJvvxu46y4fN0FuYkN7XMvEL YxHgaHxyqAosuXRgb8GOxTEZ170lSFOOZLA3dnOFG9upDOsyrEQnoV8+csHm+IiJwrsYHz jfS5CRuYuSft9JbuGbyXD/v/3PryvX9brNEHAjW4WPV4I2H9WilXi5OTTZSUYwpXQcvR7D pt9WqxD8sbq1CS2gWqeL7dPsPi8A35G67Kir7oQd6WOGyuSLPNUPTZqXgRCMUVtrGHSj+3 9UlmvuhfaCzmWrAv4UQCddmbBmKzGooB10TJ8Fswlugsf0HpV9xOcm19D19M4A== 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 4NjJPF0JTtzK74; Thu, 29 Dec 2022 06:28:33 +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 2BT6SWHL000883; Thu, 29 Dec 2022 06:28:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BT6SWAG000882; Thu, 29 Dec 2022 06:28:32 GMT (envelope-from git) Date: Thu, 29 Dec 2022 06:28:32 GMT Message-Id: <202212290628.2BT6SWAG000882@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 88dd085ff785 - main - security/0d1n: Update to 3.8 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: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88dd085ff7851bb2906039d97a81857fe6d8b2e3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=88dd085ff7851bb2906039d97a81857fe6d8b2e3 commit 88dd085ff7851bb2906039d97a81857fe6d8b2e3 Author: Zack Wylde AuthorDate: 2022-12-29 06:27:24 +0000 Commit: Li-Wen Hsu CommitDate: 2022-12-29 06:28:12 +0000 security/0d1n: Update to 3.8 PR: 268423 --- security/0d1n/Makefile | 12 ++++++-- security/0d1n/distinfo | 6 ++-- security/0d1n/files/patch-Makefile | 61 +++++++++++++++++++++++++++----------- 3 files changed, 56 insertions(+), 23 deletions(-) diff --git a/security/0d1n/Makefile b/security/0d1n/Makefile index b58cd43907ee..38311ba7bc3e 100644 --- a/security/0d1n/Makefile +++ b/security/0d1n/Makefile @@ -1,5 +1,5 @@ PORTNAME= 0d1n -PORTVERSION= 2.3 +PORTVERSION= 3.8 CATEGORIES= security MAINTAINER= zackj901@yandex.com @@ -12,6 +12,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl USE_GITHUB= yes GH_ACCOUNT= CoolerVoid +GH_TAGNAME= OdinV38 PLIST_FILES= bin/0d1n PORTDOCS= README.txt @@ -19,11 +20,16 @@ PORTDOCS= README.txt OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e '/^#include /d' \ - ${WRKSRC}/get_csrf_token.h ${WRKSRC}/spider.h + @${REINPLACE_CMD} -e '/^#include /d' \ + ${WRKSRC}/src/headers/spider.h ${WRKSRC}/src/headers/results.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DATADIR}/view + ${MKDIR} ${STAGEDIR}${DATADIR}/view/response_sources + ${MKDIR} ${STAGEDIR}${DATADIR}/payloads + (cd ${WRKSRC} && ${COPYTREE_SHARE} templates ${STAGEDIR}${DATADIR}) + (cd ${WRKSRC} && ${COPYTREE_SHARE} payloads ${STAGEDIR}${DATADIR}) do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/security/0d1n/distinfo b/security/0d1n/distinfo index 48fa71e7735e..9f15eaa88177 100644 --- a/security/0d1n/distinfo +++ b/security/0d1n/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488890485 -SHA256 (CoolerVoid-0d1n-2.3_GH0.tar.gz) = 7fe26f0268fe63ec0352502ae590a7a5e258248f253649661dc782ca7edd52ae -SIZE (CoolerVoid-0d1n-2.3_GH0.tar.gz) = 3866302 +TIMESTAMP = 1671242917 +SHA256 (CoolerVoid-0d1n-3.8-OdinV38_GH0.tar.gz) = d392250b27c6870cbd219de52c89e3f2e3ed50ec2d309a1b8721774f63591665 +SIZE (CoolerVoid-0d1n-3.8-OdinV38_GH0.tar.gz) = 4350113 diff --git a/security/0d1n/files/patch-Makefile b/security/0d1n/files/patch-Makefile index 60a82fbd4ce7..087b1fa5ee5b 100644 --- a/security/0d1n/files/patch-Makefile +++ b/security/0d1n/files/patch-Makefile @@ -1,25 +1,52 @@ ---- Makefile.orig 2017-01-14 22:53:30 UTC +--- Makefile.orig 2022-07-10 02:56:04 UTC +++ Makefile -@@ -1,17 +1,9 @@ +@@ -1,42 +1,14 @@ -CC=gcc --CFLAGS=-W -Wall -Wextra -O2 -fstack-protector-all --DFLAGS=-D_FORTIFY_SOURCE=2 +-CFLAGS=-W -Wall -Wextra -Wformat-security -Wno-maybe-uninitialized -O2 +-HARDENING=-fstack-protector-all -pie -fPIE ++CC?=gcc ++CFLAGS+=-W -Wall -Wextra -fstack-protector-all ++DFLAGS=-D_FORTIFY_SOURCE=2 -I /usr/local/include -I src/headers ++LDFLAGS=-Wl,-z,relro,-z,now,-L,/usr/local/lib,-lcurl,-lpthread + DIR=src/ + DIROUT=bin/ + DIR_HEADERS=src/headers/ -UNAME_S := $(shell uname -s) -ifeq ($(UNAME_S),Darwin) -- LDFLAGS=-Wl,-lcurl +- LDFLAGS=-Wl,-lcurl, -lpthread -else -- LDFLAGS=-Wl,-z,relro,-z,now -lcurl +- LDFLAGS=-Wl,-z,relro,-z,now -lcurl -lpthread -endif -- --#LDFLAGS=-lcurl -- -+CC?=cc -+CFLAGS+=-W -Wall -Wextra -fstack-protector-all -+DFLAGS=-D_FORTIFY_SOURCE=2 -I /usr/local/include -+LDFLAGS=-Wl,-z,relro,-z,now,-L,/usr/local/lib,-lcurl --0d1n: 0d1n.c -+all: 0d1n.c - $(CC) $(CFLAGS) $(DFLAGS) -c *.c - $(CC) -o 0d1n *.o $(LDFLAGS) ++all: $(DIR)0d1n.c ++ $(CC) $(CFLAGS) $(DFLAGS) -c $(DIR)*.c ++ $(CC) -o 0d1n *.o $(LDFLAGS) + +-0d1n: $(DIR)0d1n.c +- $(CC) $(CFLAGS) $(HARDENING) -c $(DIR)*.c -I$(DIR_HEADERS) +- $(CC) $(HARDENING) -o $(DIROUT)0d1n *.o $(LDFLAGS) + +-clean: +- rm -f *.o 0d1n +- +-PREFIX=/usr/local +-install: +- make +- mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -m 0755 bin/0d1n $(DESTDIR)$(PREFIX)/bin +- mkdir /opt/0d1n +- mkdir /opt/0d1n/view/ +- mkdir /opt/0d1n/view/response_sources +- mkdir /opt/0d1n/payloads +- cp -rf templates /opt/0d1n/ +- cp -rf tables /opt/0d1n/view/ +- cp -rf payloads /opt/0d1n/ +- chmod 0755 -R /opt/0d1n +- chown ${USER} -R /opt/0d1n +- chown ${USER} $(DESTDIR)$(PREFIX)/bin/0d1n +- +-uninstall: +- rm $(DESTDIR)$(PREFIX)/bin/0d1n +- rm -rf /opt/0d1n +- rm -f *.o 0d1n