gentoo auto-resync : 15:11:2022 - 06:52:13

5 files changed, 49 insertions, 74 deletions

diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index 100d241be77a..ef71c260702c 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -1,7 +1,6 @@
-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-3.3.2-Fix-clang-build-errors.patch 1166 BLAKE2B 4d75d717ea86d064fed40f035a3a98f97b1f0c79032f030f881db83f276b65d83717b72ecb4005e010caef6e2eef5090b4e8d037bd695ab6f62a9a63543032b7 SHA512 d17542cd72f286530a220d64162bb23c8bf725431a396924d445366d94ebe90911b2c4ef9534e7cf80d331f1407675f9f0c7f40fbcf1d6c9fa81e2c9a94879ab
 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-r2.ebuild 1614 BLAKE2B 66f397a898cb801d48091afa0b341df1287e504ba9cd91098739e4b5a9f9808a17d9f8bd69ea87a7bc6594c50718c10111cc575dd419ea934e3bafa66f075713 SHA512 da01a9273400648011e9304d5768d859266962c63271bdf36d181d2f244b35f14069e35b732086fe8abc9424222c3e06175d21ef7661ecba296d81181c81685a
+DIST ziproxy-3.3.2.tar.xz 205992 BLAKE2B 0822c54fe1448588b14fbed58d8ffce27910db78959ec1f6344dd644dfaf222ef70d4389ec9f751457991e75bfdb59a8ee3964051beae279cba3486e1af7ccb2 SHA512 9e4cca86a29d970357c14369d4c8adc1902f334a60ce8d50872c36a65cf75f580eb92e185382f4a9bcfe31ddcc3ceee4f3a8cbeea395b6c09542bce0784b0b57
+EBUILD ziproxy-3.3.2.ebuild 1602 BLAKE2B 9c88566518a52024bdd08cb114cb8c467e7f2476312883f20db20cb41062966ddf690705eb2698eaab3e9e7004abf69bc4303e74ad3d788bd62951eafef243e3 SHA512 3b331493376248fd9b182ec4a0a9b8a509874189a68a66bc8c97dcdd15e46f3a2da8ce1c190506112af51ee9560e4b1abe2ef8a8a7e3908199210db3dc026414
 MISC metadata.xml 517 BLAKE2B c11caee23184aaaca23c22baeef44c37324301c7908742f8804df5fa948d9f5e033f8a97811c885519c032e8f306655fdfc7734776e0bf4901b9e06b90596917 SHA512 b94b9a0bc1114948bcb50e89acd34133306560219be17432e6fac0966cc92ee8c4fab3d872c8c3a372ed451f44bc32f3a9664d4950a920c4c8f2d1aacfb49eb9
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 <talau@users.sourceforge.net>
-Author: Matthias Klose <doko@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/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 <xxc3ncoredxx@gmail.com>
+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 <xxc3ncoredxx@gmail.com>
+---
+ 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.1-r2.ebuild b/net-proxy/ziproxy/ziproxy-3.3.2.ebuild
index be702259c92e..18927d63ac6f 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.1-r2.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 )
@@ -25,8 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-giflib5.patch
-	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-Fix-clang-build-errors.patch
 )
 
 src_prepare() {