* [gentoo-commits] repo/gentoo:master commit in: net-irc/epic5/, net-irc/epic5/files/
@ 2018-04-20 20:01 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2018-04-20 20:01 UTC (permalink / raw
To: gentoo-commits
commit: 8b8dfee6f3f4240ce6844f73b05b022716043a2b
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Apr 20 09:10:49 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 20:00:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8dfee6
net-irc/epic5: epatch->PATCHES=()
Reworked a patch to be -p1 applicable. Also, this ebuild cannot be built
at due to missing xlocale.h on >=glibc-2.26, with or without my changes.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
net-irc/epic5/epic5-1.1.10-r2.ebuild | 22 +++++++++++-----------
.../epic5/files/epic5-1.1.10-socks5-libsocks.patch | 9 ++-------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild
index 323296c7006..289bab3402a 100644
--- a/net-irc/epic5/epic5-1.1.10-r2.ebuild
+++ b/net-irc/epic5/epic5-1.1.10-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
USE_RUBY="ruby22 ruby23"
-inherit autotools eutils multilib ruby-single toolchain-funcs
+inherit autotools ruby-single toolchain-funcs
DESCRIPTION="Epic5 IRC Client"
SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.bz2"
@@ -30,17 +30,17 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P}
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
- "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \
- "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
- "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
- "${FILESDIR}"/${P}-without-localdir.patch \
- "${FILESDIR}"/${P}-socks5-libsocks.patch
-
- eapply_user
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
+ "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \
+ "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
+ "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
+ "${FILESDIR}"/${P}-without-localdir.patch \
+ "${FILESDIR}"/${P}-socks5-libsocks.patch
+)
+src_prepare() {
+ default
eautoconf
}
diff --git a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
index c2555c059e7..4aef0c7d6af 100644
--- a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
+++ b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
@@ -1,13 +1,8 @@
From: Nathan Phillip Brink <binki@gentoo.org>
Subject: Use -lsocks instead of -lsocks5 for `./configure --with-socks5`.
-Index: configure.in
-===================================================================
-RCS file: /home/cvs/repository/epic5/configure.in,v
-retrieving revision 1.101
-diff -u -b -B -u -r1.101 configure.in
---- configure.in 9 Apr 2014 17:51:06 -0000 1.101
-+++ configure.in 4 Sep 2014 00:18:00 -0000
+--- a/configure.in
++++ b/configure.in
@@ -861,7 +861,7 @@
AC_MSG_CHECKING(whether to support SOCKS)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/epic5/, net-irc/epic5/files/
@ 2019-01-26 16:36 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2019-01-26 16:36 UTC (permalink / raw
To: gentoo-commits
commit: c76d64f8cf1e2ea30b50ee3d3aa9f3d895c9b5ca
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 26 16:36:02 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 16:36:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c76d64f8
net-irc/epic5: Debian patch for openssl-1.1
Closes: https://bugs.gentoo.org/676286
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
net-irc/epic5/epic5-2.0.1.ebuild | 5 ++
net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch | 77 +++++++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1.ebuild
index ac3c4b0060a..e5ebd880946 100644
--- a/net-irc/epic5/epic5-2.0.1.ebuild
+++ b/net-irc/epic5/epic5-2.0.1.ebuild
@@ -33,6 +33,11 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}"
+PATCHES=(
+ # From Debian
+ "${FILESDIR}/${P}-openssl-1.1.patch"
+)
+
src_configure() {
# Because of our REQUIRED_USE constraints above, we know that
# ruby_get_use_implementations will only ever return one ruby
diff --git a/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch b/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch
new file mode 100644
index 00000000000..254035e6d38
--- /dev/null
+++ b/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch
@@ -0,0 +1,77 @@
+Index: epic5-2.0/source/crypto.c
+===================================================================
+--- epic5-2.0.orig/source/crypto.c
++++ epic5-2.0/source/crypto.c
+@@ -282,9 +282,9 @@ static char * decipher_evp (const unsign
+ unsigned char *iv = NULL;
+ unsigned long errcode;
+ int outlen2;
+- EVP_CIPHER_CTX a;
+- EVP_CIPHER_CTX_init(&a);
+- EVP_CIPHER_CTX_set_padding(&a, 0);
++ EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new();
++ EVP_CIPHER_CTX_init(a);
++ EVP_CIPHER_CTX_set_padding(a, 0);
+
+ if (ivsize > 0)
+ iv = new_malloc(ivsize);
+@@ -292,18 +292,19 @@ static char * decipher_evp (const unsign
+ if (ivsize > 0)
+ memcpy(iv, ciphertext, ivsize);
+
+- EVP_DecryptInit_ex(&a, type, NULL, NULL, iv);
+- EVP_CIPHER_CTX_set_key_length(&a, passwdlen);
+- EVP_CIPHER_CTX_set_padding(&a, 0);
+- EVP_DecryptInit_ex(&a, NULL, NULL, passwd, NULL);
++ EVP_DecryptInit_ex(a, type, NULL, NULL, iv);
++ EVP_CIPHER_CTX_set_key_length(a, passwdlen);
++ EVP_CIPHER_CTX_set_padding(a, 0);
++ EVP_DecryptInit_ex(a, NULL, NULL, passwd, NULL);
+
+- if (EVP_DecryptUpdate(&a, outbuf, outlen, ciphertext, cipherlen) != 1)
++ if (EVP_DecryptUpdate(a, outbuf, outlen, ciphertext, cipherlen) != 1)
+ yell("EVP_DecryptUpdate died.");
+- if (EVP_DecryptFinal_ex(&a, outbuf + (*outlen), &outlen2) != 1)
++ if (EVP_DecryptFinal_ex(a, outbuf + (*outlen), &outlen2) != 1)
+ yell("EVP_DecryptFinal_Ex died.");
+ *outlen += outlen2;
+
+- EVP_CIPHER_CTX_cleanup(&a);
++ EVP_CIPHER_CTX_cleanup(a);
++ EVP_CIPHER_CTX_free(a);
+
+ ERR_load_crypto_strings();
+ while ((errcode = ERR_get_error()))
+@@ -454,9 +455,9 @@ static char * cipher_evp (const unsigned
+ unsigned long errcode;
+ u_32int_t randomval;
+ int iv_count;
+- EVP_CIPHER_CTX a;
+- EVP_CIPHER_CTX_init(&a);
+- EVP_CIPHER_CTX_set_padding(&a, 0);
++ EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new();
++ EVP_CIPHER_CTX_init(a);
++ EVP_CIPHER_CTX_set_padding(a, 0);
+
+ if (ivsize < 0)
+ ivsize = 0; /* Shenanigans! */
+@@ -480,12 +481,13 @@ static char * cipher_evp (const unsigned
+ if (iv)
+ memcpy(outbuf, iv, ivsize);
+
+- EVP_EncryptInit_ex(&a, type, NULL, NULL, iv);
+- EVP_CIPHER_CTX_set_key_length(&a, passwdlen);
+- EVP_EncryptInit_ex(&a, NULL, NULL, passwd, NULL);
+- EVP_EncryptUpdate(&a, outbuf + ivsize, &outlen, plaintext, plaintextlen);
+- EVP_EncryptFinal_ex(&a, outbuf + ivsize + outlen, &extralen);
+- EVP_CIPHER_CTX_cleanup(&a);
++ EVP_EncryptInit_ex(a, type, NULL, NULL, iv);
++ EVP_CIPHER_CTX_set_key_length(a, passwdlen);
++ EVP_EncryptInit_ex(a, NULL, NULL, passwd, NULL);
++ EVP_EncryptUpdate(a, outbuf + ivsize, &outlen, plaintext, plaintextlen);
++ EVP_EncryptFinal_ex(a, outbuf + ivsize + outlen, &extralen);
++ EVP_CIPHER_CTX_cleanup(a);
++ EVP_CIPHER_CTX_free(a);
+ outlen += extralen;
+
+ ERR_load_crypto_strings();
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-26 16:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-26 16:36 [gentoo-commits] repo/gentoo:master commit in: net-irc/epic5/, net-irc/epic5/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2018-04-20 20:01 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox