[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/
commit: d5e3125224022b28f05c9ef5a28131f29b7bfb64
Author: Eli Schwartz gmail com>
AuthorDate: Tue Mar 12 01:57:09 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 12 02:24:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5e31252
net-proxy/ziproxy: mark as LTO-unsafe
Closes: https://bugs.gentoo.org/861863
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
net-proxy/ziproxy/ziproxy-3.3.2.ebuild | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/net-proxy/ziproxy/ziproxy-3.3.2.ebuild
b/net-proxy/ziproxy/ziproxy-3.3.2.ebuild
index 18927d63ac6f..150e819fed4e 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.2.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+inherit flag-o-matic
+
DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
HOMEPAGE="http://ziproxy.sourceforge.net/";
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
@@ -46,6 +48,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/861863
+ # Upstream is sourceforge and has been dead for 3 years. No upstream
bug reported.
+ filter-lto
+
econf \
--without-jasper \
$(use_with sasl sasl2) \
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/files/, net-proxy/ziproxy/
commit: 0b6c2ba9ac6cc5f94409151bbf8596038cd62fbb
Author: Oskari Pirhonen gmail com>
AuthorDate: Tue Nov 15 02:56:17 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Nov 15 04:17:36 2022 +
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 gmail.com>
Signed-off-by: Sam James 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 ..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
+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
+---
+ 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
+ #include
++#include
+ #include
+
+ #include
+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 ..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; th
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/
commit: 6d397db88096d43beb673b47113f6886736d05ae Author: Sam James gentoo org> AuthorDate: Tue Nov 15 04:17:32 2022 + Commit: Sam James gentoo org> CommitDate: Tue Nov 15 04:17:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d397db8 net-proxy/ziproxy: use libjpeg-turbo Signed-off-by: Sam James gentoo.org> net-proxy/ziproxy/ziproxy-3.3.2.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net-proxy/ziproxy/ziproxy-3.3.2.ebuild b/net-proxy/ziproxy/ziproxy-3.3.2.ebuild index 9698cb2c7e85..18927d63ac6f 100644 --- a/net-proxy/ziproxy/ziproxy-3.3.2.ebuild +++ b/net-proxy/ziproxy/ziproxy-3.3.2.ebuild @@ -15,9 +15,9 @@ IUSE="sasl xinetd" RDEPEND=" acct-group/ziproxy acct-user/ziproxy - media-libs/giflib:0= - media-libs/libpng:0= - virtual/jpeg:0 + media-libs/giflib:= + media-libs/libpng:= + media-libs/libjpeg-turbo:= sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd )
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/files/, net-proxy/ziproxy/
commit: de0eaf6ab52209f7c53845b38ee269a25c457ea7
Author: Oskari Pirhonen gmail com>
AuthorDate: Tue Nov 15 02:59:45 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Nov 15 04:17:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0eaf6a
net-proxy/ziproxy: drop 3.3.1-r2
Signed-off-by: Oskari Pirhonen gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28271
Signed-off-by: Sam James 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..
--- 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.09500 +0900
-+++ b/src/tosmarking.c 2020-05-21 14:58:11.72000 +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..
--- 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
-Author: Matthias Klose
-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..
--- 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 ~ris
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/
commit: 1c5718aaefb8c7c08b76c67a648a640ed1561cbd
Author: Chris Su lesscrowds org>
AuthorDate: Wed Nov 2 02:11:17 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Wed Nov 2 05:10:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c5718aa
net-proxy/ziproxy: Keyword 3.3.1-r2 riscv, #879089
Signed-off-by: Chris Su lesscrowds.org>
Closes: https://github.com/gentoo/gentoo/pull/28091
Signed-off-by: Jakov Smolić gentoo.org>
net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
index ee73d8bdc662..be702259c92e 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
IUSE="sasl xinetd"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/files/, net-proxy/ziproxy/
commit: 2b8e5c1029efa149b3b9b6ee4796a04931f3ab27
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:09:06 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:09:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8e5c10
net-proxy/ziproxy: port to EAPI 7 and GLEP 81
Closes: https://bugs.gentoo.org/707626
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
.../ziproxy/files/ziproxy-3.3.1-fno-common.patch | 19 +++
...iproxy-3.3.1-r1.ebuild => ziproxy-3.3.1-r2.ebuild} | 19 +--
2 files changed, 28 insertions(+), 10 deletions(-)
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 000..5b6735c5d88
--- /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.09500 +0900
b/src/tosmarking.c 2020-05-21 14:58:11.72000 +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-r2.ebuild
similarity index 86%
rename from net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
rename to net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
index b5d92bd3fad..ee73d8bdc66 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit user
+EAPI=7
DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
HOMEPAGE="http://ziproxy.sourceforge.net/";
@@ -14,6 +13,8 @@ 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
@@ -23,12 +24,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-giflib5.patch )
-
-pkg_setup() {
- enewgroup ziproxy
- enewuser ziproxy -1 -1 -1 ziproxy
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-giflib5.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
src_prepare() {
default
@@ -58,7 +57,7 @@ src_install() {
default
dodir /usr/sbin
- mv -vf "${D}"usr/{,s}bin/ziproxy || die
+ mv -vf "${ED}"/usr/{,s}bin/ziproxy || die
dobin src/tools/ziproxy_genhtml_stats.sh
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/
commit: 6dc653bf34360fd13e378bb6e0f87d15294cc6c5
Author: David Seifert gentoo org>
AuthorDate: Wed Aug 28 08:19:23 2019 +
Commit: David Seifert gentoo org>
CommitDate: Wed Aug 28 08:19:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc653bf
net-proxy/ziproxy: [QA] Remove media-libs/jasper dep
Bug: https://bugs.gentoo.org/689784
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: David Seifert gentoo.org>
net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
index 7ac3b1b6f33..b5d92bd3fad 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,14 +11,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="jpeg2k sasl xinetd"
+IUSE="sasl xinetd"
RDEPEND="
media-libs/giflib:0=
media-libs/libpng:0=
virtual/jpeg:0
sys-libs/zlib
- jpeg2k? ( media-libs/jasper:= )
sasl? ( dev-libs/cyrus-sasl )
xinetd? ( virtual/inetd )
"
@@ -50,7 +49,7 @@ src_prepare() {
src_configure() {
econf \
- $(use_with jpeg2k jasper) \
+ --without-jasper \
$(use_with sasl sasl2) \
--with-cfgfile=/etc/ziproxy/ziproxy.conf
}
@@ -66,8 +65,6 @@ src_install() {
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
- use jpeg2k && dodoc JPEG2000.txt
-
insinto /etc
doins -r etc/ziproxy
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/files/
commit: f76ffe3acf97d2efe5f6c70a74092c0d24b51803 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Tue Jan 17 17:53:40 2017 + Commit: David Seifert gentoo org> CommitDate: Wed Jan 18 09:19:27 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f76ffe3a net-proxy/ziproxy: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/3516 net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch | 20 1 file changed, 20 deletions(-) diff --git a/net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch b/net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch deleted file mode 100644 index 148a513.. --- a/net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch +++ /dev/null @@ -1,20 +0,0 @@ src/image.c -+++ src/image.c -@@ -17,6 +17,8 @@ - #include - #include - -+#include -+ - #include - - #include -@@ -515,7 +517,7 @@ - bmp = new_raw_bitmap(); - *out = bmp; - -- png_set_read_fn (png_ptr, (voidp) &desc, mem_to_png); -+ png_set_read_fn (png_ptr, (png_voidp) &desc, mem_to_png); - - png_read_info (png_ptr,info_ptr); - png_get_IHDR (png_ptr, info_ptr, &width_png_uint_32, &height_png_uint_32,
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/
commit: a09ecdd62a38621662314b5ef106d0fb29d07618 Author: David Seifert gentoo org> AuthorDate: Sat Nov 12 23:15:40 2016 + Commit: David Seifert gentoo org> CommitDate: Sat Nov 12 23:36:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09ecdd6 net-proxy/ziproxy: Add subslot operator on media-libs/jasper Package-Manager: portage-2.3.2 net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild index e194bcb..978af33 100644 --- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild +++ b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild @@ -19,7 +19,7 @@ RDEPEND=" media-libs/libpng:0= virtual/jpeg:0 sys-libs/zlib - jpeg2k? ( media-libs/jasper ) + jpeg2k? ( media-libs/jasper:= ) sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd ) "
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/files/, net-proxy/ziproxy/
commit: 89e22bc0633c5e0370df9e6d6223209abfa0f726
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Oct 16 08:27:50 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Oct 16 08:49:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e22bc0
net-proxy/ziproxy: Support giflib-5 (#571898 by Oleg and Toralf Förster)
Package-Manager: portage-2.3.1
.../ziproxy/files/ziproxy-3.3.1-giflib5.patch | 46 ++
net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild | 11 +++---
2 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/net-proxy/ziproxy/files/ziproxy-3.3.1-giflib5.patch
b/net-proxy/ziproxy/files/ziproxy-3.3.1-giflib5.patch
new file mode 100644
index ..e8404ec
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-3.3.1-giflib5.patch
@@ -0,0 +1,46 @@
+Description: Build using giflib5
+Forwarded: yes
+Author: Marcos Talau
+Author: Matthias Klose
+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-r1.ebuild
b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
index 6ebbbf4..9228a26 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="jpeg2k sasl xinetd"
RDEPEND="
- media-libs/giflib
+ media-libs/giflib:0=
media-libs/libpng:0=
virtual/jpeg
sys-libs/zlib
@@ -23,9 +23,9 @@ RDEPEND="
sasl? ( dev-libs/cyrus-sasl )
xinetd? ( virtual/inetd )
"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-giflib5.patch )
pkg_setup() {
enewgroup ziproxy
@@ -57,7 +57,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install
+ default
dodir /usr/sbin
mv -vf "${D}"usr/{,s}bin/ziproxy || die
@@ -67,7 +67,6 @@ src_install() {
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
- dodoc ChangeLog CREDITS README README.tools
use jpeg2k && dodoc JPEG2000.txt
insinto /etc
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/
commit: 5db04639aa0f14f3834e2086ca94b8b0de9a266f Author: Pacho Ramos gentoo org> AuthorDate: Sun Oct 16 08:28:28 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Oct 16 08:49:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5db04639 net-proxy/ziproxy: Pin slot for jpeg Package-Manager: portage-2.3.1 net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild index 9228a26..e194bcb 100644 --- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild +++ b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild @@ -17,7 +17,7 @@ IUSE="jpeg2k sasl xinetd" RDEPEND=" media-libs/giflib:0= media-libs/libpng:0= - virtual/jpeg + virtual/jpeg:0 sys-libs/zlib jpeg2k? ( media-libs/jasper ) sasl? ( dev-libs/cyrus-sasl )
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/files/, net-proxy/ziproxy/
commit: 20317feb5adc8f6710bbf3798c35874e2b6cacad
Author: Austin English gentoo org>
AuthorDate: Tue May 3 19:14:58 2016 +
Commit: Austin English gentoo org>
CommitDate: Tue May 3 19:17:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20317feb
net-proxy/ziproxy: use #!/sbin/openrc-run instead of #!/sbin/runscript
Gentoo-Bug: https://bugs.gentoo.org/573846
Package-Manager: portage-2.2.26
net-proxy/ziproxy/files/ziproxy.initd | 26 --
net-proxy/ziproxy/files/ziproxy.initd-r1 | 4 +-
net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild | 86 +++
3 files changed, 88 insertions(+), 28 deletions(-)
diff --git a/net-proxy/ziproxy/files/ziproxy.initd
b/net-proxy/ziproxy/files/ziproxy.initd
deleted file mode 100644
index 6b0cb89..000
--- a/net-proxy/ziproxy/files/ziproxy.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need net
-}
-
-start() {
- local OPT="-d"
- ebegin "Starting ${SVCNAME}"
-
- [ -n "${CONFIG}" ] && OPT="${OPT} -c ${CONFIG}"
- [ -n "${ONLYFROM}" ] && OPT="${OPT} -f ${ONLYFROM}"
-
- start-stop-daemon --start --pidfile /var/run/${SVCNAME}.pid \
- --chuid ziproxy:ziproxy --exec /usr/sbin/ziproxy -- ${OPT} >
/var/run/${SVCNAME}.pid
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
- eend $?
-}
diff --git a/net-proxy/ziproxy/files/ziproxy.initd-r1
b/net-proxy/ziproxy/files/ziproxy.initd-r1
index dae9551..f552307 100644
--- a/net-proxy/ziproxy/files/ziproxy.initd-r1
+++ b/net-proxy/ziproxy/files/ziproxy.initd-r1
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
new file mode 100644
index 000..6ebbbf4
--- /dev/null
+++ b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="jpeg2k sasl xinetd"
+
+RDEPEND="
+ media-libs/giflib
+ media-libs/libpng:0=
+ virtual/jpeg
+ sys-libs/zlib
+ jpeg2k? ( media-libs/jasper )
+ sasl? ( dev-libs/cyrus-sasl )
+ xinetd? ( virtual/inetd )
+"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+"
+
+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 \
+ $(use_with jpeg2k jasper) \
+ $(use_with sasl sasl2) \
+ --with-cfgfile=/etc/ziproxy/ziproxy.conf
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ 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}
+
+ dodoc ChangeLog CREDITS README README.tools
+ use jpeg2k && dodoc JPEG2000.txt
+
+ 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
+}
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/
commit: 37ff52d54efbf93e0bd792b8d7541c24bc810b61
Author: Austin English gentoo org>
AuthorDate: Tue May 3 19:15:19 2016 +
Commit: Austin English gentoo org>
CommitDate: Tue May 3 19:17:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ff52d5
net-proxy/ziproxy: remove old version
Package-Manager: portage-2.2.26
net-proxy/ziproxy/ziproxy-3.3.1.ebuild | 84 --
1 file changed, 84 deletions(-)
diff --git a/net-proxy/ziproxy/ziproxy-3.3.1.ebuild
b/net-proxy/ziproxy/ziproxy-3.3.1.ebuild
deleted file mode 100644
index 56c5c78..000
--- a/net-proxy/ziproxy/ziproxy-3.3.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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="jpeg2k sasl xinetd"
-
-RDEPEND="
- media-libs/giflib
- media-libs/libpng:0=
- virtual/jpeg
- sys-libs/zlib
- jpeg2k? ( media-libs/jasper )
- sasl? ( dev-libs/cyrus-sasl )
- xinetd? ( virtual/inetd )
-"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
-"
-
-pkg_setup() {
- enewgroup ziproxy
- enewuser ziproxy -1 -1 -1 ziproxy
-}
-
-src_prepare() {
- # 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 \
- $(use_with jpeg2k jasper) \
- $(use_with sasl sasl2) \
- --with-cfgfile=/etc/ziproxy/ziproxy.conf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- 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}
-
- dodoc ChangeLog CREDITS README README.tools
- use jpeg2k && dodoc JPEG2000.txt
-
- 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
-}
