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,53 +1,54 @@ ---- 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; -if ((not $ARGV[0]) or (not $ARGV[1])) -{ - print "Usage: perl Makefile.PL \n"; - print "(e.g. 'perl Makefile.PL ../sendmail ../sendmail/obj.FreeBSD.4.0-RELEASE.i386')\n"; - print "\n"; - exit; -} - if (not $Config{usethreads}) { print "To use this module, your perl interpreter must have been compiled with\n"; print "\t-Dusethreads.\n"; print "\n"; - exit; + exit 1; } -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 - $libs = "-L$MILTER_LIB -L$SMUTIL_LIB -L$SM_LIB -lmilter -lsmutil -lsm"; + $libs = "-L$MILTER_LIB -lmilter"; # 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' => '', - 'INC' => "-I$SENDMAIL_INCLUDE -I$MILTER_INCLUDE", + 'INC' => "-I$MILTER_INCLUDE", ); 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)));