[arch-commits] Commit in balsa/trunk (3 files)

[Jaroslav Lichtblau]

    Date: Thursday, March 1, 2018 @ 20:24:55
  Author: jlichtblau
Revision: 301108

upgpkg: balsa 2.5.5-1 - new upstream release

Modified:
  balsa/trunk/PKGBUILD
  balsa/trunk/balsa.changelog
Deleted:
  balsa/trunk/balsa-openssl-1.1.patch

-------------------------+
 PKGBUILD                |   15 ++------
 balsa-openssl-1.1.patch |   78 ----------------------------------------------
 balsa.changelog         |    3 +
 3 files changed, 7 insertions(+), 89 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-01 20:22:43 UTC (rev 301107)
+++ PKGBUILD	2018-03-01 20:24:55 UTC (rev 301108)
@@ -5,8 +5,8 @@
 # Contributor: Roman Kyrylych <roman at archlinux.org>
 
 pkgname=balsa
-pkgver=2.5.3
-pkgrel=5
+pkgver=2.5.5
+pkgrel=1
 pkgdesc="An e-mail client for GNOME"
 arch=('x86_64')
 url='http://pawsa.fedorapeople.org/balsa/'
@@ -15,16 +15,9 @@
          'gpgme' 'gtksourceview3' 'gspell' 'desktop-file-utils')
 makedepends=('yelp-tools' 'intltool')
 changelog=$pkgname.changelog
-source=(https://pawsa.fedorapeople.org/balsa/$pkgname-$pkgver.tar.bz2 balsa-openssl-1.1.patch)
-sha256sums=('b896ea6b16b31725e0d81ba4eac398b39ad5c33f2337a260448d2feac7e55396'
-            '53f5639ffe5195803b8526c7a1e1ef2b96f6ba11c21b2a6b67e43c6433b3dca2')
+source=(https://pawsa.fedorapeople.org/balsa/$pkgname-$pkgver.tar.bz2)
+sha256sums=('ff2bb1150581d0ba10af5fb8f843072299899fa6efdb68a7f510f7b679409c5c')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # Fix build with openssl 1.1 (Fedora)
-  patch -p1 -i ../balsa-openssl-1.1.patch
-}
-
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
 

Deleted: balsa-openssl-1.1.patch
===================================================================
--- balsa-openssl-1.1.patch	2018-03-01 20:22:43 UTC (rev 301107)
+++ balsa-openssl-1.1.patch	2018-03-01 20:24:55 UTC (rev 301108)
@@ -1,78 +0,0 @@
-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;

Modified: balsa.changelog
===================================================================
--- balsa.changelog	2018-03-01 20:22:43 UTC (rev 301107)
+++ balsa.changelog	2018-03-01 20:24:55 UTC (rev 301108)
@@ -1,3 +1,6 @@
+2018-03-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* balsa 2.5.5-1
+
 2016-12-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* balsa 2.5.3-1