From be6868dd47738c82d7a2b3dd7d3caa48807febe6 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 9 Oct 2017 13:51:09 -0700 Subject: [PATCH] bump(net-misc/socat): sync with upstream --- .../metadata/md5-cache/net-misc/socat-1.7.3.1 | 4 +- .../metadata/md5-cache/net-misc/socat-1.7.3.2 | 14 + .../md5-cache/net-misc/socat-2.0.0_beta9 | 14 +- .../metadata/md5-cache/net-misc/socat-9999 | 13 +- .../portage-stable/net-misc/socat/ChangeLog | 162 ----- .../net-misc/socat/ChangeLog-2015 | 588 ------------------ .../portage-stable/net-misc/socat/Manifest | 9 +- .../files/socat-2.0.0_beta9-libressl.patch | 267 ++++++++ .../net-misc/socat/socat-1.7.3.1.ebuild | 3 +- .../net-misc/socat/socat-1.7.3.2.ebuild | 70 +++ .../net-misc/socat/socat-2.0.0_beta9.ebuild | 38 +- .../net-misc/socat/socat-9999.ebuild | 40 +- 12 files changed, 425 insertions(+), 797 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-1.7.3.2 delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/socat/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/socat/ChangeLog-2015 create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.3.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-1.7.3.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-1.7.3.1 index 3636ed11ff..255b5acca9 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-1.7.3.1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-1.7.3.1 @@ -4,11 +4,11 @@ DESCRIPTION=Multipurpose relay (SOcket CAT) EAPI=5 HOMEPAGE=http://www.dest-unreach.org/socat/ IUSE=ssl readline ipv6 tcpd -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos LICENSE=GPL-2 RDEPEND=ssl? ( dev-libs/openssl:0= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) RESTRICT=test SLOT=0 SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.3.1.tar.bz2 _eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 -_md5_=b697e22940b8c7d879ca3a1dfdef62c6 +_md5_=d75f14137b11399d0ef0d73ea8cac3ec diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-1.7.3.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-1.7.3.2 new file mode 100644 index 0000000000..bb236f7246 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-1.7.3.2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install prepare setup +DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Multipurpose relay (SOcket CAT) +EAPI=6 +HOMEPAGE=http://www.dest-unreach.org/socat/ +IUSE=bindist libressl ssl readline ipv6 tcpd +KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +LICENSE=GPL-2 +RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) +RESTRICT=test ssl? ( readline? ( bindist ) ) +SLOT=0 +SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.3.2.tar.bz2 +_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 +_md5_=b367f18adeac118b7408a353a592980d diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-2.0.0_beta9 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-2.0.0_beta9 index dd0a6a2279..0f1e5a1348 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-2.0.0_beta9 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-2.0.0_beta9 @@ -1,13 +1,13 @@ -DEFINED_PHASES=configure install prepare -DEPEND=ssl? ( dev-libs/openssl:0= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=configure install prepare setup +DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=Multipurpose relay (SOcket CAT) -EAPI=5 +EAPI=6 HOMEPAGE=http://www.dest-unreach.org/socat/ -IUSE=ssl readline ipv6 tcpd +IUSE=libressl ssl readline ipv6 tcpd LICENSE=GPL-2 -RDEPEND=ssl? ( dev-libs/openssl:0= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) -RESTRICT=test +RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) +RESTRICT=test ssl? ( readline? ( bindist ) ) SLOT=0 SRC_URI=http://www.dest-unreach.org/socat/download/socat-2.0.0-b9.tar.bz2 _eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 -_md5_=334d53e34ec2b8c5c5d3769ddc4b8ba2 +_md5_=e0fce1541a5378d1b4c3d10d2316e125 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-9999 index 06a8cce362..d4b4c560da 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/socat-9999 @@ -1,12 +1,11 @@ -DEFINED_PHASES=configure install prepare unpack -DEPEND=ssl? ( dev-libs/openssl:0= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) app-text/yodl >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1 +DEFINED_PHASES=configure install prepare setup unpack +DEPEND=app-text/yodl >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1 DESCRIPTION=Multipurpose relay (SOcket CAT) -EAPI=5 +EAPI=6 HOMEPAGE=http://www.dest-unreach.org/socat/ -IUSE=ssl readline ipv6 tcpd +IUSE=libressl ssl readline ipv6 tcpd LICENSE=GPL-2 -RDEPEND=ssl? ( dev-libs/openssl:0= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) -RESTRICT=test +RESTRICT=test ssl? ( readline? ( bindist ) ) SLOT=0 _eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 -_md5_=cf1d773d5106c5d885c2ef5a70785664 +_md5_=d80fdf2011d4c89e5a442e5b28bdee1c diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/ChangeLog b/sdk_container/src/third_party/portage-stable/net-misc/socat/ChangeLog deleted file mode 100644 index b8bd4cb7aa..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/ChangeLog +++ /dev/null @@ -1,162 +0,0 @@ -# ChangeLog for net-misc/socat -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*socat-9999 (09 Aug 2015) -*socat-2.0.0_beta8 (09 Aug 2015) -*socat-1.7.3.0 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson - +files/socat-1.7.2.1-long-long.patch, +files/socat-1.7.2.4-linux-3.17.patch, - +files/socat-1.7.3.0-filan-build.patch, +metadata.xml, - +socat-1.7.3.0.ebuild, +socat-2.0.0_beta8.ebuild, +socat-9999.ebuild: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - -*socat-1.7.3.0-r1 (10 Nov 2015) - - 10 Nov 2015; Jeroen Roovers +socat-1.7.3.0-r1.ebuild, - socat-2.0.0_beta8.ebuild, socat-9999.ebuild: - Add USE=libressl (bug #565244 by Marek Behun). - - Package-Manager: portage-2.2.24 - - 10 Nov 2015; Jeroen Roovers - -files/socat-1.7.2.1-long-long.patch, -files/socat-1.7.2.4-linux-3.17.patch: - Remove obsolete patches. - - Package-Manager: portage-2.2.24 - - 10 Nov 2015; Jeroen Roovers -socat-1.7.3.0-r1.ebuild, - socat-2.0.0_beta8.ebuild, socat-9999.ebuild: - Revert "net-misc/socat: Add USE=libressl (bug #565244 by Marek Behun)." - - This reverts commit 0e5abdb838cacb1d804dce26fb8639c6bd55b0f9. - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - -*socat-2.0.0_beta9 (01 Feb 2016) -*socat-1.7.3.1 (01 Feb 2016) - - 01 Feb 2016; Jeroen Roovers +socat-1.7.3.1.ebuild, - +socat-2.0.0_beta9.ebuild: - Version bump. - - Package-Manager: portage-2.2.27 - - 01 Feb 2016; Jeroen Roovers -socat-2.0.0_beta8.ebuild: - Old. - - Package-Manager: portage-2.2.27 - - 01 Feb 2016; Jeroen Roovers socat-1.7.3.1.ebuild: - Reinstate patch. - - Package-Manager: portage-2.2.27 - - 01 Feb 2016; Jeroen Roovers socat-1.7.3.1.ebuild, - socat-2.0.0_beta9.ebuild, socat-9999.ebuild: - Set SLOT deps. - - Package-Manager: portage-2.2.27 - - 02 Feb 2016; Jeroen Roovers socat-1.7.3.1.ebuild: - Stable for HPPA (bug #573602). - - Package-Manager: portage-2.2.27 - RepoMan-Options: --ignore-arches - - 02 Feb 2016; Tobias Klausmann socat-1.7.3.1.ebuild: - add alpha keyword - - Gentoo-Bug: 573602 - - Package-Manager: portage-2.2.27 - - 03 Feb 2016; Agostino Sarubbo socat-1.7.3.1.ebuild: - amd64 stable wrt bug #573602 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo - - 03 Feb 2016; Agostino Sarubbo socat-1.7.3.1.ebuild: - x86 stable wrt bug #573602 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo - - 14 Feb 2016; Markus Meier socat-1.7.3.1.ebuild: - arm stable, bug #573602 - - Package-Manager: portage-2.2.27 - RepoMan-Options: --include-arches="arm" - - 02 Mar 2016; Mike Frysinger socat-1.7.3.1.ebuild: - mark 1.7.3.1 ia64/ppc/sparc stable #573602 - - 02 Mar 2016; Jeroen Roovers -socat-1.7.3.0.ebuild: - Old. - - Package-Manager: portage-2.2.27 - - 05 Mar 2016; Jeroen Roovers - +files/socat-1.7.3.1-stddef_h.patch, socat-1.7.3.1.ebuild, - socat-2.0.0_beta9.ebuild, socat-9999.ebuild: - Fix building with USE=-ssl (bug #576270 by Jan Chren (rindeal)). - - Package-Manager: portage-2.2.27 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/net-misc/socat/ChangeLog-2015 deleted file mode 100644 index fa6cb4ad8b..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/ChangeLog-2015 +++ /dev/null @@ -1,588 +0,0 @@ -# ChangeLog for net-misc/socat -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.158 2015/04/26 01:08:36 radhermit Exp $ - - 26 Apr 2015; Tim Harder socat-2.0.0_beta8.ebuild: - Fix patch filename. - -*socat-2.0.0_beta8 (25 Apr 2015) - - 25 Apr 2015; Mike Frysinger +socat-2.0.0_beta8.ebuild, - -socat-2.0.0_beta7-r1.ebuild: - Version bump. - - 25 Apr 2015; Mike Frysinger - +files/socat-1.7.3.0-filan-build.patch, socat-1.7.3.0.ebuild: - Fix from Chromium OS for parallel build failures. - -*socat-9999 (08 Mar 2015) - - 08 Mar 2015; Jeroen Roovers socat-1.7.3.0.ebuild, - socat-2.0.0_beta7-r1.ebuild, +socat-9999.ebuild: - Add live ebuild. Drop unneeded dependency on sys-libs/ncurses. - - 08 Mar 2015; Jeroen Roovers -socat-1.7.2.4-r1.ebuild: - Old. - - 24 Feb 2015; Agostino Sarubbo socat-1.7.3.0.ebuild: - Stable for alpha, wrt bug #537592 - - 23 Feb 2015; Agostino Sarubbo socat-1.7.3.0.ebuild: - Stable for ia64, wrt bug #537592 - - 16 Feb 2015; Agostino Sarubbo socat-1.7.3.0.ebuild: - Stable for sparc, wrt bug #537592 - - 15 Feb 2015; Agostino Sarubbo socat-1.7.3.0.ebuild: - Stable for x86, wrt bug #537592 - - 31 Jan 2015; Agostino Sarubbo socat-1.7.3.0.ebuild: - Stable for ppc, wrt bug #537592 - - 28 Jan 2015; Agostino Sarubbo socat-1.7.3.0.ebuild: - Stable for amd64, wrt bug #537592 - - 25 Jan 2015; Markus Meier socat-1.7.3.0.ebuild: - arm stable, bug #537592 - - 25 Jan 2015; Jeroen Roovers socat-1.7.3.0.ebuild: - Stable for HPPA (bug #537592). - -*socat-1.7.3.0 (25 Jan 2015) - - 25 Jan 2015; Jeroen Roovers +socat-1.7.3.0.ebuild: - Version bump (bug #537592). - - 27 Oct 2014; Jeroen Roovers socat-1.7.2.4-r1.ebuild, - +files/socat-1.7.2.4-linux-3.17.patch: - Fix building against sys-kernel/linux-headers-3.17 (bug #526946 by Gangræna - Gorgeous). - - 20 Jul 2014; Jeroen Roovers -socat-1.7.2.3.ebuild: - Old. - - 20 Jul 2014; Tobias Klausmann socat-1.7.2.4-r1.ebuild: - Stable on alpha, bug #508092 - - 12 Jul 2014; Jeroen Roovers socat-1.7.2.4-r1.ebuild: - Stable for SPARC (bug #508092). - - 22 Jun 2014; Akinori Hattori socat-1.7.2.4-r1.ebuild: - ia64 stable wrt bug #508092 - - 08 Jun 2014; Agostino Sarubbo socat-1.7.2.4-r1.ebuild: - Stable for ppc, wrt bug #508092 - - 07 Jun 2014; Agostino Sarubbo socat-1.7.2.4-r1.ebuild: - Stable for x86, wrt bug #508092 - - 28 May 2014; Chema Alonso socat-1.7.2.4-r1.ebuild: - Stable for amd64 wrt bug #508092 - - 27 Apr 2014; Markus Meier socat-1.7.2.4-r1.ebuild: - arm stable, bug #508092 - - 25 Apr 2014; Jeroen Roovers socat-1.7.2.4-r1.ebuild: - Stable for HPPA (bug #508092). - -*socat-2.0.0_beta7-r1 (22 Mar 2014) -*socat-1.7.2.4-r1 (22 Mar 2014) - - 22 Mar 2014; Jeroen Roovers -socat-1.7.2.4.ebuild, - +socat-1.7.2.4-r1.ebuild, -socat-2.0.0_beta7.ebuild, - +socat-2.0.0_beta7-r1.ebuild: - Set RESTRICT=test (bug #277104). Do not install examples/VERSION. - - 18 Mar 2014; Jeroen Roovers socat-1.7.2.4.ebuild: - Do not install VERSION. - -*socat-1.7.2.4 (18 Mar 2014) - - 18 Mar 2014; Jeroen Roovers +socat-1.7.2.4.ebuild: - Version bump. - - 17 Mar 2014; Sébastien Fabbro socat-1.7.2.3.ebuild: - Keyword amd64-linux and x86-linux - - 18 Feb 2014; Jeroen Roovers -socat-1.7.2.2.ebuild: - Old. - - 17 Feb 2014; Agostino Sarubbo socat-1.7.2.3.ebuild: - Stable for arm, wrt bug #499668 - - 16 Feb 2014; Agostino Sarubbo socat-1.7.2.3.ebuild: - Stable for ia64, wrt bug #499668 - - 16 Feb 2014; Agostino Sarubbo socat-1.7.2.3.ebuild: - Stable for alpha, wrt bug #499668 - - 09 Feb 2014; Agostino Sarubbo socat-1.7.2.3.ebuild: - Stable for sparc, wrt bug #499668 - - 02 Feb 2014; Agostino Sarubbo socat-1.7.2.3.ebuild: - Stable for ppc, wrt bug #499668 - - 01 Feb 2014; Agostino Sarubbo socat-1.7.2.3.ebuild: - Stable for x86, wrt bug #499668 - - 01 Feb 2014; Agostino Sarubbo socat-1.7.2.3.ebuild: - Stable for amd64, wrt bug #499668 - - 29 Jan 2014; Jeroen Roovers socat-1.7.2.3.ebuild: - Stable for HPPA (bug #499668). - - 29 Jan 2014; Jeroen Roovers socat-1.7.2.3.ebuild: - No need for eautoreconf. - -*socat-2.0.0_beta7 (29 Jan 2014) -*socat-1.7.2.3 (29 Jan 2014) - - 29 Jan 2014; Jeroen Roovers +socat-1.7.2.3.ebuild, - -socat-2.0.0_beta6.ebuild, +socat-2.0.0_beta7.ebuild: - Version bump (bug #499668). - - 09 Jun 2013; Jeroen Roovers -socat-1.7.2.1.ebuild: - Old. - - 09 Jun 2013; Agostino Sarubbo socat-1.7.2.2.ebuild: - Stable for sparc, wrt bug #471354 - - 09 Jun 2013; Agostino Sarubbo socat-1.7.2.2.ebuild: - Stable for ppc, wrt bug #471354 - - 09 Jun 2013; Agostino Sarubbo socat-1.7.2.2.ebuild: - Stable for ia64, wrt bug #471354 - - 09 Jun 2013; Agostino Sarubbo socat-1.7.2.2.ebuild: - Stable for alpha, wrt bug #471354 - - 04 Jun 2013; Sergey Popov socat-1.7.2.2.ebuild: - Stable on amd64 and x86, wrt bug #471354 - - 02 Jun 2013; Markus Meier socat-1.7.2.2.ebuild: - arm stable, bug #471354 - - 28 May 2013; Jeroen Roovers socat-1.7.2.2.ebuild: - Stable for HPPA (bug #471354). - - 27 May 2013; Jeroen Roovers socat-1.7.2.2.ebuild: - Fix ifconfig path in test.sh. - - 27 May 2013; Jeroen Roovers socat-2.0.0_beta6.ebuild: - Remove unneeded autotools. - - 27 May 2013; Jeroen Roovers - -files/socat-1.7.2.0-cross-compile.patch, -socat-2.0.0_beta5.ebuild: - Old. - -*socat-1.7.2.2 (27 May 2013) -*socat-2.0.0_beta6 (27 May 2013) - - 27 May 2013; Jeroen Roovers +socat-1.7.2.2.ebuild, - +socat-2.0.0_beta6.ebuild: - Version bump (bug #471354). - - 02 Dec 2012; Tim Harder socat-1.7.2.1.ebuild: - Inherit autotools eclass (bug #445526). - - 26 Oct 2012; Mike Frysinger - +files/socat-1.7.2.1-long-long.patch, socat-1.7.2.1.ebuild, - socat-2.0.0_beta5.ebuild: - Build x32 support work #436164 by redneb. - - 26 Jul 2012; Christoph Junghans socat-1.7.2.1.ebuild: - added ~x86-macos - - 26 May 2012; Jeroen Roovers -socat-1.7.2.0.ebuild: - Old. - - 26 May 2012; Raúl Porcel socat-1.7.2.1.ebuild: - ia64/sparc stable wrt #415977 - - 26 May 2012; Markus Meier socat-1.7.2.1.ebuild: - arm stable, bug #415977 - - 21 May 2012; Brent Baude socat-1.7.2.1.ebuild: - Marking socat-1.7.2.1 ppc for bug 415977 - - 18 May 2012; Jeff Horelick socat-1.7.2.1.ebuild: - marked x86 per bug 415977 - - 18 May 2012; Agostino Sarubbo socat-1.7.2.1.ebuild: - Stable for amd64, wrt bug #415977 - - 17 May 2012; Tobias Klausmann socat-1.7.2.1.ebuild: - Stable on alpha, bug #415977 - - 14 May 2012; Jeroen Roovers socat-1.7.2.1.ebuild: - Stable for HPPA (bug #415977). - - 14 May 2012; Jeroen Roovers socat-2.0.0_beta5.ebuild: - Remove dependency on app-text/yodl. - -*socat-2.0.0_beta5 (14 May 2012) -*socat-1.7.2.1 (14 May 2012) - - 14 May 2012; Jeroen Roovers +socat-1.7.2.1.ebuild, - -socat-2.0.0_beta4.ebuild, +socat-2.0.0_beta5.ebuild: - Version bump (bug #415977). - - 07 Mar 2012; Jeremy Olexa socat-1.7.2.0.ebuild: - add ~x64-macos, bug 395011 - - 15 Feb 2012; Jeroen Roovers -socat-1.7.1.3.ebuild, - -files/socat-1.7.1.3-cross-compile.patch: - Old. - - 15 Feb 2012; Brent Baude socat-1.7.2.0.ebuild: - Marking socat-1.7.2.0 ppc for bug 399187 - - 31 Jan 2012; Jeroen Roovers socat-1.7.2.0.ebuild: - Stable for HPPA (bug #399187). - - 22 Jan 2012; Raúl Porcel socat-1.7.2.0.ebuild: - alpha/arm/ia64/sparc/x86 stable wrt #399187 - - 17 Jan 2012; Agostino Sarubbo socat-1.7.2.0.ebuild: - Stable for amd64, wrt bug #399187 - - 15 Dec 2011; Mike Frysinger - files/socat-1.7.1.3-cross-compile.patch, - files/socat-1.7.2.0-cross-compile.patch: - Fix cross-compile issues with ospeed offset too. - - 15 Dec 2011; Mike Frysinger socat-1.7.1.3.ebuild, - +files/socat-1.7.1.3-cross-compile.patch, socat-1.7.2.0.ebuild, - +files/socat-1.7.2.0-cross-compile.patch: - Fix cross-compilation with shift defines. - -*socat-1.7.2.0 (06 Dec 2011) - - 06 Dec 2011; Tim Harder +socat-1.7.2.0.ebuild: - Version bump. Update to EAPI 4. - - 20 Aug 2011; Jeroen Roovers metadata.xml: - Remove useless maintainer tag. - - 07 Aug 2010; Raúl Porcel socat-1.7.1.3.ebuild: - alpha/ia64/sparc stable wrt #330785 - - 05 Aug 2010; Markus Meier socat-1.7.1.3.ebuild: - arm stable, bug #330785 - - 05 Aug 2010; Christian Faulhammer socat-1.7.1.3.ebuild: - stable x86, security bug 330785 - - 02 Aug 2010; Markos Chandras socat-1.7.1.3.ebuild: - Stable on amd64 wrt bug #330785 - - 02 Aug 2010; Jeroen Roovers socat-1.7.1.3.ebuild: - Stable for HPPA PPC (bug #330785). - -*socat-2.0.0_beta4 (02 Aug 2010) -*socat-1.7.1.3 (02 Aug 2010) - - 02 Aug 2010; Jeroen Roovers +socat-1.7.1.3.ebuild, - -socat-2.0.0_beta3.ebuild, +socat-2.0.0_beta4.ebuild: - Version bump (bug #330785). - - 21 May 2010; Peter Volkov socat-1.7.1.2.ebuild: - amd64 stable, bug 312455 - - 24 Apr 2010; Fabian Groffen socat-1.7.1.2.ebuild: - Marked ~ppc-macos - - 24 Apr 2010; Fabian Groffen socat-1.7.1.2.ebuild, - socat-2.0.0_beta3.ebuild: - Allow installation on case-insensitive filesystems, bug #310423 - - 18 Apr 2010; socat-1.7.1.2.ebuild: - ppc stable #312455 - - 17 Apr 2010; Raúl Porcel socat-1.7.1.2.ebuild: - alpha/arm/ia64/sparc stable wrt #312455 - - 08 Apr 2010; Pawel Hajdan jr socat-1.7.1.2.ebuild: - x86 stable wrt bug #312455 - - 02 Apr 2010; Jeroen Roovers socat-1.7.1.2.ebuild: - Stable for HPPA (bug #312455). - - 17 Jan 2010; Jeroen Roovers socat-1.7.1.1.ebuild, - socat-1.7.1.2.ebuild, socat-2.0.0_beta3.ebuild: - Filter -Wno-error thanks to Didier Barvaux (bug #293324). - -*socat-1.7.1.2 (13 Jan 2010) - - 13 Jan 2010; Jeroen Roovers +socat-1.7.1.2.ebuild: - Version bump. Remove filter-flags -Wall. - - 01 Jan 2010; Raúl Porcel socat-1.7.1.1.ebuild, - socat-2.0.0_beta3.ebuild: - Add ~arm wrt #289633 - - 14 Aug 2009; Jeroen Roovers -socat-2.0.0_beta1.ebuild, - -socat-2.0.0_beta2.ebuild: - Remove old. - - 13 Jul 2009; Jeroen Roovers - -files/socat-1.6.0.0-noptytest.patch, -socat-1.6.0.1.ebuild: - Remove old. - - 13 Jul 2009; Joseph Jezak socat-1.7.1.1.ebuild: - Marked ppc stable for bug #270855. - - 22 Jun 2009; Jeroen Roovers socat-1.6.0.1.ebuild: - Do apply 1.6.0.0 patch to 1.6.0.1. - - 22 Jun 2009; Jeroen Roovers socat-1.6.0.1.ebuild, - -socat-1.7.0.0.ebuild, -socat-1.7.1.0.ebuild, -socat-1.7.1.0-r1.ebuild, - -files/socat-1.7.1.0-fixsetenv.patch, socat-1.7.1.1.ebuild, - socat-2.0.0_beta1.ebuild, socat-2.0.0_beta2.ebuild, - socat-2.0.0_beta3.ebuild: - Remove old. Do not depend on silly virtual/libc. Set RDEPEND explicitly. - - 22 Jun 2009; Raúl Porcel socat-1.7.1.1.ebuild: - ia64/sparc stable wrt #270855 - - 15 Jun 2009; Tobias Klausmann socat-1.7.1.1.ebuild: - Stable on alpha, bug #270855 - - 11 Jun 2009; Markus Meier socat-1.7.1.1.ebuild: - amd64 stable, bug #270855 - - 11 Jun 2009; Tobias Klausmann socat-1.7.1.0.ebuild: - Stable on alpha, bug #270855 - - 11 Jun 2009; Christian Faulhammer socat-1.7.1.1.ebuild: - stable x86, bug 270855 - - 11 Jun 2009; Tobias Klausmann socat-1.7.1.0.ebuild: - Keyworded on alpha, bug #270855 - - 10 Jun 2009; Jeroen Roovers socat-1.7.1.1.ebuild: - Stable for HPPA (bug #270855). - - 02 Jun 2009; Jeroen Roovers socat-1.7.1.0.ebuild: - Stable for HPPA (bug #270855). - - 31 May 2009; Raúl Porcel socat-1.7.1.0.ebuild: - alpha/ia64/sparc stable wrt #270855 - - 31 May 2009; Markus Meier socat-1.7.1.0.ebuild: - amd64/x86 stable, bug #270855 - - 23 May 2009; Markus Meier socat-1.7.0.0.ebuild: - amd64 stable, bug #267878 - - 10 May 2009; Jeroen Roovers socat-1.7.1.1.ebuild: - Fix build failures when CFLAGS includes -Wall (using strip-flags instead - of patched upstream configure.in. - -*socat-1.7.1.1 (07 May 2009) - - 07 May 2009; Jeroen Roovers +socat-1.7.1.1.ebuild: - Version bump. - - 06 May 2009; Raúl Porcel socat-1.7.0.0.ebuild: - ia64/sparc stable wrt #267878 - - 03 May 2009; Tobias Klausmann socat-1.7.0.0.ebuild: - Stable on alpha, bug #267878 - - 03 May 2009; Tobias Klausmann ChangeLog: - Keyworded on alpha, bug #267878 - - 03 May 2009; Markus Meier socat-1.7.0.0.ebuild: - x86 stable, bug #267878 - -*socat-1.7.1.0-r1 (02 May 2009) - - 02 May 2009; Jeroen Roovers +socat-1.7.1.0-r1.ebuild, - +files/socat-1.7.1.0-fixsetenv.patch: - Apply patch provided by Todd Stansell to fix crashes on systems without - setenv(). - - 02 May 2009; Jeroen Roovers socat-1.7.0.0.ebuild: - Stable for HPPA (bug #267878). - - 29 Apr 2009; Jeroen Roovers -socat-1.6.0.0.ebuild: - Remove old. - -*socat-2.0.0_beta3 (29 Apr 2009) -*socat-1.7.1.0 (29 Apr 2009) - - 29 Apr 2009; Jeroen Roovers +socat-1.7.1.0.ebuild, - +socat-2.0.0_beta3.ebuild: - Version bumps based on contribution by Tim Harder (bug #267848). - - 19 Nov 2008; Raúl Porcel socat-1.6.0.1.ebuild: - alpha/ia64/x86 stable wrt #247089 - - 18 Nov 2008; Jeremy Olexa socat-1.6.0.1.ebuild: - amd64 stable, bug #247089 - - 17 Nov 2008; Ferris McCormick socat-1.6.0.1.ebuild: - Sparc stable, Bug #247089 and its Comment about tests. - - 17 Nov 2008; Jeroen Roovers socat-1.6.0.1.ebuild: - Stable for HPPA (bug #247089). - -*socat-2.0.0_beta2 (16 Nov 2008) -*socat-1.7.0.0 (16 Nov 2008) - - 16 Nov 2008; Peter Volkov -socat-1.4.0.3.ebuild, - -socat-1.4.2.0.ebuild, -socat-1.4.2.0-r1.ebuild, +socat-1.7.0.0.ebuild, - +socat-2.0.0_beta2.ebuild: - Version bump, removed old. - - 16 Jun 2008; Stephanie Lockwood-Childs - socat-1.6.0.1.ebuild: - stable on ppc (bus #210328) - - 26 Feb 2008; Raúl Porcel socat-1.6.0.0.ebuild: - alpha/ia64/sparc stable wrt #210328 - - 25 Feb 2008; Christian Faulhammer socat-1.6.0.0.ebuild: - stable x86/amd64, bug 210328 - - 25 Feb 2008; Jeroen Roovers socat-1.6.0.0.ebuild: - Stable for HPPA (bug #210328). - -*socat-1.6.0.1 (25 Feb 2008) - - 25 Feb 2008; +socat-1.6.0.1.ebuild: - Version bump, thank Aron Griffis for report, bug - #210328. - -*socat-2.0.0_beta1 (26 Jul 2007) - - 26 Jul 2007; Raphael Marichez - +socat-2.0.0_beta1.ebuild: - Version bump for testing - - 14 Apr 2007; Marcelo Goes - -files/socat-1.4.3.0-noptytest.patch, -files/socat-1.4.3.0-tmp-tail.patch, - -socat-1.4.3.0.ebuild, -socat-1.4.3.0-r1.ebuild, -socat-1.4.3.1.ebuild: - Remove old ebuilds. - -*socat-1.6.0.0 (05 Apr 2007) - - 05 Apr 2007; Daniel Black - +files/socat-1.6.0.0-noptytest.patch, +socat-1.6.0.0.ebuild: - version bump - - 09 Feb 2007; Diego Pettenò ChangeLog: - Regenerate digest in Manifest2 format. - -*socat-1.4.3.1 (11 Feb 2006) - - 11 Feb 2006; Marcelo Goes +socat-1.4.3.1.ebuild: - 1.4.3.1 version bump. - - 07 Feb 2006; Simon Stelling socat-1.4.2.0-r1.ebuild: - stable on amd64 - - 24 Dec 2005; Rene Nussbaumer - socat-1.4.2.0-r1.ebuild: - Stable on hppa. - - 11 Nov 2005; Michael Hanselmann - socat-1.4.2.0-r1.ebuild: - Stable on ppc. - - 25 Oct 2005; socat-1.4.2.0-r1.ebuild, - socat-1.4.3.0-r1.ebuild: - Bad DEPEND/RDEPEND syntax fixed. - - 18 Oct 2005; Aron Griffis socat-1.4.2.0-r1.ebuild: - Mark 1.4.2.0-r1 stable on alpha - - 17 Oct 2005; Gustavo Zacarias - socat-1.4.2.0-r1.ebuild: - Stable on sparc - - 17 Oct 2005; Aron Griffis socat-1.4.2.0-r1.ebuild: - Mark 1.4.2.0-r1 stable on ia64 - -*socat-1.4.3.0-r1 (17 Oct 2005) -*socat-1.4.2.0-r1 (17 Oct 2005) - - 17 Oct 2005; +socat-1.4.2.0-r1.ebuild, - +socat-1.4.3.0-r1.ebuild: - Rev bumps as per bug #109331 thanks to James Rowe , new - tcp-wrappers depend added as an option. - -*socat-1.4.3.0 (25 Sep 2005) - - 25 Sep 2005; Daniel Black - +files/socat-1.4.3.0-noptytest.patch, +files/socat-1.4.3.0-tmp-tail.patch, - +metadata.xml, -socat-1.3.0.1.ebuild, -socat-1.3.1.0.ebuild, - -socat-1.3.2.0.ebuild, -socat-1.3.2.1.ebuild, -socat-1.3.2.2.ebuild, - +socat-1.4.3.0.ebuild: - version bump. netmon takes maintance. remove old security vulnerable versions - - 13 Aug 2005; Michael Hanselmann socat-1.4.2.0.ebuild: - Stable on ppc. - - 28 Jun 2005; Gustavo Zacarias socat-1.4.2.0.ebuild: - Stable on sparc - - 28 Jun 2005; Aron Griffis socat-1.4.2.0.ebuild: - stable on alpha amd64 ia64 x86 - -*socat-1.4.2.0 (22 Mar 2005) - - 22 Mar 2005; Chris White +socat-1.4.2.0.ebuild: - Version bump to 1.4.2.0. Closes bug #86187. - - 29 Dec 2004; Ciaran McCreesh : - Change encoding to UTF-8 for GLEP 31 compliance - -*socat-1.4.0.3 (22 Oct 2004) - - 22 Oct 2004; Mike Frysinger +socat-1.4.0.3.ebuild: - Version bump #68547 for security. - - 01 Jul 2004; Jon Hood socat-1.3.0.1.ebuild, - socat-1.3.1.0.ebuild, socat-1.3.2.0.ebuild, socat-1.3.2.1.ebuild, - socat-1.3.2.2.ebuild: - change virtual/glibc to virtual/libc - - 08 Jun 2004; Bryan Østergaard socat-1.3.2.2.ebuild: - Stable on alpha. - -*socat-1.3.2.2 (05 May 2004) - - 05 May 2004; Mike Frysinger : - Version bump and cleanup. - -*socat-1.3.2.1 (13 Sep 2003) - - 26 Apr 2004; Aron Griffis socat-1.3.0.1.ebuild, - socat-1.3.1.0.ebuild, socat-1.3.2.0.ebuild, socat-1.3.2.1.ebuild: - Add die following econf for bug 48950 - - 13 Sep 2003; Ian Leitch socat-1.3.2.1.ebuild: - Version bump to 1.3.2.1 and added ~ppc ~hppa ~amd64 ~sparc ~mips ~arm flags. - Closes bug #28627 - - 02 Aug 2003; Aron Griffis socat-1.3.2.0.ebuild: - Add ~alpha to KEYWORDS - -*socat-1.3.2.0 (30 Jul 2003) - - 30 Jul 2003; Martin Holzer socat-1.3.2.0.ebuild: - Version bumped - -*socat-1.3.1.0 (25 Jun 2003) - - 25 Jun 2003; Martin Holzer socat-1.3.1.0.ebuild: - Version bumped. Closes #21840. - -*socat-1.3.0.1 (12 Jan 2003) - - 12 Jan 2003; Martin Holzer socat-1.3.0.1.ebuild - files/digest-socat-1.3.0.1 ChangeLog : - Initial Version submitted by xplo@xplo.org in #13021 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest index c9d807c9c1..3a32dc6c64 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest @@ -1,10 +1,3 @@ -AUX socat-1.7.3.0-filan-build.patch 1164 SHA256 1916386401f633c4d4e74aa61ca3039580cb69b6d89e69e73e0eaf9d463c1c15 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf WHIRLPOOL 187535c491bb3ba7b83df865077038a054c7aa7ba3a39ad3ba868db62db113bc876f4bf3da6cdffc5cfc03ac6f4ac5ceb5058cf8185622a3dce290772306fa41 -AUX socat-1.7.3.1-stddef_h.patch 1272 SHA256 3401aaadd8b837fea293105431d8f939bf8ee15cc76039726fd7c91add16063f SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf WHIRLPOOL 89bad00d356003fbbb17e00d73f6d2cf7f07a3aa08a4447e421ac31b965ce7fbc4db16d220d0835813b2574bf33a24c5383216cce4212087f699654ed5206430 DIST socat-1.7.3.1.tar.bz2 488467 SHA256 d2da659540c38139f388e9437bfaae16bb458d174d056cb3228432a8f489fbaa SHA512 463340f578d4d1d54458b8ef9573ad3eff51dbcc736205e1b62e9a4782770d4bb76e6a07506350fd35405b130660559aaa79dfa2664c53ea268d7d64231f9b32 WHIRLPOOL 09f0fc537eaad194cac97cce73971c9f69047c648f03788fa69ac3444673ff73f143b2657d0ed28d082e2cfc36829304ed7bf0ff79c7ed75e96c991292f94dd4 +DIST socat-1.7.3.2.tar.bz2 493324 SHA256 e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251 SHA512 9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293 WHIRLPOOL d5b25ee77fd9ac77fd2a0dd33c39ae636cfe380608b8cee0d14f4d2e042bd53f9269edb466ae6c5403ccd5f5e2bff48b5f1ab15504957419f5ec759fc84a84f4 DIST socat-2.0.0-b9.tar.bz2 516673 SHA256 49efb0a5c66b94b279014addc2851faf8ebbd1ec4b7e31c1de7e912d7b4983d2 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 WHIRLPOOL e293f9da0fed9573a02658b79ae87c24e2d88c57f6d8b1ddaeecd52e035b5012eaebbfa82da80f8442da666114d14e1c2767cf929e57b634f762e198ed4e3b50 -EBUILD socat-1.7.3.1.ebuild 1171 SHA256 a7d20af255887b6c0024e251f96957d2d67845b1e4c2f4a52de830a587f1ab81 SHA512 2f7df402b86c02c1642da6b1db3a16465ada07b085a25f7cee502699c3f9d2d3a464e398b563e4ed1dc7213a3885bdbb104e1139d352d8b9436345e4a316002e WHIRLPOOL 03672b8a6124d552e60fed4e1c9e81afda7759ba5a5c2cc62619ce5ef98329d8a66b35d42bd255ccf573a99296ebc82b97af4dbde6f077d7be36a83e8dab1102 -EBUILD socat-2.0.0_beta9.ebuild 1103 SHA256 23699f6ef7eb4cb99282882390fa7493eb3afe7d1626a266ec3614a8b40d9285 SHA512 842c8c5933e974116f8aa185fe05370127ce480768658d5977d98c79def9679690cc4c7ab5a7fec5318b3f04df2abf79e5e6e4c1026ea36cf2a5f5a7d3dfa7de WHIRLPOOL 7d98e79d06c18872ce49eda2594e65242a8f8d9f4af13a346ee693dcbb0c741660d0435b7b43f2c506d3cdd84254db437099c06e6057a0881fe7c633aaeefc57 -EBUILD socat-9999.ebuild 1069 SHA256 41c724b86614a8731967935fdd3675995cd66a559a725c2b6fefdb3ba1a3d75a SHA512 f345932af5d4b1574ebf4aece4013ed8c20a07346907eddc0411d4b5b3c5c87bd5e418cac05d07ba7cb7fbf2318373d2b3e8276b830b38cbf4b858e90908e4b0 WHIRLPOOL d3aebaec9ea3f750f60a54cd29f7a67244da815947ab941c39f04e88f292c83c74418d2d4e8aed52dc40cf11c138485a739273a36c25215e9ce0485ccb2385d6 -MISC ChangeLog 5415 SHA256 751fc10c865a960630cd68e3707131f25f9cf3b7bc39f5eec488790340c456be SHA512 fb69f0f7f6d04436a5836fe6834c25b37ab746d5df54e03636a9063f884e9b9d91ec7ed1dd9333d6263e32c65b7e413d0672b11c2edda6b1562e82a57170ebfa WHIRLPOOL c33f096147b67709630b14bfd2928246bc993e5787f72aa084a4f0ec19ed102ad50f680c7e7553ba1604061b450850fda7c2acf1108075fe0402bd0840cb8f46 -MISC ChangeLog-2015 19923 SHA256 d0348859fac57da6b07b7fe97fef4b91f0b7de949074d1f449b64a65bb1acbf4 SHA512 8495e5fb70a62a43fe847edd30e29c0446f376bf9553662ca9937349e16726e9fdac550ed7d63902af76302ac6ed7d26d3f9716944f61b7201dc8b60b8dd2ae3 WHIRLPOOL 40d1f4ecfa998af5feacf50711e3ee0c385b0eee84e57778fb6cff50fbcce6f9e0ffcc3a89ee216fbfac035d52b3a8dec3bdc49984f6d93a182b09b5d6c27d91 -MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch b/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch new file mode 100644 index 0000000000..535297c04b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch @@ -0,0 +1,267 @@ +From fbb0cc3b65a2ead522019fb461ae520371cc3ede Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marek=20Beh=C3=BAn?= +Date: Mon, 6 Jun 2016 18:41:30 +0200 +Subject: [PATCH] Support compiling with LibreSSL 2.4.0 + +This patch checks for macros OPENSSL_NO_COMP, OPENSSL_NO_EGD, and +if disables those features if they are. + +Also add ifdef for HAVE_SSLv3_{client/server}_method in sslcls.c, +since these were removed from LibreSSL 2.4.0. +--- + sslcls.c | 8 +++++++- + sslcls.h | 4 +++- + xio-openssl.c | 24 ++++++++++++++++++------ + xio-openssl.h | 4 +++- + xioopts.c | 8 ++++++-- + xioopts.h | 4 +++- + 6 files changed, 40 insertions(+), 12 deletions(-) + +diff --git a/sslcls.c b/sslcls.c +index ea4c303..5011ef2 100644 +--- a/sslcls.c ++++ b/sslcls.c +@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) { + } + #endif + ++#if HAVE_SSLv3_client_method + const SSL_METHOD *sycSSLv3_client_method(void) { + const SSL_METHOD *result; + Debug("SSLv3_client_method()"); +@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) { + Debug1("SSLv3_client_method() -> %p", result); + return result; + } ++#endif + ++#if HAVE_SSLv3_server_method + const SSL_METHOD *sycSSLv3_server_method(void) { + const SSL_METHOD *result; + Debug("SSLv3_server_method()"); +@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) { + Debug1("SSLv3_server_method() -> %p", result); + return result; + } ++#endif + + const SSL_METHOD *sycSSLv23_client_method(void) { + const SSL_METHOD *result; +@@ -347,6 +351,7 @@ void sycSSL_free(SSL *ssl) { + return; + } + ++#ifndef OPENSSL_NO_EGD + int sycRAND_egd(const char *path) { + int result; + Debug1("RAND_egd(\"%s\")", path); +@@ -354,6 +359,7 @@ int sycRAND_egd(const char *path) { + Debug1("RAND_egd() -> %d", result); + return result; + } ++#endif + + DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) { + DH *result; +@@ -391,7 +397,7 @@ int sycFIPS_mode_set(int onoff) { + } + #endif /* WITH_FIPS */ + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) { + const COMP_METHOD *result; + Debug1("SSL_get_current_compression(%p)", ssl); +diff --git a/sslcls.h b/sslcls.h +index 152fe5b..9fd8ef2 100644 +--- a/sslcls.h ++++ b/sslcls.h +@@ -49,7 +49,9 @@ X509 *sycSSL_get_peer_certificate(SSL *ssl); + int sycSSL_shutdown(SSL *ssl); + void sycSSL_CTX_free(SSL_CTX *ctx); + void sycSSL_free(SSL *ssl); ++#ifndef OPENSSL_NO_EGD + int sycRAND_egd(const char *path); ++#endif + + DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u); + +@@ -57,7 +59,7 @@ BIO *sycBIO_new_file(const char *filename, const char *mode); + + int sycFIPS_mode_set(int onoff); + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl); + const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl); + const char *sycSSL_COMP_get_name(const COMP_METHOD *comp); +diff --git a/xio-openssl.c b/xio-openssl.c +index c7f283c..38dc20d 100644 +--- a/xio-openssl.c ++++ b/xio-openssl.c +@@ -181,9 +181,11 @@ const struct optdesc opt_openssl_key = { "openssl-key", "key", + const struct optdesc opt_openssl_dhparam = { "openssl-dhparam", "dh", OPT_OPENSSL_DHPARAM, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; + const struct optdesc opt_openssl_cafile = { "openssl-cafile", "cafile", OPT_OPENSSL_CAFILE, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; + const struct optdesc opt_openssl_capath = { "openssl-capath", "capath", OPT_OPENSSL_CAPATH, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; ++#ifndef OPENSSL_NO_EGD + const struct optdesc opt_openssl_egd = { "openssl-egd", "egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; ++#endif + const struct optdesc opt_openssl_pseudo = { "openssl-pseudo", "pseudo", OPT_OPENSSL_PSEUDO, GROUP_OPENSSL, PH_SPEC, TYPE_BOOL, OFUNC_SPEC }; +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + const struct optdesc opt_openssl_compress = { "openssl-compress", "compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING, OFUNC_SPEC }; + #endif + #if WITH_FIPS +@@ -220,7 +222,7 @@ int xio_reset_fips_mode(void) { + static void openssl_conn_loginfo(SSL *ssl) { + Notice1("SSL connection using %s", SSL_get_cipher(ssl)); + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + { + const COMP_METHOD *comp, *expansion; + +@@ -786,7 +788,7 @@ int _xioopen_openssl_listen(struct single *xfd, + #endif /* WITH_LISTEN */ + + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + /* In OpenSSL 0.9.7 compression methods could be added using + * SSL_COMP_add_compression_method(3), but the implemntation is not compatible + * with the standard (RFC3749). +@@ -857,8 +859,10 @@ int + char *opt_dhparam = NULL; /* file name of DH params */ + char *opt_cafile = NULL; /* certificate authority file */ + char *opt_capath = NULL; /* certificate authority directory */ ++#ifndef OPENSSL_NO_EGD + char *opt_egd = NULL; /* entropy gathering daemon socket path */ +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#endif ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + char *opt_compress = NULL; /* compression method */ + #endif + bool opt_pseudo = false; /* use pseudo entropy if nothing else */ +@@ -875,9 +879,11 @@ int + retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath); + retropt_string(opts, OPT_OPENSSL_KEY, &opt_key); + retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam); ++#ifndef OPENSSL_NO_EGD + retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd); ++#endif + retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo); +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress); + #endif + #if WITH_FIPS +@@ -1010,9 +1016,11 @@ int + } + } + ++#ifndef OPENSSL_NO_EGD + if (opt_egd) { + sycRAND_egd(opt_egd); + } ++#endif + + if (opt_pseudo) { + long int randdata; +@@ -1124,7 +1132,7 @@ int + } + #endif /* !defined(EC_KEY) */ + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + if (opt_compress) { + int result; + result = openssl_setup_compression(*ctx, opt_compress); +@@ -1238,7 +1246,11 @@ static int openssl_SSL_ERROR_SSL(int level, const char *funcname) { + if (e == ((ERR_LIB_RAND<<24)| + (RAND_F_SSLEAY_RAND_BYTES<<12)| + (RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) { ++#ifdef OPENSSL_NO_EGD ++ Error("too few entropy; use option \"pseudo\""); ++#else + Error("too few entropy; use options \"egd\" or \"pseudo\""); ++#endif + stat = STAT_NORETRY; + } else { + Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf)); +diff --git a/xio-openssl.h b/xio-openssl.h +index 62586fc..f10ee0c 100644 +--- a/xio-openssl.h ++++ b/xio-openssl.h +@@ -21,9 +21,11 @@ extern const struct optdesc opt_openssl_key; + extern const struct optdesc opt_openssl_dhparam; + extern const struct optdesc opt_openssl_cafile; + extern const struct optdesc opt_openssl_capath; ++#ifndef OPENSSL_NO_EGD + extern const struct optdesc opt_openssl_egd; ++#endif + extern const struct optdesc opt_openssl_pseudo; +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + extern const struct optdesc opt_openssl_compress; + #endif + #if WITH_FIPS +diff --git a/xioopts.c b/xioopts.c +index 6c231f4..9a56298 100644 +--- a/xioopts.c ++++ b/xioopts.c +@@ -303,7 +303,7 @@ const struct optname optionnames[] = { + #if WITH_EXT2 && defined(EXT2_COMPR_FL) + IF_ANY ("compr", &opt_ext2_compr) + #endif +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + IF_OPENSSL("compress", &opt_openssl_compress) + #endif + #ifdef TCP_CONN_ABORT_THRESHOLD /* HP_UX */ +@@ -419,7 +419,9 @@ const struct optname optionnames[] = { + #ifdef ECHOPRT + IF_TERMIOS("echoprt", &opt_echoprt) + #endif ++#ifndef OPENSSL_NO_EGD + IF_OPENSSL("egd", &opt_openssl_egd) ++#endif + IF_ANY ("end-close", &opt_end_close) + IF_TERMIOS("eof", &opt_veof) + IF_TERMIOS("eol", &opt_veol) +@@ -1062,11 +1064,13 @@ const struct optname optionnames[] = { + IF_OPENSSL("openssl-certificate", &opt_openssl_certificate) + IF_OPENSSL("openssl-cipherlist", &opt_openssl_cipherlist) + IF_OPENSSL("openssl-commonname", &opt_openssl_commonname) +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + IF_OPENSSL("openssl-compress", &opt_openssl_compress) + #endif + IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam) ++#ifndef OPENSSL_NO_EGD + IF_OPENSSL("openssl-egd", &opt_openssl_egd) ++#endif + #if WITH_FIPS + IF_OPENSSL("openssl-fips", &opt_openssl_fips) + #endif +diff --git a/xioopts.h b/xioopts.h +index 2a165f5..37d6883 100644 +--- a/xioopts.h ++++ b/xioopts.h +@@ -478,11 +478,13 @@ enum e_optcode { + OPT_OPENSSL_CERTIFICATE, + OPT_OPENSSL_CIPHERLIST, + OPT_OPENSSL_COMMONNAME, +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + OPT_OPENSSL_COMPRESS, + #endif + OPT_OPENSSL_DHPARAM, ++#ifndef OPENSSL_NO_EGD + OPT_OPENSSL_EGD, ++#endif + OPT_OPENSSL_FIPS, + OPT_OPENSSL_KEY, + OPT_OPENSSL_METHOD, +-- +2.7.3 + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.3.1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.3.1.ebuild index e46c58a434..63c88ab0a5 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.3.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.3.1.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=5 inherit autotools eutils flag-o-matic toolchain-funcs @@ -13,7 +12,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="ssl readline ipv6 tcpd" DEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.3.2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.3.2.ebuild new file mode 100644 index 0000000000..ba6cc50d96 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.3.2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Multipurpose relay (SOcket CAT)" +HOMEPAGE="http://www.dest-unreach.org/socat/" +MY_P=${P/_beta/-b} +S="${WORKDIR}/${MY_P}" +SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="bindist libressl ssl readline ipv6 tcpd" + +DEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + readline? ( sys-libs/readline:= ) + tcpd? ( sys-apps/tcp-wrappers ) +" +RDEPEND="${DEPEND}" + +RESTRICT="test + ssl? ( readline? ( bindist ) )" + +DOCS=( + BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY +) + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch +) + +pkg_setup() { + # bug #587740 + if use readline && use ssl; then + elog "You are enabling both readline and openssl USE flags, the licenses" + elog "for these packages conflict. You may not be able to legally" + elog "redistribute the resulting binary." + fi +} + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + filter-flags '-Wno-error*' #293324 + tc-export AR + econf \ + $(use_enable ssl openssl) \ + $(use_enable readline) \ + $(use_enable ipv6 ip6) \ + $(use_enable tcpd libwrap) +} + +src_install() { + default + + docinto html + dodoc doc/*.html doc/*.css +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-2.0.0_beta9.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-2.0.0_beta9.ebuild index 07429defa3..f8881af9ed 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-2.0.0_beta9.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-2.0.0_beta9.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 -inherit autotools eutils flag-o-matic toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Multipurpose relay (SOcket CAT)" HOMEPAGE="http://www.dest-unreach.org/socat/" @@ -15,24 +14,42 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="ssl readline ipv6 tcpd" +IUSE="libressl ssl readline ipv6 tcpd" DEPEND=" - ssl? ( dev-libs/openssl:0= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) " RDEPEND="${DEPEND}" -RESTRICT="test" +RESTRICT="test + ssl? ( readline? ( bindist ) )" DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) +PATCHES=( + "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch + "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch + "${FILESDIR}"/${PN}-2.0.0_beta9-libressl.patch +) + +pkg_setup() { + # bug #587740 + if use readline && use ssl; then + elog "You are enabling both readline and openssl USE flags, the licenses" + elog "for these packages conflict. You may not be able to legally" + elog "redistribute the resulting binary." + fi +} + src_prepare() { - epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch - epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch + default touch doc/${PN}.1 || die @@ -52,5 +69,6 @@ src_configure() { src_install() { default - dohtml doc/*.html doc/*.css + docinto html + dodoc doc/*.html doc/*.css } diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-9999.ebuild index 076b3a140a..52fde25ab3 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 -inherit autotools eutils flag-o-matic git-r3 toolchain-funcs +EAPI=6 + +inherit autotools flag-o-matic git-r3 toolchain-funcs DESCRIPTION="Multipurpose relay (SOcket CAT)" HOMEPAGE="http://www.dest-unreach.org/socat/" @@ -14,10 +14,13 @@ EGIT_REPO_URI="git://repo.or.cz/${PN}.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="ssl readline ipv6 tcpd" +IUSE="libressl ssl readline ipv6 tcpd" -RDEPEND=" - ssl? ( dev-libs/openssl:0= ) +DEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) " @@ -26,15 +29,29 @@ DEPEND=" app-text/yodl " -RESTRICT="test" +RESTRICT="test + ssl? ( readline? ( bindist ) )" DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) +PATCHES=( + "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch + "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch +) + +pkg_setup() { + # bug #587740 + if use readline && use ssl; then + elog "You are enabling both readline and openssl USE flags, the licenses" + elog "for these packages conflict. You may not be able to legally" + elog "redistribute the resulting binary." + fi +} + src_prepare() { - epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch - epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch + default eautoreconf } @@ -52,5 +69,6 @@ src_configure() { src_install() { default - dohtml doc/*.html doc/*.css + docinto html + dodoc doc/*.html doc/*.css }