20334187 Upgrade GnuPG to 2.0.26 (fix packaging)
authorStefan Teleman <stefan.teleman@oracle.com>
Tue, 14 Apr 2015 19:15:16 -0700
changeset 4120 d43b2b1dc558
parent 4119 bdf7d6775e82
child 4121 3e66a10136ab
20334187 Upgrade GnuPG to 2.0.26 (fix packaging)
components/libassuan/libassuan.p5m
components/libksba/libksba.p5m
--- a/components/libassuan/libassuan.p5m	Tue Apr 14 16:03:18 2015 -0700
+++ b/components/libassuan/libassuan.p5m	Tue Apr 14 19:15:16 2015 -0700
@@ -21,31 +21,34 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
-set name=pkg.fmri value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GnuPG IPC implementation library"
-set name=pkg.description value="A small library implementing the so-called Assuan protocol, used for interprocess communication between most GnuPG components."
-set name=com.oracle.info.description value="the GnuPG IPC implementation library"
+set name=pkg.description \
+    value="A small library implementing the so-called Assuan protocol, used for interprocess communication between most GnuPG components."
+set name=com.oracle.info.description \
+    value="the GnuPG IPC implementation library"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/397
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-#
 file path=usr/bin/libassuan-config
 file path=usr/include/assuan.h
+#
+link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.5.0
+link path=usr/lib/$(MACH64)/libassuan.so.0 target=libassuan.so.0.5.0
+file path=usr/lib/$(MACH64)/libassuan.so.0.5.0
+#
+link path=usr/lib/libassuan.so target=libassuan.so.0.5.0
+link path=usr/lib/libassuan.so.0 target=libassuan.so.0.5.0
 file path=usr/lib/libassuan.so.0.5.0
-file path=usr/lib/$(MACH64)/libassuan.so.0.5.0
+#
 file path=usr/share/aclocal/libassuan.m4
 file path=usr/share/info/assuan.info
 #
-link path=usr/lib/libassuan.so.0 target=libassuan.so.0.5.0
-link path=usr/lib/libassuan.so target=libassuan.so.0.5.0
-link path=usr/lib/$(MACH64)/libassuan.so.0 target=libassuan.so.0.5.0
-link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.5.0
-#
 license libassuan.license license="GPLv3, LGPLv2"
 
--- a/components/libksba/libksba.p5m	Tue Apr 14 16:03:18 2015 -0700
+++ b/components/libksba/libksba.p5m	Tue Apr 14 19:15:16 2015 -0700
@@ -21,31 +21,32 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
-set name=pkg.fmri value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GnuPG X.509 certificate library"
-set name=pkg.description value="A C library to make the tasks of working with X.509 certificates, CMS data and related objects easier, by encapsulating specific protocol details."
+set name=pkg.description \
+    value="A C library to make the tasks of working with X.509 certificates, CMS data and related objects easier, by encapsulating specific protocol details."
 set name=com.oracle.info.description value="the GnuPG X.509 certificate library"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/397
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-#
 file path=usr/bin/ksba-config
 file path=usr/include/ksba.h
+link path=usr/lib/$(MACH64)/libksba.so target=libksba.so.8.11.3
+link path=usr/lib/$(MACH64)/libksba.so.8 target=libksba.so.8.11.3
+#
+file path=usr/lib/$(MACH64)/libksba.so.8.11.3
+link path=usr/lib/libksba.so target=libksba.so.8.11.3
+link path=usr/lib/libksba.so.8 target=libksba.so.8.11.3
 file path=usr/lib/libksba.so.8.11.3
-file path=usr/lib/$(MACH64)/libksba.so.8.11.3
+#
 file path=usr/share/aclocal/ksba.m4
 file path=usr/share/info/ksba.info
 #
-link path=usr/lib/libksba.so.8 target=libksba.so.8.11.3
-link path=usr/lib/libksba.so target=libksba.so.8.11.3
-link path=usr/lib/$(MACH64)/libksba.so.8 target=libksba.so.8.11.3
-link path=usr/lib/$(MACH64)/libksba.so target=libksba.so.8.11.3
-#
 license libksba.license license="GPLv2 GPLv3 LGPLv3"