Date: Sun, 20 Aug 2023 14:37:07 GMT From: Dan Langille <dvl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: da1328032e63 - main - security/ssl-admin: Use the right tarball Message-ID: <202308201437.37KEb7gY046597@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=da1328032e6388794830111ccc0c5a41d1380997 commit da1328032e6388794830111ccc0c5a41d1380997 Author: Dan Langille <dvl@FreeBSD.org> AuthorDate: 2023-08-20 13:50:04 +0000 Commit: Dan Langille <dvl@FreeBSD.org> 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308201437.37KEb7gY046597>