From e6a066ac3e8fdf1fcd4f3f2ca1b82bd55eb2da2a Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 15 Jun 2020 13:44:37 +0000
Subject: blocklist: update to 2020-06-15 snapshot

Upstream hash 7093cd90cc9eae6bf9fa6b66f679ea6b15451c1e

Obtained from:	https://github.com/zoulasc/blocklist
Sponsored by:	The FreeBSD Foundation
---
 diff/ftpd.diff | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'diff/ftpd.diff')

diff --git a/diff/ftpd.diff b/diff/ftpd.diff
index d28577f3ef5f..37b43dae2295 100644
--- a/diff/ftpd.diff
+++ b/diff/ftpd.diff
@@ -2,17 +2,17 @@
 +++ pfilter.c	2015-01-23 17:12:02.000000000 -0500
 @@ -0,0 +1,24 @@
 +#include <stdio.h>
-+#include <blacklist.h>
++#include <blocklist.h>
 +
 +#include "pfilter.h"
 +
-+static struct blacklist *blstate;
++static struct blocklist *blstate;
 +
 +void
 +pfilter_open(void)
 +{
 +	if (blstate == NULL)
-+		blstate = blacklist_open();
++		blstate = blocklist_open();
 +}
 +
 +void
@@ -23,7 +23,7 @@
 +	if (blstate == NULL)
 +		return;
 +
-+	blacklist_r(blstate, what, 0, msg);
++	blocklist_r(blstate, what, 0, msg);
 +}
 --- /dev/null	2015-01-23 17:30:40.000000000 -0500
 +++ pfilter.h	2015-01-23 17:07:25.000000000 -0500
@@ -42,8 +42,8 @@ diff -u -p -u -r1.63 Makefile
  MLINKS=	ftpusers.5 ftpchroot.5
  
 +SRCS+=	pfilter.c
-+LDADD+=	-lblacklist
-+DPADD+=	${LIBBLACKLIST}
++LDADD+=	-lblocklist
++DPADD+=	${LIBBLOCKLIST}
 +
  .if defined(NO_INTERNAL_LS)
  CPPFLAGS+=-DNO_INTERNAL_LS
-- 
cgit v1.3