Attachment 167078 Details for Bug 207246 – the patch

[patch] the patch

milter-greylist.txt (text/plain), 4.88 KB, created by m.tsatsenko on 2016-02-16 11:49:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: m.tsatsenko

Created: 2016-02-16 11:49:24 UTC

Size: 4.88 KB

patch

obsolete

>diff -urN milter-greylist.orig/Makefile milter-greylist/Makefile
>--- milter-greylist.orig/Makefile	2016-02-16 13:28:55.377085539 +0300
>+++ milter-greylist/Makefile	2016-02-16 14:44:00.001774545 +0300
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	milter-greylist
> PORTVERSION=	4.4.3
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	mail
> MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
> 		http://fossies.org/unix/privat/
>@@ -31,9 +31,8 @@
> # installed port preference over it.
> ##
> 
>-OPTIONS_DEFINE=		SPF GEOIP CURL DKIM LDAP P0F POSTFIX DOCS EXAMPLES
>+OPTIONS_DEFINE=		SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES
> SPF_DESC=		SPF support
>-DKIM_DESC=		DKIM support
> CURL_DESC=		curl support
> P0F_DESC=		P0F support
> POSTFIX_DESC=		Use Postfix instead of Sendmail
>@@ -42,7 +41,6 @@
> SPF_LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
> CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
> GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
>-DKIM_LIB_DEPENDS=	libdkim.so:${PORTSDIR}/mail/libdkim
> 
> POSTFIX_CONFIGURE_ENABLE=	postfix
> POSTFIX_LDFLAGS_OFF=		${SENDMAIL_LDFLAGS}
>@@ -50,10 +48,9 @@
> 
> P0F_CONFIGURE_ENABLE=		p0f306
> 
>-DKIM_CONFIGURE_WITH=		--with-libdkim=${LOCALBASE}
>-SPF_CONFIGURE_WITH=		--with-libspf2=${LOCALBASE}
>-GEOIP__CONFIGURE_WITH=		--with-libGeoIP=${LOCALBASE}
>-CURL_CONFIGURE_WITH=		--with-libcurl=${LOCALBASE}
>+SPF_CONFIGURE_ON=		--with-libspf2=${LOCALBASE}
>+GEOIP_CONFIGURE_ON=		--with-libGeoIP=${LOCALBASE}
>+CURL_CONFIGURE_ON=		--with-libcurl=${LOCALBASE}
> LDAP_CONFIGURE_ON=		--with-openldap=${LOCALBASE}
> LDAP_LDFLAGS=			-L${LOCALBASE}/lib
> LDAP_USE=			OPENLDAP=yes
>diff -urN milter-greylist.orig/files/patch-configure milter-greylist/files/patch-configure
>--- milter-greylist.orig/files/patch-configure	2016-02-16 13:28:55.376134878 +0300
>+++ milter-greylist/files/patch-configure	1970-01-01 03:00:00.000000000 +0300
>@@ -1,13 +0,0 @@
>-Index: configure
>-diff -u configure.orig configure
>---- configure.orig	2013-03-07 22:26:11.000000000 +0900
>-+++ configure	2013-03-14 15:35:15.476674058 +0900
>-@@ -5899,7 +5899,7 @@
>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
>- $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
>- if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
>--  LIBS="$LIBS -lpthread"
>-+  true; #LIBS="$LIBS -lpthread"
>- else
>-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
>- $as_echo_n "checking for pthread_create in -lc_r... " >&6; }
>diff -urN milter-greylist.orig/files/patch-greylist.conf milter-greylist/files/patch-greylist.conf
>--- milter-greylist.orig/files/patch-greylist.conf	2016-02-16 13:28:55.376134878 +0300
>+++ milter-greylist/files/patch-greylist.conf	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>---- greylist.conf.orig	2009-02-13 01:39:01.000000000 +0300
>-+++ greylist.conf	2009-04-22 09:10:46.000000000 +0400
>-@@ -9,7 +9,7 @@
>- socket "/var/milter-greylist/milter-greylist.sock"
>- dumpfile "/var/milter-greylist/greylist.db" 600
>- dumpfreq 1
>--user "smmsp"
>-+user "mailnull:mailnull"
>- 
>- # Log milter-greylist activity to a file
>- #stat ">>/var/milter-greylist/greylist.log" \
>diff -urN milter-greylist.orig/files/patch-ldapcheck.c milter-greylist/files/patch-ldapcheck.c
>--- milter-greylist.orig/files/patch-ldapcheck.c	2016-02-16 13:28:55.376134878 +0300
>+++ milter-greylist/files/patch-ldapcheck.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,25 +0,0 @@
>---- ldapcheck.c.orig	2009-04-09 05:26:46.000000000 +0200
>-+++ ldapcheck.c	2009-10-23 23:57:42.000000000 +0200
>-@@ -58,6 +58,22 @@
>- #include "prop.h"
>- #include "ldapcheck.h"
>- 
>-+#ifndef SIMPLEQ_HEAD 
>-+# define SIMPLEQ_HEAD			STAILQ_HEAD
>-+# define SIMPLEQ_HEAD_INITIALIZER	STAILQ_HEAD_INITIALIZER
>-+# define SIMPLEQ_ENTRY 			STAILQ_ENTRY
>-+# define SIMPLEQ_INIT 			STAILQ_INIT
>-+# define SIMPLEQ_INSERT_HEAD 		STAILQ_INSERT_HEAD
>-+# define SIMPLEQ_INSERT_TAIL 		STAILQ_INSERT_TAIL
>-+# define SIMPLEQ_INSERT_AFTER 		STAILQ_INSERT_AFTER
>-+# define SIMPLEQ_REMOVE_HEAD 		STAILQ_REMOVE_HEAD
>-+# define SIMPLEQ_FOREACH 		STAILQ_FOREACH
>-+# define SIMPLEQ_EMPTY 			STAILQ_EMPTY
>-+# define SIMPLEQ_FIRST 			STAILQ_FIRST
>-+# define SIMPLEQ_NEXT 			STAILQ_NEXT
>-+# define SIMPLEQ_REMOVE 		STAILQ_REMOVE
>-+#endif
>-+
>- struct ldapconf_entry {
>- 	char *lc_url;
>- 	char *lc_dn;
>diff -urN milter-greylist.orig/files/patch-sync.c milter-greylist/files/patch-sync.c
>--- milter-greylist.orig/files/patch-sync.c	2016-02-16 13:28:55.377085539 +0300
>+++ milter-greylist/files/patch-sync.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,17 +0,0 @@
>-Index: sync.c
>-diff -u -p sync.c.orig sync.c
>---- sync.c.orig	2010-04-17 12:19:02.000000000 +0900
>-+++ sync.c	2013-03-14 14:57:39.284674283 +0900
>-@@ -478,7 +478,11 @@ peer_connect(peer)	/* peer list is read-
>- #ifdef AF_INET6
>- 		case AF_INET6:
>- 			SA6(res->ai_addr)->sin6_port = service;
>--			laddrstr = "::";
>-+			if (conf.c_syncsrcaddr != NULL) {
>-+				laddrstr = conf.c_syncsrcaddr;
>-+			} else {
>-+				laddrstr = "::";
>-+			}
>- 			break;
>- #endif
>- 		default:

Flags:

m.tsatsenko: maintainer-approval-

Actions: View | Diff

Attachments on bug 207246: 167078 | 168489