Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Oct 2018 10:19:29 +0000 (UTC)
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r482481 - in head/mail/opendkim: . files
Message-ID:  <201810201019.w9KAJTC8072863@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Sat Oct 20 10:19:29 2018
New Revision: 482481
URL: https://svnweb.freebsd.org/changeset/ports/482481

Log:
  Fixed problems with OpenSSL 1.1.1 and an error message regarding lua.
  
  PR:		223568
  Submitted by:	freebsd-ports@dan.me.uk
  Reported by:	pi@FreeBSD.org
  Reviewed by:	mfechner@FreeBSD.org
  Approved by:	mentors (implicit)

Modified:
  head/mail/opendkim/Makefile
  head/mail/opendkim/files/patch-libopendkim__tests__Makefile.in
  head/mail/opendkim/files/patch-libopendkim_dkim-canon.c
  head/mail/opendkim/files/patch-opendkim__tests__Makefile.in

Modified: head/mail/opendkim/Makefile
==============================================================================
--- head/mail/opendkim/Makefile	Sat Oct 20 10:10:59 2018	(r482480)
+++ head/mail/opendkim/Makefile	Sat Oct 20 10:19:29 2018	(r482481)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opendkim
 PORTVERSION=	2.10.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/Previous%20Releases \
@@ -20,12 +20,9 @@ LICENSE_GROUPS_SENDMAIL=FSF OSI
 LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
 LICENSE_PERMS_SENDMAIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	checking for library containing SSL_library_init... no
-
 GNU_CONFIGURE=	yes
 NO_OPTIONS_SORT=yes
-USES=		libtool perl5 pkgconfig shebangfix ssl
+USES=		autoreconf libtool perl5 pkgconfig shebangfix ssl
 USE_PERL5=	run
 SHEBANG_FILES=	opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \
 		reprrd/opendkim-reprrdimport*
@@ -158,10 +155,9 @@ LDFLAGS+=		-lpthread
 .endif
 
 pre-configure:
-	${REINPLACE_CMD} -e '/LIBLUA_LIBS/s/lua5\.[0-9]/lua-${LUA_VER}/' \
-	    -e '/PKG_CONFIG/s/lua5\.[0-9]/lua-${LUA_VER}/'		 \
+	${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/s/lua5\.[0-9]/lua-${LUA_VER}/' \
 	    -e '/PKG_CONFIG/s/cyrussasl/libsasl2/'			 \
-	    ${WRKSRC}/configure
+	    ${WRKSRC}/configure.ac
 
 post-patch-LCOV-on:
 	${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/libopendkim/tests/

Modified: head/mail/opendkim/files/patch-libopendkim__tests__Makefile.in
==============================================================================
--- head/mail/opendkim/files/patch-libopendkim__tests__Makefile.in	Sat Oct 20 10:10:59 2018	(r482480)
+++ head/mail/opendkim/files/patch-libopendkim__tests__Makefile.in	Sat Oct 20 10:19:29 2018	(r482481)
@@ -1,6 +1,6 @@
 --- libopendkim/tests/Makefile.in.orig	2015-05-12 18:43:48 UTC
 +++ libopendkim/tests/Makefile.in
-@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_set
+@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_setup); \
        { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
      END { for (dir in files) print dir, files[dir] }'
  am__base_list = \

Modified: head/mail/opendkim/files/patch-libopendkim_dkim-canon.c
==============================================================================
--- head/mail/opendkim/files/patch-libopendkim_dkim-canon.c	Sat Oct 20 10:10:59 2018	(r482480)
+++ head/mail/opendkim/files/patch-libopendkim_dkim-canon.c	Sat Oct 20 10:19:29 2018	(r482481)
@@ -1,6 +1,6 @@
---- libopendkim/dkim-canon.c.orig	2015-08-26 08:37:01 UTC
+--- libopendkim/dkim-canon.c.orig	2015-05-11 03:56:13 UTC
 +++ libopendkim/dkim-canon.c
-@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dst
+@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dstring *dstr, dk
  		}
  
  		/* skip all spaces before first word */

Modified: head/mail/opendkim/files/patch-opendkim__tests__Makefile.in
==============================================================================
--- head/mail/opendkim/files/patch-opendkim__tests__Makefile.in	Sat Oct 20 10:10:59 2018	(r482480)
+++ head/mail/opendkim/files/patch-opendkim__tests__Makefile.in	Sat Oct 20 10:19:29 2018	(r482481)
@@ -1,6 +1,6 @@
 --- opendkim/tests/Makefile.in.orig	2015-05-12 18:43:49 UTC
 +++ opendkim/tests/Makefile.in
-@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_set
+@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_setup); \
        { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
      END { for (dir in files) print dir, files[dir] }'
  am__base_list = \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810201019.w9KAJTC8072863>