[Astlinux-commits] SF.net SVN: astlinux:[6890] branches/1.0/package/msmtp

[<abe...@us...>]

Revision: 6890
          http://sourceforge.net/p/astlinux/code/6890
Author:   abelbeck
Date:     2015-01-01 14:29:47 +0000 (Thu, 01 Jan 2015)
Log Message:
-----------
msmtp, cosmetic build fix (Thanks Michael), and simplify the ignore-AI_IDN patch

Modified Paths:
--------------
    branches/1.0/package/msmtp/msmtp-ignore-AI_IDN.patch
    branches/1.0/package/msmtp/msmtp.mk

Modified: branches/1.0/package/msmtp/msmtp-ignore-AI_IDN.patch
===================================================================
--- branches/1.0/package/msmtp/msmtp-ignore-AI_IDN.patch	2014-12-31 18:38:44 UTC (rev 6889)
+++ branches/1.0/package/msmtp/msmtp-ignore-AI_IDN.patch	2015-01-01 14:29:47 UTC (rev 6890)
@@ -1,13 +1,11 @@
---- msmtp-1.6.0/src/net.c.orig	2014-12-31 12:21:15.000000000 -0600
-+++ msmtp-1.6.0/src/net.c	2014-12-31 12:22:55.000000000 -0600
-@@ -620,9 +620,7 @@
+--- msmtp-1.6.0/src/net.c.orig	2015-01-01 08:15:57.000000000 -0600
++++ msmtp-1.6.0/src/net.c	2015-01-01 08:17:22.000000000 -0600
+@@ -620,7 +620,7 @@
      hints.ai_addr = NULL;
      hints.ai_next = NULL;
      port_string = xasprintf("%d", port);
 -#ifdef AI_IDN
--    hints.ai_flags |= AI_IDN;
--#elif defined(HAVE_LIBIDN)
-+#ifdef HAVE_LIBIDN
++#if 0 && defined(AI_IDN)
+     hints.ai_flags |= AI_IDN;
+ #elif defined(HAVE_LIBIDN)
      idna_to_ascii_lz(hostname, &idn_hostname, 0);
- #endif
-     error_code = getaddrinfo(idn_hostname ? idn_hostname : hostname,

Modified: branches/1.0/package/msmtp/msmtp.mk
===================================================================
--- branches/1.0/package/msmtp/msmtp.mk	2014-12-31 18:38:44 UTC (rev 6889)
+++ branches/1.0/package/msmtp/msmtp.mk	2015-01-01 14:29:47 UTC (rev 6890)
@@ -13,7 +13,7 @@
 	--with-ssl=openssl \
 	--without-libgsasl \
 	--without-libidn \
-	--without-gnome-keyring \
+	--without-libsecret \
 	--sysconfdir=/etc
 
 define MSMTP_INSTALL_TARGET_CMDS

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.