r54988 - in /packages/unstable/balsa/debian: changelog control control.in patches/ patches/build-ssl-1.1.patch patches/series
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Sun Dec 10 17:07:36 UTC 2017
Author: bigon
Date: Sun Dec 10 17:07:36 2017
New Revision: 54988
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54988
Log:
* Fix FTBFS with openssl 1.1.0, thanks to Fedora for the patch (Closes:
#828245)
* Bump Standards-Version to 4.1.2 (no further changes)
Added:
packages/unstable/balsa/debian/patches/
packages/unstable/balsa/debian/patches/build-ssl-1.1.patch
packages/unstable/balsa/debian/patches/series
Modified:
packages/unstable/balsa/debian/changelog
packages/unstable/balsa/debian/control
packages/unstable/balsa/debian/control.in
Modified: packages/unstable/balsa/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/balsa/debian/changelog?rev=54988&op=diff
==============================================================================
--- packages/unstable/balsa/debian/changelog [utf-8] (original)
+++ packages/unstable/balsa/debian/changelog [utf-8] Sun Dec 10 17:07:36 2017
@@ -1,3 +1,11 @@
+balsa (2.5.3-3) UNRELEASED; urgency=medium
+
+ * Fix FTBFS with openssl 1.1.0, thanks to Fedora for the patch (Closes:
+ #828245)
+ * Bump Standards-Version to 4.1.2 (no further changes)
+
+ -- Laurent Bigonville <bigon at debian.org> Sun, 10 Dec 2017 18:01:30 +0100
+
balsa (2.5.3-2) unstable; urgency=medium
* Upload to unstable
Modified: packages/unstable/balsa/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/balsa/debian/control?rev=54988&op=diff
==============================================================================
--- packages/unstable/balsa/debian/control [utf-8] (original)
+++ packages/unstable/balsa/debian/control [utf-8] Sun Dec 10 17:07:36 2017
@@ -24,15 +24,15 @@
libnotify-dev,
libsecret-1-dev,
libsqlite3-dev (>= 2.8),
- libssl1.0-dev (>= 0.9.8),
+ libssl-dev (>= 1.1.0),
libwebkit2gtk-4.0-dev,
libxml2-dev,
pkg-config,
python3-html2text,
yelp-tools,
zlib1g-dev
-Uploaders: Alan Baghumian <alan at technotux.org>, Alberto Garcia <berto at igalia.com>, Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
-Standards-Version: 4.0.0
+Uploaders: Alan Baghumian <alan at technotux.org>, Alberto Garcia <berto at igalia.com>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Standards-Version: 4.1.2
Homepage: https://pawsa.fedorapeople.org/balsa/
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/balsa/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/balsa/
Modified: packages/unstable/balsa/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/balsa/debian/control.in?rev=54988&op=diff
==============================================================================
--- packages/unstable/balsa/debian/control.in [utf-8] (original)
+++ packages/unstable/balsa/debian/control.in [utf-8] Sun Dec 10 17:07:36 2017
@@ -20,7 +20,7 @@
libnotify-dev,
libsecret-1-dev,
libsqlite3-dev (>= 2.8),
- libssl1.0-dev (>= 0.9.8),
+ libssl-dev (>= 1.1.0),
libwebkit2gtk-4.0-dev,
libxml2-dev,
pkg-config,
@@ -28,7 +28,7 @@
yelp-tools,
zlib1g-dev
Uploaders: Alan Baghumian <alan at technotux.org>, @GNOME_TEAM@
-Standards-Version: 4.0.0
+Standards-Version: 4.1.2
Homepage: https://pawsa.fedorapeople.org/balsa/
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/balsa/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/balsa/
Added: packages/unstable/balsa/debian/patches/build-ssl-1.1.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/balsa/debian/patches/build-ssl-1.1.patch?rev=54988&op=file
==============================================================================
--- packages/unstable/balsa/debian/patches/build-ssl-1.1.patch (added)
+++ packages/unstable/balsa/debian/patches/build-ssl-1.1.patch [utf-8] Sun Dec 10 17:07:36 2017
@@ -0,0 +1,78 @@
+diff --git a/libbalsa/imap/auth-cram.c b/libbalsa/imap/auth-cram.c
+index 62e076a..c29d327 100644
+--- a/libbalsa/imap/auth-cram.c
++++ b/libbalsa/imap/auth-cram.c
+@@ -131,7 +131,7 @@ static void
+ hmac_md5 (const char* password, char* challenge,
+ unsigned char* response)
+ {
+- EVP_MD_CTX ctx;
++ EVP_MD_CTX *ctx = EVP_MD_CTX_create();
+ unsigned char ipad[MD5_BLOCK_LEN], opad[MD5_BLOCK_LEN];
+ unsigned char secret[MD5_BLOCK_LEN+1];
+ unsigned int secret_len, chal_len;
+@@ -143,9 +143,9 @@ hmac_md5 (const char* password, char* challenge,
+ /* passwords longer than MD5_BLOCK_LEN bytes are substituted with their MD5
+ * digests */
+ if (secret_len > MD5_BLOCK_LEN) {
+- EVP_DigestInit(&ctx, EVP_md5());
+- EVP_DigestUpdate(&ctx, (const unsigned char*) password, secret_len);
+- EVP_DigestFinal(&ctx, secret, &secret_len);
++ EVP_DigestInit(ctx, EVP_md5());
++ EVP_DigestUpdate(ctx, (const unsigned char*) password, secret_len);
++ EVP_DigestFinal(ctx, secret, &secret_len);
+ }
+ else
+ strncpy ((char *) secret, password, sizeof (secret));
+@@ -161,14 +161,16 @@ hmac_md5 (const char* password, char* challenge,
+ }
+
+ /* inner hash: challenge and ipadded secret */
+- EVP_DigestInit(&ctx, EVP_md5());
+- EVP_DigestUpdate(&ctx, ipad, MD5_BLOCK_LEN);
+- EVP_DigestUpdate(&ctx, (unsigned char*) challenge, chal_len);
+- EVP_DigestFinal(&ctx, response, NULL);
++ EVP_DigestInit(ctx, EVP_md5());
++ EVP_DigestUpdate(ctx, ipad, MD5_BLOCK_LEN);
++ EVP_DigestUpdate(ctx, (unsigned char*) challenge, chal_len);
++ EVP_DigestFinal(ctx, response, NULL);
+
+ /* outer hash: inner hash and opadded secret */
+- EVP_DigestInit(&ctx, EVP_md5());
+- EVP_DigestUpdate(&ctx, opad, MD5_BLOCK_LEN);
+- EVP_DigestUpdate(&ctx, response, chal_len);
+- EVP_DigestFinal(&ctx, response, NULL);
++ EVP_DigestInit(ctx, EVP_md5());
++ EVP_DigestUpdate(ctx, opad, MD5_BLOCK_LEN);
++ EVP_DigestUpdate(ctx, response, MD5_DIGEST_LEN);
++ EVP_DigestFinal(ctx, response, NULL);
++
++ EVP_MD_CTX_destroy(ctx);
+ }
+diff --git a/libbalsa/imap/pop3.c b/libbalsa/imap/pop3.c
+index 5cb6dd5..a72ce61 100644
+--- a/libbalsa/imap/pop3.c
++++ b/libbalsa/imap/pop3.c
+@@ -310,16 +310,17 @@ get_apop_stamp(const char *greeting, char *stamp)
+ static void
+ compute_auth_hash(char *stamp, char *hash, const char *passwd)
+ {
+- EVP_MD_CTX ctx;
++ EVP_MD_CTX* ctx = EVP_MD_CTX_create();
+ register unsigned char *dp;
+ register char *cp;
+ unsigned char *ep;
+ unsigned char digest[16];
+
+- EVP_DigestInit(&ctx, EVP_md5());
+- EVP_DigestUpdate(&ctx, stamp, strlen(stamp));
+- EVP_DigestUpdate(&ctx, passwd, strlen(passwd));
+- EVP_DigestFinal(&ctx, digest, NULL);
++ EVP_DigestInit(ctx, EVP_md5());
++ EVP_DigestUpdate(ctx, stamp, strlen(stamp));
++ EVP_DigestUpdate(ctx, passwd, strlen(passwd));
++ EVP_DigestFinal(ctx, digest, NULL);
++ EVP_MD_CTX_destroy(ctx);
+
+ cp = hash;
+ dp = digest;
Added: packages/unstable/balsa/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/balsa/debian/patches/series?rev=54988&op=file
==============================================================================
--- packages/unstable/balsa/debian/patches/series (added)
+++ packages/unstable/balsa/debian/patches/series [utf-8] Sun Dec 10 17:07:36 2017
@@ -0,0 +1 @@
+build-ssl-1.1.patch
More information about the pkg-gnome-commits
mailing list