commit: 0b6c2ba9ac6cc5f94409151bbf8596038cd62fbb Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com> AuthorDate: Tue Nov 15 02:56:17 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 15 04:17:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6c2ba9
net-proxy/ziproxy: add 3.3.2 Fix clang build errors. Closes: https://bugs.gentoo.org/875773 Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> net-proxy/ziproxy/Manifest | 1 + .../ziproxy-3.3.2-Fix-clang-build-errors.patch | 42 ++++++++++++ net-proxy/ziproxy/ziproxy-3.3.2.ebuild | 79 ++++++++++++++++++++++ 3 files changed, 122 insertions(+) diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest index 22a46e033e15..3070be25f3a6 100644 --- a/net-proxy/ziproxy/Manifest +++ b/net-proxy/ziproxy/Manifest @@ -1 +1,2 @@ DIST ziproxy-3.3.1.tar.xz 205972 BLAKE2B 60dde7a7da61408023d85c92b04e22e876155e90ad5541653748d7e9059a47e698767420b3f3bc072d2b23aa99b0bf0f7335965fcd519b7f34eeddc0849fb000 SHA512 bff87a63320e721091ccdcdbe409f59db7f7f681ee8b7f093f18f3c0391579a25b9a8daf6ccfea4d94384142247ce36cfaec68d294b2a23caa56ede436da2d87 +DIST ziproxy-3.3.2.tar.xz 205992 BLAKE2B 0822c54fe1448588b14fbed58d8ffce27910db78959ec1f6344dd644dfaf222ef70d4389ec9f751457991e75bfdb59a8ee3964051beae279cba3486e1af7ccb2 SHA512 9e4cca86a29d970357c14369d4c8adc1902f334a60ce8d50872c36a65cf75f580eb92e185382f4a9bcfe31ddcc3ceee4f3a8cbeea395b6c09542bce0784b0b57 diff --git a/net-proxy/ziproxy/files/ziproxy-3.3.2-Fix-clang-build-errors.patch b/net-proxy/ziproxy/files/ziproxy-3.3.2-Fix-clang-build-errors.patch new file mode 100644 index 000000000000..cae83134d32e --- /dev/null +++ b/net-proxy/ziproxy/files/ziproxy-3.3.2-Fix-clang-build-errors.patch @@ -0,0 +1,42 @@ +From b997a5283812e67992aa7e1577c7482ce5b1ce24 Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen <[email protected]> +Date: Mon, 14 Nov 2022 19:36:05 -0600 +Subject: [PATCH] Fix clang build errors + +-Werror,-Wdeprecated-non-prototype +-Werror,-Wimplicit-function-declaration + +Signed-off-by: Oskari Pirhonen <[email protected]> +--- + src/image.c | 1 + + src/netd.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/image.c b/src/image.c +index e7a8d8c..821f892 100644 +--- a/src/image.c ++++ b/src/image.c +@@ -56,6 +56,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <assert.h> + + #include <gif_lib.h> +diff --git a/src/netd.c b/src/netd.c +index 937a52e..4d4a936 100644 +--- a/src/netd.c ++++ b/src/netd.c +@@ -84,7 +84,7 @@ + #include "txtfiletools.h" + #include "session.h" + +-int proxy_server (); ++int proxy_server(struct in_addr *addr_low, struct in_addr *addr_high); + int proxy_handlereq (SOCKET sock_client, const char *client_addr, struct sockaddr_in *socket_host); + void process_request (const char *client_addr, struct sockaddr_in *socket_host, SOCKET sock_child_out); + void daemon_sigcatch (int); +-- +2.37.4 + diff --git a/net-proxy/ziproxy/ziproxy-3.3.2.ebuild b/net-proxy/ziproxy/ziproxy-3.3.2.ebuild new file mode 100644 index 000000000000..9698cb2c7e85 --- /dev/null +++ b/net-proxy/ziproxy/ziproxy-3.3.2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A forwarding, non-caching, compressing web proxy server" +HOMEPAGE="http://ziproxy.sourceforge.net/"; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86" +IUSE="sasl xinetd" + +RDEPEND=" + acct-group/ziproxy + acct-user/ziproxy + media-libs/giflib:0= + media-libs/libpng:0= + virtual/jpeg:0 + sys-libs/zlib + sasl? ( dev-libs/cyrus-sasl ) + xinetd? ( virtual/inetd ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-Fix-clang-build-errors.patch +) + +src_prepare() { + default + + # fix sample config file + sed -i \ + -e "s:/var/ziproxy/:/var/lib/ziproxy/:g" \ + -e "s:%j-%Y.log:/var/log/ziproxy/%j-%Y.log:g" \ + etc/ziproxy/ziproxy.conf || die + + # fix sample xinetd config + sed -i \ + -e "s:/usr/bin/:/usr/sbin/:g" \ + -e "s:\(.*port.*\):\1\n\ttype\t\t\t= UNLISTED:g" \ + -e "s:root:ziproxy:g" \ + etc/xinetd.d/ziproxy || die +} + +src_configure() { + econf \ + --without-jasper \ + $(use_with sasl sasl2) \ + --with-cfgfile=/etc/ziproxy/ziproxy.conf +} + +src_install() { + default + + dodir /usr/sbin + mv -vf "${ED}"/usr/{,s}bin/ziproxy || die + + dobin src/tools/ziproxy_genhtml_stats.sh + + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + + insinto /etc + doins -r etc/ziproxy + + insinto /var/lib/ziproxy/error + doins var/ziproxy/error/*.html + + if use xinetd; then + insinto /etc/xinetd.d + doins etc/xinetd.d/ziproxy + fi + + diropts -m0750 -o ziproxy -g ziproxy + keepdir /var/log/ziproxy +}
