| 1 |
commit: 2b8e5c1029efa149b3b9b6ee4796a04931f3ab27 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Sat Nov 28 23:09:06 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 28 23:09:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8e5c10 |
| 7 |
|
| 8 |
net-proxy/ziproxy: port to EAPI 7 and GLEP 81 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/707626 |
| 11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
| 12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 14 |
|
| 15 |
.../ziproxy/files/ziproxy-3.3.1-fno-common.patch | 19 +++++++++++++++++++ |
| 16 |
...iproxy-3.3.1-r1.ebuild => ziproxy-3.3.1-r2.ebuild} | 19 +++++++++---------- |
| 17 |
2 files changed, 28 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..5b6735c5d88 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch |
| 24 |
@@ -0,0 +1,19 @@ |
| 25 |
+--- a/src/tosmarking.c 2020-05-21 14:56:31.095000000 +0900 |
| 26 |
++++ b/src/tosmarking.c 2020-05-21 14:58:11.720000000 +0900 |
| 27 |
+@@ -36,11 +36,11 @@ |
| 28 |
+ /* private, local. those are not the same as the vars with the same name */ |
| 29 |
+ int tosmarking_enabled; |
| 30 |
+ SOCKET sock_child_out; |
| 31 |
+-int TOSFlagsDefault; |
| 32 |
+-int TOSFlagsDiff; |
| 33 |
+-const t_ut_urltable *tos_markasdiff_url; |
| 34 |
+-const t_ct_cttable *tos_maskasdiff_ct; |
| 35 |
+-ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT; |
| 36 |
++extern int TOSFlagsDefault; |
| 37 |
++extern int TOSFlagsDiff; |
| 38 |
++extern const t_ut_urltable *tos_markasdiff_url; |
| 39 |
++extern const t_ct_cttable *tos_maskasdiff_ct; |
| 40 |
++extern ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT; |
| 41 |
+ |
| 42 |
+ int current_tos; |
| 43 |
+ ZP_DATASIZE_TYPE tos_bytecount; /* counter used by TOSMarkAsDiffSizeBT */ |
| 44 |
|
| 45 |
diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild |
| 46 |
similarity index 86% |
| 47 |
rename from net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild |
| 48 |
rename to net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild |
| 49 |
index b5d92bd3fad..ee73d8bdc66 100644 |
| 50 |
--- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild |
| 51 |
+++ b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild |
| 52 |
@@ -1,8 +1,7 @@ |
| 53 |
-# Copyright 1999-2019 Gentoo Authors |
| 54 |
+# Copyright 1999-2020 Gentoo Authors |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
|
| 57 |
-EAPI=6 |
| 58 |
-inherit user |
| 59 |
+EAPI=7 |
| 60 |
|
| 61 |
DESCRIPTION="A forwarding, non-caching, compressing web proxy server" |
| 62 |
HOMEPAGE="http://ziproxy.sourceforge.net/" |
| 63 |
@@ -14,6 +13,8 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
| 64 |
IUSE="sasl xinetd" |
| 65 |
|
| 66 |
RDEPEND=" |
| 67 |
+ acct-group/ziproxy |
| 68 |
+ acct-user/ziproxy |
| 69 |
media-libs/giflib:0= |
| 70 |
media-libs/libpng:0= |
| 71 |
virtual/jpeg:0 |
| 72 |
@@ -23,12 +24,10 @@ RDEPEND=" |
| 73 |
" |
| 74 |
DEPEND="${RDEPEND}" |
| 75 |
|
| 76 |
-PATCHES=( "${FILESDIR}"/${P}-giflib5.patch ) |
| 77 |
- |
| 78 |
-pkg_setup() { |
| 79 |
- enewgroup ziproxy |
| 80 |
- enewuser ziproxy -1 -1 -1 ziproxy |
| 81 |
-} |
| 82 |
+PATCHES=( |
| 83 |
+ "${FILESDIR}"/${P}-giflib5.patch |
| 84 |
+ "${FILESDIR}"/${P}-fno-common.patch |
| 85 |
+) |
| 86 |
|
| 87 |
src_prepare() { |
| 88 |
default |
| 89 |
@@ -58,7 +57,7 @@ src_install() { |
| 90 |
default |
| 91 |
|
| 92 |
dodir /usr/sbin |
| 93 |
- mv -vf "${D}"usr/{,s}bin/ziproxy || die |
| 94 |
+ mv -vf "${ED}"/usr/{,s}bin/ziproxy || die |
| 95 |
|
| 96 |
dobin src/tools/ziproxy_genhtml_stats.sh |
Archives