From 4844c5c27fa24bf4d057bad7586c01d070f4681e Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Thu, 23 Jul 2020 08:26:30 +0000 Subject: [PATCH] - Update to version 3.05 - Actualize dependencies Requested by: Zeus Panchenko --- security/p5-App-Acmeman/Makefile | 18 ++++------ security/p5-App-Acmeman/distinfo | 6 ++-- security/p5-App-Acmeman/files/Unconfigured.pm | 35 ------------------- .../patch-lib_App_Acmeman_Source_Default.pm | 13 +++++++ security/p5-App-Acmeman/pkg-plist | 7 ++-- 5 files changed, 28 insertions(+), 51 deletions(-) delete mode 100644 security/p5-App-Acmeman/files/Unconfigured.pm create mode 100644 security/p5-App-Acmeman/files/patch-lib_App_Acmeman_Source_Default.pm diff --git a/security/p5-App-Acmeman/Makefile b/security/p5-App-Acmeman/Makefile index bee79b0c2bf5..6ae543c011e8 100644 --- a/security/p5-App-Acmeman/Makefile +++ b/security/p5-App-Acmeman/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= App-Acmeman -PORTVERSION= 3.02 +PORTVERSION= 3.05 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,12 +12,14 @@ COMMENT= Automatic management of ACME (Let's Encrypt) SSL certificates LICENSE= GPLv3+ -RUN_DEPENDS= p5-Apache-Config-Preproc>=1.03:www/p5-Apache-Config-Preproc \ +RUN_DEPENDS= p5-Apache-Config-Preproc>=1.04:www/p5-Apache-Config-Preproc \ p5-Apache-Defaults>=1.02:www/p5-Apache-Defaults \ p5-Config-Parser>=1.03:devel/p5-Config-Parser \ p5-Crypt-OpenSSL-PKCS10>=0.16:security/p5-Crypt-OpenSSL-PKCS10 \ + p5-Crypt-OpenSSL-RSA>=0.28:security/p5-Crypt-OpenSSL-RSA \ p5-Crypt-OpenSSL-X509>=1.804:security/p5-Crypt-OpenSSL-X509 \ p5-DateTime-Format-Strptime>=1.42:devel/p5-DateTime-Format-Strptime \ + p5-File-BackupCopy>=1.00:sysutils/p5-File-BackupCopy \ p5-LWP-Protocol-https>=6.04:www/p5-LWP-Protocol-https \ p5-Net-ACME2>=0.33:net/p5-Net-ACME2 \ p5-libwww>=6.05:www/p5-libwww @@ -26,15 +28,9 @@ NO_ARCH= yes USES= perl5 USE_PERL5= configure -post-extract: - @${CP} ${FILESDIR}/Unconfigured.pm ${WRKSRC}/lib/App/Acmeman/Source - post-patch: - @${REINPLACE_CMD} -e '/config_file =/s,/etc,${PREFIX}&,' \ - ${WRKSRC}/lib/App/Acmeman.pm - -post-stage: - @${PRINTF} "[core]\n\tsource = unconfigured\n" > \ - ${STAGEDIR}${PREFIX}/etc/acmeman.conf.sample + @${REINPLACE_CMD} -e 's,/etc/acmeman\.conf,${PREFIX}&,' \ + ${WRKSRC}/acmeman ${WRKSRC}/lib/App/Acmeman.pm \ + ${WRKSRC}/lib/App/Acmeman/Source/Default.pm .include diff --git a/security/p5-App-Acmeman/distinfo b/security/p5-App-Acmeman/distinfo index ba43e0600615..baa5367ca162 100644 --- a/security/p5-App-Acmeman/distinfo +++ b/security/p5-App-Acmeman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1571830961 -SHA256 (App-Acmeman-3.02.tar.gz) = 8d6f75067e91947afbe873b3fe571abda7d8471f109d9160fd3160a532efb3e1 -SIZE (App-Acmeman-3.02.tar.gz) = 34603 +TIMESTAMP = 1594745625 +SHA256 (App-Acmeman-3.05.tar.gz) = d50ce2b56049826dc0012d060e23f0a0a73ff77c825709b9c168f83aa719da60 +SIZE (App-Acmeman-3.05.tar.gz) = 39353 diff --git a/security/p5-App-Acmeman/files/Unconfigured.pm b/security/p5-App-Acmeman/files/Unconfigured.pm deleted file mode 100644 index be415f2c46ca..000000000000 --- a/security/p5-App-Acmeman/files/Unconfigured.pm +++ /dev/null @@ -1,35 +0,0 @@ -package App::Acmeman::Source::Unconfigured; - -use strict; -use warnings; -use parent 'App::Acmeman::Source'; -use App::Acmeman::Log qw(:all); - -sub new { - my $self; - eval { - require App::Acmeman::Source; - $self = new App::Acmeman::Source; - }; - if ($@) { - (my $s = $@) =~ s{ at /.+$}{}; - error("No domain source configured"); - print STDERR < 'note'); - return $self; -} - -1; diff --git a/security/p5-App-Acmeman/files/patch-lib_App_Acmeman_Source_Default.pm b/security/p5-App-Acmeman/files/patch-lib_App_Acmeman_Source_Default.pm new file mode 100644 index 000000000000..f3a5cb0ab281 --- /dev/null +++ b/security/p5-App-Acmeman/files/patch-lib_App_Acmeman_Source_Default.pm @@ -0,0 +1,13 @@ +--- lib/App/Acmeman/Source/Default.pm.orig 2020-01-14 19:47:02 UTC ++++ lib/App/Acmeman/Source/Default.pm +@@ -27,8 +27,8 @@ The source module couldn't be loaded because of the fo + "$s" + + If you are going to use the "apache" source, fix this error and retry. +-Otherwise, please create the /etc/acmeman.conf configuration file, and +-configure another domain source, for example: ++Otherwise, please create the /etc/acmeman.conf configuration ++file, and configure another domain source, for example: + + [core] + source = file DOMAINFILE diff --git a/security/p5-App-Acmeman/pkg-plist b/security/p5-App-Acmeman/pkg-plist index b4b57ea194f4..e1a326dea06f 100644 --- a/security/p5-App-Acmeman/pkg-plist +++ b/security/p5-App-Acmeman/pkg-plist @@ -1,13 +1,16 @@ bin/acmeman -@sample etc/acmeman.conf.sample %%SITE_PERL%%/App/Acmeman.pm %%SITE_PERL%%/App/Acmeman/Apache/Layout.pm +%%SITE_PERL%%/App/Acmeman/Apache/Layout/debian.pm +%%SITE_PERL%%/App/Acmeman/Apache/Layout/rh.pm +%%SITE_PERL%%/App/Acmeman/Apache/Layout/slackware.pm +%%SITE_PERL%%/App/Acmeman/Apache/Layout/suse.pm %%SITE_PERL%%/App/Acmeman/Config.pm %%SITE_PERL%%/App/Acmeman/Domain.pm %%SITE_PERL%%/App/Acmeman/Log.pm %%SITE_PERL%%/App/Acmeman/Source.pm %%SITE_PERL%%/App/Acmeman/Source/Apache.pm +%%SITE_PERL%%/App/Acmeman/Source/Default.pm %%SITE_PERL%%/App/Acmeman/Source/File.pm %%SITE_PERL%%/App/Acmeman/Source/Null.pm -%%SITE_PERL%%/App/Acmeman/Source/Unconfigured.pm %%PERL5_MAN1%%/acmeman.1.gz