From nobody Sun Aug 20 14:37:07 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 4RTJ8z5WHlz4qHSc; Sun, 20 Aug 2023 14:37:07 +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 4RTJ8z50XPz4K7d; Sun, 20 Aug 2023 14:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692542227; 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=xtrN9ABqETe09FRkLJx3JYcoirQEcSpsIv4xyCxb3xc=; b=lQ1XhuIULkU0S64nmNcbXZQTfqVtqJJqSJh2u/d1PGzh8IGdcdipQM0vr/3BBycpuhkdCu fLjUYfGpMzDrduQWRIX5VVpNL7SsgW08RatVJc5XbfhlFncsHw+mexxiK4/O80jag5i1PX hVPXaTS80A/pTDpOZg1mQmsN9VEfBzl0vLtArW5PCJGYJ0FITMz/Ln/O4aS5L6MWDfg8td iT8StGCh4OvL8eg8dwuVELvFgn1DPiFKu9nrDIHPaoPQUreQIDbFTGiu6ZoIreQNjAvf5h LlMEl2oIh15GjzjIXuLbe0ZgDwi+BhnkUoJoATAcCa9q1Ae4gPrk7r/qk/MJQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692542227; 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=xtrN9ABqETe09FRkLJx3JYcoirQEcSpsIv4xyCxb3xc=; b=UAS0KMWpkBna2DT0nuxS6c78D0fNDt5ZLgkoBpCNPMo4UaP2vDzdjitewakTqqDDl9d72A POyKo8o8JLNSxKmKJfe+ixfDL7Pv2D6bLAjfW7U2W2yqSqNCYV6RS/mmgskBzS2AtrSnWM WGDpdyqKilBDcOso6nRQ1mFhTSKJFFGgnNmcB9mNCCMBjr6y9JU/OhT/506yf4lAsoPQym HrCzlyp4VbVdkorvW6doRY34cg6YbjGmI/fwSCJCvBL2LGn98X4yV1MoOPRnys9paowxik yWBXUyJ6Y6TlHXOSxjIIZdwzjKpYB91ENDZdmzebXbP3JZaUlHWDHeHD/JEQag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692542227; a=rsa-sha256; cv=none; b=ieIMknNipqNH5DbRIWlLbbc6lLwmw5ReHf3D4Wv4pRh18brxKCiELWyRloxjnUTj7Au5LK GBeF6qDTQDUzM/IEIOvnv0q6bG7rX//V5KjAiztwAMievdr4bGUYfXFpclHNDVqJwxf7dZ 6MRcnpLALYYf23ldwvREAP1xZJPHTfrhjW1kdVm0/4vbFIK3qnvJZ/dwWqF0RqR7Bgi2iO rZ0XwMqDrOJFt8OPliVMHZu9ddjQmB4K5ArspuKxumugnMGPagYomiWrbjU6ANWegKdKqq QE5GQH9990EoJD1bX6omi5z74HbqYA3+HvOP/yTgwdOkYNmQn0HzV6buzHZZyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTJ8z43KpzjRp; Sun, 20 Aug 2023 14:37:07 +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 37KEb7aF046600; Sun, 20 Aug 2023 14:37:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37KEb7gY046597; Sun, 20 Aug 2023 14:37:07 GMT (envelope-from git) Date: Sun, 20 Aug 2023 14:37:07 GMT Message-Id: <202308201437.37KEb7gY046597@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: da1328032e63 - main - security/ssl-admin: Use the right tarball 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: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da1328032e6388794830111ccc0c5a41d1380997 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=da1328032e6388794830111ccc0c5a41d1380997 commit da1328032e6388794830111ccc0c5a41d1380997 Author: Dan Langille AuthorDate: 2023-08-20 13:50:04 +0000 Commit: Dan Langille CommitDate: 2023-08-20 14:37:04 +0000 security/ssl-admin: Use the right tarball The developer has indicated the correcdt tarball supplied in the assets, not the tagged Github tarball. The Github tarball will provide the wrong VERSION in the app. Not mentioned in my previous commit: this release adds a new feature: C) Generate new Certificate Revokation List (CRL) While here: * run portfmt * remove dependency on archivers/zip by patching to use bsdtar from base (credit to diizzy@ for patch and help with this commit) Approved by: maintainer (via Github discussions) --- security/ssl-admin/Makefile | 15 +++++---------- security/ssl-admin/distinfo | 6 +++--- security/ssl-admin/files/patch-ssl-admin | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/security/ssl-admin/Makefile b/security/ssl-admin/Makefile index 0a3cde53b1c7..1521fa6e9dc0 100644 --- a/security/ssl-admin/Makefile +++ b/security/ssl-admin/Makefile @@ -1,33 +1,28 @@ PORTNAME= ssl-admin -DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= security +MASTER_SITES= https://github.com/ecrist/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= ecrist@secure-computing.net COMMENT= OpenSSL certificate manager with OpenVPN support WWW= https://github.com/ecrist/ssl-admin/ LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/../LICENSE - -RUN_DEPENDS= zip:archivers/zip USES= perl5 shebangfix tar:xz -USE_GITHUB= yes -GH_ACCOUNT= ecrist USE_PERL5= run SHEBANG_FILES= ssl-admin -GNU_CONFIGURE= yes +HAS_CONFIGURE= yes -MAKE_ENV= ETCDIR=${PREFIX}/etc BINDIR=${PREFIX}/bin \ +MAKE_ENV= BINDIR=${PREFIX}/bin \ + ETCDIR=${PREFIX}/etc \ MANDIR=${MANPREFIX}/man NO_ARCH= yes SUB_FILES= pkg-message -WRKSRC_SUBDIR= perl - post-patch: ${REINPLACE_CMD} -e 's|`which sed`|${SED}|' ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|{DESTDIR}/|{DESTDIR}|g' ${WRKSRC}/Makefile diff --git a/security/ssl-admin/distinfo b/security/ssl-admin/distinfo index e1d5e6487d8b..926bbb55be2e 100644 --- a/security/ssl-admin/distinfo +++ b/security/ssl-admin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692496340 -SHA256 (ecrist-ssl-admin-v1.3.0_GH0.tar.gz) = ff672daeca2c4423ddad9591f1ae4acf3e6ce84524ca2daa74a22a131f94fd3b -SIZE (ecrist-ssl-admin-v1.3.0_GH0.tar.gz) = 15197 +TIMESTAMP = 1692537047 +SHA256 (ssl-admin-1.3.0.tar.xz) = ba732cf50780d10bba4c38826965642956ceb6534a893f79a60378cbd016bfed +SIZE (ssl-admin-1.3.0.tar.xz) = 12639 diff --git a/security/ssl-admin/files/patch-ssl-admin b/security/ssl-admin/files/patch-ssl-admin new file mode 100644 index 000000000000..8e5209204cd9 --- /dev/null +++ b/security/ssl-admin/files/patch-ssl-admin @@ -0,0 +1,14 @@ +--- ssl-admin.orig 2023-08-20 13:30:11 UTC ++++ ssl-admin +@@ -476,9 +476,9 @@ sub menu_handler { + chomp($yn = <>); + } until $yn =~ m/^[yn]$/; + if ($yn eq "n"){ +- $zip_cmd = "cd $working_dir/packages/ && zip $cn.zip client.crt client.key ca.crt"; ++ $zip_cmd = "cd $working_dir/packages/ && bsdtar -a -cf $cn.zip client.crt client.key ca.crt"; + } else { +- $zip_cmd = "cd $working_dir/packages/ && zip $cn.zip client.crt client.key ca.crt client.ovpn"; ++ $zip_cmd = "cd $working_dir/packages/ && bsdtar -a -cf $cn.zip client.crt client.key ca.crt client.ovpn"; + } + print "=================> Zipping File\n"; + system($zip_cmd);