22144611 problem in UTILITY/PIDGIN
authorRich Burridge <rich.burridge@oracle.com>
Tue, 24 Nov 2015 13:24:28 -0800
changeset 5126 d8d0ebb8ed32
parent 5125 34cc580c62c2
child 5127 ef368afc826b
22144611 problem in UTILITY/PIDGIN
components/desktop/pidgin/Makefile
components/desktop/pidgin/patches/pidgin-03-runpath.patch
components/desktop/pidgin/patches/pidgin-19-enable-gnutls.patch
components/desktop/pidgin/pidgin.p5m
--- a/components/desktop/pidgin/Makefile	Mon Nov 23 15:33:43 2015 -0800
+++ b/components/desktop/pidgin/Makefile	Tue Nov 24 13:24:28 2015 -0800
@@ -58,12 +58,14 @@
 # Needed to get libpurple to link properly.
 LIBS += -lresolv
 CONFIGURE_ENV +=	LIBS="$(LIBS)"
+CONFIGURE_ENV +=	PKG_CONFIG_PATH=/usr/lib/pkgconfig/gnutls-3
 
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS +=	--disable-binreloc
-CONFIGURE_OPTIONS +=	--enable-gnutls=no
-CONFIGURE_OPTIONS +=	--with-nss-includes=/usr/include/mps
-CONFIGURE_OPTIONS +=	--with-nss-libs=/usr/lib/mps
+CONFIGURE_OPTIONS +=	--enable-nss=no
+CONFIGURE_OPTIONS +=	--enable-gnutls=yes
+CONFIGURE_OPTIONS +=	--with-gnutls-includes=/usr/include/gnutls-3
+CONFIGURE_OPTIONS +=	--with-gnutls-libs=/usr/lib/gnutls-3
 CONFIGURE_OPTIONS +=	--with-nspr-includes=/usr/include/mps
 CONFIGURE_OPTIONS +=	--with-nspr-libs=/usr/lib/mps
 CONFIGURE_OPTIONS +=	--enable-gnome-keyring
@@ -100,11 +102,11 @@
 REQUIRED_PACKAGES += library/desktop/pango
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/gnome/gnome-keyring
+REQUIRED_PACKAGES += library/gnutls-3
 REQUIRED_PACKAGES += library/libidn
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/nspr
 REQUIRED_PACKAGES += library/python/python-dbus-27
-REQUIRED_PACKAGES += library/security/nss
 REQUIRED_PACKAGES += runtime/perl-512
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += runtime/tcl-8
--- a/components/desktop/pidgin/patches/pidgin-03-runpath.patch	Mon Nov 23 15:33:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-# date:2008-06-02 owner:elaine type:branding
-#
-# These changes should not be submitted upstream.
-
---- pidgin-ori/configure.ac	2008-05-30 12:07:21.986527000 +0800
-+++ pidgin-new/configure.ac	2008-05-30 11:56:25.655174000 +0800
[email protected]@ -1850,7 +1850,7 @@
- 
- 			if test "x$ac_cv_moz_nspr_libs" != "xno"; then
- 				have_nspr_libs="yes"
--				NSPR_LIBS="-L$with_nspr_libs $nsprlibs"
-+				NSPR_LIBS="-L$with_nspr_libs $nsprlibs -R$with_nspr_libs"
- 			else
- 				NSPR_CFLAGS=""
- 				enable_nss="no"
[email protected]@ -1948,7 +1948,7 @@
- 				AC_DEFINE(HAVE_NSS)
- 				AC_DEFINE(HAVE_SSL)
- 
--				NSS_LIBS="-L$with_nss_libs $nsslibs"
-+				NSS_LIBS="-L$with_nss_libs $nsslibs -R$with_nss_libs"
- 
- 				if test "$enable_nss" = "static"; then
- 					msg_nss="Mozilla NSS (static)"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/pidgin/patches/pidgin-19-enable-gnutls.patch	Tue Nov 24 13:24:28 2015 -0800
@@ -0,0 +1,20 @@
+The crypto certs we ship in Solaris are in pkg:/crypto/ca-certificates
+and installed under /etc/certs/CA & /etc/openssl/certs/. The Solaris
+equivalent to the filenames used in this chunk of the configure file
+is /etc/certs/ca-certificates.crt which is generated by
+/lib/svc/method/svc-ca-certificates from the others.
+
+This patch should be sent upstream.
+
+--- pidgin-2.10.11/configure.ac.orig	2015-11-24 06:27:37.749762307 -0800
++++ pidgin-2.10.11/configure.ac	2015-11-24 06:28:34.540905669 -0800
[email protected]@ -1057,7 +1057,8 @@
+ 			/etc/ssl/certs/ca-certificates.crt \
+ 			/etc/pki/tls/cert.pem \
+ 			/usr/local/share/certs/ca-root-nss.crt \
+-			/etc/ssl/cert.pem
++			/etc/ssl/cert.pem \
++			/etc/certs/ca-certificates.crt
+ 		do
+ 			if test -e $i; then
+ 				gg_gnutls_sts="$i"
--- a/components/desktop/pidgin/pidgin.p5m	Mon Nov 23 15:33:43 2015 -0800
+++ b/components/desktop/pidgin/pidgin.p5m	Tue Nov 24 13:24:28 2015 -0800
@@ -228,7 +228,6 @@
 file path=usr/lib/purple-2/libzephyr.so
 file path=usr/lib/purple-2/log_reader.so
 file path=usr/lib/purple-2/newline.so
-file path=usr/lib/purple-2/nss-prefs.so
 file path=usr/lib/purple-2/offlinemsg.so
 file path=usr/lib/purple-2/perl.so
 file path=usr/lib/purple-2/perl/Purple.pm
@@ -237,7 +236,7 @@
 file path=usr/lib/purple-2/perl/auto/Purple/Purple.so
 file path=usr/lib/purple-2/perl/auto/Purple/autosplit.ix
 file path=usr/lib/purple-2/psychic.so
-file path=usr/lib/purple-2/ssl-nss.so
+file path=usr/lib/purple-2/ssl-gnutls.so
 file path=usr/lib/purple-2/ssl.so
 file path=usr/lib/purple-2/statenotify.so
 file path=usr/lib/purple-2/tcl.so