Module Name:    src
Committed By:   agc
Date:           Sat Apr 25 05:54:51 UTC 2009

Modified Files:
        src/crypto/external/bsd: Makefile
        src/distrib/sets/lists/base: mi shl.elf shl.mi
        src/distrib/sets/lists/comp: mi shl.mi
        src/distrib/sets/lists/man: mi

Log Message:
Enable netpgp in the build, and amend set lists accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/Makefile
cvs rdiff -u -r1.804 -r1.805 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.167 -r1.168 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.464 -r1.465 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1245 -r1.1246 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1133 -r1.1134 src/distrib/sets/lists/man/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/Makefile
diff -u src/crypto/external/bsd/Makefile:1.2 src/crypto/external/bsd/Makefile:1.3
--- src/crypto/external/bsd/Makefile:1.2	Sat Jan 24 01:15:24 2009
+++ src/crypto/external/bsd/Makefile	Sat Apr 25 05:54:51 2009
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2009/01/24 01:15:24 agc Exp $
+#	$NetBSD: Makefile,v 1.3 2009/04/25 05:54:51 agc Exp $
 
+SUBDIR+= netpgp
 SUBDIR+= openpgpsdk
 
 .include <bsd.subdir.mk>

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.804 src/distrib/sets/lists/base/mi:1.805
--- src/distrib/sets/lists/base/mi:1.804	Mon Apr 20 03:07:13 2009
+++ src/distrib/sets/lists/base/mi	Sat Apr 25 05:54:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.804 2009/04/20 03:07:13 mrg Exp $
+# $NetBSD: mi,v 1.805 2009/04/25 05:54:50 agc Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -849,6 +849,7 @@
 ./usr/bin/nview					base-obsolete		obsolete
 ./usr/bin/od					base-util-bin
 ./usr/bin/openpgp				base-crypto-bin		crypto
+./usr/bin/netpgp				base-crypto-bin		crypto
 ./usr/bin/openssl				base-crypto-bin		crypto
 ./usr/bin/page					base-util-bin
 ./usr/bin/pagesize				base-util-bin

Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.167 src/distrib/sets/lists/base/shl.elf:1.168
--- src/distrib/sets/lists/base/shl.elf:1.167	Sun Apr 12 20:54:41 2009
+++ src/distrib/sets/lists/base/shl.elf	Sat Apr 25 05:54:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.167 2009/04/12 20:54:41 christos Exp $
+# $NetBSD: shl.elf,v 1.168 2009/04/25 05:54:50 agc Exp $
 #
 # Note:	Do not mark "old" major and major.minor shared libraries as
 #	"obsolete"; just remove the entry, as third-party applications
@@ -180,6 +180,8 @@
 ./usr/lib/libmagic.so.2				base-sys-shlib
 ./usr/lib/libmenu.so				base-sys-shlib
 ./usr/lib/libmenu.so.6				base-sys-shlib
+./usr/lib/libnetpgp.so				base-crypto-shlib	crypto
+./usr/lib/libnetpgp.so.0			base-crypto-shlib	crypto
 ./usr/lib/libobjc.so				base-sys-shlib		gcc
 ./usr/lib/libobjc.so.3				base-sys-shlib		gcc
 ./usr/lib/libopenpgpsdk.so			base-crypto-shlib	crypto

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.464 src/distrib/sets/lists/base/shl.mi:1.465
--- src/distrib/sets/lists/base/shl.mi:1.464	Sun Apr 12 17:12:44 2009
+++ src/distrib/sets/lists/base/shl.mi	Sat Apr 25 05:54:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.464 2009/04/12 17:12:44 christos Exp $
+# $NetBSD: shl.mi,v 1.465 2009/04/25 05:54:50 agc Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -96,6 +96,7 @@
 ./usr/lib/libm.so.0.6				base-sys-shlib
 ./usr/lib/libmagic.so.2.0			base-sys-shlib
 ./usr/lib/libmenu.so.6.0			base-sys-shlib
+./usr/lib/libnetpgp.so.0.9			base-crypto-shlib	crypto
 ./usr/lib/libobjc.so.2.0			base-sys-shlib		gcc=3
 ./usr/lib/libobjc.so.3.0			base-sys-shlib		gcc=4
 ./usr/lib/libopenpgpsdk.so.0.9			base-crypto-shlib	crypto

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1245 src/distrib/sets/lists/comp/mi:1.1246
--- src/distrib/sets/lists/comp/mi:1.1245	Sun Apr 12 17:24:51 2009
+++ src/distrib/sets/lists/comp/mi	Sat Apr 25 05:54:50 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1245 2009/04/12 17:24:51 christos Exp $
+#	$NetBSD: mi,v 1.1246 2009/04/25 05:54:50 agc Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1663,6 +1663,7 @@
 ./usr/include/objc/sarray.h			comp-c-include
 ./usr/include/objc/thr.h			comp-c-include
 ./usr/include/objc/typedstream.h		comp-c-include
+./usr/include/netpgp.h				comp-c-include		crypto
 ./usr/include/openpgpsdk/accumulate.h		comp-c-include		crypto
 ./usr/include/openpgpsdk/armour.h		comp-c-include		crypto
 ./usr/include/openpgpsdk/callback.h		comp-c-include		crypto
@@ -2444,6 +2445,9 @@
 ./usr/lib/libmenu_g.a				-unknown-		debuglib
 ./usr/lib/libmenu_p.a				comp-c-proflib		profile
 ./usr/lib/libmilter.a				comp-obsolete		obsolete
+./usr/lib/libnetpgp.a				comp-c-lib		crypto
+./usr/lib/libnetpgp_g.a				-unknown-		debuglib
+./usr/lib/libnetpgp_p.a				comp-c-proflib		profile,crypto
 ./usr/lib/libntp.a				comp-obsolete		obsolete
 ./usr/lib/libntp_p.a				comp-obsolete		obsolete
 ./usr/lib/libntp_pic.a				comp-obsolete		obsolete
@@ -2970,6 +2974,7 @@
 ./usr/libdata/debug/usr/bin/msguniq.debug	comp-c-debug		debug
 ./usr/libdata/debug/usr/bin/nbsvtool.debug	comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/bin/netgroup.debug	comp-nis-debug		debug
+./usr/libdata/debug/usr/bin/netpgp.debug	comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/bin/netstat.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/bin/newgrp.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/newsyslog.debug	comp-util-debug		debug
@@ -3555,6 +3560,7 @@
 ./usr/libdata/lint/llib-lmagic.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lmenu.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lmilter.ln		comp-obsolete		obsolete
+./usr/libdata/lint/llib-lnetpgp.ln		comp-c-lintlib		lint,crypto
 ./usr/libdata/lint/llib-lntp.ln			comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lopenpgpsdk.ln		comp-c-lintlib		lint,crypto
 ./usr/libdata/lint/llib-lossaudio.ln		comp-c-lintlib		lint
@@ -6574,6 +6580,7 @@
 ./usr/share/man/cat3/libarchive.0		comp-c-catman		.cat
 ./usr/share/man/cat3/libarchive_internals.0	comp-c-catman		.cat
 ./usr/share/man/cat3/libmagic.0			comp-c-catman		.cat
+./usr/share/man/cat3/libnetpgp.0		comp-c-catman		crypto,.cat
 ./usr/share/man/cat3/libradius.0		comp-c-catman		.cat
 ./usr/share/man/cat3/libusb.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/libusbhid.0		comp-c-catman		.cat
@@ -11921,6 +11928,7 @@
 ./usr/share/man/html3/libarchive.html		comp-c-htmlman		html
 ./usr/share/man/html3/libarchive_internals.html	comp-c-htmlman		html
 ./usr/share/man/html3/libmagic.html		comp-c-htmlman		html
+./usr/share/man/html3/libnetpgp.html		comp-c-htmlman		crypto,html
 ./usr/share/man/html3/libradius.html		comp-c-htmlman		html
 ./usr/share/man/html3/libusbhid.html		comp-c-htmlman		html
 ./usr/share/man/html3/link_addr.html		comp-c-htmlman		html
@@ -17231,6 +17239,7 @@
 ./usr/share/man/man3/libarchive.3		comp-c-man		.man
 ./usr/share/man/man3/libarchive_internals.3	comp-c-man		.man
 ./usr/share/man/man3/libmagic.3			comp-c-man		.man
+./usr/share/man/man3/libnetpgp.3		comp-c-man		crypto,.man
 ./usr/share/man/man3/libradius.3		comp-c-man		.man
 ./usr/share/man/man3/libusb.3			comp-obsolete		obsolete
 ./usr/share/man/man3/libusbhid.3		comp-c-man		.man

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.77 src/distrib/sets/lists/comp/shl.mi:1.78
--- src/distrib/sets/lists/comp/shl.mi:1.77	Sat Feb 28 15:32:29 2009
+++ src/distrib/sets/lists/comp/shl.mi	Sat Apr 25 05:54:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.77 2009/02/28 15:32:29 pooka Exp $
+# $NetBSD: shl.mi,v 1.78 2009/04/25 05:54:50 agc Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -59,6 +59,7 @@
 ./usr/lib/libm_pic.a				comp-c-piclib
 ./usr/lib/libmagic_pic.a			comp-c-piclib
 ./usr/lib/libmenu_pic.a				comp-c-piclib
+./usr/lib/libnetpgp_pic.a			comp-c-piclib		crypto
 ./usr/lib/libobjc_pic.a				comp-objc-piclib
 ./usr/lib/libopcodes.so.3			comp-c-shlib		bfd
 ./usr/lib/libopcodes.so.3.0			comp-c-shlib		bfd

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1133 src/distrib/sets/lists/man/mi:1.1134
--- src/distrib/sets/lists/man/mi:1.1133	Tue Apr 21 22:25:05 2009
+++ src/distrib/sets/lists/man/mi	Sat Apr 25 05:54:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1133 2009/04/21 22:25:05 nonaka Exp $
+# $NetBSD: mi,v 1.1134 2009/04/25 05:54:51 agc Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -301,6 +301,7 @@
 ./usr/share/man/cat1/mv.0			man-util-catman		.cat
 ./usr/share/man/cat1/nbsvtool.0			man-crypto-catman	crypto,.cat
 ./usr/share/man/cat1/netgroup.0			man-nis-catman		.cat
+./usr/share/man/cat1/netpgp.0			man-crypto-catman	crypto,.cat
 ./usr/share/man/cat1/netstat.0			man-netutil-catman	.cat
 ./usr/share/man/cat1/newaliases.0		man-postfix-catman	postfix,.cat
 ./usr/share/man/cat1/newgrp.0			man-util-catman		.cat
@@ -2960,6 +2961,7 @@
 ./usr/share/man/html1/mv.html			man-util-htmlman	html
 ./usr/share/man/html1/nbsvtool.html		man-crypto-htmlman	crypto,html
 ./usr/share/man/html1/netgroup.html		man-nis-htmlman		html
+./usr/share/man/html1/netpgp.html		man-crypto-htmlman	crypto,html
 ./usr/share/man/html1/netstat.html		man-netutil-htmlman	html
 ./usr/share/man/html1/newaliases.html		man-postfix-htmlman	postfix,html
 ./usr/share/man/html1/newgrp.html		man-util-htmlman	html
@@ -5267,6 +5269,7 @@
 ./usr/share/man/man1/mv.1			man-util-man		.man
 ./usr/share/man/man1/nbsvtool.1			man-crypto-man		crypto,.man
 ./usr/share/man/man1/netgroup.1			man-nis-man		.man
+./usr/share/man/man1/netpgp.1			man-crypto-man		crypto,.man
 ./usr/share/man/man1/netstat.1			man-netutil-man		.man
 ./usr/share/man/man1/newaliases.1		man-postfix-man		postfix,.man
 ./usr/share/man/man1/newgrp.1			man-util-man		.man

Reply via email to