10 files changed, 150 insertions, 52 deletions
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 9de36164e377..de7c719dd7e3 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/nutcracker/Manifest b/net-proxy/nutcracker/Manifest
index 0de58efbe53e..01cd43dbb072 100644
--- a/net-proxy/nutcracker/Manifest
+++ b/net-proxy/nutcracker/Manifest
@@ -1,8 +1,11 @@
 AUX nutcracker-0.3.0-use-system-libyaml.patch 1633 BLAKE2B 07fa4384987fdefae8ea6dd53cec0774434791a55ff873bd4921dbad314b745052dcfbcc29e18221cca0a4a6845d99b774f86949924a1e8d2bb5083c216288b4 SHA512 ed818b96c4c4c9e149eda91a7daca242b144496b00421c286d9f9e88863e3df8382835d2556bb988ff019d7cffee791ed35d4fefeef486bd6972c4bbbc1319f5
-AUX nutcracker.confd 271 BLAKE2B 5f8a19edd4841cbc8b86f14ec48b72a46be95f34050619a6e1d75b12a348c11dab9890f1bbfaceff262256977888c378d2eee2ffb8c7b5c97e75bcc9c6e61502 SHA512 491b0330fda3994bedc15a77e7b4f601a2a0c234298ff04ee088f0e4a9676864e0eb01e1532f2cb6fdf95cefe0b0b0cf39d84b0993cadff774e7721f22d8c752
+AUX nutcracker-0.5.0-configure-bashism.patch 552 BLAKE2B 0dfb880995b66bbcea642fa9226a31d03dddd6103d5ce5d1eb111843d306a6362db8e87b53ef0d7ffb5b9561e84d2c5b33b1ab49474da8920aa073f3b33c8f53 SHA512 662ac83095527277311fb62978fbeed8e2bbb3175496a4b0e03bf29a4d172e362cac3fab959daf8532408fd249304f089cae276aefb8edbb957214288a29ef19
+AUX nutcracker-0.5.0-md5_signature-lto-mismatch.patch 581 BLAKE2B 9fc2926d889ddbcfc77f9763f742ae03696af305c6792b44bc464e8a42ccd74ec853be48f676889740cf8a50ab6c690b5c7a3c27a18ecb867e5ff17641d8733a SHA512 265c78680aa0e320af3f33d1c9538df2aa3d83b8cd5bc3342c6b428e334cc1fd79a3a6dd394fa2908a56992bf4908469c1f0f1d7bd2d5f7d7a0dd0939021e86b
+AUX nutcracker-0.5.0-use-system-libyaml.patch 2213 BLAKE2B f7f3cac97f6a299d131b1293e49b6831529782f505f64aecc81577f12170ab3531128a1bdc487e2ddba33f873434f5c93e47c7a69a99dfafe9b96ab8ea607051 SHA512 19937c2dc89d12330d78db559e4701e3f85cf86cd0fceb43d6d335fa19dc4e5ee6b1ab942a60c80c9c21be11151a108b36e7d00eb8dc7c636b7bc83024ec9b13
 AUX nutcracker.confd.2 272 BLAKE2B dfcfdfb4134ce0acfb126b1c7cb32062e47906dd68ed109a4e9edbae9c56f4b1ae17b20f593ef5af904bbe85837f5bb9ff91e0e068acfdff82e949b623abb55a SHA512 d208654b1e1fd20f456f340fabe25836c8ba948c96db8034d41710f9e0362936a24f0faec89e51c04d478c60de5255c9d238ab00d7d7b778a0619061a8cbce4c
-AUX nutcracker.initd 890 BLAKE2B a06886319400baa7b38fc32fb2961c80def5298e733977317edc158eef265d913b1437427b47e383f4c8ce0e65cf3d2d5117865ed542fc1ecc0a1f964356b7b8 SHA512 f40d692daa3cad7d7bce85ac0ecb01ca93f28f79e74b8a5bbea38930f78b24578b47fd7c44e36217ce60fee1ac3faefd8cd6d923046b339ec00c8fcc0f05f4fb
 AUX nutcracker.initd.2 891 BLAKE2B c643a511d2e402477c0862b67cdebb244fc2205466d78bc3cdb74b1f63b1659fef6bc0480d6950b5e00c0d9e84e072050f3bedb5d7931ee904c233313290e20b SHA512 ab06f875dca4ae27b4536d84c9342ec362e6f45f20efd370da0cb6073b306eeb0a1166737f6bdba3e1d5fe836d6b708729b7eadbab62cf66151649d2f56414eb
 DIST nutcracker-0.4.1.tar.gz 1163442 BLAKE2B 6838fbb5623ad49ef564176ba4c7d4e61cedb9693851cacc06d8ed09e3045b8cff9df1af8e21790cfa0e3f988b81a9c9cfa852449d532a432c05f3f4c3eace56 SHA512 581fae1d12feb983ed25b22cd6f597fd28b7070906ac29d3990669ae5c626a468914021cee152a6a2299a2838c838ad907e4c911b911ef04166ac7bbb2982da1
+DIST twemproxy-0.5.0.tar.gz 1298797 BLAKE2B f321fb7c44bb1abca2986f458b01234da50973fd75fee1eb2e22e6119be48adab5f45f78317aa99d234a246b26e579050df4b094658139d10207f817f26c14b1 SHA512 01a90b4596c0c50535b424f193b172f39d50432b91005bb36e08a6a37fdcb0ba612a905f49ff1c0acf0e168b7cdf7552425fb095f373c180801e1d68b1b0d1c9
 EBUILD nutcracker-0.4.1-r1.ebuild 967 BLAKE2B fdbb5f9bb2994b464ee5747f1c1d6eee86cf16fb9564cb7f342f6ca2be275f9bdafb0b9c48476266cab173eac951d1cb3d770e4701ea2bfb21285f1919593066 SHA512 3141ebbaa5868aef9858ed910a630e0767eb849979470bc23b65114b4266c311e93868efd2054b6279764b4522d11c91681788e83578d945582efd11e020ec2f
+EBUILD nutcracker-0.5.0.ebuild 1088 BLAKE2B 10a4c834e28c4f0fd8bc8b85f8b273d6214c316bf7a07f8a0385bfb3ab32d22017d2dc3206fdd7379834584defa24665cb53a5db7255b267da022997088901c1 SHA512 9be351328993d474755daae8488f66186697b2f5d8f7a065785aebf8bf729db805379c511d7eeb4ebdd42c00186937fd93bdcf85fce10320a343cec3ba3d20ad
 MISC metadata.xml 330 BLAKE2B 71183af5ddf56f7696cee101385c6e0fe3ee69001f88d68b8fe35af86fb2b161d1f66b1297f8072e780a3dd38c4f1787b7b7b502360e485fa77f12dba8bb0894 SHA512 173d72290670dc434499792e0c78d3e927609a27f51febfd52dc38db3c30caf0dcba7df1869f7212afde62a45917b00030f249fd2b1439e148d27a43d1e67ce3
diff --git a/net-proxy/nutcracker/files/nutcracker-0.5.0-configure-bashism.patch b/net-proxy/nutcracker/files/nutcracker-0.5.0-configure-bashism.patch
new file mode 100644
index 000000000000..888779a82514
--- /dev/null
+++ b/net-proxy/nutcracker/files/nutcracker-0.5.0-configure-bashism.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -159,7 +159,7 @@ AS_IF([test "x$ac_cv_epoll_works" = "xno" &&
+ AM_CONDITIONAL([OS_LINUX], [test "x$ac_cv_epoll_works" = "xyes"])
+ AM_CONDITIONAL([OS_BSD], [test "x$ac_cv_kqueue_works" = "xyes"])
+ AM_CONDITIONAL([OS_SOLARIS], [test "x$ac_cv_evports_works" = "xyes"])
+-AM_CONDITIONAL([OS_FREEBSD], [test "$(uname -v | cut -c 1-10)" == "FreeBSD 10"])
++AM_CONDITIONAL([OS_FREEBSD], [test "$(uname -v | cut -c 1-10)" = "FreeBSD 10"])
+ 
+ # Package options
+ AC_MSG_CHECKING([whether to enable debug logs and asserts])
diff --git a/net-proxy/nutcracker/files/nutcracker-0.5.0-md5_signature-lto-mismatch.patch b/net-proxy/nutcracker/files/nutcracker-0.5.0-md5_signature-lto-mismatch.patch
new file mode 100644
index 000000000000..bb493f209bb8
--- /dev/null
+++ b/net-proxy/nutcracker/files/nutcracker-0.5.0-md5_signature-lto-mismatch.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/861860
+--- a/src/hashkit/nc_hashkit.h
++++ b/src/hashkit/nc_hashkit.h
+@@ -55,7 +55,7 @@ typedef enum dist_type {
+ #undef DEFINE_ACTION
+ 
+ uint32_t hash_one_at_a_time(const char *key, size_t key_length);
+-void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result);
++void md5_signature(const unsigned char *key, unsigned long length, unsigned char *result);
+ uint32_t hash_md5(const char *key, size_t key_length);
+ uint32_t hash_crc16(const char *key, size_t key_length);
+ uint32_t hash_crc32(const char *key, size_t key_length);
diff --git a/net-proxy/nutcracker/files/nutcracker-0.5.0-use-system-libyaml.patch b/net-proxy/nutcracker/files/nutcracker-0.5.0-use-system-libyaml.patch
new file mode 100644
index 000000000000..ddb6694f05b6
--- /dev/null
+++ b/net-proxy/nutcracker/files/nutcracker-0.5.0-use-system-libyaml.patch
@@ -0,0 +1,62 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in config.h.in~
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = contrib src
++SUBDIRS = src
+ 
+ dist_man_MANS = man/nutcracker.8
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,11 +197,8 @@ AS_IF([test "x$disable_stats" = xyes],
+   [AC_DEFINE([HAVE_STATS], [1], [Define to 1 if stats is not disabled])])
+ AC_MSG_RESULT($disable_stats)
+ 
+-# Untar the yaml-0.2.5 in contrib/ before config.status is rerun
+-AC_CONFIG_COMMANDS_PRE([tar xvfz contrib/yaml-0.2.5.tar.gz -C contrib])
+-
+-# Call yaml-0.2.5 ./configure recursively
+-AC_CONFIG_SUBDIRS([contrib/yaml-0.2.5])
++# Use systems libyaml.
++PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.2.5])
+ 
+ # Define Makefiles
+ AC_CONFIG_FILES([Makefile
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,7 +7,6 @@ endif
+ AM_CPPFLAGS += -I $(top_srcdir)/src/hashkit
+ AM_CPPFLAGS += -I $(top_srcdir)/src/proto
+ AM_CPPFLAGS += -I $(top_srcdir)/src/event
+-AM_CPPFLAGS += -I $(top_srcdir)/contrib/yaml-0.2.5/include
+ 
+ AM_CFLAGS =
+ # about -fno-strict-aliasing: https://github.com/twitter/twemproxy/issues/276
+@@ -20,9 +19,10 @@ AM_CFLAGS += -Wno-unused-parameter -Wno-unused-value
+ AM_CFLAGS += -Wconversion -Wsign-compare
+ AM_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations
+ AM_CFLAGS += -Wno-format-zero-length
++AM_CFLAGS += $(YAML_CFLAGS)
+ 
+ AM_LDFLAGS =
+-AM_LDFLAGS += -lm -lpthread -rdynamic
++AM_LDFLAGS += -lm -lpthread -rdynamic $(YAML_LIBS)
+ if OS_SOLARIS
+ AM_LDFLAGS += -lnsl -lsocket
+ endif
+@@ -58,7 +58,6 @@ nutcracker_SOURCES =			\
+ nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a
+ nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a
+ nutcracker_LDADD += $(top_builddir)/src/event/libevent.a
+-nutcracker_LDADD += $(top_builddir)/contrib/yaml-0.2.5/src/.libs/libyaml.a
+ 
+ TESTS = test_all
+ bin_PROGRAMS = test_all
+@@ -86,4 +85,3 @@ test_all_SOURCES = test_all.c \
+ test_all_LDADD = $(top_builddir)/src/hashkit/libhashkit.a
+ test_all_LDADD += $(top_builddir)/src/proto/libproto.a
+ test_all_LDADD += $(top_builddir)/src/event/libevent.a
+-test_all_LDADD += $(top_builddir)/contrib/yaml-0.2.5/src/.libs/libyaml.a
diff --git a/net-proxy/nutcracker/files/nutcracker.confd b/net-proxy/nutcracker/files/nutcracker.confd
deleted file mode 100644
index 03393f23a64c..000000000000
--- a/net-proxy/nutcracker/files/nutcracker.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#USER="nobody"
-#PIDFILE="/var/run/nutcracker.pid"
-#CONF_FILE="/etc/nutcracker/nutcracker.yaml"
-
-NUTCRACKER_BIN="/usr/bin/nutcracker"
-NUTCRACKER_OPTS="--daemonize"
diff --git a/net-proxy/nutcracker/files/nutcracker.initd b/net-proxy/nutcracker/files/nutcracker.initd
deleted file mode 100644
index 47abe8f3cd45..000000000000
--- a/net-proxy/nutcracker/files/nutcracker.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-USER="${USER:-nobody}"
-PIDFILE="${PIDFILE:-/var/run/nutcracker.pid}"
-NUTCRACKER_BIN="${NUTCRACKER_BIN:-/usr/bin/nutcracker}"
-CONF_FILE="${CONF_FILE:-/etc/nutcracker/nutcracker.yml}"
-
-depend() {
-    need net
-}
-
-checkconf() {
-	ebegin "Testing configuration"
-	${NUTCRACKER_BIN} --test-conf \
-		--conf-file=${CONF_FILE} \
-		>/dev/null 2>&1
-	eend $?
-}
-
-start() {
-	checkconf || exit 1
-        ebegin "Starting Nutcracker"
-        start-stop-daemon --start -u ${USER} \
-		--name ${SVCNAME} \
-                --exec ${NUTCRACKER_BIN} -- \
-		--conf-file="${CONF_FILE}" \
-                --pid-file=${PIDFILE} \
-		${NUTCRACKER_OPTS}
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Nutcracker"
-        start-stop-daemon --stop --pidfile "${PIDFILE}"
-        eend $?
-}
-
diff --git a/net-proxy/nutcracker/nutcracker-0.5.0.ebuild b/net-proxy/nutcracker/nutcracker-0.5.0.ebuild
new file mode 100644
index 000000000000..e3f1f9d6fb92
--- /dev/null
+++ b/net-proxy/nutcracker/nutcracker-0.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A fast, light-weight proxy for Memcached and Redis. (Twitter's Twemproxy)"
+HOMEPAGE="https://github.com/twitter/twemproxy"
+SRC_URI="https://github.com/twitter/twemproxy/releases/download/${PV}/twemproxy-${PV}.tar.gz"
+S="${WORKDIR}/twemproxy-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+DEPEND=">=dev-libs/libyaml-0.2.5"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# Let's use system libyaml
+	"${FILESDIR}"/${PN}-0.5.0-use-system-libyaml.patch
+	"${FILESDIR}"/${PN}-0.5.0-configure-bashism.patch
+	"${FILESDIR}"/${PN}-0.5.0-md5_signature-lto-mismatch.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use debug)
+}
+
+src_install() {
+	default
+
+	insinto /etc/nutcracker
+	newins conf/nutcracker.yml nutcracker.yml.example
+
+	newconfd "${FILESDIR}/nutcracker.confd.2" nutcracker
+	newinitd "${FILESDIR}/nutcracker.initd.2" nutcracker
+
+	if use doc; then
+		dodoc -r notes
+	fi
+}
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index ef71c260702c..7b3a70283b7d 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -2,5 +2,5 @@ AUX ziproxy-3.3.2-Fix-clang-build-errors.patch 1166 BLAKE2B 4d75d717ea86d064fed4
 AUX ziproxy.confd 650 BLAKE2B 1c9dacf16234404fc702643ffd9fc2c72d7c7eb3e1d17af68a7c784a650bc7e95688167b86fc57e0b25b09c984569de52b3ef214be34b416642f9f1be4b02e0b SHA512 77d730705c652c59acbd20c10d06801427cc3736ef3f9e06771fcadb0470599b3f6b84bd6e4d35c10e90927077e35e0547051b638a4bbafe4a596c38aa1af0eb
 AUX ziproxy.initd-r1 558 BLAKE2B 3a6ccb81024c594babb288375d7b1c47208214700d9a362bc2eae1064f3ff026559f52dcccb3774924faa36a1f66d177347615ea6eab873ddccdac6ecd65a5c6 SHA512 81fd2c24876e6cc2be6c1b77e9c3ff916a7a8b541655aeb0dab3122c7b40a5f23ddc7db3d3867441c3f61509e0c75e321681e7fcd4e6b268f45faab55460542f
 DIST ziproxy-3.3.2.tar.xz 205992 BLAKE2B 0822c54fe1448588b14fbed58d8ffce27910db78959ec1f6344dd644dfaf222ef70d4389ec9f751457991e75bfdb59a8ee3964051beae279cba3486e1af7ccb2 SHA512 9e4cca86a29d970357c14369d4c8adc1902f334a60ce8d50872c36a65cf75f580eb92e185382f4a9bcfe31ddcc3ceee4f3a8cbeea395b6c09542bce0784b0b57
-EBUILD ziproxy-3.3.2.ebuild 1602 BLAKE2B 9c88566518a52024bdd08cb114cb8c467e7f2476312883f20db20cb41062966ddf690705eb2698eaab3e9e7004abf69bc4303e74ad3d788bd62951eafef243e3 SHA512 3b331493376248fd9b182ec4a0a9b8a509874189a68a66bc8c97dcdd15e46f3a2da8ce1c190506112af51ee9560e4b1abe2ef8a8a7e3908199210db3dc026414
+EBUILD ziproxy-3.3.2.ebuild 1784 BLAKE2B 508a7020ef8a8eecb8f0ef3250a540452fb69c77a0a2fdd447739b279cfc57980f594bac41e3e9457d48406b5f1f0a4e61b5013768388368925038e846bf1171 SHA512 681a314608058f63d4a97ad357b3989d976f41a63e8ab2c14b18aa0f2ce944741e3d430125e5129ea231e5bf3afe5258174bb15230a178bb3e070fe514922584
 MISC metadata.xml 517 BLAKE2B c11caee23184aaaca23c22baeef44c37324301c7908742f8804df5fa948d9f5e033f8a97811c885519c032e8f306655fdfc7734776e0bf4901b9e06b90596917 SHA512 b94b9a0bc1114948bcb50e89acd34133306560219be17432e6fac0966cc92ee8c4fab3d872c8c3a372ed451f44bc32f3a9664d4950a920c4c8f2d1aacfb49eb9
diff --git a/net-proxy/ziproxy/ziproxy-3.3.2.ebuild b/net-proxy/ziproxy/ziproxy-3.3.2.ebuild
index 18927d63ac6f..150e819fed4e 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.2.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit flag-o-matic
+
 DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
 HOMEPAGE="http://ziproxy.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
@@ -46,6 +48,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/861863
+	# Upstream is sourceforge and has been dead for 3 years. No upstream bug reported.
+	filter-lto
+
 	econf \
 		--without-jasper \
 		$(use_with sasl sasl2) \