Rename openssl packages

3 files changed, 146 insertions, 148 deletions

diff --git a/openssl1.0.0/openssl-header.p5m b/openssl1.0.0/openssl-header.p5m
deleted file mode 100644
index 92bc9b5..0000000
--- a/openssl1.0.0/openssl-header.p5m
+++ /dev/null
@@ -1,107 +0,0 @@
-set name=pkg.fmri value=pkg:/library/openssl-headers@$(ips-version)
-set name=pkg.summary value="OpenSSL $(version-base) header files"
-set name=info.upstream-url value="$(home)"
-set name=info.source-url value="$(download)"
-
-license $(license-file) license=$(license)
-
-depend fmri=pkg:/library/openssl$(so-version)@$(ips-version) type=require
-depend fmri=pkg:/library/openssl$(so-version)@$(ips-version) type=incorporate
-depend fmri=pkg:/library/openssl0.9.8-headers type=exclude
-
-
-<transform file link path=.*usr/include/openssl.* -> \
-    default original_name library/security/openssl >
-
-dir path=usr
-dir path=usr/include
-
-# Wrapper for 32/64 bits:
-file wrapper-opensslconf.h path=usr/include/openssl/opensslconf.h
-file $(protodir.32)/usr/include/openssl/opensslconf.h path=usr/include/openssl/opensslconf.32.h
-file $(protodir.64)/usr/include/openssl/opensslconf.h path=usr/include/openssl/opensslconf.64.h
-
-dir path=usr/lib/$(mach64)/pkgconfig
-file path=usr/lib/$(mach64)/pkgconfig/libcrypto.pc
-file path=usr/lib/$(mach64)/pkgconfig/libssl.pc
-file path=usr/lib/$(mach64)/pkgconfig/openssl.pc
-
-link path=usr/lib/$(mach64)/libssl.so target=libssl.so.$(so-version)
-link path=usr/lib/$(mach64)/libcrypto.so target=libcrypto.so.$(so-version)
-
-dir path=usr/lib/pkgconfig
-file path=usr/lib/pkgconfig/libcrypto.pc
-file path=usr/lib/pkgconfig/libssl.pc
-file path=usr/lib/pkgconfig/openssl.pc
-
-dir path=usr/include
-dir path=usr/include/openssl
-file path=usr/include/openssl/dsa.h
-file path=usr/include/openssl/ssl.h
-file path=usr/include/openssl/pem2.h
-file path=usr/include/openssl/x509_vfy.h
-file path=usr/include/openssl/conf_api.h
-file path=usr/include/openssl/ui_compat.h
-file path=usr/include/openssl/aes.h
-file path=usr/include/openssl/rand.h
-file path=usr/include/openssl/dh.h
-file path=usr/include/openssl/ripemd.h
-file path=usr/include/openssl/hmac.h
-file path=usr/include/openssl/comp.h
-file path=usr/include/openssl/sha.h
-file path=usr/include/openssl/bio.h
-file path=usr/include/openssl/whrlpool.h
-file path=usr/include/openssl/lhash.h
-file path=usr/include/openssl/des_old.h
-file path=usr/include/openssl/cast.h
-file path=usr/include/openssl/x509v3.h
-file path=usr/include/openssl/ssl2.h
-file path=usr/include/openssl/opensslv.h
-file path=usr/include/openssl/ocsp.h
-file path=usr/include/openssl/cms.h
-file path=usr/include/openssl/md4.h
-file path=usr/include/openssl/safestack.h
-file path=usr/include/openssl/asn1_mac.h
-file path=usr/include/openssl/conf.h
-file path=usr/include/openssl/srp.h
-file path=usr/include/openssl/seed.h
-file path=usr/include/openssl/rc2.h
-file path=usr/include/openssl/ssl23.h
-file path=usr/include/openssl/md5.h
-file path=usr/include/openssl/symhacks.h
-file path=usr/include/openssl/ui.h
-file path=usr/include/openssl/ssl3.h
-file path=usr/include/openssl/pkcs12.h
-file path=usr/include/openssl/srtp.h
-file path=usr/include/openssl/krb5_asn.h
-file path=usr/include/openssl/ebcdic.h
-file path=usr/include/openssl/camellia.h
-file path=usr/include/openssl/cmac.h
-file path=usr/include/openssl/x509.h
-file path=usr/include/openssl/obj_mac.h
-file path=usr/include/openssl/ts.h
-file path=usr/include/openssl/stack.h
-file path=usr/include/openssl/asn1.h
-file path=usr/include/openssl/des.h
-file path=usr/include/openssl/engine.h
-file path=usr/include/openssl/tls1.h
-file path=usr/include/openssl/kssl.h
-file path=usr/include/openssl/blowfish.h
-file path=usr/include/openssl/pqueue.h
-file path=usr/include/openssl/err.h
-file path=usr/include/openssl/crypto.h
-file path=usr/include/openssl/evp.h
-file path=usr/include/openssl/bn.h
-file path=usr/include/openssl/pem.h
-file path=usr/include/openssl/asn1t.h
-file path=usr/include/openssl/objects.h
-file path=usr/include/openssl/rc4.h
-file path=usr/include/openssl/txt_db.h
-file path=usr/include/openssl/modes.h
-file path=usr/include/openssl/dso.h
-file path=usr/include/openssl/dtls1.h
-file path=usr/include/openssl/ossl_typ.h
-file path=usr/include/openssl/rsa.h
-file path=usr/include/openssl/buffer.h
-file path=usr/include/openssl/e_os2.h
-file path=usr/include/openssl/pkcs7.h
diff --git a/openssl1.0.0/openssl.p5m b/openssl1.0.0/openssl.p5m
index 747d1f2..63468fb 100644
--- a/openssl1.0.0/openssl.p5m
+++ b/openssl1.0.0/openssl.p5m
@@ -1,49 +1,105 @@
-set name=pkg.fmri value=pkg:/library/openssl$(so-version)@$(ips-version)
-set name=pkg.summary value="OpenSSL $(version-base) shared libraries"
-set name=pkg.description value="$(description)"
+set name=pkg.fmri value=pkg:/library/openssl@$(ips-version)
+set name=pkg.summary value="OpenSSL $(version-base)"
 set name=info.upstream-url value="$(home)"
 set name=info.source-url value="$(download)"
 
 license $(license-file) license=$(license)
 
-<transform file link path=.*\.so.* -> \
-    default original_name library/security/openssl >
+depend fmri=pkg:/library/openssl$(so-version)@$(ips-version) type=require
+depend fmri=pkg:/library/openssl$(so-version)@$(ips-version) type=incorporate
 
 dir path=usr
-dir path=usr/lib
-dir path=usr/lib/openssl-$(so-version)
-dir path=usr/lib/openssl-$(so-version)/engines
-dir path=usr/lib/openssl-$(so-version)/engines/64
-
-file $(builddir.32)/engines/lib4758cca.so path=usr/lib/openssl-$(so-version)/engines/lib4758cca.so
-file $(builddir.32)/engines/libaep.so path=usr/lib/openssl-$(so-version)/engines/libaep.so
-file $(builddir.32)/engines/libatalla.so path=usr/lib/openssl-$(so-version)/engines/libatalla.so
-file $(builddir.32)/engines/libcapi.so path=usr/lib/openssl-$(so-version)/engines/libcapi.so
-file $(builddir.32)/engines/libchil.so path=usr/lib/openssl-$(so-version)/engines/libchil.so
-file $(builddir.32)/engines/libcswift.so path=usr/lib/openssl-$(so-version)/engines/libcswift.so
-file $(builddir.32)/engines/libdevcrypto.so path=usr/lib/openssl-$(so-version)/engines/libdevcrypto.so
-file $(builddir.32)/engines/libgmp.so path=usr/lib/openssl-$(so-version)/engines/libgmp.so
-file $(builddir.32)/engines/libnuron.so path=usr/lib/openssl-$(so-version)/engines/libnuron.so
-file $(builddir.32)/engines/libpadlock.so path=usr/lib/openssl-$(so-version)/engines/libpadlock.so
-file $(builddir.32)/engines/libsureware.so path=usr/lib/openssl-$(so-version)/engines/libsureware.so
-file $(builddir.32)/engines/libubsec.so path=usr/lib/openssl-$(so-version)/engines/libubsec.so
-
-file path=usr/lib/libssl.so.$(so-version)
-file path=usr/lib/libcrypto.so.$(so-version)
-
-file $(builddir.64)/engines/lib4758cca.so path=usr/lib/openssl-$(so-version)/engines/64/lib4758cca.so
-file $(builddir.64)/engines/libaep.so path=usr/lib/openssl-$(so-version)/engines/64/libaep.so
-file $(builddir.64)/engines/libatalla.so path=usr/lib/openssl-$(so-version)/engines/64/libatalla.so
-file $(builddir.64)/engines/libcapi.so path=usr/lib/openssl-$(so-version)/engines/64/libcapi.so
-file $(builddir.64)/engines/libchil.so path=usr/lib/openssl-$(so-version)/engines/64/libchil.so
-file $(builddir.64)/engines/libcswift.so path=usr/lib/openssl-$(so-version)/engines/64/libcswift.so
-file $(builddir.64)/engines/libdevcrypto.so path=usr/lib/openssl-$(so-version)/engines/64/libdevcrypto.so
-file $(builddir.64)/engines/libgmp.so path=usr/lib/openssl-$(so-version)/engines/64/libgmp.so
-file $(builddir.64)/engines/libnuron.so path=usr/lib/openssl-$(so-version)/engines/64/libnuron.so
-file $(builddir.64)/engines/libpadlock.so path=usr/lib/openssl-$(so-version)/engines/64/libpadlock.so
-file $(builddir.64)/engines/libsureware.so path=usr/lib/openssl-$(so-version)/engines/64/libsureware.so
-file $(builddir.64)/engines/libubsec.so path=usr/lib/openssl-$(so-version)/engines/64/libubsec.so
-
-file path=usr/lib/$(mach64)/libssl.so.$(so-version)
-file path=usr/lib/$(mach64)/libcrypto.so.$(so-version)
+dir path=usr/include
 
+# Wrapper for 32/64 bits:
+file wrapper-opensslconf.h path=usr/include/openssl/opensslconf.h
+file $(protodir.32)/usr/include/openssl/opensslconf.h path=usr/include/openssl/opensslconf.32.h
+file $(protodir.64)/usr/include/openssl/opensslconf.h path=usr/include/openssl/opensslconf.64.h
+
+dir path=usr/lib/$(mach64)/pkgconfig
+file path=usr/lib/$(mach64)/pkgconfig/libcrypto.pc
+file path=usr/lib/$(mach64)/pkgconfig/libssl.pc
+file path=usr/lib/$(mach64)/pkgconfig/openssl.pc
+
+link path=usr/lib/$(mach64)/libssl.so target=libssl.so.$(so-version)
+link path=usr/lib/$(mach64)/libcrypto.so target=libcrypto.so.$(so-version)
+
+link path=usr/lib/libssl.so target=libssl.so.$(so-version)
+link path=usr/lib/libcrypto.so target=libcrypto.so.$(so-version)
+
+dir path=usr/lib/pkgconfig
+file path=usr/lib/pkgconfig/libcrypto.pc
+file path=usr/lib/pkgconfig/libssl.pc
+file path=usr/lib/pkgconfig/openssl.pc
+
+dir path=usr/include
+dir path=usr/include/openssl
+file path=usr/include/openssl/dsa.h
+file path=usr/include/openssl/ssl.h
+file path=usr/include/openssl/pem2.h
+file path=usr/include/openssl/x509_vfy.h
+file path=usr/include/openssl/conf_api.h
+file path=usr/include/openssl/ui_compat.h
+file path=usr/include/openssl/aes.h
+file path=usr/include/openssl/rand.h
+file path=usr/include/openssl/dh.h
+file path=usr/include/openssl/ripemd.h
+file path=usr/include/openssl/hmac.h
+file path=usr/include/openssl/comp.h
+file path=usr/include/openssl/sha.h
+file path=usr/include/openssl/bio.h
+file path=usr/include/openssl/whrlpool.h
+file path=usr/include/openssl/lhash.h
+file path=usr/include/openssl/des_old.h
+file path=usr/include/openssl/cast.h
+file path=usr/include/openssl/x509v3.h
+file path=usr/include/openssl/ssl2.h
+file path=usr/include/openssl/opensslv.h
+file path=usr/include/openssl/ocsp.h
+file path=usr/include/openssl/cms.h
+file path=usr/include/openssl/md4.h
+file path=usr/include/openssl/safestack.h
+file path=usr/include/openssl/asn1_mac.h
+file path=usr/include/openssl/conf.h
+file path=usr/include/openssl/srp.h
+file path=usr/include/openssl/seed.h
+file path=usr/include/openssl/rc2.h
+file path=usr/include/openssl/ssl23.h
+file path=usr/include/openssl/md5.h
+file path=usr/include/openssl/symhacks.h
+file path=usr/include/openssl/ui.h
+file path=usr/include/openssl/ssl3.h
+file path=usr/include/openssl/pkcs12.h
+file path=usr/include/openssl/srtp.h
+file path=usr/include/openssl/krb5_asn.h
+file path=usr/include/openssl/ebcdic.h
+file path=usr/include/openssl/camellia.h
+file path=usr/include/openssl/cmac.h
+file path=usr/include/openssl/x509.h
+file path=usr/include/openssl/obj_mac.h
+file path=usr/include/openssl/ts.h
+file path=usr/include/openssl/stack.h
+file path=usr/include/openssl/asn1.h
+file path=usr/include/openssl/des.h
+file path=usr/include/openssl/engine.h
+file path=usr/include/openssl/tls1.h
+file path=usr/include/openssl/kssl.h
+file path=usr/include/openssl/blowfish.h
+file path=usr/include/openssl/pqueue.h
+file path=usr/include/openssl/err.h
+file path=usr/include/openssl/crypto.h
+file path=usr/include/openssl/evp.h
+file path=usr/include/openssl/bn.h
+file path=usr/include/openssl/pem.h
+file path=usr/include/openssl/asn1t.h
+file path=usr/include/openssl/objects.h
+file path=usr/include/openssl/rc4.h
+file path=usr/include/openssl/txt_db.h
+file path=usr/include/openssl/modes.h
+file path=usr/include/openssl/dso.h
+file path=usr/include/openssl/dtls1.h
+file path=usr/include/openssl/ossl_typ.h
+file path=usr/include/openssl/rsa.h
+file path=usr/include/openssl/buffer.h
+file path=usr/include/openssl/e_os2.h
+file path=usr/include/openssl/pkcs7.h
diff --git a/openssl1.0.0/openssl1.0.0.p5m b/openssl1.0.0/openssl1.0.0.p5m
new file mode 100644
index 0000000..747d1f2
--- /dev/null
+++ b/openssl1.0.0/openssl1.0.0.p5m
@@ -0,0 +1,49 @@
+set name=pkg.fmri value=pkg:/library/openssl$(so-version)@$(ips-version)
+set name=pkg.summary value="OpenSSL $(version-base) shared libraries"
+set name=pkg.description value="$(description)"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license=$(license)
+
+<transform file link path=.*\.so.* -> \
+    default original_name library/security/openssl >
+
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/openssl-$(so-version)
+dir path=usr/lib/openssl-$(so-version)/engines
+dir path=usr/lib/openssl-$(so-version)/engines/64
+
+file $(builddir.32)/engines/lib4758cca.so path=usr/lib/openssl-$(so-version)/engines/lib4758cca.so
+file $(builddir.32)/engines/libaep.so path=usr/lib/openssl-$(so-version)/engines/libaep.so
+file $(builddir.32)/engines/libatalla.so path=usr/lib/openssl-$(so-version)/engines/libatalla.so
+file $(builddir.32)/engines/libcapi.so path=usr/lib/openssl-$(so-version)/engines/libcapi.so
+file $(builddir.32)/engines/libchil.so path=usr/lib/openssl-$(so-version)/engines/libchil.so
+file $(builddir.32)/engines/libcswift.so path=usr/lib/openssl-$(so-version)/engines/libcswift.so
+file $(builddir.32)/engines/libdevcrypto.so path=usr/lib/openssl-$(so-version)/engines/libdevcrypto.so
+file $(builddir.32)/engines/libgmp.so path=usr/lib/openssl-$(so-version)/engines/libgmp.so
+file $(builddir.32)/engines/libnuron.so path=usr/lib/openssl-$(so-version)/engines/libnuron.so
+file $(builddir.32)/engines/libpadlock.so path=usr/lib/openssl-$(so-version)/engines/libpadlock.so
+file $(builddir.32)/engines/libsureware.so path=usr/lib/openssl-$(so-version)/engines/libsureware.so
+file $(builddir.32)/engines/libubsec.so path=usr/lib/openssl-$(so-version)/engines/libubsec.so
+
+file path=usr/lib/libssl.so.$(so-version)
+file path=usr/lib/libcrypto.so.$(so-version)
+
+file $(builddir.64)/engines/lib4758cca.so path=usr/lib/openssl-$(so-version)/engines/64/lib4758cca.so
+file $(builddir.64)/engines/libaep.so path=usr/lib/openssl-$(so-version)/engines/64/libaep.so
+file $(builddir.64)/engines/libatalla.so path=usr/lib/openssl-$(so-version)/engines/64/libatalla.so
+file $(builddir.64)/engines/libcapi.so path=usr/lib/openssl-$(so-version)/engines/64/libcapi.so
+file $(builddir.64)/engines/libchil.so path=usr/lib/openssl-$(so-version)/engines/64/libchil.so
+file $(builddir.64)/engines/libcswift.so path=usr/lib/openssl-$(so-version)/engines/64/libcswift.so
+file $(builddir.64)/engines/libdevcrypto.so path=usr/lib/openssl-$(so-version)/engines/64/libdevcrypto.so
+file $(builddir.64)/engines/libgmp.so path=usr/lib/openssl-$(so-version)/engines/64/libgmp.so
+file $(builddir.64)/engines/libnuron.so path=usr/lib/openssl-$(so-version)/engines/64/libnuron.so
+file $(builddir.64)/engines/libpadlock.so path=usr/lib/openssl-$(so-version)/engines/64/libpadlock.so
+file $(builddir.64)/engines/libsureware.so path=usr/lib/openssl-$(so-version)/engines/64/libsureware.so
+file $(builddir.64)/engines/libubsec.so path=usr/lib/openssl-$(so-version)/engines/64/libubsec.so
+
+file path=usr/lib/$(mach64)/libssl.so.$(so-version)
+file path=usr/lib/$(mach64)/libcrypto.so.$(so-version)
+