Hello,
Update for Ziproxy to 3.3.2, with almost all our patches included.
OK? Comments?
Cheers.-
--
%gonzalo
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ziproxy/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 2 Feb 2021 14:49:53 -0000 1.16
+++ Makefile 22 Mar 2021 11:38:28 -0000
@@ -2,9 +2,8 @@
COMMENT = compressing non-caching HTTP proxy
-DISTNAME = ziproxy-3.3.1
+DISTNAME = ziproxy-3.3.2
EXTRACT_SUFX = .tar.bz2
-REVISION = 1
CATEGORIES = net www
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ziproxy/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 5 Dec 2014 16:07:56 -0000 1.4
+++ distinfo 22 Mar 2021 11:38:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (ziproxy-3.3.1.tar.bz2) = w5xhSIQM2qhn1N061B05vjRUlLIEi4bsiZ0MB15Wh00=
-SIZE (ziproxy-3.3.1.tar.bz2) = 275342
+SHA256 (ziproxy-3.3.2.tar.bz2) = dqH8Ysdt+hqNB4QZOrogqW4hTdYVt5J7SXzu5QWWmfE=
+SIZE (ziproxy-3.3.2.tar.bz2) = 251995
Index: patches/patch-src_cfgfile_c
===================================================================
RCS file: patches/patch-src_cfgfile_c
diff -N patches/patch-src_cfgfile_c
--- patches/patch-src_cfgfile_c 2 Feb 2021 14:49:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_cfgfile_c,v 1.1 2021/02/02 14:49:53 gonzalo Exp $
-
-Index: src/cfgfile.c
---- src/cfgfile.c.orig
-+++ src/cfgfile.c
-@@ -111,11 +111,11 @@ in_addr_t *BindOutgoingExAddr;
- in_addr_t *BindOutgoing;
- int BindOutgoing_entries;
-
--int TOSFlagsDefault;
--int TOSFlagsDiff;
-+extern int TOSFlagsDefault;
-+extern int TOSFlagsDiff;
- char *TOSMarkAsDiffURL;
- char *TOSMarkAsDiffCT;
--int TOSMarkAsDiffSizeBT;
-+extern int TOSMarkAsDiffSizeBT;
-
- int MaxActiveUserConnections;
-
-@@ -159,7 +159,7 @@ int check_int_ranges (const char *conf_key, const int
- int check_int_minimum (const char *conf_key, const int inval, const int vlow);
- int check_directory (const char *conf_key, const char *dirname);
-
--const t_ut_urltable *tos_markasdiff_url;
-+const t_ut_urltable *Tos_markasdiff_url;
- const t_ct_cttable *tos_maskasdiff_ct;
-
- const t_ut_urltable *urltable_noprocessing;
Index: patches/patch-src_image_c
===================================================================
RCS file: patches/patch-src_image_c
diff -N patches/patch-src_image_c
--- patches/patch-src_image_c 28 Mar 2015 16:06:48 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-src_image_c,v 1.4 2015/03/28 16:06:48 sthen Exp $
-
-Fix build with giflib-5.1
-
---- src/image.c.orig Wed Dec 3 11:58:33 2014
-+++ src/image.c Sat Mar 28 16:03:38 2015
-@@ -905,7 +905,7 @@ int gif2bitmap(char *inbuf, int insize, raw_bitmap **o
- desc.size=insize;
- desc.x.pos=0;
-
-- if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input)) == NULL)
-+ if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input, NULL)) == NULL)
- return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more
possible reasons
-
- bmp = new_raw_bitmap();
-@@ -1083,7 +1083,7 @@ int gif2bitmap(char *inbuf, int insize, raw_bitmap **o
- }
- bmp->pal_bpp = bmp->bpp;
-
-- DGifCloseFile(GifFile);
-+ DGifCloseFile(GifFile, NULL);
- return IMG_RET_OK;
- }
-
-@@ -1738,7 +1738,7 @@ static int bitmap2jp2 (raw_bitmap *bmp, float rate, ch
- cmptparm->width = cwidth [cmptno];
- cmptparm->height = cheight [cmptno];
- cmptparm->prec = cbitlen [cmptno];
-- cmptparm->sgnd = false; // we only generate unsigned components
-+ cmptparm->sgnd = 0; // we only generate unsigned components
-
- cshiftR [cmptno] = 8 - cbitlen [cmptno]; // calculate the
resampling shift for this component
- }
Index: patches/patch-src_tosmarking_c
===================================================================
RCS file: patches/patch-src_tosmarking_c
diff -N patches/patch-src_tosmarking_c
--- patches/patch-src_tosmarking_c 2 Feb 2021 14:49:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_tosmarking_c,v 1.1 2021/02/02 14:49:53 gonzalo Exp $
-
-Index: src/tosmarking.c
---- src/tosmarking.c.orig
-+++ src/tosmarking.c
-@@ -39,7 +39,7 @@ SOCKET sock_child_out;
- int TOSFlagsDefault;
- int TOSFlagsDiff;
- const t_ut_urltable *tos_markasdiff_url;
--const t_ct_cttable *tos_maskasdiff_ct;
-+extern const t_ct_cttable *tos_maskasdiff_ct;
- ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT;
-
- int current_tos;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ziproxy/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 2 Feb 2021 14:49:53 -0000 1.4
+++ pkg/PLIST 22 Mar 2021 11:38:28 -0000
@@ -5,7 +5,6 @@
@owner _ziproxy
@group _ziproxy
@rcscript ${RCDIR}/ziproxy
-@mode
@owner
@group
@bin bin/ziproxy
