gentoo auto-resync : 29:03:2024 - 01:13:38

4 files changed, 108 insertions, 2 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index cb97a695b794..698e0c1ae6c0 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 2739f1d1766c..ec167cdaf0f9 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -8,9 +8,11 @@ DIST memcached-1.6.22.tar.gz 1135926 BLAKE2B 872594e087e2302ac7901481797aa6fda98
 DIST memcached-1.6.23.tar.gz 1166511 BLAKE2B 4e0d4cc49781a78e6900d843750d495d87f72829eabf6dcb1b959725a4f1df388a4cb44e87677f80ca19ea76102df997bb292137f626e8829113ec01e0b26e06 SHA512 b531a58f8fd1ff9ae821319302093ccf44a6c911ad680a15cc29390144a153340814f45c0a1ea9eebf999743399579e655abea671b27b85c1202d70945ce902a
 DIST memcached-1.6.24.tar.gz 1168521 BLAKE2B f68b9111c179865dba8ec126775195bc1dc0efb1ad76b121a06ca019a8fba675866b6d6c243d91412db259bc79cf54ef126b7c7c800198d5c980e1c48f6307a2 SHA512 e43386c2a6c0b95cefdccfe7f6b3890c59ca8b5c2636efc2e910b9617b20a5cf6de9bfedaafe0fb05c91bebb175fbdf033f5e0e512cb041b73af5af0d1854265
 DIST memcached-1.6.25.tar.gz 1178044 BLAKE2B a00fb61cf6fbad07d18ecf878c08b250bcc2206f5bc1bbf91d2d1524ba14bba15743a3cc2d919fbdf0388d01ec26671dcfd0e4511b477747497ee564d796828f SHA512 70b11244fdedbea29cceda0f6db94fcd3723f70643f614db1163bae90d9b9792fe247233aa08b894869252f7b8340e85e41213cd04195b5f4ba288901ede80f7
+DIST memcached-1.6.26.tar.gz 1178446 BLAKE2B 95919a83bd46bcddc7d055467954da6d64d42d0b9d1ee8e373e6c2a79cf518b768e0bd5d10f25a0eb27e642dd5fbc825f24c968d12034aa6e885a945a018e761 SHA512 7bd0d0dc0d228cde2fc3841c8973a2dde86bd50a4819f9737a22e12435f61d7459655029da390b63b8e6c3ca555b92a9c4c125a7c0bef5e6b051216414f1d49e
 EBUILD memcached-1.6.21-r1.ebuild 2869 BLAKE2B 671e6a2585b7f33af492f4e41bab77fc2e44df35010ec6e0b072b2b4ceab4f40ac869e0a3e458e32f78b377cf972fb83d16d4e873ecb1da76e0e3c9bd9d24d04 SHA512 2323da15f73225ef28c5598f5c54fa268884f628cb3cbeca1c72c92c6f53de3a8c0b6b83f453b71c4337c30bf12c6f49af7faa4ddc00091e46e84d8909b09ab5
 EBUILD memcached-1.6.22.ebuild 2869 BLAKE2B 671e6a2585b7f33af492f4e41bab77fc2e44df35010ec6e0b072b2b4ceab4f40ac869e0a3e458e32f78b377cf972fb83d16d4e873ecb1da76e0e3c9bd9d24d04 SHA512 2323da15f73225ef28c5598f5c54fa268884f628cb3cbeca1c72c92c6f53de3a8c0b6b83f453b71c4337c30bf12c6f49af7faa4ddc00091e46e84d8909b09ab5
 EBUILD memcached-1.6.23.ebuild 2876 BLAKE2B 6492511f677ae751ec42bd0d8c01db45bb95a264fd9d3eb9c4639c185ed6b40a2696746b5527d9fd951b444ebf7041ee784f016e1a2261cc053932059b9aa007 SHA512 817edbb2ec16159672cf1bb9926a06325af8d1afe09ca52c7950cc6b67e7d1a3ef6e21850f1200a3afc97a7fb4ec0d43142250aff70ebc7ef3cf66eb3ad0cdba
-EBUILD memcached-1.6.24.ebuild 2876 BLAKE2B 6492511f677ae751ec42bd0d8c01db45bb95a264fd9d3eb9c4639c185ed6b40a2696746b5527d9fd951b444ebf7041ee784f016e1a2261cc053932059b9aa007 SHA512 817edbb2ec16159672cf1bb9926a06325af8d1afe09ca52c7950cc6b67e7d1a3ef6e21850f1200a3afc97a7fb4ec0d43142250aff70ebc7ef3cf66eb3ad0cdba
+EBUILD memcached-1.6.24.ebuild 2869 BLAKE2B 17f3fd3f6fa7e3734a0a7c9fe7a0f80cc1147002842bf7918cc5c2bd00ae71a41849387436f0fd698198bba383bd35283780c52d29d45954d0f545ec22697b34 SHA512 7a0bc969aa426ff6ee1f693bb94b62755401e1ef8dcf367fb64fae0aac717ec59e8f38027e0697d35a357e311eccedb029a99c04dfc777bee33c1398b16b8434
 EBUILD memcached-1.6.25.ebuild 2876 BLAKE2B 6492511f677ae751ec42bd0d8c01db45bb95a264fd9d3eb9c4639c185ed6b40a2696746b5527d9fd951b444ebf7041ee784f016e1a2261cc053932059b9aa007 SHA512 817edbb2ec16159672cf1bb9926a06325af8d1afe09ca52c7950cc6b67e7d1a3ef6e21850f1200a3afc97a7fb4ec0d43142250aff70ebc7ef3cf66eb3ad0cdba
+EBUILD memcached-1.6.26.ebuild 2876 BLAKE2B 6492511f677ae751ec42bd0d8c01db45bb95a264fd9d3eb9c4639c185ed6b40a2696746b5527d9fd951b444ebf7041ee784f016e1a2261cc053932059b9aa007 SHA512 817edbb2ec16159672cf1bb9926a06325af8d1afe09ca52c7950cc6b67e7d1a3ef6e21850f1200a3afc97a7fb4ec0d43142250aff70ebc7ef3cf66eb3ad0cdba
 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de
diff --git a/net-misc/memcached/memcached-1.6.24.ebuild b/net-misc/memcached/memcached-1.6.24.ebuild
index 9561a6bf3beb..bd837580012f 100644
--- a/net-misc/memcached/memcached-1.6.24.ebuild
+++ b/net-misc/memcached/memcached-1.6.24.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.memcached.org/files/${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"
+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:=
diff --git a/net-misc/memcached/memcached-1.6.26.ebuild b/net-misc/memcached/memcached-1.6.26.ebuild
new file mode 100644
index 000000000000..9561a6bf3beb
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.26.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 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"
+}