Fix the package to work with the latest python

3 files changed, 41 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4120ab03d4a8..ba14febe850c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mailnag-git
 	pkgdesc = An extensible mail notification daemon
 	pkgver = 20210411.r797.7ef9105
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/pulb/mailnag
 	arch = any
 	license = GPL
@@ -11,6 +11,7 @@ pkgbase = mailnag-git
 	depends = python-httplib2
 	depends = python-xdg
 	depends = python-dbus
+	depends = python-zombie-imp
 	depends = libnotify
 	depends = gst-plugins-base
 	depends = gtk3
@@ -22,7 +23,8 @@ pkgbase = mailnag-git
 	provides = mailnag
 	conflicts = mailnag
 	source = git+https://github.com/pulb/mailnag
+	source = deprecated-ssl.diff
 	sha512sums = SKIP
+	sha512sums = fe0aa6f637dff551639a4d5ec4fc00fc934d67d32cd821b15e5c20e9c15924e9252b0e5ac2efa07909a2cec999241b5abfed4c9965a841ff1be9f830b420c738
 
 pkgname = mailnag-git
-
diff --git a/PKGBUILD b/PKGBUILD
index be42f0446d4b..0693b451e8c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@
 _pkgname=mailnag
 pkgname=$_pkgname-git
 pkgver=20210411.r797.7ef9105
-pkgrel=1
+pkgrel=2
 pkgdesc='An extensible mail notification daemon'
 arch=('any')
 url='https://github.com/pulb/mailnag'
 license=('GPL')
-depends=('python-gobject' 'python-httplib2' 'python-xdg' 'python-dbus' 'libnotify' 'gst-plugins-base' 'gtk3' 'gdk-pixbuf2')
+depends=('python-gobject' 'python-httplib2' 'python-xdg' 'python-dbus' 'python-zombie-imp' 'libnotify' 'gst-plugins-base' 'gtk3' 'gdk-pixbuf2')
 makedepends=('gettext' 'git')
 
 optdepends=(
@@ -20,8 +20,8 @@ optdepends=(
   'networkmanager: network connectivity detection'
 )
 
-source=("git+$url")
-sha512sums=('SKIP')
+source=("git+$url" 'deprecated-ssl.diff')
+sha512sums=('SKIP' 'fe0aa6f637dff551639a4d5ec4fc00fc934d67d32cd821b15e5c20e9c15924e9252b0e5ac2efa07909a2cec999241b5abfed4c9965a841ff1be9f830b420c738')
 conflicts=("$_pkgname")
 provides=("$_pkgname")
 
@@ -30,6 +30,11 @@ pkgver() {
   printf "%s.r%s.%s" "$(git show -s --format=%ci master | sed 's/\ .*//g;s/-//g')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd $_pkgname
+  patch -p1 < ../deprecated-ssl.diff
+}
+
 package() {
   cd $_pkgname
   python setup.py install --root="$pkgdir"
diff --git a/deprecated-ssl.diff b/deprecated-ssl.diff
new file mode 100644
index 000000000000..b22cafa9af36
--- /dev/null
+++ b/deprecated-ssl.diff
@@ -0,0 +1,28 @@
+diff --git a/Mailnag/common/imaplib2.py b/Mailnag/common/imaplib2.py
+index dfce0b4..e97ccab 100644
+--- a/Mailnag/common/imaplib2.py
++++ b/Mailnag/common/imaplib2.py
+@@ -309,6 +309,7 @@ class IMAP4(object):
+         self.compressor = None          # COMPRESS/DEFLATE if not None
+         self.decompressor = None
+         self._tls_established = False
++        self._ssl_context = None
+ 
+         # Create unique tag for this session,
+         # and compile tagged response matcher.
+@@ -492,7 +493,13 @@ class IMAP4(object):
+ 
+             ssl_version =  TLS_MAP[self.tls_level][self.ssl_version]
+ 
+-            self.sock = ssl.wrap_socket(self.sock, self.keyfile, self.certfile, ca_certs=self.ca_certs, cert_reqs=cert_reqs, ssl_version=ssl_version)
++            self._ssl_context = ssl.SSLContext(ssl_version)
++            self._ssl_context.verify_mode = cert_reqs
++            if self.ca_certs:
++                self._ssl_context.load_verify_locations(self.ca_certs)
++            if self.keyfile and self.certfile:
++                self._ssl_context.load_cert_chain(self.certfile, self.keyfile)
++            self.sock = self._ssl_context.wrap_socket(self.sock, server_hostname=self.host)
+             ssl_exc = ssl.SSLError
+             self.read_fd = self.sock.fileno()
+         except ImportError:
+