Update to 1.1.0 and take maintainership

This commit is contained in:
giovanni 2016-09-02 12:25:36 +00:00
parent 072959c4ea
commit 2df108202c
5 changed files with 13 additions and 45 deletions

View File

@ -1,17 +1,20 @@
# $OpenBSD: Makefile,v 1.1.1.1 2016/05/27 16:28:44 giovanni Exp $
# $OpenBSD: Makefile,v 1.2 2016/09/02 12:25:36 giovanni Exp $
COMMENT = perl implementation of email authentication standards
V = 1.0.1
V = 1.1.0
DISTNAME = Mail-Milter-Authentication-v${V}
PKGNAME = p5-Mail-Milter-Authentication-${V}
CATEGORIES = mail
MAINTAINER = Giovanni Bechis <giovanni@openbsd.org>
# Perl
PERMIT_PACKAGE_CDROM = Yes
MODULES = cpan
SUBST_VARS = VARBASE
pre-configure:
${SUBST_CMD} ${WRKSRC}/bin/authentication_milter

View File

@ -1,2 +1,2 @@
SHA256 (Mail-Milter-Authentication-v1.0.1.tar.gz) = j7QfhT008f0ZJ03gIAIphg1ouCY3WLcgZsrzUOFnNq0=
SIZE (Mail-Milter-Authentication-v1.0.1.tar.gz) = 78119
SHA256 (Mail-Milter-Authentication-v1.1.0.tar.gz) = 6yVd+pgHndVkSonEtEhYHJjly4exxQktSFtXnkfTcmU=
SIZE (Mail-Milter-Authentication-v1.1.0.tar.gz) = 84104

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-bin_authentication_milter,v 1.1.1.1 2016/05/27 16:28:44 giovanni Exp $
$OpenBSD: patch-bin_authentication_milter,v 1.2 2016/09/02 12:25:36 giovanni Exp $
--- bin/authentication_milter.orig Thu Sep 10 05:37:11 2015
+++ bin/authentication_milter Wed Apr 27 15:57:09 2016
@@ -14,7 +14,7 @@ use Module::Load;
@ -6,7 +6,7 @@ $OpenBSD: patch-bin_authentication_milter,v 1.1.1.1 2016/05/27 16:28:44 giovanni
# CONFIG
-my $pid_file = '/run/authentication_milter.pid';
+my $pid_file = '/var/run/authentication_milter.pid';
+my $pid_file = '${VARBASE}/run/authentication_milter.pid';
my $daemon = 0;
my $help = 0;
my $prefix;
@ -15,7 +15,7 @@ $OpenBSD: patch-bin_authentication_milter,v 1.1.1.1 2016/05/27 16:28:44 giovanni
Write the process PID to the given file.
- defaults to /run/authentication_milter.pid
+ defaults to /var/run/authentication_milter.pid
+ defaults to ${VARBASE}/run/authentication_milter.pid
=item --prefix <dir>

View File

@ -1,35 +0,0 @@
$OpenBSD: patch-lib_Mail_Milter_Authentication_Client_pm,v 1.2 2016/06/22 22:49:42 sthen Exp $
From d0373f1ea66a0de8b7ef7a6c0c7cbf912eef9619 Mon Sep 17 00:00:00 2001
From: Giovanni Bechis <giovanni@paclan.it>
Date: Thu, 12 May 2016 22:41:44 +0200
Subject: [PATCH] Check for empty variables
--- lib/Mail/Milter/Authentication/Client.pm.orig Thu Sep 10 05:37:11 2015
+++ lib/Mail/Milter/Authentication/Client.pm Wed Apr 27 16:05:37 2016
@@ -212,7 +212,7 @@ sub load_mail {
else {
if ( $value ) {
my ( $hkey, $hvalue ) = split ( ':', $value, 2 );
- $hvalue =~ s/^ //;
+ $hvalue =~ s/^ // if defined $hvalue;
push @header_pairs , $hkey;
push @header_pairs , $hvalue;
}
@@ -221,7 +221,7 @@ sub load_mail {
}
if ( $value ) {
my ( $hkey, $hvalue ) = split ( ':', $value, 2 );
- $hvalue =~ s/^ //;
+ $hvalue =~ s/^ // if defined $hvalue;
push @header_pairs , $hkey;
push @header_pairs , $hvalue;
}
@@ -310,6 +310,7 @@ sub process {
while ( @process_header ) {
my $key = shift @process_header;
my $value = shift @process_header;
+ $value //= '';
$header_string .= "$key: $value\015\012";
}
my $header_obj = Email::Simple::Header->new( $header_string );

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/05/27 16:28:44 giovanni Exp $
@comment $OpenBSD: PLIST,v 1.2 2016/09/02 12:25:36 giovanni Exp $
@newgroup _milter-auth:770
@newuser _milter-auth:770:_milter-auth:daemon:Milter Authentication Daemon:/var/empty:/sbin/nologin
bin/authentication_milter
@ -9,7 +9,6 @@ ${P5SITE}/Mail/Milter/Authentication.pm
${P5SITE}/Mail/Milter/Authentication/Client.pm
${P5SITE}/Mail/Milter/Authentication/Config.pm
${P5SITE}/Mail/Milter/Authentication/Constants.pm
${P5SITE}/Mail/Milter/Authentication/DNSCache.pm
${P5SITE}/Mail/Milter/Authentication/Handler/
${P5SITE}/Mail/Milter/Authentication/Handler.pm
${P5SITE}/Mail/Milter/Authentication/Handler/AddID.pm
@ -25,6 +24,7 @@ ${P5SITE}/Mail/Milter/Authentication/Handler/Sanitize.pm
${P5SITE}/Mail/Milter/Authentication/Handler/SenderID.pm
${P5SITE}/Mail/Milter/Authentication/Handler/TLS.pm
${P5SITE}/Mail/Milter/Authentication/Handler/TrustedIP.pm
${P5SITE}/Mail/Milter/Authentication/Handler/XGoogleDKIM.pm
${P5SITE}/Mail/Milter/Authentication/Protocol/
${P5SITE}/Mail/Milter/Authentication/Protocol/Milter.pm
${P5SITE}/Mail/Milter/Authentication/Protocol/SMTP.pm
@ -40,7 +40,6 @@ ${P5SITE}/auto/share/dist/Mail-Milter-Authentication/mail-dmarc.ini
@man man/man3p/Mail::Milter::Authentication::Client.3p
@man man/man3p/Mail::Milter::Authentication::Config.3p
@man man/man3p/Mail::Milter::Authentication::Constants.3p
@man man/man3p/Mail::Milter::Authentication::DNSCache.3p
@man man/man3p/Mail::Milter::Authentication::Handler.3p
@man man/man3p/Mail::Milter::Authentication::Handler::AddID.3p
@man man/man3p/Mail::Milter::Authentication::Handler::Auth.3p
@ -55,6 +54,7 @@ ${P5SITE}/auto/share/dist/Mail-Milter-Authentication/mail-dmarc.ini
@man man/man3p/Mail::Milter::Authentication::Handler::SenderID.3p
@man man/man3p/Mail::Milter::Authentication::Handler::TLS.3p
@man man/man3p/Mail::Milter::Authentication::Handler::TrustedIP.3p
@man man/man3p/Mail::Milter::Authentication::Handler::XGoogleDKIM.3p
@man man/man3p/Mail::Milter::Authentication::Protocol::Milter.3p
@man man/man3p/Mail::Milter::Authentication::Protocol::SMTP.3p
@rcscript ${RCDIR}/mail_milter_authentication