7 files changed, 44 insertions, 6 deletions
diff --git a/libc/debian/changelog b/libc/debian/changelog
index 2482ea9..976c06a 100644
--- a/libc/debian/changelog
+++ b/libc/debian/changelog
@@ -1,8 +1,9 @@
 libc (0.1+13513-55) UNRELEASED; urgency=low
 
+  * Merged libcrypt-modules
   * More headers
 
- -- Igor Pashev <pashev.igor@gmail.com>  Tue, 12 Jun 2012 17:58:45 +0000
+ -- Igor Pashev <pashev.igor@gmail.com>  Wed, 13 Jun 2012 01:43:17 +0000
 
 libc (0.1+13513-54) unstable; urgency=low
 
diff --git a/libc/debian/control b/libc/debian/control
index fa8ab44..7a02ee1 100644
--- a/libc/debian/control
+++ b/libc/debian/control
@@ -43,8 +43,8 @@ Essential: yes
 Priority: required
 Section: libs
 Architecture: illumos-amd64
-Provides: libthread1, libpthread1, libsocket1, libnsl1, libm2, libm1, libelf1, libcrypt1, libgen1
-Replaces: libelf1, libgen1
+Provides: libthread1, libpthread1, libsocket1, libnsl1, libm2, libm1, libelf1, libcrypt1, libgen1, libcrypt-modules
+Replaces: libelf1, libgen1, libcrypt-modules
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Illumos C Library: Shared libraries
  Contains the standard libraries that are used by nearly all programs on the
@@ -58,7 +58,7 @@ Priority: required
 Section: libs
 Architecture: illumos-amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libelf1, libgen1
+Replaces: libelf1, libgen1, libcrypt-modules
 Description: Illumos C Library: Shared libraries (i386)
  Contains the standard libraries that are used by nearly all programs on the
  system. This package includes shared versions of the standard C library and
diff --git a/libc/debian/libc1-illumos-i386.install b/libc/debian/libc1-illumos-i386.install
index 2f90939..97b2033 100644
--- a/libc/debian/libc1-illumos-i386.install
+++ b/libc/debian/libc1-illumos-i386.install
@@ -11,9 +11,16 @@ lib/libresolv.so.2 lib/i386-illumos/
 lib/librtld.so.1 lib/i386-illumos/
 lib/libsocket.so.1 lib/i386-illumos/
 lib/nss*.so.1 lib/i386-illumos/
-usr/lib/libcrypt.so.1 usr/lib/i386-illumos/
 lib/libintl.so.1 lib/i386-illumos/
 lib/libpthread.so.1 lib/i386-illumos/
 lib/libthread.so.1 lib/i386-illumos/
 lib/libxnet.so.1 lib/i386-illumos/
 lib/librt.so.1 lib/i386-illumos/
+
+usr/lib/libcrypt.so.1 usr/lib/i386-illumos/
+usr/lib/security/crypt_bsdbf.so.1
+usr/lib/security/crypt_sha512.so.1
+usr/lib/security/crypt_bsdmd5.so.1
+usr/lib/security/crypt_sha256.so.1
+usr/lib/security/crypt_sunmd5.so.1
+
diff --git a/libc/debian/libc1.dirs b/libc/debian/libc1.dirs
index 76a4cfe..e7831cf 100644
--- a/libc/debian/libc1.dirs
+++ b/libc/debian/libc1.dirs
@@ -1,2 +1,3 @@
+etc/security
 var/ld
 var/ld/64
diff --git a/libc/debian/libc1.install b/libc/debian/libc1.install
index 7caee69..0e9d50a 100644
--- a/libc/debian/libc1.install
+++ b/libc/debian/libc1.install
@@ -11,9 +11,17 @@ lib/amd64/libresolv.so.2 lib/x86_64-illumos/
 lib/amd64/librtld.so.1 lib/x86_64-illumos/
 lib/amd64/libsocket.so.1 lib/x86_64-illumos/
 lib/amd64/nss*.so.1 lib/x86_64-illumos/
-usr/lib/amd64/libcrypt.so.1 usr/lib/x86_64-illumos/
+
+# for crypt(3):
+usr/lib/security/amd64/crypt_bsdbf.so.1
+usr/lib/security/amd64/crypt_sha512.so.1
+usr/lib/security/amd64/crypt_bsdmd5.so.1
+usr/lib/security/amd64/crypt_sha256.so.1
+usr/lib/security/amd64/crypt_sunmd5.so.1
 
 
+# Mostly filter:
+usr/lib/amd64/libcrypt.so.1 usr/lib/x86_64-illumos/
 
 # Dummy libs (filters):
 lib/amd64/librt.so.1 lib/x86_64-illumos/
@@ -23,6 +31,14 @@ lib/amd64/libthread.so.1 lib/x86_64-illumos/
 lib/amd64/libxnet.so.1 lib/x86_64-illumos/
 
 usr/share/man/man1/ld.so.1.1
+usr/share/man/man5/crypt_unix.5
+usr/share/man/man5/crypt_bsdbf.5
+usr/share/man/man5/crypt_sha512.5
+usr/share/man/man5/crypt_bsdmd5.5
+usr/share/man/man5/crypt_sha256.5
+usr/share/man/man5/crypt_sunmd5.5
+usr/share/man/man4/crypt.conf.4
+
 
 # recompiled:
 utmp_update usr/lib/
diff --git a/libc/debian/libc1.links b/libc/debian/libc1.links
index 82e3033..b63d240 100644
--- a/libc/debian/libc1.links
+++ b/libc/debian/libc1.links
@@ -3,3 +3,6 @@ lib/x86_64-illumos lib/amd64
 lib/x86_64-illumos lib/64
 usr/lib/x86_64-illumos usr/lib/amd64
 usr/lib/x86_64-illumos usr/lib/64
+
+# crypt() searches in /64
+usr/lib/security/amd64 usr/lib/security/64
diff --git a/libc/debian/libc1.postinst b/libc/debian/libc1.postinst
index d11da52..96dd1a8 100644
--- a/libc/debian/libc1.postinst
+++ b/libc/debian/libc1.postinst
@@ -5,6 +5,16 @@ if [ "$1" = configure ]; then
         echo "Creating default /var/ld/64/ld.config for 64-bit arch"
         cp /usr/lib/ld/64/ld.config /var/ld/64/ld.config
     fi
+
+    cryptconf=/etc/security/crypt.conf
+    if [ ! -e $cryptconf ]; then
+        echo '# see man 4 crypt.conf' > $cryptconf
+        echo '1   crypt_bsdmd5.so.1' >> $cryptconf
+        echo '2a  crypt_bsdbf.so.1'  >> $cryptconf
+        echo 'md5 crypt_sunmd5.so.1' >> $cryptconf
+        echo '5   crypt_sha256.so.1' >> $cryptconf
+        echo '6   crypt_sha512.so.1' >> $cryptconf
+    fi
 fi
 
 #DEBHELPER#