From owner-svn-ports-all@freebsd.org Fri May 1 12:34:38 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 104C82D497A; Fri, 1 May 2020 12:34:38 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49DBXF6fHjz4T7m; Fri, 1 May 2020 12:34:37 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DAFF68491; Fri, 1 May 2020 12:34:37 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 041CYbFI065509; Fri, 1 May 2020 12:34:37 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 041CYbd9065507; Fri, 1 May 2020 12:34:37 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <202005011234.041CYbd9065507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Fri, 1 May 2020 12:34:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533535 - in head: mail/spamilter/files www/webalizer/files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head: mail/spamilter/files www/webalizer/files X-SVN-Commit-Revision: 533535 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2020 12:34:38 -0000 Author: dinoex Date: Fri May 1 12:34:37 2020 New Revision: 533535 URL: https://svnweb.freebsd.org/changeset/ports/533535 Log: - fix build with -fno-common Added: head/mail/spamilter/files/patch-spamilter.h (contents, props changed) Modified: head/www/webalizer/files/patch-dns_resolv.c Added: head/mail/spamilter/files/patch-spamilter.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/spamilter/files/patch-spamilter.h Fri May 1 12:34:37 2020 (r533535) @@ -0,0 +1,11 @@ +--- spamilter.h.orig 2004-12-12 22:14:16 UTC ++++ spamilter.h +@@ -95,7 +95,7 @@ + + #define MLFIPRIV ((mlfiPriv *) smfi_getpriv(ctx)) + +- struct smfiDesc mlfi; /* forward declaration */ ++ extern struct smfiDesc mlfi; /* forward declaration */ + + extern int gDebug; + extern char *gPolicyUrl; /* policy url */ Modified: head/www/webalizer/files/patch-dns_resolv.c ============================================================================== --- head/www/webalizer/files/patch-dns_resolv.c Fri May 1 11:21:24 2020 (r533534) +++ head/www/webalizer/files/patch-dns_resolv.c Fri May 1 12:34:37 2020 (r533535) @@ -1,6 +1,6 @@ --- dns_resolv.c.orig 2013-02-26 05:37:27 UTC +++ dns_resolv.c -@@ -68,13 +68,21 @@ +@@ -68,21 +68,29 @@ #include "parser.h" /* log parser functions */ #include "dns_resolv.h" /* our header */ @@ -22,8 +22,20 @@ struct dns_child child[MAXCHILD]; /* DNS child pipe data */ -@@ -122,7 +130,11 @@ void resolve_dns(struct log_struct *log_ +-DNODEPTR host_table[MAXHASH]; /* hostname/ip hash table */ ++/* DNODEPTR host_table[MAXHASH]; */ +-char buffer[BUFSIZE]; /* log file record buffer */ +-char tmp_buf[BUFSIZE]; /* used to temp save above */ +-struct utsname system_info; /* system info structure */ ++static char buffer[BUFSIZE]; /* log file record buffer */ ++static char tmp_buf[BUFSIZE]; /* used to temp save above */ ++static struct utsname system_info; /* system info structure */ + + int raiseSigChild = 1; + +@@ -122,7 +130,11 @@ void resolve_dns(struct log_struct *log_rec) + if (debug_mode) fprintf(stderr,"Checking %s...", log_rec->hostname); +#ifdef USE_DB185 @@ -34,7 +46,7 @@ { memcpy(&alignedRecord, response.data, sizeof(struct dnsRecord)); strncpy (log_rec->hostname, -@@ -131,7 +143,7 @@ void resolve_dns(struct log_struct *log_ +@@ -131,7 +143,7 @@ void resolve_dns(struct log_struct *log_rec) log_rec->hostname[MAXHOST-1]=0; if (debug_mode) fprintf(stderr," found: %s (%ld)\n", @@ -117,7 +129,7 @@ return 0; } -@@ -720,7 +756,11 @@ static void db_put(char *key, char *valu +@@ -720,7 +756,11 @@ static void db_put(char *key, char *value, int numeric v.size = recSize; v.data = recPtr; @@ -210,7 +222,7 @@ if (i) strncpy(str, "Unknown", 8); else strncpy(str, v.data+3, v.size-3); -@@ -895,7 +961,11 @@ char *geodb_get_cc(DB *db, char *ip, cha +@@ -895,7 +961,11 @@ char *geodb_get_cc(DB *db, char *ip, char *buf) k.data=&addr; k.size=sizeof(addr); @@ -222,7 +234,7 @@ if (!i) memcpy(buf, v.data, 2); return buf; } -@@ -906,7 +976,11 @@ char *geodb_get_cc(DB *db, char *ip, cha +@@ -906,7 +976,11 @@ char *geodb_get_cc(DB *db, char *ip, char *buf) void geodb_close(DB *db) {