commit: de0eaf6ab52209f7c53845b38ee269a25c457ea7 Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com> AuthorDate: Tue Nov 15 02:59:45 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 15 04:17:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0eaf6a
net-proxy/ziproxy: drop 3.3.1-r2 Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/28271 Signed-off-by: Sam James <sam <AT> gentoo.org> net-proxy/ziproxy/Manifest | 1 - .../ziproxy/files/ziproxy-3.3.1-fno-common.patch | 19 ----- .../ziproxy/files/ziproxy-3.3.1-giflib5.patch | 46 ------------- net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild | 80 ---------------------- 4 files changed, 146 deletions(-) diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest index 3070be25f3a6..4d6c43380ed1 100644 --- a/net-proxy/ziproxy/Manifest +++ b/net-proxy/ziproxy/Manifest @@ -1,2 +1 @@ -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.1-fno-common.patch b/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch deleted file mode 100644 index 5b6735c5d885..000000000000 --- a/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/tosmarking.c 2020-05-21 14:56:31.095000000 +0900 -+++ b/src/tosmarking.c 2020-05-21 14:58:11.720000000 +0900 -@@ -36,11 +36,11 @@ - /* private, local. those are not the same as the vars with the same name */ - int tosmarking_enabled; - SOCKET sock_child_out; --int TOSFlagsDefault; --int TOSFlagsDiff; --const t_ut_urltable *tos_markasdiff_url; --const t_ct_cttable *tos_maskasdiff_ct; --ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT; -+extern int TOSFlagsDefault; -+extern int TOSFlagsDiff; -+extern const t_ut_urltable *tos_markasdiff_url; -+extern const t_ct_cttable *tos_maskasdiff_ct; -+extern ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT; - - int current_tos; - ZP_DATASIZE_TYPE tos_bytecount; /* counter used by TOSMarkAsDiffSizeBT */ diff --git a/net-proxy/ziproxy/files/ziproxy-3.3.1-giflib5.patch b/net-proxy/ziproxy/files/ziproxy-3.3.1-giflib5.patch deleted file mode 100644 index e8404ecc47b4..000000000000 --- a/net-proxy/ziproxy/files/ziproxy-3.3.1-giflib5.patch +++ /dev/null @@ -1,46 +0,0 @@ -Description: Build using giflib5 -Forwarded: yes -Author: Marcos Talau <ta...@users.sourceforge.net> -Author: Matthias Klose <d...@debian.org> -Last-Update: 2015-11-04 - -Index: ziproxy-3.3.1/src/image.c -=================================================================== ---- ziproxy-3.3.1.orig/src/image.c -+++ ziproxy-3.3.1/src/image.c -@@ -905,7 +905,11 @@ int gif2bitmap(char *inbuf, int insize, - desc.size=insize; - desc.x.pos=0; - -+#if GIFLIB_MAJOR >= 5 -+ if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input, NULL)) == NULL) -+#else - if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input)) == NULL) -+#endif - return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more possible reasons - - bmp = new_raw_bitmap(); -@@ -1083,7 +1087,11 @@ int gif2bitmap(char *inbuf, int insize, - } - bmp->pal_bpp = bmp->bpp; - -+#if GIFLIB_MAJOR >= 5 -+ DGifCloseFile(GifFile, NULL); -+#else - DGifCloseFile(GifFile); -+#endif - return IMG_RET_OK; - } - -@@ -1738,7 +1746,11 @@ static int bitmap2jp2 (raw_bitmap *bmp, - cmptparm->width = cwidth [cmptno]; - cmptparm->height = cheight [cmptno]; - cmptparm->prec = cbitlen [cmptno]; -+#if GIFLIB_MAJOR >= 5 -+ cmptparm->sgnd = 0; // we only generate unsigned components -+#else - cmptparm->sgnd = false; // we only generate unsigned components -+#endif - - cshiftR [cmptno] = 8 - cbitlen [cmptno]; // calculate the resampling shift for this component - } diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild deleted file mode 100644 index be702259c92e..000000000000 --- a/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# 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}-giflib5.patch - "${FILESDIR}"/${P}-fno-common.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 -}
