gentoo auto-resync : 31:10:2022 - 03:04:34

6 files changed, 74 insertions, 8 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6453b59dea38..8b494b12c606 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 9068cc1c02bb..5fe12a04e78c 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -10,6 +10,6 @@ DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f
 DIST chrony-4.3.tar.gz 593560 BLAKE2B 51ba6d19312fd52cd6d6d8ab9437c886a3779877170674db6dc37d657e849101e2669fd6c8723d24e43c895cd1924c3d8d2ff442baeef9abe8a6c313929edf5f SHA512 1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df
 DIST chrony-4.3.tar.gz.asc 833 BLAKE2B 12399205da4ee5c442207bfdf936ac88552a49b21b0db8c15b09118b579e2076f7cfec6ad916b08b41edc4f9f8e03b13d7758ed08e116bee54d0f0f9cd68a505 SHA512 300b06f253ac3727edb86a1b7c337f9529ee752bbb471b266217b6a8ac5183e827264177a3210d436425d746673bf11fbdc41da145673213e28165197c6c76b7
 EBUILD chrony-4.2-r1.ebuild 6719 BLAKE2B 9dbf927768234a5e9f4a38463815395ae78b982c784cf25be1d6e78c0b268a6b9ed327d9de71505a4c1c4f158be50c15e6ecdff691369fb25f6ff664d73dce55 SHA512 12c3470d09c3b98f81649b8d16c58b53f9a2721540ae4fb376f4aea9a1f144540e0e415f94d08aceee9d69afddf1571855798c7ee175a278096f63fc32dcb0ab
-EBUILD chrony-4.3.ebuild 6610 BLAKE2B 321b8fb250d5f8c9600196b98fbc1552c346da7c26653e7a122b8b8e31d45574da3e8272beb5df7a7837278e9b36e2b9f5e1f0b6781c71a272765bf2887cc3f8 SHA512 810ae6585376833b2bf91e84cc11fa8b36e00a2f6845e297fa81b567b217abddeedcc50ef09b32d7126cdaf3b49295c90ed6a1e027f91959537514fb1fcfb482
-EBUILD chrony-9999.ebuild 6610 BLAKE2B 321b8fb250d5f8c9600196b98fbc1552c346da7c26653e7a122b8b8e31d45574da3e8272beb5df7a7837278e9b36e2b9f5e1f0b6781c71a272765bf2887cc3f8 SHA512 810ae6585376833b2bf91e84cc11fa8b36e00a2f6845e297fa81b567b217abddeedcc50ef09b32d7126cdaf3b49295c90ed6a1e027f91959537514fb1fcfb482
+EBUILD chrony-4.3.ebuild 6624 BLAKE2B 56cb3e48e17081147d037779ec867a5162b4cb88341ecc57cea6f49813320743ff5bb87d472b5e69982c9c433226d948945e9a28b6361e01b6cb067a606f3e7f SHA512 a0c094c7f290040ea0e5befd28418552af8c55dd40b072a776f629354c8b20df50baa35a50bf4fda6797298e2a4a3de95be729b5f96e473dcafbe16c5c3f1802
+EBUILD chrony-9999.ebuild 6624 BLAKE2B 56cb3e48e17081147d037779ec867a5162b4cb88341ecc57cea6f49813320743ff5bb87d472b5e69982c9c433226d948945e9a28b6361e01b6cb067a606f3e7f SHA512 a0c094c7f290040ea0e5befd28418552af8c55dd40b072a776f629354c8b20df50baa35a50bf4fda6797298e2a4a3de95be729b5f96e473dcafbe16c5c3f1802
 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.3.ebuild b/net-misc/chrony/chrony-4.3.ebuild
index c52e4bdbf30f..f8e842d67fb0 100644
--- a/net-misc/chrony/chrony-4.3.ebuild
+++ b/net-misc/chrony/chrony-4.3.ebuild
@@ -178,8 +178,8 @@ src_install() {
 		# Prepare a directory for the chrony.drift file (a la ntpsec)
 		# Ensures the environment is sane on new installs
 		# bug #711058
-		fowners ntp:ntp /var/{lib,log}/chrony
-		fperms 770 /var/lib/chrony
+		fowners -R ntp:ntp /var/{lib,log}/chrony
+		fperms -R 770 /var/lib/chrony
 	fi
 
 	insinto /etc/logrotate.d
@@ -243,7 +243,7 @@ pkg_postinst() {
 
 	if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
 		elog "To enable seccomp in a stricter mode, please modify:"
-		elog "- /etc/conf.d/chronyd for OpenRC"
+		elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC"
 		elog "- systemctl edit chronyd for systemd"
 		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
 		elog "By default, we now use -F 2 which is a baseline/minimal filter."
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index c52e4bdbf30f..f8e842d67fb0 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -178,8 +178,8 @@ src_install() {
 		# Prepare a directory for the chrony.drift file (a la ntpsec)
 		# Ensures the environment is sane on new installs
 		# bug #711058
-		fowners ntp:ntp /var/{lib,log}/chrony
-		fperms 770 /var/lib/chrony
+		fowners -R ntp:ntp /var/{lib,log}/chrony
+		fperms -R 770 /var/lib/chrony
 	fi
 
 	insinto /etc/logrotate.d
@@ -243,7 +243,7 @@ pkg_postinst() {
 
 	if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
 		elog "To enable seccomp in a stricter mode, please modify:"
-		elog "- /etc/conf.d/chronyd for OpenRC"
+		elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC"
 		elog "- systemctl edit chronyd for systemd"
 		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
 		elog "By default, we now use -F 2 which is a baseline/minimal filter."
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 2f507ad0ec9c..da3603424c5d 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -2,7 +2,9 @@ AUX socat-1.7.3.0-filan-build.patch 1164 BLAKE2B ea158041a421fdfbbcfb14f050920f9
 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
 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
 EBUILD socat-1.7.4.3.ebuild 1846 BLAKE2B 51b7d2f01afd4efec5338d1d38aa53dc287f8493424206b0d1a60ad86b0e250c209a82b61164a6b3d2768c5619d94b9b216ae8cec55541f3a276795d2f523201 SHA512 3958922ef28097cdca8ee392c1e45e7947603e6bbd3fa397055145f00fb94728b762c59fab722d7b25b33298f073d08f05bdc82f3634c6c2cc56c687fda3e320
+EBUILD socat-1.7.4.4.ebuild 1854 BLAKE2B bb3efe17e2d645965bc3bbc0697175c07f636fe4a1731e1e94b0ed278c1a4975f97504804198328aa590906e7b2e62866efa4db7776bd6f88f550b5edbf754fe SHA512 8d39a60d8f7579ab3910ebe2a6d0949ca96ed4ba04973e899b6fc32affdba70f4903bcb63056de53778f9ca2d8be2077e802257a5a93a1e23a89e52a62ad67bb
 EBUILD socat-2.0.0_beta9.ebuild 1569 BLAKE2B 9dfa4c8b0b0abf35ac8f5cb1b8b719bae89f5814084606ecc3b1fc8197aa598b11b94912985578e939ce8c549da194fe2e17bb42214521297f0a41c5acc0d1cb SHA512 219edf709f24642d0113f0a9e4ea1566940895b1cc9b11163ab69f598a8863155fec5f06b66a8c09441e113d9fa210a1d7e26a194b5e4c6441d6e52cc2a1cb1a
 MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
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 000000000000..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
+}