The way that shared objects were handled in the PLISTs and bsd.pkg.mk was

out of date - it was based on a.out OBJECT_FMT, and added entries in the
generated PLISTs to reflect the symlinks that ELF packages uses. It also
tried to be clever, and removed and recreated any symbolic links that were
created, which has resulted in some fun, especially with packages which
use dlopen(3) to load modules. Some recent changes to our ld.so to bring
it more into line with other Operating Systems also exposed some cracks.

+ Modify bsd.pkg.mk and its shared object handling, so that PLISTs now contain
the ELF symlinks.
+ Don't mess about with file system entries when handling shared objects in
bsd.pkg.mk, since it's likely that libtool and the BSD *.mk processing will
have got it right, and have a much better idea than we do.
+ Modify PLISTs to contain "ELF symlinks"
+ On a.out platforms, delete any "ELF symlinks" from the generated PLISTs
+ On ELF platforms, no extra processing needs to be done in bsd.pkg.mk
+ Modify print-PLIST target in bsd.pkg.mk to add dummy symlink entries on
a.out platforms
+ Update the documentation in Packages.txt

With many thanks to Thomas Klausner for keeping me honest with this.

11 files changed, 51 insertions, 11 deletions

diff --git a/security/PAM/pkg/PLIST b/security/PAM/pkg/PLIST
index a1c4efae0dc..072a4aee5a2 100644
--- a/security/PAM/pkg/PLIST
+++ b/security/PAM/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:54 agc Exp $
 etc/pam.conf
 etc/pam/access.conf
 etc/pam/group.conf
@@ -13,10 +13,16 @@ include/security/pam_filter.h
 include/security/pam_misc.h
 include/security/pam_modules.h
 lib/libpam.a
+lib/libpam.so
+lib/libpam.so.0
 lib/libpam.so.0.72
 lib/libpam_misc.a
+lib/libpam_misc.so
+lib/libpam_misc.so.0
 lib/libpam_misc.so.0.72
 lib/libpamc.a
+lib/libpamc.so
+lib/libpamc.so.0
 lib/libpamc.so.0.72
 lib/security/pam_access.so
 lib/security/pam_cracklib.so
diff --git a/security/cyrus-sasl/pkg/PLIST.common b/security/cyrus-sasl/pkg/PLIST.common
index dc89f5e397c..6c6463d2f3a 100644
--- a/security/cyrus-sasl/pkg/PLIST.common
+++ b/security/cyrus-sasl/pkg/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2000/12/13 16:24:51 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2001/01/04 15:10:54 agc Exp $
 bin/sasl-config
 etc/rc.d/sasl_pwcheck
 include/hmac-md5.h
@@ -7,6 +7,8 @@ include/saslplug.h
 include/saslutil.h
 lib/libsasl.a
 lib/libsasl.la
+lib/libsasl.so
+lib/libsasl.so.8
 lib/libsasl.so.8.8
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
diff --git a/security/cyrus-sasl/pkg/PLIST.krb4 b/security/cyrus-sasl/pkg/PLIST.krb4
index f86cfc5a61f..f78ca575dd0 100644
--- a/security/cyrus-sasl/pkg/PLIST.krb4
+++ b/security/cyrus-sasl/pkg/PLIST.krb4
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST.krb4,v 1.1 2000/10/25 08:00:24 rh Exp $
+@comment $NetBSD: PLIST.krb4,v 1.2 2001/01/04 15:10:54 agc Exp $
 lib/sasl/libkerberos4.a
 lib/sasl/libkerberos4.la
+lib/sasl/libkerberos4.so
+lib/sasl/libkerberos4.so.1
 lib/sasl/libkerberos4.so.1.15
diff --git a/security/cyrus-sasl/pkg/PLIST.krb5 b/security/cyrus-sasl/pkg/PLIST.krb5
index 8d8cabc50a0..b3902053986 100644
--- a/security/cyrus-sasl/pkg/PLIST.krb5
+++ b/security/cyrus-sasl/pkg/PLIST.krb5
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST.krb5,v 1.1 2000/12/10 09:43:38 jlam Exp $
+@comment $NetBSD: PLIST.krb5,v 1.2 2001/01/04 15:10:55 agc Exp $
 lib/sasl/libgssapiv2.a
 lib/sasl/libgssapiv2.la
+lib/sasl/libgssapiv2.so
+lib/sasl/libgssapiv2.so.1
 lib/sasl/libgssapiv2.so.1.14
diff --git a/security/cyrus-sasl/pkg/PLIST.plugins b/security/cyrus-sasl/pkg/PLIST.plugins
index 4390f0c59bb..1e981aa83e6 100644
--- a/security/cyrus-sasl/pkg/PLIST.plugins
+++ b/security/cyrus-sasl/pkg/PLIST.plugins
@@ -1,14 +1,22 @@
-@comment $NetBSD: PLIST.plugins,v 1.1 2000/12/10 09:43:38 jlam Exp $
+@comment $NetBSD: PLIST.plugins,v 1.2 2001/01/04 15:10:55 agc Exp $
 lib/sasl/libanonymous.a
 lib/sasl/libanonymous.la
+lib/sasl/libanonymous.so
+lib/sasl/libanonymous.so.1
 lib/sasl/libanonymous.so.1.15
 lib/sasl/libcrammd5.a
 lib/sasl/libcrammd5.la
+lib/sasl/libcrammd5.so
+lib/sasl/libcrammd5.so.1
 lib/sasl/libcrammd5.so.1.15
 lib/sasl/libdigestmd5.a
 lib/sasl/libdigestmd5.la
+lib/sasl/libdigestmd5.so
+lib/sasl/libdigestmd5.so.0
 lib/sasl/libdigestmd5.so.0.17
 lib/sasl/libplain.a
 lib/sasl/libplain.la
+lib/sasl/libplain.so
+lib/sasl/libplain.so.1
 lib/sasl/libplain.so.1.14
 @unexec rmdir -p %D/lib/sasl 2>/dev/null || true
diff --git a/security/libcrack/pkg/PLIST b/security/libcrack/pkg/PLIST
index bedee5db870..789291b9d88 100644
--- a/security/libcrack/pkg/PLIST
+++ b/security/libcrack/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/10/21 11:17:08 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:55 agc Exp $
 bin/libcrack_mkdict
 bin/libcrack_packer
 bin/libcrack_testlib
@@ -9,6 +9,8 @@ include/cracklib/crack.h
 include/cracklib/packer.h
 lib/libcrack.a
 lib/libcrack.la
+lib/libcrack.so
+lib/libcrack.so.2
 lib/libcrack.so.2.7
 libdata/pw_dict.pwd
 libdata/pw_dict.pwi
diff --git a/security/libident/pkg/PLIST b/security/libident/pkg/PLIST
index 06db5440b0f..3746137f86b 100644
--- a/security/libident/pkg/PLIST
+++ b/security/libident/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2000/06/21 07:14:10 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:55 agc Exp $
 include/ident.h
 lib/libident.a
 lib/libident.la
+lib/libident.so
+lib/libident.so.0
 lib/libident.so.0.22
 man/man3/ident.3
diff --git a/security/libnasl/pkg/PLIST b/security/libnasl/pkg/PLIST
index f35f702bab7..81d39a323d6 100644
--- a/security/libnasl/pkg/PLIST
+++ b/security/libnasl/pkg/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2000/11/12 04:32:03 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:55 agc Exp $
 bin/nasl
 bin/nasl-config
 include/nessus/nasl.h
 lib/libnasl.a
 lib/libnasl.la
+lib/libnasl.so
+lib/libnasl.so.1
 lib/libnasl.so.1.6
 man/man1/nasl-config.1
 man/man1/nasl.1
diff --git a/security/nessus-libraries/pkg/PLIST b/security/nessus-libraries/pkg/PLIST
index f6510c0c702..b3f24b80d2d 100644
--- a/security/nessus-libraries/pkg/PLIST
+++ b/security/nessus-libraries/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/11/12 04:32:03 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:55 agc Exp $
 bin/nessus-config
 include/nessus/getopt.h
 include/nessus/harglists.h
@@ -11,15 +11,23 @@ include/peks/messages.h
 include/peks/peks.h
 lib/libhosts_gatherer.a
 lib/libhosts_gatherer.la
+lib/libhosts_gatherer.so
+lib/libhosts_gatherer.so.1
 lib/libhosts_gatherer.so.1.6
 lib/libnessus.a
 lib/libnessus.la
+lib/libnessus.so
+lib/libnessus.so.1
 lib/libnessus.so.1.6
 lib/libpcap-nessus.a
 lib/libpcap-nessus.la
+lib/libpcap-nessus.so
+lib/libpcap-nessus.so.1
 lib/libpcap-nessus.so.1.6
 lib/libpeks.a
 lib/libpeks.la
+lib/libpeks.so
+lib/libpeks.so.8
 lib/libpeks.so.8.16
 man/man1/nessus-config.1
 @dirrm include/peks
diff --git a/security/openssl/pkg/PLIST.netbsd b/security/openssl/pkg/PLIST.netbsd
index bd49117dd15..13560357b60 100644
--- a/security/openssl/pkg/PLIST.netbsd
+++ b/security/openssl/pkg/PLIST.netbsd
@@ -1,3 +1,7 @@
-@comment $NetBSD: PLIST.netbsd,v 1.1 2000/05/10 12:28:45 veego Exp $
+@comment $NetBSD: PLIST.netbsd,v 1.2 2001/01/04 15:10:55 agc Exp $
+lib/libcrypto.so
+lib/libcrypto.so.1
 lib/libcrypto.so.1.0
+lib/libssl.so
+lib/libssl.so.1
 lib/libssl.so.1.0
diff --git a/security/rsaref/pkg/PLIST b/security/rsaref/pkg/PLIST
index 9fc99a837e3..9e54ba4a576 100644
--- a/security/rsaref/pkg/PLIST
+++ b/security/rsaref/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/06/21 01:17:53 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:56 agc Exp $
 include/rsaref/des.h
 include/rsaref/global.h
 include/rsaref/md2.h
@@ -7,6 +7,8 @@ include/rsaref/rsa.h
 include/rsaref/rsaref.h
 lib/librsaref.a
 lib/librsaref.la
+lib/librsaref.so
+lib/librsaref.so.3
 lib/librsaref.so.3.0
 share/doc/rsaref/info.txt
 share/doc/rsaref/rsaref.txt