gentoo auto-resync : 15:10:2024 - 04:04:09

4 files changed, 180 insertions, 0 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index f3c9bbd9e7dc..b8823012531e 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest
index a0b8cf175aba..f6b2bf205ca7 100644
--- a/net-proxy/wwwoffle/Manifest
+++ b/net-proxy/wwwoffle/Manifest
@@ -1,7 +1,10 @@
 AUX wwwoffle-2.9i-define.patch 336 BLAKE2B df21ec944f31283f9af5b587afccab669fea91cfc3f602a430999917adfb69672c7ddcb6cc8b8d48dde84b1d8f946a381c7e73d93a259e3c54ebcb36fb5623d8 SHA512 cc59994bb94fd137214fbed66de76ae49e52b6798a603d4204c35007a38fdbe67e85d1c204f04eea2da2052027a821d0890aa33fd7ab02fed571f9f1f17990b9
+AUX wwwoffle-2.9j-lto.patch 2035 BLAKE2B c06a1d8733c21b9916baffe795b5f39b338d530e26c61fd2b8666e3577a37013c065d4941c045e93a4d95d9e649a272864fd3c83ca09308d689ff1353b66957e SHA512 76662c86f6a02d6e22050475e7a53dace5edb91250cb62779df9ae84b6a62ebe091ff35b2f846e87c1b139195f0fa370a7728eb4792ff007ee577b25b4827c96
 AUX wwwoffle-online.confd 305 BLAKE2B 42037033ca0b12993cc0c1c6e5d1d6f7665df07233e6e25e061a1d1cb69070f532d0c3a275374fb2d9db63f62a8e0c6076ae0989910139098c4a89f89f6b00de SHA512 d8d72bb77d88aac80b18f3571ae45177c936ccef7596bede87fede91f0cef1426aaf81bc4cfed74f35ac434243e3f4e87c54e48fa2ccdfc952e431b834c50124
 AUX wwwoffle-online.initd 576 BLAKE2B e929f32ba1fef07faf66b505e59e75243eafd35f1bc0c35d0996479e3f905c00f4a11ab41dc951cfc750a7587d43844222ae4a14454a8236affe3bec62ec1087 SHA512 bd5950969e19e8b99b798939e00c00d0325369502a5552507066900ab02b67e06ee8ae25f450fc7df48ce9dd19e4fc6aae969f9fd3e055564fea000a34904af8
 AUX wwwoffle.initd 426 BLAKE2B e92e7ad6fae5e25e1862664e0411a697be5d4440e3b6450adaab5b9118f30a57be31ad7e33775ce96d7ace85bc9167beca2e3f27393de5b99a29b03f5653f9f9 SHA512 3fc856cdb481a21a39c9874c2170148750968a776d54b43e7f0add51c2f3d4274d8050e04001241401878fa45369063b2e0736b8d84aa6d9f1c939a7b59589df
 DIST wwwoffle-2.9i.tgz 1113771 BLAKE2B 5acf6e14f362fe87d8f91599aaf113ce8ea5a178ed08eb21d4371d0edfc77a5c0a38e8e0053b51cf6426b0b701ba4fbbddfc84240161877a892aa2da303a5ecf SHA512 c9e9d67df9a0e40b584916857221a9a728f36a677cba28527f8c2febea1a23379d3b112d96723bf01ec1718a0897d8980715864ac7ef898b2585dd3f01d9a456
+DIST wwwoffle-2.9j.tgz 1110599 BLAKE2B cc12a1043c2047f8150883871e112007f9cd028ae961e3495332c4afc06342f0b85c44d0c08ce204907c7abbdb3660afe15d0d146dde39fc914942f9ec492a9d SHA512 03f3177fac563ecab33288d1c193d3e193ff1c07413151fc5db1b85e0111b10815d572bcc59d188145b2851e57be0327f7c9e7538361a36e1a9457aa0d028818
 EBUILD wwwoffle-2.9i-r2.ebuild 3314 BLAKE2B ce3cfe236260f3a7a0cf1d07f3c5d50948bdc51709c0b3a5159e877386d08478317fc11322673eaecaa65b567bc9164a9a6cf28c5fcdda5fed64fae531111beb SHA512 0d0dd9d53da04e5cf474c777ffbc1e8293114550aa69baeca33d31ffb5d6a9076771d354d480ba3ef078d0ec9bf5ae4993d68a0b2274837df2c1c9416c1c7d1a
+EBUILD wwwoffle-2.9j.ebuild 3452 BLAKE2B f41f087c5a202685c489187997e0f6d0791bd186c55b3975f05791680e8be96d3eb1b749ff9826cafbb8f15dcde2f29c4b1de5a555b7048f88e3c11e9012fc94 SHA512 a6ca8a93b09fbbf474af430b1bb0167105ede55641fc46b7facc4eb88fa91cc7c2f329a79a430426650a3cc497068cabe90d3dfa3cc919795394dcac64845c3f
 MISC metadata.xml 412 BLAKE2B d2fe946dff0566ff73b532b1148f7648366e8868fe5a22110acd19c8406654b4091e7824fbc80378252c3892e75219f6d1982ad921790eee8a86c561e110d941 SHA512 378be8267abb9de2d726f0f56c9d1b0d9a3a1ea8c3bd04dfc913e88a35ba4f239998a395ff4b9ec3366d8efd14f41fbbf667025a8b8c92b6c935207104acad32
diff --git a/net-proxy/wwwoffle/files/wwwoffle-2.9j-lto.patch b/net-proxy/wwwoffle/files/wwwoffle-2.9j-lto.patch
new file mode 100644
index 000000000000..7dde7797ce0e
--- /dev/null
+++ b/net-proxy/wwwoffle/files/wwwoffle-2.9j-lto.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/940608
+
+Sent via email to upstream by sam on 2024-10-15.
+--- a/src/testprogs/test-gif.c
++++ b/src/testprogs/test-gif.c
+@@ -19,8 +19,8 @@
+ #include "errors.h"
+ 
+ 
+-ssize_t wwwoffles_read_data(char *data,int len);
+-ssize_t wwwoffles_write_data(char *data,int len);
++ssize_t wwwoffles_read_data(char *data,size_t len);
++ssize_t wwwoffles_write_data(char *data,size_t len);
+ 
+ int main(int argc,char **argv)
+ {
+@@ -55,7 +55,7 @@ int main(int argc,char **argv)
+   This function is used as a callback from gifmodify.c and htmlmodify.l
+   ++++++++++++++++++++++++++++++++++++++*/
+ 
+-ssize_t wwwoffles_read_data(char *data,int len)
++ssize_t wwwoffles_read_data(char *data,size_t len)
+ {
+  int n=read_data(0,data,len);
+ 
+@@ -75,7 +75,7 @@ ssize_t wwwoffles_read_data(char *data,int len)
+   This function is used as a callback from gifmodify.c and htmlmodify.l
+   ++++++++++++++++++++++++++++++++++++++*/
+ 
+-ssize_t wwwoffles_write_data(char *data,int len)
++ssize_t wwwoffles_write_data(char *data,size_t len)
+ {
+  write_data(1,data,len);
+ 
+--- a/src/testprogs/test-modify.c
++++ b/src/testprogs/test-modify.c
+@@ -21,8 +21,8 @@
+ #include "errors.h"
+ 
+ 
+-ssize_t wwwoffles_read_data(char *data,int len);
+-ssize_t wwwoffles_write_data(char *data,int len);
++ssize_t wwwoffles_read_data(char *data,size_t len);
++ssize_t wwwoffles_write_data(char *data,size_t len);
+ 
+ int main(int argc,char **argv)
+ {
+@@ -72,7 +72,7 @@ int main(int argc,char **argv)
+   This function is used as a callback from gifmodify.c and htmlmodify.l
+   ++++++++++++++++++++++++++++++++++++++*/
+ 
+-ssize_t wwwoffles_read_data(char *data,int len)
++ssize_t wwwoffles_read_data(char *data,size_t len)
+ {
+  int n=read_data(0,data,len);
+ 
+@@ -92,7 +92,7 @@ ssize_t wwwoffles_read_data(char *data,int len)
+   This function is used as a callback from gifmodify.c and htmlmodify.l
+   ++++++++++++++++++++++++++++++++++++++*/
+ 
+-ssize_t wwwoffles_write_data(char *data,int len)
++ssize_t wwwoffles_write_data(char *data,size_t len)
+ {
+  write_data(1,data,len);
+ 
diff --git a/net-proxy/wwwoffle/wwwoffle-2.9j.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9j.ebuild
new file mode 100644
index 000000000000..df9f7824e828
--- /dev/null
+++ b/net-proxy/wwwoffle/wwwoffle-2.9j.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Web caching proxy suitable for non-permanent Internet connections"
+HOMEPAGE="https://www.gedanken.org.uk/software/wwwoffle/"
+SRC_URI="https://www.gedanken.org.uk/software/${PN}/download/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gnutls ipv6 zlib"
+
+RDEPEND="
+	acct-group/wwwoffle
+	acct-user/wwwoffle
+	gnutls? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/lex
+	dev-lang/perl
+"
+# Unsure whether to depend on >=www-misc/htdig-3.1.6-r4 or not
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9j-lto.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' -i cache/Makefile.in || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-ipv6
+		$(use_with gnutls)
+		$(use_with zlib)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/spool/wwwoffle/search/hyperestraier/db
+
+	# documentation fix
+	# del empty doc dirs
+	rmdir "${ED}/usr/doc/${PN}"/{it,nl,ru} || die
+	dodir /usr/share/doc
+	mv "${ED}/usr/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
+	rmdir "${ED}/usr/doc" || die
+
+	# install the wwwoffled init script
+	newinitd "${FILESDIR}/${PN}.initd" wwwoffled
+	newinitd "${FILESDIR}/${PN}-online.initd" wwwoffled-online
+	newconfd "${FILESDIR}/${PN}-online.confd" wwwoffled-online
+
+	keepdir /var/spool/wwwoffle/{http,outgoing,monitor,lasttime,lastout,local}
+	for number in 1 2 3 4 5 6 7 8 9; do
+		keepdir "/var/spool/wwwoffle/prevtime${number}" "/var/spool/wwwoffle/prevout${number}"
+	done
+
+	# empty dirs are removed during update
+	keepdir /var/spool/wwwoffle/search/{mnogosearch/db,htdig/tmp,htdig/db-lasttime,htdig/db,namazu/db}
+
+	touch "${ED}/var/spool/wwwoffle/search/htdig/wwwoffle-htdig.log"
+	touch "${ED}/var/spool/wwwoffle/search/mnogosearch/wwwoffle-mnogosearch.log"
+	touch "${ED}/var/spool/wwwoffle/search/namazu/wwwoffle-namazu.log"
+
+	# TODO htdig indexing as part of initscripts
+
+	# robots.txt modification - /var/spool/wwwoffle/html/en
+	# - remove Disallow: /index
+	sed -e "s|Disallow:.*/index|#Disallow: /index|" -i "${ED}/var/spool/wwwoffle/html/en/robots.txt" || die
+}
+
+pkg_preinst() {
+	# Changing the user:group to wwwoffle:woffle
+	fowners -R wwwoffle:wwwoffle /var/spool/wwwoffle /etc/wwwoffle
+	sed \
+		-e 's/^[# \t]\(run-[gu]id[ \t]*=[ \t]*\)[a-zA-Z0-9]*[ \t]*$/ \1wwwoffle/g' \
+		-i "${ED}/etc/wwwoffle/wwwoffle.conf" || die
+
+}
+
+pkg_postinst() {
+	# fix permissions for those upgrading
+	local number
+	for number in 1 2 3 4 5 6 7 8 9;
+	do
+		[[ ! -d "${EROOT}/var/spool/wwwoffle/prevtime${number}" ]] && \
+			keepdir "${EROOT}/var/spool/wwwoffle/prevtime${number}"
+		[[ ! -d "${EROOT}/var/spool/wwwoffle/prevout${number}" ]] && \
+			keepdir "${EROOT}/var/spool/wwwoffle/prevout${number}"
+	done
+
+	[[ -f "${T}/stopped" ]] && ewarn "wwwoffled was stopped. /etc/init.d/wwwoffled start to restart AFTER etc-update"
+
+	einfo "wwwoffled should run as an ordinary user now. The run-uid and run-gid should be set"
+	einfo "to \"wwwoffle\" in your /etc/wwwoffle/wwwoffle.conf. Please uncomment this if it hasn't been already"
+
+	einfo "This is for your own security. Otherwise wwwoffle is run as root which is relay bad if"
+	einfo "there is an exploit in this program that allows remote/local users to execute arbitary"
+	einfo "commands as the root user."
+}