.Fx should only have version numbers as argument.diff -r1.8 -r1.9 src/external/bsd/blacklist/bin/blacklistctl.8
(wiz)
--- src/external/bsd/blacklist/bin/Attic/blacklistctl.8 2016/06/07 17:31:02 1.8
+++ src/external/bsd/blacklist/bin/Attic/blacklistctl.8 2016/06/08 12:48:37 1.9
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | .\" $NetBSD: blacklistctl.8,v 1.8 2016/06/07 17:31:02 christos Exp $ | 1 | .\" $NetBSD: blacklistctl.8,v 1.9 2016/06/08 12:48:37 wiz Exp $ | |
2 | .\" | 2 | .\" | |
3 | .\" Copyright (c) 2015 The NetBSD Foundation, Inc. | 3 | .\" Copyright (c) 2015 The NetBSD Foundation, Inc. | |
4 | .\" All rights reserved. | 4 | .\" All rights reserved. | |
5 | .\" | 5 | .\" | |
6 | .\" This code is derived from software contributed to The NetBSD Foundation | 6 | .\" This code is derived from software contributed to The NetBSD Foundation | |
7 | .\" by Christos Zoulas. | 7 | .\" by Christos Zoulas. | |
8 | .\" | 8 | .\" | |
9 | .\" Redistribution and use in source and binary forms, with or without | 9 | .\" Redistribution and use in source and binary forms, with or without | |
10 | .\" modification, are permitted provided that the following conditions | 10 | .\" modification, are permitted provided that the following conditions | |
11 | .\" are met: | 11 | .\" are met: | |
12 | .\" 1. Redistributions of source code must retain the above copyright | 12 | .\" 1. Redistributions of source code must retain the above copyright | |
13 | .\" notice, this list of conditions and the following disclaimer. | 13 | .\" notice, this list of conditions and the following disclaimer. | |
14 | .\" 2. Redistributions in binary form must reproduce the above copyright | 14 | .\" 2. Redistributions in binary form must reproduce the above copyright | |
@@ -67,19 +67,20 @@ of attempts that | @@ -67,19 +67,20 @@ of attempts that | |||
67 | .Xr blacklistd 8 | 67 | .Xr blacklistd 8 | |
68 | is configured to block. | 68 | is configured to block. | |
69 | This can happen either because the rule has been removed manually, or | 69 | This can happen either because the rule has been removed manually, or | |
70 | because there were more attempts in flight while the rule block was being | 70 | because there were more attempts in flight while the rule block was being | |
71 | added. | 71 | added. | |
72 | This condition is normal; in that case | 72 | This condition is normal; in that case | |
73 | .Xr blacklistd 8 | 73 | .Xr blacklistd 8 | |
74 | will first attempt to remove the existing rule, and then it will re-add | 74 | will first attempt to remove the existing rule, and then it will re-add | |
75 | it to make sure that there is only one rule active. | 75 | it to make sure that there is only one rule active. | |
76 | .Sh HISTORY | 76 | .Sh HISTORY | |
77 | .Nm | 77 | .Nm | |
78 | first appeared in | 78 | first appeared in | |
79 | .Nx 7 . | 79 | .Nx 7 . | |
80 | .Fx support for | 80 | .Fx | |
81 | support for | |||
81 | .Nm | 82 | .Nm | |
82 | was implemented in | 83 | was implemented in | |
83 | .Fx 11 . | 84 | .Fx 11 . | |
84 | .Sh AUTHORS | 85 | .Sh AUTHORS | |
85 | .An Christos Zoulas | 86 | .An Christos Zoulas |
--- src/external/bsd/blacklist/bin/Attic/blacklistd.8 2016/06/07 17:31:02 1.16
+++ src/external/bsd/blacklist/bin/Attic/blacklistd.8 2016/06/08 12:48:37 1.17
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | .\" $NetBSD: blacklistd.8,v 1.16 2016/06/07 17:31:02 christos Exp $ | 1 | .\" $NetBSD: blacklistd.8,v 1.17 2016/06/08 12:48:37 wiz Exp $ | |
2 | .\" | 2 | .\" | |
3 | .\" Copyright (c) 2015 The NetBSD Foundation, Inc. | 3 | .\" Copyright (c) 2015 The NetBSD Foundation, Inc. | |
4 | .\" All rights reserved. | 4 | .\" All rights reserved. | |
5 | .\" | 5 | .\" | |
6 | .\" This code is derived from software contributed to The NetBSD Foundation | 6 | .\" This code is derived from software contributed to The NetBSD Foundation | |
7 | .\" by Christos Zoulas. | 7 | .\" by Christos Zoulas. | |
8 | .\" | 8 | .\" | |
9 | .\" Redistribution and use in source and binary forms, with or without | 9 | .\" Redistribution and use in source and binary forms, with or without | |
10 | .\" modification, are permitted provided that the following conditions | 10 | .\" modification, are permitted provided that the following conditions | |
11 | .\" are met: | 11 | .\" are met: | |
12 | .\" 1. Redistributions of source code must retain the above copyright | 12 | .\" 1. Redistributions of source code must retain the above copyright | |
13 | .\" notice, this list of conditions and the following disclaimer. | 13 | .\" notice, this list of conditions and the following disclaimer. | |
14 | .\" 2. Redistributions in binary form must reproduce the above copyright | 14 | .\" 2. Redistributions in binary form must reproduce the above copyright | |
@@ -208,19 +208,20 @@ Configuration file. | @@ -208,19 +208,20 @@ Configuration file. | |||
208 | Database of current connection entries. | 208 | Database of current connection entries. | |
209 | .It Pa /var/run/blacklistd.sock | 209 | .It Pa /var/run/blacklistd.sock | |
210 | Socket to receive connection notifications. | 210 | Socket to receive connection notifications. | |
211 | .El | 211 | .El | |
212 | .Sh SEE ALSO | 212 | .Sh SEE ALSO | |
213 | .Xr blacklistd.conf 5 , | 213 | .Xr blacklistd.conf 5 , | |
214 | .Xr blacklistctl 8 , | 214 | .Xr blacklistctl 8 , | |
215 | .Xr npfctl 8 , | 215 | .Xr npfctl 8 , | |
216 | .Xr syslogd 8 | 216 | .Xr syslogd 8 | |
217 | .Sh HISTORY | 217 | .Sh HISTORY | |
218 | .Nm | 218 | .Nm | |
219 | first appeared in | 219 | first appeared in | |
220 | .Nx 7 . | 220 | .Nx 7 . | |
221 | .Fx support for | 221 | .Fx | |
222 | support for | |||
222 | .Nm | 223 | .Nm | |
223 | was implemented in | 224 | was implemented in | |
224 | .Fx 11 . | 225 | .Fx 11 . | |
225 | .Sh AUTHORS | 226 | .Sh AUTHORS | |
226 | .An Christos Zoulas | 227 | .An Christos Zoulas |
--- src/external/bsd/blacklist/bin/Attic/blacklistd.conf.5 2016/06/07 17:31:02 1.4
+++ src/external/bsd/blacklist/bin/Attic/blacklistd.conf.5 2016/06/08 12:48:37 1.5
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | .\" $NetBSD: blacklistd.conf.5,v 1.4 2016/06/07 17:31:02 christos Exp $ | 1 | .\" $NetBSD: blacklistd.conf.5,v 1.5 2016/06/08 12:48:37 wiz Exp $ | |
2 | .\" | 2 | .\" | |
3 | .\" Copyright (c) 2015 The NetBSD Foundation, Inc. | 3 | .\" Copyright (c) 2015 The NetBSD Foundation, Inc. | |
4 | .\" All rights reserved. | 4 | .\" All rights reserved. | |
5 | .\" | 5 | .\" | |
6 | .\" This code is derived from software contributed to The NetBSD Foundation | 6 | .\" This code is derived from software contributed to The NetBSD Foundation | |
7 | .\" by Christos Zoulas. | 7 | .\" by Christos Zoulas. | |
8 | .\" | 8 | .\" | |
9 | .\" Redistribution and use in source and binary forms, with or without | 9 | .\" Redistribution and use in source and binary forms, with or without | |
10 | .\" modification, are permitted provided that the following conditions | 10 | .\" modification, are permitted provided that the following conditions | |
11 | .\" are met: | 11 | .\" are met: | |
12 | .\" 1. Redistributions of source code must retain the above copyright | 12 | .\" 1. Redistributions of source code must retain the above copyright | |
13 | .\" notice, this list of conditions and the following disclaimer. | 13 | .\" notice, this list of conditions and the following disclaimer. | |
14 | .\" 2. Redistributions in binary form must reproduce the above copyright | 14 | .\" 2. Redistributions in binary form must reproduce the above copyright | |
@@ -208,19 +208,20 @@ bnx0:ssh * * * * 3 6h | @@ -208,19 +208,20 @@ bnx0:ssh * * * * 3 6h | |||
208 | # Never block 1.2.3.4 | 208 | # Never block 1.2.3.4 | |
209 | 1.2.3.4:ssh * * * * * * | 209 | 1.2.3.4:ssh * * * * * * | |
210 | # For addresses coming from 8.8.0.0/16 block class C networks instead | 210 | # For addresses coming from 8.8.0.0/16 block class C networks instead | |
211 | # individual hosts, but keep the rest of the blocking parameters the same. | 211 | # individual hosts, but keep the rest of the blocking parameters the same. | |
212 | 8.8.0.0/16:ssh * * * /24 = = | 212 | 8.8.0.0/16:ssh * * * /24 = = | |
213 | .Ed | 213 | .Ed | |
214 | .Sh SEE ALSO | 214 | .Sh SEE ALSO | |
215 | .Xr blacklistctl 8 , | 215 | .Xr blacklistctl 8 , | |
216 | .Xr blacklistd 8 | 216 | .Xr blacklistd 8 | |
217 | .Sh HISTORY | 217 | .Sh HISTORY | |
218 | .Nm | 218 | .Nm | |
219 | first appeared in | 219 | first appeared in | |
220 | .Nx 7 . | 220 | .Nx 7 . | |
221 | .Fx support for | 221 | .Fx | |
222 | support for | |||
222 | .Nm | 223 | .Nm | |
223 | was implemented in | 224 | was implemented in | |
224 | .Fx 11 . | 225 | .Fx 11 . | |
225 | .Sh AUTHORS | 226 | .Sh AUTHORS | |
226 | .An Christos Zoulas | 227 | .An Christos Zoulas |