From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- net-proxy/ziproxy/Manifest | 3 +- .../ziproxy/files/ziproxy-3.3.1-fno-common.patch | 19 +++++ net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild | 81 ---------------------- net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild | 80 +++++++++++++++++++++ 4 files changed, 101 insertions(+), 82 deletions(-) create mode 100644 net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch delete mode 100644 net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild create mode 100644 net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild (limited to 'net-proxy/ziproxy') diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest index 5d50b9b51b26..3cef5b7d318d 100644 --- a/net-proxy/ziproxy/Manifest +++ b/net-proxy/ziproxy/Manifest @@ -1,6 +1,7 @@ +AUX ziproxy-3.3.1-fno-common.patch 734 BLAKE2B d8561e70258b1830273d8da685acf543d843ae362fde7463bb1eacfcb997be7b3332b21470583453a8e627b411b83572ea67b1ad496b0c541fcdea4db3381841 SHA512 fdc00b0e14a3eea309943dcc8adaa6281c581b65956e41cb70a913ae82d58a5a42502986894ae8c8e1e9f791a82985dcf879cf63dbca67f6c642559d60755f1a AUX ziproxy-3.3.1-giflib5.patch 1399 BLAKE2B d8f60518ae1b1fe777597d5dcc56816aee1ea3a05010a3fe39bc432834aa66f6d4b439536567a2840f05ee8cddfdecb9c3da2e9299fad4aea9163ce984c4cc4d SHA512 d8ab2e6d89fdfb7fa7e86905e9525cff6704a57ef4c25a83eb64fde39769c0196472645eaccdaa7363338cecd18855151ff82995887391e6d428227d0a516a6e AUX ziproxy.confd 650 BLAKE2B 1c9dacf16234404fc702643ffd9fc2c72d7c7eb3e1d17af68a7c784a650bc7e95688167b86fc57e0b25b09c984569de52b3ef214be34b416642f9f1be4b02e0b SHA512 77d730705c652c59acbd20c10d06801427cc3736ef3f9e06771fcadb0470599b3f6b84bd6e4d35c10e90927077e35e0547051b638a4bbafe4a596c38aa1af0eb AUX ziproxy.initd-r1 558 BLAKE2B 3a6ccb81024c594babb288375d7b1c47208214700d9a362bc2eae1064f3ff026559f52dcccb3774924faa36a1f66d177347615ea6eab873ddccdac6ecd65a5c6 SHA512 81fd2c24876e6cc2be6c1b77e9c3ff916a7a8b541655aeb0dab3122c7b40a5f23ddc7db3d3867441c3f61509e0c75e321681e7fcd4e6b268f45faab55460542f DIST ziproxy-3.3.1.tar.xz 205972 BLAKE2B 60dde7a7da61408023d85c92b04e22e876155e90ad5541653748d7e9059a47e698767420b3f3bc072d2b23aa99b0bf0f7335965fcd519b7f34eeddc0849fb000 SHA512 bff87a63320e721091ccdcdbe409f59db7f7f681ee8b7f093f18f3c0391579a25b9a8daf6ccfea4d94384142247ce36cfaec68d294b2a23caa56ede436da2d87 -EBUILD ziproxy-3.3.1-r1.ebuild 1612 BLAKE2B 109f51906fc16c5d4f87ad609feb27da35f7e162fc47ca4ab8e1717064d5b74fef161668ad2650be4f8a522eb468b25800e564f51e31eb850a6444076b6c5d7b SHA512 f6f2b8bdda748afefbc65ddb426e478aef2936b4244a9c77ce0a3d9bf1e4bf05bb88244b9159059fa77ef1e80e2ea6095f7866b558d9578eda2cc26f7e5de256 +EBUILD ziproxy-3.3.1-r2.ebuild 1607 BLAKE2B d7c800604f2d4092bd2717557dc1a0b24e75642e244da469e048e1931ac2f681191c0ad8a2e0fb76fd9d0cfb183fa782e075bfebc6854701c401262c67729a48 SHA512 95ce2d1f064cc491ac40410e2c074577767033d066ac8a1f49bac0aea022b348ab8b4550627ebd4e1c09aa3d9ef83540c08c9855be469d4a9a765552e456df21 MISC metadata.xml 516 BLAKE2B a85e057b74ce76cadded707fbd9bbb810f5f3fe4ac5b30ccda9b02fc22efedcffe3c2eb398f36a986d067771290de88fb5aa0f42cdc9846fc869d9de3a105d41 SHA512 477983c8d8f5e65f6bb6f8462711e6920da429c4c17dbcabfe5743da8cd693d016df2743bc4cedf042ccbe2d2f406486173ce7e118a117634eb3c2fee7cf4e6f 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 new file mode 100644 index 000000000000..5b6735c5d885 --- /dev/null +++ b/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch @@ -0,0 +1,19 @@ +--- 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/ziproxy-3.3.1-r1.ebuild b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild deleted file mode 100644 index b5d92bd3fadc..000000000000 --- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit user - -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 ~sparc ~x86" -IUSE="sasl xinetd" - -RDEPEND=" - 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 ) - -pkg_setup() { - enewgroup ziproxy - enewuser ziproxy -1 -1 -1 ziproxy -} - -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 "${D}"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 -} diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild new file mode 100644 index 000000000000..ee73d8bdc662 --- /dev/null +++ b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2020 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 ~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 +} -- cgit v1.2.3