gentoo resync : 22.01.2021

4 files changed, 113 insertions, 1 deletions

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 5b00a04d405b..eaa362a60037 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,12 +1,15 @@
 AUX socat-1.7.3.0-filan-build.patch 1164 BLAKE2B ea158041a421fdfbbcfb14f050920f9f6ea9d99097d74c9c81c63c5816595f2ef8475b3add04d9efd8d19498382520a4f686d73c85b1df1879d5997b2f4da635 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf
 AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff240b7330800ee26876f2b9a0b21671d79da3244f87894ee2f65ca833f34e9636ed7ace4f19951fa4443abe26a2bb9c SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf
 AUX socat-1.7.3.4-fno-common.patch 497 BLAKE2B b1329f43afd86989d527a292ec188ebacfd269efe68bb649c6652cc7eb49d43363b0e0925c40cfa2e52a318a7eb84ae4822db98a5cbed69b394481f168def9ca SHA512 0dd7c92f8da42e99409b086ba48e757aa0fcdc404b771ce6d8f43296c72ab939bb98c202056312df5424332f9209b4f2b32b212b90c9d5819fb98ab0d890bc24
+AUX socat-1.7.4.0-32bit_build_fix.patch 1221 BLAKE2B f62b549c4ecce4df792c2ada29f251f0fdd142f593637abe962d42a9bb6af65bfac94e47846a612b97ee639c69addfdfc2de09a8bc4d2b062da2610b0e89f88d SHA512 734e74acfafbd3b1eadd71177198e9ee4f841f43c0da23f546026f56ae9649b99f04636361c46f5399e222a3e397ce02e635043b13c301e216426d98e4aa7131
 AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d93679177dacdda1dc03700711163bf66d73bd728ccc3c0e4ad45c7a8c65eaf47239c7558044e0683a80fdf75eab51e09df36ee63 SHA512 183972f5354872557a6ad131f1c8276b0250729aaa6659cd202dcf534d8b4bc41dd19cc6525bc888c325c670922ba382c684103ecdd8a385e5d27f52f321c7ed
 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
 EBUILD socat-1.7.3.4.ebuild 1586 BLAKE2B 7dfdd2075cee949d3252488fb60a5d3370bf540463857521a06b5e3fc32ae75195a4383e8dc18673322ef3db9ab2f25209ac638e67e7ad65bc113a3d4285b50b SHA512 716db6a19271e18a9f08386ef2906f55d7c483186e3622fca19075b2fbcbb57c3f22fc7adf62398528b576afff040aa6bef3dbf6d6ccd9f0fc919dc1f9faaa07
-EBUILD socat-1.7.4.0.ebuild 1534 BLAKE2B 1ab55137a27da5a25d6cb8d3ebf72f7b52aa0161a8ade16892fd68d0c6e40922996228050d51d72ce8e13f712574aa85249a550e9e6b3b65eb7e606e6d12a970 SHA512 3e3a47d3e41a8dfa9dda7c625d33d04f34c1a22695ff866db5dcf2234d9e8725a4ce80d241032a991df65d2086a204a660c8695ec1130f3cf245a32a58720fe8
+EBUILD socat-1.7.4.0.ebuild 1589 BLAKE2B 0be8375683d1948e56b7454ccd73c285d4871eb747b7c5efb21cd4f34717252ba55c0c1a2df485fa0a4374f098f826a4a7d2db6c551f282f9bc5994657edc547 SHA512 b5fc6b3535db3b43912832b976aace63fde55c7360da0f93fdad14c51d0084a9bd000c1c9a3bebecf48fcf77f99841ffe279dc51aa1971bceb341ca1ae2fe6c4
+EBUILD socat-1.7.4.1.ebuild 1534 BLAKE2B 1ab55137a27da5a25d6cb8d3ebf72f7b52aa0161a8ade16892fd68d0c6e40922996228050d51d72ce8e13f712574aa85249a550e9e6b3b65eb7e606e6d12a970 SHA512 3e3a47d3e41a8dfa9dda7c625d33d04f34c1a22695ff866db5dcf2234d9e8725a4ce80d241032a991df65d2086a204a660c8695ec1130f3cf245a32a58720fe8
 EBUILD socat-2.0.0_beta9.ebuild 1684 BLAKE2B 8b12d6c8f85d1f3d161238100f994c1f85862b1abc0d5759eca22d5e743821d1cccd2e1f505b19faf8ad4d65803fe26fd1a388b8a21802f000ec94d9f145a360 SHA512 5c3c58e869b297dfffded35ff69b6f34574901472196863bd8f29d52e4957129923c2f0738dc0a0b64c6cebbcb421be20ff008561ab53bfc91f543a0f96726d1
 EBUILD socat-9999.ebuild 1406 BLAKE2B c68fd7bf03d58f1bd16266304afab4cc73e2e129be5facb7416ed0a765fd198b02a76e5459b4dda831e2c4765c6cd9d4e0669dd024795161f38909c62d882116 SHA512 6ab7b9aa353e917b8aa46f2179bbcff95fa03e1e59ff4a8f68c512cbc8a582d5e288bd79a2a251c47837b60318640a1005392e0ebc72844a08327e41effdcc18
 MISC metadata.xml 467 BLAKE2B c95bf4d69aaf5077911ffc97657ec511286dd4f524fa4b9a1d537cba55d6fbc6ed2bdebf5379daa7c340a2f56538a2546971b39e7915baed943b177e7813b781 SHA512 2eb27fc5699059cecf00fa097c2e09440d5efd5a3b851631818d965bbda6767bfcc60a663d24569ab8b89a2e60bac9a5aead5fb3ca52d15e1d250140e7b70514
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 000000000000..0b391ed8929a
--- /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 1db0f86eaaf5..4b62fa74485a 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
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 000000000000..1db0f86eaaf5
--- /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
+}