[src/netbsd-3]: src/usr.sbin/pf Pull up revision 1.2 (requested by jwise in t...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bcaf6c5875e5
branches:  netbsd-3
changeset: 575336:bcaf6c5875e5
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 13 16:05:49 2005 +0000

description:
Pull up revision 1.2 (requested by jwise in ticket #138):
Per discussion on tech-userlevel and tech-security, install `spamd',
`spamd-setup', and `spamdb' as `pfspamd', `pfspamd-setup', and `pfspamdb'.
To quote Steven M. Bellovin:
  This [having a program in basesrc with the same name as a widely used and
  completely different program in pkgsrc] is a seriously bad idea; it
  violates the rule of least surprise.  That's bad enough in normal
  situations; here, we're talking about security.  You do *not* want to
  confuse people about security features; they're hard enough to get right
  as is.

diffstat:

 usr.sbin/pf/spamd-setup/Makefile |  9 ++++++---
 usr.sbin/pf/spamdb/Makefile      |  9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 41565b55fa65 -r bcaf6c5875e5 usr.sbin/pf/spamd-setup/Makefile
--- a/usr.sbin/pf/spamd-setup/Makefile  Wed Apr 13 16:01:38 2005 +0000
+++ b/usr.sbin/pf/spamd-setup/Makefile  Wed Apr 13 16:05:49 2005 +0000
@@ -1,15 +1,18 @@
-#      $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
+#      $NetBSD: Makefile,v 1.1.2.1 2005/04/13 16:05:49 tron Exp $
 #      $OpenBSD: Makefile,v 1.3 2004/01/21 08:07:41 deraadt Exp $
 
-PROG=  spamd-setup
+PROG=  pfspamd-setup
 SRCS=  spamd-setup.c
-MAN=   spamd-setup.8
+MAN=   pfspamd-setup.8
 
 LDADD= -lz
 DPADD= ${LIBZ}
 
 BINDIR=        /usr/libexec
 
+pfspamd-setup.8: spamd-setup.8
+       cp $> $@
+
 .include <bsd.prog.mk>
 
 .PATH: ${NETBSDSRCDIR}/dist/pf/libexec/spamd-setup
diff -r 41565b55fa65 -r bcaf6c5875e5 usr.sbin/pf/spamdb/Makefile
--- a/usr.sbin/pf/spamdb/Makefile       Wed Apr 13 16:01:38 2005 +0000
+++ b/usr.sbin/pf/spamdb/Makefile       Wed Apr 13 16:05:49 2005 +0000
@@ -1,12 +1,15 @@
-#      $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
+#      $NetBSD: Makefile,v 1.1.2.1 2005/04/13 16:05:49 tron Exp $
 #      $OpenBSD: Makefile,v 1.2 2004/02/27 19:41:39 david Exp $
 
-PROG=  spamdb
+PROG=  pfspamdb
 SRCS=  spamdb.c
-MAN=   spamdb.8
+MAN=   pfspamdb.8
 
 CPPFLAGS+=-I${NETBSDSRCDIR}/dist/pf/libexec/spamd
 
+pfspamdb.8: spamdb.8
+       cp $> $@
+
 .include <bsd.prog.mk>
 
 .PATH: ${NETBSDSRCDIR}/dist/pf/usr.sbin/spamdb