pkg_lint_summary: new option -n was added

that analyses PLIST and CONFLICTS entries in input summary and outputs unregistered conflicts. pkgpana2pkgbase function was added to psu_funcs.awk
2011-08-13 12:38:19 +00:00 · 2011-08-13 12:38:19 +00:00 · 692206a473
commit 692206a473
parent 27beba051d
5 changed files with 413 additions and 10 deletions
--- a/pkg_summary-utils/files/pkg_lint_summary.1
+++ b/pkg_summary-utils/files/pkg_lint_summary.1
@ -1,4 +1,4 @@
-.\"	$NetBSD: pkg_lint_summary.1,v 1.12 2011/08/13 11:13:36 cheusov Exp $
+.\"	$NetBSD: pkg_lint_summary.1,v 1.13 2011/08/13 12:38:19 cheusov Exp $
 .\"
 .\" Copyright (c) 2008-2010 by Aleksey Cheusov (vle@gmx.net)
 .\" Absolutely no warranty.
@ -112,6 +112,32 @@ output in the following format:

   c: conflict CNFLCT_REQD CNFLCT_PATH CNFLCT_NAME <- PKGPATH PKGNAME

+.VE
+.TP
+.B "-n"
+analyses PLIST and CONFLICTS entries in input summary and outputs
+information about unregistered conflicts, i.e. common file
+and conflicting packages. Output format is below.
+.VB
+
+   n: conflict FILE <- PKGPATH1 PKGNAME1 PKGPATH2 PKGNAME2
+
+.VE
+The line above means that (PKGPATH1, PKGNAME1) and (PKGPATH2, PKGNAME2)
+packages have at least one common file FILE but have no appropriate CONFLICTS entry.
+.br
+Example:
+.VB
+
+   # pkg_lint_summary -n pkg_summary.txt
+   n: conflict /usr/pkg/bin/lzgrep <- archivers/xz xz-5.0.3 \\ 
+                  archivers/lzip lzip-1.7
+   n: conflict /usr/pkg/libexec/cpp <- devel/lcc lcc-4.1 \\ 
+                  lang/pcc pcc-1.0.0
+   n: conflict /usr/pkg/sbin/sshd <- security/openssh openssh-5.8.2nb2 \\ 
+                  security/ssh2 ssh2-3.2.9.1nb7
+   #
+
 .VE
 .TP
 .B "-u"
--- a/pkg_summary-utils/files/pkg_lint_summary.in
+++ b/pkg_summary-utils/files/pkg_lint_summary.in
@ -36,6 +36,7 @@
 #use "has_prefix.awk"
 #use "tmpfile.awk"
 #use "xclose.awk"
+#use "xgetline.awk"

 ############################################################
 #.begin-str help
@ -53,6 +54,7 @@
 #   -f          checks that there are no files common for several packages,
 #               PLIST entries are expected in input
 #   -u          checks unicity of PKGBASEs
+#   -n          checks for missing CONFLICTS by anayling PLIST entries
 #   =p prefix   specify prefix (e.g. /usr/pkg) which is used by -l
 #.end-str
 ############################################################
@ -72,16 +74,17 @@ BEGIN {
 	opt_c = getarg("c")
 	opt_f = getarg("f")
 	opt_u = getarg("u")
+	opt_n = getarg("n")

 	cnt = 0

-	if (!opt_L && !opt_l && !opt_d && !opt_D && !opt_c && !opt_f && !opt_u){
-		print "At least one of the following options should be applied:\n     -L, -l, -d, -D, -c, -f or -u" > "/dev/stderr"
+	if (!opt_L && !opt_l && !opt_d && !opt_D && !opt_c && !opt_f && !opt_u && !opt_n){
+		print "At least one of the following options should be applied:\n     -L, -l, -d, -D, -c, -f, -u or -n" > "/dev/stderr"
 		exitnow(1)
 	}

 	tmp_summary = tmpfile()
-	if (opt_d || opt_D || opt_c)
+	if (opt_d || opt_D || opt_c || opt_n)
 		printf "" > tmp_summary
 }

@ -140,11 +143,11 @@ opt_l || opt_L {
 	}
 }

-opt_d || opt_D || opt_c {
+opt_d || opt_D || opt_c || opt_n {
 	print > tmp_summary
 }

-opt_f && /^PLIST=/ {
+(opt_n || opt_f) && /^PLIST=/ {
 	plist [++plist_cnt] = substr($0, 7)
 }

@ -198,8 +201,8 @@ END {
 		}
 	}

-	# -d -D -c
-	if (opt_d || opt_D || opt_c){
+	# -d -D -c -n
+	if (opt_d || opt_D || opt_c || opt_n){
 		if (ex)
 			fflush()

@ -207,11 +210,52 @@ END {

 		if (opt_d) opts = "d"
 		if (opt_D) opts = opts "D"
-		if (opt_c) opts = opts "c"
+		if (opt_c || opt_n) opts = opts "c"

-		cmd = "pkg_summary2deps -Xnls" opts " " tmp_summary " 2>&1 > /dev/null" 
+		failed_deps_fn = tmpfile()
+		cmd = "pkg_summary2deps -Xnls" opts " " tmp_summary " 2>" failed_deps_fn " > /dev/null" 
 		if (system(cmd))
 			ex = 1
+
+		if (opt_d || opt_D || opt_c)
+			system("cat " failed_deps_fn)
+	}
+
+	# -n
+	if (opt_n){
+		for (f in all_plist){
+			cnt = split(all_plist [f], arr)
+			if (cnt > 1){
+				for (i=1; i < cnt; ++i){
+					for (j=i+1; j <= cnt; ++j){
+						base1 = pkgpana2pkgbase(arr [i])
+						base2 = pkgpana2pkgbase(arr [j])
+						if (base1 != base2){
+							conflicts [arr [i], arr [j]] = f
+#							print "n: conflict", arr [i], arr [j], f, pkgpana2pkgbase(arr [i]), pkgpana2pkgbase(arr [j])
+						}
+					}
+				}
+			}
+		}
+		while (xgetline0(failed_deps_fn)){
+			if ($1 != "c")
+				continue
+
+			pana1 = ($4 ";" $5)
+			pana2 = ($7 ";" $8)
+			delete conflicts [pana1, pana2]
+			delete conflicts [pana2, pana1]
+		}
+
+		for (pair in conflicts){
+			idx = index(pair, SUBSEP)
+			pana1 = substr(pair, 1, idx-1)
+			sub(/;/, " ", pana1)
+			pana2 = substr(pair, idx+1)
+			sub(/;/, " ", pana2)
+			print "n: conflict " conflicts [pair] " <- " pana1, pana2
+		}
 	}

 	# -u
--- a/pkg_summary-utils/files/psu_funcs.awk
+++ b/pkg_summary-utils/files/psu_funcs.awk
@ -16,6 +16,12 @@ function pkgname2pkgbase (pkgname){
 	return substr(pkgname, 1, pkgver_position(pkgname)-1)
 }

+# strip PKGPATH and version from PKGPANA
+function pkgpana2pkgbase (pkgpana,         idx){
+	idx = index(pkgpana, ";") + 1
+	return substr(pkgpana, idx, pkgver_position(pkgpana)-idx)
+}
+
 # extract version from PKGNAME, e.g. -1.2.3, -[0-9]*, >=1.0 etc.
 function pkgname2version (pkgname,       pos){
 	pos = pkgver_position(pkgname)
--- a/pkg_summary-utils/files/tests/bin_summary8.txt
+++ b/pkg_summary-utils/files/tests/bin_summary8.txt
@ -0,0 +1,311 @@
+CONFLICTS=lzma-[0-9]*
+CONFLICTS=lzma-utils-[0-9]*
+CONFLICTS=lzmalib-[0-9]*
+PKGNAME=xz-5.0.3
+COMMENT=XZ utilities
+PKGPATH=archivers/xz
+PLIST=/usr/pkg/bin/lzcat
+PLIST=/usr/pkg/bin/lzcmp
+PLIST=/usr/pkg/bin/lzdiff
+PLIST=/usr/pkg/bin/lzegrep
+PLIST=/usr/pkg/bin/lzfgrep
+PLIST=/usr/pkg/bin/lzgrep
+PLIST=/usr/pkg/bin/lzless
+PLIST=/usr/pkg/bin/lzma
+PLIST=/usr/pkg/bin/lzmadec
+PLIST=/usr/pkg/bin/lzmainfo
+PLIST=/usr/pkg/bin/lzmore
+PLIST=/usr/pkg/bin/unlzma
+PLIST=/usr/pkg/bin/unxz
+PLIST=/usr/pkg/bin/xz
+PLIST=/usr/pkg/bin/xzcat
+PLIST=/usr/pkg/bin/xzcmp
+PLIST=/usr/pkg/bin/xzdec
+PLIST=/usr/pkg/bin/xzdiff
+PLIST=/usr/pkg/bin/xzegrep
+PLIST=/usr/pkg/bin/xzfgrep
+PLIST=/usr/pkg/bin/xzgrep
+PLIST=/usr/pkg/bin/xzless
+PLIST=/usr/pkg/bin/xzmore
+PLIST=/usr/pkg/include/lzma.h
+PLIST=/usr/pkg/include/lzma/base.h
+PLIST=/usr/pkg/include/lzma/bcj.h
+PLIST=/usr/pkg/include/lzma/block.h
+PLIST=/usr/pkg/include/lzma/check.h
+PLIST=/usr/pkg/include/lzma/container.h
+PLIST=/usr/pkg/include/lzma/delta.h
+PLIST=/usr/pkg/include/lzma/filter.h
+PLIST=/usr/pkg/include/lzma/hardware.h
+PLIST=/usr/pkg/include/lzma/index.h
+PLIST=/usr/pkg/include/lzma/index_hash.h
+PLIST=/usr/pkg/include/lzma/lzma.h
+PLIST=/usr/pkg/include/lzma/stream_flags.h
+PLIST=/usr/pkg/include/lzma/version.h
+PLIST=/usr/pkg/include/lzma/vli.h
+PLIST=/usr/pkg/lib/liblzma.la
+PLIST=/usr/pkg/lib/liblzma.a
+PLIST=/usr/pkg/lib/liblzma.so
+PLIST=/usr/pkg/lib/liblzma.so.5
+PLIST=/usr/pkg/lib/liblzma.so.5.0.3
+PLIST=/usr/pkg/lib/pkgconfig/liblzma.pc
+PLIST=/usr/pkg/man/man1/lzcat.1
+PLIST=/usr/pkg/man/man1/lzcmp.1
+PLIST=/usr/pkg/man/man1/lzdiff.1
+PLIST=/usr/pkg/man/man1/lzegrep.1
+PLIST=/usr/pkg/man/man1/lzfgrep.1
+PLIST=/usr/pkg/man/man1/lzgrep.1
+PLIST=/usr/pkg/man/man1/lzless.1
+PLIST=/usr/pkg/man/man1/lzma.1
+PLIST=/usr/pkg/man/man1/lzmadec.1
+PLIST=/usr/pkg/man/man1/lzmainfo.1
+PLIST=/usr/pkg/man/man1/lzmore.1
+PLIST=/usr/pkg/man/man1/unlzma.1
+PLIST=/usr/pkg/man/man1/unxz.1
+PLIST=/usr/pkg/man/man1/xz.1
+PLIST=/usr/pkg/man/man1/xzcat.1
+PLIST=/usr/pkg/man/man1/xzcmp.1
+PLIST=/usr/pkg/man/man1/xzdec.1
+PLIST=/usr/pkg/man/man1/xzdiff.1
+PLIST=/usr/pkg/man/man1/xzegrep.1
+PLIST=/usr/pkg/man/man1/xzfgrep.1
+PLIST=/usr/pkg/man/man1/xzgrep.1
+PLIST=/usr/pkg/man/man1/xzless.1
+PLIST=/usr/pkg/man/man1/xzmore.1
+PLIST=/usr/pkg/share/doc/xz/AUTHORS
+PLIST=/usr/pkg/share/doc/xz/COPYING
+PLIST=/usr/pkg/share/doc/xz/COPYING.GPLv2
+PLIST=/usr/pkg/share/doc/xz/NEWS
+PLIST=/usr/pkg/share/doc/xz/README
+PLIST=/usr/pkg/share/doc/xz/THANKS
+PLIST=/usr/pkg/share/doc/xz/TODO
+PLIST=/usr/pkg/share/doc/xz/examples/xz_pipe_comp.c
+PLIST=/usr/pkg/share/doc/xz/examples/xz_pipe_decomp.c
+PLIST=/usr/pkg/share/doc/xz/faq.txt
+PLIST=/usr/pkg/share/doc/xz/history.txt
+PLIST=/usr/pkg/share/doc/xz/lzma-file-format.txt
+PLIST=/usr/pkg/share/doc/xz/xz-file-format.txt
+PLIST=/usr/pkg/share/locale/cs/LC_MESSAGES/xz.mo
+PLIST=/usr/pkg/share/locale/de/LC_MESSAGES/xz.mo
+PLIST=/usr/pkg/share/locale/fr/LC_MESSAGES/xz.mo
+PLIST=/usr/pkg/share/locale/it/LC_MESSAGES/xz.mo
+PLIST=/usr/pkg/share/locale/pl/LC_MESSAGES/xz.mo
+
+PKGNAME=lzip-1.7
+COMMENT=Lossless data compressor based on the LZMA algorithm
+PKGPATH=archivers/lzip
+PLIST=/usr/pkg/bin/lzdiff
+PLIST=/usr/pkg/bin/lzgrep
+PLIST=/usr/pkg/bin/lzip
+PLIST=/usr/pkg/bin/lziprecover
+PLIST=/usr/pkg/info/lzip.info
+PLIST=/usr/pkg/man/man1/lzdiff.1
+PLIST=/usr/pkg/man/man1/lzgrep.1
+PLIST=/usr/pkg/man/man1/lzip.1
+PLIST=/usr/pkg/man/man1/lziprecover.1
+
+PKGNAME=pcc-1.0.0
+COMMENT=Portable C compiler
+PKGPATH=lang/pcc
+PLIST=/usr/pkg/bin/pcc
+PLIST=/usr/pkg/libexec/ccom
+PLIST=/usr/pkg/libexec/cpp
+PLIST=/usr/pkg/man/man1/ccom.1
+PLIST=/usr/pkg/man/man1/cpp.1
+PLIST=/usr/pkg/man/man1/pcc.1
+
+PKGNAME=lcc-4.1
+COMMENT=Local ANSI C compiler for a variety of platforms
+PKGPATH=devel/lcc
+PLIST=/usr/pkg/bin/lcc
+PLIST=/usr/pkg/libexec/bprint
+PLIST=/usr/pkg/libexec/cpp
+PLIST=/usr/pkg/libexec/lburg
+PLIST=/usr/pkg/libexec/rcc
+PLIST=/usr/pkg/man/man1/bprint.1
+PLIST=/usr/pkg/man/man1/lcc.1
+PLIST=/usr/pkg/share/lcc/include/stdarg.h
+PLIST=/usr/pkg/share/lcc/include/sys/cdefs.h
+
+CONFLICTS=sftp-[0-9]*
+CONFLICTS=ssh-[0-9]*
+CONFLICTS=ssh6-[0-9]*
+CONFLICTS=ssh2-[0-9]*
+CONFLICTS=ssh2-nox11-[0-9]*
+CONFLICTS=openssh+gssapi-[0-9]*
+CONFLICTS=lsh>2.0
+PKGNAME=openssh-5.8.2nb2
+COMMENT=Open Source Secure shell client and server (remote login program)
+PKGPATH=security/openssh
+PLIST=/usr/pkg/bin/scp
+PLIST=/usr/pkg/bin/sftp
+PLIST=/usr/pkg/bin/slogin
+PLIST=/usr/pkg/bin/ssh
+PLIST=/usr/pkg/bin/ssh-add
+PLIST=/usr/pkg/bin/ssh-agent
+PLIST=/usr/pkg/bin/ssh-keygen
+PLIST=/usr/pkg/bin/ssh-keyscan
+PLIST=/usr/pkg/libexec/sftp-server
+PLIST=/usr/pkg/libexec/ssh-keysign
+PLIST=/usr/pkg/libexec/ssh-pkcs11-helper
+PLIST=/usr/pkg/man/man1/scp.1
+PLIST=/usr/pkg/man/man1/sftp.1
+PLIST=/usr/pkg/man/man1/slogin.1
+PLIST=/usr/pkg/man/man1/ssh-add.1
+PLIST=/usr/pkg/man/man1/ssh-agent.1
+PLIST=/usr/pkg/man/man1/ssh-keygen.1
+PLIST=/usr/pkg/man/man1/ssh-keyscan.1
+PLIST=/usr/pkg/man/man1/ssh.1
+PLIST=/usr/pkg/man/man5/moduli.5
+PLIST=/usr/pkg/man/man5/ssh_config.5
+PLIST=/usr/pkg/man/man5/sshd_config.5
+PLIST=/usr/pkg/man/man8/sftp-server.8
+PLIST=/usr/pkg/man/man8/ssh-keysign.8
+PLIST=/usr/pkg/man/man8/ssh-pkcs11-helper.8
+PLIST=/usr/pkg/man/man8/sshd.8
+PLIST=/usr/pkg/sbin/sshd
+PLIST=/usr/pkg/share/examples/openssh/moduli
+PLIST=/usr/pkg/share/examples/openssh/ssh_config
+PLIST=/usr/pkg/share/examples/openssh/sshd_config
+PLIST=/usr/pkg/share/examples/rc.d/sshd
+
+CONFLICTS=openssh-[0-9]*
+CONFLICTS=ssh6-[0-9]*
+CONFLICTS=ssh-[0-9]*
+CONFLICTS=sftp-[0-9]*
+CONFLICTS=openssh+gssapi-[0-9]*
+CONFLICTS=ssh2-nox11-[0-9]*
+PKGNAME=ssh2-3.2.9.1nb7
+COMMENT=Secure Shell client and server for V.2 SSH protocol
+PKGPATH=security/ssh2
+PLIST=/usr/pkg/bin/scp
+PLIST=/usr/pkg/bin/scp2
+PLIST=/usr/pkg/bin/sftp
+PLIST=/usr/pkg/bin/sftp-server
+PLIST=/usr/pkg/bin/sftp-server2
+PLIST=/usr/pkg/bin/sftp2
+PLIST=/usr/pkg/bin/ssh
+PLIST=/usr/pkg/bin/ssh-add
+PLIST=/usr/pkg/bin/ssh-add2
+PLIST=/usr/pkg/bin/ssh-agent
+PLIST=/usr/pkg/bin/ssh-agent2
+PLIST=/usr/pkg/bin/ssh-askpass
+PLIST=/usr/pkg/bin/ssh-askpass2
+PLIST=/usr/pkg/bin/ssh-dummy-shell
+PLIST=/usr/pkg/bin/ssh-keygen
+PLIST=/usr/pkg/bin/ssh-keygen2
+PLIST=/usr/pkg/bin/ssh-probe
+PLIST=/usr/pkg/bin/ssh-probe2
+PLIST=/usr/pkg/bin/ssh-signer
+PLIST=/usr/pkg/bin/ssh-signer2
+PLIST=/usr/pkg/bin/ssh2
+PLIST=/usr/pkg/man/man1/scp.1
+PLIST=/usr/pkg/man/man1/scp2.1
+PLIST=/usr/pkg/man/man1/sftp.1
+PLIST=/usr/pkg/man/man1/sftp2.1
+PLIST=/usr/pkg/man/man1/ssh-add.1
+PLIST=/usr/pkg/man/man1/ssh-add2.1
+PLIST=/usr/pkg/man/man1/ssh-agent.1
+PLIST=/usr/pkg/man/man1/ssh-agent2.1
+PLIST=/usr/pkg/man/man1/ssh-dummy-shell.1
+PLIST=/usr/pkg/man/man1/ssh-keygen.1
+PLIST=/usr/pkg/man/man1/ssh-keygen2.1
+PLIST=/usr/pkg/man/man1/ssh-probe.1
+PLIST=/usr/pkg/man/man1/ssh-probe2.1
+PLIST=/usr/pkg/man/man1/ssh.1
+PLIST=/usr/pkg/man/man1/ssh2.1
+PLIST=/usr/pkg/man/man1/sshregex.1
+PLIST=/usr/pkg/man/man5/ssh2_config.5
+PLIST=/usr/pkg/man/man5/sshd-check-conf.5
+PLIST=/usr/pkg/man/man5/sshd2_config.5
+PLIST=/usr/pkg/man/man5/sshd2_subconfig.5
+PLIST=/usr/pkg/man/man8/sshd.8
+PLIST=/usr/pkg/man/man8/sshd2.8
+PLIST=/usr/pkg/sbin/sshd
+PLIST=/usr/pkg/sbin/sshd-check-conf
+PLIST=/usr/pkg/sbin/sshd2
+PLIST=/usr/pkg/share/doc/ssh2/CHANGES
+PLIST=/usr/pkg/share/doc/ssh2/FAQ
+PLIST=/usr/pkg/share/doc/ssh2/HOWTO.anonymous.sftp
+PLIST=/usr/pkg/share/doc/ssh2/INSTALL
+PLIST=/usr/pkg/share/doc/ssh2/LICENSE
+PLIST=/usr/pkg/share/doc/ssh2/NEWS
+PLIST=/usr/pkg/share/doc/ssh2/README
+PLIST=/usr/pkg/share/doc/ssh2/REGEX-SYNTAX
+PLIST=/usr/pkg/share/doc/ssh2/RFC.authorization_program_protocol
+PLIST=/usr/pkg/share/doc/ssh2/RFC.kbdint_plugin_protocol
+PLIST=/usr/pkg/share/doc/ssh2/SSH2.QUICKSTART
+PLIST=/usr/pkg/share/examples/ssh2/ext_authorization_example.sh
+PLIST=/usr/pkg/share/examples/ssh2/kbdint_plugin_example.sh
+PLIST=/usr/pkg/share/examples/ssh2/ssh2_config
+PLIST=/usr/pkg/share/examples/ssh2/ssh_dummy_shell.out
+PLIST=/usr/pkg/share/examples/ssh2/sshd2_config
+PLIST=/usr/pkg/share/examples/ssh2/subconfig/anonymous.example
+PLIST=/usr/pkg/share/examples/ssh2/subconfig/host_ext.example
+PLIST=/usr/pkg/share/examples/ssh2/subconfig/host_int.example
+PLIST=/usr/pkg/share/examples/ssh2/subconfig/user.example
+PLIST=/usr/pkg/share/examples/rc.d/ssh2_secure_shell
+
+CONFLICTS=apache-*ssl-[0-9]*
+CONFLICTS=apache6-[0-9]*
+PKGNAME=apache-1.3.42
+COMMENT=Apache HTTP (Web) server
+PKGPATH=www/apache
+PLIST=/usr/pkg/lib/httpd/httpd.exp
+PLIST=/usr/pkg/lib/httpd/mod_define.so
+PLIST=/usr/pkg/lib/httpd/mod_proxy.so
+PLIST=/usr/pkg/bin/checkgid
+PLIST=/usr/pkg/bin/dbmmanage
+PLIST=/usr/pkg/bin/htdigest
+PLIST=/usr/pkg/bin/htpasswd
+PLIST=/usr/pkg/libexec/cgi-bin/printenv
+PLIST=/usr/pkg/libexec/cgi-bin/test-cgi
+PLIST=/usr/pkg/man/man1/dbmmanage.1
+PLIST=/usr/pkg/man/man1/htdigest.1
+PLIST=/usr/pkg/man/man1/htpasswd.1
+PLIST=/usr/pkg/man/man8/ab.8
+PLIST=/usr/pkg/man/man8/apachectl.8
+PLIST=/usr/pkg/man/man8/apxs.8
+PLIST=/usr/pkg/man/man8/httpd.8
+PLIST=/usr/pkg/man/man8/logresolve.8
+PLIST=/usr/pkg/man/man8/rotatelogs.8
+PLIST=/usr/pkg/sbin/ab
+PLIST=/usr/pkg/sbin/apachectl
+PLIST=/usr/pkg/sbin/apxs
+PLIST=/usr/pkg/sbin/httpd
+PLIST=/usr/pkg/sbin/logresolve
+PLIST=/usr/pkg/sbin/rotatelogs
+
+CONFLICTS=apache-*ssl-[0-9]*
+CONFLICTS=apache6-[0-9]*
+PKGNAME=apache-2.0.64
+COMMENT=Apache HTTP (Web) server, version 2
+PKGPATH=www/apache2
+PLIST=/usr/pkg/lib/httpd/httpd.exp
+PLIST=/usr/pkg/libexec/cgi-bin/printenv
+PLIST=/usr/pkg/libexec/cgi-bin/test-cgi
+PLIST=/usr/pkg/man/man1/dbmmanage.1
+PLIST=/usr/pkg/man/man1/htdbm.1
+PLIST=/usr/pkg/man/man1/htdigest.1
+PLIST=/usr/pkg/man/man1/htpasswd.1
+PLIST=/usr/pkg/man/man8/ab.8
+PLIST=/usr/pkg/man/man8/apachectl.8
+PLIST=/usr/pkg/man/man8/apxs.8
+PLIST=/usr/pkg/man/man8/httpd.8
+PLIST=/usr/pkg/man/man8/logresolve.8
+PLIST=/usr/pkg/man/man8/rotatelogs.8
+PLIST=/usr/pkg/man/man8/suexec.8
+PLIST=/usr/pkg/sbin/ab
+PLIST=/usr/pkg/sbin/apachectl
+PLIST=/usr/pkg/sbin/apxs
+PLIST=/usr/pkg/sbin/checkgid
+PLIST=/usr/pkg/sbin/dbmmanage
+PLIST=/usr/pkg/sbin/envvars-std
+PLIST=/usr/pkg/sbin/htdbm
+PLIST=/usr/pkg/sbin/htdigest
+PLIST=/usr/pkg/sbin/htpasswd
+PLIST=/usr/pkg/sbin/httpd
+PLIST=/usr/pkg/sbin/httxt2dbm
+PLIST=/usr/pkg/sbin/logresolve
+PLIST=/usr/pkg/sbin/mkcert
+PLIST=/usr/pkg/sbin/rotatelogs
+
--- a/pkg_summary-utils/files/tests/test_pkg_lint_summary.sh
+++ b/pkg_summary-utils/files/tests/test_pkg_lint_summary.sh
@ -84,3 +84,19 @@ pkg_lint_summary -f bin_summary7.txt |
 cmp 'pkg_lint_summary -f #10' \
 'f: conflict /usr/pkg/lib/libpng15.so wip/aaa aaa-0.9.8qnb1 wip/ccc ccc-2.0.64
 '
+
+pkg_lint_summary -n bin_summary8.txt | sort |
+cmp 'pkg_lint_summary -n #11' \
+'n: conflict /usr/pkg/bin/lzgrep <- archivers/xz xz-5.0.3 archivers/lzip lzip-1.7
+n: conflict /usr/pkg/bin/ssh <- security/openssh openssh-5.8.2nb2 security/ssh2 ssh2-3.2.9.1nb7
+n: conflict /usr/pkg/libexec/cpp <- lang/pcc pcc-1.0.0 devel/lcc lcc-4.1
+'
+
+pkg_lint_summary -n bin_summary7.txt | sort |
+cmp 'pkg_lint_summary -n #12' \
+'n: conflict /usr/pkg/lib/libpng15.so <- wip/aaa aaa-0.9.8qnb1 wip/ccc ccc-2.0.64
+'
+
+pkg_lint_summary -n bin_summary6.txt | sort |
+cmp 'pkg_lint_summary -n #13' \
+''