git: 7c03bbb23d0f - main - mail/p5-Sendmail-Milter: regen patch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 01 Jun 2022 13:02:18 UTC
The branch main has been updated by mat:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7c03bbb23d0fc0987e3d004c68ddaf7bee39fa36
commit 7c03bbb23d0fc0987e3d004c68ddaf7bee39fa36
Author: Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2022-06-01 12:48:55 +0000
Commit: Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2022-06-01 12:54:48 +0000
mail/p5-Sendmail-Milter: regen patch
---
mail/p5-Sendmail-Milter/files/patch-Makefile.PL | 19 ++++++++++---------
mail/p5-Sendmail-Milter/files/patch-callbacks.c | 8 ++++----
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/mail/p5-Sendmail-Milter/files/patch-Makefile.PL b/mail/p5-Sendmail-Milter/files/patch-Makefile.PL
index b2385e793571..dd15d5c46a18 100644
--- a/mail/p5-Sendmail-Milter/files/patch-Makefile.PL
+++ b/mail/p5-Sendmail-Milter/files/patch-Makefile.PL
@@ -1,6 +1,6 @@
---- Makefile.PL.orig Wed Sep 19 12:42:17 2001
-+++ Makefile.PL Tue Apr 1 14:28:44 2003
-@@ -5,30 +5,16 @@
+--- Makefile.PL.orig 2001-09-19 09:42:17 UTC
++++ Makefile.PL
+@@ -5,31 +5,17 @@ use strict;
use ExtUtils::MakeMaker;
use Config;
@@ -23,18 +23,19 @@
-my $SENDMAIL_PATH = MM->canonpath($ARGV[0]);
-my $SENDMAIL_OBJ_PATH = MM->canonpath($ARGV[1]);
--
++my $MILTER_LIB = "/usr/lib";
++my $MILTER_INCLUDE = "/usr/include/libmilter";
+
-my $MILTER_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libmilter");
-my $SMUTIL_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libsmutil");
-my $SM_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libsm");
-my $MILTER_INCLUDE = MM->catdir($SENDMAIL_PATH, "include");
-my $SENDMAIL_INCLUDE = MM->catdir($SENDMAIL_PATH, "sendmail");
-+my $MILTER_LIB = "/usr/lib";
-+my $MILTER_INCLUDE = "/usr/include/libmilter";
-
+-
sub milter_configure
{
-@@ -37,7 +23,7 @@
+ my $hash_ref = {};
+@@ -37,7 +23,7 @@ sub milter_configure
my $ccflags;
# Standard milter libraries
@@ -43,7 +44,7 @@
# POSIX threads support.
if ($Config{libs} =~ /-lpthread/)
-@@ -82,6 +68,6 @@
+@@ -82,6 +68,6 @@ WriteMakefile(
'CONFIGURE' => \&milter_configure,
'OBJECT' => '$(BASEEXT)$(OBJ_EXT) intpools$(OBJ_EXT) callbacks$(OBJ_EXT)',
'DEFINE' => '',
diff --git a/mail/p5-Sendmail-Milter/files/patch-callbacks.c b/mail/p5-Sendmail-Milter/files/patch-callbacks.c
index c42f07bac09e..aa5cc3c0d175 100644
--- a/mail/p5-Sendmail-Milter/files/patch-callbacks.c
+++ b/mail/p5-Sendmail-Milter/files/patch-callbacks.c
@@ -1,14 +1,14 @@
--- callbacks.c.orig 2000-07-19 06:20:36 UTC
+++ callbacks.c
-@@ -490,6 +490,11 @@ callback_ssockaddr(pTHX_ SV *callback, S
+@@ -489,6 +489,11 @@ callback_ssockaddr(pTHX_ SV *callback, SMFICTX *ctx, c
+ {
XPUSHs(sv_2mortal(newSVpvn((char *)arg_sa,
sizeof(_SOCK_ADDR))));
- }
++ }
+ else if (arg_sa->sa_family == AF_INET6)
+ {
+ XPUSHs(sv_2mortal(newSVpvn((char *)arg_sa,
+ sizeof(struct sockaddr_in6))));
-+ }
+ }
else
{
- XPUSHs(sv_2mortal(newSVsv(&PL_sv_undef)));