- Update to version 3.05

- Actualize dependencies

Requested by:	Zeus Panchenko
This commit is contained in:
Alexey Dokuchaev 2020-07-23 08:26:30 +00:00
parent e5edab72a6
commit 4844c5c27f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=542920
5 changed files with 28 additions and 51 deletions

View File

@ -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 <bsd.port.mk>

View File

@ -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

View File

@ -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 <<EOT;
You are seeing this error because you use the default configuration
file template and the default source "apache" cannot be loaded.
Please edit your configuration file (/usr/local/etc/acmeman.conf) and
change the \"source\" line appropriately.
For your information, the error reported by the "apache" module was:
$s
EOT
;
exit(78);
}
error("Using default domain source \"apache\"", prefix => 'note');
return $self;
}
1;

View File

@ -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

View File

@ -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