[Commits] [SCM] claws branch, master, updated. 3.16.0-54-g8036059

[miras at claws-mail.org]

The branch, master has been updated
       via  80360594f0d55125e97a4831e46fea08b08e95be (commit)
       via  d1c488269e3244759b921c041c77bcd198282af0 (commit)
       via  2ae542a77b687501c99fb4204a71d92abe6efce0 (commit)
       via  bc4915bb92508d919130ad229d8483324b82f039 (commit)
       via  39be80dde52ad1b5815fc14af5bec39068ee55d9 (commit)
       via  22249a5bdbc5930c0a3069804ba9cdf35ec07dec (commit)
       via  c03433163c1b3d0d9aaefc82c7c5a5fa2c413a58 (commit)
       via  7ee8518c9e2538f4c857e4d94dfcb2718edde48c (commit)
       via  29ecadc1cb6d568b5a23e06d9256c0a714cb51a7 (commit)
      from  09301b6e73e4af1b03b6f19d340dd909cf527bcc (commit)

Summary of changes:
 src/plugins/archive/Makefile.am           |    1 +
 src/plugins/clamd/libclamd/clamd-plugin.c |    4 ++++
 src/plugins/gdata/Makefile.am             |    1 +
 3 files changed, 6 insertions(+)


- Log -----------------------------------------------------------------
commit 80360594f0d55125e97a4831e46fea08b08e95be
Author: Michael Rasmussen <mir at datanom.net>
Date:   Fri Feb 9 20:46:54 2018 +0100

    Forgotten changes in commit 09301b6e73e4af1b03b6f19d340dd909cf527bcc
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
index 81991c1..26f1c8d 100644
--- a/src/plugins/archive/Makefile.am
+++ b/src/plugins/archive/Makefile.am
@@ -38,4 +38,5 @@ archive_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
 	$(LIBARCHIVE_CFLAGS)
diff --git a/src/plugins/gdata/Makefile.am b/src/plugins/gdata/Makefile.am
index 4b9ee4e..84ba0ee 100644
--- a/src/plugins/gdata/Makefile.am
+++ b/src/plugins/gdata/Makefile.am
@@ -29,4 +29,5 @@ gdata_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
 	$(GDATA_CFLAGS)

commit d1c488269e3244759b921c041c77bcd198282af0
Merge: 2ae542a 09301b6
Author: Michael Rasmussen <mir at datanom.net>
Date:   Fri Feb 9 20:40:26 2018 +0100

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 2ae542a77b687501c99fb4204a71d92abe6efce0
Merge: bc4915b a4b3b84
Author: Michael Rasmussen <mir at datanom.net>
Date:   Mon Nov 27 22:51:59 2017 +0100

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit bc4915bb92508d919130ad229d8483324b82f039
Merge: 39be80d 8e9f89b
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Nov 16 17:18:24 2017 +0100

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 39be80dde52ad1b5815fc14af5bec39068ee55d9
Merge: 22249a5 51805d8
Author: Michael Rasmussen <mir at datanom.net>
Date:   Fri Oct 27 16:45:01 2017 +0200

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 22249a5bdbc5930c0a3069804ba9cdf35ec07dec
Merge: c034331 3bce048
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Sep 23 22:55:25 2017 +0200

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit c03433163c1b3d0d9aaefc82c7c5a5fa2c413a58
Merge: 7ee8518 2bc71e4
Author: Michael Rasmussen <mir at datanom.net>
Date:   Tue Aug 29 23:07:36 2017 +0200

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 7ee8518c9e2538f4c857e4d94dfcb2718edde48c
Merge: 29ecadc 404c674
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Aug 26 23:56:30 2017 +0200

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 29ecadc1cb6d568b5a23e06d9256c0a714cb51a7
Author: Zhouyang <jiazhouyang09 at gmail.com>
Date:   Fri Aug 4 11:53:26 2017 +0200

    Fix bug #3857: Thanks to Zhouyang
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/plugins/clamd/libclamd/clamd-plugin.c b/src/plugins/clamd/libclamd/clamd-plugin.c
index c72de83..6f1cc59 100644
--- a/src/plugins/clamd/libclamd/clamd-plugin.c
+++ b/src/plugins/clamd/libclamd/clamd-plugin.c
@@ -324,6 +324,10 @@ static int create_socket() {
 			addr_i.sin_family = AF_INET;
 			addr_i.sin_port = htons(Socket->socket.port);
 			hp = gethostbyname(Socket->socket.host);
+			if (!hp) {
+				g_error("fail to get host by: %s", Socket->socket.host);
+				return new_sock;
+			}
 			debug_print("IP socket host: %s:%d\n",
 					Socket->socket.host, Socket->socket.port);
 			bcopy((void *)hp->h_addr, (void *)&addr_i.sin_addr, hp->h_length);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail