Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
24435547 pidgin can't do an AIM connection with GNU TLS enabled
authorRich Burridge <rich.burridge@oracle.com>
Wed, 24 Aug 2016 07:21:53 -0700
changeset 6666 a49ded5becfa
parent 6665 9dbe2f1926b4
child 6667 385591a5a31c
24435547 pidgin can't do an AIM connection with GNU TLS enabled
components/desktop/pidgin/Makefile file | annotate | diff | comparison | revisions
components/desktop/pidgin/pidgin.p5m file | annotate | diff | comparison | revisions 
--- a/components/desktop/pidgin/Makefile	Tue Aug 23 23:04:14 2016 -0700
+++ b/components/desktop/pidgin/Makefile	Wed Aug 24 07:21:53 2016 -0700
@@ -65,17 +65,15 @@
 LIBS += -lresolv
 CONFIGURE_ENV +=	LIBS="$(LIBS)"
 
-# Look for gnutls-3 pkg-config & libraries before the defaults
-PKG_CONFIG_PATH.64 := $(PKG_CONFIG_PATH.64)/gnutls-3:$(PKG_CONFIG_PATH.64)
-LDFLAGS += -L$(USRLIBDIR64)/gnutls-3
-
 CONFIGURE_ENV += "ac_cv_path_perlpath=$(PERL)"
 
 CONFIGURE_OPTIONS +=	--enable-cyrus-sasl
-CONFIGURE_OPTIONS +=	--disable-nss
-CONFIGURE_OPTIONS +=	--enable-gnutls
-CONFIGURE_OPTIONS +=	--with-gnutls-includes=$(USRINCDIR)/gnutls-3
-CONFIGURE_OPTIONS +=	--with-gnutls-libs=$(USRLIBDIR64)/gnutls-3
+CONFIGURE_OPTIONS +=	--enable-nss
+CONFIGURE_OPTIONS +=	--with-nspr-includes=/usr/include/mps
+CONFIGURE_OPTIONS +=	--with-nspr-libs=/usr/lib/mps/64
+CONFIGURE_OPTIONS +=	--with-nss-includes=/usr/include/mps
+CONFIGURE_OPTIONS +=	--with-nss-libs=/usr/lib/mps/64
+CONFIGURE_OPTIONS +=	--disable-gnutls
 CONFIGURE_OPTIONS +=	--enable-gnome-keyring
 CONFIGURE_OPTIONS +=	--disable-gevolution
 CONFIGURE_OPTIONS +=	--enable-cap
@@ -106,11 +104,12 @@
 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/perl-5/xml-parser
 REQUIRED_PACKAGES += library/python/python-dbus-27
+REQUIRED_PACKAGES += library/security/nss
 REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += runtime/tcl-8
--- a/components/desktop/pidgin/pidgin.p5m	Tue Aug 23 23:04:14 2016 -0700
+++ b/components/desktop/pidgin/pidgin.p5m	Wed Aug 24 07:21:53 2016 -0700
@@ -232,6 +232,9 @@
 file path=usr/lib/$(MACH64)/purple-2/libzephyr.so
 file path=usr/lib/$(MACH64)/purple-2/log_reader.so
 file path=usr/lib/$(MACH64)/purple-2/newline.so
+file path=usr/lib/$(MACH64)/purple-2/nss-prefs.so \
+    pkg.depend.bypass-generate=libnspr4.so \
+    pkg.depend.bypass-generate=libssl3.so
 file path=usr/lib/$(MACH64)/purple-2/offlinemsg.so
 file path=usr/lib/$(MACH64)/purple-2/perl.so
 file path=usr/lib/$(MACH64)/purple-2/perl/Purple.pm
@@ -239,7 +242,11 @@
 file path=usr/lib/$(MACH64)/purple-2/perl/auto/Purple/Purple.so
 file path=usr/lib/$(MACH64)/purple-2/perl/auto/Purple/autosplit.ix
 file path=usr/lib/$(MACH64)/purple-2/psychic.so
-file path=usr/lib/$(MACH64)/purple-2/ssl-gnutls.so
+file path=usr/lib/$(MACH64)/purple-2/ssl-nss.so \
+    pkg.depend.bypass-generate=libnspr4.so \
+    pkg.depend.bypass-generate=libnss3.so \
+    pkg.depend.bypass-generate=libsmime3.so \
+    pkg.depend.bypass-generate=libssl3.so
 file path=usr/lib/$(MACH64)/purple-2/ssl.so
 file path=usr/lib/$(MACH64)/purple-2/statenotify.so
 file path=usr/lib/$(MACH64)/purple-2/tcl.so
upstream/oracle/userland-gate