Update to 3.0.8.
Take over MAINTAINER-ship (discussed with ckuethe, old MAINTAINER) Remove patches that were included upstream. ok wcmaier@, ckuethe@, sturm@
This commit is contained in:
parent
316ff80c5c
commit
a0428f02f6
@ -1,14 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2007/09/15 20:38:25 merdely Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2008/04/04 02:21:29 merdely Exp $
|
||||
|
||||
COMMENT= web proxy with advanced filtering capabilities
|
||||
|
||||
DISTNAME= privoxy-3.0.3-2-stable
|
||||
PKGNAME= ${DISTNAME:S/-2-stable//}p0
|
||||
V= 3.0.8
|
||||
DISTNAME= privoxy-${V}-stable
|
||||
PKGNAME= privoxy-${V}
|
||||
CATEGORIES= www
|
||||
|
||||
HOMEPAGE= http://www.privoxy.org/
|
||||
|
||||
MAINTAINER= Chris Kuethe <ckuethe@ualberta.ca>
|
||||
MAINTAINER= Michael Erdely <merdely@openbsd.org>
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -18,9 +19,7 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c pthread
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ijbswa/}
|
||||
EXTRACT_SUFX= .src.tar.gz
|
||||
|
||||
WRKDIST= ${WRKDIR}/${DISTNAME:S/-2//}
|
||||
EXTRACT_SUFX= -src.tar.gz
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (privoxy-3.0.3-2-stable.src.tar.gz) = 1/bC/Lkm5hEGWd5uhmsh5A==
|
||||
RMD160 (privoxy-3.0.3-2-stable.src.tar.gz) = FFcCPTxzv74RLnJiZkepGlDQorc=
|
||||
SHA1 (privoxy-3.0.3-2-stable.src.tar.gz) = y0QWvzjMVSsmWM9O1AX7OgL96bs=
|
||||
SHA256 (privoxy-3.0.3-2-stable.src.tar.gz) = fkiP0Q6kGKY8i9z3F4WauH8kQFSBtxc6QUhSnbs9SOc=
|
||||
SIZE (privoxy-3.0.3-2-stable.src.tar.gz) = 1512489
|
||||
MD5 (privoxy-3.0.8-stable-src.tar.gz) = JSwOCFIY+5MMS8dWPpzt2Q==
|
||||
RMD160 (privoxy-3.0.8-stable-src.tar.gz) = YE3WGiLcdNBtStqks8h+TV2lFJs=
|
||||
SHA1 (privoxy-3.0.8-stable-src.tar.gz) = f+K3r95AZu8fFw9fEYUM+dpCikI=
|
||||
SHA256 (privoxy-3.0.8-stable-src.tar.gz) = 7NUcsnhWkfTpDgfRR/XsiaFRsuV49xr7Jr3ZAZVHhJk=
|
||||
SIZE (privoxy-3.0.8-stable-src.tar.gz) = 2007961
|
||||
|
@ -1,15 +1,7 @@
|
||||
$OpenBSD: patch-GNUmakefile_in,v 1.3 2004/05/23 21:38:11 pvalchev Exp $
|
||||
--- GNUmakefile.in.orig 2002-11-04 00:04:03.000000000 -0700
|
||||
+++ GNUmakefile.in 2004-05-23 15:31:25.000000000 -0600
|
||||
@@ -154,7 +154,6 @@ DOC_STATUS = @DOC_STATUS@
|
||||
#DOSFILTER = gawk -v ORS='\r\n' '{print $0;}'
|
||||
DOSFILTER = $(PERL) -p -e 's/\n/\r\n/'
|
||||
CVSROOT = :pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa
|
||||
-TMPDIR := $(shell mktemp -d /tmp/$(PROGRAM).XXXXXX)
|
||||
|
||||
#############################################################################
|
||||
# Setup for make distribution rh and suse for now
|
||||
@@ -226,7 +225,7 @@ PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LI
|
||||
$OpenBSD: patch-GNUmakefile_in,v 1.4 2008/04/04 02:21:29 merdely Exp $
|
||||
--- GNUmakefile.in.orig Wed Apr 2 15:27:11 2008
|
||||
+++ GNUmakefile.in Wed Apr 2 15:27:48 2008
|
||||
@@ -226,7 +226,7 @@ PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@
|
||||
SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC)
|
||||
OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS)
|
||||
HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS)
|
||||
@ -18,11 +10,3 @@ $OpenBSD: patch-GNUmakefile_in,v 1.3 2004/05/23 21:38:11 pvalchev Exp $
|
||||
|
||||
|
||||
#############################################################################
|
||||
@@ -333,6 +332,7 @@ dist-check:
|
||||
# This creates a tar.gz and spec-file for a Red Hat 6.x version.
|
||||
#############################################################################
|
||||
create-snapshot:
|
||||
+ TMPDIR = $(shell mktemp -d /tmp/$(PROGRAM).XXXXXX)
|
||||
@tag=`cvs -d $(CVSROOT) status Makefile | awk ' /Sticky Tag/ { print $$3 } '` 2> /dev/null; \
|
||||
[ x"$$tag" = x"(none)" ] && tag=HEAD; \
|
||||
echo "*** Creating package from $$tag!"; \
|
||||
|
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-actions_c,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- actions.c.orig Fri Feb 28 07:52:10 2003
|
||||
+++ actions.c Sat Mar 29 18:17:02 2003
|
||||
@@ -1206,7 +1206,7 @@ static int load_one_actions_file(struct
|
||||
init_action(cur_action);
|
||||
|
||||
/* trim { */
|
||||
- strcpy(actions_buf, buf + 1);
|
||||
+ strlcpy(actions_buf, buf + 1, sizeof(actions_buf));
|
||||
|
||||
/* check we have a trailing } and then trim it */
|
||||
end = actions_buf + strlen(actions_buf) - 1;
|
||||
@@ -1306,7 +1306,7 @@ static int load_one_actions_file(struct
|
||||
|
||||
new_alias->name = strdup(buf);
|
||||
|
||||
- strcpy(actions_buf, start);
|
||||
+ strlcpy(actions_buf, start, sizeof(actions_buf));
|
||||
|
||||
if (get_actions(actions_buf, alias_list, new_alias->action))
|
||||
{
|
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-cgi_c,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- cgi.c.orig Tue Mar 11 20:26:25 2003
|
||||
+++ cgi.c Sat Mar 29 18:17:02 2003
|
||||
@@ -1399,7 +1399,7 @@ jb_err cgi_error_unknown(struct client_s
|
||||
rsp->head_length = 0;
|
||||
rsp->is_static = 0;
|
||||
|
||||
- sprintf(errnumbuf, "%d", error_to_report);
|
||||
+ snprintf(errnumbuf, sizeof(errnumbuf), "%d", error_to_report);
|
||||
|
||||
rsp->body = malloc(strlen(body_prefix) + strlen(errnumbuf) + strlen(body_suffix) + 1);
|
||||
if (rsp->body == NULL)
|
||||
@@ -1596,7 +1596,7 @@ struct http_response *finish_http_respon
|
||||
/*
|
||||
* Fill in the HTTP Status
|
||||
*/
|
||||
- sprintf(buf, "HTTP/1.0 %s", rsp->status ? rsp->status : "200 OK");
|
||||
+ snprintf(buf, sizeof(buf), "HTTP/1.0 %s", rsp->status ? rsp->status : "200 OK");
|
||||
err = enlist_first(rsp->headers, buf);
|
||||
|
||||
/*
|
||||
@@ -1608,7 +1608,7 @@ struct http_response *finish_http_respon
|
||||
}
|
||||
if (!err)
|
||||
{
|
||||
- sprintf(buf, "Content-Length: %d", (int)rsp->content_length);
|
||||
+ snprintf(buf, sizeof(buf), "Content-Length: %d", (int)rsp->content_length);
|
||||
err = enlist(rsp->headers, buf);
|
||||
}
|
||||
|
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-cgisimple_c,v 1.1.1.1 2002/11/29 09:41:39 sturm Exp $
|
||||
--- cgisimple.c.orig Sun Nov 17 12:20:12 2002
|
||||
+++ cgisimple.c Sun Nov 17 12:21:30 2002
|
||||
@@ -843,13 +843,13 @@ jb_err cgi_show_status(struct client_sta
|
||||
perc_rej = (float)local_urls_rejected * 100.0F /
|
||||
(float)local_urls_read;
|
||||
|
||||
- sprintf(buf, "%d", local_urls_read);
|
||||
+ snprintf(buf, sizeof(buf), "%d", local_urls_read);
|
||||
if (!err) err = map(exports, "requests-received", 1, buf, 1);
|
||||
|
||||
- sprintf(buf, "%d", local_urls_rejected);
|
||||
+ snprintf(buf, sizeof(buf), "%d", local_urls_rejected);
|
||||
if (!err) err = map(exports, "requests-blocked", 1, buf, 1);
|
||||
|
||||
- sprintf(buf, "%6.2f", perc_rej);
|
||||
+ snprintf(buf, sizeof(buf), "%6.2f", perc_rej);
|
||||
if (!err) err = map(exports, "percent-blocked", 1, buf, 1);
|
||||
}
|
||||
|
||||
@@ -1382,7 +1382,7 @@ static char *show_rcs(void)
|
||||
#define SHOW_RCS(__x) \
|
||||
{ \
|
||||
extern const char __x[]; \
|
||||
- sprintf(buf, "%s\n", __x); \
|
||||
+ snprintf(buf, sizeof(buf), "%s\n", __x); \
|
||||
string_append(&result, buf); \
|
||||
}
|
||||
|
@ -1,32 +1,32 @@
|
||||
$OpenBSD: patch-config,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- config.orig Wed Mar 5 11:34:15 2003
|
||||
+++ config Sat Mar 29 18:17:02 2003
|
||||
@@ -104,7 +104,7 @@
|
||||
# flat, except for confdir/templates, where the HTML templates
|
||||
# for CGI output reside (e.g. Privoxy's 404 error page).
|
||||
#
|
||||
-confdir .
|
||||
+confdir %%SYSCONFDIR%%/privoxy
|
||||
|
||||
#
|
||||
# 1.2. logdir
|
||||
@@ -131,7 +131,7 @@ confdir .
|
||||
#
|
||||
# No trailing "/", please
|
||||
#
|
||||
-logdir .
|
||||
+logdir /var/log/privoxy
|
||||
|
||||
#
|
||||
# 1.3. actionsfile
|
||||
@@ -438,8 +438,8 @@ jarfile jarfile
|
||||
$OpenBSD: patch-config,v 1.3 2008/04/04 02:21:29 merdely Exp $
|
||||
--- config.orig Wed Apr 2 15:30:46 2008
|
||||
+++ config Wed Apr 2 15:31:57 2008
|
||||
@@ -163,8 +163,8 @@
|
||||
# don't end up locked out from the information on why they were
|
||||
# locked out in the first place!
|
||||
#
|
||||
#
|
||||
-trust-info-url http://www.example.com/why_we_block.html
|
||||
-trust-info-url http://www.example.com/what_we_allow.html
|
||||
+#trust-info-url http://www.example.com/why_we_block.html
|
||||
+#trust-info-url http://www.example.com/what_we_allow.html
|
||||
|
||||
#
|
||||
# 2.3. admin-address
|
||||
#
|
||||
#
|
||||
# 1.3. admin-address
|
||||
@@ -260,7 +260,7 @@ trust-info-url http://www.example.com/what_we_allow.h
|
||||
#
|
||||
# No trailing "/", please.
|
||||
#
|
||||
-confdir .
|
||||
+confdir %%SYSCONFDIR%%/privoxy
|
||||
#
|
||||
#
|
||||
# 2.2. templdir
|
||||
@@ -315,7 +315,7 @@ confdir .
|
||||
#
|
||||
# No trailing "/", please.
|
||||
#
|
||||
-logdir .
|
||||
+logdir /var/log/privoxy
|
||||
#
|
||||
#
|
||||
# 2.4. actionsfile
|
||||
|
@ -1,17 +1,10 @@
|
||||
$OpenBSD: patch-configure_in,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- configure.in.orig Tue Mar 25 19:25:00 2003
|
||||
+++ configure.in Sat Mar 29 18:17:02 2003
|
||||
@@ -1,4 +1,4 @@
|
||||
-dnl Process this file with autoconf to produce a configure script.
|
||||
+/rdnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
dnl $Id: patch-configure_in,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
dnl
|
||||
@@ -705,24 +705,6 @@ if test $dodk != no; then
|
||||
fi
|
||||
$OpenBSD: patch-configure_in,v 1.3 2008/04/04 02:21:29 merdely Exp $
|
||||
--- configure.in.orig Wed Apr 2 15:32:21 2008
|
||||
+++ configure.in Wed Apr 2 15:33:45 2008
|
||||
@@ -806,24 +806,6 @@ fi
|
||||
AC_SUBST(WDUMP)
|
||||
AC_SUBST(DB2HTML)
|
||||
-
|
||||
|
||||
-dnl If we use rpm, we need to check where %_topdir is
|
||||
-AC_CHECK_PROGS(RPMBIN,rpm,false)
|
||||
-if test $RPMBIN != false; then
|
||||
@ -29,6 +22,7 @@ $OpenBSD: patch-configure_in,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
-dnl Check for man2html for docs.
|
||||
-AC_CHECK_PROGS(MAN2HTML,man2html,false)
|
||||
-AC_SUBST(MAN2HTML)
|
||||
|
||||
-
|
||||
dnl Set doc status flag for conditional content inclusions
|
||||
DOC_STATUS=p-not-stable
|
||||
if test $CODE_STATUS = stable; then
|
||||
|
@ -1,55 +0,0 @@
|
||||
$OpenBSD: patch-errlog_c,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- errlog.c.orig Thu Mar 6 22:41:04 2003
|
||||
+++ errlog.c Sat Mar 29 18:17:02 2003
|
||||
@@ -564,7 +564,7 @@ void log_error(int loglevel, char *fmt,
|
||||
case 'd':
|
||||
ival = va_arg( ap, int );
|
||||
oldoutc = outc;
|
||||
- outc += sprintf(tempbuf, "%d", ival);
|
||||
+ outc += snprintf(tempbuf, sizeof(tempbuf), "%d", ival);
|
||||
if (outc < BUFFER_SIZE-1)
|
||||
{
|
||||
strcpy(outbuf + oldoutc, tempbuf);
|
||||
@@ -577,7 +577,7 @@ void log_error(int loglevel, char *fmt,
|
||||
case 'u':
|
||||
uval = va_arg( ap, unsigned );
|
||||
oldoutc = outc;
|
||||
- outc += sprintf(tempbuf, "%u", uval);
|
||||
+ outc += snprintf(tempbuf, sizeof(tempbuf), "%u", uval);
|
||||
if (outc < BUFFER_SIZE-1)
|
||||
{
|
||||
strcpy(outbuf + oldoutc, tempbuf);
|
||||
@@ -594,13 +594,13 @@ void log_error(int loglevel, char *fmt,
|
||||
{
|
||||
lval = va_arg( ap, long );
|
||||
oldoutc = outc;
|
||||
- outc += sprintf(tempbuf, "%ld", lval);
|
||||
+ outc += snprintf(tempbuf, sizeof(tempbuf), "%ld", lval);
|
||||
}
|
||||
else if (ch == 'u')
|
||||
{
|
||||
ulval = va_arg( ap, unsigned long );
|
||||
oldoutc = outc;
|
||||
- outc += sprintf(tempbuf, "%lu", ulval);
|
||||
+ outc += snprintf(tempbuf, sizeof(tempbuf), "%lu", ulval);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -700,7 +700,7 @@ void log_error(int loglevel, char *fmt,
|
||||
#endif /* ndef HAVE_STRERROR */
|
||||
if (sval == NULL)
|
||||
{
|
||||
- sprintf(tempbuf, "(errno = %d)", ival);
|
||||
+ snprintf(tempbuf, sizeof(tempbuf), "(errno = %d)", ival);
|
||||
sval = tempbuf;
|
||||
}
|
||||
#endif /* ndef _WIN32 */
|
||||
@@ -754,7 +754,7 @@ void log_error(int loglevel, char *fmt,
|
||||
hrs = ((days < -1 ? 24 : 1 < days ? -24 : days * 24) + tm_now->tm_hour - gmt.tm_hour);
|
||||
mins = hrs * 60 + tm_now->tm_min - gmt.tm_min;
|
||||
strftime (tempbuf, BUFFER_SIZE-6, "%d/%b/%Y:%H:%M:%S ", tm_now);
|
||||
- sprintf (tempbuf + strlen(tempbuf), "%+03d%02d", mins / 60, abs(mins) % 60);
|
||||
+ snprintf (tempbuf + strlen(tempbuf), sizeof(tempbuf) - strlen(tempbuf), "%+03d%02d", mins / 60, abs(mins) % 60);
|
||||
}
|
||||
oldoutc = outc;
|
||||
outc += strlen(tempbuf);
|
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-filters_c,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- filters.c.orig Fri Feb 28 07:52:45 2003
|
||||
+++ filters.c Sat Mar 29 18:17:02 2003
|
||||
@@ -958,7 +958,7 @@ struct http_response *trust_url(struct c
|
||||
p = strdup("");
|
||||
for (tl = csp->config->trust_list; (t = *tl) != NULL ; tl++)
|
||||
{
|
||||
- sprintf(buf, "<li>%s</li>\n", t->spec);
|
||||
+ snprintf(buf, sizeof(buf), "<li>%s</li>\n", t->spec);
|
||||
string_append(&p, buf);
|
||||
}
|
||||
err = map(exports, "trusted-referrers", 1, p, 0);
|
||||
@@ -980,7 +980,7 @@ struct http_response *trust_url(struct c
|
||||
p = strdup("");
|
||||
for (l = csp->config->trust_info->first; l ; l = l->next)
|
||||
{
|
||||
- sprintf(buf, "<li> <a href=\"%s\">%s</a><br>\n",l->str, l->str);
|
||||
+ snprintf(buf, sizeof(buf), "<li> <a href=\"%s\">%s</a><br>\n",l->str, l->str);
|
||||
string_append(&p, buf);
|
||||
}
|
||||
err = map(exports, "trust-info", 1, p, 0);
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-gateway_c,v 1.1.1.1 2002/11/29 09:41:39 sturm Exp $
|
||||
--- gateway.c.orig Sun Nov 17 12:20:12 2002
|
||||
+++ gateway.c Sun Nov 17 12:46:58 2002
|
||||
@@ -316,7 +316,7 @@ static jb_socket socks4_connect(const st
|
||||
errno = EINVAL;
|
||||
return(JB_INVALID_SOCKET);
|
||||
}
|
||||
- strcpy(cbuf + csiz, target_host);
|
||||
+ strlcpy(cbuf + csiz, target_host, sizeof(cbuf) - csiz);
|
||||
csiz = n;
|
||||
break;
|
||||
default:
|
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-jbsockets.c,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- jbsockets.c.orig Thu Mar 6 22:41:04 2003
|
||||
+++ jbsockets.c Sat Mar 29 18:40:39 2003
|
||||
@@ -237,7 +237,7 @@ const char jbsockets_rcs[] = "$Id: jbsoc
|
||||
|
||||
#endif
|
||||
|
||||
-#ifdef OSX_DARWIN
|
||||
+#if defined(OSX_DARWIN) || defined(__OpenBSD__)
|
||||
#include <pthread.h>
|
||||
#include "jcc.h"
|
||||
/* jcc.h is for mutex semaphores only */
|
||||
@@ -723,7 +723,7 @@ int accept_connection(struct client_stat
|
||||
{
|
||||
host = NULL;
|
||||
}
|
||||
-#elif defined(OSX_DARWIN)
|
||||
+#elif defined(OSX_DARWIN) || defined(__OpenBSD__)
|
||||
pthread_mutex_lock(&gethostbyaddr_mutex);
|
||||
host = gethostbyaddr((const char *)&server.sin_addr,
|
||||
sizeof(server.sin_addr), AF_INET);
|
||||
@@ -802,7 +802,7 @@ unsigned long resolve_hostname_to_ip(con
|
||||
{
|
||||
hostp = NULL;
|
||||
}
|
||||
-#elif OSX_DARWIN
|
||||
+#elif defined(OSX_DARWIN) || defined(__OpenBSD__)
|
||||
pthread_mutex_lock(&gethostbyname_mutex);
|
||||
hostp = gethostbyname(host);
|
||||
pthread_mutex_unlock(&gethostbyname_mutex);
|
@ -1,48 +0,0 @@
|
||||
$OpenBSD: patch-jcc_c,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- jcc.c.orig Mon Mar 17 11:48:59 2003
|
||||
+++ jcc.c Sat Mar 29 19:10:14 2003
|
||||
@@ -688,7 +688,7 @@ static int32 server_thread(void *data);
|
||||
#define sleep(N) DosSleep(((N) * 100))
|
||||
#endif
|
||||
|
||||
-#ifdef OSX_DARWIN
|
||||
+#if defined(OSX_DARWIN) || defined(__OpenBSD__)
|
||||
/*
|
||||
* Hit OSX over the head with a hammer. Protect all *_r functions.
|
||||
*/
|
||||
@@ -886,7 +886,7 @@ static void chat(struct client_state *cs
|
||||
|
||||
if (http->cmd == NULL)
|
||||
{
|
||||
- strcpy(buf, CHEADER);
|
||||
+ strlcpy(buf, CHEADER, sizeof(buf));
|
||||
write_socket(csp->cfd, buf, strlen(buf));
|
||||
|
||||
log_error(LOG_LEVEL_CLF, "%s - - [%T] \" \" 400 0", csp->ip_addr_str);
|
||||
@@ -966,7 +966,7 @@ static void chat(struct client_state *cs
|
||||
|| (csp->action->flags & ACTION_LIMIT_CONNECT
|
||||
&& !match_portlist(csp->action->string[ACTION_STRING_LIMIT_CONNECT], csp->http->port)) )
|
||||
{
|
||||
- strcpy(buf, CFORBIDDEN);
|
||||
+ strlcpy(buf, CFORBIDDEN, sizeof(buf));
|
||||
write_socket(csp->cfd, buf, strlen(buf));
|
||||
|
||||
log_error(LOG_LEVEL_CONNECT, "Denying suspicious CONNECT request from %s", csp->ip_addr_str);
|
||||
@@ -1417,7 +1417,7 @@ static void chat(struct client_state *cs
|
||||
* This is NOT the body, so
|
||||
* Let's pretend the server just sent us a blank line.
|
||||
*/
|
||||
- len = sprintf(buf, "\r\n");
|
||||
+ len = snprintf(buf, sizeof(buf), "\r\n");
|
||||
|
||||
/*
|
||||
* Now, let the normal header parsing algorithm below do its
|
||||
@@ -2438,7 +2438,7 @@ static void listen_loop(void)
|
||||
|
||||
log_error(LOG_LEVEL_ERROR, "can't fork: %E");
|
||||
|
||||
- sprintf(buf , "Privoxy: can't fork: errno = %d", errno);
|
||||
+ snprintf(buf, sizeof(buf), "Privoxy: can't fork: errno = %d", errno);
|
||||
|
||||
write_socket(csp->cfd, buf, strlen(buf));
|
||||
close_socket(csp->cfd);
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-jcc_h,v 1.1 2003/04/01 20:52:59 sturm Exp $
|
||||
--- jcc.h.orig Thu Mar 6 22:41:05 2003
|
||||
+++ jcc.h Sat Mar 29 19:13:52 2003
|
||||
@@ -121,7 +121,8 @@ extern int no_daemon;
|
||||
extern int g_terminate;
|
||||
#endif
|
||||
|
||||
-#ifdef OSX_DARWIN
|
||||
+#if defined(OSX_DARWIN) || defined(__OpenBSD__)
|
||||
+#include <pthread.h>
|
||||
extern pthread_mutex_t gmtime_mutex;
|
||||
extern pthread_mutex_t localtime_mutex;
|
||||
extern pthread_mutex_t gethostbyaddr_mutex;
|
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-loadcfg_c,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- loadcfg.c.orig Tue Mar 11 06:53:59 2003
|
||||
+++ loadcfg.c Sat Mar 29 18:17:03 2003
|
||||
@@ -633,7 +633,7 @@ struct configuration_spec * load_config(
|
||||
int vec_count;
|
||||
char *vec[3];
|
||||
|
||||
- strcpy(tmp, buf);
|
||||
+ strlcpy(tmp, buf, sizeof(tmp));
|
||||
|
||||
/* Copy command (i.e. up to space or tab) into cmd */
|
||||
p = buf;
|
||||
@@ -651,7 +651,7 @@ struct configuration_spec * load_config(
|
||||
}
|
||||
|
||||
/* Copy the argument into arg */
|
||||
- strcpy(arg, p);
|
||||
+ strlcpy(arg, p, sizeof(arg));
|
||||
|
||||
/* Should never happen, but check this anyway */
|
||||
if (*cmd == '\0')
|
||||
@@ -1281,7 +1281,7 @@ struct configuration_spec * load_config(
|
||||
* log-font-name fontnane
|
||||
* *************************************************************************/
|
||||
case hash_log_font_name :
|
||||
- strcpy( g_szFontFaceName, arg );
|
||||
+ strlcpy( g_szFontFaceName, arg , sizeof(g_szFontFaceName));
|
||||
continue;
|
||||
|
||||
/* *************************************************************************
|
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-miscutil_c,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- miscutil.c.orig Tue Nov 12 09:28:18 2002
|
||||
+++ miscutil.c Sat Mar 29 18:17:03 2003
|
||||
@@ -344,7 +344,7 @@ char *strdup( const char *s )
|
||||
|
||||
if (result != NULL)
|
||||
{
|
||||
- strcpy( result, s );
|
||||
+ strlcpy( result, s, sizeof(result) );
|
||||
}
|
||||
|
||||
return( result );
|
||||
@@ -382,7 +382,7 @@ char *safe_strerror(int err)
|
||||
|
||||
if (s == NULL)
|
||||
{
|
||||
- sprintf(buf, "(errno = %d)", err);
|
||||
+ snprintf(buf, sizeof(buf), "(errno = %d)", err);
|
||||
s = buf;
|
||||
}
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-urlmatch_c,v 1.2 2003/04/01 20:52:59 sturm Exp $
|
||||
--- urlmatch.c.orig Fri Feb 28 08:09:29 2003
|
||||
+++ urlmatch.c Sat Mar 29 18:17:03 2003
|
||||
@@ -686,7 +686,7 @@ jb_err create_url_spec(struct url_spec *
|
||||
return JB_ERR_MEMORY;
|
||||
}
|
||||
|
||||
- sprintf(rebuf, "^(%s)", url->path);
|
||||
+ snprintf(rebuf, sizeof(rebuf), "^(%s)", url->path);
|
||||
|
||||
errcode = regcomp(url->preg, rebuf,
|
||||
(REG_EXTENDED|REG_NOSUB|REG_ICASE));
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2004/11/25 21:07:50 alek Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2008/04/04 02:21:29 merdely Exp $
|
||||
@newgroup _privoxy:516
|
||||
@newuser _privoxy:516:_privoxy:daemon:Privoxy Account:/nonexistent:/sbin/nologin
|
||||
@man man/man1/privoxy.1
|
||||
@ -25,6 +25,12 @@ share/examples/privoxy/default.filter
|
||||
@sample ${SYSCONFDIR}/privoxy/default.filter
|
||||
@owner
|
||||
@group
|
||||
share/examples/privoxy/regression-tests.action
|
||||
@owner _privoxy
|
||||
@group _privoxy
|
||||
@sample ${SYSCONFDIR}/privoxy/regression-tests.action
|
||||
@owner
|
||||
@group
|
||||
share/examples/privoxy/standard.action
|
||||
@owner _privoxy
|
||||
@group _privoxy
|
||||
@ -157,6 +163,12 @@ share/examples/privoxy/templates/edit-actions-url-form
|
||||
@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-url-form
|
||||
@owner
|
||||
@group
|
||||
share/examples/privoxy/templates/forwarding-failed
|
||||
@owner _privoxy
|
||||
@group _privoxy
|
||||
@sample ${SYSCONFDIR}/privoxy/templates/forwarding-failed
|
||||
@owner
|
||||
@group
|
||||
share/examples/privoxy/templates/mod-local-help
|
||||
@owner _privoxy
|
||||
@group _privoxy
|
||||
|
Loading…
Reference in New Issue
Block a user