gentoo auto-resync : 17:06:2023 - 07:43:56

7 files changed, 109 insertions, 4 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5a9e16ea45d3..6c51a15eae66 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 98515fa9dec5..e4b4f3bbd19d 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -24,5 +24,5 @@ AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
 EBUILD dhcp-4.4.3_p1-r3.ebuild 8492 BLAKE2B 46592e05bbd2fd7607efa50e671b3794c385608043b1d0e941e96bb501694a97ef1b345333cc592f743b2a7023ac04d7e8a061c722683e80adedb471e8f8dc6d SHA512 6a6011d0a0a7c54f8dde3122b74b77dfd0540cbdd54265702d04126b19313aa455cc9526bcb7598ab8d6d5c8450738a6d126b9d95de9a34bd5b264ef7e6ba994
-EBUILD dhcp-4.4.3_p1-r4.ebuild 8550 BLAKE2B a9583d50f9d739c1964259dcf3eb05d0042b533d89ea0b86c19e6ff940328b67b69eda9e91eee6c176ac178196a5bc58255c271cbf1f7d94a5abf2bc50c6e700 SHA512 eca3c0dad1e20bc9ab73f106f45770f9b0bc47eac978a4b5d6ef225764e1aa6339378f8dfd4f880e059088aab2baaa49ba133133fb9e5f3b8424699fa7ee1003
+EBUILD dhcp-4.4.3_p1-r4.ebuild 8548 BLAKE2B 60a3d7c23eab145eec884fe615b21bda80711b943c0532387b53e8215c660993597f8d80f9212e75d534992cb2fcf3f88107be14b4632482a0444a1c44abdbf3 SHA512 a9b94eb0caba31ff6230c098b7fd4faa8b972a3956dca79a8448d72838ea9f866b82b90be9644864fc960bb454e9d8662b7d3478f0a97da9cf17a0a8490be84b
 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 4140099005c0..70aaa8b57cd9 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
 
 BDEPEND="
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index c0603200d761..dd778ac01525 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -3,5 +3,5 @@ AUX keychain-2.8.5-malformed-ssh-key.patch 993 BLAKE2B fd959123205865d4c467dd680
 AUX keychain-2.8.5-typos.patch 3639 BLAKE2B 98d4ad974d29808fab53ac155b98b9a70fd15434d33d55d52c453f1d26bd2f227d685829eb8610a65dacff05b08d760626db6f2de6ce5a928114cb9bddba0a95 SHA512 36dfb7b8c99cd41229280a3c77fabc226eae9b29f2e843b6f28a99361d3c384cc9f47aeeecb0cec417a8222365f56b2b39fee6122b7602f76bfba077c020d783
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
 EBUILD keychain-2.8.5-r1.ebuild 574 BLAKE2B 43c0e2982f7fb6222e54190d07730f555137db686311fbae753820b6bb094a6dd5c729528543fef2e13b17a9947a0f99168a304e631e81cc9e27d8e1be142e3b SHA512 4f1e7adf7c7d099f4f7dac8b09342db8c9478c337538fece2870932b228bef901a5c7d5578934a5e61aa0fc8c47ac73ca7b3999db2221ac169da37d59e500d03
-EBUILD keychain-2.8.5-r2.ebuild 750 BLAKE2B 15ee462235319fe76a9ca123ad2886f341e48c16c55a3903e21fbdbb9bac69a10d3bd648c8c20daebdc2d86bc746a78968731fd7c345d9c16d047580e71b91c3 SHA512 a315ed38166fda2f7118e75a94bea6949e705c7e1976995db1afbdff76a92da7025540df58393dbe3dc0819ea3393a8311a13424126df86b70bcd9192e9e10b1
+EBUILD keychain-2.8.5-r2.ebuild 749 BLAKE2B bd3017c379a7dc95ada3d6eb658d7862e988512783938713eea40de54f624b76c98fca0affef6156ac4a5f4bc92a43e67015fc2053f3c1047705115f9e3374a9 SHA512 92f8770e5604fa95e19b3eca44430f04586336353f122a8a59133df9a20580710c5f5104be92de02e7c06123adefba1d381fed08cead042a31a3a3d49b9c491b
 MISC metadata.xml 527 BLAKE2B 244df1b2a5ab0820d287c8cd2b56829cab27026eca673cffc5191f945bdc9cea69fe65d5de87ef147d9060a01a044110176d8377835775cbe5425796b671f836 SHA512 90e1a381903b19a64317859afcc629a22ac9c414bb61ce333966c8d2f39fc728e98d21e2695df130da645802daafa146649fa2a5a03720b53e8e3d110f589d6b
diff --git a/net-misc/keychain/keychain-2.8.5-r2.ebuild b/net-misc/keychain/keychain-2.8.5-r2.ebuild
index b4b0fddd5acb..9d1a154269b1 100644
--- a/net-misc/keychain/keychain-2.8.5-r2.ebuild
+++ b/net-misc/keychain/keychain-2.8.5-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="dev-lang/perl"
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 223b6684ae0d..8b122a5aa7c0 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -12,5 +12,6 @@ DIST memcached-1.6.21.tar.gz 1127623 BLAKE2B 13feb4872f5d196c1c3ded0159c16c2b096
 EBUILD memcached-1.6.18.ebuild 2975 BLAKE2B 1ddeee044758f6c594acfbfb8ceb825fc1d5fa9a35c895d8844c31f9ec5224a3fec61f0478c5fa633f0a7fe787eece323609542db13cb7d1db35c27ae2b5648c SHA512 eed2bfd686b15c2fe5dd400a614080a645fa545d49f3b49f687c547300072a9b82eb5a2beff213e2bda5e860a620edca851258f5ca5b0e5201ebdb9e81d32610
 EBUILD memcached-1.6.19.ebuild 2975 BLAKE2B 1ddeee044758f6c594acfbfb8ceb825fc1d5fa9a35c895d8844c31f9ec5224a3fec61f0478c5fa633f0a7fe787eece323609542db13cb7d1db35c27ae2b5648c SHA512 eed2bfd686b15c2fe5dd400a614080a645fa545d49f3b49f687c547300072a9b82eb5a2beff213e2bda5e860a620edca851258f5ca5b0e5201ebdb9e81d32610
 EBUILD memcached-1.6.20.ebuild 2982 BLAKE2B 2eaa1cbc10cfde4ad6c8ada1c300a6969928db4dafc11af6b400026e8e57481e062822de1204196c9d8a84a727846bddfc087b4defdbd8c14d8664cfa6054648 SHA512 d9477a08513a46e775ce4e361ba6ffd346c09e4e05177e2846b6e5c7760e3db238bb7f30b57da8e77482b0f0a3031d66a92b2a66dafa06ab7ee3ee63c4db8688
+EBUILD memcached-1.6.21-r1.ebuild 2876 BLAKE2B e79ecdffce82de619be65ee499124afd3ca233a10fbd5ddce1c63cac2718d5a0c29345377428ba2f21454560f0df3587f4c623c401b131b8abd7acad3e74ab87 SHA512 22a1f09114cf612bfb220412261fd8d58065c12458934055a5148b7a790decaae18e5bd14afc47c6ce2648516a3daa32899e80dc5628aa6b156b1cbb2ecbd3d3
 EBUILD memcached-1.6.21.ebuild 2982 BLAKE2B 2eaa1cbc10cfde4ad6c8ada1c300a6969928db4dafc11af6b400026e8e57481e062822de1204196c9d8a84a727846bddfc087b4defdbd8c14d8664cfa6054648 SHA512 d9477a08513a46e775ce4e361ba6ffd346c09e4e05177e2846b6e5c7760e3db238bb7f30b57da8e77482b0f0a3031d66a92b2a66dafa06ab7ee3ee63c4db8688
 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de
diff --git a/net-misc/memcached/memcached-1.6.21-r1.ebuild b/net-misc/memcached/memcached-1.6.21-r1.ebuild
new file mode 100644
index 000000000000..9a7f346eea40
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.21-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )
+	ssl? ( >=dev-libs/openssl-1.1.0g:= )"
+DEPEND="${RDEPEND}
+	acct-user/memcached
+	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+
+	eautoreconf
+
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		--disable-werror \
+		$(use_enable sasl) \
+		$(use_enable ssl tls)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}