[arch-commits] Commit in balsa/repos (8 files)
Christian Hesse
eworm at archlinux.org
Thu Mar 9 15:52:35 UTC 2017
Date: Thursday, March 9, 2017 @ 15:52:35
Author: eworm
Revision: 215406
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
balsa/repos/community-testing-i686/
balsa/repos/community-testing-i686/PKGBUILD
(from rev 215405, balsa/trunk/PKGBUILD)
balsa/repos/community-testing-i686/balsa-openssl-1.1.patch
(from rev 215405, balsa/trunk/balsa-openssl-1.1.patch)
balsa/repos/community-testing-i686/balsa.changelog
(from rev 215405, balsa/trunk/balsa.changelog)
balsa/repos/community-testing-x86_64/
balsa/repos/community-testing-x86_64/PKGBUILD
(from rev 215405, balsa/trunk/PKGBUILD)
balsa/repos/community-testing-x86_64/balsa-openssl-1.1.patch
(from rev 215405, balsa/trunk/balsa-openssl-1.1.patch)
balsa/repos/community-testing-x86_64/balsa.changelog
(from rev 215405, balsa/trunk/balsa.changelog)
--------------------------------------------------+
community-testing-i686/PKGBUILD | 50 +++++++++++++
community-testing-i686/balsa-openssl-1.1.patch | 78 +++++++++++++++++++++
community-testing-i686/balsa.changelog | 11 ++
community-testing-x86_64/PKGBUILD | 50 +++++++++++++
community-testing-x86_64/balsa-openssl-1.1.patch | 78 +++++++++++++++++++++
community-testing-x86_64/balsa.changelog | 11 ++
6 files changed, 278 insertions(+)
Copied: balsa/repos/community-testing-i686/PKGBUILD (from rev 215405, balsa/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2017-03-09 15:52:35 UTC (rev 215406)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
+
+pkgname=balsa
+pkgver=2.5.3
+pkgrel=4
+pkgdesc="An e-mail client for GNOME"
+arch=('i686' 'x86_64')
+url='http://pawsa.fedorapeople.org/balsa/'
+license=('GPL')
+depends=('gmime' 'webkit2gtk' 'libesmtp' 'libnotify'
+ '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')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # Fix build with openssl 1.1 (Fedora)
+ patch -p1 -i ../balsa-openssl-1.1.patch
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-gpgme=gpgme-config \
+ --with-gss \
+ --with-ldap \
+ --with-gtksourceview \
+ --with-spell-checker=gspell \
+ --with-rubrica \
+ --with-sqlite \
+ --with-gnome \
+ --with-html-widget=webkit2
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make GTK_UPDATE_ICON_CACHE=/bin/true DESTDIR="${pkgdir}" install
+}
Copied: balsa/repos/community-testing-i686/balsa-openssl-1.1.patch (from rev 215405, balsa/trunk/balsa-openssl-1.1.patch)
===================================================================
--- community-testing-i686/balsa-openssl-1.1.patch (rev 0)
+++ community-testing-i686/balsa-openssl-1.1.patch 2017-03-09 15:52:35 UTC (rev 215406)
@@ -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;
Copied: balsa/repos/community-testing-i686/balsa.changelog (from rev 215405, balsa/trunk/balsa.changelog)
===================================================================
--- community-testing-i686/balsa.changelog (rev 0)
+++ community-testing-i686/balsa.changelog 2017-03-09 15:52:35 UTC (rev 215406)
@@ -0,0 +1,11 @@
+2016-12-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * balsa 2.5.3-1
+
+2016-04-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * balsa 2.5.2-3 pacman hooks rebuild
+
+2015-07-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * balsa 2.5.2-1
+
+2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * balsa 2.5.1-1
Copied: balsa/repos/community-testing-x86_64/PKGBUILD (from rev 215405, balsa/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2017-03-09 15:52:35 UTC (rev 215406)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
+
+pkgname=balsa
+pkgver=2.5.3
+pkgrel=4
+pkgdesc="An e-mail client for GNOME"
+arch=('i686' 'x86_64')
+url='http://pawsa.fedorapeople.org/balsa/'
+license=('GPL')
+depends=('gmime' 'webkit2gtk' 'libesmtp' 'libnotify'
+ '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')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # Fix build with openssl 1.1 (Fedora)
+ patch -p1 -i ../balsa-openssl-1.1.patch
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-gpgme=gpgme-config \
+ --with-gss \
+ --with-ldap \
+ --with-gtksourceview \
+ --with-spell-checker=gspell \
+ --with-rubrica \
+ --with-sqlite \
+ --with-gnome \
+ --with-html-widget=webkit2
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make GTK_UPDATE_ICON_CACHE=/bin/true DESTDIR="${pkgdir}" install
+}
Copied: balsa/repos/community-testing-x86_64/balsa-openssl-1.1.patch (from rev 215405, balsa/trunk/balsa-openssl-1.1.patch)
===================================================================
--- community-testing-x86_64/balsa-openssl-1.1.patch (rev 0)
+++ community-testing-x86_64/balsa-openssl-1.1.patch 2017-03-09 15:52:35 UTC (rev 215406)
@@ -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;
Copied: balsa/repos/community-testing-x86_64/balsa.changelog (from rev 215405, balsa/trunk/balsa.changelog)
===================================================================
--- community-testing-x86_64/balsa.changelog (rev 0)
+++ community-testing-x86_64/balsa.changelog 2017-03-09 15:52:35 UTC (rev 215406)
@@ -0,0 +1,11 @@
+2016-12-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * balsa 2.5.3-1
+
+2016-04-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * balsa 2.5.2-3 pacman hooks rebuild
+
+2015-07-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * balsa 2.5.2-1
+
+2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * balsa 2.5.1-1
More information about the arch-commits
mailing list