[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2025-01-22 Thread Arthur Zamarin
commit: 523cf4bd5126c34fefb0eae550d64e0fca123082
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jan 22 18:05:27 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jan 22 18:05:27 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=523cf4bd

net-misc/socat: Stabilize 1.8.0.1 amd64, #920112

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.8.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.8.0.1.ebuild 
b/net-misc/socat/socat-1.8.0.1.ebuild
index 9691d7c01e7b..157335e282ea 100644
--- a/net-misc/socat/socat-1.8.0.1.ebuild
+++ b/net-misc/socat/socat-1.8.0.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2025-01-22 Thread Arthur Zamarin
commit: 0220c8efecd52c4bf277e39ffaf3247cf21e20b5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jan 22 18:05:21 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jan 22 18:05:21 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0220c8ef

net-misc/socat: Stabilize 1.8.0.1 arm64, #920112

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.8.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/socat/socat-1.8.0.1.ebuild 
b/net-misc/socat/socat-1.8.0.1.ebuild
index 956b49fe571c..9691d7c01e7b 100644
--- a/net-misc/socat/socat-1.8.0.1.ebuild
+++ b/net-misc/socat/socat-1.8.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2025-01-22 Thread Arthur Zamarin
commit: 50f463294b6e8c982683bddcc1e9ee04b5a9eec0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jan 22 18:05:30 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jan 22 18:05:30 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f46329

net-misc/socat: Stabilize 1.8.0.1 ppc64, #920112

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.8.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.8.0.1.ebuild 
b/net-misc/socat/socat-1.8.0.1.ebuild
index 157335e282ea..2d9c8f3c989b 100644
--- a/net-misc/socat/socat-1.8.0.1.ebuild
+++ b/net-misc/socat/socat-1.8.0.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-12-30 Thread Sam James
commit: 529e4aa7883f6586088644fffa4956f7728fd6ee
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 30 14:04:31 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 30 14:04:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=529e4aa7

net-misc/socat: crank copyright

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.4-r1.ebuild 
b/net-misc/socat/socat-1.7.4.4-r1.ebuild
index f759ca5072f4..3e09a8c951a8 100644
--- a/net-misc/socat/socat-1.7.4.4-r1.ebuild
+++ b/net-misc/socat/socat-1.7.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-12-30 Thread Sam James
commit: 1ed28d5657a40a219fd6d30d9129046d90d2bfce
Author: Z. Liu  gmail  com>
AuthorDate: Mon Dec 30 09:03:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 30 14:03:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed28d56

net-misc/socat: set QA_CONFIG_IMPL_DECL_SKIP

musl doesn't has getprotobynumber_r

Closes: https://bugs.gentoo.org/924495
Signed-off-by: Z. Liu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39902
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.4-r1.ebuild | 4 
 net-misc/socat/socat-1.8.0.0.ebuild| 4 
 net-misc/socat/socat-1.8.0.1.ebuild| 4 
 net-misc/socat/socat-1.8.0.2.ebuild| 4 
 4 files changed, 16 insertions(+)

diff --git a/net-misc/socat/socat-1.7.4.4-r1.ebuild 
b/net-misc/socat/socat-1.7.4.4-r1.ebuild
index a4f9e4264807..f759ca5072f4 100644
--- a/net-misc/socat/socat-1.7.4.4-r1.ebuild
+++ b/net-misc/socat/socat-1.7.4.4-r1.ebuild
@@ -46,4 +46,8 @@ src_install() {
 
docinto html
dodoc doc/*.html doc/*.css
+
+   if use elibc_musl; then
+   QA_CONFIG_IMPL_DECL_SKIP=( getprotobynumber_r )
+   fi
 }

diff --git a/net-misc/socat/socat-1.8.0.0.ebuild 
b/net-misc/socat/socat-1.8.0.0.ebuild
index e058ec5fe1dc..6f3eb9e0cf57 100644
--- a/net-misc/socat/socat-1.8.0.0.ebuild
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -57,4 +57,8 @@ src_install() {
 
docinto html
dodoc doc/*.html doc/*.css
+
+   if use elibc_musl; then
+   QA_CONFIG_IMPL_DECL_SKIP=( getprotobynumber_r )
+   fi
 }

diff --git a/net-misc/socat/socat-1.8.0.1.ebuild 
b/net-misc/socat/socat-1.8.0.1.ebuild
index 74a3393d7dbb..956b49fe571c 100644
--- a/net-misc/socat/socat-1.8.0.1.ebuild
+++ b/net-misc/socat/socat-1.8.0.1.ebuild
@@ -52,4 +52,8 @@ src_install() {
 
docinto html
dodoc doc/*.html doc/*.css
+
+   if use elibc_musl; then
+   QA_CONFIG_IMPL_DECL_SKIP=( getprotobynumber_r )
+   fi
 }

diff --git a/net-misc/socat/socat-1.8.0.2.ebuild 
b/net-misc/socat/socat-1.8.0.2.ebuild
index 52cfbb352af3..2448aa66a86d 100644
--- a/net-misc/socat/socat-1.8.0.2.ebuild
+++ b/net-misc/socat/socat-1.8.0.2.ebuild
@@ -53,4 +53,8 @@ src_install() {
 
docinto html
dodoc doc/*.html doc/*.css
+
+   if use elibc_musl; then
+   QA_CONFIG_IMPL_DECL_SKIP=( getprotobynumber_r )
+   fi
 }



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-12-13 Thread Sam James
commit: f368f875320944165f90eab53c0e1761bd7d5239
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 13 15:34:51 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 13 15:34:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f368f875

net-misc/socat: destabilize 1.8.0.2 for ~x86

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.8.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.8.0.2.ebuild 
b/net-misc/socat/socat-1.8.0.2.ebuild
index 36192f93270c..52cfbb352af3 100644
--- a/net-misc/socat/socat-1.8.0.2.ebuild
+++ b/net-misc/socat/socat-1.8.0.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-12-13 Thread Sam James
commit: bf52bce8d00e0a1534c609ad4d3ebfae98e93879
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 13 15:30:39 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 13 15:33:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf52bce8

net-misc/socat: add 1.8.0.2

wrt bug #946374, as I noted in the bug, we don't install readline.sh,
so we're unaffected.

Closes: https://bugs.gentoo.org/940740
Bug: https://bugs.gentoo.org/946374
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.8.0.2.ebuild | 56 +
 2 files changed, 57 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 4b5e778fdd80..200256eefe2a 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,3 +1,4 @@
 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 
221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad
 SHA512 
3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
 DIST socat-1.8.0.0.tar.bz2 564066 BLAKE2B 
b0b3e8c46f746b1aaff7390bbf9521cca8c421f3c20cd7a7f7d8ffd3d7b5e5e881e2477642f7d29247ee5a9d9edf6c8370a43c5f2757e456966b17e3ba08a58a
 SHA512 
dd15c31204f2843ab473a30aa841e960e7c00ac7487e2265d69f9e8ea0afde3841d57cfcb99084f03935d7223da65cee27166837f2f9b3a20c834bc161af802b
 DIST socat-1.8.0.1.tar.bz2 579492 BLAKE2B 
0af65b18dc6fec28e59d75048b1e1c4f442f134d87bc6a9b5ea7b3032a0c5519e0d042ae760d451006eacf368870a0a47465d9ec2d5f2fe8d41efcd639ef58c5
 SHA512 
ce8147df545f74d4b6e1d3d0dae2dcea58c4c7e6ccd1cb2eec68c29ead2c3a818e9851b30a5e5f1456d70463c31b13ab1c5b350293359419a583ed693a917231
+DIST socat-1.8.0.2.tar.bz2 579370 BLAKE2B 
148bc4a49113af987f3c9faf9971bd309e1114358d2f32722c975715a151a4d8f194be58858c4a1a1833c53e2f4334afe105423550776bc174afc84126f8d0db
 SHA512 
549380b3bf95fcf7088a7b774e0cbf5532c6fa86895cfbb44ee1dd7895391f3696f78bda886e786275951656d7c90b99c658eb28e58d2365eb33946768f04321

diff --git a/net-misc/socat/socat-1.8.0.2.ebuild 
b/net-misc/socat/socat-1.8.0.2.ebuild
new file mode 100644
index ..36192f93270c
--- /dev/null
+++ b/net-misc/socat/socat-1.8.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 readline ssl tcpd"
+
+DEPEND="
+   ssl? ( >=dev-libs/openssl-3:= )
+   readline? ( sys-libs/readline:= )
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
+
+src_configure() {
+   # bug #293324
+   filter-flags '-Wno-error*'
+
+   tc-export AR
+
+   local myeconfargs=(
+   $(use_enable ssl openssl)
+   $(use_enable readline)
+   $(use_enable ipv6 ip6)
+   $(use_enable tcpd libwrap)
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_test() {
+   # Most tests are skipped because they need network access or a TTY
+   # Some are for /dev permissions probing (bug #940740)
+   # 518 519 need extra permissions
+   edo ./test.sh -v --expect-fail 
13,15,87,217,311,313,370,388,410,466,478,518,519,528
+}
+
+src_install() {
+   default
+
+   docinto html
+   dodoc doc/*.html doc/*.css
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-10-23 Thread Arthur Zamarin
commit: 016dcb6ec981afc0a883223bb2844fbfd771770a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct 23 19:33:02 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct 23 19:33:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016dcb6e

net-misc/socat: Stabilize 1.8.0.1 x86, #920112

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.8.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.8.0.1.ebuild 
b/net-misc/socat/socat-1.8.0.1.ebuild
index c95a08a93750..74a3393d7dbb 100644
--- a/net-misc/socat/socat-1.8.0.1.ebuild
+++ b/net-misc/socat/socat-1.8.0.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-10-09 Thread Arthur Zamarin
commit: c9724b5fa625e355d4777bb7390c26f45a351da3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct  9 07:57:23 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct  9 07:57:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9724b5f

net-misc/socat: Stabilize 1.8.0.0 x86, #920112

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.8.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.8.0.0.ebuild 
b/net-misc/socat/socat-1.8.0.0.ebuild
index 412c34bd0776..e058ec5fe1dc 100644
--- a/net-misc/socat/socat-1.8.0.0.ebuild
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-10-09 Thread Arthur Zamarin
commit: c0f6c5ecadc7534bf0039637aac46f1972ade10e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct  9 07:57:06 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct  9 07:57:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f6c5ec

net-misc/socat: Stabilize 1.8.0.0 arm, #920112

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.8.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.8.0.0.ebuild 
b/net-misc/socat/socat-1.8.0.0.ebuild
index f840822a76f5..9569aa83768e 100644
--- a/net-misc/socat/socat-1.8.0.0.ebuild
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-10-09 Thread Arthur Zamarin
commit: 65897450474ed37fa393964e563713f8ee523ed8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct  9 07:57:20 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct  9 07:57:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65897450

net-misc/socat: Stabilize 1.8.0.0 amd64, #920112

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.8.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.8.0.0.ebuild 
b/net-misc/socat/socat-1.8.0.0.ebuild
index b31be06b4033..412c34bd0776 100644
--- a/net-misc/socat/socat-1.8.0.0.ebuild
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-10-09 Thread Arthur Zamarin
commit: a4af638af0615d18c22c0319285ee190842b701f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct  9 07:57:13 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct  9 07:57:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4af638a

net-misc/socat: Stabilize 1.8.0.0 ppc, #920112

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.8.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.8.0.0.ebuild 
b/net-misc/socat/socat-1.8.0.0.ebuild
index 36506796987d..115b206a4171 100644
--- a/net-misc/socat/socat-1.8.0.0.ebuild
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-10-09 Thread Arthur Zamarin
commit: 3175cbfd52faed7ce4172faa0d3c83fb135d6d28
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct  9 07:57:09 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct  9 07:57:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3175cbfd

net-misc/socat: Stabilize 1.8.0.0 arm64, #920112

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.8.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.8.0.0.ebuild 
b/net-misc/socat/socat-1.8.0.0.ebuild
index 9569aa83768e..36506796987d 100644
--- a/net-misc/socat/socat-1.8.0.0.ebuild
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-10-09 Thread Arthur Zamarin
commit: ce5533274bc25a80f0c4720aba8eb8ab82f9d83c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct  9 07:57:17 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct  9 07:57:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce553327

net-misc/socat: Stabilize 1.8.0.0 ppc64, #920112

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.8.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.8.0.0.ebuild 
b/net-misc/socat/socat-1.8.0.0.ebuild
index 115b206a4171..b31be06b4033 100644
--- a/net-misc/socat/socat-1.8.0.0.ebuild
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-10-03 Thread Sam James
commit: 574b96930429ec02ed3cadfdf8ebff52abbc2373
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  4 01:54:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  4 01:54:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574b9693

net-misc/socat: add 1.8.0.1

Skip handful of tests which need permissions, like:
```
test 518 STDIN_F_SETPIPE_SZ: f-setpipe-sz on STDIN... FAILED
 ./socat -t 0.1  STDIN,f-setpipe-sz=2097152!!STDOUT EXEC:./filan,nofork
2023/12/29 01:30:22 socat[9560] E fcntl(0, 1031, 0x20): Operation not 
permitted
```

Bug: https://bugs.gentoo.org/920907
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.8.0.1.ebuild | 55 +
 2 files changed, 56 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 5171cae8235d..4b5e778fdd80 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,2 +1,3 @@
 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 
221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad
 SHA512 
3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
 DIST socat-1.8.0.0.tar.bz2 564066 BLAKE2B 
b0b3e8c46f746b1aaff7390bbf9521cca8c421f3c20cd7a7f7d8ffd3d7b5e5e881e2477642f7d29247ee5a9d9edf6c8370a43c5f2757e456966b17e3ba08a58a
 SHA512 
dd15c31204f2843ab473a30aa841e960e7c00ac7487e2265d69f9e8ea0afde3841d57cfcb99084f03935d7223da65cee27166837f2f9b3a20c834bc161af802b
+DIST socat-1.8.0.1.tar.bz2 579492 BLAKE2B 
0af65b18dc6fec28e59d75048b1e1c4f442f134d87bc6a9b5ea7b3032a0c5519e0d042ae760d451006eacf368870a0a47465d9ec2d5f2fe8d41efcd639ef58c5
 SHA512 
ce8147df545f74d4b6e1d3d0dae2dcea58c4c7e6ccd1cb2eec68c29ead2c3a818e9851b30a5e5f1456d70463c31b13ab1c5b350293359419a583ed693a917231

diff --git a/net-misc/socat/socat-1.8.0.1.ebuild 
b/net-misc/socat/socat-1.8.0.1.ebuild
new file mode 100644
index ..c95a08a93750
--- /dev/null
+++ b/net-misc/socat/socat-1.8.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 readline ssl tcpd"
+
+DEPEND="
+   ssl? ( >=dev-libs/openssl-3:= )
+   readline? ( sys-libs/readline:= )
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
+
+src_configure() {
+   # bug #293324
+   filter-flags '-Wno-error*'
+
+   tc-export AR
+
+   local myeconfargs=(
+   $(use_enable ssl openssl)
+   $(use_enable readline)
+   $(use_enable ipv6 ip6)
+   $(use_enable tcpd libwrap)
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_test() {
+   # Most tests are skipped because they need network access or a TTY
+   # 518 519 need extra permissions
+   edo ./test.sh -v --expect-fail 217,311,313,410,478,518,519,528
+}
+
+src_install() {
+   default
+
+   docinto html
+   dodoc doc/*.html doc/*.css
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2024-10-03 Thread Sam James
commit: 4765bbe24661beb5647e68828b42476faa712553
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  4 01:55:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  4 01:55:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4765bbe2

net-misc/socat: backport test skips

Bug: https://bugs.gentoo.org/920907
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.8.0.0.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-misc/socat/socat-1.8.0.0.ebuild 
b/net-misc/socat/socat-1.8.0.0.ebuild
index f256875f9b24..f840822a76f5 100644
--- a/net-misc/socat/socat-1.8.0.0.ebuild
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,9 @@ src_configure() {
 }
 
 src_test() {
-   edo ./test.sh -v --expect-fail 217,311,313,410,478,528
+   # Most tests are skipped because they need network access or a TTY
+   # 518 519 need extra permissions
+   edo ./test.sh -v --expect-fail 217,311,313,410,478,518,519,528
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-12-27 Thread Sam James
commit: f797645f5cf09d59a8742db251989cf6a76d8e01
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:34:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:34:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f797645f

net-misc/socat: drop 1.7.4.3, 1.7.4.4

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  1 -
 net-misc/socat/socat-1.7.4.3.ebuild | 64 -
 net-misc/socat/socat-1.7.4.4.ebuild | 58 -
 3 files changed, 123 deletions(-)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index ea585d6d46d3..5171cae8235d 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,3 +1,2 @@
-DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B 
d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b
 SHA512 
81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046
 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 
221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad
 SHA512 
3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
 DIST socat-1.8.0.0.tar.bz2 564066 BLAKE2B 
b0b3e8c46f746b1aaff7390bbf9521cca8c421f3c20cd7a7f7d8ffd3d7b5e5e881e2477642f7d29247ee5a9d9edf6c8370a43c5f2757e456966b17e3ba08a58a
 SHA512 
dd15c31204f2843ab473a30aa841e960e7c00ac7487e2265d69f9e8ea0afde3841d57cfcb99084f03935d7223da65cee27166837f2f9b3a20c834bc161af802b

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
deleted file mode 100644
index f60964294e44..
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.gz";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )
-   readline? ( sys-libs/readline:= )
-   tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}"
-
-# Tests are a large bash script
-# Hard to disable individual tests needing network or privileges
-# in 1.7.4.2: FAILED:  59 329
-RESTRICT="test ssl? ( readline? ( bindist ) )"
-
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
-
-pkg_setup() {
-   # bug #587740
-   if use readline && use ssl ; then
-   elog "You are enabling both readline and ssl (openssl) USE 
flags, the licenses"
-   elog "for these packages conflict. You may not be able to 
legally"
-   elog "redistribute the resulting binary."
-   fi
-}
-
-src_configure() {
-   # bug #293324
-   filter-flags '-Wno-error*'
-
-   tc-export AR
-
-   # getprotobynumber_r doesn't exist on musl, so avoid probing for it
-   # and possibly getting it wrong. TODO: fix configure?
-   # (Grabbed from Alpine Linux: 
https://git.alpinelinux.org/aports/commit/main/socat/APKBUILD?id=5edc9195355ced3db991c1a7cda5648d52019b11)
-   # bug #831016
-   use elibc_musl && export sc_cv_getprotobynumber_r=2
-
-   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/net-misc/socat/socat-1.7.4.4.ebuild 
b/net-misc/socat/socat-1.7.4.4.ebuild
deleted file mode 100644
index 26efc8a7d17f..
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )
-   readline? ( sys-libs/readline:= )
-   tcpd? ( sys-apps/tcp-wrappers )"
-RDE

[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-11-15 Thread Sam James
commit: eb08e4aa7127cf0fd098b3e430bb20e39f0c3aa1
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 15 17:12:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 15 17:13:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb08e4aa

net-misc/socat: add 1.8.0.0

Closes: https://bugs.gentoo.org/898738
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.8.0.0.ebuild | 58 +
 2 files changed, 59 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index ae6c8cfa71c3..ea585d6d46d3 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,2 +1,3 @@
 DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B 
d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b
 SHA512 
81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046
 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 
221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad
 SHA512 
3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
+DIST socat-1.8.0.0.tar.bz2 564066 BLAKE2B 
b0b3e8c46f746b1aaff7390bbf9521cca8c421f3c20cd7a7f7d8ffd3d7b5e5e881e2477642f7d29247ee5a9d9edf6c8370a43c5f2757e456966b17e3ba08a58a
 SHA512 
dd15c31204f2843ab473a30aa841e960e7c00ac7487e2265d69f9e8ea0afde3841d57cfcb99084f03935d7223da65cee27166837f2f9b3a20c834bc161af802b

diff --git a/net-misc/socat/socat-1.8.0.0.ebuild 
b/net-misc/socat/socat-1.8.0.0.ebuild
new file mode 100644
index ..ca3d608643a5
--- /dev/null
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 readline ssl tcpd"
+
+DEPEND="
+   ssl? ( >=dev-libs/openssl-3:= )
+   readline? ( sys-libs/readline:= )
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+# in 1.7.4.2: FAILED:  59 329
+#RESTRICT="test"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
+
+src_configure() {
+   # bug #293324
+   filter-flags '-Wno-error*'
+
+   tc-export AR
+
+   local myeconfargs=(
+   $(use_enable ssl openssl)
+   $(use_enable readline)
+   $(use_enable ipv6 ip6)
+   $(use_enable tcpd libwrap)
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_test() {
+   edo ./test.sh -v --expect-fail 217,311,313,410,478,528
+}
+
+src_install() {
+   default
+
+   docinto html
+   dodoc doc/*.html doc/*.css
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-08-06 Thread Andreas K. Hüttel
commit: 11d91eec8073b98400a7b65a38627e02f10b992b
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Aug  6 10:16:43 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Aug  6 10:16:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d91eec

net-misc/socat: require openssl 3 for license reasons

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 net-misc/socat/socat-1.7.4.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.4-r1.ebuild 
b/net-misc/socat/socat-1.7.4.4-r1.ebuild
index d9df4957fc55..56c0a04850d6 100644
--- a/net-misc/socat/socat-1.7.4.4-r1.ebuild
+++ b/net-misc/socat/socat-1.7.4.4-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
-DEPEND="ssl? ( dev-libs/openssl:0= )
+DEPEND="ssl? ( >=dev-libs/openssl-3:0= )
readline? ( sys-libs/readline:= )
tcpd? ( sys-apps/tcp-wrappers )"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-08-06 Thread Andreas K. Hüttel
commit: af4f66a9f5d96cf8232cb2b84948d21fce71dfe4
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Aug  6 10:14:12 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Aug  6 10:14:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4f66a9

net-misc/socat: stabilize 1.7.4.4-r1

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 net-misc/socat/socat-1.7.4.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.4-r1.ebuild 
b/net-misc/socat/socat-1.7.4.4-r1.ebuild
index 26ff914b02af..d9df4957fc55 100644
--- a/net-misc/socat/socat-1.7.4.4-r1.ebuild
+++ b/net-misc/socat/socat-1.7.4.4-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-08-05 Thread Sam James
commit: 448cc0064cb40615ddd47f717b014680a6465d3e
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug  6 01:33:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug  6 01:36:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448cc006

net-misc/socat: cleanup obsolete USE=bindist

OpenSSL 3 is Apache-2.0 licenced which should resolve the conflict. OpenSSL 
1.1.x
is EOL in a month so I'm not worrying about it here (nobody should be running it
and I'll be masking it shortly).

Bug: https://bugs.gentoo.org/587740
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.4-r1.ebuild | 49 ++
 1 file changed, 49 insertions(+)

diff --git a/net-misc/socat/socat-1.7.4.4-r1.ebuild 
b/net-misc/socat/socat-1.7.4.4-r1.ebuild
new file mode 100644
index ..26ff914b02af
--- /dev/null
+++ b/net-misc/socat/socat-1.7.4.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 readline ssl tcpd"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )
+   readline? ( sys-libs/readline:= )
+   tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+# in 1.7.4.2: FAILED:  59 329
+RESTRICT="test"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
+
+src_configure() {
+   # bug #293324
+   filter-flags '-Wno-error*'
+
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/files/, net-misc/socat/

2023-05-26 Thread Sam James
commit: 720d4808a276e29d61ff552cfd090a688fe0052f
Author: orbea  riseup  net>
AuthorDate: Thu May 25 13:30:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 26 09:35:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=720d4808

net-misc/socat: drop 2.0.0_beta9

The socat2 build fails with musl and the most recent 2.0.0_beta9 release
came out 7 years ago on January 26 2016. However several socat1 releases
have since been made. In the event that upstream ever resumes their work
on socat2 then it can be added back to Gentoo.

Closes: https://bugs.gentoo.org/907177
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/31158
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest|  1 -
 .../socat/files/socat-1.7.3.0-filan-build.patch| 30 -
 net-misc/socat/files/socat-1.7.3.1-stddef_h.patch  | 38 ---
 .../socat/files/socat-1.7.3.4-fno-common.patch | 24 ---
 net-misc/socat/socat-2.0.0_beta9.ebuild| 74 --
 5 files changed, 167 deletions(-)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index cddac553abf2..ae6c8cfa71c3 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,3 +1,2 @@
 DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B 
d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b
 SHA512 
81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046
 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 
221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad
 SHA512 
3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
-DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/files/socat-1.7.3.0-filan-build.patch 
b/net-misc/socat/files/socat-1.7.3.0-filan-build.patch
deleted file mode 100644
index 861c673ad91d..
--- a/net-misc/socat/files/socat-1.7.3.0-filan-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From aae2ea107b543fa908956f2fdcdf6db684e4a2e6 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Fri, 24 Apr 2015 23:06:37 -0400
-Subject: [PATCH] filan: fix depend list
-
-The link line contains more objects than the depend line; sync them like
-procan does.  Otherwise, parallel builds randomly fail.

- Makefile.in | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f2a6edb..0c00459 100644
 a/Makefile.in
-+++ b/Makefile.in
-@@ -118,8 +118,9 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o 
error.o sycls.o sysut
- procan: $(PROCAN_OBJS)
-   $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS)
- 
--filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
--  $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o 
sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS)
-+FILAN_OBJS=filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o 
vsnprintf_r.o snprinterr.o
-+filan: $(FILAN_OBJS)
-+  $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FILAN_OBJS) $(CLIBS)
- 
- libxio.a: $(XIOOBJS) $(UTLOBJS)
-   $(AR) r $@ $(XIOOBJS) $(UTLOBJS)
--- 
-2.3.5
-

diff --git a/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch 
b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
deleted file mode 100644
index c914a817ceca..
--- a/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-When disabling OpenSSL support, nestlex.c still needs stddef.h which is
-magically included through the OpenSSL headers otherwise.
-
 a/configure.in
-+++ b/configure.in
-@@ -61,7 +61,7 @@
- AC_CHECK_HEADERS(inttypes.h)
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h 
sys/time.h syslog.h unistd.h)
--AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h 
sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
-+AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h 
sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
- AC_CHECK_HEADERS(pty.h)
- AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
- AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
 a/config.h.in
-+++ b/config.h.in
-@@ -189,6 +189,9 @@
- /* Define if you have the  header file.  */
- #undef HAVE_GRP_H
- 
-+/* Define if you have the  header file.  */
-+#undef HAVE_STDDEF_H
-+
- /* Define if you have the  header file.  */
- #undef HAVE_STDINT_H
- 
 a/sysincludes.h
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-03-04 Thread Arthur Zamarin
commit: 2423a54ed09f45830693b41ff495bb2fe1754e09
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 11:13:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 11:13:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2423a54e

net-misc/socat: Stabilize 1.7.4.4 arm64, #899400

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.7.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.4.ebuild 
b/net-misc/socat/socat-1.7.4.4.ebuild
index bcb93f49ad91..26efc8a7d17f 100644
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-03-04 Thread Arthur Zamarin
commit: 69587f14a1e25d58797edce48861130eaceb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 11:09:22 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 11:09:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69587f14

net-misc/socat: Stabilize 1.7.4.4 ppc, #899400

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.7.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.4.ebuild 
b/net-misc/socat/socat-1.7.4.4.ebuild
index 3f54f0cc5825..bcb93f49ad91 100644
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-03-04 Thread Arthur Zamarin
commit: fb71fafc8352ef6b062cb7f8b58b23cd9517fbf7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 08:59:52 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 08:59:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb71fafc

net-misc/socat: Stabilize 1.7.4.4 amd64, #899400

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.7.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.4.ebuild 
b/net-misc/socat/socat-1.7.4.4.ebuild
index 8f6b50802bdc..3f54f0cc5825 100644
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-03-04 Thread Arthur Zamarin
commit: b12405303afbc4f3d33eef4bfa97ec58739cf80a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 08:09:29 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 08:09:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1240530

net-misc/socat: Stabilize 1.7.4.4 sparc, #899400

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.7.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.4.ebuild 
b/net-misc/socat/socat-1.7.4.4.ebuild
index 85ab8a33bd24..8f6b50802bdc 100644
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-03-03 Thread Arthur Zamarin
commit: 982d7359499632161969470b522ab7f101da1478
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 07:45:39 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 07:45:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982d7359

net-misc/socat: Stabilize 1.7.4.4 x86, #899400

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.7.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.4.ebuild 
b/net-misc/socat/socat-1.7.4.4.ebuild
index da19dec97976..85ab8a33bd24 100644
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-03-03 Thread Arthur Zamarin
commit: e4219c7a138f614d4491157a4762549fe0749d9f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 06:01:00 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 06:01:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4219c7a

net-misc/socat: Stabilize 1.7.4.4 arm, #899400

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.7.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.4.ebuild 
b/net-misc/socat/socat-1.7.4.4.ebuild
index d8cd44b2d89d..da19dec97976 100644
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2023-03-03 Thread Arthur Zamarin
commit: 4c914b6069dacf1570f265e06173543a91961d0d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 05:48:57 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 05:48:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c914b60

net-misc/socat: Stabilize 1.7.4.4 ppc64, #899400

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.7.4.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/socat/socat-1.7.4.4.ebuild 
b/net-misc/socat/socat-1.7.4.4.ebuild
index 8693b3348e41..d8cd44b2d89d 100644
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-11-22 Thread Sam James
commit: f335bad455c9308a8a4df5997f9e772b6288f056
Author: Petr Vaněk  atlas  cz>
AuthorDate: Mon Nov 21 08:03:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 23 01:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f335bad4

net-misc/socat: fix 1.7.4.4 build on musl

The issue with undefined reference to getprotobynumber_r for musl was
fixed in 1.7.4.4 in commit [1]. It is no longer wanted to treat musl
configuration specially.

[1] 
https://repo.or.cz/socat.git/commitdiff/75cb44bc90577c3487458564ca803163681319f1

Bug: https://bugs.gentoo.org/831016
Closes: https://bugs.gentoo.org/879601
Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/28358
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.4.ebuild | 6 --
 1 file changed, 6 deletions(-)

diff --git a/net-misc/socat/socat-1.7.4.4.ebuild 
b/net-misc/socat/socat-1.7.4.4.ebuild
index 2c36251c7698..8693b3348e41 100644
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -43,12 +43,6 @@ src_configure() {
 
tc-export AR
 
-   # getprotobynumber_r doesn't exist on musl, so avoid probing for it
-   # and possibly getting it wrong. TODO: fix configure?
-   # (Grabbed from Alpine Linux: 
https://git.alpinelinux.org/aports/commit/main/socat/APKBUILD?id=5edc9195355ced3db991c1a7cda5648d52019b11)
-   # bug #831016
-   use elibc_musl && export sc_cv_getprotobynumber_r=2
-
econf \
$(use_enable ssl openssl) \
$(use_enable readline) \



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-10-30 Thread Sam James
commit: 99435e83537f0582b186184649e2ae49aae94be0
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 31 00:43:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 31 00:43:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99435e83

net-misc/socat: add 1.7.4.4

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.7.4.4.ebuild | 64 +
 2 files changed, 65 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index b399a10fbd4d..cddac553abf2 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,2 +1,3 @@
 DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B 
d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b
 SHA512 
81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046
+DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 
221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad
 SHA512 
3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.4.4.ebuild 
b/net-misc/socat/socat-1.7.4.4.ebuild
new file mode 100644
index ..2c36251c7698
--- /dev/null
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="bindist ipv6 readline ssl tcpd"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )
+   readline? ( sys-libs/readline:= )
+   tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+# in 1.7.4.2: FAILED:  59 329
+RESTRICT="test ssl? ( readline? ( bindist ) )"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
+
+pkg_setup() {
+   # bug #587740
+   if use readline && use ssl ; then
+   elog "You are enabling both readline and ssl (openssl) USE 
flags, the licenses"
+   elog "for these packages conflict. You may not be able to 
legally"
+   elog "redistribute the resulting binary."
+   fi
+}
+
+src_configure() {
+   # bug #293324
+   filter-flags '-Wno-error*'
+
+   tc-export AR
+
+   # getprotobynumber_r doesn't exist on musl, so avoid probing for it
+   # and possibly getting it wrong. TODO: fix configure?
+   # (Grabbed from Alpine Linux: 
https://git.alpinelinux.org/aports/commit/main/socat/APKBUILD?id=5edc9195355ced3db991c1a7cda5648d52019b11)
+   # bug #831016
+   use elibc_musl && export sc_cv_getprotobynumber_r=2
+
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-05-13 Thread WANG Xuerui
commit: 1453c71e49a7f0af6adeda01c269d45ac394a5a1
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sat May 14 06:05:18 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sat May 14 06:21:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1453c71e

net-misc/socat: keyword 1.7.4.3 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-misc/socat/socat-1.7.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
index 79675ef1a190..f60964294e44 100644
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-04-17 Thread Sam James
commit: e556ea9acc2809ca3beafe04694b9e6851df2c6d
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 16:42:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 16:42:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e556ea9a

net-misc/socat: drop 1.7.4.2

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  1 -
 net-misc/socat/socat-1.7.4.2.ebuild | 58 -
 2 files changed, 59 deletions(-)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 8edac6c21eca..b399a10fbd4d 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,3 +1,2 @@
-DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 
0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01bf9d6f0f0d5e9550d4cd7e6aa390b26120a47e3661772550f4fb189807bedd31d1477ff0065f478ef2be062ab
 SHA512 
c331a6348e0febb35cd8adc2b116e3b8896cd7f64bcd93e507df4b8197ee1e6738ca256abf74c9b225e7a3769cf9643f0e237826125c6f390b5124ce0f10c972
 DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B 
d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b
 SHA512 
81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.4.2.ebuild 
b/net-misc/socat/socat-1.7.4.2.ebuild
deleted file mode 100644
index 7bb1513b232e..
--- a/net-misc/socat/socat-1.7.4.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.gz";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )
-   readline? ( sys-libs/readline:= )
-   tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}"
-
-# Tests are a large bash script
-# Hard to disable individual tests needing network or privileges
-# in 1.7.4.2: FAILED:  59 329
-RESTRICT="test ssl? ( readline? ( bindist ) )"
-
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
-
-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_configure() {
-   # bug #293324
-   filter-flags '-Wno-error*'
-
-   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
-}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-02-20 Thread Arthur Zamarin
commit: 759bceb81f9e6a4d46011e361b206ac9609be989
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Feb 20 19:34:28 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Feb 20 19:34:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=759bceb8

net-misc/socat: Stabilize 1.7.4.3 arm, #833027

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.7.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
index 2b8ee1c0b360..79675ef1a190 100644
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-02-18 Thread Sam James
commit: b8294b3d6fc2ce1534c964a7b8f2f369de7bf4ac
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 19 00:35:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 19 00:35:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8294b3d

net-misc/socat: Stabilize 1.7.4.3 arm64, #833027

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
index 56798012ed9a..2b8ee1c0b360 100644
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-02-15 Thread Agostino Sarubbo
commit: 994286418fb33fa19ea52721b3a75d4c8643aa1e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb 15 15:57:16 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb 15 15:57:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99428641

net-misc/socat: ppc stable wrt bug #833027

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/socat/socat-1.7.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
index 7a47379bd348..56798012ed9a 100644
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-02-14 Thread Agostino Sarubbo
commit: 009c7282beace2ecd7ad99b14032559f3372e2f2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb 15 07:12:21 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb 15 07:12:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=009c7282

net-misc/socat: x86 stable wrt bug #833027

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/socat/socat-1.7.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
index 219765b102d3..7a47379bd348 100644
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-02-14 Thread Agostino Sarubbo
commit: 5f721545d95276f5f3e769e9938c419b68ae8b9e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb 15 07:11:41 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb 15 07:11:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f721545

net-misc/socat: sparc stable wrt bug #833027

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/socat/socat-1.7.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
index c005b9027a6b..219765b102d3 100644
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-02-14 Thread Agostino Sarubbo
commit: 78716d971d02c70aeab7a3ea4520fc8b43edff46
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb 15 07:10:53 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb 15 07:10:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78716d97

net-misc/socat: ppc64 stable wrt bug #833027

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/socat/socat-1.7.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
index eb348a381ead..c005b9027a6b 100644
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-02-14 Thread Agostino Sarubbo
commit: 228e303d34f2c446880c9c10bb4e06b45f2e9b98
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb 15 07:09:14 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb 15 07:09:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=228e303d

net-misc/socat: amd64 stable wrt bug #833027

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/socat/socat-1.7.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
index ca8f23d51acb..eb348a381ead 100644
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-02-09 Thread Sam James
commit: a32c13886353c0a861cb0c140385d1bd8879fc79
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 06:59:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 07:50:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a32c1388

net-misc/socat: fix build on musl

Closes: https://bugs.gentoo.org/831016
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.3.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
index 17478f6a210d..ca8f23d51acb 100644
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -43,6 +43,12 @@ src_configure() {
 
tc-export AR
 
+   # getprotobynumber_r doesn't exist on musl, so avoid probing for it
+   # and possibly getting it wrong. TODO: fix configure?
+   # (Grabbed from Alpine Linux: 
https://git.alpinelinux.org/aports/commit/main/socat/APKBUILD?id=5edc9195355ced3db991c1a7cda5648d52019b11)
+   # bug #831016
+   use elibc_musl && export sc_cv_getprotobynumber_r=2
+
econf \
$(use_enable ssl openssl) \
$(use_enable readline) \



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-01-08 Thread Sam James
commit: 4f8682d27deaeb5c003259831bc1d76b114b207e
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  9 06:49:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  9 07:08:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8682d2

net-misc/socat: add 1.7.4.3

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.7.4.3.ebuild | 58 +
 2 files changed, 59 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 671f546425ff..8edac6c21eca 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,2 +1,3 @@
 DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 
0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01bf9d6f0f0d5e9550d4cd7e6aa390b26120a47e3661772550f4fb189807bedd31d1477ff0065f478ef2be062ab
 SHA512 
c331a6348e0febb35cd8adc2b116e3b8896cd7f64bcd93e507df4b8197ee1e6738ca256abf74c9b225e7a3769cf9643f0e237826125c6f390b5124ce0f10c972
+DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B 
d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b
 SHA512 
81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.4.3.ebuild 
b/net-misc/socat/socat-1.7.4.3.ebuild
new file mode 100644
index ..17478f6a210d
--- /dev/null
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.gz";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="bindist ipv6 readline ssl tcpd"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )
+   readline? ( sys-libs/readline:= )
+   tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+# in 1.7.4.2: FAILED:  59 329
+RESTRICT="test ssl? ( readline? ( bindist ) )"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
+
+pkg_setup() {
+   # bug #587740
+   if use readline && use ssl ; then
+   elog "You are enabling both readline and ssl (openssl) USE 
flags, the licenses"
+   elog "for these packages conflict. You may not be able to 
legally"
+   elog "redistribute the resulting binary."
+   fi
+}
+
+src_configure() {
+   # bug #293324
+   filter-flags '-Wno-error*'
+
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2022-01-01 Thread Sam James
commit: 6da4f1bad335348ecdf329655d84987f70542770
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan  1 09:30:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  1 09:38:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da4f1ba

net-misc/socat: drop 1.7.3.4, 1.7.4.1

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  2 --
 net-misc/socat/socat-1.7.3.4.ebuild | 66 -
 net-misc/socat/socat-1.7.4.1.ebuild | 61 --
 3 files changed, 129 deletions(-)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 6a41e2eecbf2..671f546425ff 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,4 +1,2 @@
-DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 
68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666
 SHA512 
f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
-DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 
9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568
 SHA512 
7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756
 DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 
0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01bf9d6f0f0d5e9550d4cd7e6aa390b26120a47e3661772550f4fb189807bedd31d1477ff0065f478ef2be062ab
 SHA512 
c331a6348e0febb35cd8adc2b116e3b8896cd7f64bcd93e507df4b8197ee1e6738ca256abf74c9b225e7a3769cf9643f0e237826125c6f390b5124ce0f10c972
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
deleted file mode 100644
index be9f48e777e4..
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-DEPEND="
-   ssl? ( dev-libs/openssl:0= )
-   readline? ( sys-libs/readline:= )
-   tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-# Tests are a large bash script
-# Hard to disable individual tests needing network or privileges
-RESTRICT="
-   test
-   ssl? ( readline? ( bindist ) )
-"
-
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.7.3.4-fno-common.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_configure() {
-   # bug #293324
-   filter-flags '-Wno-error*'
-
-   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/net-misc/socat/socat-1.7.4.1.ebuild 
b/net-misc/socat/socat-1.7.4.1.ebuild
deleted file mode 100644
index 7a65f4b61cdc..
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-DEPEND="
-   ssl? ( dev-libs/openssl:0= )
-   readline? ( sys-libs/readline:= )
-   tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEP

[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-12-06 Thread Sam James
commit: cdcfb3c5ef85580174ec73bdeb6ddd7910a0d666
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  6 15:21:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  6 15:21:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdcfb3c5

net-misc/socat: Stabilize 1.7.4.2 arm, #828386

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.2.ebuild 
b/net-misc/socat/socat-1.7.4.2.ebuild
index a7851e974bd4..7bb1513b232e 100644
--- a/net-misc/socat/socat-1.7.4.2.ebuild
+++ b/net-misc/socat/socat-1.7.4.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-12-06 Thread Sam James
commit: 86718e7ee88c72c2f0d3717e3125b80ffe55fc19
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  6 15:18:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  6 15:18:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86718e7e

net-misc/socat: Stabilize 1.7.4.2 arm64, #828386

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.2.ebuild 
b/net-misc/socat/socat-1.7.4.2.ebuild
index 454abfceafc5..a7851e974bd4 100644
--- a/net-misc/socat/socat-1.7.4.2.ebuild
+++ b/net-misc/socat/socat-1.7.4.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-12-06 Thread Agostino Sarubbo
commit: 5b46e61feff9b64728967879e1ab9c8dd050798c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec  6 11:31:07 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec  6 11:31:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b46e61f

net-misc/socat: x86 stable wrt bug #828386

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/socat/socat-1.7.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.2.ebuild 
b/net-misc/socat/socat-1.7.4.2.ebuild
index 840f9a0b768a..454abfceafc5 100644
--- a/net-misc/socat/socat-1.7.4.2.ebuild
+++ b/net-misc/socat/socat-1.7.4.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-12-05 Thread Arthur Zamarin
commit: 8ac826a53706eb130a22fcd3bf536c1bcd6e0189
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec  5 20:11:26 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec  5 20:12:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac826a5

net-misc/socat: Stabilize 1.7.4.2 sparc, #828386

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/socat/socat-1.7.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.2.ebuild 
b/net-misc/socat/socat-1.7.4.2.ebuild
index 315575ea0dbe..840f9a0b768a 100644
--- a/net-misc/socat/socat-1.7.4.2.ebuild
+++ b/net-misc/socat/socat-1.7.4.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-12-05 Thread Sam James
commit: 2020e3fc1331ca2f85e057bd12b2a7170709c646
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  5 18:37:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  5 18:37:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2020e3fc

net-misc/socat: Stabilize 1.7.4.2 ppc, #828386

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.2.ebuild 
b/net-misc/socat/socat-1.7.4.2.ebuild
index abce092bb55e..315575ea0dbe 100644
--- a/net-misc/socat/socat-1.7.4.2.ebuild
+++ b/net-misc/socat/socat-1.7.4.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-12-04 Thread Sam James
commit: b07dca08afe5579cf622e923f7f587b510f7089d
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  5 05:18:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  5 05:18:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b07dca08

net-misc/socat: Stabilize 1.7.4.2 amd64, #828386

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.2.ebuild 
b/net-misc/socat/socat-1.7.4.2.ebuild
index fbf589fadca9..6d110461fe19 100644
--- a/net-misc/socat/socat-1.7.4.2.ebuild
+++ b/net-misc/socat/socat-1.7.4.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-11-02 Thread Sam James
commit: d6c27e19c12facf2816d715ba475eb1193af316a
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov  2 23:50:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  2 23:50:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c27e19

net-misc/socat: add 1.7.4.2

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.7.4.2.ebuild | 58 +
 2 files changed, 59 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index a47d4af7a88..6a41e2eecbf 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,3 +1,4 @@
 DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 
68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666
 SHA512 
f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
 DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 
9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568
 SHA512 
7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756
+DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 
0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01bf9d6f0f0d5e9550d4cd7e6aa390b26120a47e3661772550f4fb189807bedd31d1477ff0065f478ef2be062ab
 SHA512 
c331a6348e0febb35cd8adc2b116e3b8896cd7f64bcd93e507df4b8197ee1e6738ca256abf74c9b225e7a3769cf9643f0e237826125c6f390b5124ce0f10c972
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.4.2.ebuild 
b/net-misc/socat/socat-1.7.4.2.ebuild
new file mode 100644
index 000..fbf589fadca
--- /dev/null
+++ b/net-misc/socat/socat-1.7.4.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.gz";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="bindist ipv6 readline ssl tcpd"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )
+   readline? ( sys-libs/readline:= )
+   tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+# in 1.7.4.2: FAILED:  59 329
+RESTRICT="test ssl? ( readline? ( bindist ) )"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
+
+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_configure() {
+   # bug #293324
+   filter-flags '-Wno-error*'
+
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-09-24 Thread Sam James
commit: a6879406ac48246a96799e710176fcd8f0d3bca4
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 24 17:44:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 24 17:45:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6879406

net-misc/socat: drop (broken) 

Apparently I broke it (when syncing with release ebuilds)
9 months ago and nobody has noticed. Let's get rid of it.

Fixes: df13bd514e0d04eb52593e0b43c40c422ce09ad4
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-.ebuild | 64 
 1 file changed, 64 deletions(-)

diff --git a/net-misc/socat/socat-.ebuild b/net-misc/socat/socat-.ebuild
deleted file mode 100644
index e0872e55666..000
--- a/net-misc/socat/socat-.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-EGIT_REPO_URI="https://repo.or.cz/${PN}.git";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-BDEPEND="app-text/yodl"
-DEPEND="
-   ssl? ( dev-libs/openssl:0= )
-   readline? ( sys-libs/readline:= )
-   tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-# Tests are a large bash script
-# Hard to disable individual tests needing network or privileges
-RESTRICT="
-   test
-   ssl? ( readline? ( bindist ) )
-"
-
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
-
-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() {
-   # bug #293324
-   filter-flags '-Wno-error*'
-   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
-}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/, net-misc/socat/files/

2021-04-30 Thread Sam James
commit: 211374be86cb10ee6a1d583abd113ca9f6622b46
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 30 23:13:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 30 23:27:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=211374be

net-misc/socat: remove LibreSSL support

Signed-off-by: Sam James  gentoo.org>

 .../socat/files/socat-2.0.0_beta9-libressl.patch   | 267 -
 net-misc/socat/socat-1.7.3.4.ebuild|  11 +-
 net-misc/socat/socat-1.7.4.1.ebuild|  10 +-
 net-misc/socat/socat-2.0.0_beta9.ebuild|  12 +-
 net-misc/socat/socat-.ebuild   |  10 +-
 5 files changed, 17 insertions(+), 293 deletions(-)

diff --git a/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch 
b/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch
deleted file mode 100644
index 535297c04b0..000
--- a/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-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", 
   O

[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-03-22 Thread Sam James
commit: 2119d24638ee3bed12532160394cd6ed7e44249a
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 22 22:21:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 23 04:48:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2119d246

net-misc/socat: minor style changes

* Sort IUSE
* Drop trailing slash from HOMEPAGE
* Semicolon style

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 4 ++--
 net-misc/socat/socat-1.7.4.1.ebuild | 4 ++--
 net-misc/socat/socat-2.0.0_beta9.ebuild | 4 ++--
 net-misc/socat/socat-.ebuild| 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index 3eba54db2ef..6a196150378 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ipv6 readline ssl tcpd"
 
 DEPEND="
ssl? (
@@ -41,7 +41,7 @@ PATCHES=(
 
 pkg_setup() {
# bug #587740
-   if use readline && use ssl; then
+   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."

diff --git a/net-misc/socat/socat-1.7.4.1.ebuild 
b/net-misc/socat/socat-1.7.4.1.ebuild
index d064243f99d..d7ded0482c7 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ipv6 readline ssl tcpd"
 
 DEPEND="
ssl? (
@@ -37,7 +37,7 @@ DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES 
PORTING README SECURITY
 
 pkg_setup() {
# bug #587740
-   if use readline && use ssl; then
+   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."

diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild 
b/net-misc/socat/socat-2.0.0_beta9.ebuild
index 0f00e144582..9532a828421 100644
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="libressl ssl readline ipv6 tcpd"
+IUSE="libressl ipv6 readline ssl tcpd"
 
 DEPEND="
ssl? (
@@ -44,7 +44,7 @@ PATCHES=(
 
 pkg_setup() {
# bug #587740
-   if use readline && use ssl; then
+   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."

diff --git a/net-misc/socat/socat-.ebuild b/net-misc/socat/socat-.ebuild
index dada7a8478e..b0f72ca9e8e 100644
--- a/net-misc/socat/socat-.ebuild
+++ b/net-misc/socat/socat-.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://repo.or.cz/${PN}.git";
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bindist libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ipv6 readline ssl tcpd"
 
 BDEPEND="app-text/yodl"
 DEPEND="
@@ -35,7 +35,7 @@ DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES 
PORTING README SECURITY
 
 pkg_setup() {
# bug #587740
-   if use readline && use ssl; then
+   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."



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-02-16 Thread Sam James
commit: bc31efd1a951d65af1c4b6a4e5722bcf9a49c120
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 16 12:29:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 16 12:29:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc31efd1

net-misc/socat: Stabilize 1.7.4.1 ppc, #769830

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.1.ebuild 
b/net-misc/socat/socat-1.7.4.1.ebuild
index 7c31bce0a86..d064243f99d 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-02-15 Thread Sam James
commit: 37df64092d3a04977930e1f2e5ce47b020c35e09
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 15 10:48:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 15 10:48:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37df6409

net-misc/socat: Stabilize 1.7.4.1 arm, #769830

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.1.ebuild 
b/net-misc/socat/socat-1.7.4.1.ebuild
index 0b427133e32..7c31bce0a86 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-02-14 Thread Sam James
commit: a0b51cfd1619a94e5faa56158efe5387f70d73ad
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 14 14:52:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 14 14:52:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b51cfd

net-misc/socat: Stabilize 1.7.4.1 arm64, #769830

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.1.ebuild 
b/net-misc/socat/socat-1.7.4.1.ebuild
index b825d44a0c8..0b427133e32 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-02-12 Thread Sam James
commit: 6017560204c5583acf5f02da166081bd86224fbf
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 12 13:47:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 12 13:47:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60175602

net-misc/socat: Stabilize 1.7.4.1 amd64, #769830

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.1.ebuild 
b/net-misc/socat/socat-1.7.4.1.ebuild
index 60528f8130d..b825d44a0c8 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-02-12 Thread Sam James
commit: a8f74fc6cebc2b06a4abc380b4524bc2e823927d
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 12 09:56:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 12 09:56:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f74fc6

net-misc/socat: Stabilize 1.7.4.1 x86, #769830

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.1.ebuild 
b/net-misc/socat/socat-1.7.4.1.ebuild
index 0300789f216..60528f8130d 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-02-10 Thread Sam James
commit: f1d107ff86d16163ee41de5f8fd8983f79a5649e
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 10 16:59:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 10 16:59:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1d107ff

net-misc/socat: Stabilize 1.7.4.1 ppc64, #769830

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.1.ebuild 
b/net-misc/socat/socat-1.7.4.1.ebuild
index f2a86a292eb..0300789f216 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-02-09 Thread Sam James
commit: e5759c120067237d88cf79d8a0ea6adfb3c7566f
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 10 02:45:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 10 02:45:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5759c12

net-misc/socat: Stabilize 1.7.4.1 sparc, #769830

Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.4.1.ebuild 
b/net-misc/socat/socat-1.7.4.1.ebuild
index 1db0f86eaaf..f2a86a292eb 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/files/, net-misc/socat/

2021-01-26 Thread Sam James
commit: c46cfcc8d9e2917be6e128b5bad005dff1651d3e
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 27 07:33:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 27 07:33:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c46cfcc8

net-misc/socat: cleanup old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest|  1 -
 .../files/socat-1.7.4.0-32bit_build_fix.patch  | 42 --
 net-misc/socat/socat-1.7.4.0.ebuild| 67 --
 3 files changed, 110 deletions(-)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 22d39d91ac3..a47d4af7a88 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,4 +1,3 @@
 DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 
68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666
 SHA512 
f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
-DIST socat-1.7.4.0.tar.bz2 509023 BLAKE2B 
97ad5f5a52375aea4d2afbb4ac6143a86bfa057aed602d552b015f6c9fc6a3a0cc65b1717573b3c60bed482da908197366bd1d282ee1db6fd86a229484d2bb9f
 SHA512 
c4d166c2259271a70f81d6c4972549549c3fc60a9e47cc03eff1dd4d71c298ac39c177ae3c053dc0c97c2770fe8d157fd0bc6f2c14aef91625f868894d5d7c61
 DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 
9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568
 SHA512 
7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch 
b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch
deleted file mode 100644
index 0b391ed8929..000
--- a/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-2021-01-08: Quick fix to a compilation failure especially on 32 bit systems
-
 socat-1.7.4.0/compat.h
-+++ socat-1.7.4.0/compat.h
-@@ -134,6 +134,8 @@
- #define F_uint64_t "%u"
- #  elif HAVE_BASIC_UINT64_T==6
- #define F_uint64_t "%lu"
-+#  elif HAVE_BASIC_UINT64_T==8
-+#define F_uint64_t "%llu"
- #  else
- #error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T
- #  endif
-@@ -147,7 +149,7 @@
- #  elif HAVE_BASIC_INT16_T==3
- #define F_int16_t "%d"
- #  elif HAVE_BASIC_INT16_T==5
--#define F_int16_t "%l"
-+#define F_int16_t "%ld"
- #  else
- #error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T
- #  endif
-@@ -161,7 +163,7 @@
- #  elif HAVE_BASIC_INT32_T==3
- #define F_int32_t "%d"
- #  elif HAVE_BASIC_INT32_T==5
--#define F_int32_t "%l"
-+#define F_int32_t "%ld"
- #  else
- #error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T
- #  endif
-@@ -175,7 +177,9 @@
- #  elif HAVE_BASIC_INT64_T==3
- #define F_int64_t "%d"
- #  elif HAVE_BASIC_INT64_T==5
--#define F_int64_t "%l"
-+#define F_int64_t "%ld"
-+#  elif HAVE_BASIC_INT64_T==7
-+#define F_int64_t "%lld"
- #  else
- #error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T
- #  endif

diff --git a/net-misc/socat/socat-1.7.4.0.ebuild 
b/net-misc/socat/socat-1.7.4.0.ebuild
deleted file mode 100644
index 4b62fa74485..000
--- a/net-misc/socat/socat-1.7.4.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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}"
-
-# Tests are a large bash script
-# Hard to disable individual tests needing network or privileges
-RESTRICT="
-   test
-   ssl? ( readline? ( bindist ) )
-"
-
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
-
-PATCHES=(
-   "${FILESDIR}/${P}-32bit_build_fix.

[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-01-10 Thread Sam James
commit: 7a88ae21a0af1bd0242b2d878a12967690b7cd45
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 10 21:56:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 10 21:56:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a88ae21

net-misc/socat: bump to 1.7.4.1

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.7.4.1.ebuild | 63 +
 2 files changed, 64 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 8a226798468..22d39d91ac3 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,3 +1,4 @@
 DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 
68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666
 SHA512 
f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
 DIST socat-1.7.4.0.tar.bz2 509023 BLAKE2B 
97ad5f5a52375aea4d2afbb4ac6143a86bfa057aed602d552b015f6c9fc6a3a0cc65b1717573b3c60bed482da908197366bd1d282ee1db6fd86a229484d2bb9f
 SHA512 
c4d166c2259271a70f81d6c4972549549c3fc60a9e47cc03eff1dd4d71c298ac39c177ae3c053dc0c97c2770fe8d157fd0bc6f2c14aef91625f868894d5d7c61
+DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 
9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568
 SHA512 
7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.4.1.ebuild 
b/net-misc/socat/socat-1.7.4.1.ebuild
new file mode 100644
index 000..1db0f86eaaf
--- /dev/null
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+RESTRICT="
+   test
+   ssl? ( readline? ( bindist ) )
+"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
+
+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_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
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/files/, net-misc/socat/

2021-01-09 Thread Lars Wendler
commit: 70a6c877b9763fb19eb292bd0b15243d5fd534d4
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan  9 13:52:42 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jan  9 13:53:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a6c877

net-misc/socat: Fixed build on 32bit arches

with kind permission from Sam

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 .../files/socat-1.7.4.0-32bit_build_fix.patch  | 42 ++
 net-misc/socat/socat-1.7.4.0.ebuild|  4 +++
 2 files changed, 46 insertions(+)

diff --git a/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch 
b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch
new file mode 100644
index 000..0b391ed8929
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch
@@ -0,0 +1,42 @@
+2021-01-08: Quick fix to a compilation failure especially on 32 bit systems
+
+--- socat-1.7.4.0/compat.h
 socat-1.7.4.0/compat.h
+@@ -134,6 +134,8 @@
+ #define F_uint64_t "%u"
+ #  elif HAVE_BASIC_UINT64_T==6
+ #define F_uint64_t "%lu"
++#  elif HAVE_BASIC_UINT64_T==8
++#define F_uint64_t "%llu"
+ #  else
+ #error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T
+ #  endif
+@@ -147,7 +149,7 @@
+ #  elif HAVE_BASIC_INT16_T==3
+ #define F_int16_t "%d"
+ #  elif HAVE_BASIC_INT16_T==5
+-#define F_int16_t "%l"
++#define F_int16_t "%ld"
+ #  else
+ #error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T
+ #  endif
+@@ -161,7 +163,7 @@
+ #  elif HAVE_BASIC_INT32_T==3
+ #define F_int32_t "%d"
+ #  elif HAVE_BASIC_INT32_T==5
+-#define F_int32_t "%l"
++#define F_int32_t "%ld"
+ #  else
+ #error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T
+ #  endif
+@@ -175,7 +177,9 @@
+ #  elif HAVE_BASIC_INT64_T==3
+ #define F_int64_t "%d"
+ #  elif HAVE_BASIC_INT64_T==5
+-#define F_int64_t "%l"
++#define F_int64_t "%ld"
++#  elif HAVE_BASIC_INT64_T==7
++#define F_int64_t "%lld"
+ #  else
+ #error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T
+ #  endif

diff --git a/net-misc/socat/socat-1.7.4.0.ebuild 
b/net-misc/socat/socat-1.7.4.0.ebuild
index 1db0f86eaaf..4b62fa74485 100644
--- a/net-misc/socat/socat-1.7.4.0.ebuild
+++ b/net-misc/socat/socat-1.7.4.0.ebuild
@@ -35,6 +35,10 @@ RESTRICT="
 
 DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
 
+PATCHES=(
+   "${FILESDIR}/${P}-32bit_build_fix.patch"
+)
+
 pkg_setup() {
# bug #587740
if use readline && use ssl; then



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-01-06 Thread Sam James
commit: 5458af5f9efaca5a968acbdc71dddfe240da70d4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 03:19:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 03:19:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5458af5f

net-misc/socat: unify style

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 19 +++
 net-misc/socat/socat-2.0.0_beta9.ebuild | 18 +++---
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index ea696ac13e6..3eba54db2ef 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -2,13 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit flag-o-matic toolchain-funcs
 
+MY_P=${P/_beta/-b}
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
 SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,16 +24,17 @@ DEPEND="
readline? ( sys-libs/readline:= )
tcpd? ( sys-apps/tcp-wrappers )
 "
-RDEPEND="
-   ${DEPEND}
-"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
 RESTRICT="
test
ssl? ( readline? ( bindist ) )
 "
-DOCS=(
-   BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY
-)
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
+
 PATCHES=(
"${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch
 )
@@ -49,6 +51,7 @@ pkg_setup() {
 src_configure() {
filter-flags '-Wno-error*' #293324
tc-export AR
+
econf \
$(use_enable ssl openssl) \
$(use_enable readline) \

diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild 
b/net-misc/socat/socat-2.0.0_beta9.ebuild
index 3745b7704e2..0f00e144582 100644
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild
@@ -2,13 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic toolchain-funcs
 
+MY_P=${P/_beta/-b}
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
 SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,12 +26,14 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT="test
-   ssl? ( readline? ( bindist ) )"
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+RESTRICT="
+   test
+   ssl? ( readline? ( bindist ) )
+"
 
-DOCS=(
-   BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY
-)
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
@@ -59,6 +62,7 @@ src_prepare() {
 src_configure() {
filter-flags -Wall '-Wno-error*' #293324
tc-export AR
+
econf \
$(use_enable ssl openssl) \
$(use_enable readline) \



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-01-06 Thread Sam James
commit: 0ecd104c8ce857dd4721cf7c56481ba1afbf602d
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 03:16:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 03:16:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ecd104c

net-misc/socat: add extra HOMEPAGE

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 2 +-
 net-misc/socat/socat-1.7.4.0.ebuild | 2 +-
 net-misc/socat/socat-2.0.0_beta9.ebuild | 4 ++--
 net-misc/socat/socat-.ebuild| 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index 3ae99fe76a3..ea696ac13e6 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/";
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
 MY_P=${P/_beta/-b}
 S="${WORKDIR}/${MY_P}"
 SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";

diff --git a/net-misc/socat/socat-1.7.4.0.ebuild 
b/net-misc/socat/socat-1.7.4.0.ebuild
index cce924237d7..1db0f86eaaf 100644
--- a/net-misc/socat/socat-1.7.4.0.ebuild
+++ b/net-misc/socat/socat-1.7.4.0.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs
 
 MY_P=${P/_beta/-b}
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/";
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
 SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
 S="${WORKDIR}/${MY_P}"
 

diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild 
b/net-misc/socat/socat-2.0.0_beta9.ebuild
index d5d7fe26557..3745b7704e2 100644
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/";
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
 MY_P=${P/_beta/-b}
 S="${WORKDIR}/${MY_P}"
 SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";

diff --git a/net-misc/socat/socat-.ebuild b/net-misc/socat/socat-.ebuild
index b7f8ff16c50..dada7a8478e 100644
--- a/net-misc/socat/socat-.ebuild
+++ b/net-misc/socat/socat-.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/";
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
 EGIT_REPO_URI="https://repo.or.cz/${PN}.git";
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-01-06 Thread Sam James
commit: 0b37a28ecfdc8d201e53edf80d0de0840d613bb4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 03:00:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 03:06:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b37a28e

net-misc/socat: bump to 1.7.4.0

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.7.4.0.ebuild | 63 +
 2 files changed, 64 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 0fb684a0357..8a226798468 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,2 +1,3 @@
 DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 
68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666
 SHA512 
f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
+DIST socat-1.7.4.0.tar.bz2 509023 BLAKE2B 
97ad5f5a52375aea4d2afbb4ac6143a86bfa057aed602d552b015f6c9fc6a3a0cc65b1717573b3c60bed482da908197366bd1d282ee1db6fd86a229484d2bb9f
 SHA512 
c4d166c2259271a70f81d6c4972549549c3fc60a9e47cc03eff1dd4d71c298ac39c177ae3c053dc0c97c2770fe8d157fd0bc6f2c14aef91625f868894d5d7c61
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.4.0.ebuild 
b/net-misc/socat/socat-1.7.4.0.ebuild
new file mode 100644
index 000..cce924237d7
--- /dev/null
+++ b/net-misc/socat/socat-1.7.4.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/";
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+RESTRICT="
+   test
+   ssl? ( readline? ( bindist ) )
+"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
+
+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_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
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/, net-misc/socat/files/

2021-01-06 Thread Sam James
commit: df13bd514e0d04eb52593e0b43c40c422ce09ad4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 03:02:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 03:06:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df13bd51

net-misc/socat: sync live

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/files/socat--stddef_h.patch | 38 --
 net-misc/socat/socat-.ebuild   | 29 
 2 files changed, 11 insertions(+), 56 deletions(-)

diff --git a/net-misc/socat/files/socat--stddef_h.patch 
b/net-misc/socat/files/socat--stddef_h.patch
deleted file mode 100644
index 802b578d4a2..000
--- a/net-misc/socat/files/socat--stddef_h.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-When disabling OpenSSL support, nestlex.c still needs stddef.h which is
-magically included through the OpenSSL headers otherwise.
-
 a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,7 @@
- AC_CHECK_HEADERS(inttypes.h)
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h 
sys/time.h syslog.h unistd.h)
--AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h 
sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
-+AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h 
sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
- AC_CHECK_HEADERS(pty.h)
- AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
- AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
 a/config.h.in
-+++ b/config.h.in
-@@ -189,6 +189,9 @@
- /* Define if you have the  header file.  */
- #undef HAVE_GRP_H
- 
-+/* Define if you have the  header file.  */
-+#undef HAVE_STDDEF_H
-+
- /* Define if you have the  header file.  */
- #undef HAVE_STDINT_H
- 
 a/sysincludes.h
-+++ b/sysincludes.h
-@@ -51,6 +51,9 @@
- #if HAVE_SYS_TIME_H
- #include  /* select(); OpenBSD: struct timespec */
- #endif
-+#if HAVE_STDDEF_H
-+#include 
-+#endif
- #if HAVE_STDINT_H
- #include/* uint8_t */
- #endif

diff --git a/net-misc/socat/socat-.ebuild b/net-misc/socat/socat-.ebuild
index 7d28699e42f..b7f8ff16c50 100644
--- a/net-misc/socat/socat-.ebuild
+++ b/net-misc/socat/socat-.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic git-r3 toolchain-funcs
+
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/";
@@ -10,9 +11,9 @@ EGIT_REPO_URI="https://repo.or.cz/${PN}.git";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ssl readline ipv6 tcpd"
 
+BDEPEND="app-text/yodl"
 DEPEND="
ssl? (
!libressl? ( dev-libs/openssl:0= )
@@ -21,24 +22,16 @@ DEPEND="
readline? ( sys-libs/readline:= )
tcpd? ( sys-apps/tcp-wrappers )
 "
-BDEPEND="
-   app-text/yodl
-"
-DEPEND="
-   ${RDEPEND}
-"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
 RESTRICT="
test
ssl? ( readline? ( bindist ) )
 "
-DOCS=(
-   BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY
-)
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch
-   "${FILESDIR}"/${PN}--stddef_h.patch
-)
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY )
 
 pkg_setup() {
# bug #587740
@@ -51,13 +44,13 @@ pkg_setup() {
 
 src_prepare() {
default
-
eautoreconf
 }
 
 src_configure() {
filter-flags '-Wno-error*' #293324
tc-export AR
+
econf \
$(use_enable ssl openssl) \
$(use_enable readline) \



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2021-01-06 Thread Fabian Groffen
commit: bfec8bae78bd5259a694b8e4bf85dee2467ba9e6
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 14:49:43 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:06:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfec8bae

net-misc/socat: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index a364c0284ad..3ae99fe76a3 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,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 arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-11-03 Thread Sam James
commit: ce143107b6896858729b932723a3752eb370ea4b
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  4 00:32:23 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  4 00:32:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce143107

net-misc/socat: join as (co-)maintainer

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
index 70bb6410439..b367792e3e3 100644
--- a/net-misc/socat/metadata.xml
+++ b/net-misc/socat/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
+   
+   s...@gentoo.org
+   Sam James
+   

net...@gentoo.org
Gentoo network monitoring and analysis project



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-07-25 Thread Jeroen Roovers
commit: 9c583d83ebd9c1e9ec9b39e08bb4ee2733924bcc
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jul 25 09:16:20 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jul 25 09:20:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c583d83

net-misc/socat: Old

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-misc/socat/Manifest |  2 --
 net-misc/socat/socat-1.7.3.2.ebuild | 70 -
 net-misc/socat/socat-1.7.3.3.ebuild | 67 ---
 3 files changed, 139 deletions(-)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 41bb967bd89..0fb684a0357 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,4 +1,2 @@
-DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 
8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5
 SHA512 
9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293
-DIST socat-1.7.3.3.tar.bz2 489901 BLAKE2B 
5bd919dbef2efb64b4674ea072375d2b4e7c14629c2a48cd2f0233f31163c5aadd02f99d98a54b5f1375bbe7291d8134d4bb59d74a674d99d95714720b482cce
 SHA512 
6073facb3db7cd24b9380f400876d73537b52b8e53ff6aac080388c2b1fc4a2decdfac7ce23bff6ab680fb2751251cda7fc67be9b09954edc46f449e0a7d0c7e
 DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 
68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666
 SHA512 
f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
deleted file mode 100644
index 5b4862cd259..000
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 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/net-misc/socat/socat-1.7.3.3.ebuild 
b/net-misc/socat/socat-1.7.3.3.ebuild
deleted file mode 100644
index b12695499bb..000
--- a/net-misc/socat/socat-1.7.3.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="bindist libressl ssl readline ipv6 tcpd"
-
-DEPEND="
-   ssl? (
-   !libressl? ( dev-libs/opens

[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-07-25 Thread Jeroen Roovers
commit: ef66b0419a4511a1bfe9612f2c0fabf3f51702ab
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jul 25 09:14:09 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jul 25 09:14:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef66b041

net-misc/socat: Stable for HPPA

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Bug: https://bugs.gentoo.org/show_bug.cgi?id=726646
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index a364c0284ad..a7e73743412 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -12,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 arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-07-22 Thread Agostino Sarubbo
commit: 9382d866762b0df301e79786eba538fda3f6f24a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 22 09:02:25 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 22 09:02:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9382d866

net-misc/socat: x86 stable wrt bug #726646

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index 582972ee945..a364c0284ad 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -12,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 arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-07-22 Thread Agostino Sarubbo
commit: 040bbdf3c929f1e90eba578250f45d541d40a63c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 22 09:01:00 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 22 09:01:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040bbdf3

net-misc/socat: amd64 stable wrt bug #726646

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index c9da10a735c..582972ee945 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -12,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 arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-07-22 Thread Sergei Trofimovich
commit: ed0a1baad0d853913de5e51478ee6f20ddad4115
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jul 22 07:31:12 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jul 22 07:31:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0a1baa

net-misc/socat: stable 1.7.3.4 for sparc

stable wrt bug #726646

Package-Manager: Portage-3.0.0, Repoman-2.3.23
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index d914b577bc3..c9da10a735c 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -12,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 arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-07-22 Thread Sergei Trofimovich
commit: ccda94796c0a34b5a37e9c16444e3fb3b7088cdf
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jul 22 07:29:53 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jul 22 07:29:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccda9479

net-misc/socat: stable 1.7.3.4 for ppc64

stable wrt bug #726646

Package-Manager: Portage-3.0.0, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index afbf944cc7e..d914b577bc3 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -12,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 arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-07-22 Thread Sergei Trofimovich
commit: 0f8ebbba5867c587b4e0184c8da9fce743d3454a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jul 22 07:28:57 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jul 22 07:28:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8ebbba

net-misc/socat: stable 1.7.3.4 for ppc

stable wrt bug #726646

Package-Manager: Portage-3.0.0, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index ede57730bcf..afbf944cc7e 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -12,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 arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-07-20 Thread Sam James
commit: 5db0fc91a9d66439b2bd5158b608af50724db437
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 21 00:21:29 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 21 00:21:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5db0fc91

net-misc/socat: arm stable (bug #726646)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index 3b9e65bd683..ede57730bcf 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -12,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 arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-07-20 Thread Sam James
commit: 1c0df14014c213de5b536f369f71f1326dc23575
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 20 18:24:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 20 18:24:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0df140

net-misc/socat: arm64 stable (bug #726646)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 net-misc/socat/socat-1.7.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index bb9b7b39d9a..3b9e65bd683 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -12,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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-06-03 Thread Jeroen Roovers
commit: 1821838c98613733da2fb2305febe7de72f3c40f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jun  3 09:09:36 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jun  3 09:10:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1821838c

net-misc/socat: BDEPEND on app-text/yodl

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-misc/socat/socat-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-.ebuild b/net-misc/socat/socat-.ebuild
index 2c12dbc3dc4..7d28699e42f 100644
--- a/net-misc/socat/socat-.ebuild
+++ b/net-misc/socat/socat-.ebuild
@@ -21,9 +21,11 @@ DEPEND="
readline? ( sys-libs/readline:= )
tcpd? ( sys-apps/tcp-wrappers )
 "
+BDEPEND="
+   app-text/yodl
+"
 DEPEND="
${RDEPEND}
-   app-text/yodl
 "
 RESTRICT="
test



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/, net-misc/socat/files/

2020-01-27 Thread Jeroen Roovers
commit: a4e3d5b9b0af743e295fd5fe1ec2021950d7a4cd
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jan 27 11:04:03 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jan 27 11:05:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e3d5b9

net-misc/socat: Fix CFLAGS=-fno-common USE=tcpd

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 .../socat/files/socat-1.7.3.4-fno-common.patch | 24 ++
 net-misc/socat/socat-1.7.3.4.ebuild|  3 +++
 net-misc/socat/socat-2.0.0_beta9.ebuild|  6 +++---
 net-misc/socat/socat-.ebuild   |  3 ++-
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/net-misc/socat/files/socat-1.7.3.4-fno-common.patch 
b/net-misc/socat/files/socat-1.7.3.4-fno-common.patch
new file mode 100644
index 000..a7dcf71c376
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.3.4-fno-common.patch
@@ -0,0 +1,24 @@
+--- a/filan.c
 b/filan.c
+@@ -30,7 +30,9 @@
+ 
+ /* dirty workaround so we dont get an error on AIX when being linked with
+libwrap */
++#if _AIX
+ int allow_severity, deny_severity;
++#endif
+ 
+ /* global variables for configuring filan */
+ bool filan_followsymlinks;
+--- a/procan.c
 b/procan.c
+@@ -21,7 +21,9 @@
+ 
+ /* dirty workaround so we dont get an error on AIX when getting linked with
+libwrap */
++#if _AIX
+ int allow_severity, deny_severity;
++#endif
+ 
+ 
+ int procan(FILE *outfile) {

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
index 5c208be530b..d964ea01444 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -33,6 +33,9 @@ RESTRICT="
 DOCS=(
BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY
 )
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch
+)
 
 pkg_setup() {
# bug #587740

diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild 
b/net-misc/socat/socat-2.0.0_beta9.ebuild
index f8881af9ed2..d5d7fe26557 100644
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
@@ -36,6 +35,7 @@ DOCS=(
 PATCHES=(
"${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
"${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+   "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch
"${FILESDIR}"/${PN}-2.0.0_beta9-libressl.patch
 )
 

diff --git a/net-misc/socat/socat-.ebuild b/net-misc/socat/socat-.ebuild
index dfc7752ca39..2c12dbc3dc4 100644
--- a/net-misc/socat/socat-.ebuild
+++ b/net-misc/socat/socat-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,7 @@ DOCS=(
 )
 
 PATCHES=(
+   "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch
"${FILESDIR}"/${PN}--stddef_h.patch
 )
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2020-01-07 Thread Jeroen Roovers
commit: af024394f1413fb457f9add46804f474c422ff54
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Jan  7 10:42:11 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Jan  7 10:43:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af024394

net-misc/socat: Version 1.7.3.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.7.3.4.ebuild | 61 +
 2 files changed, 62 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index e45a2fb0385..41bb967bd89 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,3 +1,4 @@
 DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 
8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5
 SHA512 
9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293
 DIST socat-1.7.3.3.tar.bz2 489901 BLAKE2B 
5bd919dbef2efb64b4674ea072375d2b4e7c14629c2a48cd2f0233f31163c5aadd02f99d98a54b5f1375bbe7291d8134d4bb59d74a674d99d95714720b482cce
 SHA512 
6073facb3db7cd24b9380f400876d73537b52b8e53ff6aac080388c2b1fc4a2decdfac7ce23bff6ab680fb2751251cda7fc67be9b09954edc46f449e0a7d0c7e
+DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 
68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666
 SHA512 
f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.3.4.ebuild 
b/net-misc/socat/socat-1.7.3.4.ebuild
new file mode 100644
index 000..5c208be530b
--- /dev/null
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit 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
+)
+
+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_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
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/, net-misc/socat/files/

2019-04-18 Thread Jeroen Roovers
commit: 6fac1518b00810d03d46ffddc5f030193b1deaf7
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Apr 18 15:19:17 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Apr 18 15:19:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fac1518

net-misc/socat: Update live ebuild

Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-misc/socat/files/socat--stddef_h.patch | 38 ++
 net-misc/socat/socat-.ebuild   |  3 +-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/net-misc/socat/files/socat--stddef_h.patch 
b/net-misc/socat/files/socat--stddef_h.patch
new file mode 100644
index 000..802b578d4a2
--- /dev/null
+++ b/net-misc/socat/files/socat--stddef_h.patch
@@ -0,0 +1,38 @@
+When disabling OpenSSL support, nestlex.c still needs stddef.h which is
+magically included through the OpenSSL headers otherwise.
+
+--- a/configure.ac
 b/configure.ac
+@@ -61,7 +61,7 @@
+ AC_CHECK_HEADERS(inttypes.h)
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h 
sys/time.h syslog.h unistd.h)
+-AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h 
sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
++AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h 
sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
+ AC_CHECK_HEADERS(pty.h)
+ AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
+ AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
+--- a/config.h.in
 b/config.h.in
+@@ -189,6 +189,9 @@
+ /* Define if you have the  header file.  */
+ #undef HAVE_GRP_H
+ 
++/* Define if you have the  header file.  */
++#undef HAVE_STDDEF_H
++
+ /* Define if you have the  header file.  */
+ #undef HAVE_STDINT_H
+ 
+--- a/sysincludes.h
 b/sysincludes.h
+@@ -51,6 +51,9 @@
+ #if HAVE_SYS_TIME_H
+ #include  /* select(); OpenBSD: struct timespec */
+ #endif
++#if HAVE_STDDEF_H
++#include 
++#endif
+ #if HAVE_STDINT_H
+ #include/* uint8_t */
+ #endif

diff --git a/net-misc/socat/socat-.ebuild b/net-misc/socat/socat-.ebuild
index dab9093e876..dfc7752ca39 100644
--- a/net-misc/socat/socat-.ebuild
+++ b/net-misc/socat/socat-.ebuild
@@ -34,8 +34,7 @@ DOCS=(
 )
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
-   "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+   "${FILESDIR}"/${PN}--stddef_h.patch
 )
 
 pkg_setup() {



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2019-04-10 Thread Jeroen Roovers
commit: 2d1c978adbbe081b9831c091b55dc6fe90c73865
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Apr 10 09:52:13 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Apr 10 09:53:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1c978a

net-misc/socat: Version 1.7.3.3

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.7.3.3.ebuild | 67 +
 2 files changed, 68 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 9de02486bea..e45a2fb0385 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,2 +1,3 @@
 DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 
8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5
 SHA512 
9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293
+DIST socat-1.7.3.3.tar.bz2 489901 BLAKE2B 
5bd919dbef2efb64b4674ea072375d2b4e7c14629c2a48cd2f0233f31163c5aadd02f99d98a54b5f1375bbe7291d8134d4bb59d74a674d99d95714720b482cce
 SHA512 
6073facb3db7cd24b9380f400876d73537b52b8e53ff6aac080388c2b1fc4a2decdfac7ce23bff6ab680fb2751251cda7fc67be9b09954edc46f449e0a7d0c7e
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.3.3.ebuild 
b/net-misc/socat/socat-1.7.3.3.ebuild
new file mode 100644
index 000..5d48079d56c
--- /dev/null
+++ b/net-misc/socat/socat-1.7.3.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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
+)
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2019-04-04 Thread Jeroen Roovers
commit: 2bd5b5e0229b7402939adfa1c4720af0bbc9fb02
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Apr  4 08:40:37 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Apr  4 08:41:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd5b5e0

net-misc/socat: Use HTTPS

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-misc/socat/socat-.ebuild | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/net-misc/socat/socat-.ebuild b/net-misc/socat/socat-.ebuild
index 52fde25ab3f..dab9093e876 100644
--- a/net-misc/socat/socat-.ebuild
+++ b/net-misc/socat/socat-.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit autotools flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/";
-MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
-EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
+EGIT_REPO_URI="https://repo.or.cz/${PN}.git";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,10 +25,10 @@ DEPEND="
${RDEPEND}
app-text/yodl
 "
-
-RESTRICT="test
-   ssl? ( readline? ( bindist ) )"
-
+RESTRICT="
+   test
+   ssl? ( readline? ( bindist ) )
+"
 DOCS=(
BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY
 )



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2018-03-15 Thread Jeroen Roovers
commit: 4eed4f3d06e2177a48fef74fb58f98fba1d403cd
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Mar 15 15:47:57 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Mar 15 15:49:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eed4f3d

net-misc/socat: Old.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/socat/Manifest |  1 -
 net-misc/socat/socat-1.7.3.1.ebuild | 52 -
 2 files changed, 53 deletions(-)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 115026eeeff..9de02486bea 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,3 +1,2 @@
-DIST socat-1.7.3.1.tar.bz2 488467 BLAKE2B 
57e03488bb8513dd7961cf4ec42d9176ea1ce9827c78d643bdeb08a5290b3a00ad9f7643b94967538cddec5375f8cf4a155e52929fb33d619eaeebd17a3cd420
 SHA512 
463340f578d4d1d54458b8ef9573ad3eff51dbcc736205e1b62e9a4782770d4bb76e6a07506350fd35405b130660559aaa79dfa2664c53ea268d7d64231f9b32
 DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 
8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5
 SHA512 
9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
 SHA512 
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834

diff --git a/net-misc/socat/socat-1.7.3.1.ebuild 
b/net-misc/socat/socat-1.7.3.1.ebuild
deleted file mode 100644
index 63c88ab0a5b..000
--- a/net-misc/socat/socat-1.7.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils 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 s390 sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="ssl readline ipv6 tcpd"
-
-DEPEND="
-   ssl? ( dev-libs/openssl:0= )
-   readline? ( sys-libs/readline:= )
-   tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-DOCS=(
-   BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README 
SECURITY
-)
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
-   epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
-
-   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
-
-   dohtml doc/*.html doc/*.css
-}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2018-03-15 Thread Mikle Kolyada
commit: daace69fe2c2cacbb43a5c09d4c9eb08589b1386
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Mar 15 15:06:38 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Mar 15 15:06:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daace69f

net-misc/socat: arm stable wrt bug #615180

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/socat/socat-1.7.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
index 4d82cb66a51..d60e4c3ea1d 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2018-03-05 Thread Mart Raudsepp
commit: aa15f5cb9f5bceb55bbfe3b76b8c9a24a5e6b776
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Mar  5 14:13:22 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Mar  5 14:28:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa15f5cb

net-misc/socat-1.7.3.2: arm64 stable (bug #615180)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-misc/socat/socat-1.7.3.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
index c4cf894a49b..4d82cb66a51 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 
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"
+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="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2017-11-05 Thread Sergei Trofimovich
commit: 4b82fec75604fb3e6e89ad24b7559fd3e1d00b0a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov  5 18:04:36 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov  5 18:06:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b82fec7

net-misc/socat: stable 1.7.3.2 for sparc, bug #615180 (thanks to Rolf Eike Beer)

Package-Manager: Portage-2.3.13, Repoman-2.3.4
RepoMan-Options: --include-arches="sparc"

 net-misc/socat/socat-1.7.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
index ba6cc50d964..c4cf894a49b 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2017-08-29 Thread Thomas Deutschmann
commit: 03005859c787e473180d393906bdb50d476a59ef
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug 29 21:28:01 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug 29 21:38:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03005859

net-misc/socat: x86 stable (bug #615180)

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-misc/socat/socat-1.7.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
index 1b3e71f4d43..ba6cc50d964 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2017-08-26 Thread Mikle Kolyada
commit: 7da13384403f1b221427cbf787c258b22500b5e2
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Aug 26 08:40:13 2017 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Aug 26 08:40:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da13384

net-misc/socat: amd64 stable wrt bug #615180

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-misc/socat/socat-1.7.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
index 2c33905d085..1b3e71f4d43 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2017-06-17 Thread Sergei Trofimovich
commit: 5a80dc91ad8d01a73db21cc8a424d6f5c629921d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 17 16:29:58 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 17 16:32:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a80dc91

net-misc/socat: ia64 stable, bug #615180

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-misc/socat/socat-1.7.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
index b2d87958ee1..2c33905d085 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2017-05-22 Thread Tobias Klausmann
commit: ee45bc62eaf64179c248fa9ddf7247a916631d2a
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon May 22 18:40:58 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon May 22 18:40:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee45bc62

net-misc/socat-1.7.3.2-r0: add alpha keyword

Gentoo-Bug: 615180

 net-misc/socat/socat-1.7.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
index a8e484c5457..b2d87958ee1 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2017-05-18 Thread Michael Weber
commit: c0098210e2db9d7e976fcbfe6678a2fe79b069fe
Author: Michael Weber  gentoo  org>
AuthorDate: Thu May 18 15:19:58 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Thu May 18 15:20:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0098210

net-misc/socat: ppc ppc64 stable (bug 615180).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="ppc ppc64"

 net-misc/socat/socat-1.7.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
index 1e191010193..a8e484c5457 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2017-04-17 Thread Jeroen Roovers
commit: 05e9dc86fa36ee3760fdc45572a52bb678abc5ab
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Apr 18 06:36:43 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Apr 18 06:36:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e9dc86

net-misc/socat: Stable for HPPA (bug #615180).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 net-misc/socat/socat-1.7.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
index 63a28aec863..1e191010193 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2017-03-21 Thread Matt Turner
commit: 27ef905362c15a5e8dcd55a80aab5cb15e75b903
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Mar 21 16:43:47 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Mar 21 18:11:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ef9053

net-misc/socat-1.7.3.2: added ~ppc64

 net-misc/socat/socat-1.7.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
index da366505760..63a28aec863 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ 
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 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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="



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/

2017-01-29 Thread Jeroen Roovers
commit: a2e998fabab3f46a0e608e8d5c37ecbde9353731
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jan 29 09:33:17 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jan 29 09:34:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e998fa

net-misc/socat: Version bump by Marek Behun (bug #607478).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-misc/socat/Manifest |  1 +
 net-misc/socat/socat-1.7.3.2.ebuild | 71 +
 2 files changed, 72 insertions(+)

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 7622d70..3a32dc6 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/net-misc/socat/socat-1.7.3.2.ebuild 
b/net-misc/socat/socat-1.7.3.2.ebuild
new file mode 100644
index ..8c61f2e
--- /dev/null
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~hppa ~ia64 ~mips ~ppc ~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
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/files/, net-misc/socat/

2017-01-29 Thread Jeroen Roovers
commit: 88c9a01578f3e2e92c5f4ae365eea1421f3b38b7
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jan 29 09:34:13 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jan 29 09:34:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88c9a015

net-misc/socat: Old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-misc/socat/files/socat-1.7.3.1-libressl.patch | 277 --
 net-misc/socat/socat-1.7.3.1-r1.ebuild|  73 --
 2 files changed, 350 deletions(-)

diff --git a/net-misc/socat/files/socat-1.7.3.1-libressl.patch 
b/net-misc/socat/files/socat-1.7.3.1-libressl.patch
deleted file mode 100644
index fe9a1b1..
--- a/net-misc/socat/files/socat-1.7.3.1-libressl.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From 1106527e9ca2be33af03d99393aa43069918df1a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Beh=C3=BAn?= 
-Date: Mon, 6 Jun 2016 18:43:56 +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  |  6 +-
- xio-openssl.c | 24 ++--
- xio-openssl.h |  4 +++-
- xioopts.c |  8 ++--
- xioopts.h |  4 +++-
- 6 files changed, 42 insertions(+), 12 deletions(-)
-
-diff --git a/sslcls.c b/sslcls.c
-index 6ddc077..a4de26b 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;
-@@ -331,6 +335,7 @@ void sycSSL_free(SSL *ssl) {
-return;
- }
- 
-+#ifndef OPENSSL_NO_EGD
- int sycRAND_egd(const char *path) {
-int result;
-Debug1("RAND_egd(\"%s\")", path);
-@@ -338,6 +343,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;
-@@ -375,7 +381,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 aece28a..5a4f8b1 100644
 a/sslcls.h
-+++ b/sslcls.h
-@@ -47,7 +47,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);
- 
-@@ -55,7 +57,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);
-@@ -98,7 +100,9 @@ const char *sycSSL_COMP_get_name(const COMP_METHOD *comp);
- #define sycSSL_shutdown(s) SSL_shutdown(s)
- #define sycSSL_CTX_free(c) SSL_CTX_free(c)
- #define sycSSL_free(s) SSL_free(s)
-+#ifndef OPENSSL_NO_EGD
- #define sycRAND_egd(p) RAND_egd(p)
-+#endif
- 
- #define sycPEM_read_bio_DHparams(b,x,p,u) PEM_read_bio_DHparams(b,x,p,u)
- 
-diff --git a/xio-openssl.c b/xio-openssl.c
-index b7e95c1..03cc9ff 100644
 a/xio-openssl.c
-+++ b/xio-openssl.c
-@@ -108,9 +108,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

[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/files/, net-misc/socat/

2016-09-21 Thread Patrick McLean
commit: b46ade639dea1b83feb4ed821fa12f58ec0780a1
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Sep 21 18:31:05 2016 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Sep 21 18:36:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46ade63

net-misc/socat: Revision bump, add libressl support and license warning

Port to EAPI=6

Add libressl support (bug #565244), thanks to Marek Behun for the patch

Add license warning and RESTRICT (bug #587740)

Package-Manager: portage-2.3.1

 net-misc/socat/files/socat-1.7.3.1-libressl.patch | 277 ++
 net-misc/socat/socat-1.7.3.1-r1.ebuild|  73 ++
 2 files changed, 350 insertions(+)

diff --git a/net-misc/socat/files/socat-1.7.3.1-libressl.patch 
b/net-misc/socat/files/socat-1.7.3.1-libressl.patch
new file mode 100644
index ..fe9a1b1
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.3.1-libressl.patch
@@ -0,0 +1,277 @@
+From 1106527e9ca2be33af03d99393aa43069918df1a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= 
+Date: Mon, 6 Jun 2016 18:43:56 +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  |  6 +-
+ xio-openssl.c | 24 ++--
+ xio-openssl.h |  4 +++-
+ xioopts.c |  8 ++--
+ xioopts.h |  4 +++-
+ 6 files changed, 42 insertions(+), 12 deletions(-)
+
+diff --git a/sslcls.c b/sslcls.c
+index 6ddc077..a4de26b 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;
+@@ -331,6 +335,7 @@ void sycSSL_free(SSL *ssl) {
+return;
+ }
+ 
++#ifndef OPENSSL_NO_EGD
+ int sycRAND_egd(const char *path) {
+int result;
+Debug1("RAND_egd(\"%s\")", path);
+@@ -338,6 +343,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;
+@@ -375,7 +381,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 aece28a..5a4f8b1 100644
+--- a/sslcls.h
 b/sslcls.h
+@@ -47,7 +47,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);
+ 
+@@ -55,7 +57,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);
+@@ -98,7 +100,9 @@ const char *sycSSL_COMP_get_name(const COMP_METHOD *comp);
+ #define sycSSL_shutdown(s) SSL_shutdown(s)
+ #define sycSSL_CTX_free(c) SSL_CTX_free(c)
+ #define sycSSL_free(s) SSL_free(s)
++#ifndef OPENSSL_NO_EGD
+ #define sycRAND_egd(p) RAND_egd(p)
++#endif
+ 
+ #define sycPEM_read_bio_DHparams(b,x,p,u) PEM_read_bio_DHparams(b,x,p,u)
+ 
+diff --git a/xio-openssl.c b/xio-openssl.c
+index b7e95c1..03cc9ff 100644
+--- a/xio-openssl.c
 b/xio-openssl.c
+@@ -108,9 +108,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, 

[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/files/, net-misc/socat/

2016-09-21 Thread Patrick McLean
commit: 699d4c3617e48a9b1d66879e56b34479cf647a5f
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Sep 21 18:36:04 2016 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Sep 21 18:37:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699d4c36

net-misc/socat: Add libressl and license warning to 2.0 ebuild

Port to EAPI=6

This adds libressl support (bug #565244) thanks to Marek Behun for the patch

This also adds a RESTRICT for bindist with ssl and readline

Sync  ebuild with changes

Package-Manager: portage-2.3.1

 .../socat/files/socat-2.0.0_beta9-libressl.patch   | 267 +
 net-misc/socat/socat-2.0.0_beta9.ebuild|  37 ++-
 net-misc/socat/socat-.ebuild   |  39 ++-
 3 files changed, 324 insertions(+), 19 deletions(-)

diff --git a/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch 
b/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch
new file mode 100644
index ..535297c
--- /dev/null
+++ b/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
+ co

[gentoo-commits] repo/gentoo:master commit in: net-misc/socat/, net-misc/socat/files/

2016-03-06 Thread Jeroen Roovers
commit: 1e993862a9035cdf54e32298f593a3d03b2f94fe
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Mar  5 08:26:40 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Mar  5 08:26:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e993862

net-misc/socat: Fix building with USE=-ssl (bug #576270 by Jan Chren (rindeal)).

Package-Manager: portage-2.2.27

 net-misc/socat/files/socat-1.7.3.1-stddef_h.patch | 38 +++
 net-misc/socat/socat-1.7.3.1.ebuild   |  5 ++-
 net-misc/socat/socat-2.0.0_beta9.ebuild   |  6 +++-
 net-misc/socat/socat-.ebuild  |  3 ++
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch 
b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
new file mode 100644
index 000..c914a81
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
@@ -0,0 +1,38 @@
+When disabling OpenSSL support, nestlex.c still needs stddef.h which is
+magically included through the OpenSSL headers otherwise.
+
+--- a/configure.in
 b/configure.in
+@@ -61,7 +61,7 @@
+ AC_CHECK_HEADERS(inttypes.h)
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h 
sys/time.h syslog.h unistd.h)
+-AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h 
sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
++AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h 
sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
+ AC_CHECK_HEADERS(pty.h)
+ AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
+ AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
+--- a/config.h.in
 b/config.h.in
+@@ -189,6 +189,9 @@
+ /* Define if you have the  header file.  */
+ #undef HAVE_GRP_H
+ 
++/* Define if you have the  header file.  */
++#undef HAVE_STDDEF_H
++
+ /* Define if you have the  header file.  */
+ #undef HAVE_STDINT_H
+ 
+--- a/sysincludes.h
 b/sysincludes.h
+@@ -51,6 +51,9 @@
+ #if HAVE_SYS_TIME_H
+ #include  /* select(); OpenBSD: struct timespec */
+ #endif
++#if HAVE_STDDEF_H
++#include 
++#endif
+ #if HAVE_STDINT_H
+ #include/* uint8_t */
+ #endif

diff --git a/net-misc/socat/socat-1.7.3.1.ebuild 
b/net-misc/socat/socat-1.7.3.1.ebuild
index 998dc35..e46c58a 100644
--- a/net-misc/socat/socat-1.7.3.1.ebuild
+++ b/net-misc/socat/socat-1.7.3.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/";
@@ -31,6 +31,9 @@ DOCS=(
 
 src_prepare() {
epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
+   epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+
+   eautoreconf
 }
 
 src_configure() {

diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild 
b/net-misc/socat/socat-2.0.0_beta9.ebuild
index 1a83319..07429de 100644
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/";
@@ -32,7 +32,11 @@ DOCS=(
 
 src_prepare() {
epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
+   epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+
touch doc/${PN}.1 || die
+
+   eautoreconf
 }
 
 src_configure() {

diff --git a/net-misc/socat/socat-.ebuild b/net-misc/socat/socat-.ebuild
index 9ebf68b..076b3a1 100644
--- a/net-misc/socat/socat-.ebuild
+++ b/net-misc/socat/socat-.ebuild
@@ -33,6 +33,9 @@ DOCS=(
 )
 
 src_prepare() {
+   epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
+   epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+
eautoreconf
 }
 



  1   2   >