Fix for -fno-common

OK sthen@
This commit is contained in:
gonzalo 2021-02-02 14:49:53 +00:00
parent 57ab413e8b
commit a6f67e8bbb
4 changed files with 52 additions and 4 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2019/07/12 20:48:53 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2021/02/02 14:49:53 gonzalo Exp $
COMMENT = compressing non-caching HTTP proxy
DISTNAME = ziproxy-3.3.1
EXTRACT_SUFX = .tar.bz2
REVISION = 0
REVISION = 1
CATEGORIES = net www

View File

@ -0,0 +1,29 @@
$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;

View File

@ -0,0 +1,14 @@
$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;

View File

@ -1,7 +1,13 @@
@comment $OpenBSD: PLIST,v 1.3 2012/09/27 13:17:12 gonzalo Exp $
@comment $OpenBSD: PLIST,v 1.4 2021/02/02 14:49:53 gonzalo Exp $
@newgroup _ziproxy:641
@newuser _ziproxy:641:641:daemon:Ziproxy Daemon:/var/empty:/sbin/nologin
@extraunexec rm -rf /var/log/ziproxy/*
@owner _ziproxy
@group _ziproxy
@rcscript ${RCDIR}/ziproxy
@mode
@owner
@group
@bin bin/ziproxy
@bin bin/ziproxylogtool
@man man/man1/ziproxy.1
@ -30,4 +36,3 @@ share/examples/ziproxy/ziproxy_genhtml_stats.sh
@owner _ziproxy
@group _ziproxy
@sample /var/log/ziproxy/
@rcscript ${RCDIR}/ziproxy