4 files changed, 113 insertions, 19 deletions
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 89787d723168..c7fcf59705e9 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index 275a0b4294fd..05ca77c7f3e5 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -1,8 +1,8 @@
 AUX tinyproxy-1.10.0.initd 855 BLAKE2B 4bd9a260a930958ea449a08edce1f9e8633429a5222a3ea7254b4bdc03808c5f9f87d9b33556f345e305d28e155834b33ff2a952c041af582cae3bedbae2034d SHA512 cd440ed686e8128ed46441ca29da8376c4d28e9e34ae9b85c18eb2f1681d60c0c04b79401a7368f917eeab6768965d6c867d0ac6578a7858557c11b356446c02
 AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca809aca67b658bb13917869e5203d66730f52670fb9030dd9f6cf249d09f357bbdd143436f6b358377d8f78036 SHA512 7721b986326f82b03d79983be33047fdf4b37b5c63992645a321bf8bd3edea63680a2bf81b2d51fbeab2a5884773a0598dba14f9d597d3db0eea7c7f6b4c79d3
+AUX tinyproxy-1.11.2_use-runstatedir.patch 2694 BLAKE2B d960f69c8cb859cddcea340b4ec98345ef350a3661a51a173c3706680c37fe65e68915fa3053235c135ffcff66ff4c88c1d686712addd6a84a58794b85653349 SHA512 82b02ef1a334f44719d949679fbc33211c288db410233a4bb6c023450c6c6a95dfc8a8ff85f39f0622131ee677347c26245f0ca7c40a2099ff18d0b073f83253
 AUX tinyproxy.tmpfiles.conf 44 BLAKE2B a4e1cf0c8cbd78360175b8260c7d83885dfc9560a78faa6fc111f8611b6dd43c3cbf9fa62e60f8333cac4d0bededbe048c626d8a85d4f3c6c1bfa1ae249c599e SHA512 59d1efcc996e94ae684708ef06263c61f17680a776938a90ce145cf6f0243ed253d402cd886dab7c2c287f47dbc6f02f0e34904433e7b6756cfaa18a1b766b4e
 DIST tinyproxy-1.11.2.tar.xz 185864 BLAKE2B ae8f1cc0fcfa3f2a6b239ad1f0f34bf21843cbf85613643b221359904e672d5c28c69bcb6b61f0244c5a3e6fd901b0c24488c3b80a0aa1f95b87ff90b175dc62 SHA512 008e43b770f946965d5a3fbad1881859e30b66a3a4a97cf9982e63d81139da7a8f23937601b72f32276166cd170008cafec9231b616fc840f05cae3c1329be35
-DIST tinyproxy-31339cb1615765f2fbb4ec7779400535bad6da46.tar.gz 112886 BLAKE2B 82af9f671b31c9be46624400d726e428837763ab763942c335df1aa63499e33c17384b55ea2f68790cd3b8b1e4eff3b61b40f25e1d55506ce0f0694c7cddaddb SHA512 638ae0731aa2d9f498643aa883871f7b3978c68ee5098fcbeb234234e5432d1a833c33fb0cc1944504369bdf975baa0bd6166664c340825b9b55664d8afdf94c
-EBUILD tinyproxy-1.11.1_p20230201.ebuild 1824 BLAKE2B c8c44add2ee379b9d5b06d0ab6fcae37403a75da1c1946c9a01ff2e9d3434613155a0c29852d836d4be88bd21fecadcc2270c4b6e7b8f27dc3e72ca7b64dcbdb SHA512 0faea60253d65408016047b7c8f3cc7bf3228ed24e6e856d87209d2e8031d4441848656a040463a9890779721a8b2ccd335a499aa60c7333bcc1083921590860
+EBUILD tinyproxy-1.11.2-r1.ebuild 1927 BLAKE2B f2bbb377da2efead2e5bf896425258815fa09f4baa3cd1154324af600d4893c6457f45bf2723e27fb6f79d54e63a325ad8bd2aee254a2bfcf53a3aebbd93f909 SHA512 cb73c47da11b5e6dff251ca5b2c06cc50625c0485e34ab7c7c55ff9992633dafeabd4dfbdb442057689d8ab072be4fdc3d13934add03ac24fe8fb18b116db402
 EBUILD tinyproxy-1.11.2.ebuild 1711 BLAKE2B aca8c04fd089c0e73fcb1a56ea9751a955cd307a9718064bc5f0ee5a0989a6be489a5da9b0630b43146c3f716b9f876d78da25c5b8a4ba06f4494249a670e1d9 SHA512 f15961883b29a3db9fdc1c3d56e198cac75be9f1cd4b8ac4c0bc0728672972d3a6b7a28327460c3a51c150087bb67a7a194e125d559760e101f01561e2d1d392
 MISC metadata.xml 718 BLAKE2B 3afc0958e86832552618442ab17be839a9cdab7a16b09c6c818c40aba1dfa7ac5d38030295b9377241a60c363263a7b1dd95b710fcf1ff4cb3bd8ed570779ff7 SHA512 dee3edacaa08d3d006e6b762a23859bb0d903a13fa386512f2117093c761073fdded8b04a172e41993525d1baefb3e46fe90f3cb950149c6a2409d84386950c1
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.11.2_use-runstatedir.patch b/net-proxy/tinyproxy/files/tinyproxy-1.11.2_use-runstatedir.patch
new file mode 100644
index 000000000000..4bc7d47a961b
--- /dev/null
+++ b/net-proxy/tinyproxy/files/tinyproxy-1.11.2_use-runstatedir.patch
@@ -0,0 +1,89 @@
+https://github.com/tinyproxy/tinyproxy/commit/942d0c6b03673ad816c42176422d7fe691143064
+From 942d0c6b03673ad816c42176422d7fe691143064 Mon Sep 17 00:00:00 2001
+From: Mohamed Akram <mohd.akram@outlook.com>
+Date: Sun, 2 Jun 2024 18:52:59 +0400
+Subject: [PATCH] Use appropriate installation path variables
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -173,6 +173,9 @@ fi
+ dnl
+ dnl Substitute the variables into the various Makefiles
+ dnl
++# runstatedir isn't available for Autoconf < 2.70
++AS_IF([test -z "${runstatedir}"], [runstatedir='${localstatedir}/run'])
++AC_SUBST([runstatedir])
+ AC_SUBST(CFLAGS)
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(CPPFLAGS)
+@@ -220,7 +223,6 @@ docs/Makefile
+ docs/man5/Makefile
+ docs/man5/tinyproxy.conf.txt
+ docs/man8/Makefile
+-docs/man8/tinyproxy.txt
+ m4macros/Makefile
+ tests/Makefile
+ tests/scripts/Makefile
+--- a/docs/man8/Makefile.am
++++ b/docs/man8/Makefile.am
+@@ -9,6 +9,17 @@ M_NAME=TINYPROXY
+ man_MANS = \
+ 	$(MAN8_FILES:.txt=.8)
+ 
++edit = sed \
++	-e 's|@localstatedir[@]|$(localstatedir)|g' \
++	-e 's|@runstatedir[@]|$(runstatedir)|g' \
++	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
++	-e 's|@TINYPROXY_STATHOST[@]|$(TINYPROXY_STATHOST)|g'
++
++tinyproxy.txt: $(top_srcdir)/docs/man8/tinyproxy.txt.in Makefile
++	@rm -f $@ $@.tmp
++	$(AM_V_GEN) $(edit) $(top_srcdir)/docs/man8/$@.in > $@.tmp
++	@mv $@.tmp $@
++
+ .txt.8:
+ if HAVE_POD2MAN
+ 	$(AM_V_GEN) $(POD2MAN) --center="Tinyproxy manual" \
+--- a/docs/man8/tinyproxy.txt.in
++++ b/docs/man8/tinyproxy.txt.in
+@@ -156,7 +156,11 @@ configuration variable `StatFile`.
+ 
+ =head1 FILES
+ 
+-`/etc/tinyproxy/tinyproxy.conf`, `/var/run/tinyproxy/tinyproxy.pid`, `/var/log/tinyproxy/tinyproxy.log`
++F<@sysconfdir@/tinyproxy/tinyproxy.conf>
++
++F<@runstatedir@/tinyproxy/tinyproxy.pid>
++
++F<@localstatedir@/log/tinyproxy/tinyproxy.log>
+ 
+ =head1 BUGS
+ 
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -12,6 +12,7 @@ edit = sed \
+ 	-e 's|@datarootdir[@]|$(datarootdir)|g' \
+ 	-e 's|@pkgsysconfdir[@]|$(pkgsysconfdir)|g' \
+ 	-e 's|@localstatedir[@]|$(localstatedir)|g' \
++	-e 's|@runstatedir[@]|$(runstatedir)|g' \
+ 	-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
+ 	-e 's|@prefix[@]|$(prefix)|g' \
+ 	-e 's|@TINYPROXY_STATHOST[@]|$(TINYPROXY_STATHOST)|g'
+--- a/etc/tinyproxy.conf.in
++++ b/etc/tinyproxy.conf.in
+@@ -124,7 +124,7 @@ LogLevel Info
+ # can be used for signalling purposes.
+ # If not specified, no pidfile will be written.
+ #
+-#PidFile "@localstatedir@/run/tinyproxy/tinyproxy.pid"
++#PidFile "@runstatedir@/tinyproxy/tinyproxy.pid"
+ 
+ #
+ # XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which
+@@ -320,6 +320,3 @@ ViaProxyName "tinyproxy"
+ # If not set then no rewriting occurs.
+ #
+ #ReverseBaseURL "http://localhost:8888/"
+-
+-
+-
diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.1_p20230201.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.2-r1.ebuild
index abdc192cc4c4..ce51d00216f5 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.11.1_p20230201.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.11.2-r1.ebuild
@@ -1,27 +1,22 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools systemd tmpfiles
 
-COMMIT=31339cb1615765f2fbb4ec7779400535bad6da46
-
 DESCRIPTION="A lightweight HTTP/SSL proxy"
 HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
-SRC_URI="https://github.com/tinyproxy/tinyproxy/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
+SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
 
-IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
-+upstream-proxy +xtinyproxy-header"
+IUSE="test debug +filter-proxy reverse-proxy transparent-proxy +upstream-proxy +xtinyproxy-header"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( xtinyproxy-header )"
 
-S="${WORKDIR}"/${PN}-${COMMIT}
-
 DEPEND="
 	acct-group/tinyproxy
 	acct-user/tinyproxy
@@ -29,11 +24,17 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/tinyproxy-1.11.2_use-runstatedir.patch"
+)
+
 src_prepare() {
 	default
 
+	# Enable and change PidFile location, OpenRC relies on it
 	sed -i \
 		-e "s|nobody|${PN}|g" \
+		-e "s|^#PidFile |PidFile |g" \
 		etc/${PN}.conf.in || die "sed failed"
 
 	sed -i -e "s# -Wp,-D_FORTIFY_SOURCE=2##" configure.ac || die "sed failed"
@@ -42,14 +43,18 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
+	local myeconfargs=(
 		$(use_enable debug) \
-		$(use_enable filter-proxy filter) \
-		$(use_enable reverse-proxy reverse) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable upstream-proxy upstream) \
-		$(use_enable xtinyproxy-header xtinyproxy) \
+		$(use_enable filter-proxy filter)
+		$(use_enable reverse-proxy reverse)
+		$(use_enable transparent-proxy transparent)
+		$(use_enable upstream-proxy upstream)
+		$(use_enable xtinyproxy-header xtinyproxy)
 		--localstatedir=/var
+		--runstatedir=/run
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
@@ -60,7 +65,7 @@ src_test() {
 src_install() {
 	default
 
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	dodoc AUTHORS README.md
 
 	diropts -m0775 -o ${PN} -g ${PN}
 	keepdir /var/log/${PN}