Merge pull request #8977 from suvari/master
sylpheed: rebuild, fix deps
This commit is contained in:
Kamil ATLI
GitHub
+31
@@ -0,0 +1,31 @@
|
||||
From b554d88ca0032051a19f57dce8dcda298173e6cd Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Ospite <ao2@ao2.it>
|
||||
Date: Fri, 24 Aug 2018 10:46:04 +0200
|
||||
Subject: [PATCH v2] libsylph/ssl.c: Support SNI, some servers (imap.gmail.com)
|
||||
seem to require it
|
||||
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
|
||||
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
|
||||
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
|
||||
|
||||
---
|
||||
libsylph/ssl.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/libsylph/ssl.c b/libsylph/ssl.c
|
||||
index 61e770f8..b4f6be0c 100644
|
||||
--- a/libsylph/ssl.c
|
||||
+++ b/libsylph/ssl.c
|
||||
@@ -262,6 +262,10 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
|
||||
+ SSL_set_tlsext_host_name(sockinfo->ssl, sockinfo->hostname);
|
||||
+#endif
|
||||
+
|
||||
SSL_set_fd(sockinfo->ssl, sockinfo->sock);
|
||||
while ((ret = SSL_connect(sockinfo->ssl)) != 1) {
|
||||
err = SSL_get_error(sockinfo->ssl, ret);
|
||||
--
|
||||
2.19.0.rc2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>sylpheed</Name>
|
||||
@@ -15,26 +15,30 @@
|
||||
<Description>Sylpheed is a simple and lightweight but featureful and easy-to-use e-mail client.</Description>
|
||||
<Archive sha1sum="178424466901572b99fbf8e3bd55d6347f727f3c" type="tarbz2">http://sylpheed.sraoss.jp/sylpheed/v3.7/sylpheed-3.7.0.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>shared-mime-info</Dependency>
|
||||
|
||||
<Dependency>atk-devel</Dependency>
|
||||
<Dependency>gtk2-devel</Dependency>
|
||||
<Dependency>gpgme-devel</Dependency>
|
||||
<Dependency>openldap-client</Dependency>
|
||||
<Dependency>compface-devel</Dependency>
|
||||
<Dependency>gtkspell-devel</Dependency>
|
||||
<Dependency>enchant-devel</Dependency>
|
||||
<Dependency>pango-devel</Dependency>
|
||||
<Dependency>cairo-devel</Dependency>
|
||||
<Dependency>atk-devel</Dependency>
|
||||
<Dependency>openssl-devel</Dependency>
|
||||
<Dependency>enchant-devel</Dependency>
|
||||
<Dependency>compface-devel</Dependency>
|
||||
<Dependency>gtkspell-devel</Dependency>
|
||||
<Dependency>harfbuzz-devel</Dependency>
|
||||
<Dependency>openldap-client</Dependency>
|
||||
<Dependency>fontconfig-devel</Dependency>
|
||||
<Dependency>libgpg-error-devel</Dependency>
|
||||
<Dependency>gdk-pixbuf-devel</Dependency>
|
||||
<Dependency>shared-mime-info</Dependency>
|
||||
<Dependency>libgpg-error-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">sendmail_accelerator.patch</Patch>
|
||||
|
||||
<!-- Use xdg-open for every mime type instead of parsing them and using mailcap file (pb#17534) -->
|
||||
<Patch level="1">add-xdg-support.patch</Patch>
|
||||
<!-- https://sylpheed.sraoss.jp/redmine/issues/306 -->
|
||||
<Patch level="1">v2-0001-libsylph-ssl.c-Support-SNI-some-servers-imap.gmai.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -46,6 +50,7 @@
|
||||
<Dependency release="current">sylpheed</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="doc">/usr/share/doc/sylpheed</Path>
|
||||
<Path fileType="doc">/usr/share/doc/sylpheed/html</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
@@ -53,27 +58,27 @@
|
||||
<Package>
|
||||
<Name>sylpheed</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>shared-mime-info</Dependency>
|
||||
<Dependency>atk</Dependency>
|
||||
<Dependency>dbus</Dependency>
|
||||
<Dependency>gtk2</Dependency>
|
||||
<Dependency>gpgme</Dependency>
|
||||
<Dependency>openldap-client</Dependency>
|
||||
<Dependency>compface</Dependency>
|
||||
<Dependency>gtkspell</Dependency>
|
||||
<Dependency>enchant</Dependency>
|
||||
<Dependency>pango</Dependency>
|
||||
<Dependency>cairo</Dependency>
|
||||
<Dependency>atk</Dependency>
|
||||
<Dependency>fontconfig</Dependency>
|
||||
<Dependency>gdk-pixbuf</Dependency>
|
||||
<Dependency>dbus</Dependency>
|
||||
<Dependency>glib2</Dependency>
|
||||
<Dependency>gpgme</Dependency>
|
||||
<Dependency>enchant</Dependency>
|
||||
<Dependency>openssl</Dependency>
|
||||
<Dependency>freetype</Dependency>
|
||||
<Dependency>compface</Dependency>
|
||||
<Dependency>gtkspell</Dependency>
|
||||
<Dependency>harfbuzz</Dependency>
|
||||
<Dependency>dbus-glib</Dependency>
|
||||
<Dependency>fontconfig</Dependency>
|
||||
<Dependency>gdk-pixbuf</Dependency>
|
||||
<Dependency>openldap-client</Dependency>
|
||||
<Dependency>shared-mime-info</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="doc">/usr/share/doc/sylpheed</Path>
|
||||
<Path fileType="localedata">/usr/share/locale</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="data">/usr/share/pixmaps</Path>
|
||||
@@ -85,6 +90,9 @@
|
||||
<Name>sylpheed-devel</Name>
|
||||
<IsA>library</IsA>
|
||||
<Summary>Development files for sylpheed</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">sylpheed</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include/sylpheed</Path>
|
||||
</Files>
|
||||
@@ -92,7 +100,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="6">
|
||||
<Date>2019-04-26</Date>
|
||||
<Date>2021-02-06</Date>
|
||||
<Version>3.7.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
Reference in New Issue
Block a user