* [gentoo-commits] repo/gentoo:master commit in: www-client/w3mmee/files/, www-client/w3mmee/
@ 2018-03-31 14:02 Akinori Hattori
0 siblings, 0 replies; 5+ messages in thread
From: Akinori Hattori @ 2018-03-31 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 9686ccba79d936298b2cd8dfd541371100ca79a2
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 14:01:54 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 14:01:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9686ccba
www-client/w3mmee: fix build
Closes: https://bugs.gentoo.org/586258
Package-Manager: Portage-2.3.24, Repoman-2.3.6
www-client/w3mmee/files/w3mmee-time.patch | 32 +++++++++++++++++++++++++++
www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild | 1 +
2 files changed, 33 insertions(+)
diff --git a/www-client/w3mmee/files/w3mmee-time.patch b/www-client/w3mmee/files/w3mmee-time.patch
new file mode 100644
index 00000000000..c63d6542c32
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-time.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/586258
+
+Author: kouyu <ckyoog@gmail.com>
+
+--- a/terms.c
++++ b/terms.c
+@@ -305,11 +305,7 @@
+ struct timeval *tout)
+ {
+ static struct timeval polltv = {
+-#if CLOCKS_PER_SEC > 1
+- 0, 1000000 / CLOCKS_PER_SEC
+-#else
+- 0, 10000
+-#endif
++ 0, CLOCKS_PER_SEC > 1 ? 1000000 / CLOCKS_PER_SEC : 10000
+ };
+ int m;
+ struct timeval tv;
+@@ -779,11 +775,7 @@
+ #endif
+
+ static struct timeval display_delta = {
+-#if CLOCKS_PER_SEC > 1
+- 0, 1000000 / CLOCKS_PER_SEC,
+-#else
+- 0, 10000
+-#endif
++ 0, CLOCKS_PER_SEC > 1 ? 1000000 / CLOCKS_PER_SEC : 10000
+ };
+
+ static int
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
index f96eff96014..b08f0b4a398 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-gcc-4.4.patch
"${FILESDIR}"/${PN}-gcc-4.5.patch
"${FILESDIR}"/${PN}-glibc-2.14.patch
+ "${FILESDIR}"/${PN}-time.patch
"${FILESDIR}"/${PN}-tinfo.patch
"${FILESDIR}"/${PN}-w3mman-gentoo.patch
)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/w3mmee/files/, www-client/w3mmee/
@ 2018-03-31 14:02 Akinori Hattori
0 siblings, 0 replies; 5+ messages in thread
From: Akinori Hattori @ 2018-03-31 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 3567cc0d71f9b867c7410eb8c368f28aebb90bf4
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 13:54:18 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 13:54:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3567cc0d
www-client/w3mmee: update patches
Package-Manager: Portage-2.3.24, Repoman-2.3.6
....2_p24-boehm-gc.patch => w3mmee-boehm-gc.patch} | 2 --
.../{w3mmee-gcc44.patch => w3mmee-gcc-4.4.patch} | 5 ++---
.../{w3mmee-gcc45.patch => w3mmee-gcc-4.5.patch} | 4 ++--
..._p24-glibc214.patch => w3mmee-glibc-2.14.patch} | 4 ----
...ee-0.3.2_p24-tinfo.patch => w3mmee-tinfo.patch} | 2 --
www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff | 23 ----------------------
www-client/w3mmee/files/w3mmee-w3mman-gentoo.patch | 21 ++++++++++++++++++++
www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild | 13 ++++++------
www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild | 15 +++++++-------
9 files changed, 40 insertions(+), 49 deletions(-)
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch b/www-client/w3mmee/files/w3mmee-boehm-gc.patch
similarity index 81%
rename from www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch
rename to www-client/w3mmee/files/w3mmee-boehm-gc.patch
index 81e6a6dea0f..d9bafa06904 100644
--- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch
+++ b/www-client/w3mmee/files/w3mmee-boehm-gc.patch
@@ -1,5 +1,3 @@
-diff --git a/configure b/configure
-index 32afb35..3be66fd 100755
--- a/configure
+++ b/configure
@@ -1503,7 +1503,7 @@ if [ -n "$gclib" -a -n "$gcinclude" ]; then
diff --git a/www-client/w3mmee/files/w3mmee-gcc44.patch b/www-client/w3mmee/files/w3mmee-gcc-4.4.patch
similarity index 50%
rename from www-client/w3mmee/files/w3mmee-gcc44.patch
rename to www-client/w3mmee/files/w3mmee-gcc-4.4.patch
index 092adb5ba40..e724244ab86 100644
--- a/www-client/w3mmee/files/w3mmee-gcc44.patch
+++ b/www-client/w3mmee/files/w3mmee-gcc-4.4.patch
@@ -1,6 +1,5 @@
-diff -ur w3mmee-p24-22.orig/indep.c w3mmee-p24-22/indep.c
---- w3mmee-p24-22.orig/indep.c 2002-11-27 16:35:37.000000000 +0200
-+++ w3mmee-p24-22/indep.c 2009-07-25 23:06:52.000000000 +0300
+--- a/indep.c
++++ b/indep.c
@@ -14,7 +14,7 @@
{
#ifdef HAVE_STRTOLL
diff --git a/www-client/w3mmee/files/w3mmee-gcc45.patch b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch
similarity index 92%
rename from www-client/w3mmee/files/w3mmee-gcc45.patch
rename to www-client/w3mmee/files/w3mmee-gcc-4.5.patch
index db6f86e4dee..e0b13f92c5f 100644
--- a/www-client/w3mmee/files/w3mmee-gcc45.patch
+++ b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch
@@ -4,8 +4,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=317815
Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
---- configure
-+++ configure
+--- a/configure
++++ b/configure
@@ -2636,7 +2636,7 @@
fi
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch b/www-client/w3mmee/files/w3mmee-glibc-2.14.patch
similarity index 85%
rename from www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch
rename to www-client/w3mmee/files/w3mmee-glibc-2.14.patch
index dc9be94732c..7a2b0d9cb39 100644
--- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch
+++ b/www-client/w3mmee/files/w3mmee-glibc-2.14.patch
@@ -1,5 +1,3 @@
-diff --git a/istream.c b/istream.c
-index de5fbd3..6718b41 100644
--- a/istream.c
+++ b/istream.c
@@ -132,7 +132,7 @@ newFileStream(FILE *f, void (*closep)())
@@ -11,8 +9,6 @@ index de5fbd3..6718b41 100644
stream->handle.file->f = f;
if (closep)
-diff --git a/istream.h b/istream.h
-index 168882f..3e7132f 100644
--- a/istream.h
+++ b/istream.h
@@ -20,7 +20,7 @@ struct stream_buffer {
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch b/www-client/w3mmee/files/w3mmee-tinfo.patch
similarity index 84%
rename from www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch
rename to www-client/w3mmee/files/w3mmee-tinfo.patch
index 603e30bb403..c29f43ada30 100644
--- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch
+++ b/www-client/w3mmee/files/w3mmee-tinfo.patch
@@ -1,5 +1,3 @@
-diff --git a/configure b/configure
-index 73e247b..32afb35 100755
--- a/configure
+++ b/configure
@@ -1354,7 +1354,7 @@ main()
diff --git a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff b/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff
deleted file mode 100644
index 967e679f02b..00000000000
--- a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in w3mmee-p24-19/scripts/w3mman/w3mman.in
---- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in 2002-03-17 14:07:08.000000000 +0900
-+++ w3mmee-p24-19/scripts/w3mman/w3mman.in 2003-12-06 20:49:15.000000000 +0900
-@@ -1,7 +1,7 @@
- #!@PERL@
-
- @W3M = split(' ', '@W3M@');
--$ENV{'MAN'} = '@MAN@';
-+$ENV{'MAN'} = 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
- $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
-
- sub usage {
-diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in
---- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in 2002-03-17 14:07:08.000000000 +0900
-+++ w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in 2003-12-06 20:49:53.000000000 +0900
-@@ -1,6 +1,6 @@
- #!@PERL@
-
--$MAN = $ENV{'MAN'} || '@MAN@';
-+$MAN = $ENV{'MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
- $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0];
- $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0;
- $CGI = "file://$SCRIPT_NAME";
diff --git a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.patch b/www-client/w3mmee/files/w3mmee-w3mman-gentoo.patch
new file mode 100644
index 00000000000..dd669191e76
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-w3mman-gentoo.patch
@@ -0,0 +1,21 @@
+--- a/scripts/w3mman/w3mman.in
++++ b/scripts/w3mman/w3mman.in
+@@ -1,7 +1,7 @@
+ #!@PERL@
+
+ @W3M = split(' ', '@W3M@');
+-$ENV{'MAN'} = '@MAN@';
++$ENV{'MAN'} = 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
+
+ sub usage {
+--- a/scripts/w3mman/w3mman2html.cgi.in
++++ b/scripts/w3mman/w3mman2html.cgi.in
+@@ -1,6 +1,6 @@
+ #!@PERL@
+
+-$MAN = $ENV{'MAN'} || '@MAN@';
++$MAN = $ENV{'MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0];
+ $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0;
+ $CGI = "file://$SCRIPT_NAME";
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
index a7fcda4f911..ce4b10e46f5 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit alternatives eutils toolchain-funcs multilib
@@ -33,11 +33,12 @@ S=${WORKDIR}/${MY_P}
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \
- "${FILESDIR}"/${PN}-gcc4{4,5}.patch \
- "${FILESDIR}"/${P}-glibc214.patch \
- "${FILESDIR}"/${P}-tinfo.patch \
- "${FILESDIR}"/${P}-boehm-gc.patch
+ epatch "${FILESDIR}"/${PN}-boehm-gc.patch
+ epatch "${FILESDIR}"/${PN}-gcc-4.4.patch
+ epatch "${FILESDIR}"/${PN}-gcc-4.5.patch
+ epatch "${FILESDIR}"/${PN}-glibc-2.14.patch
+ epatch "${FILESDIR}"/${PN}-tinfo.patch
+ epatch "${FILESDIR}"/${PN}-w3mman-gentoo.patch
sed -ie "/^AR=/s:ar:$(tc-getAR):" XMakefile || die
}
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild
index d475f7bc2ae..9aec0de8636 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -36,12 +36,13 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \
- "${FILESDIR}"/${PN}-gcc4{4,5}.patch \
- "${FILESDIR}"/${P}-glibc214.patch \
- "${FILESDIR}"/${P}-tinfo.patch \
- "${FILESDIR}"/${P}-boehm-gc.patch
- sed -ie "/^AR=/s:ar:$(tc-getAR):" XMakefile || die
+ epatch "${FILESDIR}"/${PN}-boehm-gc.patch
+ epatch "${FILESDIR}"/${PN}-gcc-4.4.patch
+ epatch "${FILESDIR}"/${PN}-gcc-4.5.patch
+ epatch "${FILESDIR}"/${PN}-glibc-2.14.patch
+ epatch "${FILESDIR}"/${PN}-tinfo.patch
+ epatch "${FILESDIR}"/${PN}-w3mman-gentoo.patch
+ sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile
}
src_compile() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/w3mmee/files/, www-client/w3mmee/
@ 2018-04-01 12:24 Akinori Hattori
0 siblings, 0 replies; 5+ messages in thread
From: Akinori Hattori @ 2018-04-01 12:24 UTC (permalink / raw
To: gentoo-commits
commit: f65b6d0c3c80ed0f9e041f728b7c41ff44224d26
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 1 11:57:05 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Apr 1 12:23:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f65b6d0c
www-client/w3mmee: update patches
Package-Manager: Portage-2.3.24, Repoman-2.3.6
www-client/w3mmee/files/w3mmee-gcc-4.5.patch | 6 ++----
.../files/{w3mmee-w3mman-gentoo.patch => w3mmee-w3mman.patch} | 0
www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild | 2 +-
www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/www-client/w3mmee/files/w3mmee-gcc-4.5.patch b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch
index e0b13f92c5f..3e7d1aa0cc0 100644
--- a/www-client/w3mmee/files/w3mmee-gcc-4.5.patch
+++ b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch
@@ -1,8 +1,6 @@
-Fixing build with gcc-4.5
+https://bugs.gentoo.org/317815
-https://bugs.gentoo.org/show_bug.cgi?id=317815
-
-Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+Author: Kacper Kowalik <xarthisius.kk@gmail.com>
--- a/configure
+++ b/configure
diff --git a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.patch b/www-client/w3mmee/files/w3mmee-w3mman.patch
similarity index 100%
rename from www-client/w3mmee/files/w3mmee-w3mman-gentoo.patch
rename to www-client/w3mmee/files/w3mmee-w3mman.patch
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
index b08f0b4a398..9d1a74ccfa0 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-glibc-2.14.patch
"${FILESDIR}"/${PN}-time.patch
"${FILESDIR}"/${PN}-tinfo.patch
- "${FILESDIR}"/${PN}-w3mman-gentoo.patch
+ "${FILESDIR}"/${PN}-w3mman.patch
)
DOCS=( ChangeLog NEWS{,.mee} README )
HTML_DOCS=( 00INCOMPATIBLE.html )
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
index ce4b10e46f5..d49a167a56c 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
@@ -38,7 +38,7 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-gcc-4.5.patch
epatch "${FILESDIR}"/${PN}-glibc-2.14.patch
epatch "${FILESDIR}"/${PN}-tinfo.patch
- epatch "${FILESDIR}"/${PN}-w3mman-gentoo.patch
+ epatch "${FILESDIR}"/${PN}-w3mman.patch
sed -ie "/^AR=/s:ar:$(tc-getAR):" XMakefile || die
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/w3mmee/files/, www-client/w3mmee/
@ 2019-12-13 13:23 Akinori Hattori
0 siblings, 0 replies; 5+ messages in thread
From: Akinori Hattori @ 2019-12-13 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 6516073d0e9c7d9ee55175ea96ac264946dad406
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 13:22:12 2019 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 13:23:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6516073d
www-client/w3mmee: fix build with >=dev-libs/openssl-1.1
Closes: https://bugs.gentoo.org/682902
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
www-client/w3mmee/files/w3mmee-openssl-1.1.patch | 92 ++++++++++++++++++++++++
www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild | 3 +-
2 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/www-client/w3mmee/files/w3mmee-openssl-1.1.patch b/www-client/w3mmee/files/w3mmee-openssl-1.1.patch
new file mode 100644
index 00000000000..8d7087c93a2
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-openssl-1.1.patch
@@ -0,0 +1,92 @@
+--- a/configure
++++ b/configure
+@@ -1230,7 +1230,7 @@
+ def_param format_nice n
+ def_param id_ext y
+ def_param use_bufinfo y
+-def_param use_egd y
++def_param use_egd n
+ def_param enable_remove_trailingspaces n
+ def_param menu_thin_frame n
+ def_param emacs_like_lineedit $include_opt
+--- a/istream.c
++++ b/istream.c
+@@ -770,7 +770,11 @@
+ gn = sk_GENERAL_NAME_value(alt, i);
+
+ if (gn->type == GEN_DNS) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ char *sn = ASN1_STRING_data(gn->d.ia5);
++#else
++ char *sn = ASN1_STRING_get0_data(gn->d.ia5);
++#endif
+ int sl = ASN1_STRING_length(gn->d.ia5);
+
+ if (!seen_dnsname)
+--- a/url.c
++++ b/url.c
+@@ -20,8 +20,8 @@
+ #include "regex.h"
+
+ #ifdef USE_SSL
+-#ifndef SSLEAY_VERSION_NUMBER
+-#include <crypto.h> /* SSLEAY_VERSION_NUMBER may be here */
++#ifndef OPENSSL_VERSION_NUMBER
++#include <crypto.h> /* OPENSSL_VERSION_NUMBER may be here */
+ #endif
+ #include <err.h>
+ #endif
+@@ -126,7 +126,7 @@
+ ssl_accept_this_site(NULL);
+ }
+
+-#if SSLEAY_VERSION_NUMBER >= 0x00905100
++#if OPENSSL_VERSION_NUMBER >= 0x00905100
+ #include <rand.h>
+ static void
+ init_PRNG()
+@@ -154,7 +154,7 @@
+ if (file)
+ RAND_write_file(file);
+ }
+-#endif /* SSLEAY_VERSION_NUMBER >= 0x00905100 */
++#endif /* OPENSSL_VERSION_NUMBER >= 0x00905100 */
+
+ static SSL *
+ openSSLHandle(int sock, char *hostname, char **p_cert)
+@@ -188,12 +188,16 @@
+ #endif /* defined(USE_SSL_VERIFY) */
+ if (ssl_ctx == NULL) {
+ int option;
+-#if SSLEAY_VERSION_NUMBER < 0x0800
++#if OPENSSL_VERSION_NUMBER < 0x0800
+ ssl_ctx = SSL_CTX_new();
+ X509_set_default_verify_paths(ssl_ctx->cert);
+-#else /* SSLEAY_VERSION_NUMBER >= 0x0800 */
++#else /* OPENSSL_VERSION_NUMBER >= 0x0800 */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ SSLeay_add_ssl_algorithms();
+ SSL_load_error_strings();
++#else
++ OPENSSL_init_ssl(0, NULL);
++#endif
+ if (!(ssl_ctx = SSL_CTX_new(SSLv23_client_method())))
+ goto eend;
+ option = SSL_OP_ALL;
+@@ -233,13 +237,13 @@
+ if (SSL_CTX_load_verify_locations(ssl_ctx, ssl_ca_file, ssl_ca_path))
+ #endif /* defined(USE_SSL_VERIFY) */
+ SSL_CTX_set_default_verify_paths(ssl_ctx);
+-#endif /* SSLEAY_VERSION_NUMBER >= 0x0800 */
++#endif /* OPENSSL_VERSION_NUMBER >= 0x0800 */
+ }
+ handle = SSL_new(ssl_ctx);
+ SSL_set_fd(handle, sock);
+-#if SSLEAY_VERSION_NUMBER >= 0x00905100
++#if OPENSSL_VERSION_NUMBER >= 0x00905100
+ init_PRNG();
+-#endif /* SSLEAY_VERSION_NUMBER >= 0x00905100 */
++#endif /* OPENSSL_VERSION_NUMBER >= 0x00905100 */
+ if (SSL_connect(handle) > 0) {
+ Str serv_cert = ssl_get_certificate(handle, hostname);
+ if (serv_cert) {
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
index 839f8427a0f..e14ba864ecc 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-gcc-4.4.patch
"${FILESDIR}"/${PN}-gcc-4.5.patch
"${FILESDIR}"/${PN}-glibc-2.14.patch
+ "${FILESDIR}"/${PN}-openssl-1.1.patch
"${FILESDIR}"/${PN}-rc_name.patch
"${FILESDIR}"/${PN}-time.patch
"${FILESDIR}"/${PN}-tinfo.patch
@@ -77,7 +78,7 @@ src_configure() {
else
myuse+=( use_ssl=n )
fi
- # Obsolete imlib-1 disabled, bug #678910
+ # bug #678910
myuse+=( use_image=n )
cat <<-EOF >> config.param
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/w3mmee/files/, www-client/w3mmee/
@ 2020-06-16 14:20 Akinori Hattori
0 siblings, 0 replies; 5+ messages in thread
From: Akinori Hattori @ 2020-06-16 14:20 UTC (permalink / raw
To: gentoo-commits
commit: 1cbb72d72215c830304bbef32c9212d24e7cd250
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 14:19:50 2020 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 14:19:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbb72d7
www-client/w3mmee: fix build with >=sys-devel/gcc-10
Closes: https://bugs.gentoo.org/706604
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
www-client/w3mmee/files/w3mmee-gcc-10.patch | 17 +++++++++++++++++
www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild | 1 +
2 files changed, 18 insertions(+)
diff --git a/www-client/w3mmee/files/w3mmee-gcc-10.patch b/www-client/w3mmee/files/w3mmee-gcc-10.patch
new file mode 100644
index 00000000000..262be512dc1
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-gcc-10.patch
@@ -0,0 +1,17 @@
+--- a/fm.h
++++ b/fm.h
+@@ -1191,12 +1191,12 @@
+ global TextList *mimetypes_list;
+ global char *mailcap_files init("0, " USER_MAILCAP ", 0, " SYS_MAILCAP ", 1, " GLOBAL_MAILCAP);
+ global char *mimetypes_files init(USER_MIMETYPES ", " SYS_MIMETYPES);
+-global TextList mailcap_entries;
++extern TextList mailcap_entries;
+
+ global struct mailcap **UserBrowsecap init(NULL);
+ global TextList *browsecap_list;
+ global char *browsecap_files init(USER_BROWSECAP ", " SYS_BROWSECAP);
+-global TextList browsecap_entries;
++extern TextList browsecap_entries;
+
+ global TextList *fileToDelete;
+
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
index 1a707e3bfcd..96d017eb15b 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
@@ -35,6 +35,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-boehm-gc.patch
"${FILESDIR}"/${PN}-gcc-4.4.patch
"${FILESDIR}"/${PN}-gcc-4.5.patch
+ "${FILESDIR}"/${PN}-gcc-10.patch
"${FILESDIR}"/${PN}-glibc-2.14.patch
"${FILESDIR}"/${PN}-openssl-1.1.patch
"${FILESDIR}"/${PN}-rc_name.patch
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-06-16 14:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-13 13:23 [gentoo-commits] repo/gentoo:master commit in: www-client/w3mmee/files/, www-client/w3mmee/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2020-06-16 14:20 Akinori Hattori
2018-04-01 12:24 Akinori Hattori
2018-03-31 14:02 Akinori Hattori
2018-03-31 14:02 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox