July 2018 - Arch-excludes - Fedora Mailing-Lists

Architecture specific change in rpms/libjingle.git

by githook-noreply＠fedoraproject.org

The package rpms/libjingle.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/libjingle.git/commit/?id=1b196d5e.... Change: -ExclusiveArch: %{ix86} x86_64 %{arm} Thanks. Full change: ============ commit 1b196d5e1e17da65ee6d42fabd962aa0288a7788 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Jul 24 13:05:50 2018 -0400 this code is very old, nothing uses it, and it got eaten by webrtc a million years ago diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 70654f5..0000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -libjingle-0.3.12.tar.gz -/libjingle-0.5.1.zip -/libjingle-0.5.2.zip -/libjingle-0.5.8.zip -/libjingle-0.6.0.zip -/libjingle-0.6.6.zip -/libjingle-0.6.10.zip -/libjingle-0.6.14.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..06b94cc --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +this code is very old, nothing uses it, and it got eaten by webrtc a million years ago diff --git a/libjingle-0.3.12-gcc44.patch b/libjingle-0.3.12-gcc44.patch deleted file mode 100644 index 4acc357..0000000 --- a/libjingle-0.3.12-gcc44.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urp libjingle-0.3.12.OLD/talk/base/logging.cc libjingle-0.3.12/talk/base/logging.cc ---- libjingle-0.3.12.OLD/talk/base/logging.cc 2008-09-16 09:55:22.000000000 -0400 -+++ libjingle-0.3.12/talk/base/logging.cc 2009-03-02 14:32:09.000000000 -0500 -@@ -34,6 +34,7 @@ - #include <iostream> - #include <iomanip> - #include <string.h> -+#include <cstdio> - - #include "talk/base/logging.h" - #include "talk/base/stream.h" -diff -urp libjingle-0.3.12.OLD/talk/base/stream.cc libjingle-0.3.12/talk/base/stream.cc ---- libjingle-0.3.12.OLD/talk/base/stream.cc 2008-09-16 09:55:22.000000000 -0400 -+++ libjingle-0.3.12/talk/base/stream.cc 2009-03-02 14:43:48.000000000 -0500 -@@ -30,6 +30,7 @@ - #include <errno.h> - #include <string> - #include <string.h> -+#include <cstdio> - #include "talk/base/basictypes.h" - #include "talk/base/common.h" - #include "talk/base/stream.h" diff --git a/libjingle-0.3.12-openssl.patch b/libjingle-0.3.12-openssl.patch deleted file mode 100644 index 6d97db2..0000000 --- a/libjingle-0.3.12-openssl.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up libjingle-0.3.12/talk/base/openssladapter.cc.openssl libjingle-0.3.12/talk/base/openssladapter.cc ---- libjingle-0.3.12/talk/base/openssladapter.cc.openssl 2008-09-16 15:55:22.000000000 +0200 -+++ libjingle-0.3.12/talk/base/openssladapter.cc 2009-08-25 17:26:25.000000000 +0200 -@@ -641,7 +641,11 @@ OpenSSLAdapter::SSLPostConnectionCheck(S - int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension)); - - if (extension_nid == NID_subject_alt_name) { -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ const X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension); -+#else - X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension); -+#endif - if (!meth) - break; - diff --git a/libjingle-0.5.1-64bittypes.patch b/libjingle-0.5.1-64bittypes.patch deleted file mode 100644 index ffb1dc7..0000000 --- a/libjingle-0.5.1-64bittypes.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up libjingle-0.5.1/talk/base/basictypes.h.64bit libjingle-0.5.1/talk/base/basictypes.h ---- libjingle-0.5.1/talk/base/basictypes.h.64bit 2010-11-22 12:42:33.480425694 -0500 -+++ libjingle-0.5.1/talk/base/basictypes.h 2010-11-22 12:44:51.657425696 -0500 -@@ -43,7 +43,11 @@ - #ifdef COMPILER_MSVC - typedef __int64 int64; - #else -+#if __LP64__ -+typedef long int64; -+#else - typedef long long int64; -+#endif - #endif /* COMPILER_MSVC */ - typedef int int32; - typedef short int16; -@@ -60,8 +64,11 @@ typedef __int64 int64; - #endif - #define INT64_F "I64" - #else -+#if __LP64__ -+typedef unsigned long uint64; -+#else - typedef unsigned long long uint64; --typedef long long int64; -+#endif - #ifndef INT64_C - #define INT64_C(x) x ## LL - #endif diff --git a/libjingle-0.5.1-C-linkage-fix.patch b/libjingle-0.5.1-C-linkage-fix.patch deleted file mode 100644 index cc458c9..0000000 --- a/libjingle-0.5.1-C-linkage-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up libjingle-0.5.1/talk/base/basictypes.h.linkage libjingle-0.5.1/talk/base/basictypes.h ---- libjingle-0.5.1/talk/base/basictypes.h.linkage 2010-11-18 16:20:19.365761996 -0500 -+++ libjingle-0.5.1/talk/base/basictypes.h 2010-11-18 16:20:28.934762001 -0500 -@@ -80,8 +80,10 @@ typedef int socklen_t; - #endif - - namespace talk_base { -+extern "C++" { - template<class T> inline T _min(T a, T b) { return (a > b) ? b : a; } - template<class T> inline T _max(T a, T b) { return (a < b) ? b : a; } -+} - - // For wait functions that take a number of milliseconds, kForever indicates - // unlimited time. diff --git a/libjingle-0.5.1-NULL-fix.patch b/libjingle-0.5.1-NULL-fix.patch deleted file mode 100644 index 005cb18..0000000 --- a/libjingle-0.5.1-NULL-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up libjingle-0.5.1/talk/base/event.cc.NULL libjingle-0.5.1/talk/base/event.cc ---- libjingle-0.5.1/talk/base/event.cc.NULL 2010-11-18 16:02:08.333762000 -0500 -+++ libjingle-0.5.1/talk/base/event.cc 2010-11-18 16:02:17.010762001 -0500 -@@ -26,6 +26,7 @@ - */ - - #include "talk/base/event.h" -+#include <cstdlib> - - #if defined(WIN32) - #include <windows.h> diff --git a/libjingle-0.5.1-build-sanity.patch b/libjingle-0.5.1-build-sanity.patch deleted file mode 100644 index 1ed2b75..0000000 --- a/libjingle-0.5.1-build-sanity.patch +++ /dev/null @@ -1,625 +0,0 @@ -diff -up libjingle-0.5.1/configure.ac.SANITY libjingle-0.5.1/configure.ac ---- libjingle-0.5.1/configure.ac.SANITY 2010-11-19 15:06:35.529492155 -0500 -+++ libjingle-0.5.1/configure.ac 2010-11-19 15:36:17.297431699 -0500 -@@ -0,0 +1,86 @@ -+AC_INIT([libjingle], [0.5.1], [google-talk-open(a)googlegroups.com]) -+AC_CANONICAL_SYSTEM -+AM_CONFIG_HEADER(config.h) -+AM_INIT_AUTOMAKE([dist-zip]) -+AC_PROG_CC -+AC_PROG_CXX -+AM_PROG_LIBTOOL -+LIBTOOL="$LIBTOOL --silent" -+AC_PROG_INSTALL -+AC_DEFINE(PRODUCTION_BUILD, 1, [Build as a production build]) -+AC_DEFINE(PRODUCTION, 1, [Build as a production build]) -+AC_DEFINE(POSIX, 1, [If we're using configure, we're on POSIX]) -+AC_DEFINE(FEATURE_ENABLE_VOICEMAIL, 1, [voice mail]) -+AC_DEFINE(LOGGING, 1, [Logging]) -+ -+LIBJINGLE_MAJORMINOR=0.5 -+AC_SUBST(LIBJINGLE_MAJORMINOR) -+ -+LIBJINGLE_LIBRARY_VERSION=1:0:0 -+AC_SUBST(LIBJINGLE_LIBRARY_VERSION) -+ -+HAVE_EXPAT=no -+AC_CHECK_LIB(expat, XML_ParserCreate, HAVE_EXPAT="yes") -+if test "x$HAVE_EXPAT" = xyes ; then -+ EXPAT_LIBS="-lexpat" -+ AC_SUBST(EXPAT_LIBS) -+else -+ AC_ERROR([Expat is required to build libjingle. You can get it from http://expat.sourceforge.net/]) -+fi -+ -+if test `uname -s` = Linux ; then -+ AC_DEFINE(LINUX, 1, [Building on Linux]) -+ HAVE_ALSA=no -+ AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA="yes") -+ if test "x$HAVE_ALSA" = xyes ; then -+ ALSA_LIBS="-lasound" -+ AC_SUBST(ALSA_LIBS) -+ AC_DEFINE(HAVE_ALSA, 1, [Using ALSA]) -+ else -+ AC_ERROR([libasound is required to build libjingle. You can get it from http://www.alsa-project.org/]) -+ fi -+ -+ AC_CHECK_HEADER(openssl/ssl.h, HAVE_OPENSSL_SSL_H=yes, HAVE_OPENSSL_SSL_H=no) -+ if test x$HAVE_OPENSSL_SSL_H = xyes; then -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 1, [Found openssl/ssl.h]) -+ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7g, HAVE_OPENSSL=yes, HAVE_OPENSSL=no) -+ AC_SUBST(OPENSSL_CFLAGS) -+ AC_SUBST(OPENSSL_LIBS) -+ AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL]) -+ AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled]) -+ CPPFLAGS+="$OPENSSL_CFLAGS" -+ LDFLAGS+="$OPENSSL_LIBS" -+ else -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 0, [Did not find openssl/ssl.h]) -+ fi -+fi -+ -+PKG_CHECK_MODULES(LIBSRTP, libsrtp >= 1.4.4, enable_srtp=yes, enable_srtp=no) -+if test x$enable_srtp = xno ; then -+ HAVE_SRTP=no -+else -+ AC_SUBST(LIBSRTP_CFLAGS) -+ AC_SUBST(LIBSRTP_LIBS) -+ AC_DEFINE(HAVE_SRTP, 1, [libSRTP provides SRTP supprt]) -+fi -+ -+AC_OUTPUT([Makefile -+ talk/Makefile -+ talk/base/Makefile -+ talk/examples/Makefile -+ talk/examples/login/Makefile -+ talk/examples/call/Makefile -+ talk/p2p/Makefile -+ talk/p2p/base/Makefile -+ talk/p2p/client/Makefile -+ talk/session/Makefile -+ talk/session/tunnel/Makefile -+ talk/session/phone/Makefile -+ talk/xmllite/Makefile -+ talk/xmpp/Makefile -+ pkgconfig/Makefile -+ pkgconfig/jinglebase.pc -+ pkgconfig/jinglep2p.pc -+ pkgconfig/jinglesessiontunnel.pc -+ pkgconfig/jinglesessionphone.pc -+ ]) -diff -up libjingle-0.5.1/Makefile.am.SANITY libjingle-0.5.1/Makefile.am ---- libjingle-0.5.1/Makefile.am.SANITY 2010-11-19 15:06:35.529492155 -0500 -+++ libjingle-0.5.1/Makefile.am 2010-11-19 15:06:35.529492155 -0500 -@@ -0,0 +1,4 @@ -+SUBDIRS=talk pkgconfig -+ -+configdir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk -+config_HEADERS = config.h -diff -up libjingle-0.5.1/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglebase.pc.in ---- libjingle-0.5.1/pkgconfig/jinglebase.pc.in.SANITY 2010-11-19 15:06:35.529492155 -0500 -+++ libjingle-0.5.1/pkgconfig/jinglebase.pc.in 2010-11-19 15:06:35.529492155 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglebase -+Description: Jingle Base Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglebase -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.5.1/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglep2p.pc.in ---- libjingle-0.5.1/pkgconfig/jinglep2p.pc.in.SANITY 2010-11-19 15:06:35.529492155 -0500 -+++ libjingle-0.5.1/pkgconfig/jinglep2p.pc.in 2010-11-19 15:06:35.529492155 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglep2p -+Description: Jingle P2P Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -ljinglep2pbase -ljinglep2pclient -ljinglexmllite -ljinglexmpp -lexpat -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in ---- libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in.SANITY 2010-11-19 15:06:35.530514466 -0500 -+++ libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in 2010-11-19 15:06:35.530514466 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessionphone -+Description: Jingle Session Phone Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in ---- libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in.SANITY 2010-11-19 15:06:35.530514466 -0500 -+++ libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in 2010-11-19 15:06:35.530514466 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessiontunnel -+Description: Jingle Session Tunnel Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessiontunnel -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.5.1/pkgconfig/Makefile.am.SANITY libjingle-0.5.1/pkgconfig/Makefile.am ---- libjingle-0.5.1/pkgconfig/Makefile.am.SANITY 2010-11-19 15:06:35.530514466 -0500 -+++ libjingle-0.5.1/pkgconfig/Makefile.am 2010-11-19 15:06:35.530514466 -0500 -@@ -0,0 +1,20 @@ -+### all of the standard pc files we need to generate -+pcfiles = jinglebase-@LIBJINGLE_MAJORMINOR@.pc jinglep2p-@LIBJINGLE_MAJORMINOR@.pc jinglesessiontunnel-@LIBJINGLE_MAJORMINOR@.pc jinglesessionphone-@LIBJINGLE_MAJORMINOR@.pc -+ -+all-local: $(pcfiles) -+ -+### how to generate pc files -+%-@LIBJINGLE_MAJORMINOR@.pc: %.pc -+ cp $< $@ -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = $(pcfiles) -+ -+EXTRA_DIST = \ -+ jinglebase.pc.in \ -+ jinglep2p.pc.in \ -+ jinglesessionphone.pc.in \ -+ jinglesessiontunnel.pc.in -+ -+CLEANFILES = $(pcfiles) -+ -diff -up libjingle-0.5.1/talk/base/Makefile.am.SANITY libjingle-0.5.1/talk/base/Makefile.am ---- libjingle-0.5.1/talk/base/Makefile.am.SANITY 2010-11-19 15:06:35.531284893 -0500 -+++ libjingle-0.5.1/talk/base/Makefile.am 2010-11-19 15:06:35.531284893 -0500 -@@ -0,0 +1,135 @@ -+lib_LTLIBRARIES = libjinglebase.la -+ -+libjinglebase_la_SOURCES = asyncfile.cc \ -+ asynchttprequest.cc \ -+ asyncpacketsocket.cc \ -+ asyncsocket.cc \ -+ asynctcpsocket.cc \ -+ asyncudpsocket.cc \ -+ autodetectproxy.cc \ -+ base64.cc \ -+ bytebuffer.cc \ -+ checks.cc \ -+ common.cc \ -+ diskcache.cc \ -+ event.cc \ -+ fileutils.cc \ -+ firewallsocketserver.cc \ -+ flags.cc \ -+ helpers.cc \ -+ host.cc \ -+ httpbase.cc \ -+ httpclient.cc \ -+ httpcommon.cc \ -+ httprequest.cc \ -+ linux.cc \ -+ logging.cc \ -+ md5c.c \ -+ messagehandler.cc \ -+ messagequeue.cc \ -+ nethelpers.cc \ -+ network.cc \ -+ openssladapter.cc \ -+ opensslidentity.cc \ -+ opensslstreamadapter.cc \ -+ pathutils.cc \ -+ physicalsocketserver.cc \ -+ proxydetect.cc \ -+ proxyinfo.cc \ -+ signalthread.cc \ -+ socketadapters.cc \ -+ socketaddress.cc \ -+ socketaddresspair.cc \ -+ socketpool.cc \ -+ socketstream.cc \ -+ ssladapter.cc \ -+ sslidentity.cc \ -+ sslsocketfactory.cc \ -+ sslstreamadapter.cc \ -+ stream.cc \ -+ stringdigest.cc \ -+ stringencode.cc \ -+ stringutils.cc \ -+ task.cc \ -+ taskparent.cc \ -+ taskrunner.cc \ -+ thread.cc \ -+ time.cc \ -+ unixfilesystem.cc \ -+ urlencode.cc -+ -+libjinglebase_la_LIBADD = -lrt -+ -+libjinglebase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglebase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/base -+ -+libjinglebase_include_HEADERS = asyncfile.h \ -+ asynchttprequest.h \ -+ asyncpacketsocket.h \ -+ asyncsocket.h \ -+ asynctcpsocket.h \ -+ asyncudpsocket.h \ -+ autodetectproxy.h \ -+ base64.h \ -+ basicdefs.h \ -+ basictypes.h \ -+ bytebuffer.h \ -+ byteorder.h \ -+ checks.h \ -+ common.h \ -+ constructormagic.h \ -+ criticalsection.h \ -+ cryptstring.h \ -+ diskcache.h \ -+ event.h \ -+ fileutils.h \ -+ firewallsocketserver.h \ -+ flags.h \ -+ helpers.h \ -+ host.h \ -+ httpbase.h \ -+ httpclient.h \ -+ httpcommon-inl.h \ -+ httpcommon.h \ -+ httprequest.h \ -+ linked_ptr.h \ -+ linux.h \ -+ logging.h \ -+ md5.h \ -+ messagehandler.h \ -+ messagequeue.h \ -+ nethelpers.h \ -+ network.h \ -+ pathutils.h \ -+ physicalsocketserver.h \ -+ proxydetect.h \ -+ proxyinfo.h \ -+ scoped_ptr.h \ -+ sec_buffer.h \ -+ signalthread.h \ -+ sigslot.h \ -+ sigslotrepeater.h \ -+ socket.h \ -+ socketadapters.h \ -+ socketaddress.h \ -+ socketfactory.h \ -+ socketpool.h \ -+ socketserver.h \ -+ socketstream.h \ -+ ssladapter.h \ -+ sslsocketfactory.h \ -+ sslstreamadapter.h \ -+ stream.h \ -+ stringdigest.h \ -+ stringencode.h \ -+ stringutils.h \ -+ task.h \ -+ taskparent.h \ -+ taskrunner.h \ -+ thread.h \ -+ time.h \ -+ unixfilesystem.h \ -+ urlencode.h -+ -+AM_CXXFLAGS = -DPOSIX -diff -up libjingle-0.5.1/talk/examples/call/Makefile.am.SANITY libjingle-0.5.1/talk/examples/call/Makefile.am ---- libjingle-0.5.1/talk/examples/call/Makefile.am.SANITY 2010-11-19 15:06:35.531284893 -0500 -+++ libjingle-0.5.1/talk/examples/call/Makefile.am 2010-11-19 15:06:35.531284893 -0500 -@@ -0,0 +1,23 @@ -+bin_PROGRAMS = call -+call_CXXFLAGS = $(AM_CXXFLAGS) -+call_SOURCES = call_main.cc \ -+ callclient.cc \ -+ console.cc \ -+ discoitemsquerytask.cc \ -+ friendinvitesendtask.cc \ -+ mucinviterecvtask.cc \ -+ mucinvitesendtask.cc \ -+ presenceouttask.cc \ -+ presencepushtask.cc \ -+ voicemailjidrequester.cc -+noinst_HEADERS = callclient.h console.h -+call_LDADD = $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(top_srcdir)/talk/session/phone/libjinglesessionphone.la \ -+ $(top_srcdir)/talk/p2p/client/libjinglep2pclient.la \ -+ $(top_srcdir)/talk/p2p/base/libjinglep2pbase.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) $(ALSA_LIBS) $(LIBSRTP_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.5.1/talk/examples/login/Makefile.am.SANITY libjingle-0.5.1/talk/examples/login/Makefile.am ---- libjingle-0.5.1/talk/examples/login/Makefile.am.SANITY 2010-11-19 15:06:35.531284893 -0500 -+++ libjingle-0.5.1/talk/examples/login/Makefile.am 2010-11-19 15:06:35.531284893 -0500 -@@ -0,0 +1,24 @@ -+noinst_LTLIBRARIES= libxmpphelp.la -+libxmpphelp_la_SOURCES = xmppsocket.cc \ -+ xmppauth.cc \ -+ xmpppump.cc -+ -+noinst_HEADERS = xmppauth.h \ -+ xmpppump.h \ -+ xmppsocket.h \ -+ xmppthread.h \ -+ jingleinfotask.h \ -+ presenceouttask.h \ -+ presencepushtask.h \ -+ status.h -+ -+bin_PROGRAMS = login -+login_CXXFLAGS = $(AM_CXXFLAGS) -+login_SOURCES = login_main.cc xmppthread.cc -+login_LDADD = $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.5.1/talk/examples/Makefile.am.SANITY libjingle-0.5.1/talk/examples/Makefile.am ---- libjingle-0.5.1/talk/examples/Makefile.am.SANITY 2010-11-19 15:06:35.532294141 -0500 -+++ libjingle-0.5.1/talk/examples/Makefile.am 2010-11-19 15:06:35.532294141 -0500 -@@ -0,0 +1 @@ -+SUBDIRS=login call -diff -up libjingle-0.5.1/talk/Makefile.am.SANITY libjingle-0.5.1/talk/Makefile.am ---- libjingle-0.5.1/talk/Makefile.am.SANITY 2010-11-19 15:06:35.532294141 -0500 -+++ libjingle-0.5.1/talk/Makefile.am 2010-11-19 15:06:35.532294141 -0500 -@@ -0,0 +1 @@ -+SUBDIRS=base xmllite xmpp p2p session -diff -up libjingle-0.5.1/talk/p2p/base/Makefile.am.SANITY libjingle-0.5.1/talk/p2p/base/Makefile.am ---- libjingle-0.5.1/talk/p2p/base/Makefile.am.SANITY 2010-11-19 15:06:35.532294141 -0500 -+++ libjingle-0.5.1/talk/p2p/base/Makefile.am 2010-11-19 15:06:35.532294141 -0500 -@@ -0,0 +1,74 @@ -+lib_LTLIBRARIES = libjinglep2pbase.la -+ -+libjinglep2pbase_la_SOURCES = stun.cc \ -+ port.cc \ -+ udpport.cc \ -+ tcpport.cc \ -+ stunport.cc \ -+ relayport.cc \ -+ relayserver.cc \ -+ stunrequest.cc \ -+ stunserver.cc \ -+ sessionmanager.cc \ -+ sessionmessages.cc \ -+ session.cc \ -+ sessiondescription.cc \ -+ transport.cc \ -+ transportchannel.cc \ -+ transportchannelproxy.cc \ -+ p2ptransport.cc \ -+ p2ptransportchannel.cc \ -+ rawtransport.cc \ -+ rawtransportchannel.cc \ -+ constants.cc \ -+ pseudotcp.cc \ -+ parsing.cc -+ -+libjinglep2pbase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/base -+libjinglep2pbase_include_HEADERS = candidate.h \ -+ portallocator.h \ -+ relayport.h \ -+ session.h \ -+ stunport.h \ -+ tcpport.h \ -+ port.h \ -+ sessionid.h \ -+ stunrequest.h \ -+ udpport.h \ -+ pseudotcp.h \ -+ sessiondescription.h \ -+ sessionmanager.h \ -+ stun.h \ -+ relayserver.h \ -+ stunserver.h \ -+ sessionclient.h \ -+ transport.h \ -+ transportchannel.h \ -+ transportchannelproxy.h \ -+ transportchannelimpl.h \ -+ p2ptransport.h \ -+ p2ptransportchannel.h \ -+ rawtransport.h \ -+ rawtransportchannel.h \ -+ constants.h \ -+ common.h \ -+ parsing.h \ -+ sessionmessages.h -+ -+libjinglep2pbase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+libjinglep2pbase_la_LIBADD = $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la -+ -+AM_CPPFLAGS = -DPOSIX -DENABLE_DEBUG -D_DEBUG -g -+ -+P2PLIBS = libjinglep2pbase.la ../../base/libjinglebase.la -lpthread -+XMLLIBS = ../../xmllite/libjinglexmllite.la ../../xmpp/libjinglexmpp.la $(EXPAT_LIBS) -+ -+bin_PROGRAMS = relayserver stunserver -+relayserver_SOURCES = relayserver.cc relayserver_main.cc -+relayserver_LDADD = $(P2PLIBS) -+relayserver_CPPFLAGS = $(AM_CPPFLAGS) -+ -+stunserver_SOURCES = stunserver.cc stunserver_main.cc -+stunserver_LDADD = $(P2PLIBS) -+stunserver_CPPFLAGS = $(AM_CPPFLAGS) -diff -up libjingle-0.5.1/talk/p2p/client/Makefile.am.SANITY libjingle-0.5.1/talk/p2p/client/Makefile.am ---- libjingle-0.5.1/talk/p2p/client/Makefile.am.SANITY 2010-11-19 15:06:35.533290617 -0500 -+++ libjingle-0.5.1/talk/p2p/client/Makefile.am 2010-11-19 15:06:35.533290617 -0500 -@@ -0,0 +1,18 @@ -+lib_LTLIBRARIES = libjinglep2pclient.la -+ -+libjinglep2pclient_la_SOURCES = basicportallocator.cc \ -+ httpportallocator.cc \ -+ socketmonitor.cc -+ -+libjinglep2pclient_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/client -+ -+libjinglep2pclient_include_HEADERS = basicportallocator.h \ -+ socketmonitor.h \ -+ sessionmanagertask.h \ -+ sessionsendtask.h \ -+ httpportallocator.h -+ -+libjinglep2pclient_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD -+ -diff -up libjingle-0.5.1/talk/p2p/Makefile.am.SANITY libjingle-0.5.1/talk/p2p/Makefile.am ---- libjingle-0.5.1/talk/p2p/Makefile.am.SANITY 2010-11-19 15:06:35.533290617 -0500 -+++ libjingle-0.5.1/talk/p2p/Makefile.am 2010-11-19 15:06:35.533290617 -0500 -@@ -0,0 +1 @@ -+SUBDIRS=base client -diff -up libjingle-0.5.1/talk/session/Makefile.am.SANITY libjingle-0.5.1/talk/session/Makefile.am ---- libjingle-0.5.1/talk/session/Makefile.am.SANITY 2010-11-19 15:06:35.533290617 -0500 -+++ libjingle-0.5.1/talk/session/Makefile.am 2010-11-19 15:06:35.533290617 -0500 -@@ -0,0 +1 @@ -+SUBDIRS = tunnel phone -diff -up libjingle-0.5.1/talk/session/phone/Makefile.am.SANITY libjingle-0.5.1/talk/session/phone/Makefile.am ---- libjingle-0.5.1/talk/session/phone/Makefile.am.SANITY 2010-11-19 15:06:35.534284310 -0500 -+++ libjingle-0.5.1/talk/session/phone/Makefile.am 2010-11-19 15:06:35.534284310 -0500 -@@ -0,0 +1,37 @@ -+lib_LTLIBRARIES = libjinglesessionphone.la -+ -+libjinglesessionphone_la_SOURCES = audiomonitor.cc \ -+ channelmanager.cc \ -+ call.cc \ -+ channel.cc \ -+ codec.cc \ -+ devicemanager.cc \ -+ filemediaengine.cc \ -+ mediaengine.cc \ -+ mediamonitor.cc \ -+ mediasessionclient.cc \ -+ rtpdump.cc \ -+ soundclip.cc \ -+ srtpfilter.cc \ -+ v4llookup.cc -+ -+libjinglesessionphone_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/phone -+libjinglesessionphone_include_HEADERS = audiomonitor.h \ -+ channelmanager.h \ -+ mediaengine.h \ -+ voicechannel.h \ -+ call.h \ -+ mediachannel.h \ -+ codec.h \ -+ channel.h \ -+ filemediaengine.h \ -+ mediasessionclient.h \ -+ rtpdump.h \ -+ srtpfilter.h \ -+ videocommon.h -+ -+libjinglesessionphone_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglesessionphone_la_LIBADD = $(LIBSRTP_LIBS) -+ -+AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS) -diff -up libjingle-0.5.1/talk/session/tunnel/Makefile.am.SANITY libjingle-0.5.1/talk/session/tunnel/Makefile.am ---- libjingle-0.5.1/talk/session/tunnel/Makefile.am.SANITY 2010-11-19 15:06:35.534284310 -0500 -+++ libjingle-0.5.1/talk/session/tunnel/Makefile.am 2010-11-19 15:06:35.534284310 -0500 -@@ -0,0 +1,16 @@ -+lib_LTLIBRARIES = libjinglesessiontunnel.la -+ -+libjinglesessiontunnel_la_SOURCES = tunnelsessionclient.cc \ -+ securetunnelsessionclient.cc \ -+ pseudotcpchannel.cc -+ -+libjinglesessiontunnel_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/tunnel -+ -+libjinglesessiontunnel_include_HEADERS = tunnelsessionclient.h \ -+ pseudotcpchannel.h \ -+ securetunnelsessionclient.h -+ -+libjinglesessiontunnel_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CXXFLAGS = -DPOSIX -+ -diff -up libjingle-0.5.1/talk/xmllite/Makefile.am.SANITY libjingle-0.5.1/talk/xmllite/Makefile.am ---- libjingle-0.5.1/talk/xmllite/Makefile.am.SANITY 2010-11-19 15:06:35.534284310 -0500 -+++ libjingle-0.5.1/talk/xmllite/Makefile.am 2010-11-19 15:06:35.534284310 -0500 -@@ -0,0 +1,21 @@ -+lib_LTLIBRARIES = libjinglexmllite.la -+ -+libjinglexmllite_la_SOURCES = qname.cc \ -+ xmlbuilder.cc \ -+ xmlconstants.cc \ -+ xmlelement.cc \ -+ xmlnsstack.cc \ -+ xmlparser.cc \ -+ xmlprinter.cc -+ -+libjinglexmllite_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmllite -+libjinglexmllite_include_HEADERS = qname.h \ -+ xmlbuilder.h \ -+ xmlconstants.h \ -+ xmlelement.h \ -+ xmlnsstack.h \ -+ xmlparser.h \ -+ xmlprinter.h -+AM_CPPFLAGS = -DPOSIX -+ -+libjinglexmllite_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) $(EXPAT_LIBS) -diff -up libjingle-0.5.1/talk/xmpp/Makefile.am.SANITY libjingle-0.5.1/talk/xmpp/Makefile.am ---- libjingle-0.5.1/talk/xmpp/Makefile.am.SANITY 2010-11-19 15:06:35.535286215 -0500 -+++ libjingle-0.5.1/talk/xmpp/Makefile.am 2010-11-19 15:06:35.534284310 -0500 -@@ -0,0 +1,35 @@ -+lib_LTLIBRARIES = libjinglexmpp.la -+ -+libjinglexmpp_la_SOURCES = constants.cc \ -+ jid.cc \ -+ saslmechanism.cc \ -+ xmppclient.cc \ -+ xmppengineimpl.cc \ -+ xmppengineimpl_iq.cc \ -+ xmpplogintask.cc \ -+ xmppstanzaparser.cc \ -+ xmpptask.cc \ -+ ratelimitmanager.cc -+ -+libjinglexmpp_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmpp -+libjinglexmpp_include_HEADERS = asyncsocket.h \ -+ prexmppauth.h \ -+ saslhandler.h \ -+ xmpplogintask.h \ -+ jid.h \ -+ saslmechanism.h \ -+ xmppclient.h \ -+ constants.h \ -+ saslplainmechanism.h \ -+ xmppclientsettings.h \ -+ xmppstanzaparser.h \ -+ xmppengine.h \ -+ xmpptask.h \ -+ plainsaslhandler.h \ -+ saslcookiemechanism.h \ -+ xmppengineimpl.h \ -+ ratelimitmanager.h -+ -+libjinglexmpp_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -DPOSIX diff --git a/libjingle-0.5.1-config-linux.patch b/libjingle-0.5.1-config-linux.patch deleted file mode 100644 index 61bc71c..0000000 --- a/libjingle-0.5.1-config-linux.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up libjingle-0.5.1/talk/base/linux.cc.config libjingle-0.5.1/talk/base/linux.cc ---- libjingle-0.5.1/talk/base/linux.cc.config 2011-01-13 11:49:11.524655003 -0500 -+++ libjingle-0.5.1/talk/base/linux.cc 2011-01-13 11:49:22.421655008 -0500 -@@ -1,10 +1,9 @@ - // Copyright 2008 Google Inc. All Rights Reserved. - - // -- --#ifdef LINUX - #include "talk/base/linux.h" - -+#ifdef LINUX - #include <errno.h> - #include <sys/utsname.h> - -diff -up libjingle-0.5.1/talk/base/linux.h.config libjingle-0.5.1/talk/base/linux.h ---- libjingle-0.5.1/talk/base/linux.h.config 2010-11-08 18:01:43.000000000 -0500 -+++ libjingle-0.5.1/talk/base/linux.h 2011-01-13 11:39:45.990654999 -0500 -@@ -4,6 +4,8 @@ - #ifndef TALK_BASE_LINUX_H_ - #define TALK_BASE_LINUX_H_ - -+#include "config.h" -+ - #ifdef LINUX - #include <string> - #include <map> diff --git a/libjingle-0.5.1-devicemanager-alsafix.patch b/libjingle-0.5.1-devicemanager-alsafix.patch deleted file mode 100644 index a2e5e7b..0000000 --- a/libjingle-0.5.1-devicemanager-alsafix.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up libjingle-0.5.1/talk/session/phone/devicemanager.cc.alsa libjingle-0.5.1/talk/session/phone/devicemanager.cc ---- libjingle-0.5.1/talk/session/phone/devicemanager.cc.alsa 2010-11-19 12:26:06.864967001 -0500 -+++ libjingle-0.5.1/talk/session/phone/devicemanager.cc 2010-11-19 12:30:59.090967002 -0500 -@@ -25,7 +25,7 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/session/phone/devicemanager.h" -+#include "config.h" - - #if WIN32 - #include <atlbase.h> -@@ -44,9 +44,7 @@ - #include <QuickTime/QuickTime.h> - #elif LINUX - #include <unistd.h> --#ifndef USE_TALK_SOUND - #include <alsa/asoundlib.h> --#endif - #include "talk/base/linux.h" - #include "talk/base/fileutils.h" - #include "talk/base/pathutils.h" -@@ -54,6 +52,7 @@ - #include "talk/session/phone/v4llookup.h" - #endif - -+#include "talk/session/phone/devicemanager.h" - #include "talk/base/logging.h" - #include "talk/base/stringutils.h" - #include "talk/session/phone/mediaengine.h" diff --git a/libjingle-0.5.1-fixconflict.patch b/libjingle-0.5.1-fixconflict.patch deleted file mode 100644 index 4f98ac5..0000000 --- a/libjingle-0.5.1-fixconflict.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -up libjingle-0.5.1/talk/base/basictypes.h.fixconflict libjingle-0.5.1/talk/base/basictypes.h ---- libjingle-0.5.1/talk/base/basictypes.h.fixconflict 2010-11-19 15:36:43.354419670 -0500 -+++ libjingle-0.5.1/talk/base/basictypes.h 2010-11-19 15:36:43.605296985 -0500 -@@ -47,7 +47,7 @@ typedef long long int64; - #endif /* COMPILER_MSVC */ - typedef int int32; - typedef short int16; --typedef char int8; -+typedef signed char int8; - - #ifdef COMPILER_MSVC - typedef unsigned __int64 uint64; -diff -up libjingle-0.5.1/talk/base/constructormagic.h.fixconflict libjingle-0.5.1/talk/base/constructormagic.h ---- libjingle-0.5.1/talk/base/constructormagic.h.fixconflict 2010-11-08 18:01:43.000000000 -0500 -+++ libjingle-0.5.1/talk/base/constructormagic.h 2010-11-19 15:44:19.512176912 -0500 -@@ -28,14 +28,11 @@ - #ifndef TALK_BASE_CONSTRUCTORMAGIC_H_ - #define TALK_BASE_CONSTRUCTORMAGIC_H_ - --#define DISALLOW_ASSIGN(TypeName) \ -- void operator=(const TypeName&) -- - // A macro to disallow the evil copy constructor and operator= functions - // This should be used in the private: declarations for a class - #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName&); \ -- DISALLOW_ASSIGN(TypeName) -+ void operator=(const TypeName&) - - // Alternative, less-accurate legacy name. - #define DISALLOW_EVIL_CONSTRUCTORS(TypeName) \ -@@ -49,7 +46,7 @@ - // especially useful for classes containing only static methods. - #define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ - TypeName(); \ -- DISALLOW_EVIL_CONSTRUCTORS(TypeName) -+ DISALLOW_COPY_AND_ASSIGN(TypeName) - - - #endif // TALK_BASE_CONSTRUCTORMAGIC_H_ diff --git a/libjingle-0.5.1-qname-threadsafe.patch b/libjingle-0.5.1-qname-threadsafe.patch deleted file mode 100644 index 066e430..0000000 --- a/libjingle-0.5.1-qname-threadsafe.patch +++ /dev/null @@ -1,284 +0,0 @@ -diff -up libjingle-0.5.1/talk/xmllite/qname.cc.threadsafe libjingle-0.5.1/talk/xmllite/qname.cc ---- libjingle-0.5.1/talk/xmllite/qname.cc.threadsafe 2010-11-08 18:01:44.000000000 -0500 -+++ libjingle-0.5.1/talk/xmllite/qname.cc 2010-12-03 06:52:54.000000000 -0500 -@@ -1,112 +1,23 @@ --/* -- * libjingle -- * Copyright 2004--2005, Google Inc. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions are met: -- * -- * 1. Redistributions of source code must retain the above copyright notice, -- * this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright notice, -- * this list of conditions and the following disclaimer in the documentation -- * and/or other materials provided with the distribution. -- * 3. The name of the author may not be used to endorse or promote products -- * derived from this software without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -+// Copyright (c) 2010 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#include "talk/xmllite/qname.h" - --#include <string> - #include "talk/base/common.h" - #include "talk/xmllite/xmlelement.h" --#include "talk/xmllite/qname.h" - #include "talk/xmllite/xmlconstants.h" - - namespace buzz { - --static int QName_Hash(const std::string & ns, const char * local) { -- int result = static_cast<int>(ns.size()) * 101; -- while (*local) { -- result *= 19; -- result += *local; -- local += 1; -- } -- return result; --} -- --static const int bits = 9; --static QName::Data * get_qname_table() { -- static QName::Data qname_table[1 << bits]; -- return qname_table; --} -- --static QName::Data * --AllocateOrFind(const std::string & ns, const char * local) { -- int index = QName_Hash(ns, local); -- int increment = index >> (bits - 1) | 1; -- QName::Data * qname_table = get_qname_table(); -- for (;;) { -- index &= ((1 << bits) - 1); -- if (!qname_table[index].Occupied()) { -- return new QName::Data(ns, local); -- } -- if (qname_table[index].localPart_ == local && -- qname_table[index].namespace_ == ns) { -- qname_table[index].AddRef(); -- return qname_table + index; -- } -- index += increment; -- } --} -- --static QName::Data * --Add(const std::string & ns, const char * local) { -- int index = QName_Hash(ns, local); -- int increment = index >> (bits - 1) | 1; -- QName::Data * qname_table = get_qname_table(); -- for (;;) { -- index &= ((1 << bits) - 1); -- if (!qname_table[index].Occupied()) { -- qname_table[index].namespace_ = ns; -- qname_table[index].localPart_ = local; -- qname_table[index].AddRef(); // AddRef twice so it's never deleted -- qname_table[index].AddRef(); -- return qname_table + index; -- } -- if (qname_table[index].localPart_ == local && -- qname_table[index].namespace_ == ns) { -- qname_table[index].AddRef(); -- return qname_table + index; -- } -- index += increment; -- } --} -- --QName::~QName() { -- data_->Release(); --} -- --QName::QName() : data_(QN_EMPTY.data_) { -- data_->AddRef(); --} -+QName::QName() : namespace_(QN_EMPTY.namespace_), -+ local_part_(QN_EMPTY.local_part_) {} - --QName::QName(bool add, const std::string & ns, const char * local) : -- data_(add ? Add(ns, local) : AllocateOrFind(ns, local)) {} -+QName::QName(const std::string & ns, const std::string & local) : -+ namespace_(ns), local_part_(local) {} - - QName::QName(bool add, const std::string & ns, const std::string & local) : -- data_(add ? Add(ns, local.c_str()) : AllocateOrFind(ns, local.c_str())) {} -- --QName::QName(const std::string & ns, const char * local) : -- data_(AllocateOrFind(ns, local)) {} -+ namespace_(ns), local_part_(local) {} - - static std::string - QName_LocalPart(const std::string & name) { -@@ -125,38 +36,30 @@ QName_Namespace(const std::string & name - } - - QName::QName(const std::string & mergedOrLocal) : -- data_(AllocateOrFind(QName_Namespace(mergedOrLocal), -- QName_LocalPart(mergedOrLocal).c_str())) {} -+ namespace_(QName_Namespace(mergedOrLocal)), -+ local_part_(QName_LocalPart(mergedOrLocal)) {} - - std::string - QName::Merged() const { -- if (data_->namespace_ == STR_EMPTY) -- return data_->localPart_; -- -- std::string result(data_->namespace_); -- result.reserve(result.length() + 1 + data_->localPart_.length()); -- result += ':'; -- result += data_->localPart_; -- return result; -+ if (namespace_ == STR_EMPTY) -+ return local_part_; -+ return namespace_ + ':' + local_part_; - } - - bool - QName::operator==(const QName & other) const { -- return other.data_ == data_ || -- (data_->localPart_ == other.data_->localPart_ && -- data_->namespace_ == other.data_->namespace_); -+ return -+ local_part_ == other.local_part_ && -+ namespace_ == other.namespace_; - } - - int - QName::Compare(const QName & other) const { -- if (data_ == other.data_) -- return 0; -- -- int result = data_->localPart_.compare(other.data_->localPart_); -+ int result = local_part_.compare(other.local_part_); - if (result) - return result; - -- return data_->namespace_.compare(other.data_->namespace_); -+ return namespace_.compare(other.namespace_); - } - --} -+} // namespace buzz -diff -up libjingle-0.5.1/talk/xmllite/qname.h.threadsafe libjingle-0.5.1/talk/xmllite/qname.h ---- libjingle-0.5.1/talk/xmllite/qname.h.threadsafe 2010-11-08 18:01:44.000000000 -0500 -+++ libjingle-0.5.1/talk/xmllite/qname.h 2010-12-10 15:28:15.644708848 -0500 -@@ -1,87 +1,37 @@ --/* -- * libjingle -- * Copyright 2004--2005, Google Inc. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions are met: -- * -- * 1. Redistributions of source code must retain the above copyright notice, -- * this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright notice, -- * this list of conditions and the following disclaimer in the documentation -- * and/or other materials provided with the distribution. -- * 3. The name of the author may not be used to endorse or promote products -- * derived from this software without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -+// Copyright (c) 2010 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. - --#ifndef _qname_h_ --#define _qname_h_ -+#ifndef TALK_XMLLITE_QNAME_H_ -+#define TALK_XMLLITE_QNAME_H_ - - #include <string> - - namespace buzz { - -- -+// Default libjingle's implementation of QName class is not threadsafe. This -+// one is. - class QName - { - public: -- explicit QName(); -- QName(const QName & qname) : data_(qname.data_) { data_->AddRef(); } -- explicit QName(bool add, const std::string & ns, const char * local); -- explicit QName(bool add, const std::string & ns, const std::string & local); -- explicit QName(const std::string & ns, const char * local); -+ QName(); -+ QName(const std::string & ns, const std::string & local); -+ QName(bool add, const std::string & ns, const std::string & local); - explicit QName(const std::string & mergedOrLocal); -- QName & operator=(const QName & qn) { -- qn.data_->AddRef(); -- data_->Release(); -- data_ = qn.data_; -- return *this; -- } -- ~QName(); -- -- const std::string & Namespace() const { return data_->namespace_; } -- const std::string & LocalPart() const { return data_->localPart_; } -+ -+ const std::string & Namespace() const { return namespace_; } -+ const std::string & LocalPart() const { return local_part_; } - std::string Merged() const; - int Compare(const QName & other) const; - bool operator==(const QName & other) const; - bool operator!=(const QName & other) const { return !operator==(other); } - bool operator<(const QName & other) const { return Compare(other) < 0; } -- -- class Data { -- public: -- Data(const std::string & ns, const std::string & local) : -- namespace_(ns), -- localPart_(local), -- refcount_(1) {} -- -- Data() : refcount_(0) {} -- -- std::string namespace_; -- std::string localPart_; -- void AddRef() { refcount_++; } -- void Release() { if (!--refcount_) { delete this; } } -- bool Occupied() { return !!refcount_; } -- -- private: -- int refcount_; -- }; - - private: -- Data * data_; -+ std::string namespace_; -+ std::string local_part_; - }; - -+} // namespace buzz - --} -- --#endif -+#endif // TALK_XMLLITE_QNAME_H_ diff --git a/libjingle-0.5.1-statfix.patch b/libjingle-0.5.1-statfix.patch deleted file mode 100644 index b6b64af..0000000 --- a/libjingle-0.5.1-statfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up libjingle-0.5.1/talk/base/physicalsocketserver.cc.statfix libjingle-0.5.1/talk/base/physicalsocketserver.cc ---- libjingle-0.5.1/talk/base/physicalsocketserver.cc.statfix 2010-11-18 16:25:20.475761998 -0500 -+++ libjingle-0.5.1/talk/base/physicalsocketserver.cc 2010-11-18 16:26:37.294762015 -0500 -@@ -34,6 +34,7 @@ - #ifdef POSIX - #include <string.h> - #include <errno.h> -+#include <time.h> - #include <fcntl.h> - #include <sys/time.h> - #include <unistd.h> -diff -up libjingle-0.5.1/talk/base/stream.cc.statfix libjingle-0.5.1/talk/base/stream.cc ---- libjingle-0.5.1/talk/base/stream.cc.statfix 2010-11-18 16:27:09.870761999 -0500 -+++ libjingle-0.5.1/talk/base/stream.cc 2010-11-18 16:27:43.842762002 -0500 -@@ -26,6 +26,7 @@ - */ - - #if defined(POSIX) -+#include <time.h> - #include <sys/file.h> - #endif // POSIX - #include <sys/types.h> diff --git a/libjingle-0.5.1-system-expat.patch b/libjingle-0.5.1-system-expat.patch deleted file mode 100644 index ee79a8a..0000000 --- a/libjingle-0.5.1-system-expat.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up libjingle-0.5.1/talk/xmllite/xmlbuilder.cc.system-expat libjingle-0.5.1/talk/xmllite/xmlbuilder.cc ---- libjingle-0.5.1/talk/xmllite/xmlbuilder.cc.system-expat 2010-11-19 11:05:16.419967001 -0500 -+++ libjingle-0.5.1/talk/xmllite/xmlbuilder.cc 2010-11-19 11:05:28.161967001 -0500 -@@ -33,7 +33,7 @@ - #ifdef EXPAT_RELATIVE_PATH - #include "lib/expat.h" - #else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" -+#include <expat.h> - #endif // EXPAT_RELATIVE_PATH - - namespace buzz { -diff -up libjingle-0.5.1/talk/xmllite/xmlbuilder.h.system-expat libjingle-0.5.1/talk/xmllite/xmlbuilder.h ---- libjingle-0.5.1/talk/xmllite/xmlbuilder.h.system-expat 2010-11-19 11:04:49.214967000 -0500 -+++ libjingle-0.5.1/talk/xmllite/xmlbuilder.h 2010-11-19 11:05:05.753967002 -0500 -@@ -36,7 +36,7 @@ - #ifdef EXPAT_RELATIVE_PATH - #include "lib/expat.h" - #else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" -+#include <expat.h> - #endif // EXPAT_RELATIVE_PATH - - namespace buzz { -diff -up libjingle-0.5.1/talk/xmllite/xmlparser.cc.system-expat libjingle-0.5.1/talk/xmllite/xmlparser.cc ---- libjingle-0.5.1/talk/xmllite/xmlparser.cc.system-expat 2010-11-19 11:05:55.471967002 -0500 -+++ libjingle-0.5.1/talk/xmllite/xmlparser.cc 2010-11-19 11:06:07.578967000 -0500 -@@ -38,7 +38,7 @@ - #ifdef EXPAT_RELATIVE_PATH - #include "lib/expat.h" - #else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" -+#include <expat.h> - #endif // EXPAT_RELATIVE_PATH - - namespace buzz { -diff -up libjingle-0.5.1/talk/xmllite/xmlparser.h.system-expat libjingle-0.5.1/talk/xmllite/xmlparser.h ---- libjingle-0.5.1/talk/xmllite/xmlparser.h.system-expat 2010-11-19 11:05:38.778967001 -0500 -+++ libjingle-0.5.1/talk/xmllite/xmlparser.h 2010-11-19 11:05:50.330967001 -0500 -@@ -34,7 +34,7 @@ - #ifdef EXPAT_RELATIVE_PATH - #include "lib/expat.h" - #else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" -+#include <expat.h> - #endif // EXPAT_RELATIVE_PATH - - struct XML_ParserStruct; -diff -up libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc.system-expat libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc ---- libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc.system-expat 2010-11-19 11:06:25.677966995 -0500 -+++ libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc 2010-11-19 11:06:37.048967002 -0500 -@@ -32,7 +32,7 @@ - #ifdef EXPAT_RELATIVE_PATH - #include "lib/expat.h" - #else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" -+#include <expat.h> - #endif - - namespace buzz { diff --git a/libjingle-0.5.1-system-srtp.patch b/libjingle-0.5.1-system-srtp.patch deleted file mode 100644 index 57c85a1..0000000 --- a/libjingle-0.5.1-system-srtp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libjingle-0.5.1/talk/session/phone/srtpfilter.cc.system-srtp libjingle-0.5.1/talk/session/phone/srtpfilter.cc ---- libjingle-0.5.1/talk/session/phone/srtpfilter.cc.system-srtp 2010-11-19 11:09:50.271967001 -0500 -+++ libjingle-0.5.1/talk/session/phone/srtpfilter.cc 2010-11-19 11:10:10.295966994 -0500 -@@ -47,7 +47,7 @@ - #ifdef SRTP_RELATIVE_PATH - #include "srtp.h" // NOLINT - #else --#include "third_party/libsrtp/include/srtp.h" -+#include <srtp.h> - #endif // SRTP_RELATIVE_PATH - #ifdef _DEBUG - extern "C" debug_module_t mod_srtp; diff --git a/libjingle-0.5.1-timefix.patch b/libjingle-0.5.1-timefix.patch deleted file mode 100644 index acda956..0000000 --- a/libjingle-0.5.1-timefix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up libjingle-0.5.1/talk/base/thread.cc.timefix libjingle-0.5.1/talk/base/thread.cc ---- libjingle-0.5.1/talk/base/thread.cc.timefix 2010-11-19 10:53:41.509966999 -0500 -+++ libjingle-0.5.1/talk/base/thread.cc 2010-11-19 10:53:51.317967002 -0500 -@@ -25,14 +25,13 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/base/thread.h" -- - #if defined(WIN32) - #include <comdef.h> - #elif defined(POSIX) - #include <time.h> - #endif - -+#include "talk/base/thread.h" - #include "talk/base/common.h" - #include "talk/base/logging.h" - #include "talk/base/stringutils.h" diff --git a/libjingle-0.5.1-uint32-fix.patch b/libjingle-0.5.1-uint32-fix.patch deleted file mode 100644 index 642c1f2..0000000 --- a/libjingle-0.5.1-uint32-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libjingle-0.5.1/talk/base/md5.h.uint32 libjingle-0.5.1/talk/base/md5.h ---- libjingle-0.5.1/talk/base/md5.h.uint32 2010-11-18 16:31:58.492762006 -0500 -+++ libjingle-0.5.1/talk/base/md5.h 2010-11-18 16:32:06.322761999 -0500 -@@ -22,7 +22,7 @@ - extern "C" { - #endif - --typedef long unsigned int uint32; -+typedef unsigned int uint32; - typedef struct MD5Context MD5_CTX; - - #define md5byte unsigned char diff --git a/libjingle-0.5.1-unixfilesystemfix.patch b/libjingle-0.5.1-unixfilesystemfix.patch deleted file mode 100644 index 8823f62..0000000 --- a/libjingle-0.5.1-unixfilesystemfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up libjingle-0.5.1/talk/base/unixfilesystem.cc.missingheader libjingle-0.5.1/talk/base/unixfilesystem.cc ---- libjingle-0.5.1/talk/base/unixfilesystem.cc.missingheader 2010-11-19 10:59:11.465967001 -0500 -+++ libjingle-0.5.1/talk/base/unixfilesystem.cc 2010-11-19 11:02:12.027967004 -0500 -@@ -25,9 +25,8 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/base/unixfilesystem.h" -- - #include <errno.h> -+#include <time.h> - #include <fcntl.h> - #include <stdlib.h> - #include <unistd.h> -@@ -56,6 +55,7 @@ - #include <algorithm> - #endif - -+#include "talk/base/unixfilesystem.h" - #include "talk/base/fileutils.h" - #include "talk/base/pathutils.h" - #include "talk/base/stream.h" diff --git a/libjingle-0.5.1-v4llookup-fix.patch b/libjingle-0.5.1-v4llookup-fix.patch deleted file mode 100644 index 026248f..0000000 --- a/libjingle-0.5.1-v4llookup-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up libjingle-0.5.1/talk/session/phone/v4llookup.cc.v4lfix libjingle-0.5.1/talk/session/phone/v4llookup.cc ---- libjingle-0.5.1/talk/session/phone/v4llookup.cc.v4lfix 2010-11-19 12:37:12.153967002 -0500 -+++ libjingle-0.5.1/talk/session/phone/v4llookup.cc 2010-11-19 12:38:47.910967002 -0500 -@@ -6,7 +6,8 @@ - * The functionality is implemented as a class with virtual methods for - * the purpose of unit testing. - */ --#include "talk/session/phone/v4llookup.h" -+ -+#include "config.h" - - #include <errno.h> - #include <fcntl.h> -@@ -18,6 +19,7 @@ - - #include <cstring> - -+#include "talk/session/phone/v4llookup.h" - #include "talk/base/logging.h" - - namespace cricket { diff --git a/libjingle-0.5.2-NULL-fix.patch b/libjingle-0.5.2-NULL-fix.patch deleted file mode 100644 index a397a7f..0000000 --- a/libjingle-0.5.2-NULL-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -upN libjingle-0.5.2/talk/base/event.cc.NULL libjingle-0.5.2/talk/base/event.cc ---- libjingle-0.5.2/talk/base/event.cc.NULL 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/event.cc 2011-04-01 08:11:07.676149003 -0400 -@@ -26,6 +26,7 @@ - */ - - #include "talk/base/event.h" -+#include <cstdlib> - - #if defined(WIN32) - #include <windows.h> -diff -upN libjingle-0.5.2/talk/base/sigslot.h.NULL libjingle-0.5.2/talk/base/sigslot.h ---- libjingle-0.5.2/talk/base/sigslot.h.NULL 2011-04-01 08:12:00.723149003 -0400 -+++ libjingle-0.5.2/talk/base/sigslot.h 2011-04-01 08:12:09.470149096 -0400 -@@ -80,6 +80,7 @@ - - #include <set> - #include <list> -+#include <cstdlib> - - // On our copy of sigslot.h, we force single threading - #define SIGSLOT_PURE_ISO diff --git a/libjingle-0.5.2-chromium12-changes.patch b/libjingle-0.5.2-chromium12-changes.patch deleted file mode 100644 index a888023..0000000 --- a/libjingle-0.5.2-chromium12-changes.patch +++ /dev/null @@ -1,6829 +0,0 @@ -diff -upN libjingle-0.5.2/talk/base/asyncpacketsocket.cc.chromium12 libjingle-0.5.2/talk/base/asyncpacketsocket.cc ---- libjingle-0.5.2/talk/base/asyncpacketsocket.cc.chromium12 2011-01-11 19:25:48.000000000 -0500 -+++ libjingle-0.5.2/talk/base/asyncpacketsocket.cc 1969-12-31 19:00:00.000000000 -0500 -@@ -1,92 +0,0 @@ --/* -- * libjingle -- * Copyright 2004--2005, Google Inc. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions are met: -- * -- * 1. Redistributions of source code must retain the above copyright notice, -- * this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright notice, -- * this list of conditions and the following disclaimer in the documentation -- * and/or other materials provided with the distribution. -- * 3. The name of the author may not be used to endorse or promote products -- * derived from this software without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -- --#if defined(_MSC_VER) && _MSC_VER < 1300 --#pragma warning(disable:4786) --#endif -- --#include "talk/base/asyncpacketsocket.h" -- --namespace talk_base { -- --AsyncPacketSocket::AsyncPacketSocket(AsyncSocket* socket) : socket_(socket) { --} -- --AsyncPacketSocket::~AsyncPacketSocket() { -- delete socket_; --} -- --SocketAddress AsyncPacketSocket::GetLocalAddress() const { -- return socket_->GetLocalAddress(); --} -- --SocketAddress AsyncPacketSocket::GetRemoteAddress() const { -- return socket_->GetRemoteAddress(); --} -- --int AsyncPacketSocket::Bind(const SocketAddress& addr) { -- return socket_->Bind(addr); --} -- --int AsyncPacketSocket::Connect(const SocketAddress& addr) { -- return socket_->Connect(addr); --} -- --int AsyncPacketSocket::Send(const void *pv, size_t cb) { -- return socket_->Send(pv, cb); --} -- --int AsyncPacketSocket::SendTo( -- const void *pv, size_t cb, const SocketAddress& addr) { -- return socket_->SendTo(pv, cb, addr); --} -- --int AsyncPacketSocket::Close() { -- return socket_->Close(); --} -- --Socket::ConnState AsyncPacketSocket::GetState() const { -- return socket_->GetState(); --} -- --int AsyncPacketSocket::GetOption(Socket::Option opt, int* value) { -- return socket_->GetOption(opt, value); --} -- --int AsyncPacketSocket::SetOption(Socket::Option opt, int value) { -- return socket_->SetOption(opt, value); --} -- --int AsyncPacketSocket::GetError() const { -- return socket_->GetError(); --} -- --void AsyncPacketSocket::SetError(int error) { -- return socket_->SetError(error); --} -- --} // namespace talk_base -diff -upN libjingle-0.5.2/talk/base/asyncpacketsocket.h.chromium12 libjingle-0.5.2/talk/base/asyncpacketsocket.h ---- libjingle-0.5.2/talk/base/asyncpacketsocket.h.chromium12 2011-01-11 19:25:48.000000000 -0500 -+++ libjingle-0.5.2/talk/base/asyncpacketsocket.h 2011-03-30 21:51:32.694287001 -0400 -@@ -28,38 +28,61 @@ - #ifndef TALK_BASE_ASYNCPACKETSOCKET_H_ - #define TALK_BASE_ASYNCPACKETSOCKET_H_ - --#include "talk/base/asyncsocket.h" -+#include "talk/base/sigslot.h" -+#include "talk/base/socket.h" - - namespace talk_base { - --// Provides the ability to receive packets asynchronously. Sends are not -+// Provides the ability to receive packets asynchronously. Sends are not - // buffered since it is acceptable to drop packets under high load. - class AsyncPacketSocket : public sigslot::has_slots<> { - public: -- explicit AsyncPacketSocket(AsyncSocket* socket); -- virtual ~AsyncPacketSocket(); -+ AsyncPacketSocket() { } -+ virtual ~AsyncPacketSocket() { } - -- // Relevant socket methods: -- virtual SocketAddress GetLocalAddress() const; -- virtual SocketAddress GetRemoteAddress() const; -- virtual int Bind(const SocketAddress& addr); -- virtual int Connect(const SocketAddress& addr); -- virtual int Send(const void *pv, size_t cb); -- virtual int SendTo(const void *pv, size_t cb, const SocketAddress& addr); -- virtual int Close(); -- -- virtual Socket::ConnState GetState() const; -- virtual int GetOption(Socket::Option opt, int* value); -- virtual int SetOption(Socket::Option opt, int value); -- virtual int GetError() const; -- virtual void SetError(int error); -- -- // Emitted each time a packet is read. -- sigslot::signal4<const char*, size_t, -- const SocketAddress&, AsyncPacketSocket*> SignalReadPacket; -+ // Returns current local address. If port or IP address is not -+ // assigned yet, then they set to 0 in the result and |allocated| is -+ // set to false. Otherwise |allocated| is set to true. -+ virtual SocketAddress GetLocalAddress(bool* allocated) const = 0; - -- protected: -- AsyncSocket* socket_; -+ // Returns remote address. Returns zeroes if this is not a client TCP socket. -+ virtual SocketAddress GetRemoteAddress() const = 0; -+ -+ // Send a packet. -+ virtual int Send(const void *pv, size_t cb) = 0; -+ virtual int SendTo(const void *pv, size_t cb, const SocketAddress& addr) = 0; -+ -+ // Close the socket. -+ virtual int Close() = 0; -+ -+ // Returns current state of the socket. -+ virtual Socket::ConnState GetState() const = 0; -+ -+ // Get/set options. -+ virtual int GetOption(Socket::Option opt, int* value) = 0; -+ virtual int SetOption(Socket::Option opt, int value) = 0; -+ -+ // Get/Set current error. -+ // TODO: Do we really need SetError() here? -+ virtual int GetError() const = 0; -+ virtual void SetError(int error) = 0; -+ -+ // Emitted after address for the socket is allocated. -+ sigslot::signal2<AsyncPacketSocket*, const SocketAddress&> SignalAddressReady; -+ -+ // Emitted each time a packet is read. Used only for UDP and -+ // connected TCP sockets. -+ sigslot::signal4<AsyncPacketSocket*, const char*, size_t, -+ const SocketAddress&> SignalReadPacket; -+ -+ // Used only for connected TCP sockets. -+ sigslot::signal1<AsyncPacketSocket*> SignalConnect; -+ sigslot::signal2<AsyncPacketSocket*, int> SignalClose; -+ -+ // Used only for listening TCP sockets. -+ sigslot::signal2<AsyncPacketSocket*, AsyncPacketSocket*> SignalNewConnection; -+ -+ private: - DISALLOW_EVIL_CONSTRUCTORS(AsyncPacketSocket); - }; - -diff -upN libjingle-0.5.2/talk/base/asynctcpsocket.cc.chromium12 libjingle-0.5.2/talk/base/asynctcpsocket.cc ---- libjingle-0.5.2/talk/base/asynctcpsocket.cc.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/asynctcpsocket.cc 2011-03-30 21:51:32.694287001 -0400 -@@ -39,20 +39,30 @@ - - namespace talk_base { - --const size_t MAX_PACKET_SIZE = 64 * 1024; -+static const size_t MAX_PACKET_SIZE = 64 * 1024; - - typedef uint16 PacketLength; --const size_t PKT_LEN_SIZE = sizeof(PacketLength); -+static const size_t PKT_LEN_SIZE = sizeof(PacketLength); - --const size_t BUF_SIZE = MAX_PACKET_SIZE + PKT_LEN_SIZE; -+static const size_t BUF_SIZE = MAX_PACKET_SIZE + PKT_LEN_SIZE; - --AsyncTCPSocket* AsyncTCPSocket::Create(SocketFactory* factory) { -+static const int LISTEN_BACKLOG = 5; -+ -+AsyncTCPSocket* AsyncTCPSocket::Create(SocketFactory* factory, bool listen) { - AsyncSocket* sock = factory->CreateAsyncSocket(SOCK_STREAM); -- return (sock) ? new AsyncTCPSocket(sock) : NULL; -+ // This will still return a socket even if we failed to listen on -+ // it. It is neccessary because even if we can't accept new -+ // connections on this socket, the corresponding port is still -+ // useful for outgoing connections. -+ // -+ // TODO: It might be better to pass listen() error to the -+ // upper layer and let it handle the problem. -+ return (sock) ? new AsyncTCPSocket(sock, listen) : NULL; - } - --AsyncTCPSocket::AsyncTCPSocket(AsyncSocket* socket) -- : AsyncPacketSocket(socket), -+AsyncTCPSocket::AsyncTCPSocket(AsyncSocket* socket, bool listen) -+ : socket_(socket), -+ listen_(listen), - insize_(BUF_SIZE), - inpos_(0), - outsize_(BUF_SIZE), -@@ -60,11 +70,17 @@ AsyncTCPSocket::AsyncTCPSocket(AsyncSock - inbuf_ = new char[insize_]; - outbuf_ = new char[outsize_]; - -- ASSERT(socket_ != NULL); -+ ASSERT(socket_.get() != NULL); - socket_->SignalConnectEvent.connect(this, &AsyncTCPSocket::OnConnectEvent); - socket_->SignalReadEvent.connect(this, &AsyncTCPSocket::OnReadEvent); - socket_->SignalWriteEvent.connect(this, &AsyncTCPSocket::OnWriteEvent); - socket_->SignalCloseEvent.connect(this, &AsyncTCPSocket::OnCloseEvent); -+ -+ if (listen_) { -+ if (socket_->Listen(LISTEN_BACKLOG) < 0) { -+ LOG(LS_ERROR) << "Listen() failed with error " << socket_->GetError(); -+ } -+ } - } - - AsyncTCPSocket::~AsyncTCPSocket() { -@@ -72,6 +88,16 @@ AsyncTCPSocket::~AsyncTCPSocket() { - delete [] outbuf_; - } - -+SocketAddress AsyncTCPSocket::GetLocalAddress(bool* allocated) const { -+ if (allocated) -+ *allocated = true; -+ return socket_->GetLocalAddress(); -+} -+ -+SocketAddress AsyncTCPSocket::GetRemoteAddress() const { -+ return socket_->GetRemoteAddress(); -+} -+ - int AsyncTCPSocket::Send(const void *pv, size_t cb) { - if (cb > MAX_PACKET_SIZE) { - socket_->SetError(EMSGSIZE); -@@ -108,6 +134,30 @@ int AsyncTCPSocket::SendTo(const void *p - return -1; - } - -+int AsyncTCPSocket::Close() { -+ return socket_->Close(); -+} -+ -+Socket::ConnState AsyncTCPSocket::GetState() const { -+ return socket_->GetState(); -+} -+ -+int AsyncTCPSocket::GetOption(Socket::Option opt, int* value) { -+ return socket_->GetOption(opt, value); -+} -+ -+int AsyncTCPSocket::SetOption(Socket::Option opt, int value) { -+ return socket_->SetOption(opt, value); -+} -+ -+int AsyncTCPSocket::GetError() const { -+ return socket_->GetError(); -+} -+ -+void AsyncTCPSocket::SetError(int error) { -+ return socket_->SetError(error); -+} -+ - int AsyncTCPSocket::SendRaw(const void * pv, size_t cb) { - if (outpos_ + cb > outsize_) { - socket_->SetError(EMSGSIZE); -@@ -134,7 +184,7 @@ void AsyncTCPSocket::ProcessInput(char * - if (len < PKT_LEN_SIZE + pkt_len) - return; - -- SignalReadPacket(data + PKT_LEN_SIZE, pkt_len, remote_addr, this); -+ SignalReadPacket(this, data + PKT_LEN_SIZE, pkt_len, remote_addr); - - len -= PKT_LEN_SIZE + pkt_len; - if (len > 0) { -@@ -165,30 +215,46 @@ void AsyncTCPSocket::OnConnectEvent(Asyn - } - - void AsyncTCPSocket::OnReadEvent(AsyncSocket* socket) { -- ASSERT(socket == socket_); -+ ASSERT(socket_.get() == socket); - -- int len = socket_->Recv(inbuf_ + inpos_, insize_ - inpos_); -- if (len < 0) { -- // TODO: Do something better like forwarding the error to the user. -- if (!socket_->IsBlocking()) { -- LOG_ERR(LS_ERROR) << "recvfrom"; -+ if (listen_) { -+ talk_base::SocketAddress address; -+ talk_base::AsyncSocket* new_socket = socket->Accept(&address); -+ if (!new_socket) { -+ // TODO: Do something better like forwarding the error -+ // to the user. -+ LOG(LS_ERROR) << "TCP accept failed with error " << socket_->GetError(); -+ return; - } -- return; -- } - -- inpos_ += len; -+ SignalNewConnection(this, new AsyncTCPSocket(new_socket, false)); - -- ProcessInput(inbuf_, inpos_); -+ // Prime a read event in case data is waiting. -+ new_socket->SignalReadEvent(new_socket); -+ } else { -+ int len = socket_->Recv(inbuf_ + inpos_, insize_ - inpos_); -+ if (len < 0) { -+ // TODO: Do something better like forwarding the error to the user. -+ if (!socket_->IsBlocking()) { -+ LOG(LS_ERROR) << "Recv() returned error: " << socket_->GetError(); -+ } -+ return; -+ } - -- if (inpos_ >= insize_) { -- LOG(INFO) << "input buffer overflow"; -- ASSERT(false); -- inpos_ = 0; -+ inpos_ += len; -+ -+ ProcessInput(inbuf_, inpos_); -+ -+ if (inpos_ >= insize_) { -+ LOG(LS_ERROR) << "input buffer overflow"; -+ ASSERT(false); -+ inpos_ = 0; -+ } - } - } - - void AsyncTCPSocket::OnWriteEvent(AsyncSocket* socket) { -- ASSERT(socket == socket_); -+ ASSERT(socket_.get() == socket); - - if (outpos_ > 0) { - Flush(); -diff -upN libjingle-0.5.2/talk/base/asynctcpsocket.h.chromium12 libjingle-0.5.2/talk/base/asynctcpsocket.h ---- libjingle-0.5.2/talk/base/asynctcpsocket.h.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/asynctcpsocket.h 2011-03-30 21:51:32.695287001 -0400 -@@ -29,6 +29,7 @@ - #define TALK_BASE_ASYNCTCPSOCKET_H_ - - #include "talk/base/asyncpacketsocket.h" -+#include "talk/base/scoped_ptr.h" - #include "talk/base/socketfactory.h" - - namespace talk_base { -@@ -38,15 +39,21 @@ namespace talk_base { - // buffer them in user space. - class AsyncTCPSocket : public AsyncPacketSocket { - public: -- static AsyncTCPSocket* Create(SocketFactory* factory); -- explicit AsyncTCPSocket(AsyncSocket* socket); -+ static AsyncTCPSocket* Create(SocketFactory* factory, bool listen); -+ explicit AsyncTCPSocket(AsyncSocket* socket, bool listen); - virtual ~AsyncTCPSocket(); - -- virtual int Send(const void* pv, size_t cb); -- virtual int SendTo(const void* pv, size_t cb, const SocketAddress& addr); -- -- sigslot::signal1<AsyncTCPSocket*> SignalConnect; -- sigslot::signal2<AsyncTCPSocket*, int> SignalClose; -+ virtual SocketAddress GetLocalAddress(bool* allocated) const; -+ virtual SocketAddress GetRemoteAddress() const; -+ virtual int Send(const void *pv, size_t cb); -+ virtual int SendTo(const void *pv, size_t cb, const SocketAddress& addr); -+ virtual int Close(); -+ -+ virtual Socket::ConnState GetState() const; -+ virtual int GetOption(Socket::Option opt, int* value); -+ virtual int SetOption(Socket::Option opt, int value); -+ virtual int GetError() const; -+ virtual void SetError(int error); - - protected: - int SendRaw(const void* pv, size_t cb); -@@ -61,8 +68,12 @@ class AsyncTCPSocket : public AsyncPacke - void OnWriteEvent(AsyncSocket* socket); - void OnCloseEvent(AsyncSocket* socket, int error); - -+ scoped_ptr<AsyncSocket> socket_; -+ bool listen_; - char* inbuf_, * outbuf_; - size_t insize_, inpos_, outsize_, outpos_; -+ -+ DISALLOW_EVIL_CONSTRUCTORS(AsyncTCPSocket); - }; - - } // namespace talk_base -diff -upN libjingle-0.5.2/talk/base/asyncudpsocket.cc.chromium12 libjingle-0.5.2/talk/base/asyncudpsocket.cc ---- libjingle-0.5.2/talk/base/asyncudpsocket.cc.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/asyncudpsocket.cc 2011-03-30 21:51:32.695287001 -0400 -@@ -34,11 +34,23 @@ - - namespace talk_base { - --const int BUF_SIZE = 64 * 1024; -+static const int BUF_SIZE = 64 * 1024; -+ -+AsyncUDPSocket* AsyncUDPSocket::Create(SocketFactory* factory, -+ const SocketAddress& address) { -+ scoped_ptr<AsyncSocket> socket(factory->CreateAsyncSocket(SOCK_DGRAM)); -+ if (!socket.get()) -+ return NULL; -+ if (socket->Bind(address)) { -+ LOG(LS_INFO) << "Failed to bind UDP socket " << socket->GetError(); -+ return NULL; -+ } -+ return new AsyncUDPSocket(socket.release()); -+} - - AsyncUDPSocket::AsyncUDPSocket(AsyncSocket* socket) -- : AsyncPacketSocket(socket) { -- ASSERT(socket_ != NULL); -+ : socket_(socket) { -+ ASSERT(socket_.get() != NULL); - size_ = BUF_SIZE; - buf_ = new char[size_]; - -@@ -50,8 +62,51 @@ AsyncUDPSocket::~AsyncUDPSocket() { - delete [] buf_; - } - -+SocketAddress AsyncUDPSocket::GetLocalAddress(bool* allocated) const { -+ if (allocated) -+ *allocated = true; -+ return socket_->GetLocalAddress(); -+} -+ -+SocketAddress AsyncUDPSocket::GetRemoteAddress() const { -+ return socket_->GetRemoteAddress(); -+} -+ -+int AsyncUDPSocket::Send(const void *pv, size_t cb) { -+ return socket_->Send(pv, cb); -+} -+ -+int AsyncUDPSocket::SendTo( -+ const void *pv, size_t cb, const SocketAddress& addr) { -+ return socket_->SendTo(pv, cb, addr); -+} -+ -+int AsyncUDPSocket::Close() { -+ return socket_->Close(); -+} -+ -+Socket::ConnState AsyncUDPSocket::GetState() const { -+ return socket_->GetState(); -+} -+ -+int AsyncUDPSocket::GetOption(Socket::Option opt, int* value) { -+ return socket_->GetOption(opt, value); -+} -+ -+int AsyncUDPSocket::SetOption(Socket::Option opt, int value) { -+ return socket_->SetOption(opt, value); -+} -+ -+int AsyncUDPSocket::GetError() const { -+ return socket_->GetError(); -+} -+ -+void AsyncUDPSocket::SetError(int error) { -+ return socket_->SetError(error); -+} -+ - void AsyncUDPSocket::OnReadEvent(AsyncSocket* socket) { -- ASSERT(socket == socket_); -+ ASSERT(socket_.get() == socket); - - SocketAddress remote_addr; - int len = socket_->RecvFrom(buf_, size_, &remote_addr); -@@ -68,7 +123,7 @@ void AsyncUDPSocket::OnReadEvent(AsyncSo - - // TODO: Make sure that we got all of the packet. - // If we did not, then we should resize our buffer to be large enough. -- SignalReadPacket(buf_, (size_t)len, remote_addr, this); -+ SignalReadPacket(this, buf_, (size_t)len, remote_addr); - } - - } // namespace talk_base -diff -upN libjingle-0.5.2/talk/base/asyncudpsocket.h.chromium12 libjingle-0.5.2/talk/base/asyncudpsocket.h ---- libjingle-0.5.2/talk/base/asyncudpsocket.h.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/asyncudpsocket.h 2011-03-30 21:51:32.695287001 -0400 -@@ -29,6 +29,7 @@ - #define TALK_BASE_ASYNCUDPSOCKET_H_ - - #include "talk/base/asyncpacketsocket.h" -+#include "talk/base/scoped_ptr.h" - #include "talk/base/socketfactory.h" - - namespace talk_base { -@@ -39,26 +40,32 @@ class AsyncUDPSocket : public AsyncPacke - public: - // Creates a new socket for sending asynchronous UDP packets using an - // asynchronous socket from the given factory. -- static AsyncUDPSocket* Create(SocketFactory* factory) { -- AsyncSocket* sock = factory->CreateAsyncSocket(SOCK_DGRAM); -- return (sock) ? new AsyncUDPSocket(sock) : NULL; -- } -+ static AsyncUDPSocket* Create(SocketFactory* factory, -+ const SocketAddress& address); - explicit AsyncUDPSocket(AsyncSocket* socket); - virtual ~AsyncUDPSocket(); - -+ virtual SocketAddress GetLocalAddress(bool* allocated) const; -+ virtual SocketAddress GetRemoteAddress() const; -+ virtual int Send(const void *pv, size_t cb); -+ virtual int SendTo(const void *pv, size_t cb, const SocketAddress& addr); -+ virtual int Close(); -+ -+ virtual Socket::ConnState GetState() const; -+ virtual int GetOption(Socket::Option opt, int* value); -+ virtual int SetOption(Socket::Option opt, int value); -+ virtual int GetError() const; -+ virtual void SetError(int error); -+ - private: - // Called when the underlying socket is ready to be read from. - void OnReadEvent(AsyncSocket* socket); - -+ scoped_ptr<AsyncSocket> socket_; - char* buf_; - size_t size_; - }; - --// TODO: This is now deprecated. Remove it. --inline AsyncUDPSocket* CreateAsyncUDPSocket(SocketFactory* factory) { -- return AsyncUDPSocket::Create(factory); --} -- - } // namespace talk_base - - #endif // TALK_BASE_ASYNCUDPSOCKET_H_ -diff -upN libjingle-0.5.2/talk/base/basicpacketsocketfactory.cc.chromium12 libjingle-0.5.2/talk/base/basicpacketsocketfactory.cc ---- libjingle-0.5.2/talk/base/basicpacketsocketfactory.cc.chromium12 2011-03-30 21:51:32.695287001 -0400 -+++ libjingle-0.5.2/talk/base/basicpacketsocketfactory.cc 2011-03-30 21:51:32.695287001 -0400 -@@ -0,0 +1,159 @@ -+/* -+ * libjingle -+ * Copyright 2011, Google Inc. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "talk/base/basicpacketsocketfactory.h" -+ -+#include "talk/base/asyncudpsocket.h" -+#include "talk/base/asynctcpsocket.h" -+#include "talk/base/logging.h" -+#include "talk/base/socketadapters.h" -+#include "talk/base/thread.h" -+ -+namespace talk_base { -+ -+BasicPacketSocketFactory::BasicPacketSocketFactory( -+ Thread* thread) -+ : thread_(thread), -+ socket_factory_(NULL) { -+} -+ -+BasicPacketSocketFactory::BasicPacketSocketFactory( -+ SocketFactory* socket_factory) -+ : thread_(NULL), -+ socket_factory_(socket_factory) { -+} -+ -+BasicPacketSocketFactory::~BasicPacketSocketFactory() { -+} -+ -+AsyncPacketSocket* BasicPacketSocketFactory::CreateUdpSocket( -+ const SocketAddress& address, int min_port, int max_port) { -+ // UDP sockets are simple. -+ talk_base::AsyncSocket* socket = -+ socket_factory()->CreateAsyncSocket(SOCK_DGRAM); -+ if (!socket) { -+ return NULL; -+ } -+ if (BindSocket(socket, address, min_port, max_port) < 0) { -+ LOG(LS_ERROR) << "UDP bind failed with error " -+ << socket->GetError(); -+ delete socket; -+ return NULL; -+ } -+ return new talk_base::AsyncUDPSocket(socket); -+} -+ -+AsyncPacketSocket* BasicPacketSocketFactory::CreateServerTcpSocket( -+ const SocketAddress& local_address, int min_port, int max_port, -+ bool listen, bool ssl) { -+ talk_base::AsyncSocket* socket = -+ socket_factory()->CreateAsyncSocket(SOCK_STREAM); -+ if (!socket) { -+ return NULL; -+ } -+ -+ if (BindSocket(socket, local_address, min_port, max_port) < 0) { -+ LOG(LS_ERROR) << "TCP bind failed with error " -+ << socket->GetError(); -+ delete socket; -+ return NULL; -+ } -+ -+ // If using SSLTCP, wrap the TCP socket in a pseudo-SSL socket. -+ if (ssl) { -+ socket = new talk_base::AsyncSSLSocket(socket); -+ } -+ -+ return new talk_base::AsyncTCPSocket(socket, true); -+} -+ -+AsyncPacketSocket* BasicPacketSocketFactory::CreateClientTcpSocket( -+ const SocketAddress& local_address, const SocketAddress& remote_address, -+ const ProxyInfo& proxy_info, const std::string& user_agent, bool ssl) { -+ talk_base::AsyncSocket* socket = -+ socket_factory()->CreateAsyncSocket(SOCK_STREAM); -+ if (!socket) { -+ return NULL; -+ } -+ -+ if (BindSocket(socket, local_address, 0, 0) < 0) { -+ LOG(LS_ERROR) << "TCP bind failed with error " -+ << socket->GetError(); -+ delete socket; -+ return NULL; -+ } -+ -+ // If using a proxy, wrap the socket in a proxy socket. -+ if (proxy_info.type == talk_base::PROXY_SOCKS5) { -+ socket = new talk_base::AsyncSocksProxySocket( -+ socket, proxy_info.address, proxy_info.username, proxy_info.password); -+ } else if (proxy_info.type == talk_base::PROXY_HTTPS) { -+ socket = new talk_base::AsyncHttpsProxySocket( -+ socket, user_agent, proxy_info.address, -+ proxy_info.username, proxy_info.password); -+ } -+ -+ // If using SSLTCP, wrap the TCP socket in a pseudo-SSL socket. -+ if (ssl) { -+ socket = new talk_base::AsyncSSLSocket(socket); -+ } -+ -+ if (socket->Connect(remote_address) < 0) { -+ LOG(LS_ERROR) << "TCP connect failed with error " -+ << socket->GetError(); -+ delete socket; -+ return NULL; -+ } -+ -+ // Finally, wrap that socket in a TCP packet socket. -+ return new talk_base::AsyncTCPSocket(socket, false); -+} -+ -+int BasicPacketSocketFactory::BindSocket( -+ AsyncSocket* socket, const SocketAddress& local_address, -+ int min_port, int max_port) { -+ int ret = -1; -+ if (min_port == 0 && max_port == 0) { -+ // If there's no port range, let the OS pick a port for us. -+ ret = socket->Bind(local_address); -+ } else { -+ // Otherwise, try to find a port in the provided range. -+ for (int port = min_port; ret < 0 && port <= max_port; ++port) { -+ ret = socket->Bind(talk_base::SocketAddress(local_address.ip(), port)); -+ } -+ } -+ return ret; -+} -+ -+SocketFactory* BasicPacketSocketFactory::socket_factory() { -+ if (thread_) -+ return thread_->socketserver(); -+ else -+ return socket_factory_; -+} -+ -+} // namespace talk_base -diff -upN libjingle-0.5.2/talk/base/basicpacketsocketfactory.h.chromium12 libjingle-0.5.2/talk/base/basicpacketsocketfactory.h ---- libjingle-0.5.2/talk/base/basicpacketsocketfactory.h.chromium12 2011-03-30 21:51:32.696287001 -0400 -+++ libjingle-0.5.2/talk/base/basicpacketsocketfactory.h 2011-03-30 21:51:32.696287001 -0400 -@@ -0,0 +1,67 @@ -+/* -+ * libjingle -+ * Copyright 2011, Google Inc. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#ifndef TALK_BASE_BASICPACKETSOCKETFACTORY_H_ -+#define TALK_BASE_BASICPACKETSOCKETFACTORY_H_ -+ -+#include "talk/base/asyncsocket.h" -+#include "talk/base/packetsocketfactory.h" -+ -+namespace talk_base { -+ -+class AsyncSocket; -+class SocketFactory; -+class Thread; -+ -+class BasicPacketSocketFactory : public PacketSocketFactory { -+ public: -+ explicit BasicPacketSocketFactory(Thread* thread); -+ explicit BasicPacketSocketFactory(SocketFactory* socket_factory); -+ virtual ~BasicPacketSocketFactory(); -+ -+ virtual AsyncPacketSocket* CreateUdpSocket( -+ const SocketAddress& local_address, int min_port, int max_port); -+ virtual AsyncPacketSocket* CreateServerTcpSocket( -+ const SocketAddress& local_address, int min_port, int max_port, -+ bool listen, bool ssl); -+ virtual AsyncPacketSocket* CreateClientTcpSocket( -+ const SocketAddress& local_address, const SocketAddress& remote_address, -+ const ProxyInfo& proxy_info, const std::string& user_agent, bool ssl); -+ -+ private: -+ int BindSocket(AsyncSocket* socket, const SocketAddress& local_address, -+ int min_port, int max_port); -+ -+ SocketFactory* socket_factory(); -+ -+ Thread* thread_; -+ SocketFactory* socket_factory_; -+}; -+ -+} // namespace talk_base -+ -+#endif // TALK_BASE_BASICPACKETSOCKETFACTORY_H_ -diff -upN libjingle-0.5.2/talk/base/basictypes.h.chromium12 libjingle-0.5.2/talk/base/basictypes.h ---- libjingle-0.5.2/talk/base/basictypes.h.chromium12 2011-03-30 21:51:32.681287001 -0400 -+++ libjingle-0.5.2/talk/base/basictypes.h 2011-03-30 21:51:32.696287001 -0400 -@@ -1,6 +1,6 @@ - /* - * libjingle -- * Copyright 2004--2005, Google Inc. -+ * Copyright 2011, Google Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: -@@ -97,6 +97,12 @@ extern "C++" { - const int kForever = -1; - } - -+// Detect compiler is for x86 or x64. -+#if defined(__x86_64__) || defined(_M_X64) || \ -+ defined(__i386__) || defined(_M_IX86) -+#define CPU_X86 1 -+#endif -+ - #ifdef WIN32 - #define alignof(t) __alignof(t) - #else // !WIN32 -diff -upN libjingle-0.5.2/talk/base/linux.cc.chromium12 libjingle-0.5.2/talk/base/linux.cc ---- libjingle-0.5.2/talk/base/linux.cc.chromium12 2011-03-30 21:51:32.691287001 -0400 -+++ libjingle-0.5.2/talk/base/linux.cc 2011-03-30 21:51:32.696287001 -0400 -@@ -1,6 +1,30 @@ --// Copyright 2008 Google Inc. All Rights Reserved. -+/* -+ * libjingle -+ * Copyright 2011, Google Inc. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ - --// - #include "talk/base/linux.h" - - #ifdef LINUX -@@ -25,25 +49,50 @@ ProcCpuInfo::~ProcCpuInfo() { - - bool ProcCpuInfo::LoadFromSystem() { - ConfigParser procfs; -- if (!procfs.Open(kCpuInfoFile)) -+ if (!procfs.Open(kCpuInfoFile)) { - return false; -+ } - return procfs.Parse(&cpu_info_); - }; - - bool ProcCpuInfo::GetNumCpus(int *num) { -- if (cpu_info_.size() == 0) -+ if (cpu_info_.size() == 0) { - return false; -+ } - *num = cpu_info_.size(); - return true; - } - -+bool ProcCpuInfo::GetNumPhysicalCpus(int *num) { -+ if (cpu_info_.size() == 0) { -+ return false; -+ } -+ int total_cores = 0; -+ int physical_id_prev = -1; -+ int cpus = static_cast<int>(cpu_info_.size()); -+ for (int i = 0; i < cpus; ++i) { -+ int physical_id; -+ if (GetCpuIntValue(i, "physical id", &physical_id)) { -+ if (physical_id != physical_id_prev) { -+ physical_id_prev = physical_id; -+ int cores; -+ if (GetCpuIntValue(i, "cpu cores", &cores)) { -+ total_cores += cores; -+ } -+ } -+ } -+ } -+ return total_cores; -+} -+ - bool ProcCpuInfo::GetCpuStringValue(int cpu_id, const std::string& key, - std::string *result) { - if (cpu_id >= static_cast<int>(cpu_info_.size())) - return false; - ConfigParser::SimpleMap::iterator iter = cpu_info_[cpu_id].find(key); -- if (iter == cpu_info_[cpu_id].end()) -+ if (iter == cpu_info_[cpu_id].end()) { - return false; -+ } - *result = iter->second; - return true; - } -@@ -67,8 +116,9 @@ ConfigParser::~ConfigParser() {} - - bool ConfigParser::Open(const std::string& filename) { - FileStream *fs = new FileStream(); -- if (!fs->Open(filename, "r")) -+ if (!fs->Open(filename, "r")) { - return false; -+ } - instream_.reset(fs); - return true; - } -@@ -101,20 +151,24 @@ bool ConfigParser::ParseLine(std::string - // Parses the next line in the filestream and places the found key-value - // pair into key and val. - std::string line; -- if ((instream_->ReadLine(&line)) == EOF) -+ if ((instream_->ReadLine(&line)) == EOF) { - return false; -+ } - std::vector<std::string> tokens; -- if (2 != split(line, ':', &tokens)) -+ if (2 != split(line, ':', &tokens)) { - return false; -+ } - // Removes whitespace at the end of Key name - size_t pos = tokens[0].length() - 1; -- while ((pos > 0) && isspace(tokens[0][pos])) -+ while ((pos > 0) && isspace(tokens[0][pos])) { - pos--; -+ } - tokens[0].erase(pos + 1); - // Removes whitespace at the start of value - pos = 0; -- while (pos < tokens[1].length() && isspace(tokens[1][pos])) -+ while (pos < tokens[1].length() && isspace(tokens[1][pos])) { - pos++; -+ } - tokens[1].erase(0, pos); - *key = tokens[0]; - *value = tokens[1]; -diff -upN libjingle-0.5.2/talk/base/linux.h.chromium12 libjingle-0.5.2/talk/base/linux.h ---- libjingle-0.5.2/talk/base/linux.h.chromium12 2011-03-30 21:51:32.691287001 -0400 -+++ libjingle-0.5.2/talk/base/linux.h 2011-03-30 21:51:32.696287001 -0400 -@@ -1,5 +1,29 @@ --// Copyright 2008 Google Inc. All Rights Reserved. -- -+/* -+ * libjingle -+ * Copyright 2011, Google Inc. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ - - #ifndef TALK_BASE_LINUX_H_ - #define TALK_BASE_LINUX_H_ -@@ -70,9 +94,12 @@ class ProcCpuInfo { - // returns false; if it succeeds, it returns true. - virtual bool LoadFromSystem(); - -- // Obtains the number of CPUs and places the value num. -+ // Obtains the number of logical CPU threads and places the value num. - virtual bool GetNumCpus(int *num); - -+ // Obtains the number of physical CPU cores and places the value num. -+ virtual bool GetNumPhysicalCpus(int *num); -+ - // Looks for the CPU proc item with the given name for the given CPU number - // and places the string value in result. - virtual bool GetCpuStringValue(int cpu_id, const std::string& key, -diff -upN libjingle-0.5.2/talk/base/logging.cc.chromium12 libjingle-0.5.2/talk/base/logging.cc ---- libjingle-0.5.2/talk/base/logging.cc.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/logging.cc 2011-03-30 21:51:32.697287001 -0400 -@@ -1,6 +1,6 @@ - /* - * libjingle -- * Copyright 2004--2005, Google Inc. -+ * Copyright 2011, Google Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: -@@ -37,6 +37,10 @@ - #elif defined(ANDROID) - #include <android/log.h> - static const char kLibjingle[] = "libjingle"; -+// Android has a 1024 limit on log inputs. We use 60 chars as an -+// approx for the header/tag portion. -+// See android/system/core/liblog/logd_write.c -+static const int kMaxLogLineSize = 1024 - 60; - #endif // OSX || ANDROID - - #include <iostream> -@@ -270,7 +274,7 @@ void LogMessage::ConfigureLogging(const - int file_level = GetLogToStream(); - - std::vector<std::string> tokens; -- split(params, ' ', &tokens); -+ tokenize(params, ' ', &tokens); - - for (size_t i = 0; i < tokens.size(); ++i) { - if (tokens[i].empty()) -@@ -429,6 +433,10 @@ void LogMessage::OutputToDebug(const std - switch (severity) { - case LS_SENSITIVE: - __android_log_write(ANDROID_LOG_INFO, kLibjingle, "SENSITIVE"); -+ if (log_to_stderr) { -+ std::cerr << "SENSITIVE"; -+ std::cerr.flush(); -+ } - return; - case LS_VERBOSE: - prio = ANDROID_LOG_VERBOSE; -@@ -445,8 +453,26 @@ void LogMessage::OutputToDebug(const std - default: - prio = ANDROID_LOG_UNKNOWN; - } -- // Use the size of the string in the format (str may have \0 in the middle). -- __android_log_print(prio, kLibjingle, "%.*s", str.size(), str.c_str()); -+ -+ int size = str.size(); -+ int line = 0; -+ int idx = 0; -+ const int max_lines = size / kMaxLogLineSize + 1; -+ if (max_lines == 1) { -+ __android_log_print(prio, kLibjingle, "%.*s", size, str.c_str()); -+ } else { -+ while (size > 0) { -+ const int len = std::min(size, kMaxLogLineSize); -+ // Use the size of the string in the format (str may have \0 in the -+ // middle). -+ __android_log_print(prio, kLibjingle, "[%d/%d] %.*s", -+ line + 1, max_lines, -+ len, str.c_str() + idx); -+ idx += len; -+ size -= len; -+ ++line; -+ } -+ } - #endif // ANDROID - if (log_to_stderr) { - std::cerr << str; -diff -upN libjingle-0.5.2/talk/base/Makefile.am.chromium12 libjingle-0.5.2/talk/base/Makefile.am ---- libjingle-0.5.2/talk/base/Makefile.am.chromium12 2011-03-30 21:51:32.656287001 -0400 -+++ libjingle-0.5.2/talk/base/Makefile.am 2011-03-30 21:53:50.328287005 -0400 -@@ -2,12 +2,12 @@ lib_LTLIBRARIES = libjinglebase.la - - libjinglebase_la_SOURCES = asyncfile.cc \ - asynchttprequest.cc \ -- asyncpacketsocket.cc \ - asyncsocket.cc \ - asynctcpsocket.cc \ - asyncudpsocket.cc \ - autodetectproxy.cc \ - base64.cc \ -+ basicpacketsocketfactory.cc \ - bytebuffer.cc \ - checks.cc \ - common.cc \ -@@ -22,6 +22,7 @@ libjinglebase_la_SOURCES = asyncfile.cc - httpclient.cc \ - httpcommon.cc \ - httprequest.cc \ -+ latebindingsymboltable.cc \ - linux.cc \ - logging.cc \ - md5c.c \ -@@ -36,6 +37,7 @@ libjinglebase_la_SOURCES = asyncfile.cc - physicalsocketserver.cc \ - proxydetect.cc \ - proxyinfo.cc \ -+ ratetracker.cc \ - signalthread.cc \ - socketadapters.cc \ - socketaddress.cc \ -@@ -73,6 +75,7 @@ libjinglebase_include_HEADERS = asyncfil - autodetectproxy.h \ - base64.h \ - basicdefs.h \ -+ basicpacketsocketfactory.h \ - basictypes.h \ - bytebuffer.h \ - byteorder.h \ -@@ -101,10 +104,12 @@ libjinglebase_include_HEADERS = asyncfil - messagequeue.h \ - nethelpers.h \ - network.h \ -+ packetsocketfactory.h \ - pathutils.h \ - physicalsocketserver.h \ - proxydetect.h \ - proxyinfo.h \ -+ ratetracker.h \ - scoped_ptr.h \ - sec_buffer.h \ - signalthread.h \ -diff -upN libjingle-0.5.2/talk/base/nethelpers.cc.chromium12 libjingle-0.5.2/talk/base/nethelpers.cc ---- libjingle-0.5.2/talk/base/nethelpers.cc.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/nethelpers.cc 2011-03-30 21:51:32.697287001 -0400 -@@ -25,6 +25,8 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include "config.h" -+ - #include "talk/base/nethelpers.h" - - #include "talk/base/byteorder.h" -@@ -32,6 +34,11 @@ - - namespace talk_base { - -+#if defined(LINUX) || defined(ANDROID) -+static const size_t kInitHostentLen = 1024; -+static const size_t kMaxHostentLen = kInitHostentLen * 8; -+#endif -+ - // AsyncResolver - - AsyncResolver::AsyncResolver() : result_(NULL), error_(0) { -@@ -55,17 +62,16 @@ void AsyncResolver::OnWorkDone() { - // The functions below are used to do gethostbyname, but with an allocated - // instead of a static buffer. - hostent* SafeGetHostByName(const char* hostname, int* herrno) { -+ if (NULL == hostname || NULL == herrno) { -+ return NULL; -+ } - hostent* result = NULL; --#if defined(WIN32) || (defined(POSIX) && !defined(OSX)) -+#if defined(WIN32) - // On Windows we have to allocate a buffer, and manually copy the hostent, - // along with its embedded pointers. - hostent* ent = gethostbyname(hostname); - if (!ent) { --#ifdef WIN32 - *herrno = WSAGetLastError(); --#else // POSIX -- *herrno = h_errno; --#endif - return NULL; - } - -@@ -85,6 +91,9 @@ hostent* SafeGetHostByName(const char* h - total_len += sizeof(char*); - - result = static_cast<hostent*>(malloc(total_len)); -+ if (NULL == result) { -+ return NULL; -+ } - char* p = reinterpret_cast<char*>(result) + sizeof(hostent); - - // Copy the hostent into it, along with its embedded pointers. -@@ -114,7 +123,37 @@ hostent* SafeGetHostByName(const char* h - result->h_addr_list[num_addrs] = NULL; - - *herrno = 0; --#elif defined(OSX) -+#elif defined(LINUX) || defined(ANDROID) -+ // gethostbyname() is not thread safe, so we need to call gethostbyname_r() -+ // which is a reentrant version of gethostbyname(). -+ ASSERT(kInitHostentLen > sizeof(hostent)); -+ size_t size = kInitHostentLen; -+ int ret; -+ void* buf = malloc(size); -+ if (NULL == buf) { -+ return NULL; -+ } -+ char* aux = static_cast<char*>(buf) + sizeof(hostent); -+ size_t aux_len = size - sizeof(hostent); -+ while ((ret = gethostbyname_r(hostname, reinterpret_cast<hostent*>(buf), aux, -+ aux_len, &result, herrno)) == ERANGE) { -+ size *= 2; -+ if (size > kMaxHostentLen) { -+ break; // Just to be safe. -+ } -+ buf = realloc(buf, size); -+ if (NULL == buf) { -+ return NULL; -+ } -+ aux = static_cast<char*>(buf) + sizeof(hostent); -+ aux_len = size - sizeof(hostent); -+ } -+ if (ret != 0 || buf != result) { -+ free(buf); -+ return NULL; -+ } -+ *herrno = 0; -+#elif defined(OSX) || defined(IOS) - // Mac OS returns an object with everything allocated. - result = getipnodebyname(hostname, AF_INET, AI_DEFAULT, herrno); - #else -@@ -126,10 +165,10 @@ hostent* SafeGetHostByName(const char* h - // This function should mirror the above function, and free any resources - // allocated by the above. - void FreeHostEnt(hostent* host) { --#if defined(WIN32) || (defined(POSIX) && !defined(OSX)) -- free(host); --#elif defined(OSX) -+#if defined(OSX) || defined(IOS) - freehostent(host); -+#elif defined(WIN32) || defined(POSIX) -+ free(host); - #else - #error "I don't know how to free a hostent on your system." - #endif -diff -upN libjingle-0.5.2/talk/base/packetsocketfactory.h.chromium12 libjingle-0.5.2/talk/base/packetsocketfactory.h ---- libjingle-0.5.2/talk/base/packetsocketfactory.h.chromium12 2011-03-30 21:51:32.697287001 -0400 -+++ libjingle-0.5.2/talk/base/packetsocketfactory.h 2011-03-30 21:51:32.697287001 -0400 -@@ -0,0 +1,57 @@ -+/* -+ * libjingle -+ * Copyright 2011, Google Inc. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#ifndef TALK_BASE_PACKETSOCKETFACTORY_H_ -+#define TALK_BASE_PACKETSOCKETFACTORY_H_ -+ -+#include "talk/base/proxyinfo.h" -+ -+namespace talk_base { -+ -+class AsyncPacketSocket; -+ -+class PacketSocketFactory { -+ public: -+ PacketSocketFactory() { } -+ virtual ~PacketSocketFactory() { } -+ -+ virtual AsyncPacketSocket* CreateUdpSocket( -+ const SocketAddress& address, int min_port, int max_port) = 0; -+ virtual AsyncPacketSocket* CreateServerTcpSocket( -+ const SocketAddress& local_address, int min_port, int max_port, -+ bool listen, bool ssl) = 0; -+ virtual AsyncPacketSocket* CreateClientTcpSocket( -+ const SocketAddress& local_address, const SocketAddress& remote_address, -+ const ProxyInfo& proxy_info, const std::string& user_agent, bool ssl) = 0; -+ -+ private: -+ DISALLOW_EVIL_CONSTRUCTORS(PacketSocketFactory); -+}; -+ -+} // namespace talk_base -+ -+#endif // TALK_BASE_PACKETSOCKETFACTORY_H_ -diff -upN libjingle-0.5.2/talk/base/physicalsocketserver.cc.chromium12 libjingle-0.5.2/talk/base/physicalsocketserver.cc ---- libjingle-0.5.2/talk/base/physicalsocketserver.cc.chromium12 2011-03-30 21:51:32.664287001 -0400 -+++ libjingle-0.5.2/talk/base/physicalsocketserver.cc 2011-03-30 21:51:32.698287001 -0400 -@@ -216,7 +216,6 @@ class PhysicalSocket : public AsyncSocke - addr.ToSockAddr(&saddr); - int err = ::connect(s_, (sockaddr*)&saddr, sizeof(saddr)); - UpdateLastError(); -- //LOG(INFO) << "SOCK[" << static_cast<int>(s_) << "] Connect(" << addr2.ToString() << ") Ret: " << err << " Error: " << error_; - if (err == 0) { - state_ = CS_CONNECTED; - } else if (IsBlockingError(error_)) { -@@ -284,8 +283,8 @@ class PhysicalSocket : public AsyncSocke - #endif - ); - UpdateLastError(); -- //LOG(INFO) << "SOCK[" << static_cast<int>(s_) << "] Send(" << cb << ") Ret: " << sent << " Error: " << error_; -- ASSERT(sent <= static_cast<int>(cb)); // We have seen minidumps where this may be false -+ // We have seen minidumps where this may be false. -+ ASSERT(sent <= static_cast<int>(cb)); - if ((sent < 0) && IsBlockingError(error_)) { - enabled_events_ |= DE_WRITE; - } -@@ -305,11 +304,11 @@ class PhysicalSocket : public AsyncSocke - #endif - (sockaddr*)&saddr, sizeof(saddr)); - UpdateLastError(); -- ASSERT(sent <= static_cast<int>(cb)); // We have seen minidumps where this may be false -+ // We have seen minidumps where this may be false. -+ ASSERT(sent <= static_cast<int>(cb)); - if ((sent < 0) && IsBlockingError(error_)) { - enabled_events_ |= DE_WRITE; - } -- //LOG_F(LS_INFO) << cb << ":" << addr.ToString() << ":" << sent << ":" << error_; - return sent; - } - -@@ -387,7 +386,6 @@ class PhysicalSocket : public AsyncSocke - return 0; - int err = ::closesocket(s_); - UpdateLastError(); -- //LOG(INFO) << "SOCK[" << static_cast<int>(s_) << "] Close() Ret: " << err << " Error: " << error_; - s_ = INVALID_SOCKET; - state_ = CS_CLOSED; - enabled_events_ = 0; -@@ -427,14 +425,14 @@ class PhysicalSocket : public AsyncSocke - - ASSERT(false); - return -1; --#elif defined(OSX) -+#elif defined(IOS) || defined(OSX) - // No simple way to do this on Mac OS X. - // SIOCGIFMTU would work if we knew which interface would be used, but - // figuring that out is pretty complicated. For now we'll return an error - // and let the caller pick a default MTU. - error_ = EINVAL; - return -1; --#elif defined(LINUX) -+#elif defined(LINUX) || defined(ANDROID) - // Gets the path MTU. - int value; - socklen_t vlen = sizeof(value); -@@ -482,7 +480,7 @@ class PhysicalSocket : public AsyncSocke - *slevel = IPPROTO_IP; - *sopt = IP_DONTFRAGMENT; - break; --#elif defined(OSX) || defined(BSD) -+#elif defined(IOS) || defined(OSX) || defined(BSD) - LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; - return -1; - #elif defined(POSIX) -@@ -582,71 +580,43 @@ class EventDispatcher : public Dispatche - CriticalSection crit_; - }; - --// This is a class customized to use the self-pipe trick to deliver POSIX --// signals. This is the only safe, reliable, cross-platform way to do --// non-trivial things with a POSIX signal (until proper pselect() --// implementations become ubiquitous). --class PosixSignalDeliveryDispatcher : public Dispatcher { -+// These two classes use the self-pipe trick to deliver POSIX signals to our -+// select loop. This is the only safe, reliable, cross-platform way to do -+// non-trivial things with a POSIX signal in an event-driven program (until -+// proper pselect() implementations become ubiquitous). -+ -+class PosixSignalHandler { - public: -- virtual ~PosixSignalDeliveryDispatcher() { -- close(afd_[0]); -- close(afd_[1]); -- } -+ // POSIX only specifies 32 signals, but in principle the system might have -+ // more and the programmer might choose to use them, so we size our array -+ // for 128. -+ static const int kNumPosixSignals = 128; - -- virtual uint32 GetRequestedEvents() { -- return DE_READ; -- } -+ static PosixSignalHandler *Instance() { return &instance_; } - -- virtual void OnPreEvent(uint32 ff) { -- // Events might get grouped if signals come very fast, so we read out up to -- // 16 bytes to make sure we keep the pipe empty. -- uint8 b[16]; -- ssize_t ret = read(afd_[0], b, sizeof(b)); -- if (ret < 0) { -- LOG_ERR(LS_WARNING) << "Error in read()"; -- } else if (ret == 0) { -- LOG(LS_WARNING) << "Should have read at least one byte"; -+ // Returns true if the given signal number is set. -+ bool IsSignalSet(int signum) const { -+ ASSERT(signum < ARRAY_SIZE(received_signal_)); -+ if (signum < ARRAY_SIZE(received_signal_)) { -+ return received_signal_[signum]; -+ } else { -+ return false; - } - } - -- virtual void OnEvent(uint32 ff, int err) { -- for (int signum = 0; signum < ARRAY_SIZE(received_signal_); ++signum) { -- if (received_signal_[signum]) { -- received_signal_[signum] = false; -- HandlerMap::iterator i = handlers_.find(signum); -- if (i == handlers_.end()) { -- // This can happen if a signal is delivered to our process at around -- // the same time as we unset our handler for it. It is not an error -- // condidion, but it's unusual enough to be worth logging. -- LOG(LS_INFO) << "Received signal with no handler: " << signum; -- } else { -- // Otherwise, execute the handler. -- (*i->second)(signum); -- } -- } -+ // Clears the given signal number. -+ void ClearSignal(int signum) { -+ ASSERT(signum < ARRAY_SIZE(received_signal_)); -+ if (signum < ARRAY_SIZE(received_signal_)) { -+ received_signal_[signum] = false; - } - } - -- virtual int GetDescriptor() { -+ // Returns the file descriptor to monitor for signal events. -+ int GetDescriptor() const { - return afd_[0]; - } - -- virtual bool IsDescriptorClosed() { -- return false; -- } -- -- void SetHandler(int signum, void (*handler)(int)) { -- handlers_[signum] = handler; -- } -- -- void ClearHandler(int signum) { -- handlers_.erase(signum); -- } -- -- bool HasHandlers() { -- return !handlers_.empty(); -- } -- - // This is called directly from our real signal handler, so it must be - // signal-handler-safe. That means it cannot assume anything about the - // user-level state of the process, since the handler could be executed at any -@@ -658,7 +628,7 @@ class PosixSignalDeliveryDispatcher : pu - } - // Set a flag saying we've seen this signal. - received_signal_[signum] = true; -- // Tell the thread running our PhysicalSocketServer that we got a signal. -+ // Notify application code that we got a signal. - const uint8 b[1] = { 0 }; - if (-1 == write(afd_[1], b, sizeof(b))) { - // Nothing we can do here. If there's an error somehow then there's -@@ -670,49 +640,8 @@ class PosixSignalDeliveryDispatcher : pu - } - } - -- // Sets a PhysicalSocketServer to own signal delivery, or fails if already -- // owned. -- bool SetOwner(PhysicalSocketServer *owner) { -- CritScope cs(&owner_critsec_); -- if (owner == owner_) { -- return true; -- } else if (owner_) { -- return false; -- } else { -- owner_ = owner; -- owner_->Add(this); -- return true; -- } -- } -- -- bool IsOwner(PhysicalSocketServer *ss) { -- CritScope cs(&owner_critsec_); -- return owner_ == ss; -- } -- -- void ClearOwner(PhysicalSocketServer *ss) { -- CritScope cs(&owner_critsec_); -- if (owner_ != ss) { -- return; -- } -- owner_->Remove(this); -- owner_ = NULL; -- } -- -- // There is just a single global instance. (Signal handlers do not get any -- // sort of user-defined void * parameter, so they can't access anything that -- // isn't global.) -- static PosixSignalDeliveryDispatcher instance_; -- - private: -- // POSIX only specifies 32 signals, but in principle the system might have -- // more and the programmer might choose to use them, so we size our array -- // for 128. -- static const int kNumPosixSignals = 128; -- -- typedef std::map<int, void (*)(int)> HandlerMap; -- -- PosixSignalDeliveryDispatcher() : owner_(NULL) { -+ PosixSignalHandler() { - if (pipe(afd_) < 0) { - LOG_ERR(LS_ERROR) << "pipe failed"; - return; -@@ -728,8 +657,30 @@ class PosixSignalDeliveryDispatcher : pu - sizeof(received_signal_)); - } - -+ ~PosixSignalHandler() { -+ int fd1 = afd_[0]; -+ int fd2 = afd_[1]; -+ // We clobber the stored file descriptor numbers here or else in principle -+ // a signal that happens to be delivered during application termination -+ // could erroneously write a zero byte to an unrelated file handle in -+ // OnPosixSignalReceived() if some other file happens to be opened later -+ // during shutdown and happens to be given the same file descriptor number -+ // as our pipe had. Unfortunately even with this precaution there is still a -+ // race where that could occur if said signal happens to be handled -+ // concurrently with this code and happens to have already read the value of -+ // afd_[1] from memory before we clobber it, but that's unlikely. -+ afd_[0] = -1; -+ afd_[1] = -1; -+ close(fd1); -+ close(fd2); -+ } -+ -+ // There is just a single global instance. (Signal handlers do not get any -+ // sort of user-defined void * parameter, so they can't access anything that -+ // isn't global.) -+ static PosixSignalHandler instance_; -+ - int afd_[2]; -- HandlerMap handlers_; - // These are boolean flags that will be set in our signal handler and read - // and cleared from Wait(). There is a race involved in this, but it is - // benign. The signal handler sets the flag before signaling the pipe, so -@@ -741,14 +692,83 @@ class PosixSignalDeliveryDispatcher : pu - // Volatile is not necessary here for correctness, but this data _is_ volatile - // so I've marked it as such. - volatile uint8 received_signal_[kNumPosixSignals]; -+}; -+ -+PosixSignalHandler PosixSignalHandler::instance_; -+ -+class PosixSignalDispatcher : public Dispatcher { -+ public: -+ PosixSignalDispatcher(PhysicalSocketServer *owner) : owner_(owner) { -+ owner_->Add(this); -+ } -+ -+ virtual ~PosixSignalDispatcher() { -+ owner_->Remove(this); -+ } -+ -+ virtual uint32 GetRequestedEvents() { -+ return DE_READ; -+ } -+ -+ virtual void OnPreEvent(uint32 ff) { -+ // Events might get grouped if signals come very fast, so we read out up to -+ // 16 bytes to make sure we keep the pipe empty. -+ uint8 b[16]; -+ ssize_t ret = read(GetDescriptor(), b, sizeof(b)); -+ if (ret < 0) { -+ LOG_ERR(LS_WARNING) << "Error in read()"; -+ } else if (ret == 0) { -+ LOG(LS_WARNING) << "Should have read at least one byte"; -+ } -+ } -+ -+ virtual void OnEvent(uint32 ff, int err) { -+ for (int signum = 0; signum < PosixSignalHandler::kNumPosixSignals; -+ ++signum) { -+ if (PosixSignalHandler::Instance()->IsSignalSet(signum)) { -+ PosixSignalHandler::Instance()->ClearSignal(signum); -+ HandlerMap::iterator i = handlers_.find(signum); -+ if (i == handlers_.end()) { -+ // This can happen if a signal is delivered to our process at around -+ // the same time as we unset our handler for it. It is not an error -+ // condition, but it's unusual enough to be worth logging. -+ LOG(LS_INFO) << "Received signal with no handler: " << signum; -+ } else { -+ // Otherwise, execute our handler. -+ (*i->second)(signum); -+ } -+ } -+ } -+ } -+ -+ virtual int GetDescriptor() { -+ return PosixSignalHandler::Instance()->GetDescriptor(); -+ } -+ -+ virtual bool IsDescriptorClosed() { -+ return false; -+ } -+ -+ void SetHandler(int signum, void (*handler)(int)) { -+ handlers_[signum] = handler; -+ } -+ -+ void ClearHandler(int signum) { -+ handlers_.erase(signum); -+ } -+ -+ bool HasHandlers() { -+ return !handlers_.empty(); -+ } -+ -+ private: -+ typedef std::map<int, void (*)(int)> HandlerMap; -+ -+ HandlerMap handlers_; - // Our owner. - PhysicalSocketServer *owner_; -- // To synchronize ownership changes. -- CriticalSection owner_critsec_; - }; - --PosixSignalDeliveryDispatcher PosixSignalDeliveryDispatcher::instance_; -- - class SocketDispatcher : public Dispatcher, public PhysicalSocket { - public: - explicit SocketDispatcher(PhysicalSocketServer *ss) : PhysicalSocket(ss) { -@@ -994,9 +1014,16 @@ class SocketDispatcher : public Dispatch - bool signal_close_; - int signal_err_; - -- SocketDispatcher(PhysicalSocketServer* ss) : PhysicalSocket(ss), id_(0), signal_close_(false) { -+ SocketDispatcher(PhysicalSocketServer* ss) -+ : PhysicalSocket(ss), -+ id_(0), -+ signal_close_(false) { - } -- SocketDispatcher(SOCKET s, PhysicalSocketServer* ss) : PhysicalSocket(ss, s), id_(0), signal_close_(false) { -+ -+ SocketDispatcher(SOCKET s, PhysicalSocketServer* ss) -+ : PhysicalSocket(ss, s), -+ id_(0), -+ signal_close_(false) { - } - - virtual ~SocketDispatcher() { -@@ -1069,7 +1096,6 @@ class SocketDispatcher : public Dispatch - SignalReadEvent(this); - } - if (((ff & DE_CLOSE) != 0) && (id_ == cache_id)) { -- //LOG(INFO) << "SOCK[" << static_cast<int>(s_) << "] OnClose() Error: " << err; - signal_close_ = true; - signal_err_ = err; - } -@@ -1134,7 +1160,7 @@ PhysicalSocketServer::~PhysicalSocketSer - WSACloseEvent(socket_ev_); - #endif - #ifdef POSIX -- PosixSignalDeliveryDispatcher::instance_.ClearOwner(this); -+ signal_dispatcher_.reset(); - #endif - delete signal_wakeup_; - ASSERT(dispatchers_.empty()); -@@ -1355,7 +1381,7 @@ bool PhysicalSocketServer::Wait(int cmsW - } - - static void GlobalSignalHandler(int signum) { -- PosixSignalDeliveryDispatcher::instance_.OnPosixSignalReceived(signum); -+ PosixSignalHandler::Instance()->OnPosixSignalReceived(signum); - } - - bool PhysicalSocketServer::SetPosixSignalHandler(int signum, -@@ -1366,19 +1392,17 @@ bool PhysicalSocketServer::SetPosixSigna - if (!InstallSignal(signum, handler)) { - return false; - } -- if (PosixSignalDeliveryDispatcher::instance_.IsOwner(this)) { -- PosixSignalDeliveryDispatcher::instance_.ClearHandler(signum); -- if (!PosixSignalDeliveryDispatcher::instance_.HasHandlers()) { -- PosixSignalDeliveryDispatcher::instance_.ClearOwner(this); -+ if (signal_dispatcher_.get()) { -+ signal_dispatcher_->ClearHandler(signum); -+ if (!signal_dispatcher_->HasHandlers()) { -+ signal_dispatcher_.reset(); - } - } - } else { -- if (!PosixSignalDeliveryDispatcher::instance_.SetOwner(this)) { -- LOG(LS_ERROR) << -- "Cannot do POSIX signal delivery on more than one PhysicalSocketServer"; -- return false; -+ if (!signal_dispatcher_.get()) { -+ signal_dispatcher_.reset(new PosixSignalDispatcher(this)); - } -- PosixSignalDeliveryDispatcher::instance_.SetHandler(signum, handler); -+ signal_dispatcher_->SetHandler(signum, handler); - if (!InstallSignal(signum, &GlobalSignalHandler)) { - return false; - } -@@ -1439,7 +1463,9 @@ bool PhysicalSocketServer::Wait(int cmsW - if (disp->CheckSignalClose()) { - // We just signalled close, don't poll this socket - } else if (s != INVALID_SOCKET) { -- WSAEventSelect(s, events[0], FlagsToEvents(disp->GetRequestedEvents())); -+ WSAEventSelect(s, -+ events[0], -+ FlagsToEvents(disp->GetRequestedEvents())); - } else { - events.push_back(disp->GetWSAEvent()); - event_owners.push_back(disp); -@@ -1459,14 +1485,19 @@ bool PhysicalSocketServer::Wait(int cmsW - } - - // Wait for one of the events to signal -- DWORD dw = WSAWaitForMultipleEvents(static_cast<DWORD>(events.size()), &events[0], false, cmsNext, false); -+ DWORD dw = WSAWaitForMultipleEvents(static_cast<DWORD>(events.size()), -+ &events[0], -+ false, -+ cmsNext, -+ false); - - #if 0 // LOGGING - // we track this information purely for logging purposes. - last_tick_dispatch_count_++; - if (last_tick_dispatch_count_ >= 1000) { - int32 elapsed = TimeSince(last_tick_tracked_); -- LOG(INFO) << "PhysicalSocketServer took " << elapsed << "ms for 1000 events"; -+ LOG(INFO) << "PhysicalSocketServer took " << elapsed -+ << "ms for 1000 events"; - - // If we get more than 1000 events in a second, we are spinning badly - // (normally it should take about 8-20 seconds). -@@ -1510,20 +1541,30 @@ bool PhysicalSocketServer::Wait(int cmsW - - #if LOGGING - { -- if ((wsaEvents.lNetworkEvents & FD_READ) && wsaEvents.iErrorCode[FD_READ_BIT] != 0) { -- LOG(WARNING) << "PhysicalSocketServer got FD_READ_BIT error " << wsaEvents.iErrorCode[FD_READ_BIT]; -+ if ((wsaEvents.lNetworkEvents & FD_READ) && -+ wsaEvents.iErrorCode[FD_READ_BIT] != 0) { -+ LOG(WARNING) << "PhysicalSocketServer got FD_READ_BIT error " -+ << wsaEvents.iErrorCode[FD_READ_BIT]; - } -- if ((wsaEvents.lNetworkEvents & FD_WRITE) && wsaEvents.iErrorCode[FD_WRITE_BIT] != 0) { -- LOG(WARNING) << "PhysicalSocketServer got FD_WRITE_BIT error " << wsaEvents.iErrorCode[FD_WRITE_BIT]; -+ if ((wsaEvents.lNetworkEvents & FD_WRITE) && -+ wsaEvents.iErrorCode[FD_WRITE_BIT] != 0) { -+ LOG(WARNING) << "PhysicalSocketServer got FD_WRITE_BIT error " -+ << wsaEvents.iErrorCode[FD_WRITE_BIT]; - } -- if ((wsaEvents.lNetworkEvents & FD_CONNECT) && wsaEvents.iErrorCode[FD_CONNECT_BIT] != 0) { -- LOG(WARNING) << "PhysicalSocketServer got FD_CONNECT_BIT error " << wsaEvents.iErrorCode[FD_CONNECT_BIT]; -+ if ((wsaEvents.lNetworkEvents & FD_CONNECT) && -+ wsaEvents.iErrorCode[FD_CONNECT_BIT] != 0) { -+ LOG(WARNING) << "PhysicalSocketServer got FD_CONNECT_BIT error " -+ << wsaEvents.iErrorCode[FD_CONNECT_BIT]; - } -- if ((wsaEvents.lNetworkEvents & FD_ACCEPT) && wsaEvents.iErrorCode[FD_ACCEPT_BIT] != 0) { -- LOG(WARNING) << "PhysicalSocketServer got FD_ACCEPT_BIT error " << wsaEvents.iErrorCode[FD_ACCEPT_BIT]; -+ if ((wsaEvents.lNetworkEvents & FD_ACCEPT) && -+ wsaEvents.iErrorCode[FD_ACCEPT_BIT] != 0) { -+ LOG(WARNING) << "PhysicalSocketServer got FD_ACCEPT_BIT error " -+ << wsaEvents.iErrorCode[FD_ACCEPT_BIT]; - } -- if ((wsaEvents.lNetworkEvents & FD_CLOSE) && wsaEvents.iErrorCode[FD_CLOSE_BIT] != 0) { -- LOG(WARNING) << "PhysicalSocketServer got FD_CLOSE_BIT error " << wsaEvents.iErrorCode[FD_CLOSE_BIT]; -+ if ((wsaEvents.lNetworkEvents & FD_CLOSE) && -+ wsaEvents.iErrorCode[FD_CLOSE_BIT] != 0) { -+ LOG(WARNING) << "PhysicalSocketServer got FD_CLOSE_BIT error " -+ << wsaEvents.iErrorCode[FD_CLOSE_BIT]; - } - } - #endif -diff -upN libjingle-0.5.2/talk/base/physicalsocketserver.h.chromium12 libjingle-0.5.2/talk/base/physicalsocketserver.h ---- libjingle-0.5.2/talk/base/physicalsocketserver.h.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/physicalsocketserver.h 2011-03-30 21:51:32.698287001 -0400 -@@ -31,6 +31,7 @@ - #include <vector> - - #include "talk/base/asyncfile.h" -+#include "talk/base/scoped_ptr.h" - #include "talk/base/socketserver.h" - #include "talk/base/criticalsection.h" - -@@ -51,7 +52,7 @@ enum DispatcherEvent { - - class Signaler; - #ifdef POSIX --class PosixSignalDeliveryDispatcher; -+class PosixSignalDispatcher; - #endif - - class Dispatcher { -@@ -99,9 +100,8 @@ public: - // manipulate user-level data structures. - // "handler" may be SIG_IGN, SIG_DFL, or a user-specified function, just like - // with signal(2). -- // Only one PhysicalSocketServer may have user-level signal handlers. -- // Attempting to install a signal handler for a PhysicalSocketServer when -- // another already owns some will fail. -+ // Only one PhysicalSocketServer should have user-level signal handlers. -+ // Dispatching signals on multiple PhysicalSocketServers is not reliable. - // The signal mask is not modified. It is the caller's responsibily to - // maintain it as desired. - bool SetPosixSignalHandler(int signum, void (*handler)(int)); -@@ -113,8 +113,9 @@ private: - - #ifdef POSIX - static bool InstallSignal(int signum, void (*handler)(int)); --#endif - -+ scoped_ptr<PosixSignalDispatcher> signal_dispatcher_; -+#endif - DispatcherList dispatchers_; - IteratorList iterators_; - Signaler* signal_wakeup_; -diff -upN libjingle-0.5.2/talk/base/socketpool.cc.chromium12 libjingle-0.5.2/talk/base/socketpool.cc ---- libjingle-0.5.2/talk/base/socketpool.cc.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/socketpool.cc 2011-03-30 21:51:32.699287001 -0400 -@@ -218,11 +218,25 @@ ReuseSocketPool::ReturnConnectedStream(S - - void - ReuseSocketPool::OnStreamEvent(StreamInterface* stream, int events, int err) { -- LOG_F(LS_VERBOSE) << "Connection closed with error: " << err; - ASSERT(stream == stream_); - ASSERT(!checked_out_); -- ASSERT(0 != (events & SE_CLOSE)); -- // Socket has closed. We'll reconnect it the next time it is used. -+ -+ // If the stream was written to and then immediately returned to us then -+ // we may get a writable notification for it, which we should ignore. -+ if (events == SE_WRITE) { -+ LOG_F(LS_VERBOSE) << "Pooled Socket unexpectedly writable: ignoring"; -+ return; -+ } -+ -+ // If the peer sent data, we can't process it, so drop the connection. -+ // If the socket has closed, clean it up. -+ // In either case, we'll reconnect it the next time it is used. -+ ASSERT(0 != (events & (SE_READ|SE_CLOSE))); -+ if (0 != (events & SE_CLOSE)) { -+ LOG_F(LS_VERBOSE) << "Connection closed with error: " << err; -+ } else { -+ LOG_F(LS_VERBOSE) << "Pooled Socket unexpectedly readable: closing"; -+ } - stream_->Close(); - } - -diff -upN libjingle-0.5.2/talk/base/socketpool.h.chromium12 libjingle-0.5.2/talk/base/socketpool.h ---- libjingle-0.5.2/talk/base/socketpool.h.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/socketpool.h 2011-03-30 21:51:32.699287001 -0400 -@@ -25,8 +25,8 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#ifndef TALK_BASE_SOCKETPOOL_H__ --#define TALK_BASE_SOCKETPOOL_H__ -+#ifndef TALK_BASE_SOCKETPOOL_H_ -+#define TALK_BASE_SOCKETPOOL_H_ - - #include <deque> - #include <list> -@@ -155,6 +155,6 @@ private: - - ////////////////////////////////////////////////////////////////////// - --} // namespace talk_base -+} // namespace talk_base - --#endif // TALK_BASE_SOCKETPOOL_H__ -+#endif // TALK_BASE_SOCKETPOOL_H_ -diff -upN libjingle-0.5.2/talk/base/stream.cc.chromium12 libjingle-0.5.2/talk/base/stream.cc ---- libjingle-0.5.2/talk/base/stream.cc.chromium12 2011-03-30 21:51:32.664287001 -0400 -+++ libjingle-0.5.2/talk/base/stream.cc 2011-03-30 21:51:32.699287001 -0400 -@@ -1,6 +1,6 @@ - /* - * libjingle -- * Copyright 2004--2010, Google Inc. -+ * Copyright 2011, Google Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: -@@ -552,7 +552,8 @@ void POpenStream::DoClose() { - /////////////////////////////////////////////////////////////////////////////// - - MemoryStreamBase::MemoryStreamBase() -- : buffer_(NULL), buffer_length_(0), data_length_(0), seek_position_(0) { -+ : buffer_(NULL), buffer_length_(0), data_length_(0), -+ seek_position_(0) { - } - - StreamState MemoryStreamBase::GetState() const { -@@ -647,25 +648,29 @@ StreamResult MemoryStreamBase::DoReserve - - /////////////////////////////////////////////////////////////////////////////// - --MemoryStream::MemoryStream() { -+MemoryStream::MemoryStream() -+ : buffer_alloc_(NULL) { - } - --MemoryStream::MemoryStream(const char* data) { -+MemoryStream::MemoryStream(const char* data) -+ : buffer_alloc_(NULL) { - SetData(data, strlen(data)); - } - --MemoryStream::MemoryStream(const void* data, size_t length) { -+MemoryStream::MemoryStream(const void* data, size_t length) -+ : buffer_alloc_(NULL) { - SetData(data, length); - } - - MemoryStream::~MemoryStream() { -- delete [] buffer_; -+ delete [] buffer_alloc_; - } - - void MemoryStream::SetData(const void* data, size_t length) { - data_length_ = buffer_length_ = length; -- delete [] buffer_; -- buffer_ = new char[buffer_length_]; -+ delete [] buffer_alloc_; -+ buffer_alloc_ = new char[buffer_length_ + kAlignment]; -+ buffer_ = reinterpret_cast<char*>(ALIGNP(buffer_alloc_, kAlignment)); - memcpy(buffer_, data, data_length_); - seek_position_ = 0; - } -@@ -674,9 +679,12 @@ StreamResult MemoryStream::DoReserve(siz - if (buffer_length_ >= size) - return SR_SUCCESS; - -- if (char* new_buffer = new char[size]) { -+ if (char* new_buffer_alloc = new char[size + kAlignment]) { -+ char* new_buffer = reinterpret_cast<char*>( -+ ALIGNP(new_buffer_alloc, kAlignment)); - memcpy(new_buffer, buffer_, data_length_); -- delete [] buffer_; -+ delete [] buffer_alloc_; -+ buffer_alloc_ = new_buffer_alloc; - buffer_ = new_buffer; - buffer_length_ = size; - return SR_SUCCESS; -diff -upN libjingle-0.5.2/talk/base/stream.h.chromium12 libjingle-0.5.2/talk/base/stream.h ---- libjingle-0.5.2/talk/base/stream.h.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/stream.h 2011-03-30 21:51:32.700287001 -0400 -@@ -530,6 +530,9 @@ class MemoryStream : public MemoryStream - - protected: - virtual StreamResult DoReserve(size_t size, int* error); -+ // Memory Streams are aligned for efficiency. -+ static const int kAlignment = 16; -+ char* buffer_alloc_; - }; - - // ExternalMemoryStream adapts an external memory buffer, so writes which would -diff -upN libjingle-0.5.2/talk/base/stringencode.cc.chromium12 libjingle-0.5.2/talk/base/stringencode.cc ---- libjingle-0.5.2/talk/base/stringencode.cc.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/stringencode.cc 2011-03-30 21:51:32.700287001 -0400 -@@ -1,27 +1,27 @@ - /* - * libjingle -- * Copyright 2004--2005, Google Inc. -+ * Copyright 2011, Google Inc. - * -- * Redistribution and use in source and binary forms, with or without -+ * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * -- * 1. Redistributions of source code must retain the above copyright notice, -+ * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. -- * 3. The name of the author may not be used to endorse or promote products -+ * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -@@ -168,7 +168,7 @@ const unsigned char HTML_UNSAFE = 0x2; / - - // ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 6 5 7 8 9 : ; < = > ? - //@ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ --//` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ -+//` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ - - const unsigned char ASCII_CLASS[128] = { - 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, -@@ -251,7 +251,7 @@ size_t utf8_decode(const char* source, s - return 0; - } - value16 = (value16 << 6) | (s[2] & 0x3F); -- if ((s[0] & 0xF0) == 0xE0) { // Check s[0] == 1110xxxx -+ if ((s[0] & 0xF0) == 0xE0) { // Check s[0] == 1110xxxx - *value = ((s[0] & 0x0F) << 12) | value16; - return 3; - } -@@ -259,7 +259,7 @@ size_t utf8_decode(const char* source, s - return 0; - } - value16 = (value16 << 6) | (s[3] & 0x3F); -- if ((s[0] & 0xF8) == 0xF0) { // Check s[0] == 11110xxx -+ if ((s[0] & 0xF8) == 0xF0) { // Check s[0] == 11110xxx - *value = ((s[0] & 0x07) << 18) | value16; - return 4; - } -@@ -511,8 +511,8 @@ std::string s_transform(const std::strin - return result; - } - --size_t split(const std::string& source, char delimiter, -- std::vector<std::string>* fields) { -+size_t tokenize(const std::string& source, char delimiter, -+ std::vector<std::string>* fields) { - ASSERT(NULL != fields); - fields->clear(); - size_t last = 0; -@@ -530,20 +530,19 @@ size_t split(const std::string& source, - return fields->size(); - } - --std::string split_one(const std::string& source, char delimiter, int* index) { -- std::string substring; -- size_t start = source.find_first_not_of(delimiter, *index); -- size_t end = source.find_first_of(delimiter, start); -- if (start != std::string::npos) { -- if (end == std::string::npos) { -- substring = source.substr(start); -- *index = source.length(); -- } else { -- substring = source.substr(start, end - start); -- *index = source.find_first_not_of(delimiter, end); -+size_t split(const std::string& source, char delimiter, -+ std::vector<std::string>* fields) { -+ ASSERT(NULL != fields); -+ fields->clear(); -+ size_t last = 0; -+ for (size_t i = 0; i < source.length(); ++i) { -+ if (source[i] == delimiter) { -+ fields->push_back(source.substr(last, i - last)); -+ last = i + 1; - } - } -- return substring; -+ fields->push_back(source.substr(last, source.length() - last)); -+ return fields->size(); - } - - char make_char_safe_for_filename(char c) { -diff -upN libjingle-0.5.2/talk/base/stringencode.h.chromium12 libjingle-0.5.2/talk/base/stringencode.h ---- libjingle-0.5.2/talk/base/stringencode.h.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/stringencode.h 2011-03-30 21:51:32.700287001 -0400 -@@ -1,27 +1,27 @@ - /* - * libjingle -- * Copyright 2004--2005, Google Inc. -+ * Copyright 2011, Google Inc. - * -- * Redistribution and use in source and binary forms, with or without -+ * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * -- * 1. Redistributions of source code must retain the above copyright notice, -+ * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. -- * 3. The name of the author may not be used to endorse or promote products -+ * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -@@ -58,7 +58,7 @@ size_t escape(char * buffer, size_t bufl - // Note: in-place unescaping (buffer == source) is allowed. - size_t unescape(char * buffer, size_t buflen, - const char * source, size_t srclen, -- char escape); -+ char escape); - - // Encoding replaces illegal characters with the escape character and 2 hex - // chars, so it's a little less compact than escape, but completely removes -@@ -125,14 +125,15 @@ inline std::string s_url_decode(const st - return s_transform(source, url_decode); - } - --// Splits the source string into multiple fields separated by delimiter. -+// Splits the source string into multiple fields separated by delimiter, -+// with duplicates of delimiter creating empty fields. - size_t split(const std::string& source, char delimiter, - std::vector<std::string>* fields); - --// Returns the first part of a string separated by delimiter. --// Index indicates the location to start parsing in the string and --// is increased to the start of the next substring. --std::string split_one(const std::string& source, char delimiter, int* index); -+// Splits the source string into multiple fields separated by delimiter, -+// with duplicates of delimiter ignored. Trailing delimiter ignored. -+size_t tokenize(const std::string& source, char delimiter, -+ std::vector<std::string>* fields); - - // Safe sprintf to std::string - //void sprintf(std::string& value, size_t maxlen, const char * format, ...) -diff -upN libjingle-0.5.2/talk/base/stringutils.cc.chromium12 libjingle-0.5.2/talk/base/stringutils.cc ---- libjingle-0.5.2/talk/base/stringutils.cc.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/stringutils.cc 2011-03-30 21:51:32.701287001 -0400 -@@ -2,26 +2,26 @@ - * libjingle - * Copyright 2004--2005, Google Inc. - * -- * Redistribution and use in source and binary forms, with or without -+ * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * -- * 1. Redistributions of source code must retain the above copyright notice, -+ * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. -- * 3. The name of the author may not be used to endorse or promote products -+ * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -@@ -33,7 +33,7 @@ namespace talk_base { - bool memory_check(const void* memory, int c, size_t count) { - const char* char_memory = static_cast<const char*>(memory); - char char_c = static_cast<char>(c); -- for (size_t i=0; i<count; ++i) { -+ for (size_t i = 0; i < count; ++i) { - if (char_memory[i] != char_c) { - return false; - } -@@ -88,7 +88,7 @@ size_t asccpyn(wchar_t* buffer, size_t b - const char* source, size_t srclen) { - if (buflen <= 0) - return 0; -- -+ - if (srclen == SIZE_UNKNOWN) { - srclen = strlenn(source, buflen - 1); - } else if (srclen >= buflen) { -@@ -129,4 +129,17 @@ bool starts_with(const char *s1, const c - return true; - } - -+static const std::string kWhitespace(" \n\r\t"); -+ -+std::string string_trim(const std::string& s) { -+ std::string::size_type first = s.find_first_not_of(kWhitespace); -+ std::string::size_type last = s.find_last_not_of(kWhitespace); -+ -+ if (first == std::string::npos || last == std::string::npos) { -+ return std::string(""); -+ } -+ -+ return s.substr(first, last - first + 1); -+} -+ - } // namespace talk_base -diff -upN libjingle-0.5.2/talk/base/stringutils.h.chromium12 libjingle-0.5.2/talk/base/stringutils.h ---- libjingle-0.5.2/talk/base/stringutils.h.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/stringutils.h 2011-03-30 21:51:32.701287001 -0400 -@@ -332,6 +332,9 @@ void replace_substrs(const char *search, - // True iff s1 starts with s2. - bool starts_with(const char *s1, const char *s2); - -+// Remove leading and trailing whitespaces. -+std::string string_trim(const std::string& s); -+ - } // namespace talk_base - - #endif // TALK_BASE_STRINGUTILS_H__ -diff -upN libjingle-0.5.2/talk/examples/call/callclient.cc.chromium12 libjingle-0.5.2/talk/examples/call/callclient.cc ---- libjingle-0.5.2/talk/examples/call/callclient.cc.chromium12 2011-01-11 19:25:51.000000000 -0500 -+++ libjingle-0.5.2/talk/examples/call/callclient.cc 2011-03-30 21:51:32.701287001 -0400 -@@ -29,19 +29,14 @@ - - #include <string> - --#include "talk/xmpp/constants.h" -+#include "talk/base/basicpacketsocketfactory.h" - #include "talk/base/helpers.h" --#include "talk/base/thread.h" -+#include "talk/base/logging.h" - #include "talk/base/network.h" - #include "talk/base/socketaddress.h" --#include "talk/base/stringutils.h" - #include "talk/base/stringencode.h" --#include "talk/p2p/base/sessionmanager.h" --#include "talk/p2p/client/basicportallocator.h" --#include "talk/p2p/client/sessionmanagertask.h" --#include "talk/session/phone/devicemanager.h" --#include "talk/session/phone/mediaengine.h" --#include "talk/session/phone/mediasessionclient.h" -+#include "talk/base/stringutils.h" -+#include "talk/base/thread.h" - #include "talk/examples/call/console.h" - #include "talk/examples/call/presencepushtask.h" - #include "talk/examples/call/presenceouttask.h" -@@ -50,11 +45,14 @@ - #include "talk/examples/call/friendinvitesendtask.h" - #include "talk/examples/call/muc.h" - #include "talk/examples/call/voicemailjidrequester.h" --#ifdef USE_TALK_SOUND --#include "talk/sound/platformsoundsystemfactory.h" --#endif -+#include "talk/p2p/base/sessionmanager.h" -+#include "talk/p2p/client/basicportallocator.h" -+#include "talk/p2p/client/sessionmanagertask.h" -+#include "talk/session/phone/devicemanager.h" -+#include "talk/session/phone/mediaengine.h" -+#include "talk/session/phone/mediasessionclient.h" -+#include "talk/xmpp/constants.h" - --#include "talk/base/logging.h" - - class NullRenderer : public cricket::VideoRenderer { - public: -@@ -250,11 +248,7 @@ CallClient::CallClient(buzz::XmppClient* - portallocator_flags_(0), - allow_local_ips_(false), - initial_protocol_(cricket::PROTOCOL_HYBRID), -- secure_policy_(cricket::SEC_DISABLED) --#ifdef USE_TALK_SOUND -- , sound_system_factory_(NULL) --#endif -- { -+ secure_policy_(cricket::SEC_DISABLED) { - xmpp_client_->SignalStateChange.connect(this, &CallClient::OnStateChange); - } - -@@ -342,14 +336,19 @@ void CallClient::InitPhone() { - // dispatched by it. - worker_thread_->Start(); - -+ // TODO: It looks like we are leaking many -+ // objects. E.g. |network_manager_| and |socket_factory_| are never -+ // deleted. -+ - network_manager_ = new talk_base::NetworkManager(); -+ socket_factory_ = new talk_base::BasicPacketSocketFactory(worker_thread_); - - // TODO: Decide if the relay address should be specified here. - talk_base::SocketAddress stun_addr("stun.l.google.com", 19302); -- port_allocator_ = -- new cricket::BasicPortAllocator(network_manager_, stun_addr, -- talk_base::SocketAddress(), talk_base::SocketAddress(), -- talk_base::SocketAddress()); -+ port_allocator_ = new cricket::BasicPortAllocator( -+ network_manager_, socket_factory_, stun_addr, -+ talk_base::SocketAddress(), talk_base::SocketAddress(), -+ talk_base::SocketAddress()); - - if (portallocator_flags_ != 0) { - port_allocator_->set_flags(portallocator_flags_); -@@ -367,29 +366,15 @@ void CallClient::InitPhone() { - session_manager_task_->EnableOutgoingMessages(); - session_manager_task_->Start(); - --#ifdef USE_TALK_SOUND -- if (!sound_system_factory_) { -- sound_system_factory_ = new cricket::PlatformSoundSystemFactory(); -- } --#endif -- - if (!media_engine_) { -- media_engine_ = cricket::MediaEngine::Create( --#ifdef USE_TALK_SOUND -- sound_system_factory_ --#endif -- ); -+ media_engine_ = cricket::MediaEngine::Create(); - } - - media_client_ = new cricket::MediaSessionClient( - xmpp_client_->jid(), - session_manager_, - media_engine_, -- new cricket::DeviceManager( --#ifdef USE_TALK_SOUND -- sound_system_factory_ --#endif -- )); -+ new cricket::DeviceManager()); - media_client_->SignalCallCreate.connect(this, &CallClient::OnCallCreate); - media_client_->SignalDevicesChange.connect(this, - &CallClient::OnDevicesChange); -diff -upN libjingle-0.5.2/talk/examples/call/callclient.h.chromium12 libjingle-0.5.2/talk/examples/call/callclient.h ---- libjingle-0.5.2/talk/examples/call/callclient.h.chromium12 2011-01-11 19:25:51.000000000 -0500 -+++ libjingle-0.5.2/talk/examples/call/callclient.h 2011-03-30 21:51:32.701287001 -0400 -@@ -38,9 +38,6 @@ - #include "talk/xmpp/xmppclient.h" - #include "talk/examples/call/status.h" - #include "talk/examples/call/console.h" --#ifdef USE_TALK_SOUND --#include "talk/sound/soundsystemfactory.h" --#endif - - namespace buzz { - class PresencePushTask; -@@ -92,7 +89,7 @@ class CallClient: public sigslot::has_sl - auto_accept_ = auto_accept; - } - void SetPmucDomain(const std::string &pmuc_domain) { -- pmuc_domain_ = pmuc_domain; -+ pmuc_domain_ = pmuc_domain; - } - void SetConsole(Console *console) { - console_ = console; -@@ -171,6 +168,7 @@ class CallClient: public sigslot::has_sl - buzz::XmppClient* xmpp_client_; - talk_base::Thread* worker_thread_; - talk_base::NetworkManager* network_manager_; -+ talk_base::PacketSocketFactory* socket_factory_; - cricket::PortAllocator* port_allocator_; - cricket::SessionManager* session_manager_; - cricket::SessionManagerTask* session_manager_task_; -@@ -199,9 +197,6 @@ class CallClient: public sigslot::has_sl - cricket::SignalingProtocol initial_protocol_; - cricket::SecureMediaPolicy secure_policy_; - std::string last_sent_to_; --#ifdef USE_TALK_SOUND -- cricket::SoundSystemFactory* sound_system_factory_; --#endif - }; - - #endif // TALK_EXAMPLES_CALL_CALLCLIENT_H_ -diff -upN libjingle-0.5.2/talk/libjingle.scons.chromium12 libjingle-0.5.2/talk/libjingle.scons ---- libjingle-0.5.2/talk/libjingle.scons.chromium12 2011-01-11 19:25:51.000000000 -0500 -+++ libjingle-0.5.2/talk/libjingle.scons 2011-03-30 21:51:32.702287001 -0400 -@@ -56,7 +56,9 @@ talk.Library(env, name = "libsrtp", - ) - talk.Library(env, name = "libjingle", - lin_srcs = [ -+ "base/latebindingsymboltable.cc", - "base/linux.cc", -+ "session/phone/libudevsymboltable.cc", - "session/phone/v4llookup.cc", - ], - mac_srcs = [ -@@ -80,12 +82,12 @@ talk.Library(env, name = "libjingle", - srcs = [ - "base/asyncfile.cc", - "base/asynchttprequest.cc", -- "base/asyncpacketsocket.cc", - "base/asyncsocket.cc", - "base/asynctcpsocket.cc", - "base/asyncudpsocket.cc", - "base/autodetectproxy.cc", - "base/base64.cc", -+ "base/basicpacketsocketfactory.cc", - "base/bytebuffer.cc", - "base/checks.cc", - "base/common.cc", -@@ -100,7 +102,6 @@ talk.Library(env, name = "libjingle", - "base/httpclient.cc", - "base/httpcommon.cc", - "base/httprequest.cc", -- "base/latebindingsymboltable.cc", - "base/logging.cc", - "base/md5c.c", - "base/messagehandler.cc", -@@ -166,7 +167,6 @@ talk.Library(env, name = "libjingle", - "session/phone/channelmanager.cc", - "session/phone/codec.cc", - "session/phone/devicemanager.cc", -- "session/phone/libudevsymboltable.cc", - "session/phone/filemediaengine.cc", - "session/phone/mediaengine.cc", - "session/phone/mediamonitor.cc", -diff -upN libjingle-0.5.2/talk/main.scons.chromium12 libjingle-0.5.2/talk/main.scons ---- libjingle-0.5.2/talk/main.scons.chromium12 2011-01-11 19:25:51.000000000 -0500 -+++ libjingle-0.5.2/talk/main.scons 2011-03-30 21:51:32.702287001 -0400 -@@ -188,7 +188,7 @@ win_dbg_env = win_env.Clone( - ) - - win_dbg_env.Prepend( -- CCFLAGS=[ -+ CCFLAGS = [ - '/ZI', # enable debugging - '/Od', # disable optimizations - '/MTd', # link with LIBCMTD.LIB debug lib -@@ -198,6 +198,21 @@ win_dbg_env.Prepend( - - envs.append(win_dbg_env) - -+win_coverage_env = win_dbg_env.Clone( -+ tools = ['code_coverage'], -+ BUILD_TYPE = 'coverage', -+ BUILD_TYPE_DESCRIPTION = 'Windows code coverage build', -+ BUILD_GROUPS = ['all'], -+) -+ -+win_coverage_env.Append( -+ CPPDEFINES = [ -+ 'COVERAGE_ENABLED', -+ ], -+) -+ -+envs.append(win_coverage_env) -+ - win_opt_env = win_env.Clone( - BUILD_TYPE = 'opt', - BUILD_TYPE_DESCRIPTION = 'Windows opt build', -@@ -285,6 +300,7 @@ mac_env.Append( - 'SystemConfiguration', - 'OpenGL', - 'CoreAudio', -+ 'Quartz', - 'QuickTime', - 'Cocoa', - 'QTKit', -@@ -334,9 +350,7 @@ linux_common_env.Append( - CPPDEFINES = [ - 'LINUX', - 'HAVE_GLIB', -- # TODO() Enable once we figure out multiple defines with gips lib -- # Also consider other linux flags: 64bit, no-strict-aliasing, wrap, etc -- #'USE_TALK_SOUND', -+# 'HAVE_DBUS_GLIB', - ], - CCFLAGS = [ - # TODO: Some or all of this may be desirable for Mac too. -@@ -469,6 +483,7 @@ if win_env.Bit('vsproj'): - - # Solution and target projects - s = vs_env.ComponentVSSolution( -+ # 'libjingle', # Please uncomment this line if you build VS proj files. - ['all_libraries', 'all_programs', 'all_test_programs'], - projects = [p], - ) -diff -upN libjingle-0.5.2/talk/p2p/base/common.h.chromium12 libjingle-0.5.2/talk/p2p/base/common.h ---- libjingle-0.5.2/talk/p2p/base/common.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/common.h 2011-03-30 21:51:32.702287001 -0400 -@@ -25,12 +25,13 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#ifndef CRICKET_P2P_BASE_COMMON_H__ --#define CRICKET_P2P_BASE_COMMON_H__ -+#ifndef TALK_P2P_BASE_COMMON_H_ -+#define TALK_P2P_BASE_COMMON_H_ - - #include "talk/base/logging.h" - - // Common log description format for jingle messages --#define LOG_J(sev,obj) LOG(sev) << "Jingle:" << obj->ToString() << ": " -+#define LOG_J(sev, obj) LOG(sev) << "Jingle:" << obj->ToString() << ": " -+#define LOG_JV(sev, obj) LOG_V(sev) << "Jingle:" << obj->ToString() << ": " - --#endif // CRICKET_P2P_BASE_COMMON_H__ -+#endif // TALK_P2P_BASE_COMMON_H_ -diff -upN libjingle-0.5.2/talk/p2p/base/constants.cc.chromium12 libjingle-0.5.2/talk/p2p/base/constants.cc ---- libjingle-0.5.2/talk/p2p/base/constants.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/constants.cc 2011-03-30 21:51:32.702287001 -0400 -@@ -65,6 +65,7 @@ const std::string GINGLE_ACTION_TERMINAT - const std::string GINGLE_ACTION_CANDIDATES("candidates"); - const std::string GINGLE_ACTION_NOTIFY("notify"); - const std::string GINGLE_ACTION_UPDATE("update"); -+const std::string GINGLE_ACTION_VIEW("view"); - - const std::string LN_ERROR("error"); - const buzz::QName QN_GINGLE_REDIRECT(true, NS_GINGLE, "redirect"); -@@ -75,6 +76,7 @@ const std::string STR_REDIRECT_PREFIX("x - const std::string LN_DESCRIPTION("description"); - const std::string LN_PAYLOADTYPE("payload-type"); - const buzz::QName QN_ID(true, NS_EMPTY, "id"); -+const buzz::QName QN_SID(true, NS_EMPTY, "sid"); - const buzz::QName QN_NAME(true, NS_EMPTY, "name"); - const buzz::QName QN_CLOCKRATE(true, NS_EMPTY, "clockrate"); - const buzz::QName QN_BITRATE(true, NS_EMPTY, "bitrate"); -@@ -190,6 +192,34 @@ const std::string STR_TERMINATE_PROTOCOL - const std::string STR_TERMINATE_INTERNAL_SERVER_ERROR("internal-server-error"); - const std::string STR_TERMINATE_UNKNOWN_ERROR("unknown-error"); - -+// Session notify messages -+const buzz::QName QN_GINGLE_NOTIFY(true, NS_GINGLE, "notify"); -+const buzz::QName QN_GINGLE_NOTIFY_NICK(true, cricket::NS_EMPTY, "nick"); -+const buzz::QName QN_GINGLE_NOTIFY_SOURCE(true, NS_GINGLE, "source"); -+const buzz::QName QN_GINGLE_NOTIFY_SOURCE_MTYPE( -+ true, cricket::NS_EMPTY, "mtype"); -+const buzz::QName QN_GINGLE_NOTIFY_SOURCE_SSRC(true, cricket::NS_EMPTY, "ssrc"); -+const std::string GINGLE_NOTIFY_SOURCE_MTYPE_AUDIO("audio"); -+const std::string GINGLE_NOTIFY_SOURCE_MTYPE_VIDEO("video"); -+ -+// Session view messages -+const buzz::QName QN_GINGLE_VIEW(true, cricket::NS_EMPTY, "view"); -+const buzz::QName QN_GINGLE_VIEW_TYPE(true, cricket::NS_EMPTY, "type"); -+const buzz::QName QN_GINGLE_VIEW_NICK(true, cricket::NS_EMPTY, "nick"); -+const buzz::QName QN_GINGLE_VIEW_MEDIA_TYPE(true, cricket::NS_EMPTY, "mtype"); -+const buzz::QName QN_GINGLE_VIEW_SSRC(true, cricket::NS_EMPTY, "ssrc"); -+const std::string GINGLE_VIEW_TYPE_STATIC("static"); -+const std::string GINGLE_VIEW_TYPE_DYNAMIC("dynamic"); -+const std::string GINGLE_VIEW_MEDIA_TYPE_AUDIO("audio"); -+const std::string GINGLE_VIEW_MEDIA_TYPE_VIDEO("video"); -+const buzz::QName QN_GINGLE_VIEW_PARAMS(true, cricket::NS_EMPTY, "params"); -+const buzz::QName QN_GINGLE_VIEW_PARAMS_WIDTH(true, cricket::NS_EMPTY, "width"); -+const buzz::QName QN_GINGLE_VIEW_PARAMS_HEIGHT( -+ true, cricket::NS_EMPTY, "height"); -+const buzz::QName QN_GINGLE_VIEW_PARAMS_FRAMERATE( -+ true, cricket::NS_EMPTY, "framerate"); -+ -+ - // old stuff - #ifdef FEATURE_ENABLE_VOICEMAIL - const std::string NS_VOICEMAIL("http://www.google.com/session/voicemail"); -diff -upN libjingle-0.5.2/talk/p2p/base/constants.h.chromium12 libjingle-0.5.2/talk/p2p/base/constants.h ---- libjingle-0.5.2/talk/p2p/base/constants.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/constants.h 2011-03-30 21:51:32.703287001 -0400 -@@ -81,6 +81,7 @@ extern const std::string GINGLE_ACTION_T - extern const std::string GINGLE_ACTION_CANDIDATES; - extern const std::string GINGLE_ACTION_NOTIFY; - extern const std::string GINGLE_ACTION_UPDATE; -+extern const std::string GINGLE_ACTION_VIEW; - - extern const std::string LN_ERROR; - extern const buzz::QName QN_GINGLE_REDIRECT; -@@ -91,6 +92,7 @@ extern const std::string STR_REDIRECT_PR - extern const std::string LN_DESCRIPTION; - extern const std::string LN_PAYLOADTYPE; - extern const buzz::QName QN_ID; -+extern const buzz::QName QN_SID; - extern const buzz::QName QN_NAME; - extern const buzz::QName QN_CLOCKRATE; - extern const buzz::QName QN_BITRATE; -@@ -205,6 +207,30 @@ extern const std::string STR_TERMINATE_P - extern const std::string STR_TERMINATE_INTERNAL_SERVER_ERROR; - extern const std::string STR_TERMINATE_UNKNOWN_ERROR; - -+// Session notify messages -+extern const buzz::QName QN_GINGLE_NOTIFY; -+extern const buzz::QName QN_GINGLE_NOTIFY_NICK; -+extern const buzz::QName QN_GINGLE_NOTIFY_SOURCE; -+extern const buzz::QName QN_GINGLE_NOTIFY_SOURCE_MTYPE; -+extern const buzz::QName QN_GINGLE_NOTIFY_SOURCE_SSRC; -+extern const std::string GINGLE_NOTIFY_SOURCE_MTYPE_AUDIO; -+extern const std::string GINGLE_NOTIFY_SOURCE_MTYPE_VIDEO; -+ -+// Session view messages -+extern const buzz::QName QN_GINGLE_VIEW; -+extern const buzz::QName QN_GINGLE_VIEW_TYPE; -+extern const buzz::QName QN_GINGLE_VIEW_NICK; -+extern const buzz::QName QN_GINGLE_VIEW_MEDIA_TYPE; -+extern const buzz::QName QN_GINGLE_VIEW_SSRC; -+extern const std::string GINGLE_VIEW_TYPE_STATIC; -+extern const std::string GINGLE_VIEW_TYPE_DYNAMIC; -+extern const std::string GINGLE_VIEW_MEDIA_TYPE_AUDIO; -+extern const std::string GINGLE_VIEW_MEDIA_TYPE_VIDEO; -+extern const buzz::QName QN_GINGLE_VIEW_PARAMS; -+extern const buzz::QName QN_GINGLE_VIEW_PARAMS_WIDTH; -+extern const buzz::QName QN_GINGLE_VIEW_PARAMS_HEIGHT; -+extern const buzz::QName QN_GINGLE_VIEW_PARAMS_FRAMERATE; -+ - // old stuff - #ifdef FEATURE_ENABLE_VOICEMAIL - extern const std::string NS_VOICEMAIL; -diff -upN libjingle-0.5.2/talk/p2p/base/p2ptransportchannel.cc.chromium12 libjingle-0.5.2/talk/p2p/base/p2ptransportchannel.cc ---- libjingle-0.5.2/talk/p2p/base/p2ptransportchannel.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/p2ptransportchannel.cc 2011-03-30 21:51:32.703287001 -0400 -@@ -621,12 +621,21 @@ void P2PTransportChannel::SortConnection - - // Track the best connection, and let listeners know - void P2PTransportChannel::SwitchBestConnectionTo(Connection* conn) { -- // Note: the previous best_connection_ may be destroyed by now, so don't -+ // Note: if conn is NULL, the previous best_connection_ has been destroyed, -+ // so don't use it. - // use it. -+ Connection* old_best_connection = best_connection_; - best_connection_ = conn; - if (best_connection_) { -- LOG_J(LS_INFO, this) << "New best connection: " << conn->ToString(); -+ if (old_best_connection) { -+ LOG_J(LS_INFO, this) << "Previous best connection: " -+ << old_best_connection->ToString(); -+ } -+ LOG_J(LS_INFO, this) << "New best connection: " -+ << best_connection_->ToString(); - SignalRouteChange(this, best_connection_->remote_candidate().address()); -+ } else { -+ LOG_J(LS_INFO, this) << "No best connection"; - } - } - -diff -upN libjingle-0.5.2/talk/p2p/base/portallocator.h.chromium12 libjingle-0.5.2/talk/p2p/base/portallocator.h ---- libjingle-0.5.2/talk/p2p/base/portallocator.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/portallocator.h 2011-03-30 21:51:32.703287001 -0400 -@@ -25,13 +25,14 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#ifndef _PORTALLOCATOR_H_ --#define _PORTALLOCATOR_H_ -+#ifndef TALK_P2P_BASE_PORTALLOCATOR_H_ -+#define TALK_P2P_BASE_PORTALLOCATOR_H_ -+ -+#include <string> -+#include <vector> - - #include "talk/base/sigslot.h" - #include "talk/p2p/base/port.h" --#include <string> --#undef SetPort - - namespace cricket { - -@@ -50,8 +51,8 @@ const uint32 PORTALLOCATOR_ENABLE_SHAKER - const uint32 kDefaultPortAllocatorFlags = 0; - - class PortAllocatorSession : public sigslot::has_slots<> { --public: -- PortAllocatorSession(uint32 flags) : flags_(flags) {} -+ public: -+ explicit PortAllocatorSession(uint32 flags) : flags_(flags) {} - - // Subclasses should clean up any ports created. - virtual ~PortAllocatorSession() {} -@@ -68,22 +69,28 @@ public: - virtual bool IsGettingAllPorts() = 0; - - sigslot::signal2<PortAllocatorSession*, Port*> SignalPortReady; -- sigslot::signal2<PortAllocatorSession*, const std::vector<Candidate>&> SignalCandidatesReady; -+ sigslot::signal2<PortAllocatorSession*, -+ const std::vector<Candidate>&> SignalCandidatesReady; - - uint32 generation() { return generation_; } - void set_generation(uint32 generation) { generation_ = generation; } - --private: -+ private: - uint32 flags_; - uint32 generation_; - }; - - class PortAllocator { --public: -- PortAllocator() : flags_(kDefaultPortAllocatorFlags) {} -+ public: -+ PortAllocator() : -+ flags_(kDefaultPortAllocatorFlags), -+ min_port_(0), -+ max_port_(0) { -+ } - virtual ~PortAllocator() {} - -- virtual PortAllocatorSession *CreateSession(const std::string &name, const std::string &session_type) = 0; -+ virtual PortAllocatorSession *CreateSession(const std::string &name, -+ const std::string &session_type) = 0; - - uint32 flags() const { return flags_; } - void set_flags(uint32 flags) { flags_ = flags; } -@@ -91,15 +98,31 @@ public: - const std::string& user_agent() const { return agent_; } - const talk_base::ProxyInfo& proxy() const { return proxy_; } - void set_proxy(const std::string& agent, const talk_base::ProxyInfo& proxy) { -- agent_ = agent; proxy_ = proxy; -+ agent_ = agent; -+ proxy_ = proxy; -+ } -+ -+ // Gets/Sets the port range to use when choosing client ports. -+ int min_port() const { return min_port_; } -+ int max_port() const { return max_port_; } -+ bool SetPortRange(int min_port, int max_port) { -+ if (min_port > max_port) { -+ return false; -+ } -+ -+ min_port_ = min_port; -+ max_port_ = max_port; -+ return true; - } - --protected: -+ protected: - uint32 flags_; - std::string agent_; - talk_base::ProxyInfo proxy_; -+ int min_port_; -+ int max_port_; - }; - --} // namespace cricket -+} // namespace cricket - --#endif // _PORTALLOCATOR_H_ -+#endif // TALK_P2P_BASE_PORTALLOCATOR_H_ -diff -upN libjingle-0.5.2/talk/p2p/base/port.cc.chromium12 libjingle-0.5.2/talk/p2p/base/port.cc ---- libjingle-0.5.2/talk/p2p/base/port.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/port.cc 2011-03-30 21:51:32.704287001 -0400 -@@ -30,12 +30,9 @@ - #include <algorithm> - #include <vector> - --#include "talk/base/asyncudpsocket.h" --#include "talk/base/asynctcpsocket.h" - #include "talk/base/helpers.h" - #include "talk/base/logging.h" - #include "talk/base/scoped_ptr.h" --#include "talk/base/socketadapters.h" - #include "talk/base/stringutils.h" - #include "talk/p2p/base/common.h" - -@@ -128,11 +125,19 @@ bool StringToProto(const char* value, Pr - } - - Port::Port(talk_base::Thread* thread, const std::string& type, -- talk_base::SocketFactory* factory, talk_base::Network* network) -- : thread_(thread), factory_(factory), type_(type), network_(network), -- preference_(-1), lifetime_(LT_PRESTART), enable_port_packets_(false) { -- if (factory_ == NULL) -- factory_ = thread_->socketserver(); -+ talk_base::PacketSocketFactory* factory, talk_base::Network* network, -+ uint32 ip, int min_port, int max_port) -+ : thread_(thread), -+ factory_(factory), -+ type_(type), -+ network_(network), -+ ip_(ip), -+ min_port_(min_port), -+ max_port_(max_port), -+ preference_(-1), -+ lifetime_(LT_PRESTART), -+ enable_port_packets_(false) { -+ ASSERT(factory_ != NULL); - - set_username_fragment(talk_base::CreateRandomString(16)); - set_password(talk_base::CreateRandomString(16)); -@@ -200,7 +205,7 @@ void Port::OnReadPacket( - // send back a proper binding response. - StunMessage* msg; - std::string remote_username; -- if (!GetStunMessage(data, size, addr, msg, remote_username)) { -+ if (!GetStunMessage(data, size, addr, &msg, &remote_username)) { - LOG_J(LS_ERROR, this) << "Received non-STUN packet from unknown address (" - << addr.ToString() << ")"; - } else if (!msg) { -@@ -219,34 +224,16 @@ void Port::OnReadPacket( - } - } - --void Port::SendBindingRequest(Connection* conn) { -- // Construct the request message. -- StunMessage request; -- request.SetType(STUN_BINDING_REQUEST); -- request.SetTransactionID(talk_base::CreateRandomString(16)); -- -- StunByteStringAttribute* username_attr = -- StunAttribute::CreateByteString(STUN_ATTR_USERNAME); -- std::string username = conn->remote_candidate().username(); -- username.append(username_frag_); -- username_attr->CopyBytes(username.c_str(), username.size()); -- request.AddAttribute(username_attr); -- -- // Send the request message. -- // NOTE: If we wanted to, this is where we would add the HMAC. -- talk_base::ByteBuffer buf; -- request.Write(&buf); -- SendTo(buf.Data(), buf.Length(), conn->remote_candidate().address(), false); --} -- - bool Port::GetStunMessage(const char* data, size_t size, - const talk_base::SocketAddress& addr, -- StunMessage *& msg, std::string& remote_username) { -+ StunMessage** out_msg, std::string* out_username) { - // NOTE: This could clearly be optimized to avoid allocating any memory. - // However, at the data rates we'll be looking at on the client side, - // this probably isn't worth worrying about. -- -- msg = 0; -+ ASSERT(out_msg != NULL); -+ ASSERT(out_username != NULL); -+ *out_msg = NULL; -+ out_username->clear(); - - // Parse the request message. If the packet is not a complete and correct - // STUN message, then ignore it. -@@ -268,68 +255,73 @@ bool Port::GetStunMessage(const char* da - if (stun_msg->type() == STUN_BINDING_REQUEST) { - if (remote_frag_len < 0) { - // Username not present or corrupted, don't reply. -- LOG_J(LS_ERROR, this) << "Received STUN request without username"; -+ LOG_J(LS_ERROR, this) << "Received STUN request without username from " -+ << addr.ToString(); - return true; - } else if (std::memcmp(username_attr->bytes(), username_frag_.c_str(), - username_frag_.size()) != 0) { -- LOG_J(LS_ERROR, this) << "Received STUN request with bad username"; -+ LOG_J(LS_ERROR, this) << "Received STUN request with bad local username " -+ << std::string(username_attr->bytes(), -+ username_attr->length()) << " from " -+ << addr.ToString(); - SendBindingErrorResponse(stun_msg.get(), addr, STUN_ERROR_BAD_REQUEST, - STUN_ERROR_REASON_BAD_REQUEST); - return true; - } - -- remote_username.assign(username_attr->bytes() + username_frag_.size(), -- username_attr->bytes() + username_attr->length()); -+ out_username->assign(username_attr->bytes() + username_frag_.size(), -+ username_attr->bytes() + username_attr->length()); - } else if ((stun_msg->type() == STUN_BINDING_RESPONSE) - || (stun_msg->type() == STUN_BINDING_ERROR_RESPONSE)) { - if (remote_frag_len < 0) { -- // NOTE(tschmelcher): This is benign. It occurs when the response to a -- // StunBindingRequest to the real STUN server (which involves no -- // usernames) took too long to reach us and so the base StunRequest -- // re-sent itself, resulting in us getting an extraneous second response -- // that gets forwarded on to this code and correctly discarded. -- LOG_J(LS_ERROR, this) << "Received STUN response without username"; -+ LOG_J(LS_ERROR, this) << "Received STUN response without username from " -+ << addr.ToString(); - // Do not send error response to a response - return true; - } else if (std::memcmp(username_attr->bytes() + remote_frag_len, - username_frag_.c_str(), - username_frag_.size()) != 0) { -- LOG_J(LS_ERROR, this) << "Received STUN response with bad username"; -+ LOG_J(LS_ERROR, this) << "Received STUN response with bad local username " -+ << std::string(username_attr->bytes(), -+ username_attr->length()) << " from " -+ << addr.ToString(); - // Do not send error response to a response - return true; - } - -- remote_username.assign(username_attr->bytes(), -- username_attr->bytes() + remote_frag_len); -+ out_username->assign(username_attr->bytes(), -+ username_attr->bytes() + remote_frag_len); - - if (stun_msg->type() == STUN_BINDING_ERROR_RESPONSE) { - if (const StunErrorCodeAttribute* error_code = stun_msg->GetErrorCode()) { - LOG_J(LS_ERROR, this) << "Received STUN binding error:" -- << " class=" << error_code->error_class() -- << " number=" << error_code->number() -- << " reason='" << error_code->reason() << "'"; -+ << " class=" -+ << static_cast<int>(error_code->error_class()) -+ << " number=" -+ << static_cast<int>(error_code->number()) -+ << " reason='" << error_code->reason() << "'" -+ << " from " << addr.ToString(); - // Return message to allow error-specific processing - } else { -- LOG_J(LS_ERROR, this) -- << "Received STUN error response with no error code"; -+ LOG_J(LS_ERROR, this) << "Received STUN binding error without a error " -+ << "code from " << addr.ToString(); - // Drop corrupt message - return true; - } - } - } else { - LOG_J(LS_ERROR, this) << "Received STUN packet with invalid type (" -- << stun_msg->type() << ")"; -+ << stun_msg->type() << ") from " << addr.ToString(); - return true; - } - - // Return the STUN message found. -- msg = stun_msg.release(); -+ *out_msg = stun_msg.release(); - return true; - } - --void Port::SendBindingResponse( -- StunMessage* request, const talk_base::SocketAddress& addr) { -- -+void Port::SendBindingResponse(StunMessage* request, -+ const talk_base::SocketAddress& addr) { - ASSERT(request->type() == STUN_BINDING_REQUEST); - - // Retrieve the username from the request. -@@ -362,7 +354,10 @@ void Port::SendBindingResponse( - // NOTE: If we wanted to, this is where we would add the HMAC. - talk_base::ByteBuffer buf; - response.Write(&buf); -- SendTo(buf.Data(), buf.Length(), addr, false); -+ if (SendTo(buf.Data(), buf.Length(), addr, false) < 0) { -+ LOG_J(LS_ERROR, this) << "Failed to send STUN ping response to " -+ << addr.ToString(); -+ } - - // The fact that we received a successful request means that this connection - // (if one exists) should now be readable. -@@ -372,13 +367,12 @@ void Port::SendBindingResponse( - conn->ReceivedPing(); - } - --void Port::SendBindingErrorResponse( -- StunMessage* request, const talk_base::SocketAddress& addr, int error_code, -- const std::string& reason) { -- -+void Port::SendBindingErrorResponse(StunMessage* request, -+ const talk_base::SocketAddress& addr, -+ int error_code, const std::string& reason) { - ASSERT(request->type() == STUN_BINDING_REQUEST); - -- // Retrieve the username from the request. If it didn't have one, we -+ // Retrieve the username from the request. If it didn't have one, we - // shouldn't be responding at all. - const StunByteStringAttribute* username_attr = - request->GetByteString(STUN_ATTR_USERNAME); -@@ -408,41 +402,8 @@ void Port::SendBindingErrorResponse( - talk_base::ByteBuffer buf; - response.Write(&buf); - SendTo(buf.Data(), buf.Length(), addr, false); --} -- --talk_base::AsyncPacketSocket* Port::CreatePacketSocket(ProtocolType proto) { -- if (proto == PROTO_UDP) { -- // UDP sockets are simple. -- return talk_base::AsyncUDPSocket::Create(factory_); -- } else if (proto == PROTO_TCP || proto == PROTO_SSLTCP) { -- // Create the base TCP socket. Bail out if this fails. -- talk_base::AsyncSocket* socket = factory_->CreateAsyncSocket(SOCK_STREAM); -- if (!socket) { -- return NULL; -- } -- -- // If using a proxy, wrap the socket in a proxy socket. -- if (proxy().type == talk_base::PROXY_SOCKS5) { -- socket = new talk_base::AsyncSocksProxySocket( -- socket, proxy().address, proxy().username, proxy().password); -- } else if (proxy().type == talk_base::PROXY_HTTPS) { -- socket = new talk_base::AsyncHttpsProxySocket( -- socket, user_agent(), proxy().address, -- proxy().username, proxy().password); -- } -- -- // If using SSLTCP, wrap the TCP socket in a pseudo-SSL socket. -- if (proto == PROTO_SSLTCP) { -- socket = new talk_base::AsyncSSLSocket(socket); -- } -- -- // Finally, wrap that socket in a TCP packet socket. -- // [Insert obligatory Taco Town reference here] -- return new talk_base::AsyncTCPSocket(socket); -- } else { -- LOG_J(LS_ERROR, this) << "Unknown protocol (" << proto << ")"; -- return NULL; -- } -+ LOG_J(LS_INFO, this) << "Sending STUN binding error: reason=" << reason -+ << " to " << addr.ToString(); - } - - void Port::OnMessage(talk_base::Message *pmsg) { -@@ -519,15 +480,15 @@ class ConnectionRequest : public StunReq - } - - virtual void OnResponse(StunMessage* response) { -- connection_->OnConnectionRequestResponse(response, Elapsed()); -+ connection_->OnConnectionRequestResponse(this, response); - } - - virtual void OnErrorResponse(StunMessage* response) { -- connection_->OnConnectionRequestErrorResponse(response, Elapsed()); -+ connection_->OnConnectionRequestErrorResponse(this, response); - } - - virtual void OnTimeout() { -- LOG_J(LS_VERBOSE, connection_) << "Timing-out STUN ping " << id(); -+ connection_->OnConnectionRequestTimeout(this); - } - - virtual int GetNextDelay() { -@@ -551,7 +512,8 @@ Connection::Connection(Port* port, size_ - remote_candidate_(remote_candidate), read_state_(STATE_READ_TIMEOUT), - write_state_(STATE_WRITE_CONNECT), connected_(true), pruned_(false), - requests_(port->thread()), rtt_(DEFAULT_RTT), -- last_ping_sent_(0), last_ping_received_(0), reported_(false) { -+ last_ping_sent_(0), last_ping_received_(0), last_data_received_(0), -+ reported_(false) { - // Wire up to send stun packets - requests_.SignalSendPacket.connect(this, &Connection::OnSendStunPacket); - LOG_J(LS_INFO, this) << "Connection created"; -@@ -596,16 +558,18 @@ void Connection::set_connected(bool valu - } - } - --void Connection::OnSendStunPacket( -- const void* data, size_t size, StunRequest* req) { -- port_->SendTo(data, size, remote_candidate_.address(), false); -+void Connection::OnSendStunPacket(const void* data, size_t size, -+ StunRequest* req) { -+ if (port_->SendTo(data, size, remote_candidate_.address(), false) < 0) { -+ LOG_J(LS_WARNING, this) << "Failed to send STUN ping " << req->id(); -+ } - } - - void Connection::OnReadPacket(const char* data, size_t size) { - StunMessage* msg; - std::string remote_username; - const talk_base::SocketAddress& addr(remote_candidate_.address()); -- if (!port_->GetStunMessage(data, size, addr, msg, remote_username)) { -+ if (!port_->GetStunMessage(data, size, addr, &msg, &remote_username)) { - // The packet did not parse as a valid STUN message - - // If this connection is readable, then pass along the packet. -@@ -613,6 +577,7 @@ void Connection::OnReadPacket(const char - // readable means data from this address is acceptable - // Send it on! - -+ last_data_received_ = talk_base::Time(); - recv_rate_tracker_.Update(size); - SignalReadPacket(this, data, size); - -@@ -620,24 +585,30 @@ void Connection::OnReadPacket(const char - if (!pruned_ && (write_state_ == STATE_WRITE_TIMEOUT)) - set_write_state(STATE_WRITE_CONNECT); - } else { -- // Not readable means the remote address hasn't send a valid -+ // Not readable means the remote address hasn't sent a valid - // binding request yet. - - LOG_J(LS_WARNING, this) - << "Received non-STUN packet from an unreadable connection."; - } - } else if (!msg) { -- // The packet was STUN, but was already handled -+ // The packet was STUN, but was already handled internally. - } else if (remote_username != remote_candidate_.username()) { -- // Not destined this connection -- LOG_J(LS_ERROR, this) << "Received STUN packet on wrong address."; -+ // The packet had the right local username, but the remote username was -+ // not the right one for the remote address. - if (msg->type() == STUN_BINDING_REQUEST) { -+ LOG_J(LS_ERROR, this) << "Received STUN request with bad remote username " -+ << remote_username; - port_->SendBindingErrorResponse(msg, addr, STUN_ERROR_BAD_REQUEST, - STUN_ERROR_REASON_BAD_REQUEST); -+ } else if (msg->type() == STUN_BINDING_RESPONSE || -+ msg->type() == STUN_BINDING_ERROR_RESPONSE) { -+ LOG_J(LS_ERROR, this) << "Received STUN response with bad remote username" -+ " " << remote_username; - } - delete msg; - } else { -- // The packet is STUN, with the current username -+ // The packet is STUN, with the right username. - // If this is a STUN request, then update the readable bit and respond. - // If this is a STUN response, then update the writable bit. - -@@ -688,6 +659,18 @@ void Connection::Destroy() { - } - - void Connection::UpdateState(uint32 now) { -+ uint32 rtt = ConservativeRTTEstimate(rtt_); -+ -+ std::string pings; -+ for (size_t i = 0; i < pings_since_last_response_.size(); ++i) { -+ char buf[32]; -+ talk_base::sprintfn(buf, sizeof(buf), "%u", -+ pings_since_last_response_[i]); -+ pings.append(buf).append(" "); -+ } -+ LOG_J(LS_VERBOSE, this) << "UpdateState(): pings_since_last_response_=" << -+ pings << ", rtt=" << rtt << ", now=" << now; -+ - // Check the readable state. - // - // Since we don't know how many pings the other side has attempted, the best -@@ -695,6 +678,9 @@ void Connection::UpdateState(uint32 now) - - if ((read_state_ == STATE_READABLE) && - (last_ping_received_ + CONNECTION_READ_TIMEOUT <= now)) { -+ LOG_J(LS_INFO, this) << "Unreadable after " -+ << now - last_ping_received_ -+ << " ms without a ping, rtt=" << rtt; - set_read_state(STATE_READ_TIMEOUT); - } - -@@ -707,18 +693,6 @@ void Connection::UpdateState(uint32 now) - // Before timing out writability, we give a fixed amount of time. This is to - // allow for changes in network conditions. - -- uint32 rtt = ConservativeRTTEstimate(rtt_); -- -- std::string pings; -- for (size_t i = 0; i < pings_since_last_response_.size(); ++i) { -- char buf[32]; -- talk_base::sprintfn(buf, sizeof(buf), "%u", -- pings_since_last_response_[i]); -- pings.append(buf).append(" "); -- } -- LOG_J(LS_VERBOSE, this) << "UpdateState(): pings_since_last_response_ = " << -- pings << ", rtt = " << rtt << ", now = " << now; -- - if ((write_state_ == STATE_WRITABLE) && - TooManyFailures(pings_since_last_response_, - CONNECTION_WRITE_CONNECT_FAILURES, -@@ -727,6 +701,16 @@ void Connection::UpdateState(uint32 now) - TooLongWithoutResponse(pings_since_last_response_, - CONNECTION_WRITE_CONNECT_TIMEOUT, - now)) { -+ uint32 max_pings = CONNECTION_WRITE_CONNECT_FAILURES; -+ LOG_J(LS_INFO, this) << "Unwritable after " << max_pings -+ << " ping failures and " -+ << now - pings_since_last_response_[0] -+ << " ms without a response," -+ << " ms since last received ping=" -+ << now - last_ping_received_ -+ << " ms since last received data=" -+ << now - last_data_received_ -+ << " rtt=" << rtt; - set_write_state(STATE_WRITE_CONNECT); - } - -@@ -734,6 +718,9 @@ void Connection::UpdateState(uint32 now) - TooLongWithoutResponse(pings_since_last_response_, - CONNECTION_WRITE_TIMEOUT, - now)) { -+ LOG_J(LS_INFO, this) << "Timed out after " -+ << now - pings_since_last_response_[0] -+ << " ms without a response, rtt=" << rtt; - set_write_state(STATE_WRITE_TIMEOUT); - } - } -@@ -778,79 +765,46 @@ std::string Connection::ToString() const - << CONNECT_STATE_ABBREV[connected()] - << READ_STATE_ABBREV[read_state()] - << WRITE_STATE_ABBREV[write_state()] -- << "|" << rtt_ << "]"; -+ << "|"; -+ if (rtt_ < DEFAULT_RTT) { -+ ss << rtt_ << "]"; -+ } else { -+ ss << "-]"; -+ } - return ss.str(); - } - --void Connection::OnConnectionRequestResponse(StunMessage* response, -- uint32 rtt) { -- // We have a potentially valid reply from the remote address. -- // The packet must include a username that ends with our fragment, -- // since it is a response. -- -- // Check exact message type -- bool valid = true; -- if (response->type() != STUN_BINDING_RESPONSE) -- valid = false; -- -- // Must have username attribute -- const StunByteStringAttribute* username_attr = -- response->GetByteString(STUN_ATTR_USERNAME); -- if (valid) { -- if (!username_attr) { -- LOG_J(LS_ERROR, this) << "Received likely STUN packet with no username"; -- valid = false; -- } -- } -- -- // Length must be at least the size of our fragment (actually, should -- // be bigger since our fragment is at the end!) -- if (valid) { -- if (username_attr->length() <= port_->username_fragment().size()) { -- LOG_J(LS_ERROR, this) << "Received likely STUN packet with short username"; -- valid = false; -- } -- } -+void Connection::OnConnectionRequestResponse(ConnectionRequest* request, -+ StunMessage* response) { -+ // We've already validated that this is a STUN binding response with -+ // the correct local and remote username for this connection. -+ // So if we're not already, become writable. We may be bringing a pruned -+ // connection back to life, but if we don't really want it, we can always -+ // prune it again. -+ uint32 rtt = request->Elapsed(); -+ set_write_state(STATE_WRITABLE); - -- // Compare our fragment with the end of the username - must be exact match -- if (valid) { -- std::string username_fragment = port_->username_fragment(); -- int offset = (int)(username_attr->length() - username_fragment.size()); -- if (std::memcmp(username_attr->bytes() + offset, -- username_fragment.c_str(), username_fragment.size()) != 0) { -- LOG_J(LS_ERROR, this) << "Received STUN response with bad username"; -- valid = false; -- } -+ std::string pings; -+ for (size_t i = 0; i < pings_since_last_response_.size(); ++i) { -+ char buf[32]; -+ talk_base::sprintfn(buf, sizeof(buf), "%u", -+ pings_since_last_response_[i]); -+ pings.append(buf).append(" "); - } - -- if (valid) { -- // Valid response. If we're not already, become writable. We may be -- // bringing a pruned connection back to life, but if we don't really want -- // it, we can always prune it again. -- set_write_state(STATE_WRITABLE); -- -- std::string pings; -- for (size_t i = 0; i < pings_since_last_response_.size(); ++i) { -- char buf[32]; -- talk_base::sprintfn(buf, sizeof(buf), "%u", -- pings_since_last_response_[i]); -- pings.append(buf).append(" "); -- } -- LOG_J(LS_VERBOSE, this) << "OnConnectionRequestResponse(): " -- "pings_since_last_response_ = " << pings << ", rtt = " << rtt; -- -- pings_since_last_response_.clear(); -- rtt_ = (RTT_RATIO * rtt_ + rtt) / (RTT_RATIO + 1); -+ LOG_J(LS_VERBOSE, this) << "Received STUN ping response " << request->id() -+ << ", pings_since_last_response_=" << pings -+ << ", rtt=" << rtt; - -- LOG_J(LS_VERBOSE, this) << "Received STUN ping response " << -- response->transaction_id() << " after rtt = " << rtt; -- } -+ pings_since_last_response_.clear(); -+ rtt_ = (RTT_RATIO * rtt_ + rtt) / (RTT_RATIO + 1); - } - --void Connection::OnConnectionRequestErrorResponse(StunMessage *response, -- uint32 rtt) { -+void Connection::OnConnectionRequestErrorResponse(ConnectionRequest* request, -+ StunMessage* response) { - const StunErrorCodeAttribute* error = response->GetErrorCode(); -- uint32 error_code = error ? error->error_code() : STUN_ERROR_GLOBAL_FAILURE; -+ uint32 error_code = error ? -+ error->error_code() : static_cast<uint32>(STUN_ERROR_GLOBAL_FAILURE); - - if ((error_code == STUN_ERROR_UNKNOWN_ATTRIBUTE) - || (error_code == STUN_ERROR_SERVER_ERROR) -@@ -860,16 +814,33 @@ void Connection::OnConnectionRequestErro - // Race failure, retry - } else { - // This is not a valid connection. -- LOG_J(LS_ERROR, this) << "Received STUN error response; killing connection"; -+ LOG_J(LS_ERROR, this) << "Received STUN error response, code=" -+ << error_code << "; killing connection"; - set_write_state(STATE_WRITE_TIMEOUT); - } - } - -+void Connection::OnConnectionRequestTimeout(ConnectionRequest* request) { -+ // Log at LS_INFO if we miss a ping on a writable connection. -+ talk_base::LoggingSeverity sev = (write_state_ == STATE_WRITABLE) ? -+ talk_base::LS_INFO : talk_base::LS_VERBOSE; -+ uint32 when = talk_base::Time() - request->Elapsed(); -+ size_t failures; -+ for (failures = 0; failures < pings_since_last_response_.size(); ++failures) { -+ if (pings_since_last_response_[failures] > when) { -+ break; -+ } -+ } -+ LOG_JV(sev, this) << "Timing-out STUN ping " << request->id() -+ << " after " << request->Elapsed() -+ << " ms, failures=" << failures; -+} -+ - void Connection::CheckTimeout() { - // If both read and write have timed out, then this connection can contribute - // no more to p2p socket unless at some later date readability were to come - // back. However, we gave readability a long time to timeout, so at this -- // point, it seems fair to get rid of this connectoin. -+ // point, it seems fair to get rid of this connection. - if ((read_state_ == STATE_READ_TIMEOUT) && - (write_state_ == STATE_WRITE_TIMEOUT)) { - port_->thread()->Post(this, MSG_DELETE); -diff -upN libjingle-0.5.2/talk/p2p/base/port.h.chromium12 libjingle-0.5.2/talk/p2p/base/port.h ---- libjingle-0.5.2/talk/p2p/base/port.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/port.h 2011-03-30 21:51:32.704287001 -0400 -@@ -33,10 +33,11 @@ - #include <map> - - #include "talk/base/network.h" --#include "talk/base/socketaddress.h" -+#include "talk/base/packetsocketfactory.h" - #include "talk/base/proxyinfo.h" - #include "talk/base/ratetracker.h" - #include "talk/base/sigslot.h" -+#include "talk/base/socketaddress.h" - #include "talk/base/thread.h" - #include "talk/p2p/base/candidate.h" - #include "talk/p2p/base/stun.h" -@@ -49,6 +50,7 @@ class AsyncPacketSocket; - namespace cricket { - - class Connection; -+class ConnectionRequest; - - enum ProtocolType { - PROTO_UDP, -@@ -73,17 +75,19 @@ struct ProtocolAddress { - // one add support for specific mechanisms like local UDP ports. - class Port : public talk_base::MessageHandler, public sigslot::has_slots<> { - public: -- Port(talk_base::Thread* thread, const std::string &type, -- talk_base::SocketFactory* factory, talk_base::Network* network); -+ Port(talk_base::Thread* thread, const std::string& type, -+ talk_base::PacketSocketFactory* factory, talk_base::Network* network, -+ uint32 ip, int min_port, int max_port); - virtual ~Port(); - - // The thread on which this port performs its I/O. - talk_base::Thread* thread() { return thread_; } - - // The factory used to create the sockets of this port. -- talk_base::SocketFactory* socket_factory() const { return factory_; } -- void set_socket_factory(talk_base::SocketFactory* factory) -- { factory_ = factory; } -+ talk_base::PacketSocketFactory* socket_factory() const { return factory_; } -+ void set_socket_factory(talk_base::PacketSocketFactory* factory) { -+ factory_ = factory; -+ } - - // Each port is identified by a name (for debugging purposes). - const std::string& name() const { return name_; } -@@ -110,7 +114,6 @@ class Port : public talk_base::MessageHa - void set_preference(float preference) { preference_ = preference; } - - // Identifies the port type. -- //const std::string& protocol() const { return proto_; } - const std::string& type() const { return type_; } - - // Identifies network that this port was allocated on. -@@ -185,8 +188,6 @@ class Port : public talk_base::MessageHa - const std::string& user_agent() { return user_agent_; } - const talk_base::ProxyInfo& proxy() { return proxy_; } - -- talk_base::AsyncPacketSocket * CreatePacketSocket(ProtocolType proto); -- - // Normally, packets arrive through a connection (or they result signaling of - // unknown address). Calling this method turns off delivery of packets - // through their respective connection and instead delivers every packet -@@ -212,20 +213,6 @@ class Port : public talk_base::MessageHa - std::string ToString() const; - - protected: -- talk_base::Thread* thread_; -- talk_base::SocketFactory* factory_; -- std::string type_; -- talk_base::Network* network_; -- uint32 generation_; -- std::string name_; -- std::string username_frag_; -- std::string password_; -- float preference_; -- std::vector<Candidate> candidates_; -- AddressMap connections_; -- enum Lifetime { LT_PRESTART, LT_PRETIMEOUT, LT_POSTTIMEOUT } lifetime_; -- bool enable_port_packets_; -- - // Fills in the local address of the port. - void AddAddress(const talk_base::SocketAddress& address, - const std::string& protocol, bool final); -@@ -239,8 +226,6 @@ class Port : public talk_base::MessageHa - void OnReadPacket(const char* data, size_t size, - const talk_base::SocketAddress& addr); - -- // Constructs a STUN binding request for the given connection and sends it. -- void SendBindingRequest(Connection* conn); - - // If the given data comprises a complete and correct STUN message then the - // return value is true, otherwise false. If the message username corresponds -@@ -249,9 +234,25 @@ class Port : public talk_base::MessageHa - // remote_username contains the remote fragment of the STUN username. - bool GetStunMessage(const char* data, size_t size, - const talk_base::SocketAddress& addr, -- StunMessage *& msg, std::string& remote_username); -+ StunMessage** out_msg, std::string* out_username); - -- friend class Connection; -+ // TODO: make these members private -+ talk_base::Thread* thread_; -+ talk_base::PacketSocketFactory* factory_; -+ std::string type_; -+ talk_base::Network* network_; -+ uint32 ip_; -+ int min_port_; -+ int max_port_; -+ uint32 generation_; -+ std::string name_; -+ std::string username_frag_; -+ std::string password_; -+ float preference_; -+ std::vector<Candidate> candidates_; -+ AddressMap connections_; -+ enum Lifetime { LT_PRESTART, LT_PRETIMEOUT, LT_POSTTIMEOUT } lifetime_; -+ bool enable_port_packets_; - - private: - // Called when one of our connections deletes itself. -@@ -263,6 +264,8 @@ class Port : public talk_base::MessageHa - // Information to use when going through a proxy. - std::string user_agent_; - talk_base::ProxyInfo proxy_; -+ -+ friend class Connection; - }; - - // Represents a communication link between a port on the local client and a -@@ -331,7 +334,7 @@ class Connection : public talk_base::Mes - // still keep it around in case the other side wants to use it. But we can - // safely stop pinging on it and we can allow it to time out if the other - // side stops using it as well. -- bool pruned() { return pruned_; } -+ bool pruned() const { return pruned_; } - void Prune(); - - // Makes the connection go away. -@@ -342,7 +345,7 @@ class Connection : public talk_base::Mes - void UpdateState(uint32 now); - - // Called when this connection should try checking writability again. -- uint32 last_ping_sent() { return last_ping_sent_; } -+ uint32 last_ping_sent() const { return last_ping_sent_; } - void Ping(uint32 now); - - // Called whenever a valid ping is received on this connection. This is -@@ -352,10 +355,33 @@ class Connection : public talk_base::Mes - // Debugging description of this connection - std::string ToString() const; - -- bool reported() { return reported_; } -+ bool reported() const { return reported_; } - void set_reported(bool reported) { reported_ = reported;} - - protected: -+ // Constructs a new connection to the given remote port. -+ Connection(Port* port, size_t index, const Candidate& candidate); -+ -+ // Called back when StunRequestManager has a stun packet to send -+ void OnSendStunPacket(const void* data, size_t size, StunRequest* req); -+ -+ // Callbacks from ConnectionRequest -+ void OnConnectionRequestResponse(ConnectionRequest* req, -+ StunMessage* response); -+ void OnConnectionRequestErrorResponse(ConnectionRequest* req, -+ StunMessage* response); -+ void OnConnectionRequestTimeout(ConnectionRequest* req); -+ -+ // Changes the state and signals if necessary. -+ void set_read_state(ReadState value); -+ void set_write_state(WriteState value); -+ void set_connected(bool value); -+ -+ // Checks if this connection is useless, and hence, should be destroyed. -+ void CheckTimeout(); -+ -+ void OnMessage(talk_base::Message *pmsg); -+ - Port* port_; - size_t local_candidate_index_; - Candidate remote_candidate_; -@@ -368,36 +394,17 @@ class Connection : public talk_base::Mes - uint32 last_ping_sent_; // last time we sent a ping to the other side - uint32 last_ping_received_; // last time we received a ping from the other - // side -+ uint32 last_data_received_; - std::vector<uint32> pings_since_last_response_; - - talk_base::RateTracker recv_rate_tracker_; - talk_base::RateTracker send_rate_tracker_; - -- // Callbacks from ConnectionRequest -- void OnConnectionRequestResponse(StunMessage *response, uint32 rtt); -- void OnConnectionRequestErrorResponse(StunMessage *response, uint32 rtt); -- -- // Called back when StunRequestManager has a stun packet to send -- void OnSendStunPacket(const void* data, size_t size, StunRequest* req); -- -- // Constructs a new connection to the given remote port. -- Connection(Port* port, size_t index, const Candidate& candidate); -- -- // Changes the state and signals if necessary. -- void set_read_state(ReadState value); -- void set_write_state(WriteState value); -- void set_connected(bool value); -- -- // Checks if this connection is useless, and hence, should be destroyed. -- void CheckTimeout(); -- -- void OnMessage(talk_base::Message *pmsg); -+ private: -+ bool reported_; - - friend class Port; - friend class ConnectionRequest; -- -- private: -- bool reported_; - }; - - // ProxyConnection defers all the interesting work to the port -diff -upN libjingle-0.5.2/talk/p2p/base/pseudotcp.cc.chromium12 libjingle-0.5.2/talk/p2p/base/pseudotcp.cc ---- libjingle-0.5.2/talk/p2p/base/pseudotcp.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/pseudotcp.cc 2011-03-30 21:51:32.705287001 -0400 -@@ -118,7 +118,7 @@ const uint32 PACKET_OVERHEAD = HEADER_SI - const uint32 MIN_RTO = 250; // 250 ms (RFC1122, Sec 4.2.3.1 "fractions of a second") - const uint32 DEF_RTO = 3000; // 3 seconds (RFC1122, Sec 4.2.3.1) - const uint32 MAX_RTO = 60000; // 60 seconds --const uint32 ACK_DELAY = 100; // 100 milliseconds -+const uint32 DEF_ACK_DELAY = 100; // 100 milliseconds - - const uint8 FLAG_CTL = 0x02; - const uint8 FLAG_RST = 0x04; -@@ -256,6 +256,9 @@ PseudoTcp::PseudoTcp(IPseudoTcpNotify* n - - m_rx_rto = DEF_RTO; - m_rx_srtt = m_rx_rttvar = 0; -+ -+ m_use_nagling = true; -+ m_ack_delay = DEF_ACK_DELAY; - } - - PseudoTcp::~PseudoTcp() { -@@ -337,7 +340,7 @@ void PseudoTcp::NotifyClock(uint32 now) - } - - // Check if it's time to send delayed acks -- if (m_t_ack && (talk_base::TimeDiff(m_t_ack + ACK_DELAY, now) <= 0)) { -+ if (m_t_ack && (talk_base::TimeDiff(m_t_ack + m_ack_delay, now) <= 0)) { - packet(m_snd_nxt, 0, 0, 0); - } - -@@ -367,6 +370,26 @@ bool PseudoTcp::GetNextClock(uint32 now, - return clock_check(now, timeout); - } - -+void PseudoTcp::GetOption(Option opt, int* value) { -+ if (opt == OPT_NODELAY) { -+ *value = m_use_nagling ? 0 : 1; -+ } else if (opt == OPT_ACKDELAY) { -+ *value = m_ack_delay; -+ } else { -+ ASSERT(false); -+ } -+} -+ -+void PseudoTcp::SetOption(Option opt, int value) { -+ if (opt == OPT_NODELAY) { -+ m_use_nagling = value == 0; -+ } else if (opt == OPT_ACKDELAY) { -+ m_ack_delay = value; -+ } else { -+ ASSERT(false); -+ } -+} -+ - // - // IPStream Implementation - // -@@ -554,7 +577,7 @@ bool PseudoTcp::clock_check(uint32 now, - - if (m_t_ack) { - nTimeout = talk_base::_min<int32>(nTimeout, -- talk_base::TimeDiff(m_t_ack + ACK_DELAY, now)); -+ talk_base::TimeDiff(m_t_ack + m_ack_delay, now)); - } - if (m_rto_base) { - nTimeout = talk_base::_min<int32>(nTimeout, -@@ -774,7 +797,11 @@ bool PseudoTcp::process(Segment& seg) { - if (seg.seq != m_rcv_nxt) { - sflags = sfImmediateAck; // (Fast Recovery) - } else if (seg.len != 0) { -- sflags = sfDelayedAck; -+ if (m_ack_delay == 0) { -+ sflags = sfImmediateAck; -+ } else { -+ sflags = sfDelayedAck; -+ } - } - #if _DEBUGMSG >= _DBG_NORMAL - if (sflags == sfImmediateAck) { -@@ -992,8 +1019,11 @@ void PseudoTcp::attemptSend(SendFlags sf - return; - } - -- // Nagle algorithm -- if ((m_snd_nxt > m_snd_una) && (nAvailable < m_mss)) { -+ // Nagle's algorithm. -+ // If there is data already in-flight, and we haven't a full segment of -+ // data ready to send then hold off until we get more to send, or the -+ // in-flight data is acknowledged. -+ if (m_use_nagling && (m_snd_nxt > m_snd_una) && (nAvailable < m_mss)) { - return; - } - -diff -upN libjingle-0.5.2/talk/p2p/base/pseudotcp.h.chromium12 libjingle-0.5.2/talk/p2p/base/pseudotcp.h ---- libjingle-0.5.2/talk/p2p/base/pseudotcp.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/pseudotcp.h 2011-03-30 21:51:32.705287001 -0400 -@@ -92,6 +92,18 @@ class PseudoTcp { - // Returns false if the socket is ready to be destroyed. - bool GetNextClock(uint32 now, long& timeout); - -+ // Call these to get/set option values to tailor this PseudoTcp -+ // instance's behaviour for the kind of data it will carry. -+ // If an unrecognized option is set or got, an assertion will fire. -+ enum Option { -+ OPT_NODELAY, // Whether to enable Nagle's algorithm (0 == off) -+ OPT_ACKDELAY, // The Delayed ACK timeout (0 == off). -+ //kOptRcvBuf, // Set the receive buffer size, in bytes. -+ //kOptSndBuf, // Set the send buffer size, in bytes. -+ }; -+ void GetOption(Option opt, int* value); -+ void SetOption(Option opt, int value); -+ - protected: - enum SendFlags { sfNone, sfDelayedAck, sfImmediateAck }; - enum { -@@ -180,6 +192,10 @@ class PseudoTcp { - uint8 m_dup_acks; - uint32 m_recover; - uint32 m_t_ack; -+ -+ // Configuration options -+ bool m_use_nagling; -+ uint32 m_ack_delay; - }; - - } // namespace cricket -diff -upN libjingle-0.5.2/talk/p2p/base/relayport.cc.chromium12 libjingle-0.5.2/talk/p2p/base/relayport.cc ---- libjingle-0.5.2/talk/p2p/base/relayport.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/relayport.cc 2011-03-30 21:51:32.706287001 -0400 -@@ -25,11 +25,7 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#if defined(_MSC_VER) && _MSC_VER < 1300 --#pragma warning(disable:4786) --#endif -- --#include "talk/base/asynctcpsocket.h" -+#include "talk/base/asyncpacketsocket.h" - #include "talk/base/helpers.h" - #include "talk/base/logging.h" - #include "talk/p2p/base/relayport.h" -@@ -96,8 +92,7 @@ class RelayConnection : public sigslot:: - class RelayEntry : public talk_base::MessageHandler, - public sigslot::has_slots<> { - public: -- RelayEntry(RelayPort* port, const talk_base::SocketAddress& ext_addr, -- const talk_base::SocketAddress& local_addr); -+ RelayEntry(RelayPort* port, const talk_base::SocketAddress& ext_addr); - ~RelayEntry(); - - RelayPort* port() { return port_; } -@@ -148,21 +143,20 @@ class RelayEntry : public talk_base::Mes - - private: - RelayPort* port_; -- talk_base::SocketAddress ext_addr_, local_addr_; -+ talk_base::SocketAddress ext_addr_; - size_t server_index_; - bool connected_; - bool locked_; - RelayConnection* current_connection_; - - // Called when a TCP connection is established or fails -- void OnSocketConnect(talk_base::AsyncTCPSocket* socket); -- void OnSocketClose(talk_base::AsyncTCPSocket* socket, int error); -+ void OnSocketConnect(talk_base::AsyncPacketSocket* socket); -+ void OnSocketClose(talk_base::AsyncPacketSocket* socket, int error); - - // Called when a packet is received on this socket. -- void OnReadPacket( -- const char* data, size_t size, -- const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket); -+ void OnReadPacket(talk_base::AsyncPacketSocket* socket, -+ const char* data, size_t size, -+ const talk_base::SocketAddress& remote_addr); - - // Sends the given data on the socket to the server with no wrapping. This - // returns the number of bytes written or -1 if an error occurred. -@@ -192,14 +186,16 @@ class AllocateRequest : public StunReque - const std::string RELAY_PORT_TYPE("relay"); - - RelayPort::RelayPort( -- talk_base::Thread* thread, talk_base::SocketFactory* factory, -- talk_base::Network* network, const talk_base::SocketAddress& local_addr, -+ talk_base::Thread* thread, talk_base::PacketSocketFactory* factory, -+ talk_base::Network* network, uint32 ip, int min_port, int max_port, - const std::string& username, const std::string& password, - const std::string& magic_cookie) -- : Port(thread, RELAY_PORT_TYPE, factory, network), local_addr_(local_addr), -- ready_(false), magic_cookie_(magic_cookie), error_(0) { -+ : Port(thread, RELAY_PORT_TYPE, factory, network, ip, min_port, max_port), -+ ready_(false), -+ magic_cookie_(magic_cookie), -+ error_(0) { - entries_.push_back( -- new RelayEntry(this, talk_base::SocketAddress(), local_addr_)); -+ new RelayEntry(this, talk_base::SocketAddress())); - - set_username_fragment(username); - set_password(password); -@@ -316,7 +312,7 @@ int RelayPort::SendTo(const void* data, - // If we did not find one, then we make a new one. This will not be useable - // until it becomes connected, however. - if (!entry && payload) { -- entry = new RelayEntry(this, addr, local_addr_); -+ entry = new RelayEntry(this, addr); - if (!entries_.empty()) { - entry->SetServerIndex(entries_[0]->ServerIndex()); - } -@@ -345,7 +341,7 @@ int RelayPort::SendTo(const void* data, - } - // The caller of the function is expecting the number of user data bytes, - // rather than the size of the packet. -- return (int)size; -+ return size; - } - - int RelayPort::SetOption(talk_base::Socket::Option opt, int value) { -@@ -420,9 +416,8 @@ void RelayConnection::SendAllocateReques - } - - RelayEntry::RelayEntry(RelayPort* port, -- const talk_base::SocketAddress& ext_addr, -- const talk_base::SocketAddress& local_addr) -- : port_(port), ext_addr_(ext_addr), local_addr_(local_addr), -+ const talk_base::SocketAddress& ext_addr) -+ : port_(port), ext_addr_(ext_addr), - server_index_(0), connected_(false), locked_(false), - current_connection_(NULL) { - } -@@ -455,13 +450,23 @@ void RelayEntry::Connect() { - LOG(LS_INFO) << "Connecting to relay via " << ProtoToString(ra->proto) << - " @ " << ra->address.ToString(); - -- talk_base::AsyncPacketSocket* socket = port_->CreatePacketSocket(ra->proto); -+ talk_base::AsyncPacketSocket* socket = NULL; -+ -+ if (ra->proto == PROTO_UDP) { -+ // UDP sockets are simple. -+ socket = port_->socket_factory()->CreateUdpSocket( -+ talk_base::SocketAddress(port_->ip_, 0), -+ port_->min_port_, port_->max_port_); -+ } else if (ra->proto == PROTO_TCP || ra->proto == PROTO_SSLTCP) { -+ socket = port_->socket_factory()->CreateClientTcpSocket( -+ talk_base::SocketAddress(port_->ip_, 0), ra->address, -+ port_->proxy(), port_->user_agent(), ra->proto == PROTO_SSLTCP); -+ } else { -+ LOG(LS_WARNING) << "Unknown protocol (" << ra->proto << ")"; -+ } -+ - if (!socket) { - LOG(LS_WARNING) << "Socket creation failed"; -- } else if (socket->Bind(local_addr_) < 0) { -- LOG(LS_WARNING) << "Socket bind failed with error " << socket->GetError(); -- delete socket; -- socket = NULL; - } - - // If we failed to get a socket, move on to the next protocol. -@@ -479,13 +484,10 @@ void RelayEntry::Connect() { - } - - // If we're trying UDP, start binding requests. -- // If we're trying TCP, initiate a connection with a fixed timeout. -+ // If we're trying TCP, wait for connection with a fixed timeout. - if ((ra->proto == PROTO_TCP) || (ra->proto == PROTO_SSLTCP)) { -- talk_base::AsyncTCPSocket* tcp = -- static_cast<talk_base::AsyncTCPSocket*>(socket); -- tcp->SignalClose.connect(this, &RelayEntry::OnSocketClose); -- tcp->SignalConnect.connect(this, &RelayEntry::OnSocketConnect); -- tcp->Connect(ra->address); -+ socket->SignalClose.connect(this, &RelayEntry::OnSocketClose); -+ socket->SignalConnect.connect(this, &RelayEntry::OnSocketConnect); - port()->thread()->PostDelayed(kSoftConnectTimeoutMs, this, - kMessageConnectTimeout); - } else { -@@ -538,13 +540,13 @@ int RelayEntry::SendTo(const void* data, - StunByteStringAttribute* magic_cookie_attr = - StunAttribute::CreateByteString(STUN_ATTR_MAGIC_COOKIE); - magic_cookie_attr->CopyBytes(port_->magic_cookie().c_str(), -- (uint16)port_->magic_cookie().size()); -+ port_->magic_cookie().size()); - request.AddAttribute(magic_cookie_attr); - - StunByteStringAttribute* username_attr = - StunAttribute::CreateByteString(STUN_ATTR_USERNAME); - username_attr->CopyBytes(port_->username_fragment().c_str(), -- (uint16)port_->username_fragment().size()); -+ port_->username_fragment().size()); - request.AddAttribute(username_attr); - - StunAddressAttribute* addr_attr = -@@ -564,7 +566,7 @@ int RelayEntry::SendTo(const void* data, - - StunByteStringAttribute* data_attr = - StunAttribute::CreateByteString(STUN_ATTR_DATA); -- data_attr->CopyBytes(data, (uint16)size); -+ data_attr->CopyBytes(data, size); - request.AddAttribute(data_attr); - - // TODO: compute the HMAC. -@@ -616,8 +618,8 @@ void RelayEntry::OnMessage(talk_base::Me - // the next address, otherwise give this connection more time and - // await the real timeout. - // -- // TODO: Connect to servers in pararel to speed up connect time -- // and to avoid giving up to early. -+ // TODO: Connect to servers in parallel to speed up connect time -+ // and to avoid giving up too early. - port_->SignalSoftTimeout(ra); - HandleConnectFailure(current_connection_->socket()); - } else { -@@ -625,7 +627,7 @@ void RelayEntry::OnMessage(talk_base::Me - } - } - --void RelayEntry::OnSocketConnect(talk_base::AsyncTCPSocket* socket) { -+void RelayEntry::OnSocketConnect(talk_base::AsyncPacketSocket* socket) { - LOG(INFO) << "relay tcp connected to " << - socket->GetRemoteAddress().ToString(); - if (current_connection_ != NULL) { -@@ -633,14 +635,15 @@ void RelayEntry::OnSocketConnect(talk_ba - } - } - --void RelayEntry::OnSocketClose(talk_base::AsyncTCPSocket* socket, int error) { -+void RelayEntry::OnSocketClose(talk_base::AsyncPacketSocket* socket, -+ int error) { - PLOG(LERROR, error) << "Relay connection failed: socket closed"; - HandleConnectFailure(socket); - } - --void RelayEntry::OnReadPacket(const char* data, size_t size, -- const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket) { -+void RelayEntry::OnReadPacket(talk_base::AsyncPacketSocket* socket, -+ const char* data, size_t size, -+ const talk_base::SocketAddress& remote_addr) { - // ASSERT(remote_addr == port_->server_addr()); - // TODO: are we worried about this? - -@@ -732,14 +735,14 @@ void AllocateRequest::Prepare(StunMessag - StunAttribute::CreateByteString(STUN_ATTR_MAGIC_COOKIE); - magic_cookie_attr->CopyBytes( - entry_->port()->magic_cookie().c_str(), -- (uint16)entry_->port()->magic_cookie().size()); -+ entry_->port()->magic_cookie().size()); - request->AddAttribute(magic_cookie_attr); - - StunByteStringAttribute* username_attr = - StunAttribute::CreateByteString(STUN_ATTR_USERNAME); - username_attr->CopyBytes( - entry_->port()->username_fragment().c_str(), -- (uint16)entry_->port()->username_fragment().size()); -+ entry_->port()->username_fragment().size()); - request->AddAttribute(username_attr); - } - -diff -upN libjingle-0.5.2/talk/p2p/base/relayport.h.chromium12 libjingle-0.5.2/talk/p2p/base/relayport.h ---- libjingle-0.5.2/talk/p2p/base/relayport.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/relayport.h 2011-03-30 21:51:32.706287001 -0400 -@@ -28,8 +28,11 @@ - #ifndef TALK_P2P_BASE_RELAYPORT_H_ - #define TALK_P2P_BASE_RELAYPORT_H_ - -+#include <deque> - #include <string> -+#include <utility> - #include <vector> -+ - #include "talk/p2p/base/port.h" - #include "talk/p2p/base/stunrequest.h" - -@@ -51,18 +54,13 @@ class RelayPort : public Port { - - // RelayPort doesn't yet do anything fancy in the ctor. - static RelayPort* Create( -- talk_base::Thread* thread, talk_base::SocketFactory* factory, -- talk_base::Network* network, const talk_base::SocketAddress& local_addr, -- const std::string& username, const std::string& password, -- const std::string& magic_cookie) { -- return new RelayPort(thread, factory, network, local_addr, -+ talk_base::Thread* thread, talk_base::PacketSocketFactory* factory, -+ talk_base::Network* network, uint32 ip, int min_port, int max_port, -+ const std::string& username, const std::string& password, -+ const std::string& magic_cookie) { -+ return new RelayPort(thread, factory, network, ip, min_port, max_port, - username, password, magic_cookie); - } -- RelayPort(talk_base::Thread* thread, talk_base::SocketFactory* factory, -- talk_base::Network*, const talk_base::SocketAddress& local_addr, -- const std::string& username, const std::string& password, -- const std::string& magic_cookie); -- bool Init(); - virtual ~RelayPort(); - - void AddServerAddress(const ProtocolAddress& addr); -@@ -86,6 +84,12 @@ class RelayPort : public Port { - sigslot::signal1<const ProtocolAddress*> SignalSoftTimeout; - - protected: -+ RelayPort(talk_base::Thread* thread, talk_base::PacketSocketFactory* factory, -+ talk_base::Network*, uint32 ip, int min_port, int max_port, -+ const std::string& username, const std::string& password, -+ const std::string& magic_cookie); -+ bool Init(); -+ - void SetReady(); - - virtual int SendTo(const void* data, size_t size, -@@ -98,7 +102,6 @@ class RelayPort : public Port { - private: - friend class RelayEntry; - -- talk_base::SocketAddress local_addr_; - std::deque<ProtocolAddress> server_addr_; - bool ready_; - std::vector<RelayEntry*> entries_; -diff -upN libjingle-0.5.2/talk/p2p/base/relayserver.cc.chromium12 libjingle-0.5.2/talk/p2p/base/relayserver.cc ---- libjingle-0.5.2/talk/p2p/base/relayserver.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/relayserver.cc 2011-03-30 21:51:32.706287001 -0400 -@@ -159,12 +159,24 @@ void RelayServer::RemoveInternalServerSo - socket->SignalReadEvent.disconnect(this); - } - --int RelayServer::GetConnectionCount() { -+int RelayServer::GetConnectionCount() const { - return connections_.size(); - } - --bool RelayServer::HasConnection(const talk_base::SocketAddress& address) { -- for (ConnectionMap::iterator it = connections_.begin(); -+talk_base::SocketAddressPair RelayServer::GetConnection(int connection) const { -+ int i = 0; -+ for (ConnectionMap::const_iterator it = connections_.begin(); -+ it != connections_.end(); ++it) { -+ if (i == connection) { -+ return it->second->addr_pair(); -+ } -+ ++i; -+ } -+ return talk_base::SocketAddressPair(); -+} -+ -+bool RelayServer::HasConnection(const talk_base::SocketAddress& address) const { -+ for (ConnectionMap::const_iterator it = connections_.begin(); - it != connections_.end(); ++it) { - if (it->second->addr_pair().destination() == address) { - return true; -@@ -180,11 +192,14 @@ void RelayServer::OnReadEvent(talk_base: - } - - void RelayServer::OnInternalPacket( -- const char* bytes, size_t size, const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket) { -+ talk_base::AsyncPacketSocket* socket, const char* bytes, size_t size, -+ const talk_base::SocketAddress& remote_addr) { - - // Get the address of the connection we just received on. -- talk_base::SocketAddressPair ap(remote_addr, socket->GetLocalAddress()); -+ bool allocated; -+ talk_base::SocketAddressPair ap( -+ remote_addr, socket->GetLocalAddress(&allocated)); -+ ASSERT(allocated); - ASSERT(!ap.destination().IsAny()); - - // If this did not come from an existing connection, it should be a STUN -@@ -224,11 +239,14 @@ void RelayServer::OnInternalPacket( - } - - void RelayServer::OnExternalPacket( -- const char* bytes, size_t size, const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket) { -+ talk_base::AsyncPacketSocket* socket, const char* bytes, size_t size, -+ const talk_base::SocketAddress& remote_addr) { - - // Get the address of the connection we just received on. -- talk_base::SocketAddressPair ap(remote_addr, socket->GetLocalAddress()); -+ bool allocated; -+ talk_base::SocketAddressPair ap( -+ remote_addr, socket->GetLocalAddress(&allocated)); -+ ASSERT(allocated); - ASSERT(!ap.destination().IsAny()); - - // If this connection already exists, then forward the traffic. -@@ -425,8 +443,10 @@ void RelayServer::HandleStunAllocate( - response.AddAttribute(magic_cookie_attr); - - size_t index = rand() % external_sockets_.size(); -+ bool allocated; - talk_base::SocketAddress ext_addr = -- external_sockets_[index]->GetLocalAddress(); -+ external_sockets_[index]->GetLocalAddress(&allocated); -+ ASSERT(allocated); - - StunAddressAttribute* addr_attr = - StunAttribute::CreateAddress(STUN_ATTR_MAPPED_ADDRESS); -@@ -472,7 +492,10 @@ void RelayServer::HandleStunSend( - // Create a new connection to establish the relationship with this binding. - ASSERT(external_sockets_.size() == 1); - talk_base::AsyncPacketSocket* socket = external_sockets_[0]; -- talk_base::SocketAddressPair ap(ext_addr, socket->GetLocalAddress()); -+ bool allocated; -+ talk_base::SocketAddressPair ap( -+ ext_addr, socket->GetLocalAddress(&allocated)); -+ ASSERT(allocated); - ext_conn = new RelayServerConnection(int_conn->binding(), ap, socket); - ext_conn->binding()->AddExternalConnection(ext_conn); - AddConnection(ext_conn); -@@ -559,7 +582,7 @@ void RelayServer::AcceptConnection(talk_ - accepted_socket = new talk_base::AsyncSSLServerSocket(accepted_socket); - } - talk_base::AsyncTCPSocket* tcp_socket = -- new talk_base::AsyncTCPSocket(accepted_socket); -+ new talk_base::AsyncTCPSocket(accepted_socket, false); - - // Finally add the socket so it can start communicating with the client. - AddInternalSocket(tcp_socket); -diff -upN libjingle-0.5.2/talk/p2p/base/relayserver.h.chromium12 libjingle-0.5.2/talk/p2p/base/relayserver.h ---- libjingle-0.5.2/talk/p2p/base/relayserver.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/relayserver.h 2011-03-30 21:51:32.707287001 -0400 -@@ -25,8 +25,12 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#ifndef __RELAYSERVER_H__ --#define __RELAYSERVER_H__ -+#ifndef TALK_P2P_BASE_RELAYSERVER_H_ -+#define TALK_P2P_BASE_RELAYSERVER_H_ -+ -+#include <string> -+#include <vector> -+#include <map> - - #include "talk/base/asyncudpsocket.h" - #include "talk/base/socketaddresspair.h" -@@ -35,10 +39,6 @@ - #include "talk/p2p/base/port.h" - #include "talk/p2p/base/stun.h" - --#include <string> --#include <vector> --#include <map> -- - namespace cricket { - - class RelayServerBinding; -@@ -48,9 +48,9 @@ class RelayServerConnection; - // All connections created with the same username/password are bound together. - class RelayServer : public talk_base::MessageHandler, - public sigslot::has_slots<> { --public: -+ public: - // Creates a server, which will use this thread to post messages to itself. -- RelayServer(talk_base::Thread* thread); -+ explicit RelayServer(talk_base::Thread* thread); - ~RelayServer(); - - talk_base::Thread* thread() { return thread_; } -@@ -79,16 +79,18 @@ public: - // Removes this server socket from the list. - void RemoveInternalServerSocket(talk_base::AsyncSocket* socket); - -- int GetConnectionCount(); -+ // Methods for testing and debuging. -+ int GetConnectionCount() const; -+ talk_base::SocketAddressPair GetConnection(int connection) const; -+ bool HasConnection(const talk_base::SocketAddress& address) const; - -- bool HasConnection(const talk_base::SocketAddress& address); -- --private: -+ private: - typedef std::vector<talk_base::AsyncPacketSocket*> SocketList; - typedef std::map<talk_base::AsyncSocket*, - cricket::ProtocolType> ServerSocketMap; -- typedef std::map<std::string,RelayServerBinding*> BindingMap; -- typedef std::map<talk_base::SocketAddressPair,RelayServerConnection*> ConnectionMap; -+ typedef std::map<std::string, RelayServerBinding*> BindingMap; -+ typedef std::map<talk_base::SocketAddressPair, -+ RelayServerConnection*> ConnectionMap; - - talk_base::Thread* thread_; - bool log_bindings_; -@@ -99,18 +101,19 @@ private: - ConnectionMap connections_; - - // Called when a packet is received by the server on one of its sockets. -- void OnInternalPacket( -- const char* bytes, size_t size, const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket); -- void OnExternalPacket( -- const char* bytes, size_t size, const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket); -+ void OnInternalPacket(talk_base::AsyncPacketSocket* socket, -+ const char* bytes, size_t size, -+ const talk_base::SocketAddress& remote_addr); -+ void OnExternalPacket(talk_base::AsyncPacketSocket* socket, -+ const char* bytes, size_t size, -+ const talk_base::SocketAddress& remote_addr); - - void OnReadEvent(talk_base::AsyncSocket* socket); - - // Processes the relevant STUN request types from the client. - bool HandleStun(const char* bytes, size_t size, -- const talk_base::SocketAddress& remote_addr, talk_base::AsyncPacketSocket* socket, -+ const talk_base::SocketAddress& remote_addr, -+ talk_base::AsyncPacketSocket* socket, - std::string* username, StunMessage* msg); - void HandleStunAllocate(const char* bytes, size_t size, - const talk_base::SocketAddressPair& ap, -@@ -142,7 +145,7 @@ private: - // Maintains information about a connection to the server. Each connection is - // part of one and only one binding. - class RelayServerConnection { --public: -+ public: - RelayServerConnection(RelayServerBinding* binding, - const talk_base::SocketAddressPair& addrs, - talk_base::AsyncPacketSocket* socket); -@@ -158,7 +161,8 @@ public: - // Sends a packet to the connected client. If an address is provided, then - // we make sure the internal client receives it, wrapping if necessary. - void Send(const char* data, size_t size); -- void Send(const char* data, size_t size, const talk_base::SocketAddress& ext_addr); -+ void Send(const char* data, size_t size, -+ const talk_base::SocketAddress& ext_addr); - - // Sends a STUN message to the connected client with no wrapping. - void SendStun(const StunMessage& msg); -@@ -172,12 +176,14 @@ public: - - // Records the address that raw packets should be forwarded to (for internal - // packets only; for external, we already know where they go). -- const talk_base::SocketAddress& default_destination() const { return default_dest_; } -+ const talk_base::SocketAddress& default_destination() const { -+ return default_dest_; -+ } - void set_default_destination(const talk_base::SocketAddress& addr) { - default_dest_ = addr; - } - --private: -+ private: - RelayServerBinding* binding_; - talk_base::SocketAddressPair addr_pair_; - talk_base::AsyncPacketSocket* socket_; -@@ -188,7 +194,7 @@ private: - // Records a set of internal and external connections that we relay between, - // or in other words, that are "bound" together. - class RelayServerBinding : public talk_base::MessageHandler { --public: -+ public: - RelayServerBinding( - RelayServer* server, const std::string& username, - const std::string& password, uint32 lifetime); -@@ -215,13 +221,15 @@ public: - - // Determines the connection to use to send packets to or from the given - // external address. -- RelayServerConnection* GetInternalConnection(const talk_base::SocketAddress& ext_addr); -- RelayServerConnection* GetExternalConnection(const talk_base::SocketAddress& ext_addr); -+ RelayServerConnection* GetInternalConnection( -+ const talk_base::SocketAddress& ext_addr); -+ RelayServerConnection* GetExternalConnection( -+ const talk_base::SocketAddress& ext_addr); - - // MessageHandler: - void OnMessage(talk_base::Message *pmsg); - --private: -+ private: - RelayServer* server_; - - std::string username_; -@@ -236,6 +244,6 @@ private: - // TODO: bandwidth - }; - --} // namespace cricket -+} // namespace cricket - --#endif // __RELAYSERVER_H__ -+#endif // TALK_P2P_BASE_RELAYSERVER_H_ -diff -upN libjingle-0.5.2/talk/p2p/base/relayserver_main.cc.chromium12 libjingle-0.5.2/talk/p2p/base/relayserver_main.cc ---- libjingle-0.5.2/talk/p2p/base/relayserver_main.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/relayserver_main.cc 2011-03-30 21:51:32.707287001 -0400 -@@ -53,18 +53,18 @@ int main(int argc, char **argv) { - talk_base::Thread *pthMain = talk_base::Thread::Current(); - - talk_base::scoped_ptr<talk_base::AsyncUDPSocket> int_socket( -- talk_base::CreateAsyncUDPSocket(pthMain->socketserver())); -- if (int_socket->Bind(int_addr) < 0) { -- std::cerr << "Internal socket bind(" << int_addr.ToString() << "): " -- << std::strerror(int_socket->GetError()) << std::endl; -+ talk_base::AsyncUDPSocket::Create(pthMain->socketserver(), int_addr)); -+ if (!int_socket.get()) { -+ std::cerr << "Failed to create a UDP socket bound at" -+ << int_addr.ToString() << std::endl; - return 1; - } - - talk_base::scoped_ptr<talk_base::AsyncUDPSocket> ext_socket( -- talk_base::CreateAsyncUDPSocket(pthMain->socketserver())); -- if (ext_socket->Bind(ext_addr) < 0) { -- std::cerr << "External socket bind(" << ext_addr.ToString() << "): " -- << std::strerror(ext_socket->GetError()) << std::endl; -+ talk_base::AsyncUDPSocket::Create(pthMain->socketserver(), ext_addr)); -+ if (ext_socket.get()) { -+ std::cerr << "Failed to create a UDP socket bound at" -+ << ext_addr.ToString() << std::endl; - return 1; - } - -diff -upN libjingle-0.5.2/talk/p2p/base/session.cc.chromium12 libjingle-0.5.2/talk/p2p/base/session.cc ---- libjingle-0.5.2/talk/p2p/base/session.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/session.cc 2011-03-30 21:51:32.707287001 -0400 -@@ -180,8 +180,6 @@ void BaseSession::SetError(Error error) - if (error != error_) { - error_ = error; - SignalError(this, error); -- if (error_ != ERROR_NONE) -- signaling_thread_->Post(this, MSG_ERROR); - } - } - -@@ -647,12 +645,10 @@ void Session::OnIncomingMessage(const Se - valid = OnTransportAcceptMessage(msg, &error); - break; - case ACTION_NOTIFY: -+ valid = OnNotifyMessage(msg, &error); -+ break; - case ACTION_UPDATE: -- // TODO: Process these non-standard messages, but -- // only once we figure out how in a jingle-specific way (or -- // remove the need altogether). For now, just don't send an -- // error back, because it disrupts call establishment. -- valid = true; -+ valid = OnUpdateMessage(msg, &error); - break; - default: - valid = BadMessage(buzz::QN_STANZA_BAD_REQUEST, -@@ -697,13 +693,16 @@ void Session::OnFailedSend(const buzz::X - std::string error_type = "cancel"; - - const buzz::XmlElement* error = error_stanza->FirstNamed(buzz::QN_ERROR); -- ASSERT(error != NULL); - if (error) { - ASSERT(error->HasAttr(buzz::QN_TYPE)); - error_type = error->Attr(buzz::QN_TYPE); - - LOG(LS_ERROR) << "Session error:\n" << error->Str() << "\n" - << "in response to:\n" << orig_stanza->Str(); -+ } else { -+ // don't crash if <error> is missing -+ LOG(LS_ERROR) << "Session error without <error/> element, ignoring"; -+ return; - } - - if (msg.type == ACTION_TRANSPORT_INFO) { -@@ -832,6 +831,30 @@ bool Session::OnTransportAcceptMessage(c - return true; - } - -+bool Session::OnNotifyMessage(const SessionMessage& msg, -+ MessageError* error) { -+ SessionNotify notify; -+ if (!ParseSessionNotify(msg.action_elem, &notify, error)) { -+ return false; -+ } -+ -+ SignalMediaSources(notify.nickname_to_sources); -+ -+ return true; -+} -+ -+bool Session::OnUpdateMessage(const SessionMessage& msg, -+ MessageError* error) { -+ SessionUpdate update; -+ if (!ParseSessionUpdate(msg.action_elem, &update, error)) { -+ return false; -+ } -+ -+ // TODO: Process this message appropriately. -+ -+ return true; -+} -+ - bool BareJidsEqual(const std::string& name1, - const std::string& name2) { - buzz::Jid jid1(name1); -@@ -868,6 +891,12 @@ bool Session::CheckState(State state, Me - return true; - } - -+void Session::SetError(Error error) { -+ BaseSession::SetError(error); -+ if (error_ != ERROR_NONE) -+ signaling_thread_->Post(this, MSG_ERROR); -+} -+ - void Session::OnMessage(talk_base::Message *pmsg) { - // preserve this because BaseSession::OnMessage may modify it - BaseSession::State orig_state = state_; -@@ -909,6 +938,16 @@ bool Session::WriteSessionAction( - elems, error); - } - -+bool Session::SetVideoView( -+ const std::vector<VideoViewRequest>& view_requests) { -+ SessionView view; -+ SessionError error; -+ -+ view.view_requests = view_requests; -+ -+ return !SendViewMessage(view, &error); -+} -+ - bool Session::SendAcceptMessage(const SessionDescription* sdesc, - SessionError* error) { - XmlElements elems; -@@ -958,6 +997,12 @@ bool Session::WriteSessionAction(Signali - elems, error); - } - -+bool Session::SendViewMessage(const SessionView& view, SessionError* error) { -+ XmlElements elems; -+ WriteSessionView(view, &elems); -+ return SendMessage(ACTION_VIEW, elems, error); -+} -+ - bool Session::ResendAllTransportInfoMessages(SessionError* error) { - for (TransportMap::iterator iter = transports_.begin(); - iter != transports_.end(); ++iter) { -diff -upN libjingle-0.5.2/talk/p2p/base/session.h.chromium12 libjingle-0.5.2/talk/p2p/base/session.h ---- libjingle-0.5.2/talk/p2p/base/session.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/session.h 2011-03-30 21:51:32.708287001 -0400 -@@ -42,8 +42,6 @@ - #include "talk/xmllite/xmlelement.h" - #include "talk/xmpp/constants.h" - --class JingleMessageHandler; -- - namespace cricket { - - class P2PTransportChannel; -@@ -163,6 +161,7 @@ class BaseSession : public sigslot::has_ - ERROR_TIME = 1, // no response to signaling - ERROR_RESPONSE = 2, // error during signaling - ERROR_NETWORK = 3, // network error, could not allocate network resources -+ ERROR_CONTENT = 4, // channel errors in SetLocalContent/SetRemoteContent - }; - - explicit BaseSession(talk_base::Thread *signaling_thread); -@@ -172,7 +171,7 @@ class BaseSession : public sigslot::has_ - void SetState(State state); - - // Updates the error state, signaling if necessary. -- void SetError(Error error); -+ virtual void SetError(Error error); - - // Handles messages posted to us. - virtual void OnMessage(talk_base::Message *pmsg); -@@ -364,9 +363,20 @@ class Session : public BaseSession { - virtual void DestroyChannel(const std::string& content_name, - const std::string& channel_name); - -+ // Updates the error state, signaling if necessary. -+ virtual void SetError(Error error); -+ - // Handles messages posted to us. - virtual void OnMessage(talk_base::Message *pmsg); - -+ // Fired when notification of media sources is received from the server. -+ // Passes a map whose keys are strings containing nick names for users -+ // in the session and whose values contain the SSRCs for each user. -+ sigslot::signal1<const StringToMediaSourcesMap&> SignalMediaSources; -+ -+ // Sets the video streams to receive from the server. -+ bool SetVideoView(const VideoViewRequestVector& view_requests); -+ - private: - // Creates or destroys a session. (These are called only SessionManager.) - Session(SessionManager *session_manager, -@@ -439,6 +449,7 @@ class Session : public BaseSession { - bool SendTerminateMessage(const std::string& reason, SessionError* error); - bool SendTransportInfoMessage(const TransportInfo& tinfo, - SessionError* error); -+ bool SendViewMessage(const SessionView& view, SessionError* error); - bool ResendAllTransportInfoMessages(SessionError* error); - - // Both versions of SendMessage send a message of the given type to -@@ -510,6 +521,8 @@ class Session : public BaseSession { - bool OnTerminateMessage(const SessionMessage& msg, MessageError* error); - bool OnTransportInfoMessage(const SessionMessage& msg, MessageError* error); - bool OnTransportAcceptMessage(const SessionMessage& msg, MessageError* error); -+ bool OnNotifyMessage(const SessionMessage& msg, MessageError* error); -+ bool OnUpdateMessage(const SessionMessage& msg, MessageError* error); - bool OnRedirectError(const SessionRedirect& redirect, SessionError* error); - - // Verifies that we are in the appropriate state to receive this message. -diff -upN libjingle-0.5.2/talk/p2p/base/sessionmessages.cc.chromium12 libjingle-0.5.2/talk/p2p/base/sessionmessages.cc ---- libjingle-0.5.2/talk/p2p/base/sessionmessages.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/sessionmessages.cc 2011-03-30 21:51:32.708287001 -0400 -@@ -25,11 +25,13 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include <stdio.h> - #include <string> - #include "talk/p2p/base/sessionmessages.h" - - #include "talk/base/logging.h" - #include "talk/base/scoped_ptr.h" -+#include "talk/base/stringutils.h" - #include "talk/xmllite/xmlconstants.h" - #include "talk/xmpp/constants.h" - #include "talk/p2p/base/constants.h" -@@ -38,6 +40,7 @@ - #include "talk/p2p/base/sessionclient.h" - #include "talk/p2p/base/sessiondescription.h" - #include "talk/p2p/base/transport.h" -+#include "talk/xmllite/xmlconstants.h" - - namespace cricket { - -@@ -112,6 +115,8 @@ std::string ToGingleString(ActionType ty - return GINGLE_ACTION_REJECT; - case ACTION_SESSION_TERMINATE: - return GINGLE_ACTION_TERMINATE; -+ case ACTION_VIEW: -+ return GINGLE_ACTION_VIEW; - case ACTION_TRANSPORT_INFO: - return GINGLE_ACTION_CANDIDATES; - default: -@@ -126,7 +131,12 @@ bool IsJingleMessage(const buzz::XmlElem - return false; - - return (jingle->HasAttr(buzz::QN_ACTION) && -- jingle->HasAttr(buzz::QN_ID)); -+ (jingle->HasAttr(QN_SID) -+ // TODO: This works around a bug in old jingle -+ // clients that set QN_ID instead of QN_SID. Once we know -+ // there are no clients which have this bug, we can remove -+ // this code. -+ || jingle->HasAttr(QN_ID))); - } - - bool IsGingleMessage(const buzz::XmlElement* stanza) { -@@ -168,7 +178,13 @@ bool ParseJingleSessionMessage(const buz - msg->protocol = PROTOCOL_JINGLE; - std::string type_string = jingle->Attr(buzz::QN_ACTION); - msg->type = ToActionType(type_string); -- msg->sid = jingle->Attr(buzz::QN_ID); -+ msg->sid = jingle->Attr(QN_SID); -+ // TODO: This works around a bug in old jingle clients -+ // that set QN_ID instead of QN_SID. Once we know there are no -+ // clients which have this bug, we can remove this code. -+ if (msg->sid.empty()) { -+ msg->sid = jingle->Attr(buzz::QN_ID); -+ } - msg->initiator = GetXmlAttr(jingle, QN_INITIATOR, buzz::STR_EMPTY); - msg->action_elem = jingle; - -@@ -221,7 +237,11 @@ buzz::XmlElement* WriteJingleAction(cons - const XmlElements& action_elems) { - buzz::XmlElement* jingle = new buzz::XmlElement(QN_JINGLE, true); - jingle->AddAttr(buzz::QN_ACTION, ToJingleString(msg.type)); -- jingle->AddAttr(buzz::QN_ID, msg.sid); -+ jingle->AddAttr(QN_SID, msg.sid); -+ // TODO: This works around a bug in old jingle clinets -+ // that expected QN_ID instead of QN_SID. Once we know there are no -+ // clients which have this bug, we can remove this code. -+ jingle->AddAttr(QN_ID, msg.sid); - // TODO: Right now, the XMPP server rejects a jingle-only - // (non hybrid) message with "feature-not-implemented" if there is - // no initiator. Fix the server, and then only set the initiator on -@@ -824,6 +844,40 @@ bool WriteTransportInfos(SignalingProtoc - } - } - -+bool ParseSessionNotify(const buzz::XmlElement* action_elem, -+ SessionNotify* notify, ParseError* error) { -+ const buzz::XmlElement* notify_elem; -+ for (notify_elem = action_elem->FirstNamed(QN_GINGLE_NOTIFY); -+ notify_elem != NULL; -+ notify_elem = notify_elem->NextNamed(QN_GINGLE_NOTIFY)) { -+ // Note that a subsequent notify element for the same user will override a -+ // previous. We don't merge them. -+ std::string nick(notify_elem->Attr(QN_GINGLE_NOTIFY_NICK)); -+ if (nick != buzz::STR_EMPTY) { -+ MediaSources sources; -+ const buzz::XmlElement* source_elem; -+ for (source_elem = notify_elem->FirstNamed(QN_GINGLE_NOTIFY_SOURCE); -+ source_elem != NULL; -+ source_elem = source_elem->NextNamed(QN_GINGLE_NOTIFY_SOURCE)) { -+ std::string ssrc = source_elem->Attr(QN_GINGLE_NOTIFY_SOURCE_SSRC); -+ if (ssrc != buzz::STR_EMPTY) { -+ std::string mtype = source_elem->Attr(QN_GINGLE_NOTIFY_SOURCE_MTYPE); -+ if (mtype == GINGLE_NOTIFY_SOURCE_MTYPE_AUDIO) { -+ sources.audio_ssrc = strtoul(ssrc.c_str(), NULL, 10); -+ } else if (mtype == GINGLE_NOTIFY_SOURCE_MTYPE_VIDEO) { -+ sources.video_ssrc = strtoul(ssrc.c_str(), NULL, 10); -+ } -+ } -+ } -+ -+ notify->nickname_to_sources.insert( -+ std::pair<std::string, MediaSources>(nick, sources)); -+ } -+ } -+ -+ return true; -+} -+ - bool GetUriTarget(const std::string& prefix, const std::string& str, - std::string* after) { - size_t pos = str.find(prefix); -@@ -834,6 +888,65 @@ bool GetUriTarget(const std::string& pre - return true; - } - -+bool ParseSessionUpdate(const buzz::XmlElement* action_elem, -+ SessionUpdate* update, ParseError* error) { -+ // TODO: Parse the update message. -+ return true; -+} -+ -+void WriteSessionView(const SessionView& view, XmlElements* elems) { -+ std::vector<VideoViewRequest>::const_iterator it; -+ for (it = view.view_requests.begin(); it != view.view_requests.end(); it++) { -+ talk_base::scoped_ptr<buzz::XmlElement> view_elem( -+ new buzz::XmlElement(QN_GINGLE_VIEW)); -+ if (view_elem.get() == NULL) { -+ return; -+ } -+ -+ view_elem->SetAttr(QN_GINGLE_VIEW_TYPE, GINGLE_VIEW_TYPE_STATIC); -+ view_elem->SetAttr(QN_GINGLE_VIEW_NICK, it->nick_name); -+ view_elem->SetAttr(QN_GINGLE_VIEW_MEDIA_TYPE, -+ GINGLE_VIEW_MEDIA_TYPE_VIDEO); -+ -+ // A 32-bit uint, expressed as decimal, has a max of 10 digits, plus one -+ // for the null. -+ char str[11]; -+ int result = talk_base::sprintfn(str, ARRAY_SIZE(str), "%u", it->ssrc); -+ if (result < 0 || result >= ARRAY_SIZE(str)) { -+ continue; -+ } -+ view_elem->SetAttr(QN_GINGLE_VIEW_SSRC, str); -+ -+ // Include video-specific parameters in a child <params> element. -+ talk_base::scoped_ptr<buzz::XmlElement> params_elem( -+ new buzz::XmlElement(QN_GINGLE_VIEW_PARAMS)); -+ if (params_elem.get() == NULL) { -+ return; -+ } -+ -+ result = talk_base::sprintfn(str, ARRAY_SIZE(str), "%u", it->width); -+ if (result < 0 || result >= ARRAY_SIZE(str)) { -+ continue; -+ } -+ params_elem->SetAttr(QN_GINGLE_VIEW_PARAMS_WIDTH, str); -+ -+ result = talk_base::sprintfn(str, ARRAY_SIZE(str), "%u", it->height); -+ if (result < 0 || result >= ARRAY_SIZE(str)) { -+ continue; -+ } -+ params_elem->SetAttr(QN_GINGLE_VIEW_PARAMS_HEIGHT, str); -+ -+ result = talk_base::sprintfn(str, ARRAY_SIZE(str), "%u", it->framerate); -+ if (result < 0 || result >= ARRAY_SIZE(str)) { -+ continue; -+ } -+ params_elem->SetAttr(QN_GINGLE_VIEW_PARAMS_FRAMERATE, str); -+ -+ view_elem->AddElement(params_elem.release()); -+ elems->push_back(view_elem.release()); -+ } -+} -+ - bool FindSessionRedirect(const buzz::XmlElement* stanza, - SessionRedirect* redirect) { - const buzz::XmlElement* error_elem = GetXmlChild(stanza, LN_ERROR); -diff -upN libjingle-0.5.2/talk/p2p/base/sessionmessages.h.chromium12 libjingle-0.5.2/talk/p2p/base/sessionmessages.h ---- libjingle-0.5.2/talk/p2p/base/sessionmessages.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/sessionmessages.h 2011-03-30 21:51:32.709287001 -0400 -@@ -35,6 +35,7 @@ - #include "talk/xmllite/xmlelement.h" - #include "talk/p2p/base/constants.h" - #include "talk/p2p/base/sessiondescription.h" // Needed to delete contents. -+#include "talk/base/basictypes.h" - - namespace cricket { - -@@ -66,6 +67,7 @@ enum ActionType { - // being needed at all. - ACTION_NOTIFY, - ACTION_UPDATE, -+ ACTION_VIEW, - }; - - // Abstraction of a <jingle> element within an <iq> stanza, per XMPP -@@ -159,6 +161,45 @@ struct SessionRedirect { - std::string target; - }; - -+// Holds the ssrcs for a user's media streams. -+struct MediaSources { -+ uint32 audio_ssrc; -+ uint32 video_ssrc; -+ MediaSources() : audio_ssrc(0), video_ssrc(0) {} -+}; -+ -+typedef std::map<std::string, MediaSources> StringToMediaSourcesMap; -+ -+struct SessionNotify { -+ // A mapping of room users (identified by their nicknames) to their ssrcs. -+ StringToMediaSourcesMap nickname_to_sources; -+}; -+ -+// TODO: Populate the update message. -+struct SessionUpdate { -+}; -+ -+// Represents an individual <view> element in the <session type="view"> -+// message. -+struct VideoViewRequest { -+ std::string nick_name; -+ uint32 ssrc; -+ uint32 width; -+ uint32 height; -+ uint32 framerate; -+ -+ VideoViewRequest(const std::string& nick_name, uint32 ssrc, uint32 width, -+ uint32 height, uint32 framerate) : -+ nick_name(nick_name), ssrc(ssrc), width(width), height(height), -+ framerate(framerate) {} -+}; -+ -+typedef std::vector<VideoViewRequest> VideoViewRequestVector; -+ -+struct SessionView { -+ VideoViewRequestVector view_requests; -+}; -+ - bool IsSessionMessage(const buzz::XmlElement* stanza); - bool ParseSessionMessage(const buzz::XmlElement* stanza, - SessionMessage* msg, -@@ -218,6 +259,11 @@ bool WriteTransportInfos(SignalingProtoc - const TransportParserMap& trans_parsers, - XmlElements* elems, - WriteError* error); -+bool ParseSessionNotify(const buzz::XmlElement* action_elem, -+ SessionNotify* notify, ParseError* error); -+bool ParseSessionUpdate(const buzz::XmlElement* action_elem, -+ SessionUpdate* update, ParseError* error); -+void WriteSessionView(const SessionView& view, XmlElements* elems); - // Handles both Gingle and Jingle syntax. - bool FindSessionRedirect(const buzz::XmlElement* stanza, - SessionRedirect* redirect); -diff -upN libjingle-0.5.2/talk/p2p/base/stunport.cc.chromium12 libjingle-0.5.2/talk/p2p/base/stunport.cc ---- libjingle-0.5.2/talk/p2p/base/stunport.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/stunport.cc 2011-03-30 21:51:32.709287001 -0400 -@@ -102,8 +102,8 @@ class StunPortBindingRequest : public St - - virtual void OnTimeout() { - LOG(LS_ERROR) << "Binding request timed out from " -- << port_->GetLocalAddress().ToString() -- << " (" << port_->network()->name() << ")"; -+ << port_->socket_->GetLocalAddress(NULL).ToString() -+ << " (" << port_->network()->name() << ")"; - - port_->SignalAddressError(port_); - -@@ -124,26 +124,27 @@ class StunPortBindingRequest : public St - - const std::string STUN_PORT_TYPE("stun"); - --StunPort::StunPort(talk_base::Thread* thread, talk_base::SocketFactory* factory, -+StunPort::StunPort(talk_base::Thread* thread, -+ talk_base::PacketSocketFactory* factory, - talk_base::Network* network, -+ uint32 ip, int min_port, int max_port, - const talk_base::SocketAddress& server_addr) -- : Port(thread, STUN_PORT_TYPE, factory, network), -- server_addr_(server_addr), requests_(thread), socket_(NULL), error_(0), -+ : Port(thread, STUN_PORT_TYPE, factory, network, ip, min_port, max_port), -+ server_addr_(server_addr), -+ requests_(thread), -+ socket_(NULL), -+ error_(0), - resolver_(NULL) { - requests_.SignalSendPacket.connect(this, &StunPort::OnSendPacket); - } - --bool StunPort::Init(const talk_base::SocketAddress& local_addr) { -- socket_ = CreatePacketSocket(PROTO_UDP); -+bool StunPort::Init() { -+ socket_ = factory_->CreateUdpSocket( -+ talk_base::SocketAddress(ip_, 0), min_port_, max_port_); - if (!socket_) { - LOG_J(LS_WARNING, this) << "UDP socket creation failed"; - return false; - } -- if (socket_->Bind(local_addr) < 0) { -- LOG_J(LS_WARNING, this) << "UDP bind failed with error " -- << socket_->GetError(); -- return false; -- } - socket_->SignalReadPacket.connect(this, &StunPort::OnReadPacket); - return true; - } -@@ -200,14 +201,20 @@ int StunPort::GetError() { - return error_; - } - --void StunPort::OnReadPacket( -- const char* data, size_t size, const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket) { -+void StunPort::OnReadPacket(talk_base::AsyncPacketSocket* socket, -+ const char* data, size_t size, -+ const talk_base::SocketAddress& remote_addr) { - ASSERT(socket == socket_); - -- // Look for a response to a binding request. -- if (requests_.CheckResponse(data, size)) -+ // Look for a response from the STUN server. -+ // Even if the response doesn't match one of our outstanding requests, we -+ // will eat it because it might be a response to a retransmitted packet, and -+ // we already cleared the request when we got the first response. -+ ASSERT(!server_addr_.IsUnresolved()); -+ if (remote_addr == server_addr_ || remote_addr == server_addr2_) { -+ requests_.CheckResponse(data, size); - return; -+ } - - if (Connection* conn = GetConnection(remote_addr)) { - conn->OnReadPacket(data, size); -diff -upN libjingle-0.5.2/talk/p2p/base/stunport.h.chromium12 libjingle-0.5.2/talk/p2p/base/stunport.h ---- libjingle-0.5.2/talk/p2p/base/stunport.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/stunport.h 2011-03-30 21:51:32.709287001 -0400 -@@ -29,7 +29,8 @@ - #define TALK_P2P_BASE_STUNPORT_H_ - - #include <string> --#include "talk/base/asyncudpsocket.h" -+ -+#include "talk/base/asyncpacketsocket.h" - #include "talk/p2p/base/udpport.h" - #include "talk/p2p/base/stunrequest.h" - -@@ -46,27 +47,20 @@ extern const std::string STUN_PORT_TYPE; - class StunPort : public Port { - public: - static StunPort* Create(talk_base::Thread* thread, -- talk_base::SocketFactory* factory, -+ talk_base::PacketSocketFactory* factory, - talk_base::Network* network, -- const talk_base::SocketAddress& local_addr, -+ uint32 ip, int min_port, int max_port, - const talk_base::SocketAddress& server_addr) { -- StunPort* port = new StunPort(thread, factory, network, server_addr); -- if (!port->Init(local_addr)) { -+ StunPort* port = new StunPort(thread, factory, network, -+ ip, min_port, max_port, server_addr); -+ if (!port->Init()) { - delete port; - port = NULL; - } - return port; - } -- StunPort(talk_base::Thread* thread, talk_base::SocketFactory* factory, -- talk_base::Network* network, -- const talk_base::SocketAddress& server_addr); -- bool Init(const talk_base::SocketAddress& local_addr); - virtual ~StunPort(); - -- talk_base::SocketAddress GetLocalAddress() const { -- return socket_->GetLocalAddress(); -- } -- - const talk_base::SocketAddress& server_addr() const { return server_addr_; } - void set_server_addr(const talk_base::SocketAddress& addr) { - server_addr_ = addr; -@@ -89,13 +83,17 @@ class StunPort : public Port { - virtual int GetError(); - - protected: -+ StunPort(talk_base::Thread* thread, talk_base::PacketSocketFactory* factory, -+ talk_base::Network* network, uint32 ip, int min_port, int max_port, -+ const talk_base::SocketAddress& server_addr); -+ bool Init(); -+ - virtual int SendTo(const void* data, size_t size, - const talk_base::SocketAddress& addr, bool payload); - -- void OnReadPacket( -- const char* data, size_t size, -- const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket); -+ void OnReadPacket(talk_base::AsyncPacketSocket* socket, -+ const char* data, size_t size, -+ const talk_base::SocketAddress& remote_addr); - - private: - // DNS resolution of the STUN server. -diff -upN libjingle-0.5.2/talk/p2p/base/stunserver.cc.chromium12 libjingle-0.5.2/talk/p2p/base/stunserver.cc ---- libjingle-0.5.2/talk/p2p/base/stunserver.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/stunserver.cc 2011-03-30 21:51:32.709287001 -0400 -@@ -44,8 +44,8 @@ StunServer::~StunServer() { - } - - void StunServer::OnPacket( -- const char* buf, size_t size, const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket) { -+ talk_base::AsyncPacketSocket* socket, const char* buf, size_t size, -+ const talk_base::SocketAddress& remote_addr) { - - // TODO: If appropriate, look for the magic cookie before parsing. - -@@ -97,7 +97,12 @@ void StunServer::OnBindingRequest( - response.AddAttribute(mapped_addr); - - // Tell the user the address that we are sending the response from. -- talk_base::SocketAddress local_addr = socket_->GetLocalAddress(); -+ // This method should not be called if socket address is not -+ // allocated yet. -+ bool allocated; -+ talk_base::SocketAddress local_addr = socket_->GetLocalAddress(&allocated); -+ ASSERT(allocated); -+ - StunAddressAttribute* source_addr = - StunAttribute::CreateAddress(STUN_ATTR_SOURCE_ADDRESS); - source_addr->SetFamily(1); -diff -upN libjingle-0.5.2/talk/p2p/base/stunserver.h.chromium12 libjingle-0.5.2/talk/p2p/base/stunserver.h ---- libjingle-0.5.2/talk/p2p/base/stunserver.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/stunserver.h 2011-03-30 21:51:32.710287001 -0400 -@@ -46,8 +46,8 @@ class StunServer : public sigslot::has_s - protected: - // Slot for AsyncSocket.PacketRead: - void OnPacket( -- const char* buf, size_t size, const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket); -+ talk_base::AsyncPacketSocket* socket, const char* buf, size_t size, -+ const talk_base::SocketAddress& remote_addr); - - // Handlers for the different types of STUN/TURN requests: - void OnBindingRequest(StunMessage* msg, -diff -upN libjingle-0.5.2/talk/p2p/base/stunserver_main.cc.chromium12 libjingle-0.5.2/talk/p2p/base/stunserver_main.cc ---- libjingle-0.5.2/talk/p2p/base/stunserver_main.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/stunserver_main.cc 2011-03-30 21:51:32.710287001 -0400 -@@ -52,9 +52,9 @@ int main(int argc, char* argv[]) { - talk_base::Thread *pthMain = talk_base::Thread::Current(); - - talk_base::AsyncUDPSocket* server_socket = -- talk_base::CreateAsyncUDPSocket(pthMain->socketserver()); -- if (server_socket->Bind(server_addr) < 0) { -- std::cerr << "bind: " << std::strerror(errno) << std::endl; -+ talk_base::AsyncUDPSocket::Create(pthMain->socketserver(), server_addr); -+ if (!server_socket) { -+ std::cerr << "Failed to create a UDP socket" << std::endl; - return 1; - } - -diff -upN libjingle-0.5.2/talk/p2p/base/tcpport.cc.chromium12 libjingle-0.5.2/talk/p2p/base/tcpport.cc ---- libjingle-0.5.2/talk/p2p/base/tcpport.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/tcpport.cc 2011-03-30 21:51:32.710287001 -0400 -@@ -25,10 +25,6 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#if defined(_MSC_VER) && _MSC_VER < 1300 --#pragma warning(disable:4786) --#endif -- - #include "talk/p2p/base/tcpport.h" - - #include "talk/base/common.h" -@@ -37,30 +33,28 @@ - - namespace cricket { - --TCPPort::TCPPort(talk_base::Thread* thread, talk_base::SocketFactory* factory, -- talk_base::Network* network, -- const talk_base::SocketAddress& address, -- bool allow_listen) -- : Port(thread, LOCAL_PORT_TYPE, factory, network), address_(address), -- incoming_only_(address_.port() != 0), allow_listen_(allow_listen), -- socket_(NULL), error_(0) { -+TCPPort::TCPPort(talk_base::Thread* thread, -+ talk_base::PacketSocketFactory* factory, -+ talk_base::Network* network, uint32 ip, -+ int min_port, int max_port, bool allow_listen) -+ : Port(thread, LOCAL_PORT_TYPE, factory, network, ip, min_port, max_port), -+ incoming_only_(false), -+ allow_listen_(allow_listen), -+ socket_(NULL), -+ error_(0) { - } - - bool TCPPort::Init() { -- // We don't use CreatePacketSocket here since we're creating a listen socket. -- // However we will treat failure to create or bind a TCP socket as fatal. -- // This should never happen. -- socket_ = factory_->CreateAsyncSocket(SOCK_STREAM); -+ // Treat failure to create or bind a TCP socket as fatal. This -+ // should never happen. -+ socket_ = factory_->CreateServerTcpSocket( -+ talk_base::SocketAddress(ip_, 0), min_port_, max_port_, allow_listen_, -+ false /* ssl */); - if (!socket_) { - LOG_J(LS_ERROR, this) << "TCP socket creation failed."; - return false; - } -- if (socket_->Bind(address_) < 0) { -- LOG_J(LS_ERROR, this) << "TCP bind failed with error " -- << socket_->GetError(); -- return false; -- } -- socket_->SignalReadEvent.connect(this, &TCPPort::OnAcceptEvent); -+ socket_->SignalNewConnection.connect(this, &TCPPort::OnNewConnection); - return true; - } - -@@ -87,8 +81,8 @@ Connection* TCPPort::CreateConnection(co - return NULL; - - TCPConnection* conn = NULL; -- if (talk_base::AsyncTCPSocket * socket -- = GetIncoming(address.address(), true)) { -+ if (talk_base::AsyncPacketSocket* socket = -+ GetIncoming(address.address(), true)) { - socket->SignalReadPacket.disconnect(this); - conn = new TCPConnection(this, address, socket); - } else { -@@ -101,18 +95,21 @@ Connection* TCPPort::CreateConnection(co - void TCPPort::PrepareAddress() { - if (!allow_listen_) { - LOG_J(LS_INFO, this) << "Not listening due to firewall restrictions."; -- } else if (socket_->Listen(5) < 0) { -- LOG_J(LS_WARNING, this) << "TCP listen failed with error " -- << socket_->GetError(); - } - // Note: We still add the address, since otherwise the remote side won't - // recognize our incoming TCP connections. -- AddAddress(socket_->GetLocalAddress(), "tcp", true); -+ bool allocated; -+ talk_base::SocketAddress address = socket_->GetLocalAddress(&allocated); -+ if (allocated) { -+ AddAddress(address, "tcp", true); -+ } else { -+ socket_->SignalAddressReady.connect(this, &TCPPort::OnAddresReady); -+ } - } - - int TCPPort::SendTo(const void* data, size_t size, - const talk_base::SocketAddress& addr, bool payload) { -- talk_base::AsyncTCPSocket * socket = NULL; -+ talk_base::AsyncPacketSocket * socket = NULL; - if (TCPConnection * conn = static_cast<TCPConnection*>(GetConnection(addr))) { - socket = conn->socket(); - } else { -@@ -141,31 +138,23 @@ int TCPPort::GetError() { - return error_; - } - --void TCPPort::OnAcceptEvent(talk_base::AsyncSocket* socket) { -+void TCPPort::OnNewConnection(talk_base::AsyncPacketSocket* socket, -+ talk_base::AsyncPacketSocket* new_socket) { - ASSERT(socket == socket_); - - Incoming incoming; -- talk_base::AsyncSocket* newsocket = socket->Accept(&incoming.addr); -- if (!newsocket) { -- // TODO: Do something better like forwarding the error to the user. -- LOG_J(LS_ERROR, this) << "TCP accept failed with error " -- << socket_->GetError(); -- return; -- } -- incoming.socket = new talk_base::AsyncTCPSocket(newsocket); -+ incoming.addr = new_socket->GetRemoteAddress(); -+ incoming.socket = new_socket; - incoming.socket->SignalReadPacket.connect(this, &TCPPort::OnReadPacket); - - LOG_J(LS_VERBOSE, this) << "Accepted connection from " - << incoming.addr.ToString(); - incoming_.push_back(incoming); -- -- // Prime a read event in case data is waiting -- newsocket->SignalReadEvent(newsocket); - } - --talk_base::AsyncTCPSocket* TCPPort::GetIncoming( -+talk_base::AsyncPacketSocket* TCPPort::GetIncoming( - const talk_base::SocketAddress& addr, bool remove) { -- talk_base::AsyncTCPSocket* socket = NULL; -+ talk_base::AsyncPacketSocket* socket = NULL; - for (std::list<Incoming>::iterator it = incoming_.begin(); - it != incoming_.end(); ++it) { - if (it->addr == addr) { -@@ -178,34 +167,46 @@ talk_base::AsyncTCPSocket* TCPPort::GetI - return socket; - } - --void TCPPort::OnReadPacket(const char* data, size_t size, -- const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket) { -+void TCPPort::OnReadPacket(talk_base::AsyncPacketSocket* socket, -+ const char* data, size_t size, -+ const talk_base::SocketAddress& remote_addr) { - Port::OnReadPacket(data, size, remote_addr); - } - -+void TCPPort::OnAddresReady(talk_base::AsyncPacketSocket* socket, -+ const talk_base::SocketAddress& address) { -+ AddAddress(address, "tcp", true); -+} -+ - TCPConnection::TCPConnection(TCPPort* port, const Candidate& candidate, -- talk_base::AsyncTCPSocket* socket) -+ talk_base::AsyncPacketSocket* socket) - : Connection(port, 0, candidate), socket_(socket), error_(0) { - bool outgoing = (socket_ == NULL); - if (outgoing) { -- // TODO: Handle failures here (unlikely since TCP) -- socket_ = static_cast<talk_base::AsyncTCPSocket*>(port->CreatePacketSocket( -- (candidate.protocol() == "ssltcp") ? PROTO_SSLTCP : PROTO_TCP)); -+ // TODO: Handle failures here (unlikely since TCP). -+ -+ socket_ = port->socket_factory()->CreateClientTcpSocket( -+ talk_base::SocketAddress(port_->network()->ip(), 0), -+ candidate.address(), port->proxy(), port->user_agent(), -+ candidate.protocol() == "ssltcp"); -+ if (socket_) { -+ LOG_J(LS_VERBOSE, this) << "Connecting from " -+ << socket_->GetLocalAddress(NULL).ToString() -+ << " to " << candidate.address().ToString(); -+ set_connected(false); -+ socket_->SignalConnect.connect(this, &TCPConnection::OnConnect); -+ } else { -+ LOG_J(LS_WARNING, this) << "Failed to create connection to " -+ << candidate.address().ToString(); -+ } - } else { -- // Incoming connections should match the network address -- ASSERT(socket_->GetLocalAddress().EqualIPs(port->address_)); -+ // Incoming connections should match the network address. -+ ASSERT(socket_->GetLocalAddress(NULL).ip() == port->ip_); - } -- socket_->SignalReadPacket.connect(this, &TCPConnection::OnReadPacket); -- socket_->SignalClose.connect(this, &TCPConnection::OnClose); -- if (outgoing) { -- set_connected(false); -- talk_base::SocketAddress local_address(port->address_.ip(), 0); -- socket_->SignalConnect.connect(this, &TCPConnection::OnConnect); -- socket_->Bind(local_address); -- socket_->Connect(candidate.address()); -- LOG_J(LS_VERBOSE, this) << "Connecting from " << local_address.ToString() -- << " to " << candidate.address().ToString(); -+ -+ if (socket_) { -+ socket_->SignalReadPacket.connect(this, &TCPConnection::OnReadPacket); -+ socket_->SignalClose.connect(this, &TCPConnection::OnClose); - } - } - -@@ -214,6 +215,11 @@ TCPConnection::~TCPConnection() { - } - - int TCPConnection::Send(const void* data, size_t size) { -+ if (!socket_) { -+ error_ = ENOTCONN; -+ return SOCKET_ERROR; -+ } -+ - if (write_state() != STATE_WRITABLE) { - // TODO: Should STATE_WRITE_TIMEOUT return a non-blocking error? - error_ = EWOULDBLOCK; -@@ -232,23 +238,23 @@ int TCPConnection::GetError() { - return error_; - } - --void TCPConnection::OnConnect(talk_base::AsyncTCPSocket* socket) { -+void TCPConnection::OnConnect(talk_base::AsyncPacketSocket* socket) { - ASSERT(socket == socket_); - LOG_J(LS_VERBOSE, this) << "Connection established to " - << socket->GetRemoteAddress().ToString(); - set_connected(true); - } - --void TCPConnection::OnClose(talk_base::AsyncTCPSocket* socket, int error) { -+void TCPConnection::OnClose(talk_base::AsyncPacketSocket* socket, int error) { - ASSERT(socket == socket_); - LOG_J(LS_VERBOSE, this) << "Connection closed with error " << error; - set_connected(false); - set_write_state(STATE_WRITE_TIMEOUT); - } - --void TCPConnection::OnReadPacket(const char* data, size_t size, -- const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket) { -+void TCPConnection::OnReadPacket(talk_base::AsyncPacketSocket* socket, -+ const char* data, size_t size, -+ const talk_base::SocketAddress& remote_addr) { - ASSERT(socket == socket_); - Connection::OnReadPacket(data, size); - } -diff -upN libjingle-0.5.2/talk/p2p/base/tcpport.h.chromium12 libjingle-0.5.2/talk/p2p/base/tcpport.h ---- libjingle-0.5.2/talk/p2p/base/tcpport.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/tcpport.h 2011-03-30 21:51:32.710287001 -0400 -@@ -30,7 +30,7 @@ - - #include <string> - #include <list> --#include "talk/base/asynctcpsocket.h" -+#include "talk/base/asyncpacketsocket.h" - #include "talk/p2p/base/port.h" - - namespace cricket { -@@ -48,19 +48,18 @@ extern const std::string LOCAL_PORT_TYPE - class TCPPort : public Port { - public: - static TCPPort* Create(talk_base::Thread* thread, -- talk_base::SocketFactory* factory, -+ talk_base::PacketSocketFactory* factory, - talk_base::Network* network, -- const talk_base::SocketAddress& local_addr, -+ uint32 ip, int min_port, int max_port, - bool allow_listen) { -- TCPPort* port = new TCPPort(thread, factory, network, local_addr, -- allow_listen); -+ TCPPort* port = new TCPPort(thread, factory, network, -+ ip, min_port, max_port, allow_listen); - if (!port->Init()) { - delete port; - port = NULL; - } - return port; - } -- bool Init(); - virtual ~TCPPort(); - - virtual Connection* CreateConnection(const Candidate& address, -@@ -72,36 +71,40 @@ class TCPPort : public Port { - virtual int GetError(); - - protected: -- TCPPort(talk_base::Thread* thread, talk_base::SocketFactory* factory, -- talk_base::Network* network, const talk_base::SocketAddress& address, -+ TCPPort(talk_base::Thread* thread, talk_base::PacketSocketFactory* factory, -+ talk_base::Network* network, uint32 ip, int min_port, int max_port, - bool allow_listen); -+ bool Init(); - - // Handles sending using the local TCP socket. - virtual int SendTo(const void* data, size_t size, - const talk_base::SocketAddress& addr, bool payload); - -- // Creates TCPConnection for incoming sockets -- void OnAcceptEvent(talk_base::AsyncSocket* socket); -+ // Accepts incoming TCP connection. -+ void OnNewConnection(talk_base::AsyncPacketSocket* socket, -+ talk_base::AsyncPacketSocket* new_socket); - - private: - struct Incoming { - talk_base::SocketAddress addr; -- talk_base::AsyncTCPSocket * socket; -+ talk_base::AsyncPacketSocket* socket; - }; - -- talk_base::AsyncTCPSocket* GetIncoming(const talk_base::SocketAddress& addr, -- bool remove = false); -+ talk_base::AsyncPacketSocket* GetIncoming( -+ const talk_base::SocketAddress& addr, bool remove = false); - - // Receives packet signal from the local TCP Socket. -- void OnReadPacket(const char* data, size_t size, -- const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket); -+ void OnReadPacket(talk_base::AsyncPacketSocket* socket, -+ const char* data, size_t size, -+ const talk_base::SocketAddress& remote_addr); -+ -+ void OnAddresReady(talk_base::AsyncPacketSocket* socket, -+ const talk_base::SocketAddress& address); - -- // Note: use this until Network ips are stable, then use network->ip -- talk_base::SocketAddress address_; -+ // TODO: Is this still needed? - bool incoming_only_; - bool allow_listen_; -- talk_base::AsyncSocket* socket_; -+ talk_base::AsyncPacketSocket* socket_; - int error_; - std::list<Incoming> incoming_; - -@@ -112,22 +115,22 @@ class TCPConnection : public Connection - public: - // Connection is outgoing unless socket is specified - TCPConnection(TCPPort* port, const Candidate& candidate, -- talk_base::AsyncTCPSocket* socket = 0); -+ talk_base::AsyncPacketSocket* socket = 0); - virtual ~TCPConnection(); - - virtual int Send(const void* data, size_t size); - virtual int GetError(); - -- talk_base::AsyncTCPSocket * socket() { return socket_; } -+ talk_base::AsyncPacketSocket* socket() { return socket_; } - - private: -- void OnConnect(talk_base::AsyncTCPSocket* socket); -- void OnClose(talk_base::AsyncTCPSocket* socket, int error); -- void OnReadPacket(const char* data, size_t size, -- const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket); -+ void OnConnect(talk_base::AsyncPacketSocket* socket); -+ void OnClose(talk_base::AsyncPacketSocket* socket, int error); -+ void OnReadPacket(talk_base::AsyncPacketSocket* socket, -+ const char* data, size_t size, -+ const talk_base::SocketAddress& remote_addr); - -- talk_base::AsyncTCPSocket* socket_; -+ talk_base::AsyncPacketSocket* socket_; - int error_; - - friend class TCPPort; -diff -upN libjingle-0.5.2/talk/p2p/base/transport.cc.chromium12 libjingle-0.5.2/talk/p2p/base/transport.cc ---- libjingle-0.5.2/talk/p2p/base/transport.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/transport.cc 2011-03-30 21:51:32.711287001 -0400 -@@ -28,6 +28,7 @@ - #include "talk/p2p/base/transport.h" - - #include "talk/base/common.h" -+#include "talk/base/logging.h" - #include "talk/p2p/base/candidate.h" - #include "talk/p2p/base/constants.h" - #include "talk/p2p/base/sessionmanager.h" -@@ -145,11 +146,13 @@ void Transport::DestroyChannel(const std - - void Transport::DestroyChannel_w(const std::string& name) { - ASSERT(worker_thread()->IsCurrent()); -+ - TransportChannelImpl* impl = NULL; - { - talk_base::CritScope cs(&crit_); - ChannelMap::iterator iter = channels_.find(name); -- ASSERT(iter != channels_.end()); -+ if (iter == channels_.end()) -+ return; - impl = iter->second; - channels_.erase(iter); - } -@@ -173,7 +176,7 @@ void Transport::ConnectChannels() { - - void Transport::ConnectChannels_w() { - ASSERT(worker_thread()->IsCurrent()); -- if (connect_requested_) -+ if (connect_requested_ || channels_.empty()) - return; - connect_requested_ = true; - signaling_thread()->Post( -@@ -192,6 +195,8 @@ void Transport::OnConnecting_s() { - void Transport::DestroyAllChannels() { - ASSERT(signaling_thread()->IsCurrent()); - worker_thread()->Send(this, MSG_DESTROYALLCHANNELS, NULL); -+ worker_thread()->Clear(this); -+ signaling_thread()->Clear(this); - destroyed_ = true; - } - -@@ -233,6 +238,8 @@ void Transport::ResetChannels_w() { - - void Transport::OnSignalingReady() { - ASSERT(signaling_thread()->IsCurrent()); -+ if (destroyed_) return; -+ - worker_thread()->Post(this, MSG_ONSIGNALINGREADY, NULL); - - // Notify the subclass. -@@ -283,7 +290,13 @@ void Transport::OnRemoteCandidates(const - - void Transport::OnRemoteCandidate(const Candidate& candidate) { - ASSERT(signaling_thread()->IsCurrent()); -- ASSERT(HasChannel(candidate.name())); -+ if (destroyed_) return; -+ if (!HasChannel(candidate.name())) { -+ LOG(LS_WARNING) << "Ignoring candidate for unknown channel " -+ << candidate.name(); -+ return; -+ } -+ - // new candidate deleted when params is deleted - ChannelParams* params = new ChannelParams(new Candidate(candidate)); - ChannelMessage* msg = new ChannelMessage(params); -@@ -445,7 +458,7 @@ bool TransportParser::ParseAddress(const - - address->SetIP(elem->Attr(address_name)); - std::istringstream ist(elem->Attr(port_name)); -- int port; -+ int port = 0; - ist >> port; - address->SetPort(port); - -diff -upN libjingle-0.5.2/talk/p2p/base/udpport.cc.chromium12 libjingle-0.5.2/talk/p2p/base/udpport.cc ---- libjingle-0.5.2/talk/p2p/base/udpport.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/udpport.cc 2011-03-30 21:51:32.711287001 -0400 -@@ -27,6 +27,7 @@ - - #include "talk/p2p/base/udpport.h" - -+#include "talk/base/asyncpacketsocket.h" - #include "talk/base/logging.h" - #include "talk/p2p/base/common.h" - -@@ -34,23 +35,22 @@ namespace cricket { - - const std::string LOCAL_PORT_TYPE("local"); - --UDPPort::UDPPort(talk_base::Thread* thread, talk_base::SocketFactory* factory, -- talk_base::Network* network) -- : Port(thread, LOCAL_PORT_TYPE, factory, network), -- socket_(NULL), error_(0) { -+UDPPort::UDPPort(talk_base::Thread* thread, -+ talk_base::PacketSocketFactory* factory, -+ talk_base::Network* network, -+ uint32 ip, int min_port, int max_port) -+ : Port(thread, LOCAL_PORT_TYPE, factory, network, ip, min_port, max_port), -+ socket_(NULL), -+ error_(0) { - } - --bool UDPPort::Init(const talk_base::SocketAddress& local_addr) { -- socket_ = CreatePacketSocket(PROTO_UDP); -+bool UDPPort::Init() { -+ socket_ = factory_->CreateUdpSocket( -+ talk_base::SocketAddress(ip_, 0), min_port_, max_port_); - if (!socket_) { - LOG_J(LS_WARNING, this) << "UDP socket creation failed"; - return false; - } -- if (socket_->Bind(local_addr) < 0) { -- LOG_J(LS_WARNING, this) << "UDP bind failed with error " -- << socket_->GetError(); -- return false; -- } - socket_->SignalReadPacket.connect(this, &UDPPort::OnReadPacket); - return true; - } -@@ -60,7 +60,13 @@ UDPPort::~UDPPort() { - } - - void UDPPort::PrepareAddress() { -- AddAddress(socket_->GetLocalAddress(), "udp", true); -+ bool allocated; -+ talk_base::SocketAddress address = socket_->GetLocalAddress(&allocated); -+ if (allocated) { -+ AddAddress(address, "udp", true); -+ } else { -+ socket_->SignalAddressReady.connect(this, &UDPPort::OnAddresReady); -+ } - } - - Connection* UDPPort::CreateConnection(const Candidate& address, -@@ -80,7 +86,7 @@ int UDPPort::SendTo(const void* data, si - error_ = socket_->GetError(); - LOG_J(LS_ERROR, this) << "UDP send of " << size - << " bytes failed with error " << error_; -- } -+ } - return sent; - } - -@@ -92,9 +98,14 @@ int UDPPort::GetError() { - return error_; - } - -+void UDPPort::OnAddresReady(talk_base::AsyncPacketSocket* socket, -+ const talk_base::SocketAddress& address) { -+ AddAddress(address, "udp", true); -+} -+ - void UDPPort::OnReadPacket( -- const char* data, size_t size, const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket) { -+ talk_base::AsyncPacketSocket* socket, const char* data, size_t size, -+ const talk_base::SocketAddress& remote_addr) { - ASSERT(socket == socket_); - if (Connection* conn = GetConnection(remote_addr)) { - conn->OnReadPacket(data, size); -diff -upN libjingle-0.5.2/talk/p2p/base/udpport.h.chromium12 libjingle-0.5.2/talk/p2p/base/udpport.h ---- libjingle-0.5.2/talk/p2p/base/udpport.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/base/udpport.h 2011-03-30 21:51:32.711287001 -0400 -@@ -30,7 +30,6 @@ - - #include <string> - --#include "talk/base/asyncudpsocket.h" - #include "talk/p2p/base/port.h" - - namespace talk_base { -@@ -47,19 +46,17 @@ extern const std::string LOCAL_PORT_TYPE - class UDPPort : public Port { - public: - static UDPPort* Create(talk_base::Thread* thread, -- talk_base::SocketFactory* factory, -+ talk_base::PacketSocketFactory* factory, - talk_base::Network* network, -- const talk_base::SocketAddress& local_addr) { -- UDPPort* port = new UDPPort(thread, factory, network); -- if (!port->Init(local_addr)) { -+ uint32 ip, int min_port, int max_port) { -+ UDPPort* port = new UDPPort(thread, factory, network, -+ ip, min_port, max_port); -+ if (!port->Init()) { - delete port; - port = NULL; - } - return port; - } -- UDPPort(talk_base::Thread* thread, talk_base::SocketFactory* factory, -- talk_base::Network* network); -- bool Init(const talk_base::SocketAddress& local_addr); - virtual ~UDPPort(); - - virtual void PrepareAddress(); -@@ -70,14 +67,21 @@ class UDPPort : public Port { - virtual int GetError(); - - protected: -+ UDPPort(talk_base::Thread* thread, talk_base::PacketSocketFactory* factory, -+ talk_base::Network* network, uint32 ip, int min_port, int max_port); -+ bool Init(); -+ - // Handles sending using the local UDP socket. - virtual int SendTo(const void* data, size_t size, - const talk_base::SocketAddress& remote_addr, bool payload); - -+ void OnAddresReady(talk_base::AsyncPacketSocket* socket, -+ const talk_base::SocketAddress& address); -+ - // Dispatches the given packet to the port or connection as appropriate. -- void OnReadPacket(const char* data, size_t size, -- const talk_base::SocketAddress& remote_addr, -- talk_base::AsyncPacketSocket* socket); -+ void OnReadPacket(talk_base::AsyncPacketSocket* socket, -+ const char* data, size_t size, -+ const talk_base::SocketAddress& remote_addr); - - private: - talk_base::AsyncPacketSocket* socket_; -diff -upN libjingle-0.5.2/talk/p2p/client/basicportallocator.cc.chromium12 libjingle-0.5.2/talk/p2p/client/basicportallocator.cc ---- libjingle-0.5.2/talk/p2p/client/basicportallocator.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/client/basicportallocator.cc 2011-03-30 21:51:32.712287001 -0400 -@@ -166,17 +166,24 @@ class AllocationSequence : public talk_b - // BasicPortAllocator - - BasicPortAllocator::BasicPortAllocator( -- talk_base::NetworkManager* network_manager) -- : network_manager_(network_manager), best_writable_phase_(-1) { -+ talk_base::NetworkManager* network_manager, -+ talk_base::PacketSocketFactory* socket_factory) -+ : network_manager_(network_manager), -+ socket_factory_(socket_factory), -+ best_writable_phase_(-1), -+ allow_tcp_listen_(true) { -+ ASSERT(socket_factory_ != NULL); - } - - BasicPortAllocator::BasicPortAllocator( - talk_base::NetworkManager* network_manager, -+ talk_base::PacketSocketFactory* socket_factory, - const talk_base::SocketAddress& stun_address, - const talk_base::SocketAddress& relay_address_udp, - const talk_base::SocketAddress& relay_address_tcp, - const talk_base::SocketAddress& relay_address_ssl) - : network_manager_(network_manager), -+ socket_factory_(socket_factory), - stun_address_(stun_address), - relay_address_udp_(relay_address_udp), - relay_address_tcp_(relay_address_tcp), -@@ -656,8 +663,11 @@ void AllocationSequence::CreateUDPPorts( - return; - } - -- Port* port = UDPPort::Create(session_->network_thread(), NULL, network_, -- talk_base::SocketAddress(ip_, 0)); -+ Port* port = UDPPort::Create(session_->network_thread(), -+ session_->allocator()->socket_factory(), -+ network_, ip_, -+ session_->allocator()->min_port(), -+ session_->allocator()->max_port()); - if (port) - session_->AddAllocatedPort(port, this, PREF_LOCAL_UDP); - } -@@ -668,8 +678,11 @@ void AllocationSequence::CreateTCPPorts( - return; - } - -- Port* port = TCPPort::Create(session_->network_thread(), NULL, network_, -- talk_base::SocketAddress(ip_, 0), -+ Port* port = TCPPort::Create(session_->network_thread(), -+ session_->allocator()->socket_factory(), -+ network_, ip_, -+ session_->allocator()->min_port(), -+ session_->allocator()->max_port(), - session_->allocator()->allow_tcp_listen()); - if (port) - session_->AddAllocatedPort(port, this, PREF_LOCAL_TCP); -@@ -690,8 +703,11 @@ void AllocationSequence::CreateStunPorts - return; - } - -- Port* port = StunPort::Create(session_->network_thread(), NULL, network_, -- talk_base::SocketAddress(ip_, 0), -+ Port* port = StunPort::Create(session_->network_thread(), -+ session_->allocator()->socket_factory(), -+ network_, ip_, -+ session_->allocator()->min_port(), -+ session_->allocator()->max_port(), - config_->stun_address); - if (port) - session_->AddAllocatedPort(port, this, PREF_LOCAL_STUN); -@@ -715,9 +731,11 @@ void AllocationSequence::CreateRelayPort - PortConfiguration::RelayList::const_iterator relay; - for (relay = config_->relays.begin(); - relay != config_->relays.end(); ++relay) { -- RelayPort* port = RelayPort::Create(session_->network_thread(), NULL, -- network_, -- talk_base::SocketAddress(ip_, 0), -+ RelayPort* port = RelayPort::Create(session_->network_thread(), -+ session_->allocator()->socket_factory(), -+ network_, ip_, -+ session_->allocator()->min_port(), -+ session_->allocator()->max_port(), - config_->username, config_->password, - config_->magic_cookie); - if (port) { -diff -upN libjingle-0.5.2/talk/p2p/client/basicportallocator.h.chromium12 libjingle-0.5.2/talk/p2p/client/basicportallocator.h ---- libjingle-0.5.2/talk/p2p/client/basicportallocator.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/client/basicportallocator.h 2011-03-30 21:51:32.712287001 -0400 -@@ -40,8 +40,10 @@ namespace cricket { - - class BasicPortAllocator : public PortAllocator { - public: -- explicit BasicPortAllocator(talk_base::NetworkManager* network_manager); - BasicPortAllocator(talk_base::NetworkManager* network_manager, -+ talk_base::PacketSocketFactory* socket_factory); -+ BasicPortAllocator(talk_base::NetworkManager* network_manager, -+ talk_base::PacketSocketFactory* socket_factory, - const talk_base::SocketAddress& stun_server, - const talk_base::SocketAddress& relay_server_udp, - const talk_base::SocketAddress& relay_server_tcp, -@@ -50,6 +52,8 @@ class BasicPortAllocator : public PortAl - - talk_base::NetworkManager* network_manager() { return network_manager_; } - -+ talk_base::PacketSocketFactory* socket_factory() { return socket_factory_; } -+ - const talk_base::SocketAddress& stun_address() const { - return stun_address_; - } -@@ -84,6 +88,7 @@ class BasicPortAllocator : public PortAl - - private: - talk_base::NetworkManager* network_manager_; -+ talk_base::PacketSocketFactory* socket_factory_; - const talk_base::SocketAddress stun_address_; - const talk_base::SocketAddress relay_address_udp_; - const talk_base::SocketAddress relay_address_tcp_; -diff -upN libjingle-0.5.2/talk/p2p/client/httpportallocator.cc.chromium12 libjingle-0.5.2/talk/p2p/client/httpportallocator.cc ---- libjingle-0.5.2/talk/p2p/client/httpportallocator.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/client/httpportallocator.cc 2011-03-30 21:51:32.712287001 -0400 -@@ -96,9 +96,11 @@ const int HttpPortAllocator::kNumRetries - - const std::string HttpPortAllocator::kCreateSessionURL = "/create_session"; - --HttpPortAllocator::HttpPortAllocator(talk_base::NetworkManager* network_manager, -- const std::string &user_agent) -- : BasicPortAllocator(network_manager), agent_(user_agent) { -+HttpPortAllocator::HttpPortAllocator( -+ talk_base::NetworkManager* network_manager, -+ talk_base::PacketSocketFactory* socket_factory, -+ const std::string &user_agent) -+ : BasicPortAllocator(network_manager, socket_factory), agent_(user_agent) { - relay_hosts_.push_back("relay.google.com"); - stun_hosts_.push_back( - talk_base::SocketAddress("stun.l.google.com", 19302)); -diff -upN libjingle-0.5.2/talk/p2p/client/httpportallocator.h.chromium12 libjingle-0.5.2/talk/p2p/client/httpportallocator.h ---- libjingle-0.5.2/talk/p2p/client/httpportallocator.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/p2p/client/httpportallocator.h 2011-03-30 21:51:32.712287001 -0400 -@@ -50,6 +50,7 @@ class HttpPortAllocator : public BasicPo - static const std::string kCreateSessionURL; - - HttpPortAllocator(talk_base::NetworkManager* network_manager, -+ talk_base::PacketSocketFactory* socket_factory, - const std::string& user_agent); - virtual ~HttpPortAllocator(); - -diff -upN libjingle-0.5.2/talk/session/phone/channel.cc.chromium12 libjingle-0.5.2/talk/session/phone/channel.cc ---- libjingle-0.5.2/talk/session/phone/channel.cc.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/channel.cc 2011-03-30 21:51:32.713287001 -0400 -@@ -43,6 +43,24 @@ struct PacketMessageData : public talk_b - talk_base::Buffer packet; - }; - -+struct VoiceChannelErrorMessageData : public talk_base::MessageData { -+ VoiceChannelErrorMessageData(uint32 in_ssrc, -+ VoiceMediaChannel::Error in_error) -+ : ssrc(in_ssrc), -+ error(in_error) {} -+ uint32 ssrc; -+ VoiceMediaChannel::Error error; -+}; -+ -+struct VideoChannelErrorMessageData : public talk_base::MessageData { -+ VideoChannelErrorMessageData(uint32 in_ssrc, -+ VideoMediaChannel::Error in_error) -+ : ssrc(in_ssrc), -+ error(in_error) {} -+ uint32 ssrc; -+ VideoMediaChannel::Error error; -+}; -+ - static const char* PacketType(bool rtcp) { - return (!rtcp) ? "RTP" : "RTCP"; - } -@@ -101,6 +119,7 @@ BaseChannel::BaseChannel(talk_base::Thre - BaseChannel::~BaseChannel() { - ASSERT(worker_thread_ == talk_base::Thread::Current()); - StopConnectionMonitor(); -+ FlushRtcpMessages(); // Send any outstanding RTCP packets. - Clear(); // eats any outstanding messages or packets - // We must destroy the media channel before the transport channel, otherwise - // the media channel may try to send on the dead transport channel. NULLing -@@ -365,32 +384,34 @@ void BaseChannel::HandlePacket(bool rtcp - - void BaseChannel::OnSessionState(BaseSession* session, - BaseSession::State state) { -- // TODO: tear down the call via session->SetError() if the -- // SetXXXXDescription calls fail. - const MediaContentDescription* content = NULL; - switch (state) { - case Session::STATE_SENTINITIATE: - content = GetFirstContent(session->local_description()); -- if (content) { -- SetLocalContent(content, CA_OFFER); -+ if (content && !SetLocalContent(content, CA_OFFER)) { -+ LOG(LS_ERROR) << "Failure in SetLocalContent with CA_OFFER"; -+ session->SetError(BaseSession::ERROR_CONTENT); - } - break; - case Session::STATE_SENTACCEPT: - content = GetFirstContent(session->local_description()); -- if (content) { -- SetLocalContent(content, CA_ANSWER); -+ if (content && !SetLocalContent(content, CA_ANSWER)) { -+ LOG(LS_ERROR) << "Failure in SetLocalContent with CA_ANSWER"; -+ session->SetError(BaseSession::ERROR_CONTENT); - } - break; - case Session::STATE_RECEIVEDINITIATE: - content = GetFirstContent(session->remote_description()); -- if (content) { -- SetRemoteContent(content, CA_OFFER); -+ if (content && !SetRemoteContent(content, CA_OFFER)) { -+ LOG(LS_ERROR) << "Failure in SetRemoteContent with CA_OFFER"; -+ session->SetError(BaseSession::ERROR_CONTENT); - } - break; - case Session::STATE_RECEIVEDACCEPT: - content = GetFirstContent(session->remote_description()); -- if (content) { -- SetRemoteContent(content, CA_ANSWER); -+ if (content && !SetRemoteContent(content, CA_ANSWER)) { -+ LOG(LS_ERROR) << "Failure in SetRemoteContent with CA_ANSWER"; -+ session->SetError(BaseSession::ERROR_CONTENT); - } - break; - default: -@@ -578,6 +599,18 @@ void BaseChannel::Clear(uint32 id, talk_ - worker_thread_->Clear(this, id, removed); - } - -+void BaseChannel::FlushRtcpMessages() { -+ // Flush all remaining RTCP messages. This should only be called in -+ // destructor. -+ ASSERT(talk_base::Thread::Current() == worker_thread_); -+ talk_base::MessageList rtcp_messages; -+ Clear(MSG_RTCPPACKET, &rtcp_messages); -+ for (talk_base::MessageList::iterator it = rtcp_messages.begin(); -+ it != rtcp_messages.end(); ++it) { -+ Send(MSG_RTCPPACKET, it->pdata); -+ } -+} -+ - VoiceChannel::VoiceChannel(talk_base::Thread* thread, - MediaEngine* media_engine, - VoiceMediaChannel* media_channel, -@@ -593,6 +626,9 @@ VoiceChannel::VoiceChannel(talk_base::Th - // Can't go in BaseChannel because certain session states will - // trigger pure virtual functions, such as GetFirstContent(). - OnSessionState(session, session->state()); -+ -+ media_channel->SignalMediaError.connect( -+ this, &VoiceChannel::OnVoiceChannelError); - } - - VoiceChannel::~VoiceChannel() { -@@ -692,8 +728,10 @@ void VoiceChannel::OnChannelRead(Transpo - // If we were playing out our local ringback, make sure it is stopped to - // prevent it from interfering with the incoming media. - if (!received_media_) { -- received_media_ = false; -- PlayRingbackTone_w(false, false); -+ if (!PlayRingbackTone_w(false, false)) { -+ LOG(LS_ERROR) << "Failed to stop ringback tone."; -+ SendLastMediaError(); -+ } - } - } - -@@ -701,13 +739,19 @@ void VoiceChannel::ChangeState() { - // render incoming data if we are the active call - // we receive data on the default channel and multiplexed streams - bool recv = enabled(); -- media_channel()->SetPlayout(recv); -+ if (!media_channel()->SetPlayout(recv)) { -+ SendLastMediaError(); -+ } - - // send outgoing data if we are the active call, have the - // remote party's codec, and have a writable transport - // we only send data on the default channel - bool send = enabled() && has_codec() && writable(); -- media_channel()->SetSend(send ? SEND_MICROPHONE : SEND_NOTHING); -+ SendFlags send_flag = send ? SEND_MICROPHONE : SEND_NOTHING; -+ if (!media_channel()->SetSend(send_flag)) { -+ LOG(LS_ERROR) << "Failed to SetSend " << send_flag << " on voice channel"; -+ SendLastMediaError(); -+ } - - LOG(LS_INFO) << "Changing voice state, recv=" << recv << " send=" << send; - } -@@ -769,7 +813,10 @@ bool VoiceChannel::SetRemoteContent_w(co - ret = media_channel()->SetSendCodecs(audio->codecs()); - } - -- int audio_options = audio->conference_mode() ? OPT_CONFERENCE : 0; -+ int audio_options = 0; -+ if (audio->conference_mode()) { -+ audio_options |= OPT_CONFERENCE; -+ } - if (!media_channel()->SetOptions(audio_options)) { - // Log an error on failure, but don't abort the call. - LOG(LS_ERROR) << "Failed to set voice channel options"; -@@ -850,6 +897,13 @@ void VoiceChannel::OnMessage(talk_base:: - data->result = PressDTMF_w(data->digit, data->playout); - break; - } -+ case MSG_CHANNEL_ERROR: { -+ VoiceChannelErrorMessageData* data = -+ static_cast<VoiceChannelErrorMessageData*>(pmsg->pdata); -+ SignalMediaError(this, data->ssrc, data->error); -+ delete data; -+ break; -+ } - - default: - BaseChannel::OnMessage(pmsg); -@@ -873,6 +927,13 @@ void VoiceChannel::OnAudioMonitorUpdate( - SignalAudioMonitor(this, info); - } - -+void VoiceChannel::OnVoiceChannelError( -+ uint32 ssrc, VoiceMediaChannel::Error error) { -+ VoiceChannelErrorMessageData *data = new VoiceChannelErrorMessageData( -+ ssrc, error); -+ signaling_thread()->Post(this, MSG_CHANNEL_ERROR, data); -+} -+ - VideoChannel::VideoChannel(talk_base::Thread* thread, - MediaEngine* media_engine, - VideoMediaChannel* media_channel, -@@ -891,6 +952,15 @@ VideoChannel::VideoChannel(talk_base::Th - // trigger pure virtual functions, such as GetFirstContent() - OnSessionState(session, session->state()); - -+ media_channel->SignalMediaError.connect( -+ this, &VideoChannel::OnVideoChannelError); -+} -+ -+void VoiceChannel::SendLastMediaError() { -+ uint32 ssrc; -+ VoiceMediaChannel::Error error; -+ media_channel()->GetLastMediaError(&ssrc, &error); -+ SignalMediaError(this, ssrc, error); - } - - VideoChannel::~VideoChannel() { -@@ -926,13 +996,19 @@ void VideoChannel::ChangeState() { - // render incoming data if we are the active call - // we receive data on the default channel and multiplexed streams - bool recv = enabled(); -- media_channel()->SetRender(recv); -+ if (!media_channel()->SetRender(recv)) { -+ LOG(LS_ERROR) << "Failed to SetRender on video channel"; -+ // TODO: Report error back to server. -+ } - - // send outgoing data if we are the active call, have the - // remote party's codec, and have a writable transport - // we only send data on the default channel - bool send = enabled() && has_codec() && writable(); -- media_channel()->SetSend(send); -+ if (!media_channel()->SetSend(send)) { -+ LOG(LS_ERROR) << "Failed to SetSend on video channel"; -+ // TODO: Report error back to server. -+ } - - LOG(LS_INFO) << "Changing video state, recv=" << recv << " send=" << send; - } -@@ -1053,10 +1129,16 @@ void VideoChannel::OnMessage(talk_base:: - case MSG_REQUESTINTRAFRAME: - RequestIntraFrame_w(); - break; -- -- default: -- BaseChannel::OnMessage(pmsg); -- break; -+ case MSG_CHANNEL_ERROR: { -+ const VideoChannelErrorMessageData* data = -+ static_cast<VideoChannelErrorMessageData*>(pmsg->pdata); -+ SignalMediaError(this, data->ssrc, data->error); -+ delete data; -+ break; -+ } -+ default: -+ BaseChannel::OnMessage(pmsg); -+ break; - } - } - -@@ -1072,4 +1154,11 @@ void VideoChannel::OnMediaMonitorUpdate( - } - - -+void VideoChannel::OnVideoChannelError(uint32 ssrc, -+ VideoMediaChannel::Error error) { -+ VideoChannelErrorMessageData* data = new VideoChannelErrorMessageData( -+ ssrc, error); -+ signaling_thread()->Post(this, MSG_CHANNEL_ERROR, data); -+} -+ - } // namespace cricket -diff -upN libjingle-0.5.2/talk/session/phone/channel.h.chromium12 libjingle-0.5.2/talk/session/phone/channel.h ---- libjingle-0.5.2/talk/session/phone/channel.h.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/channel.h 2011-03-30 21:51:32.713287001 -0400 -@@ -69,7 +69,8 @@ enum { - MSG_SENDINTRAFRAME = 19, - MSG_REQUESTINTRAFRAME = 20, - MSG_RTPPACKET = 22, -- MSG_RTCPPACKET = 23 -+ MSG_RTCPPACKET = 23, -+ MSG_CHANNEL_ERROR = 24 - }; - - // BaseChannel contains logic common to voice and video, including -@@ -83,7 +84,7 @@ class BaseChannel - MediaChannel* channel, BaseSession* session, - const std::string& content_name, - TransportChannel* transport_channel); -- ~BaseChannel(); -+ virtual ~BaseChannel(); - - talk_base::Thread* worker_thread() const { return worker_thread_; } - BaseSession* session() const { return session_; } -@@ -94,6 +95,7 @@ class BaseChannel - TransportChannel* rtcp_transport_channel() const { - return rtcp_transport_channel_; - } -+ bool enabled() const { return enabled_; } - bool secure() const { return srtp_filter_.IsActive(); } - - // Channel control -@@ -136,7 +138,6 @@ class BaseChannel - MediaEngine* media_engine() const { return media_engine_; } - virtual MediaChannel* media_channel() const { return media_channel_; } - void set_rtcp_transport_channel(TransportChannel* transport); -- bool enabled() const { return enabled_; } - bool writable() const { return writable_; } - bool has_codec() const { return has_codec_; } - void set_has_codec(bool has_codec) { has_codec_ = has_codec; } -@@ -149,6 +150,7 @@ class BaseChannel - talk_base::MessageData *pdata = NULL); - void Clear(uint32 id = talk_base::MQID_ANY, - talk_base::MessageList* removed = NULL); -+ void FlushRtcpMessages(); - - // NetworkInterface implementation, called by MediaEngine - virtual bool SendPacket(talk_base::Buffer* packet); -@@ -290,6 +292,11 @@ class VoiceChannel : public BaseChannel - int GetOutputLevel_w(); - void GetActiveStreams_w(AudioInfo::StreamList* actives); - -+ // Signal errors from VoiceMediaChannel. Arguments are: -+ // ssrc(uint32), and error(VoiceMediaChannel::Error). -+ sigslot::signal3<VoiceChannel*, uint32, VoiceMediaChannel::Error> -+ SignalMediaError; -+ - private: - struct SetRingbackToneMessageData : public talk_base::MessageData { - SetRingbackToneMessageData(const void* b, int l) -@@ -345,6 +352,8 @@ class VoiceChannel : public BaseChannel - virtual void OnMediaMonitorUpdate( - VoiceMediaChannel *media_channel, const VoiceMediaInfo& info); - void OnAudioMonitorUpdate(AudioMonitor *monitor, const AudioInfo& info); -+ void OnVoiceChannelError(uint32 ssrc, VoiceMediaChannel::Error error); -+ void SendLastMediaError(); - - static const int kEarlyMediaTimeout = 1000; - bool received_media_; -@@ -382,6 +391,9 @@ class VideoChannel : public BaseChannel - bool SendIntraFrame(); - bool RequestIntraFrame(); - -+ sigslot::signal3<VideoChannel*, uint32, VideoMediaChannel::Error> -+ SignalMediaError; -+ - private: - // overrides from BaseChannel - virtual void ChangeState(); -@@ -417,6 +429,8 @@ class VideoChannel : public BaseChannel - SocketMonitor *monitor, const std::vector<ConnectionInfo> &infos); - virtual void OnMediaMonitorUpdate( - VideoMediaChannel *media_channel, const VideoMediaInfo& info); -+ void OnVideoChannelError(uint32 ssrc, VideoMediaChannel::Error error); -+ - VoiceChannel *voice_channel_; - VideoRenderer *renderer_; - talk_base::scoped_ptr<VideoMediaMonitor> media_monitor_; -diff -upN libjingle-0.5.2/talk/session/phone/channelmanager.cc.chromium12 libjingle-0.5.2/talk/session/phone/channelmanager.cc ---- libjingle-0.5.2/talk/session/phone/channelmanager.cc.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/channelmanager.cc 2011-03-30 21:51:32.714287001 -0400 -@@ -39,10 +39,6 @@ - #include "talk/base/stringencode.h" - #include "talk/session/phone/mediaengine.h" - #include "talk/session/phone/soundclip.h" --#ifdef USE_TALK_SOUND --#include "talk/sound/platformsoundsystemfactory.h" --#include "talk/sound/soundsysteminterface.h" --#endif - - namespace cricket { - -@@ -134,23 +130,13 @@ struct CaptureParams : public talk_base: - }; - - ChannelManager::ChannelManager(talk_base::Thread* worker_thread) -- : --#ifdef USE_TALK_SOUND -- sound_system_factory_(new PlatformSoundSystemFactory()), --#endif -- media_engine_(MediaEngine::Create( --#ifdef USE_TALK_SOUND -- sound_system_factory_.get() --#endif -- )), -- device_manager_(new DeviceManager( --#ifdef USE_TALK_SOUND -- sound_system_factory_.get() --#endif -- )), -+ : media_engine_(MediaEngine::Create()), -+ device_manager_(new DeviceManager()), - initialized_(false), - main_thread_(talk_base::Thread::Current()), - worker_thread_(worker_thread), -+ audio_in_device_(DeviceManager::kDefaultDeviceName), -+ audio_out_device_(DeviceManager::kDefaultDeviceName), - audio_options_(MediaEngine::DEFAULT_AUDIO_OPTIONS), - local_renderer_(NULL), - capturing_(false), -@@ -160,15 +146,13 @@ ChannelManager::ChannelManager(talk_base - - ChannelManager::ChannelManager(MediaEngine* me, DeviceManager* dm, - talk_base::Thread* worker_thread) -- : --#ifdef USE_TALK_SOUND -- sound_system_factory_(NULL), --#endif -- media_engine_(me), -+ : media_engine_(me), - device_manager_(dm), - initialized_(false), - main_thread_(talk_base::Thread::Current()), - worker_thread_(worker_thread), -+ audio_in_device_(DeviceManager::kDefaultDeviceName), -+ audio_out_device_(DeviceManager::kDefaultDeviceName), - audio_options_(MediaEngine::DEFAULT_AUDIO_OPTIONS), - local_renderer_(NULL), - capturing_(false), -@@ -180,7 +164,8 @@ void ChannelManager::Construct() { - // Init the device manager immediately, and set up our default video device. - SignalDevicesChange.repeat(device_manager_->SignalDevicesChange); - device_manager_->Init(); -- SetVideoOptions(""); -+ // Set camera_device_ to the name of the default video capturer. -+ SetVideoOptions(DeviceManager::kDefaultDeviceName); - - // Camera is started asynchronously, request callbacks when startup - // completes to be able to forward them to the rendering manager. -@@ -230,18 +215,47 @@ bool ChannelManager::Init() { - if (media_engine_->Init()) { - initialized_ = true; - -- // Now that we're initialized, apply any stored preferences. -+ // Now that we're initialized, apply any stored preferences. A preferred -+ // device might have been unplugged. In this case, we fallback to the -+ // default device but keep the user preferences. The preferences are -+ // changed only when the Javascript FE changes them. -+ const std::string preferred_audio_in_device = audio_in_device_; -+ const std::string preferred_audio_out_device = audio_out_device_; -+ const std::string preferred_camera_device = camera_device_; -+ Device device; -+ if (!device_manager_->GetAudioInputDevice(audio_in_device_, &device)) { -+ LOG(LS_WARNING) << "The preferred microphone '" << audio_in_device_ -+ << "' is unavailable. Fall back to the default."; -+ audio_in_device_ = DeviceManager::kDefaultDeviceName; -+ } -+ if (!device_manager_->GetAudioOutputDevice(audio_out_device_, &device)) { -+ LOG(LS_WARNING) << "The preferred speaker '" << audio_out_device_ -+ << "' is unavailable. Fall back to the default."; -+ audio_out_device_ = DeviceManager::kDefaultDeviceName; -+ } -+ if (!device_manager_->GetVideoCaptureDevice(camera_device_, &device)) { -+ LOG(LS_WARNING) << "The preferred camera '" << camera_device_ -+ << "' is unavailable. Fall back to the default."; -+ camera_device_ = DeviceManager::kDefaultDeviceName; -+ } -+ - if (!SetAudioOptions(audio_in_device_, audio_out_device_, - audio_options_)) { -- audio_in_device_.clear(); -- audio_out_device_.clear(); -+ LOG(LS_WARNING) << "Failed to SetAudioOptions with" -+ << " microphone: " << audio_in_device_ -+ << " speaker: " << audio_out_device_ -+ << " options: " << audio_options_; - } - if (!SetVideoOptions(camera_device_)) { -- // Perhaps it's been unplugged, fall back to default device -- if (!SetVideoOptions("")) { -- camera_device_.clear(); -- } -+ LOG(LS_WARNING) << "Failed to SetVideoOptions with camera: " -+ << camera_device_; - } -+ -+ // Restore the user preferences. -+ audio_in_device_ = preferred_audio_in_device; -+ audio_out_device_ = preferred_audio_out_device; -+ camera_device_ = preferred_camera_device; -+ - // Now apply the default video codec that has been set earlier. - if (default_video_encoder_config_.max_codec.id != 0) { - SetDefaultVideoEncoderConfig(default_video_encoder_config_); -@@ -480,29 +494,15 @@ bool ChannelManager::GetVideoOptions(std - } - - bool ChannelManager::SetVideoOptions(const std::string& cam_name) { -- bool ret; - Device device; -- -- if (cam_name.empty()) { -- // If we're passed the default device name, get the default device. -- ret = device_manager_->GetDefaultVideoCaptureDevice(&device); -- } else { -- // Convert the camera name to a device, fail if it can't be found. -- std::vector<Device> devices; -- ret = device_manager_->GetVideoCaptureDevices(&devices); -- if (ret) { -- for (size_t i = 0; i < devices.size(); ++i) { -- if (devices[i].name == cam_name) { -- device = devices[i]; -- break; -- } -- } -- ret = !device.name.empty(); -- } -+ if (!device_manager_->GetVideoCaptureDevice(cam_name, &device)) { -+ LOG(LS_WARNING) << "Device manager can't find camera: " << cam_name; -+ return false; - } - - // If we're running, tell the media engine about it. -- if (ret && initialized_) { -+ bool ret = true; -+ if (initialized_) { - VideoOptions options(&device); - ret = (Send(MSG_SETVIDEOOPTIONS, &options) && options.result); - } -@@ -628,10 +628,10 @@ bool ChannelManager::Send(uint32 id, tal - return true; - } - --void ChannelManager::OnVideoCaptureResult(bool result) { -- capturing_ = result; -+void ChannelManager::OnVideoCaptureResult(CaptureResult result) { -+ capturing_ = result == CR_SUCCESS; - main_thread_->Post(this, MSG_CAMERASTARTED, -- new talk_base::TypedMessageData<bool>(result)); -+ new talk_base::TypedMessageData<CaptureResult>(result)); - } - - void ChannelManager::OnMessage(talk_base::Message* message) { -@@ -718,8 +718,9 @@ void ChannelManager::OnMessage(talk_base - break; - } - case MSG_CAMERASTARTED: { -- talk_base::TypedMessageData<bool> *data = -- static_cast<talk_base::TypedMessageData<bool>*>(message->pdata); -+ talk_base::TypedMessageData<CaptureResult>* data = -+ static_cast<talk_base::TypedMessageData<CaptureResult>*>( -+ message->pdata); - SignalVideoCaptureResult(data->data()); - delete data; - break; -diff -upN libjingle-0.5.2/talk/session/phone/channelmanager.h.chromium12 libjingle-0.5.2/talk/session/phone/channelmanager.h ---- libjingle-0.5.2/talk/session/phone/channelmanager.h.chromium12 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/channelmanager.h 2011-03-30 21:51:32.714287001 -0400 -@@ -38,9 +38,6 @@ - #include "talk/session/phone/voicechannel.h" - #include "talk/session/phone/mediaengine.h" - #include "talk/session/phone/devicemanager.h" --#ifdef USE_TALK_SOUND --#include "talk/sound/soundsystemfactory.h" --#endif - - namespace cricket { - -@@ -157,7 +154,7 @@ class ChannelManager : public talk_base: - bool GetAudioOutputDevices(std::vector<std::string>* names); - bool GetVideoCaptureDevices(std::vector<std::string>* names); - sigslot::repeater0<> SignalDevicesChange; -- sigslot::signal1<bool> SignalVideoCaptureResult; -+ sigslot::signal1<CaptureResult> SignalVideoCaptureResult; - - private: - typedef std::vector<VoiceChannel*> VoiceChannels; -@@ -185,13 +182,10 @@ class ChannelManager : public talk_base: - CaptureResult SetVideoCapture_w(bool capture); - void SetMediaLogging(bool video, int level, const char* filter); - void SetMediaLogging_w(bool video, int level, const char* filter); -- void OnVideoCaptureResult(bool result); -+ void OnVideoCaptureResult(CaptureResult result); - void OnMessage(talk_base::Message *message); - - talk_base::CriticalSection crit_; --#ifdef USE_TALK_SOUND -- talk_base::scoped_ptr<SoundSystemFactory> sound_system_factory_; --#endif - talk_base::scoped_ptr<MediaEngine> media_engine_; - talk_base::scoped_ptr<DeviceManager> device_manager_; - bool initialized_; -diff -upN libjingle-0.5.2/talk/session/phone/cryptoparams.h.chromium12 libjingle-0.5.2/talk/session/phone/cryptoparams.h ---- libjingle-0.5.2/talk/session/phone/cryptoparams.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/cryptoparams.h 2011-03-30 21:51:32.714287001 -0400 -@@ -32,7 +32,7 @@ - - namespace cricket { - --// Parameters for SRTP negotiation, as described in RFC 4586. -+// Parameters for SRTP negotiation, as described in RFC 4568. - struct CryptoParams { - CryptoParams() : tag(0) {} - CryptoParams(int t, const std::string& cs, -diff -upN libjingle-0.5.2/talk/session/phone/Makefile.am.chromium12 libjingle-0.5.2/talk/session/phone/Makefile.am ---- libjingle-0.5.2/talk/session/phone/Makefile.am.chromium12 2011-03-30 21:51:32.658287001 -0400 -+++ libjingle-0.5.2/talk/session/phone/Makefile.am 2011-03-30 21:51:32.715287001 -0400 -@@ -7,9 +7,11 @@ - codec.cc \ - devicemanager.cc \ - filemediaengine.cc \ -+ libudevsymboltable.cc \ - mediaengine.cc \ - mediamonitor.cc \ - mediasessionclient.cc \ -+ rtcpmuxfilter.cc \ - rtpdump.cc \ - soundclip.cc \ - srtpfilter.cc \ -@@ -26,8 +28,10 @@ - channel.h \ - filemediaengine.h \ - mediasessionclient.h \ -+ rtcpmuxfilter.h \ - rtpdump.h \ - srtpfilter.h \ -+ libudevsymboltable.h \ - videocommon.h - - libjinglesessionphone_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -diff -upN libjingle-0.5.2/talk/session/phone/mediachannel.h.chromium12 libjingle-0.5.2/talk/session/phone/mediachannel.h ---- libjingle-0.5.2/talk/session/phone/mediachannel.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/mediachannel.h 2011-03-30 21:51:32.715287001 -0400 -@@ -187,6 +187,24 @@ struct VideoMediaInfo { - - class VoiceMediaChannel : public MediaChannel { - public: -+ enum Error { -+ ERROR_NONE = 0, // No error. -+ ERROR_OTHER, // Other errors. -+ ERROR_REC_DEVICE_OPEN_FAILED = 100, // Could not open mic. -+ ERROR_REC_DEVICE_MUTED, // Mic was muted by OS. -+ ERROR_REC_DEVICE_SILENT, // No background noise picked up. -+ ERROR_REC_DEVICE_SATURATION, // Mic input is clipping. -+ ERROR_REC_DEVICE_REMOVED, // Mic was removed while active. -+ ERROR_REC_RUNTIME_ERROR, // Processing is encountering errors. -+ ERROR_REC_SRTP_ERROR, // Generic SRTP failure. -+ ERROR_PLAY_DEVICE_OPEN_FAILED = 200, // Could not open playout. -+ ERROR_PLAY_DEVICE_MUTED, // Playout muted by OS. -+ ERROR_PLAY_DEVICE_REMOVED, // Playout removed while active. -+ ERROR_PLAY_RUNTIME_ERROR, // Errors in voice processing. -+ ERROR_PLAY_SRTP_ERROR, // Generic SRTP failure. -+ ERROR_PLAY_SRTP_AUTH_FAILED, // Failed to authenticate packets. -+ }; -+ - VoiceMediaChannel() {} - virtual ~VoiceMediaChannel() {} - // Sets the codecs/payload types to be used for incoming media. -@@ -213,6 +231,16 @@ class VoiceMediaChannel : public MediaCh - virtual bool PressDTMF(int event, bool playout) = 0; - // Gets quality stats for the channel. - virtual bool GetStats(VoiceMediaInfo* info) = 0; -+ // Gets last reported error for this media channel. -+ virtual void GetLastMediaError(uint32* ssrc, -+ VoiceMediaChannel::Error* error) { -+ ASSERT(error != NULL); -+ *error = ERROR_NONE; -+ } -+ -+ // Signal errors from MediaChannel. Arguments are: -+ // ssrc(uint32), and error(VoiceMediaChannel::Error). -+ sigslot::signal2<uint32, VoiceMediaChannel::Error> SignalMediaError; - }; - - // Represents a YUV420 (a.k.a. I420) video frame. -@@ -390,6 +418,18 @@ class NullVideoRenderer : public VideoRe - - class VideoMediaChannel : public MediaChannel { - public: -+ enum Error { -+ ERROR_NONE = 0, // No error. -+ ERROR_OTHER, // Other errors. -+ ERROR_REC_DEVICE_OPEN_FAILED = 100, // Could not open camera. -+ ERROR_REC_DEVICE_NO_DEVICE, // No camera. -+ ERROR_REC_DEVICE_IN_USE, // Device is in already use. -+ ERROR_REC_DEVICE_REMOVED, // Device is removed. -+ ERROR_REC_SRTP_ERROR, // Generic sender SRTP failure. -+ ERROR_PLAY_SRTP_ERROR = 200, // Generic receiver SRTP failure. -+ ERROR_PLAY_SRTP_AUTH_FAILED, // Failed to authenticate packets. -+ }; -+ - VideoMediaChannel() { renderer_ = NULL; } - virtual ~VideoMediaChannel() {} - // Sets the codecs/payload types to be used for incoming media. -@@ -415,6 +455,7 @@ class VideoMediaChannel : public MediaCh - // Reuqest each of the remote senders to send an intra frame. - virtual bool RequestIntraFrame() = 0; - -+ sigslot::signal2<uint32, Error> SignalMediaError; - - protected: - VideoRenderer *renderer_; -diff -upN libjingle-0.5.2/talk/session/phone/mediaengine.cc.chromium12 libjingle-0.5.2/talk/session/phone/mediaengine.cc ---- libjingle-0.5.2/talk/session/phone/mediaengine.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/mediaengine.cc 2011-03-30 21:51:32.716287001 -0400 -@@ -33,11 +33,7 @@ namespace cricket { - // TODO: according to thaloun, HAVE_GIPSVIDEO will always - // be false, so we can get rid of it. - --MediaEngine* MediaEngine::Create( --#ifdef USE_TALK_SOUND -- SoundSystemFactory *factory --#endif -- ) { -+MediaEngine* MediaEngine::Create() { - return new NullMediaEngine(); - } - -diff -upN libjingle-0.5.2/talk/session/phone/mediaengine.h.chromium12 libjingle-0.5.2/talk/session/phone/mediaengine.h ---- libjingle-0.5.2/talk/session/phone/mediaengine.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/mediaengine.h 2011-03-30 21:51:32.716287001 -0400 -@@ -39,9 +39,6 @@ - #include "talk/session/phone/codec.h" - #include "talk/session/phone/devicemanager.h" - #include "talk/session/phone/mediachannel.h" --#ifdef USE_TALK_SOUND --#include "talk/sound/soundsystemfactory.h" --#endif - #include "talk/session/phone/videocommon.h" - - namespace cricket { -@@ -88,11 +85,7 @@ class MediaEngine { - }; - - virtual ~MediaEngine() {} -- static MediaEngine* Create( --#ifdef USE_TALK_SOUND -- SoundSystemFactory *factory --#endif -- ); -+ static MediaEngine* Create(); - - // Initialization - // Starts the engine. -@@ -154,7 +147,7 @@ class MediaEngine { - virtual void SetVoiceLogging(int min_sev, const char* filter) = 0; - virtual void SetVideoLogging(int min_sev, const char* filter) = 0; - -- sigslot::repeater1<bool> SignalVideoCaptureResult; -+ sigslot::repeater1<CaptureResult> SignalVideoCaptureResult; - }; - - // CompositeMediaEngine constructs a MediaEngine from separate -@@ -162,11 +155,6 @@ class MediaEngine { - template<class VOICE, class VIDEO> - class CompositeMediaEngine : public MediaEngine { - public: --#ifdef USE_TALK_SOUND -- explicit CompositeMediaEngine(SoundSystemFactory *factory) -- : voice_(factory) { -- } --#endif - CompositeMediaEngine() {} - virtual bool Init() { - if (!voice_.Init()) -@@ -257,6 +245,37 @@ class CompositeMediaEngine : public Medi - VIDEO video_; - }; - -+class NullVoiceMediaChannel : public VoiceMediaChannel { -+ public: -+ explicit NullVoiceMediaChannel() {} -+ ~NullVoiceMediaChannel() {} -+ // MediaChannel implementations -+ virtual void OnPacketReceived(talk_base::Buffer* packet) {} -+ virtual void OnRtcpReceived(talk_base::Buffer* packet) {} -+ virtual void SetSendSsrc(uint32 id) {} -+ virtual bool SetRtcpCName(const std::string& cname) { return true; } -+ virtual bool Mute(bool on) { return true; } -+ virtual bool SetSendBandwidth(bool autobw, int bps) { return true; } -+ virtual bool SetOptions(int options) { return true; } -+ // VoiceMediaChannel implementations -+ virtual bool SetRecvCodecs(const std::vector<AudioCodec> &codecs) { -+ return true; -+ } -+ virtual bool SetSendCodecs(const std::vector<AudioCodec> &codecs) { -+ return true; -+ } -+ virtual bool SetPlayout(bool playout) { return true; } -+ virtual bool SetSend(SendFlags flag) { return true; } -+ virtual bool AddStream(uint32 ssrc) { return true; } -+ virtual bool RemoveStream(uint32 ssrc) { return true; } -+ virtual bool GetActiveStreams(AudioInfo::StreamList* streams) { return true; } -+ virtual int GetOutputLevel() { return 0; } -+ virtual void SetRingbackTone(const char *buf, int len) {} -+ virtual bool PlayRingbackTone(bool play, bool loop) { return true; } -+ virtual bool PressDTMF(int event, bool playout) { return true; } -+ virtual bool GetStats(VoiceMediaInfo* info) { return false; } -+}; -+ - // NullVoiceEngine can be used with CompositeMediaEngine in the case where only - // a video engine is desired. - class NullVoiceEngine { -@@ -265,7 +284,9 @@ class NullVoiceEngine { - void Terminate() {} - int GetCapabilities() { return 0; } - VoiceMediaChannel* CreateChannel() { -- return NULL; -+ // TODO: See if we can make things work without requiring -+ // allocation of a channel. -+ return new NullVoiceMediaChannel(); - } - SoundclipMedia* CreateSoundclip() { - return NULL; -@@ -304,7 +325,7 @@ class NullVideoEngine { - const std::vector<VideoCodec>& codecs() { return codecs_; } - bool FindCodec(const VideoCodec&) { return false; } - void SetLogging(int min_sev, const char* filter) {} -- sigslot::signal1<bool> SignalCaptureResult; -+ sigslot::signal1<CaptureResult> SignalCaptureResult; - private: - std::vector<VideoCodec> codecs_; - }; -diff -upN libjingle-0.5.2/talk/session/phone/rtpdump.cc.chromium12 libjingle-0.5.2/talk/session/phone/rtpdump.cc ---- libjingle-0.5.2/talk/session/phone/rtpdump.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/rtpdump.cc 2011-03-30 21:51:32.716287001 -0400 -@@ -262,9 +262,9 @@ void RtpDumpLoopReader::UpdateDumpPacket - - if (packet->IsValidRtpPacket()) { - // Get the old RTP sequence number and timestamp. -- uint16 sequence; -+ uint16 sequence = 0; - packet->GetRtpSeqNum(&sequence); -- uint32 timestamp; -+ uint32 timestamp = 0; - packet->GetRtpTimestamp(&timestamp); - // Increase the RTP sequence number and timestamp. - sequence += loop_count_ * rtp_seq_num_increase_; -diff -upN libjingle-0.5.2/talk/session/phone/videocommon.h.chromium12 libjingle-0.5.2/talk/session/phone/videocommon.h ---- libjingle-0.5.2/talk/session/phone/videocommon.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/videocommon.h 2011-03-30 21:51:32.716287001 -0400 -@@ -1,5 +1,5 @@ - // libjingle --// Copyright 2004--2005, Google Inc. -+// Copyright 2011, Google Inc. - // - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are met: -@@ -59,34 +59,35 @@ inline std::string GetFourccName(uint32 - // http://developer.apple.com/quicktime/icefloe/dispatch020.html - // http://www.fourcc.org/yuv.php - enum FourCC { -- // Canonical fourccs used in our code. -+ // Canonical fourcc codes used in our code. - FOURCC_I420 = FOURCC('I', '4', '2', '0'), - FOURCC_YUY2 = FOURCC('Y', 'U', 'Y', '2'), - FOURCC_UYVY = FOURCC('U', 'Y', 'V', 'Y'), -+ FOURCC_M420 = FOURCC('M', '4', '2', '0'), - FOURCC_24BG = FOURCC('2', '4', 'B', 'G'), -- FOURCC_RGBA = FOURCC('R', 'G', 'B', 'A'), -+ FOURCC_ABGR = FOURCC('A', 'B', 'G', 'R'), - FOURCC_BGRA = FOURCC('B', 'G', 'R', 'A'), - FOURCC_ARGB = FOURCC('A', 'R', 'G', 'B'), - FOURCC_MJPG = FOURCC('M', 'J', 'P', 'G'), -- FOURCC_JPEG = FOURCC('J', 'P', 'E', 'G'), - FOURCC_RAW = FOURCC('r', 'a', 'w', ' '), -- // Next five are Bayer RGB formats. The four characters define the order of -+ FOURCC_NV21 = FOURCC('N', 'V', '2', '1'), -+ FOURCC_NV12 = FOURCC('N', 'V', '1', '2'), -+ // Next four are Bayer RGB formats. The four characters define the order of - // the colours in each 2x2 pixel grid, going left-to-right and top-to-bottom. - FOURCC_RGGB = FOURCC('R', 'G', 'G', 'B'), - FOURCC_BGGR = FOURCC('B', 'G', 'G', 'R'), - FOURCC_GRBG = FOURCC('G', 'R', 'B', 'G'), - FOURCC_GBRG = FOURCC('G', 'B', 'R', 'G'), - -- // Aliases for canonical fourccs, replaced with their canonical equivalents by -- // CanonicalFourCC(). -+ // Aliases for canonical fourcc codes, replaced with their canonical -+ // equivalents by CanonicalFourCC(). - FOURCC_IYUV = FOURCC('I', 'Y', 'U', 'V'), // Alias for I420 - FOURCC_YU12 = FOURCC('Y', 'U', '1', '2'), // Alias for I420 - FOURCC_YUYV = FOURCC('Y', 'U', 'Y', 'V'), // Alias for YUY2 -- FOURCC_YUVS = FOURCC('y', 'u', 'v', 's'), // Alias for YUY2 -+ FOURCC_YUVS = FOURCC('y', 'u', 'v', 's'), // Alias for YUY2 on Mac - FOURCC_HDYC = FOURCC('H', 'D', 'Y', 'C'), // Alias for UYVY - FOURCC_2VUY = FOURCC('2', 'v', 'u', 'y'), // Alias for UYVY -- FOURCC_RGB1 = FOURCC('R', 'G', 'B', '1'), // Alias for ABGR -- FOURCC_RGB2 = FOURCC('R', 'G', 'B', '2'), // Alias for BGRA -+ FOURCC_JPEG = FOURCC('J', 'P', 'E', 'G'), // Alias for MJPG - FOURCC_BA81 = FOURCC('B', 'A', '8', '1'), // Alias for BGGR - - // Match any fourcc. -diff -upN libjingle-0.5.2/talk/session/tunnel/pseudotcpchannel.cc.chromium12 libjingle-0.5.2/talk/session/tunnel/pseudotcpchannel.cc ---- libjingle-0.5.2/talk/session/tunnel/pseudotcpchannel.cc.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/session/tunnel/pseudotcpchannel.cc 2011-03-30 21:51:32.717287001 -0400 -@@ -198,6 +198,26 @@ void PseudoTcpChannel::OnSessionTerminat - if (stream_ != NULL) - stream_thread_->Post(this, MSG_ST_EVENT, new EventData(SE_CLOSE, -1)); - } -+ -+ // Even though session_ is being destroyed, we mustn't clear the pointer, -+ // since we'll need it to tear down channel_. -+ // -+ // TODO(wez): Is it always the case that if channel_ != NULL then we'll get -+ // a channel-destroyed notification? -+} -+ -+void PseudoTcpChannel::GetOption(PseudoTcp::Option opt, int* value) { -+ ASSERT(signal_thread_->IsCurrent()); -+ CritScope lock(&cs_); -+ ASSERT(tcp_ != NULL); -+ tcp_->GetOption(opt, value); -+} -+ -+void PseudoTcpChannel::SetOption(PseudoTcp::Option opt, int value) { -+ ASSERT(signal_thread_->IsCurrent()); -+ CritScope lock(&cs_); -+ ASSERT(tcp_ != NULL); -+ tcp_->SetOption(opt, value); - } - - // -diff -upN libjingle-0.5.2/talk/session/tunnel/pseudotcpchannel.h.chromium12 libjingle-0.5.2/talk/session/tunnel/pseudotcpchannel.h ---- libjingle-0.5.2/talk/session/tunnel/pseudotcpchannel.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/session/tunnel/pseudotcpchannel.h 2011-03-30 21:51:32.717287001 -0400 -@@ -43,18 +43,22 @@ namespace cricket { - class TransportChannel; - - /////////////////////////////////////////////////////////////////////////////// --// ChannelStream --// Note: The lifetime of TunnelSession is complicated. It needs to survive --// until the following three conditions are true: --// 1) TunnelStream has called Close (tracked via non-null stream_) --// 2) PseudoTcp has completed (tracked via non-null tcp_) --// 3) Session has been destroyed (tracked via non-null session_) --// This is accomplished by calling CheckDestroy after these indicators change. -+// PseudoTcpChannel -+// Note: The PseudoTcpChannel must persist until both of: -+// 1) The StreamInterface provided via GetStream has been closed. -+// This is tracked via non-null stream_. -+// 2) The PseudoTcp session has completed. -+// This is tracked via non-null worker_thread_. When PseudoTcp is done, -+// the TransportChannel is signalled to tear-down. Once the channel is -+// torn down, the worker thread is purged. -+// These indicators are checked by CheckDestroy, invoked whenever one of them -+// changes. - /////////////////////////////////////////////////////////////////////////////// --// TunnelStream --// Note: Because TunnelStream provides a stream interface, it's lifetime is --// controlled by the owner of the stream pointer. As a result, we must support --// both the TunnelSession disappearing before TunnelStream, and vice versa. -+// PseudoTcpChannel::GetStream -+// Note: The stream pointer returned by GetStream is owned by the caller. -+// They can close & immediately delete the stream while PseudoTcpChannel still -+// has cleanup work to do. They can also close the stream but not delete it -+// until long after PseudoTcpChannel has finished. We must cope with both. - /////////////////////////////////////////////////////////////////////////////// - - class PseudoTcpChannel -@@ -72,8 +76,14 @@ public: - - sigslot::signal1<PseudoTcpChannel*> SignalChannelClosed; - -+ // Call this when the Session used to create this channel is being torn -+ // down, to ensure that things get cleaned up properly. - void OnSessionTerminate(Session* session); - -+ // See the PseudoTcp class for available options. -+ void GetOption(PseudoTcp::Option opt, int* value); -+ void SetOption(PseudoTcp::Option opt, int value); -+ - private: - class InternalStream; - friend class InternalStream; -diff -upN libjingle-0.5.2/talk/site_scons/talk.py.chromium12 libjingle-0.5.2/talk/site_scons/talk.py ---- libjingle-0.5.2/talk/site_scons/talk.py.chromium12 2011-01-11 19:25:51.000000000 -0500 -+++ libjingle-0.5.2/talk/site_scons/talk.py 2011-03-30 21:51:32.717287001 -0400 -@@ -211,7 +211,7 @@ def AddMediaLibs(env, **kwargs): - elif env.Bit('mac'): - gips_lib = 'VoiceEngine_mac_universal_gcc' - elif env.Bit('linux'): -- gips_lib = 'VoiceEngine_Linux_external_gcc' -+ gips_lib = 'VoiceEngine_Linux_gcc' - - - AddToDict(kwargs, 'libs', [ ---- libjingle-0.5.2/talk/session/phone/devicemanager.h.chromium12 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/devicemanager.h 2011-03-30 23:57:46.524287064 -0400 -@@ -59,11 +59,7 @@ - // Methods are virtual to allow for easy stubbing/mocking in tests. - class DeviceManager { - public: -- DeviceManager( --#ifdef USE_TALK_SOUND -- SoundSystemFactory *factory --#endif -- ); -+ DeviceManager(); - virtual ~DeviceManager(); - - // Initialization -@@ -82,7 +78,7 @@ - bool GetAudioOutputDevice(const std::string& name, Device* out); - - virtual bool GetVideoCaptureDevices(std::vector<Device>* devs); -- virtual bool GetDefaultVideoCaptureDevice(Device* device); -+ bool GetVideoCaptureDevice(const std::string& name, Device* out); - - sigslot::signal0<> SignalDevicesChange; - -@@ -93,10 +89,15 @@ - protected: - virtual bool GetAudioDevice(bool is_input, const std::string& name, - Device* out); -+ virtual bool GetDefaultVideoCaptureDevice(Device* device); -+ - private: - bool GetAudioDevicesByPlatform(bool input, std::vector<Device>* devs); - - bool initialized_; -+#ifdef WIN32 -+ bool need_couninitialize_; -+#endif - DeviceWatcher* watcher_; - #ifdef USE_TALK_SOUND - SoundSystemHandle sound_system_; ---- libjingle-0.5.2/talk/session/phone/devicemanager.cc.chromium12 2011-03-30 23:58:32.819287002 -0400 -+++ libjingle-0.5.2/talk/session/phone/devicemanager.cc 2011-03-31 00:03:00.810286990 -0400 -@@ -53,17 +53,18 @@ - #include "talk/base/stream.h" - #include "talk/session/phone/libudevsymboltable.h" - #include "talk/session/phone/v4llookup.h" -+#if USE_TALK_SOUND -+#include "talk/sound/platformsoundsystem.h" -+#include "talk/sound/platformsoundsystemfactory.h" -+#include "talk/sound/sounddevicelocator.h" -+#include "talk/sound/soundsysteminterface.h" -+#endif - #endif - - #include "talk/session/phone/devicemanager.h" - #include "talk/base/logging.h" - #include "talk/base/stringutils.h" - #include "talk/session/phone/mediaengine.h" --#if USE_TALK_SOUND --#include "talk/sound/platformsoundsystem.h" --#include "talk/sound/sounddevicelocator.h" --#include "talk/sound/soundsysteminterface.h" --#endif - - namespace cricket { - // Initialize to empty string. -@@ -116,9 +117,17 @@ - DeviceManager* manager_; - void* impl_; - }; -+#elif defined(IOS) || defined(ANDROID) -+// We don't use DeviceWatcher on iOS or Android, so just stub out a noop class. -+class DeviceWatcher { -+ public: -+ explicit DeviceWatcher(DeviceManager* dm) {} -+ bool Start() { return true; } -+ void Stop() {} -+}; - #endif - --#ifndef LINUX -+#if !defined(LINUX) && !defined(IOS) - static bool ShouldDeviceBeIgnored(const std::string& device_name); - #endif - #ifndef OSX -@@ -142,15 +151,14 @@ - static bool GetAudioDeviceName(AudioDeviceID id, bool input, std::string* out); - #endif - --DeviceManager::DeviceManager( --#ifdef USE_TALK_SOUND -- SoundSystemFactory *factory --#endif -- ) -+DeviceManager::DeviceManager() - : initialized_(false), -+#if defined(WIN32) -+ need_couninitialize_(false), -+#endif - watcher_(new DeviceWatcher(this)) - #ifdef USE_TALK_SOUND -- , sound_system_(factory) -+ , sound_system_(new PlatformSoundSystemFactory()) - #endif - { - } -@@ -164,6 +172,16 @@ - - bool DeviceManager::Init() { - if (!initialized_) { -+#if defined(WIN32) -+ HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); -+ need_couninitialize_ = SUCCEEDED(hr); -+ if (FAILED(hr)) { -+ LOG(LS_ERROR) << "CoInitialize failed, hr=" << hr; -+ if (hr != RPC_E_CHANGED_MODE) { -+ return false; -+ } -+ } -+#endif - if (!watcher_->Start()) { - return false; - } -@@ -175,6 +193,12 @@ - void DeviceManager::Terminate() { - if (initialized_) { - watcher_->Stop(); -+#if defined(WIN32) -+ if (need_couninitialize_) { -+ CoUninitialize(); -+ need_couninitialize_ = false; -+ } -+#endif - initialized_ = false; - } - } -@@ -259,6 +283,28 @@ - return ret; - } - -+bool DeviceManager::GetVideoCaptureDevice(const std::string& name, -+ Device* out) { -+ // If the name is empty, return the default device. -+ if (name.empty() || name == kDefaultDeviceName) { -+ return GetDefaultVideoCaptureDevice(out); -+ } -+ -+ std::vector<Device> devices; -+ if (!GetVideoCaptureDevices(&devices)) { -+ return false; -+ } -+ -+ for (std::vector<Device>::const_iterator it = devices.begin(); -+ it != devices.end(); ++it) { -+ if (name == it->name) { -+ *out = *it; -+ return true; -+ } -+ } -+ -+ return false; -+} - - bool DeviceManager::GetAudioDevice(bool is_input, const std::string& name, - Device* out) { -@@ -287,6 +333,7 @@ - bool DeviceManager::GetAudioDevicesByPlatform(bool input, - std::vector<Device>* devs) { - devs->clear(); -+ - #if defined(USE_TALK_SOUND) - if (!sound_system_.get()) { - return false; -@@ -332,7 +379,6 @@ - } - } - return ret; -- - #elif defined(LINUX) - int card = -1, dev = -1; - snd_ctl_t *handle = NULL; -@@ -385,20 +431,7 @@ - - #if defined(WIN32) - bool GetVideoDevices(std::vector<Device>* devices) { -- // TODO: Move the CoInit stuff to Initialize/Terminate. -- HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); -- if (FAILED(hr)) { -- LOG(LS_ERROR) << "CoInitialize failed, hr=" << hr; -- if (hr != RPC_E_CHANGED_MODE) { -- return false; -- } -- } -- -- bool ret = GetDevices(CLSID_VideoInputDeviceCategory, devices); -- if (SUCCEEDED(hr)) { -- CoUninitialize(); -- } -- return ret; -+ return GetDevices(CLSID_VideoInputDeviceCategory, devices); - } - - bool GetDevices(const CLSID& catid, std::vector<Device>* devices) { -@@ -977,7 +1010,7 @@ - - // TODO: Try to get hold of a copy of Final Cut to understand why we - // crash while scanning their components on OS X. --#ifndef LINUX -+#if !defined(LINUX) && !defined(IOS) - static bool ShouldDeviceBeIgnored(const std::string& device_name) { - static const char* const kFilteredDevices[] = { - "Google Camera Adapter", // Our own magiccams diff --git a/libjingle-0.5.2-compilefix.patch b/libjingle-0.5.2-compilefix.patch deleted file mode 100644 index 2e17641..0000000 --- a/libjingle-0.5.2-compilefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -upN libjingle-0.5.2/talk/base/ratetracker.cc.compilefix libjingle-0.5.2/talk/base/ratetracker.cc ---- libjingle-0.5.2/talk/base/ratetracker.cc.compilefix 2011-01-11 19:25:49.000000000 -0500 -+++ libjingle-0.5.2/talk/base/ratetracker.cc 2011-03-30 23:53:08.288286757 -0400 -@@ -25,8 +25,8 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/base/ratetracker.h" - #include "talk/base/time.h" -+#include "talk/base/ratetracker.h" - - namespace talk_base { - diff --git a/libjingle-0.5.2-devicemanager-alsafix.patch b/libjingle-0.5.2-devicemanager-alsafix.patch deleted file mode 100644 index a7f271b..0000000 --- a/libjingle-0.5.2-devicemanager-alsafix.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up libjingle-0.5.2/talk/session/phone/devicemanager.cc.alsa libjingle-0.5.2/talk/session/phone/devicemanager.cc ---- libjingle-0.5.2/talk/session/phone/devicemanager.cc.alsa 2011-01-11 19:25:50.000000000 -0500 -+++ libjingle-0.5.2/talk/session/phone/devicemanager.cc 2011-03-30 19:49:54.989287610 -0400 -@@ -25,7 +25,7 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/session/phone/devicemanager.h" -+#include "config.h" - - #if WIN32 - #include <atlbase.h> -@@ -45,9 +45,7 @@ - #elif LINUX - #include <libudev.h> - #include <unistd.h> --#ifndef USE_TALK_SOUND - #include <alsa/asoundlib.h> --#endif - #include "talk/base/linux.h" - #include "talk/base/fileutils.h" - #include "talk/base/pathutils.h" -@@ -57,6 +55,7 @@ - #include "talk/session/phone/v4llookup.h" - #endif - -+#include "talk/session/phone/devicemanager.h" - #include "talk/base/logging.h" - #include "talk/base/stringutils.h" - #include "talk/session/phone/mediaengine.h" diff --git a/libjingle-0.5.2-size_t.patch b/libjingle-0.5.2-size_t.patch deleted file mode 100644 index eaea235..0000000 --- a/libjingle-0.5.2-size_t.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upN libjingle-0.5.2/talk/p2p/base/pseudotcp.h.sizet libjingle-0.5.2/talk/p2p/base/pseudotcp.h ---- libjingle-0.5.2/talk/p2p/base/pseudotcp.h.sizet 2011-04-01 08:21:09.592149011 -0400 -+++ libjingle-0.5.2/talk/p2p/base/pseudotcp.h 2011-04-01 08:21:18.242149032 -0400 -@@ -29,6 +29,7 @@ - #define TALK_P2P_BASE_PSEUDOTCP_H_ - - #include <list> -+#include <cstdlib> - - #include "talk/base/basictypes.h" - diff --git a/libjingle-0.5.8-NULL-fix.patch b/libjingle-0.5.8-NULL-fix.patch deleted file mode 100644 index 8dda42d..0000000 --- a/libjingle-0.5.8-NULL-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libjingle-0.5.8/talk/base/event.cc.NULL libjingle-0.5.8/talk/base/event.cc ---- libjingle-0.5.8/talk/base/event.cc.NULL 2011-07-25 11:36:53.561334546 -0400 -+++ libjingle-0.5.8/talk/base/event.cc 2011-07-25 11:38:10.157417620 -0400 -@@ -26,6 +26,7 @@ - */ - - #include "talk/base/event.h" -+#include <stdlib.h> - - #if defined(WIN32) - #include <windows.h> -diff -up libjingle-0.5.8/talk/base/sigslot.h.NULL libjingle-0.5.8/talk/base/sigslot.h diff --git a/libjingle-0.5.8-build-sanity.patch b/libjingle-0.5.8-build-sanity.patch deleted file mode 100644 index 9b1bc95..0000000 --- a/libjingle-0.5.8-build-sanity.patch +++ /dev/null @@ -1,634 +0,0 @@ -diff -up libjingle-0.5.8/configure.ac.SANITY libjingle-0.5.8/configure.ac ---- libjingle-0.5.8/configure.ac.SANITY 2011-07-26 16:23:18.232768372 -0400 -+++ libjingle-0.5.8/configure.ac 2011-07-26 16:25:29.909261951 -0400 -@@ -0,0 +1,86 @@ -+AC_INIT([libjingle], [0.5.1], [google-talk-open(a)googlegroups.com]) -+AC_CANONICAL_SYSTEM -+AM_CONFIG_HEADER(config.h) -+AM_INIT_AUTOMAKE([dist-zip]) -+AC_PROG_CC -+AC_PROG_CXX -+AM_PROG_LIBTOOL -+LIBTOOL="$LIBTOOL --silent" -+AC_PROG_INSTALL -+AC_DEFINE(PRODUCTION_BUILD, 1, [Build as a production build]) -+AC_DEFINE(PRODUCTION, 1, [Build as a production build]) -+AC_DEFINE(POSIX, 1, [If we're using configure, we're on POSIX]) -+AC_DEFINE(FEATURE_ENABLE_VOICEMAIL, 1, [voice mail]) -+AC_DEFINE(LOGGING, 1, [Logging]) -+ -+LIBJINGLE_MAJORMINOR=0.5 -+AC_SUBST(LIBJINGLE_MAJORMINOR) -+ -+LIBJINGLE_LIBRARY_VERSION=1:0:0 -+AC_SUBST(LIBJINGLE_LIBRARY_VERSION) -+ -+HAVE_EXPAT=no -+AC_CHECK_LIB(expat, XML_ParserCreate, HAVE_EXPAT="yes") -+if test "x$HAVE_EXPAT" = xyes ; then -+ EXPAT_LIBS="-lexpat" -+ AC_SUBST(EXPAT_LIBS) -+else -+ AC_ERROR([Expat is required to build libjingle. You can get it from http://expat.sourceforge.net/]) -+fi -+ -+if test `uname -s` = Linux ; then -+ AC_DEFINE(LINUX, 1, [Building on Linux]) -+ HAVE_ALSA=no -+ AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA="yes") -+ if test "x$HAVE_ALSA" = xyes ; then -+ ALSA_LIBS="-lasound" -+ AC_SUBST(ALSA_LIBS) -+ AC_DEFINE(HAVE_ALSA, 1, [Using ALSA]) -+ else -+ AC_ERROR([libasound is required to build libjingle. You can get it from http://www.alsa-project.org/]) -+ fi -+ -+ AC_CHECK_HEADER(openssl/ssl.h, HAVE_OPENSSL_SSL_H=yes, HAVE_OPENSSL_SSL_H=no) -+ if test x$HAVE_OPENSSL_SSL_H = xyes; then -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 1, [Found openssl/ssl.h]) -+ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7g, HAVE_OPENSSL=yes, HAVE_OPENSSL=no) -+ AC_SUBST(OPENSSL_CFLAGS) -+ AC_SUBST(OPENSSL_LIBS) -+ AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL]) -+ AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled]) -+ CPPFLAGS+="$OPENSSL_CFLAGS" -+ LDFLAGS+=" $OPENSSL_LIBS" -+ else -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 0, [Did not find openssl/ssl.h]) -+ fi -+fi -+ -+PKG_CHECK_MODULES(LIBSRTP, libsrtp >= 1.4.4, enable_srtp=yes, enable_srtp=no) -+if test x$enable_srtp = xno ; then -+ HAVE_SRTP=no -+else -+ AC_SUBST(LIBSRTP_CFLAGS) -+ AC_SUBST(LIBSRTP_LIBS) -+ AC_DEFINE(HAVE_SRTP, 1, [libSRTP provides SRTP supprt]) -+fi -+ -+AC_OUTPUT([Makefile -+ talk/Makefile -+ talk/base/Makefile -+ talk/examples/Makefile -+ talk/examples/login/Makefile -+ talk/examples/call/Makefile -+ talk/p2p/Makefile -+ talk/p2p/base/Makefile -+ talk/p2p/client/Makefile -+ talk/session/Makefile -+ talk/session/tunnel/Makefile -+ talk/session/phone/Makefile -+ talk/xmllite/Makefile -+ talk/xmpp/Makefile -+ pkgconfig/Makefile -+ pkgconfig/jinglebase.pc -+ pkgconfig/jinglep2p.pc -+ pkgconfig/jinglesessiontunnel.pc -+ pkgconfig/jinglesessionphone.pc -+ ]) -diff -up libjingle-0.5.8/Makefile.am.SANITY libjingle-0.5.8/Makefile.am ---- libjingle-0.5.8/Makefile.am.SANITY 2011-07-26 16:23:18.232768372 -0400 -+++ libjingle-0.5.8/Makefile.am 2011-07-26 16:23:18.232768372 -0400 -@@ -0,0 +1,4 @@ -+SUBDIRS=talk pkgconfig -+ -+configdir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk -+config_HEADERS = config.h -diff -up libjingle-0.5.8/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.5.8/pkgconfig/jinglebase.pc.in ---- libjingle-0.5.8/pkgconfig/jinglebase.pc.in.SANITY 2011-07-26 16:23:18.232768372 -0400 -+++ libjingle-0.5.8/pkgconfig/jinglebase.pc.in 2011-07-26 16:23:18.232768372 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglebase -+Description: Jingle Base Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglebase -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.5.8/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.5.8/pkgconfig/jinglep2p.pc.in ---- libjingle-0.5.8/pkgconfig/jinglep2p.pc.in.SANITY 2011-07-26 16:23:18.233768361 -0400 -+++ libjingle-0.5.8/pkgconfig/jinglep2p.pc.in 2011-07-26 16:23:18.233768361 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglep2p -+Description: Jingle P2P Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -ljinglep2pbase -ljinglep2pclient -ljinglexmllite -ljinglexmpp -lexpat -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in ---- libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in.SANITY 2011-07-26 16:23:18.233768361 -0400 -+++ libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in 2011-07-26 16:23:18.233768361 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessionphone -+Description: Jingle Session Phone Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in ---- libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in.SANITY 2011-07-26 16:23:18.233768361 -0400 -+++ libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in 2011-07-26 16:23:18.233768361 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessiontunnel -+Description: Jingle Session Tunnel Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessiontunnel -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.5.8/pkgconfig/Makefile.am.SANITY libjingle-0.5.8/pkgconfig/Makefile.am ---- libjingle-0.5.8/pkgconfig/Makefile.am.SANITY 2011-07-26 16:23:18.233768361 -0400 -+++ libjingle-0.5.8/pkgconfig/Makefile.am 2011-07-26 16:23:18.233768361 -0400 -@@ -0,0 +1,20 @@ -+### all of the standard pc files we need to generate -+pcfiles = jinglebase-@LIBJINGLE_MAJORMINOR@.pc jinglep2p-@LIBJINGLE_MAJORMINOR@.pc jinglesessiontunnel-@LIBJINGLE_MAJORMINOR@.pc jinglesessionphone-@LIBJINGLE_MAJORMINOR@.pc -+ -+all-local: $(pcfiles) -+ -+### how to generate pc files -+%-@LIBJINGLE_MAJORMINOR@.pc: %.pc -+ cp $< $@ -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = $(pcfiles) -+ -+EXTRA_DIST = \ -+ jinglebase.pc.in \ -+ jinglep2p.pc.in \ -+ jinglesessionphone.pc.in \ -+ jinglesessiontunnel.pc.in -+ -+CLEANFILES = $(pcfiles) -+ -diff -up libjingle-0.5.8/talk/base/Makefile.am.SANITY libjingle-0.5.8/talk/base/Makefile.am ---- libjingle-0.5.8/talk/base/Makefile.am.SANITY 2011-07-26 16:23:18.234768350 -0400 -+++ libjingle-0.5.8/talk/base/Makefile.am 2011-07-26 16:26:00.332913735 -0400 -@@ -0,0 +1,142 @@ -+lib_LTLIBRARIES = libjinglebase.la -+ -+libjinglebase_la_SOURCES = asyncfile.cc \ -+ asynchttprequest.cc \ -+ asyncsocket.cc \ -+ asynctcpsocket.cc \ -+ asyncudpsocket.cc \ -+ autodetectproxy.cc \ -+ base64.cc \ -+ basicpacketsocketfactory.cc \ -+ bytebuffer.cc \ -+ checks.cc \ -+ common.cc \ -+ diskcache.cc \ -+ event.cc \ -+ fileutils.cc \ -+ firewallsocketserver.cc \ -+ flags.cc \ -+ helpers.cc \ -+ host.cc \ -+ httpbase.cc \ -+ httpclient.cc \ -+ httpcommon.cc \ -+ httprequest.cc \ -+ linux.cc \ -+ logging.cc \ -+ md5c.c \ -+ messagehandler.cc \ -+ messagequeue.cc \ -+ nethelpers.cc \ -+ network.cc \ -+ openssladapter.cc \ -+ opensslidentity.cc \ -+ opensslstreamadapter.cc \ -+ pathutils.cc \ -+ physicalsocketserver.cc \ -+ proxydetect.cc \ -+ proxyinfo.cc \ -+ ratetracker.cc \ -+ signalthread.cc \ -+ socketadapters.cc \ -+ socketaddress.cc \ -+ socketaddresspair.cc \ -+ socketpool.cc \ -+ socketstream.cc \ -+ ssladapter.cc \ -+ sslsocketfactory.cc \ -+ sslstreamadapter.cc \ -+ stream.cc \ -+ stringdigest.cc \ -+ stringencode.cc \ -+ stringutils.cc \ -+ task.cc \ -+ taskparent.cc \ -+ taskrunner.cc \ -+ thread.cc \ -+ time.cc \ -+ unixfilesystem.cc \ -+ urlencode.cc -+ -+libjinglebase_la_LIBADD = -lrt -+ -+libjinglebase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglebase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/base -+ -+libjinglebase_include_HEADERS = asyncfile.h \ -+ asynchttprequest.h \ -+ asyncpacketsocket.h \ -+ asyncsocket.h \ -+ asynctcpsocket.h \ -+ asyncudpsocket.h \ -+ autodetectproxy.h \ -+ base64.h \ -+ basicdefs.h \ -+ basicpacketsocketfactory.h \ -+ basictypes.h \ -+ bytebuffer.h \ -+ byteorder.h \ -+ checks.h \ -+ common.h \ -+ constructormagic.h \ -+ criticalsection.h \ -+ cryptstring.h \ -+ diskcache.h \ -+ event.h \ -+ fileutils.h \ -+ firewallsocketserver.h \ -+ flags.h \ -+ helpers.h \ -+ host.h \ -+ httpbase.h \ -+ httpclient.h \ -+ httpcommon-inl.h \ -+ httpcommon.h \ -+ httprequest.h \ -+ linked_ptr.h \ -+ linux.h \ -+ logging.h \ -+ md5.h \ -+ messagehandler.h \ -+ messagequeue.h \ -+ nethelpers.h \ -+ network.h \ -+ openssladapter.h \ -+ opensslidentity.h \ -+ opensslstreamadapter.h \ -+ packetsocketfactory.h \ -+ pathutils.h \ -+ physicalsocketserver.h \ -+ proxydetect.h \ -+ proxyinfo.h \ -+ ratetracker.h \ -+ scoped_ptr.h \ -+ sec_buffer.h \ -+ signalthread.h \ -+ sigslot.h \ -+ sigslotrepeater.h \ -+ socket.h \ -+ socketadapters.h \ -+ socketaddress.h \ -+ socketaddresspair.h \ -+ socketfactory.h \ -+ socketpool.h \ -+ socketserver.h \ -+ socketstream.h \ -+ ssladapter.h \ -+ sslsocketfactory.h \ -+ sslstreamadapter.h \ -+ stream.h \ -+ stringdigest.h \ -+ stringencode.h \ -+ stringutils.h \ -+ task.h \ -+ taskparent.h \ -+ taskrunner.h \ -+ thread.h \ -+ time.h \ -+ unixfilesystem.h \ -+ urlencode.h -+ -+AM_CXXFLAGS = -DPOSIX -diff -up libjingle-0.5.8/talk/examples/call/Makefile.am.SANITY libjingle-0.5.8/talk/examples/call/Makefile.am ---- libjingle-0.5.8/talk/examples/call/Makefile.am.SANITY 2011-07-26 16:23:18.234768350 -0400 -+++ libjingle-0.5.8/talk/examples/call/Makefile.am 2011-07-26 16:23:18.234768350 -0400 -@@ -0,0 +1,23 @@ -+bin_PROGRAMS = call -+call_CXXFLAGS = $(AM_CXXFLAGS) -+call_SOURCES = call_main.cc \ -+ callclient.cc \ -+ console.cc \ -+ discoitemsquerytask.cc \ -+ friendinvitesendtask.cc \ -+ mucinviterecvtask.cc \ -+ mucinvitesendtask.cc \ -+ presenceouttask.cc \ -+ presencepushtask.cc \ -+ voicemailjidrequester.cc -+noinst_HEADERS = callclient.h console.h -+call_LDADD = $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(top_srcdir)/talk/session/phone/libjinglesessionphone.la \ -+ $(top_srcdir)/talk/p2p/client/libjinglep2pclient.la \ -+ $(top_srcdir)/talk/p2p/base/libjinglep2pbase.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) $(ALSA_LIBS) $(LIBSRTP_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.5.8/talk/examples/login/Makefile.am.SANITY libjingle-0.5.8/talk/examples/login/Makefile.am ---- libjingle-0.5.8/talk/examples/login/Makefile.am.SANITY 2011-07-26 16:23:18.234768350 -0400 -+++ libjingle-0.5.8/talk/examples/login/Makefile.am 2011-07-26 16:23:18.234768350 -0400 -@@ -0,0 +1,24 @@ -+noinst_LTLIBRARIES= libxmpphelp.la -+libxmpphelp_la_SOURCES = xmppsocket.cc \ -+ xmppauth.cc \ -+ xmpppump.cc -+ -+noinst_HEADERS = xmppauth.h \ -+ xmpppump.h \ -+ xmppsocket.h \ -+ xmppthread.h \ -+ jingleinfotask.h \ -+ presenceouttask.h \ -+ presencepushtask.h \ -+ status.h -+ -+bin_PROGRAMS = login -+login_CXXFLAGS = $(AM_CXXFLAGS) -+login_SOURCES = login_main.cc xmppthread.cc -+login_LDADD = $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.5.8/talk/examples/Makefile.am.SANITY libjingle-0.5.8/talk/examples/Makefile.am ---- libjingle-0.5.8/talk/examples/Makefile.am.SANITY 2011-07-26 16:23:18.234768350 -0400 -+++ libjingle-0.5.8/talk/examples/Makefile.am 2011-07-26 16:23:18.234768350 -0400 -@@ -0,0 +1 @@ -+SUBDIRS=login call -diff -up libjingle-0.5.8/talk/Makefile.am.SANITY libjingle-0.5.8/talk/Makefile.am ---- libjingle-0.5.8/talk/Makefile.am.SANITY 2011-07-26 16:23:18.235768339 -0400 -+++ libjingle-0.5.8/talk/Makefile.am 2011-07-26 16:23:18.235768339 -0400 -@@ -0,0 +1 @@ -+SUBDIRS=base xmllite xmpp p2p session -diff -up libjingle-0.5.8/talk/p2p/base/Makefile.am.SANITY libjingle-0.5.8/talk/p2p/base/Makefile.am ---- libjingle-0.5.8/talk/p2p/base/Makefile.am.SANITY 2011-07-26 16:23:18.235768339 -0400 -+++ libjingle-0.5.8/talk/p2p/base/Makefile.am 2011-07-26 16:23:18.235768339 -0400 -@@ -0,0 +1,74 @@ -+lib_LTLIBRARIES = libjinglep2pbase.la -+ -+libjinglep2pbase_la_SOURCES = stun.cc \ -+ port.cc \ -+ udpport.cc \ -+ tcpport.cc \ -+ stunport.cc \ -+ relayport.cc \ -+ relayserver.cc \ -+ stunrequest.cc \ -+ stunserver.cc \ -+ sessionmanager.cc \ -+ sessionmessages.cc \ -+ session.cc \ -+ sessiondescription.cc \ -+ transport.cc \ -+ transportchannel.cc \ -+ transportchannelproxy.cc \ -+ p2ptransport.cc \ -+ p2ptransportchannel.cc \ -+ rawtransport.cc \ -+ rawtransportchannel.cc \ -+ constants.cc \ -+ pseudotcp.cc \ -+ parsing.cc -+ -+libjinglep2pbase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/base -+libjinglep2pbase_include_HEADERS = candidate.h \ -+ portallocator.h \ -+ relayport.h \ -+ session.h \ -+ stunport.h \ -+ tcpport.h \ -+ port.h \ -+ sessionid.h \ -+ stunrequest.h \ -+ udpport.h \ -+ pseudotcp.h \ -+ sessiondescription.h \ -+ sessionmanager.h \ -+ stun.h \ -+ relayserver.h \ -+ stunserver.h \ -+ sessionclient.h \ -+ transport.h \ -+ transportchannel.h \ -+ transportchannelproxy.h \ -+ transportchannelimpl.h \ -+ p2ptransport.h \ -+ p2ptransportchannel.h \ -+ rawtransport.h \ -+ rawtransportchannel.h \ -+ constants.h \ -+ common.h \ -+ parsing.h \ -+ sessionmessages.h -+ -+libjinglep2pbase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+libjinglep2pbase_la_LIBADD = $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la -+ -+AM_CPPFLAGS = -DPOSIX -DENABLE_DEBUG -D_DEBUG -g -+ -+P2PLIBS = libjinglep2pbase.la ../../base/libjinglebase.la -lpthread -+XMLLIBS = ../../xmllite/libjinglexmllite.la ../../xmpp/libjinglexmpp.la $(EXPAT_LIBS) -+ -+bin_PROGRAMS = relayserver stunserver -+relayserver_SOURCES = relayserver.cc relayserver_main.cc -+relayserver_LDADD = $(P2PLIBS) -+relayserver_CPPFLAGS = $(AM_CPPFLAGS) -+ -+stunserver_SOURCES = stunserver.cc stunserver_main.cc -+stunserver_LDADD = $(P2PLIBS) -+stunserver_CPPFLAGS = $(AM_CPPFLAGS) -diff -up libjingle-0.5.8/talk/p2p/client/Makefile.am.SANITY libjingle-0.5.8/talk/p2p/client/Makefile.am ---- libjingle-0.5.8/talk/p2p/client/Makefile.am.SANITY 2011-07-26 16:23:18.235768339 -0400 -+++ libjingle-0.5.8/talk/p2p/client/Makefile.am 2011-07-26 16:23:18.235768339 -0400 -@@ -0,0 +1,18 @@ -+lib_LTLIBRARIES = libjinglep2pclient.la -+ -+libjinglep2pclient_la_SOURCES = basicportallocator.cc \ -+ httpportallocator.cc \ -+ socketmonitor.cc -+ -+libjinglep2pclient_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/client -+ -+libjinglep2pclient_include_HEADERS = basicportallocator.h \ -+ socketmonitor.h \ -+ sessionmanagertask.h \ -+ sessionsendtask.h \ -+ httpportallocator.h -+ -+libjinglep2pclient_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD -+ -diff -up libjingle-0.5.8/talk/p2p/Makefile.am.SANITY libjingle-0.5.8/talk/p2p/Makefile.am ---- libjingle-0.5.8/talk/p2p/Makefile.am.SANITY 2011-07-26 16:23:18.236768327 -0400 -+++ libjingle-0.5.8/talk/p2p/Makefile.am 2011-07-26 16:23:18.235768339 -0400 -@@ -0,0 +1 @@ -+SUBDIRS=base client -diff -up libjingle-0.5.8/talk/session/Makefile.am.SANITY libjingle-0.5.8/talk/session/Makefile.am ---- libjingle-0.5.8/talk/session/Makefile.am.SANITY 2011-07-26 16:23:18.236768327 -0400 -+++ libjingle-0.5.8/talk/session/Makefile.am 2011-07-26 16:23:18.236768327 -0400 -@@ -0,0 +1 @@ -+SUBDIRS = tunnel phone -diff -up libjingle-0.5.8/talk/session/phone/Makefile.am.SANITY libjingle-0.5.8/talk/session/phone/Makefile.am ---- libjingle-0.5.8/talk/session/phone/Makefile.am.SANITY 2011-07-26 16:23:18.236768327 -0400 -+++ libjingle-0.5.8/talk/session/phone/Makefile.am 2011-07-26 16:23:18.236768327 -0400 -@@ -0,0 +1,39 @@ -+lib_LTLIBRARIES = libjinglesessionphone.la -+ -+libjinglesessionphone_la_SOURCES = audiomonitor.cc \ -+ channelmanager.cc \ -+ call.cc \ -+ channel.cc \ -+ codec.cc \ -+ devicemanager.cc \ -+ filemediaengine.cc \ -+ libudevsymboltable.cc \ -+ mediaengine.cc \ -+ mediamonitor.cc \ -+ mediasessionclient.cc \ -+ rtpdump.cc \ -+ soundclip.cc \ -+ srtpfilter.cc \ -+ v4llookup.cc -+ -+libjinglesessionphone_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/phone -+libjinglesessionphone_include_HEADERS = audiomonitor.h \ -+ channelmanager.h \ -+ mediaengine.h \ -+ voicechannel.h \ -+ call.h \ -+ mediachannel.h \ -+ codec.h \ -+ channel.h \ -+ filemediaengine.h \ -+ libudevsymboltable.h \ -+ mediasessionclient.h \ -+ rtpdump.h \ -+ srtpfilter.h \ -+ videocommon.h -+ -+libjinglesessionphone_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglesessionphone_la_LIBADD = $(LIBSRTP_LIBS) -+ -+AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS) -diff -up libjingle-0.5.8/talk/session/tunnel/Makefile.am.SANITY libjingle-0.5.8/talk/session/tunnel/Makefile.am ---- libjingle-0.5.8/talk/session/tunnel/Makefile.am.SANITY 2011-07-26 16:23:18.236768327 -0400 -+++ libjingle-0.5.8/talk/session/tunnel/Makefile.am 2011-07-26 16:23:18.236768327 -0400 -@@ -0,0 +1,16 @@ -+lib_LTLIBRARIES = libjinglesessiontunnel.la -+ -+libjinglesessiontunnel_la_SOURCES = tunnelsessionclient.cc \ -+ securetunnelsessionclient.cc \ -+ pseudotcpchannel.cc -+ -+libjinglesessiontunnel_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/tunnel -+ -+libjinglesessiontunnel_include_HEADERS = tunnelsessionclient.h \ -+ pseudotcpchannel.h \ -+ securetunnelsessionclient.h -+ -+libjinglesessiontunnel_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CXXFLAGS = -DPOSIX -+ -diff -up libjingle-0.5.8/talk/xmllite/Makefile.am.SANITY libjingle-0.5.8/talk/xmllite/Makefile.am ---- libjingle-0.5.8/talk/xmllite/Makefile.am.SANITY 2011-07-26 16:23:18.237768315 -0400 -+++ libjingle-0.5.8/talk/xmllite/Makefile.am 2011-07-26 16:23:18.236768327 -0400 -@@ -0,0 +1,21 @@ -+lib_LTLIBRARIES = libjinglexmllite.la -+ -+libjinglexmllite_la_SOURCES = qname.cc \ -+ xmlbuilder.cc \ -+ xmlconstants.cc \ -+ xmlelement.cc \ -+ xmlnsstack.cc \ -+ xmlparser.cc \ -+ xmlprinter.cc -+ -+libjinglexmllite_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmllite -+libjinglexmllite_include_HEADERS = qname.h \ -+ xmlbuilder.h \ -+ xmlconstants.h \ -+ xmlelement.h \ -+ xmlnsstack.h \ -+ xmlparser.h \ -+ xmlprinter.h -+AM_CPPFLAGS = -DPOSIX -+ -+libjinglexmllite_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) $(EXPAT_LIBS) -diff -up libjingle-0.5.8/talk/xmpp/Makefile.am.SANITY libjingle-0.5.8/talk/xmpp/Makefile.am ---- libjingle-0.5.8/talk/xmpp/Makefile.am.SANITY 2011-07-26 16:23:18.237768315 -0400 -+++ libjingle-0.5.8/talk/xmpp/Makefile.am 2011-07-26 16:23:18.237768315 -0400 -@@ -0,0 +1,35 @@ -+lib_LTLIBRARIES = libjinglexmpp.la -+ -+libjinglexmpp_la_SOURCES = constants.cc \ -+ jid.cc \ -+ saslmechanism.cc \ -+ xmppclient.cc \ -+ xmppengineimpl.cc \ -+ xmppengineimpl_iq.cc \ -+ xmpplogintask.cc \ -+ xmppstanzaparser.cc \ -+ xmpptask.cc \ -+ ratelimitmanager.cc -+ -+libjinglexmpp_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmpp -+libjinglexmpp_include_HEADERS = asyncsocket.h \ -+ prexmppauth.h \ -+ saslhandler.h \ -+ xmpplogintask.h \ -+ jid.h \ -+ saslmechanism.h \ -+ xmppclient.h \ -+ constants.h \ -+ saslplainmechanism.h \ -+ xmppclientsettings.h \ -+ xmppstanzaparser.h \ -+ xmppengine.h \ -+ xmpptask.h \ -+ plainsaslhandler.h \ -+ saslcookiemechanism.h \ -+ xmppengineimpl.h \ -+ ratelimitmanager.h -+ -+libjinglexmpp_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -DPOSIX diff --git a/libjingle-0.5.8-chromium14-changes.patch b/libjingle-0.5.8-chromium14-changes.patch deleted file mode 100644 index 9754b30..0000000 --- a/libjingle-0.5.8-chromium14-changes.patch +++ /dev/null @@ -1,1204 +0,0 @@ -diff -uprN libjingle-0.5.8/talk/base/autodetectproxy.cc source/talk/base/autodetectproxy.cc ---- libjingle-0.5.8/talk/base/autodetectproxy.cc 2011-07-01 18:57:06.000000000 -0400 -+++ source/talk/base/autodetectproxy.cc 2011-07-21 05:59:06.000000000 -0400 -@@ -38,6 +38,15 @@ static const ProxyType TEST_ORDER[] = { - PROXY_HTTPS, PROXY_SOCKS5, PROXY_UNKNOWN - }; - -+static const int kSavedStringLimit = 128; -+ -+static void SaveStringToStack(char *dst, -+ const std::string &src, -+ size_t dst_size) { -+ strncpy(dst, src.c_str(), dst_size - 1); -+ dst[dst_size - 1] = '\0'; -+} -+ - AutoDetectProxy::AutoDetectProxy(const std::string& user_agent) - : agent_(user_agent), socket_(NULL), next_(0) { - } -@@ -75,7 +84,54 @@ void AutoDetectProxy::OnMessage(Message - if (MSG_TIMEOUT == msg->message_id) { - OnCloseEvent(socket_, ETIMEDOUT); - } else { -+ // This must be the ST_MSG_WORKER_DONE message that deletes the -+ // AutoDetectProxy object. We have observed crashes within this stack that -+ // seem to be highly reproducible for a small subset of users and thus are -+ // probably correlated with a specific proxy setting, so copy potentially -+ // relevant information onto the stack to make it available in Windows -+ // minidumps. -+ -+ // Save the user agent and the number of auto-detection passes that we -+ // needed. -+ char agent[kSavedStringLimit]; -+ SaveStringToStack(agent, agent_, sizeof agent); -+ -+ int next = next_; -+ -+ // Now the detected proxy config (minus the password field, which could be -+ // sensitive). -+ ProxyType type = proxy().type; -+ -+ char address_hostname[kSavedStringLimit]; -+ SaveStringToStack(address_hostname, -+ proxy().address.hostname(), -+ sizeof address_hostname); -+ -+ uint32 address_ip = proxy().address.ip(); -+ -+ uint16 address_port = proxy().address.port(); -+ -+ char autoconfig_url[kSavedStringLimit]; -+ SaveStringToStack(autoconfig_url, -+ proxy().autoconfig_url, -+ sizeof autoconfig_url); -+ -+ bool autodetect = proxy().autodetect; -+ -+ char bypass_list[kSavedStringLimit]; -+ SaveStringToStack(bypass_list, proxy().bypass_list, sizeof bypass_list); -+ -+ char username[kSavedStringLimit]; -+ SaveStringToStack(username, proxy().username, sizeof username); -+ - SignalThread::OnMessage(msg); -+ -+ // Log the gathered data at a log level that will never actually be enabled -+ // so that the compiler is forced to retain the data on the stack. -+ LOG(LS_SENSITIVE) << agent << " " << next << " " << type << " " -+ << address_hostname << " " << address_ip << " " -+ << address_port << " " << autoconfig_url << " " -+ << autodetect << " " << bypass_list << " " << username; - } - } - -diff -uprN libjingle-0.5.8/talk/base/autodetectproxy.h source/talk/base/autodetectproxy.h ---- libjingle-0.5.8/talk/base/autodetectproxy.h 2011-07-01 18:57:06.000000000 -0400 -+++ source/talk/base/autodetectproxy.h 2011-07-21 05:59:06.000000000 -0400 -@@ -30,6 +30,7 @@ - - #include <string> - -+#include "talk/base/constructormagic.h" - #include "talk/base/cryptstring.h" - #include "talk/base/proxyinfo.h" - #include "talk/base/signalthread.h" -@@ -83,6 +84,8 @@ class AutoDetectProxy : public SignalThr - ProxyInfo proxy_; - AsyncSocket* socket_; - int next_; -+ -+ DISALLOW_IMPLICIT_CONSTRUCTORS(AutoDetectProxy); - }; - - } // namespace talk_base -diff -uprN libjingle-0.5.8/talk/base/messagehandler.h source/talk/base/messagehandler.h ---- libjingle-0.5.8/talk/base/messagehandler.h 2011-07-01 18:57:06.000000000 -0400 -+++ source/talk/base/messagehandler.h 2011-07-21 05:59:06.000000000 -0400 -@@ -25,8 +25,10 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#ifndef TALK_BASE_MESSAGEHANDLER_H__ --#define TALK_BASE_MESSAGEHANDLER_H__ -+#ifndef TALK_BASE_MESSAGEHANDLER_H_ -+#define TALK_BASE_MESSAGEHANDLER_H_ -+ -+#include "talk/base/constructormagic.h" - - namespace talk_base { - -@@ -35,12 +37,18 @@ struct Message; - // Messages get dispatched to a MessageHandler - - class MessageHandler { --public: -+ public: - virtual ~MessageHandler(); - - virtual void OnMessage(Message* msg) = 0; -+ -+ protected: -+ MessageHandler() {} -+ -+ private: -+ DISALLOW_COPY_AND_ASSIGN(MessageHandler); - }; - - } // namespace talk_base - --#endif // TALK_BASE_MESSAGEHANDLER_H__ -+#endif // TALK_BASE_MESSAGEHANDLER_H_ -diff -uprN libjingle-0.5.8/talk/base/messagequeue.h source/talk/base/messagequeue.h ---- libjingle-0.5.8/talk/base/messagequeue.h 2011-07-01 18:57:06.000000000 -0400 -+++ source/talk/base/messagequeue.h 2011-07-21 05:59:06.000000000 -0400 -@@ -35,6 +35,7 @@ - #include <vector> - - #include "talk/base/basictypes.h" -+#include "talk/base/constructormagic.h" - #include "talk/base/criticalsection.h" - #include "talk/base/messagehandler.h" - #include "talk/base/scoped_ptr.h" -@@ -238,6 +239,9 @@ class MessageQueue { - PriorityQueue dmsgq_; - uint32 dmsgq_next_num_; - CriticalSection crit_; -+ -+ private: -+ DISALLOW_COPY_AND_ASSIGN(MessageQueue); - }; - - } // namespace talk_base -diff -uprN libjingle-0.5.8/talk/base/network.cc source/talk/base/network.cc ---- libjingle-0.5.8/talk/base/network.cc 2011-07-01 18:57:06.000000000 -0400 -+++ source/talk/base/network.cc 2011-07-21 05:59:06.000000000 -0400 -@@ -30,7 +30,6 @@ - #endif - - #include "talk/base/network.h" --#include "talk/base/stream.h" - - #ifdef POSIX - #include <sys/socket.h> -@@ -47,193 +46,135 @@ - #endif - - #include <algorithm> --#include <cassert> --#include <cfloat> --#include <cmath> - #include <cstdio> --#include <cstring> --#include <sstream> - - #include "talk/base/host.h" - #include "talk/base/logging.h" - #include "talk/base/scoped_ptr.h" - #include "talk/base/socket.h" // includes something that makes windows happy --#include "talk/base/stringencode.h" --#include "talk/base/time.h" -+#include "talk/base/stream.h" -+#include "talk/base/thread.h" - --namespace { -+namespace talk_base { - --const double kAlpha = 0.5; // weight for data infinitely far in the past --const double kHalfLife = 2000; // half life of exponential decay (in ms) --const double kLog2 = 0.693147180559945309417; --const double kLambda = kLog2 / kHalfLife; -+namespace { - --// assume so-so quality unless data says otherwise --const double kDefaultQuality = talk_base::QUALITY_FAIR; -+const uint32 kUpdateNetworksMessage = 1; - --typedef std::map<std::string, std::string> StrMap; -+// Fetch list of networks every two seconds. -+const int kNetworksUpdateIntervalMs = 2000; - --void BuildMap(const StrMap& map, std::string& str) { -- str.append("{"); -- bool first = true; -- for (StrMap::const_iterator i = map.begin(); i != map.end(); ++i) { -- if (!first) str.append(","); -- str.append(i->first); -- str.append("="); -- str.append(i->second); -- first = false; -- } -- str.append("}"); --} -+#ifdef POSIX -+// Gets the default gateway for the specified interface. -+uint32 GetDefaultGateway(const std::string& name) { -+#ifdef OSX -+ // TODO: /proc/net/route doesn't exist, -+ // Use ioctl to get the routing table -+ return 0xFFFFFFFF; -+#endif - --void ParseCheck(std::istringstream& ist, char ch) { -- if (ist.get() != ch) -- LOG(LERROR) << "Expecting '" << ch << "'"; --} -+ uint32 gateway_ip = 0; - --std::string ParseString(std::istringstream& ist) { -- std::string str; -- int count = 0; -- while (ist) { -- char ch = ist.peek(); -- if ((count == 0) && ((ch == '=') || (ch == ',') || (ch == '}'))) { -- break; -- } else if (ch == '{') { -- count += 1; -- } else if (ch == '}') { -- count -= 1; -- if (count < 0) -- LOG(LERROR) << "mismatched '{' and '}'"; -+ talk_base::FileStream fs; -+ if (fs.Open("/proc/net/route", "r", NULL)) { -+ std::string line; -+ while (fs.ReadLine(&line) == talk_base::SR_SUCCESS && gateway_ip == 0) { -+ char iface[16]; -+ unsigned int ip, gw; -+ if (sscanf(line.c_str(), "%7s %8X %8X", iface, &ip, &gw) == 3 && -+ name == iface && ip == 0) { -+ gateway_ip = ntohl(gw); -+ } - } -- str.append(1, static_cast<char>(ist.get())); - } -- return str; -+ -+ return gateway_ip; - } -+#endif // POSIX - --void ParseMap(const std::string& str, StrMap& map) { -- if (str.size() == 0) -- return; -- std::istringstream ist(str); -- ParseCheck(ist, '{'); -- for (;;) { -- std::string key = ParseString(ist); -- ParseCheck(ist, '='); -- std::string val = ParseString(ist); -- map[key] = val; -- if (ist.peek() == ',') -- ist.get(); -- else -- break; -- } -- ParseCheck(ist, '}'); -- if (ist.rdbuf()->in_avail() != 0) -- LOG(LERROR) << "Unexpected characters at end"; -+bool CompareNetworks(const Network* a, const Network* b) { -+ return a->name() < b->name(); - } - - } // namespace - --namespace talk_base { -+NetworkManager::NetworkManager() { -+} - - NetworkManager::~NetworkManager() { -- for (NetworkMap::iterator i = networks_.begin(); i != networks_.end(); ++i) -- delete i->second; - } - --bool NetworkManager::GetNetworks(std::vector<Network*>* result) { -- std::vector<Network*> list; -- if (!EnumNetworks(false, &list)) { -- return false; -+NetworkManagerBase::NetworkManagerBase() { -+} -+ -+NetworkManagerBase::~NetworkManagerBase() { -+ for (NetworkMap::iterator i = networks_map_.begin(); -+ i != networks_map_.end(); ++i) { -+ delete i->second; - } -+} -+ -+void NetworkManagerBase::GetNetworks(NetworkList* result) const { -+ *result = networks_; -+} -+ -+void NetworkManagerBase::MergeNetworkList(const NetworkList& new_networks, -+ bool force_notification) { -+ // Sort the list so that we can detect when it changes. -+ NetworkList list(new_networks); -+ std::sort(list.begin(), list.end(), CompareNetworks); -+ -+ bool changed = false; -+ -+ if (networks_.size() != list.size()) -+ changed = true; -+ -+ networks_.resize(list.size()); - - for (uint32 i = 0; i < list.size(); ++i) { -- NetworkMap::iterator iter = networks_.find(list[i]->name()); -+ NetworkMap::iterator iter = networks_map_.find(list[i]->name()); - - Network* network; -- if (iter == networks_.end()) { -+ if (iter == networks_map_.end()) { -+ // That's a new network, add it to the map. - network = list[i]; -+ networks_map_[network->name()] = network; - } else { - network = iter->second; -- network->set_ip(list[i]->ip()); -- network->set_gateway_ip(list[i]->gateway_ip()); -+ if (network->ip() != list[i]->ip()) { -+ changed = true; -+ network->set_ip(list[i]->ip()); -+ } -+ -+ if (network->gateway_ip() != list[i]->gateway_ip()) { -+ changed = true; -+ network->set_gateway_ip(list[i]->gateway_ip()); -+ } -+ - delete list[i]; - } - -- networks_[network->name()] = network; -- result->push_back(network); -- } -- return true; --} -+ if (!changed && networks_[i]->name() != network->name()) -+ changed = true; - --void NetworkManager::DumpNetworks(bool include_ignored) { -- std::vector<Network*> list; -- EnumNetworks(include_ignored, &list); -- LOG(LS_INFO) << "NetworkManager detected " << list.size() << " networks:"; -- for (size_t i = 0; i < list.size(); ++i) { -- const Network* network = list[i]; -- if (!network->ignored() || include_ignored) { -- LOG(LS_INFO) << network->ToString() << ": " << network->description() -- << ", Gateway=" -- << SocketAddress::IPToString(network->gateway_ip()) -- << ((network->ignored()) ? ", Ignored" : ""); -- } -+ networks_[i] = network; - } --} - --std::string NetworkManager::GetState() const { -- StrMap map; -- for (NetworkMap::const_iterator i = networks_.begin(); -- i != networks_.end(); ++i) -- map[i->first] = i->second->GetState(); -- -- std::string str; -- BuildMap(map, str); -- return str; --} -- --void NetworkManager::SetState(const std::string& str) { -- StrMap map; -- ParseMap(str, map); -- -- for (StrMap::iterator i = map.begin(); i != map.end(); ++i) { -- std::string name = i->first; -- std::string state = i->second; -- -- Network* network = new Network(name, "", 0, 0); -- network->SetState(state); -- networks_[name] = network; -- } -+ if (changed || force_notification) -+ SignalNetworksChanged(); - } - --#ifdef POSIX --// Gets the default gateway for the specified interface. --uint32 GetDefaultGateway(const std::string& name) { --#ifdef OSX -- // TODO: /proc/net/route doesn't exist, -- // Use ioctl to get the routing table -- return 0xFFFFFFFF; --#endif -- -- uint32 gateway_ip = 0; -- -- FileStream fs; -- if (fs.Open("/proc/net/route", "r", NULL)) { -- std::string line; -- while (fs.ReadLine(&line) == SR_SUCCESS && gateway_ip == 0) { -- char iface[16]; -- unsigned int ip, gw; -- if (sscanf(line.c_str(), "%7s %8X %8X", iface, &ip, &gw) == 3 && -- name == iface && ip == 0) { -- gateway_ip = ntohl(gw); -- } -- } -- } -- -- return gateway_ip; -+BasicNetworkManager::BasicNetworkManager() -+ : thread_(NULL), -+ started_(false) { - } - -+BasicNetworkManager::~BasicNetworkManager() { -+} - --bool NetworkManager::CreateNetworks(bool include_ignored, -- std::vector<Network*>* networks) { -+#ifdef POSIX -+bool BasicNetworkManager::CreateNetworks(bool include_ignored, -+ NetworkList* networks) { - int fd; - if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - LOG_ERR(LERROR) << "socket"; -@@ -248,7 +189,7 @@ bool NetworkManager::CreateNetworks(bool - LOG_ERR(LERROR) << "ioctl"; - return false; - } -- assert(ifc.ifc_len < static_cast<int>(64 * sizeof(struct ifreq))); -+ ASSERT(ifc.ifc_len < static_cast<int>(64 * sizeof(struct ifreq))); - - struct ifreq* ptr = reinterpret_cast<struct ifreq*>(ifc.ifc_buf); - struct ifreq* end = -@@ -283,8 +224,8 @@ bool NetworkManager::CreateNetworks(bool - #endif // POSIX - - #ifdef WIN32 --bool NetworkManager::CreateNetworks(bool include_ignored, -- std::vector<Network*>* networks) { -+bool BasicNetworkManager::CreateNetworks(bool include_ignored, -+ NetworkList* networks) { - IP_ADAPTER_INFO info_temp; - ULONG len = 0; - -@@ -332,7 +273,7 @@ bool NetworkManager::CreateNetworks(bool - } - #endif // WIN32 - --bool NetworkManager::IsIgnoredNetwork(const Network& network) { -+bool BasicNetworkManager::IsIgnoredNetwork(const Network& network) { - #ifdef POSIX - // Ignore local networks (lo, lo0, etc) - // Also filter out VMware interfaces, typically named vmnet1 and vmnet8 -@@ -354,57 +295,65 @@ bool NetworkManager::IsIgnoredNetwork(co - return (network.ip() < 0x01000000); - } - --bool NetworkManager::EnumNetworks(bool include_ignored, -- std::vector<Network*>* result) { -- return CreateNetworks(include_ignored, result); --} -- -- --Network::Network(const std::string& name, const std::string& desc, -- uint32 ip, uint32 gateway_ip) -- : name_(name), description_(desc), ip_(ip), gateway_ip_(gateway_ip), -- ignored_(false), uniform_numerator_(0), uniform_denominator_(0), -- exponential_numerator_(0), exponential_denominator_(0), -- quality_(kDefaultQuality) { -- last_data_time_ = Time(); -+void BasicNetworkManager::StartUpdating() { -+ if (started_) { -+ sent_first_update_ = false; -+ return; -+ } - -- // TODO: seed the historical data with one data point based -- // on the link speed metric from XP (4.0 if < 50, 3.0 otherwise). -+ thread_ = Thread::Current(); -+ started_ = true; -+ sent_first_update_ = false; -+ thread_->Post(this, kUpdateNetworksMessage); - } - --void Network::StartSession(NetworkSession* session) { -- assert(std::find(sessions_.begin(), sessions_.end(), session) == -- sessions_.end()); -- sessions_.push_back(session); -+void BasicNetworkManager::StopUpdating() { -+ ASSERT(Thread::Current() == thread_); -+ started_ = false; - } - --void Network::StopSession(NetworkSession* session) { -- SessionList::iterator iter = -- std::find(sessions_.begin(), sessions_.end(), session); -- if (iter != sessions_.end()) -- sessions_.erase(iter); -+void BasicNetworkManager::OnMessage(Message* msg) { -+ ASSERT(msg->message_id == kUpdateNetworksMessage); -+ DoUpdateNetworks(); - } - --void Network::EstimateQuality() { -- uint32 now = Time(); -+void BasicNetworkManager::DoUpdateNetworks() { -+ if (!started_) -+ return; -+ -+ ASSERT(Thread::Current() == thread_); - -- // Add new data points for the current time. -- for (uint32 i = 0; i < sessions_.size(); ++i) { -- if (sessions_[i]->HasQuality()) -- AddDataPoint(now, sessions_[i]->GetCurrentQuality()); -+ NetworkList list; -+ if (!CreateNetworks(false, &list)) { -+ SignalError(); -+ } else { -+ MergeNetworkList(list, !sent_first_update_); -+ sent_first_update_ = true; - } - -- // Construct the weighted average using both uniform and exponential weights. -+ thread_->PostDelayed(kNetworksUpdateIntervalMs, this, kUpdateNetworksMessage); -+} - -- double exp_shift = exp(-kLambda * (now - last_data_time_)); -- double numerator = uniform_numerator_ + exp_shift * exponential_numerator_; -- double denominator = uniform_denominator_ + exp_shift * -- exponential_denominator_; -+void BasicNetworkManager::DumpNetworks(bool include_ignored) { -+ NetworkList list; -+ CreateNetworks(include_ignored, &list); -+ LOG(LS_INFO) << "NetworkManager detected " << list.size() << " networks:"; -+ for (size_t i = 0; i < list.size(); ++i) { -+ const Network* network = list[i]; -+ if (!network->ignored() || include_ignored) { -+ LOG(LS_INFO) << network->ToString() << ": " << network->description() -+ << ", Gateway=" -+ << SocketAddress::IPToString(network->gateway_ip()) -+ << ((network->ignored()) ? ", Ignored" : ""); -+ } -+ } -+} - -- if (denominator < DBL_EPSILON) -- quality_ = kDefaultQuality; -- else -- quality_ = numerator / denominator; -+Network::Network(const std::string& name, const std::string& desc, -+ uint32 ip, uint32 gateway_ip) -+ : name_(name), description_(desc), ip_(ip), gateway_ip_(gateway_ip), -+ ignored_(false), uniform_numerator_(0), uniform_denominator_(0), -+ exponential_numerator_(0), exponential_denominator_(0) { - } - - std::string Network::ToString() const { -@@ -416,41 +365,4 @@ std::string Network::ToString() const { - return ss.str(); - } - --void Network::AddDataPoint(uint32 time, double quality) { -- uniform_numerator_ += kAlpha * quality; -- uniform_denominator_ += kAlpha; -- -- double exp_shift = exp(-kLambda * (time - last_data_time_)); -- exponential_numerator_ = (1 - kAlpha) * quality + exp_shift * -- exponential_numerator_; -- exponential_denominator_ = (1 - kAlpha) + exp_shift * -- exponential_denominator_; -- -- last_data_time_ = time; --} -- --std::string Network::GetState() const { -- StrMap map; -- map["lt"] = talk_base::ToString<uint32>(last_data_time_); -- map["un"] = talk_base::ToString<double>(uniform_numerator_); -- map["ud"] = talk_base::ToString<double>(uniform_denominator_); -- map["en"] = talk_base::ToString<double>(exponential_numerator_); -- map["ed"] = talk_base::ToString<double>(exponential_denominator_); -- -- std::string str; -- BuildMap(map, str); -- return str; --} -- --void Network::SetState(const std::string& str) { -- StrMap map; -- ParseMap(str, map); -- -- last_data_time_ = FromString<uint32>(map["lt"]); -- uniform_numerator_ = FromString<double>(map["un"]); -- uniform_denominator_ = FromString<double>(map["ud"]); -- exponential_numerator_ = FromString<double>(map["en"]); -- exponential_denominator_ = FromString<double>(map["ed"]); --} -- - } // namespace talk_base -diff -uprN libjingle-0.5.8/talk/base/network.h source/talk/base/network.h ---- libjingle-0.5.8/talk/base/network.h 2011-07-01 18:57:06.000000000 -0400 -+++ source/talk/base/network.h 2011-07-21 05:59:06.000000000 -0400 -@@ -34,50 +34,105 @@ - #include <vector> - - #include "talk/base/basictypes.h" -+#include "talk/base/messagehandler.h" -+#include "talk/base/sigslot.h" - - namespace talk_base { - - class Network; - class NetworkSession; -+class Thread; - --// Keeps track of the available network interfaces over time so that quality --// information can be aggregated and recorded. -+// Generic network manager interface. It provides list of local -+// networks. - class NetworkManager { - public: -+ typedef std::vector<Network*> NetworkList; -+ -+ NetworkManager(); - virtual ~NetworkManager(); - -- // Updates and returns the current list of networks available on this machine. -- // This version will make sure that repeated calls return the same object for -- // a given network, so that quality is tracked appropriately. -- // Does not include ignored networks. -- bool GetNetworks(std::vector<Network*>* networks); -+ // Called when network list is updated. -+ sigslot::signal0<> SignalNetworksChanged; -+ -+ // Indicates a failure when getting list of network interfaces. -+ sigslot::signal0<> SignalError; -+ -+ // Start/Stop monitoring of network interfaces -+ // list. SignalNetworksChanged or SignalError is emitted immidiately -+ // after StartUpdating() is called. After that SignalNetworksChanged -+ // is emitted wheneven list of networks changes. -+ virtual void StartUpdating() = 0; -+ virtual void StopUpdating() = 0; -+ -+ // Returns the current list of networks available on this machine. -+ // UpdateNetworks() must be called before this method is called. -+ // It makes sure that repeated calls return the same object for a -+ // given network, so that quality is tracked appropriately. Does not -+ // include ignored networks. -+ virtual void GetNetworks(NetworkList* networks) const = 0; -+}; -+ -+// Base class for NetworkManager implementations. -+class NetworkManagerBase : public NetworkManager { -+ public: -+ NetworkManagerBase(); -+ virtual ~NetworkManagerBase(); -+ -+ virtual void GetNetworks(std::vector<Network*>* networks) const; -+ -+ protected: -+ // Updates |networks_| with the networks listed in |list|. If -+ // |network_map_| already has a Network object for a network listed -+ // in the |list| then it is reused. Accept ownership of the Network -+ // objects in the |list|. SignalNetworkListUpdated is emitted if -+ // there is a change in network configuration or -+ // |force_notification| is set to true. -+ void MergeNetworkList(const NetworkList& list, bool force_notification); -+ -+ private: -+ typedef std::map<std::string, Network*> NetworkMap; -+ -+ void DoUpdateNetworks(); -+ -+ NetworkList networks_; -+ NetworkMap networks_map_; -+}; -+ -+// Basic implementation of the NetworkManager interface that gets list -+// of networks using OS APIs. -+class BasicNetworkManager : public NetworkManagerBase, -+ public MessageHandler { -+ public: -+ BasicNetworkManager(); -+ virtual ~BasicNetworkManager(); -+ -+ virtual void StartUpdating(); -+ virtual void StopUpdating(); - - // Logs the available networks. -- void DumpNetworks(bool include_ignored); -+ static void DumpNetworks(bool include_ignored); - -- // Reads and writes the state of the quality database in a string format. -- std::string GetState() const; -- void SetState(const std::string& str); -+ // MessageHandler interface. -+ virtual void OnMessage(Message* msg); - -+ protected: - // Creates a network object for each network available on the machine. -- static bool CreateNetworks(bool include_ignored, -- std::vector<Network*>* networks); -+ static bool CreateNetworks(bool include_ignored, NetworkList* networks); - // Determines if a network should be ignored. - static bool IsIgnoredNetwork(const Network& network); - -- protected: -- // Fills the supplied list with all usable networks. Overrideable. -- virtual bool EnumNetworks(bool include_ignored, -- std::vector<Network*>* networks); -- - private: -- typedef std::map<std::string, Network*> NetworkMap; -+ friend class NetworkTest; - -- NetworkMap networks_; -+ void DoUpdateNetworks(); -+ -+ Thread* thread_; -+ bool started_; -+ bool sent_first_update_; - }; - - // Represents a Unix-type network interface, with a name and single address. --// It also includes the ability to track and estimate quality. - class Network { - public: - Network(const std::string& name, const std::string& description, -@@ -104,18 +159,6 @@ class Network { - bool ignored() const { return ignored_; } - void set_ignored(bool ignored) { ignored_ = ignored; } - -- // Updates the list of sessions that are ongoing. -- void StartSession(NetworkSession* session); -- void StopSession(NetworkSession* session); -- -- // Re-computes the estimate of near-future quality based on the information -- // as of this exact moment. -- void EstimateQuality(); -- -- // Returns the current estimate of the near-future quality of connections -- // that use this local interface. -- double quality() { return quality_; } -- - // Debugging description of this network - std::string ToString() const; - -@@ -132,39 +175,10 @@ class Network { - double uniform_denominator_; - double exponential_numerator_; - double exponential_denominator_; -- uint32 last_data_time_; -- double quality_; -- -- // Updates the statistics maintained to include the given estimate. -- void AddDataPoint(uint32 time, double quality); -- -- // Converts the internal state to and from a string. This is used to record -- // quality information into a permanent store. -- void SetState(const std::string& str); -- std::string GetState() const; - - friend class NetworkManager; - }; - --// Represents a session that is in progress using a particular network and can --// provide data about the quality of the network at any given moment. --class NetworkSession { -- public: -- virtual ~NetworkSession() { } -- -- // Determines whether this session has an estimate at this moment. We will -- // only call GetCurrentQuality when this returns true. -- virtual bool HasQuality() = 0; -- -- // Returns an estimate of the quality at this exact moment. The result should -- // be a MOS (mean opinion score) value. -- virtual float GetCurrentQuality() = 0; --}; -- --const double QUALITY_BAD = 3.0; --const double QUALITY_FAIR = 3.35; --const double QUALITY_GOOD = 3.7; -- - } // namespace talk_base - - #endif // TALK_BASE_NETWORK_H_ -diff -uprN libjingle-0.5.8/talk/base/signalthread.h source/talk/base/signalthread.h ---- libjingle-0.5.8/talk/base/signalthread.h 2011-07-01 18:57:06.000000000 -0400 -+++ source/talk/base/signalthread.h 2011-07-21 05:59:06.000000000 -0400 -@@ -30,6 +30,7 @@ - - #include <string> - -+#include "talk/base/constructormagic.h" - #include "talk/base/thread.h" - #include "talk/base/sigslot.h" - -@@ -117,16 +118,17 @@ class SignalThread : public sigslot::has - kStopping, // Work is being interrupted - }; - -- friend class Worker; - class Worker : public Thread { - public: - explicit Worker(SignalThread* parent) : parent_(parent) {} - virtual void Run() { parent_->Run(); } -+ - private: - SignalThread* parent_; -+ -+ DISALLOW_IMPLICIT_CONSTRUCTORS(Worker); - }; - -- friend class EnterExit; - class EnterExit { - public: - explicit EnterExit(SignalThread* t) : t_(t) { -@@ -142,8 +144,11 @@ class SignalThread : public sigslot::has - if (d) - delete t_; - } -+ - private: - SignalThread* t_; -+ -+ DISALLOW_IMPLICIT_CONSTRUCTORS(EnterExit); - }; - - void Run(); -@@ -154,6 +159,8 @@ class SignalThread : public sigslot::has - CriticalSection cs_; - State state_; - int refcount_; -+ -+ DISALLOW_COPY_AND_ASSIGN(SignalThread); - }; - - /////////////////////////////////////////////////////////////////////////////// -diff -uprN libjingle-0.5.8/talk/base/stringencode.cc source/talk/base/stringencode.cc ---- libjingle-0.5.8/talk/base/stringencode.cc 2011-07-01 18:57:06.000000000 -0400 -+++ source/talk/base/stringencode.cc 2011-07-21 05:59:06.000000000 -0400 -@@ -530,6 +530,44 @@ size_t tokenize(const std::string& sourc - return fields->size(); - } - -+size_t tokenize_append(const std::string& source, char delimiter, -+ std::vector<std::string>* fields) { -+ if (!fields) return 0; -+ -+ std::vector<std::string> new_fields; -+ tokenize(source, delimiter, &new_fields); -+ fields->insert(fields->end(), new_fields.begin(), new_fields.end()); -+ return fields->size(); -+} -+ -+size_t tokenize(const std::string& source, char delimiter, char start_mark, -+ char end_mark, std::vector<std::string>* fields) { -+ if (!fields) return 0; -+ fields->clear(); -+ -+ std::string remain_source = source; -+ while (!remain_source.empty()) { -+ size_t start_pos = remain_source.find(start_mark); -+ if (std::string::npos == start_pos) break; -+ std::string pre_mark; -+ if (start_pos > 0) { -+ pre_mark = remain_source.substr(0, start_pos - 1); -+ } -+ -+ ++start_pos; -+ size_t end_pos = remain_source.find(end_mark, start_pos); -+ if (std::string::npos == end_pos) break; -+ -+ // We have found the matching marks. First tokenize the pre-mask. Then add -+ // the marked part as a single field. Finally, loop back for the post-mark. -+ tokenize_append(pre_mark, delimiter, fields); -+ fields->push_back(remain_source.substr(start_pos, end_pos - start_pos)); -+ remain_source = remain_source.substr(end_pos + 1); -+ } -+ -+ return tokenize_append(remain_source, delimiter, fields); -+} -+ - size_t split(const std::string& source, char delimiter, - std::vector<std::string>* fields) { - ASSERT(NULL != fields); -diff -uprN libjingle-0.5.8/talk/base/stringencode.h source/talk/base/stringencode.h ---- libjingle-0.5.8/talk/base/stringencode.h 2011-07-01 18:57:06.000000000 -0400 -+++ source/talk/base/stringencode.h 2011-07-21 05:59:06.000000000 -0400 -@@ -135,6 +135,20 @@ size_t split(const std::string& source, - size_t tokenize(const std::string& source, char delimiter, - std::vector<std::string>* fields); - -+// Tokenize and append the tokens to fields. Return the new size of fields. -+size_t tokenize_append(const std::string& source, char delimiter, -+ std::vector<std::string>* fields); -+ -+// Splits the source string into multiple fields separated by delimiter, with -+// duplicates of delimiter ignored. Trailing delimiter ignored. A substring in -+// between the start_mark and the end_mark is treated as a single field. Return -+// the size of fields. For example, if source is "filename -+// \"/Library/Application Support/media content.txt\"", delimiter is ' ', and -+// the start_mark and end_mark are '"', this method returns two fields: -+// "filename" and "/Library/Application Support/media content.txt". -+size_t tokenize(const std::string& source, char delimiter, char start_mark, -+ char end_mark, std::vector<std::string>* fields); -+ - // Safe sprintf to std::string - //void sprintf(std::string& value, size_t maxlen, const char * format, ...) - // PRINTF_FORMAT(3); -diff -uprN libjingle-0.5.8/talk/base/thread.h source/talk/base/thread.h ---- libjingle-0.5.8/talk/base/thread.h 2011-07-01 18:57:06.000000000 -0400 -+++ source/talk/base/thread.h 2011-07-21 05:59:06.000000000 -0400 -@@ -37,6 +37,7 @@ - #include <pthread.h> - #endif - -+#include "talk/base/constructormagic.h" - #include "talk/base/messagequeue.h" - - #ifdef WIN32 -@@ -87,6 +88,8 @@ class ThreadManager { - #ifdef WIN32 - static DWORD key_; - #endif -+ -+ DISALLOW_COPY_AND_ASSIGN(ThreadManager); - }; - - class Thread; -@@ -109,6 +112,12 @@ class Runnable { - public: - virtual ~Runnable() {} - virtual void Run(Thread* thread) = 0; -+ -+ protected: -+ Runnable() {} -+ -+ private: -+ DISALLOW_COPY_AND_ASSIGN(Runnable); - }; - - class Thread : public MessageQueue { -@@ -208,6 +217,8 @@ class Thread : public MessageQueue { - bool owned_; - - friend class ThreadManager; -+ -+ DISALLOW_COPY_AND_ASSIGN(Thread); - }; - - // AutoThread automatically installs itself at construction -@@ -215,16 +226,25 @@ class Thread : public MessageQueue { - // _not already_ associated with the current OS thread. - - class AutoThread : public Thread { --public: -+ public: - AutoThread(SocketServer* ss = 0); - virtual ~AutoThread(); -+ -+ private: -+ DISALLOW_COPY_AND_ASSIGN(AutoThread); - }; - - // Win32 extension for threads that need to use COM - #ifdef WIN32 - class ComThread : public Thread { -+ public: -+ ComThread() {} -+ - protected: - virtual void Run(); -+ -+ private: -+ DISALLOW_COPY_AND_ASSIGN(ComThread); - }; - #endif - -@@ -238,8 +258,11 @@ class SocketServerScope { - ~SocketServerScope() { - Thread::Current()->set_socketserver(old_ss_); - } -+ - private: - SocketServer* old_ss_; -+ -+ DISALLOW_IMPLICIT_CONSTRUCTORS(SocketServerScope); - }; - - } // namespace talk_base -diff -uprN libjingle-0.5.8/talk/examples/call/callclient.cc source/talk/examples/call/callclient.cc ---- libjingle-0.5.8/talk/examples/call/callclient.cc 2011-07-01 18:57:07.000000000 -0400 -+++ source/talk/examples/call/callclient.cc 2011-07-21 05:59:07.000000000 -0400 -@@ -329,7 +329,7 @@ void CallClient::InitMedia() { - // TODO: It looks like we are leaking many objects. E.g. - // |network_manager_| is never deleted. - -- network_manager_ = new talk_base::NetworkManager(); -+ network_manager_ = new talk_base::BasicNetworkManager(); - - // TODO: Decide if the relay address should be specified here. - talk_base::SocketAddress stun_addr("stun.l.google.com", 19302); -diff -uprN libjingle-0.5.8/talk/examples/call/callclient.h source/talk/examples/call/callclient.h ---- libjingle-0.5.8/talk/examples/call/callclient.h 2011-07-01 18:57:07.000000000 -0400 -+++ source/talk/examples/call/callclient.h 2011-07-21 05:59:07.000000000 -0400 -@@ -66,11 +66,11 @@ namespace cricket { - class PortAllocator; - class MediaEngine; - class MediaSessionClient; --class NamedSource; - class Receiver; - class Call; --struct CallOptions; - class SessionManagerTask; -+struct CallOptions; -+struct NamedSource; - } - - struct RosterItem { -diff -uprN libjingle-0.5.8/talk/examples/call/call_main.cc source/talk/examples/call/call_main.cc ---- libjingle-0.5.8/talk/examples/call/call_main.cc 2011-07-01 18:57:07.000000000 -0400 -+++ source/talk/examples/call/call_main.cc 2011-07-21 05:59:07.000000000 -0400 -@@ -46,6 +46,7 @@ - #include "talk/examples/login/xmpppump.h" - #include "talk/examples/call/callclient.h" - #include "talk/examples/call/console.h" -+#include "talk/session/phone/fakemediaengine.h" - #include "talk/session/phone/filemediaengine.h" - #include "talk/session/phone/mediasessionclient.h" - #include "talk/session/phone/srtpfilter.h" -@@ -216,6 +217,7 @@ cricket::MediaEngine* CreateFileMediaEng - return file_media_engine; - } - -+ - // TODO: Move this into Console. - void Print(const char* chars) { - printf("%s", chars); -@@ -247,6 +249,7 @@ int main(int argc, char **argv) { - DEFINE_string(voiceinput, NULL, "RTP dump file for voice input."); - DEFINE_string(voiceoutput, NULL, "RTP dump file for voice output."); - DEFINE_string(videoinput, NULL, "RTP dump file for video input."); -+ DEFINE_string(yuvvideoinput, NULL, "YUV file for video input."); - DEFINE_string(videooutput, NULL, "RTP dump file for video output."); - DEFINE_bool(debugsrtp, false, "Enable debugging for srtp."); - DEFINE_bool(help, false, "Prints this message"); -@@ -389,7 +392,6 @@ int main(int argc, char **argv) { - // The engine will be released by the client later. - client->SetMediaEngine(engine); - } -- - Console *console = new Console(main_thread, client); - client->SetConsole(console); - client->SetAutoAccept(auto_accept); -diff -uprN libjingle-0.5.8/talk/p2p/client/basicportallocator.cc source/talk/p2p/client/basicportallocator.cc ---- libjingle-0.5.8/talk/p2p/client/basicportallocator.cc 2011-07-01 18:57:07.000000000 -0400 -+++ source/talk/p2p/client/basicportallocator.cc 2011-07-21 05:59:04.000000000 -0400 -@@ -232,7 +232,11 @@ BasicPortAllocatorSession::BasicPortAllo - : PortAllocatorSession(allocator->flags()), allocator_(allocator), - name_(name), session_type_(session_type), network_thread_(NULL), - socket_factory_(allocator->socket_factory()), allocation_started_(false), -+ network_manager_started_(false), - running_(false) { -+ allocator_->network_manager()->SignalNetworksChanged.connect( -+ this, &BasicPortAllocatorSession::OnNetworksChanged); -+ allocator_->network_manager()->StartUpdating(); - } - - BasicPortAllocatorSession::~BasicPortAllocatorSession() { -@@ -347,14 +351,21 @@ void BasicPortAllocatorSession::Allocate - network_thread_->Post(this, MSG_ALLOCATE); - } - -+void BasicPortAllocatorSession::OnAllocate() { -+ if (network_manager_started_) -+ DoAllocate(); -+ -+ allocation_started_ = true; -+ if (running_) -+ network_thread_->PostDelayed(ALLOCATE_DELAY, this, MSG_ALLOCATE); -+} -+ - // For each network, see if we have a sequence that covers it already. If not, - // create a new sequence to create the appropriate ports. --void BasicPortAllocatorSession::OnAllocate() { -+void BasicPortAllocatorSession::DoAllocate() { - std::vector<talk_base::Network*> networks; -- -- if (!allocator_->network_manager()->GetNetworks(&networks)) { -- LOG(LS_ERROR) << "Failed to enumerate networks"; -- } else if (networks.empty()) { -+ allocator_->network_manager()->GetNetworks(&networks); -+ if (networks.empty()) { - LOG(LS_WARNING) << "Machine has no networks; no ports will be allocated"; - } else { - for (uint32 i = 0; i < networks.size(); ++i) { -@@ -374,8 +385,8 @@ void BasicPortAllocatorSession::OnAlloca - sequence_flags |= PORTALLOCATOR_DISABLE_RELAY; - } - -- // Disable phases that would only create ports equivalent to ones that we -- // have already made. -+ // Disable phases that would only create ports equivalent to -+ // ones that we have already made. - DisableEquivalentPhases(networks[i], config, &sequence_flags); - - if ((sequence_flags & DISABLE_ALL_PHASES) == DISABLE_ALL_PHASES) { -@@ -391,10 +402,12 @@ void BasicPortAllocatorSession::OnAlloca - sequences_.push_back(sequence); - } - } -+} - -- allocation_started_ = true; -- if (running_) -- network_thread_->PostDelayed(ALLOCATE_DELAY, this, MSG_ALLOCATE); -+void BasicPortAllocatorSession::OnNetworksChanged() { -+ network_manager_started_ = true; -+ if (allocation_started_) -+ DoAllocate(); - } - - void BasicPortAllocatorSession::DisableEquivalentPhases( -diff -uprN libjingle-0.5.8/talk/p2p/client/basicportallocator.h source/talk/p2p/client/basicportallocator.h ---- libjingle-0.5.8/talk/p2p/client/basicportallocator.h 2011-07-01 18:57:07.000000000 -0400 -+++ source/talk/p2p/client/basicportallocator.h 2011-07-21 05:59:04.000000000 -0400 -@@ -140,6 +140,8 @@ class BasicPortAllocatorSession : public - void OnConfigTimeout(); - void AllocatePorts(); - void OnAllocate(); -+ void DoAllocate(); -+ void OnNetworksChanged(); - void DisableEquivalentPhases(talk_base::Network* network, - PortConfiguration* config, uint32* flags); - void AddAllocatedPort(Port* port, AllocationSequence* seq, float pref, -@@ -159,6 +161,7 @@ class BasicPortAllocatorSession : public - talk_base::PacketSocketFactory* socket_factory_; - bool configuration_done_; - bool allocation_started_; -+ bool network_manager_started_; - bool running_; // set when StartGetAllPorts is called - std::vector<PortConfiguration*> configs_; - std::vector<AllocationSequence*> sequences_; -diff -uprN libjingle-0.5.8/talk/p2p/client/socketmonitor.cc source/talk/p2p/client/socketmonitor.cc ---- libjingle-0.5.8/talk/p2p/client/socketmonitor.cc 2011-07-01 18:57:07.000000000 -0400 -+++ source/talk/p2p/client/socketmonitor.cc 2011-07-21 05:59:04.000000000 -0400 -@@ -138,7 +138,6 @@ void SocketMonitor::PollSocket(bool poll - info.recv_bytes_second = connection->recv_bytes_second(); - info.local_candidate = connection->local_candidate(); - info.remote_candidate = connection->remote_candidate(); -- info.est_quality = connection->port()->network()->quality(); - info.key = connection; - connection_infos_.push_back(info); - } -diff -uprN libjingle-0.5.8/talk/p2p/client/socketmonitor.h source/talk/p2p/client/socketmonitor.h ---- libjingle-0.5.8/talk/p2p/client/socketmonitor.h 2011-07-01 18:57:07.000000000 -0400 -+++ source/talk/p2p/client/socketmonitor.h 2011-07-21 05:59:04.000000000 -0400 -@@ -51,7 +51,6 @@ struct ConnectionInfo { - size_t recv_bytes_second; - Candidate local_candidate; - Candidate remote_candidate; -- double est_quality; - void *key; - }; - -diff -uprN libjingle-0.5.8/talk/session/phone/currentspeakermonitor.h source/talk/session/phone/currentspeakermonitor.h ---- libjingle-0.5.8/talk/session/phone/currentspeakermonitor.h 2011-07-01 18:57:07.000000000 -0400 -+++ source/talk/session/phone/currentspeakermonitor.h 2011-07-21 05:59:05.000000000 -0400 -@@ -38,11 +38,11 @@ - - namespace cricket { - --class AudioInfo; - class BaseSession; - class Call; --class MediaSources; - class Session; -+struct AudioInfo; -+struct MediaSources; - - // Note that the call's audio monitor must be started before this is started. - // It's recommended that the audio monitor be started with a 100 ms period. diff --git a/libjingle-0.5.8-config-linux.patch b/libjingle-0.5.8-config-linux.patch deleted file mode 100644 index 820d519..0000000 --- a/libjingle-0.5.8-config-linux.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up libjingle-0.5.8/talk/base/linux.cc.config libjingle-0.5.8/talk/base/linux.cc ---- libjingle-0.5.8/talk/base/linux.cc.config 2011-07-01 18:57:06.000000000 -0400 -+++ libjingle-0.5.8/talk/base/linux.cc 2011-07-25 12:05:40.084014155 -0400 -@@ -25,9 +25,9 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#if defined(LINUX) || defined(ANDROID) - #include "talk/base/linux.h" - -+#if defined(LINUX) || defined(ANDROID) - #include <ctype.h> - - #include <errno.h> -diff -up libjingle-0.5.8/talk/base/linux.h.config libjingle-0.5.8/talk/base/linux.h ---- libjingle-0.5.8/talk/base/linux.h.config 2011-07-01 18:57:06.000000000 -0400 -+++ libjingle-0.5.8/talk/base/linux.h 2011-07-25 12:05:53.314954072 -0400 -@@ -28,6 +28,8 @@ - #ifndef TALK_BASE_LINUX_H_ - #define TALK_BASE_LINUX_H_ - -+#include "config.h" -+ - #if defined(LINUX) || defined(ANDROID) - #include <string> - #include <map> diff --git a/libjingle-0.5.8-devicemanager-fix.patch b/libjingle-0.5.8-devicemanager-fix.patch deleted file mode 100644 index e46de94..0000000 --- a/libjingle-0.5.8-devicemanager-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up libjingle-0.5.8/talk/session/phone/devicemanager.cc.BAD libjingle-0.5.8/talk/session/phone/devicemanager.cc ---- libjingle-0.5.8/talk/session/phone/devicemanager.cc.BAD 2011-07-25 11:57:17.646309358 -0400 -+++ libjingle-0.5.8/talk/session/phone/devicemanager.cc 2011-07-25 11:58:05.604403378 -0400 -@@ -25,7 +25,7 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/session/phone/devicemanager.h" -+#include "config.h" - - #if WIN32 - #include <atlbase.h> -@@ -58,6 +58,7 @@ - #include "talk/sound/soundsysteminterface.h" - #endif - -+#include "talk/session/phone/devicemanager.h" - #include "talk/base/logging.h" - #include "talk/base/stringutils.h" - #include "talk/session/phone/mediaengine.h" diff --git a/libjingle-0.5.8-fixmacro.patch b/libjingle-0.5.8-fixmacro.patch deleted file mode 100644 index b164071..0000000 --- a/libjingle-0.5.8-fixmacro.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libjingle-0.5.8/talk/sound/sounddevicelocator.h.fix-macro libjingle-0.5.8/talk/sound/sounddevicelocator.h ---- libjingle-0.5.8/talk/sound/sounddevicelocator.h.fix-macro 2011-07-01 18:57:06.000000000 -0400 -+++ libjingle-0.5.8/talk/sound/sounddevicelocator.h 2011-07-25 12:50:24.066773540 -0400 -@@ -63,7 +63,7 @@ class SoundDeviceLocator { - std::string device_name_; - - private: -- DISALLOW_ASSIGN(SoundDeviceLocator); -+ void operator=(const SoundDeviceLocator&); - }; - - } // namespace cricket diff --git a/libjingle-0.5.8-statfix.patch b/libjingle-0.5.8-statfix.patch deleted file mode 100644 index 3f5036f..0000000 --- a/libjingle-0.5.8-statfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up libjingle-0.5.8/talk/base/physicalsocketserver.cc.statfix libjingle-0.5.8/talk/base/physicalsocketserver.cc ---- libjingle-0.5.8/talk/base/physicalsocketserver.cc.statfix 2011-07-25 11:39:12.301403847 -0400 -+++ libjingle-0.5.8/talk/base/physicalsocketserver.cc 2011-07-25 11:39:25.723411866 -0400 -@@ -34,6 +34,7 @@ - #ifdef POSIX - #include <string.h> - #include <errno.h> -+#include <time.h> - #include <fcntl.h> - #include <sys/time.h> - #include <unistd.h> -diff -up libjingle-0.5.8/talk/base/stream.cc.statfix libjingle-0.5.8/talk/base/stream.cc ---- libjingle-0.5.8/talk/base/stream.cc.statfix 2011-07-25 11:39:48.101311105 -0400 -+++ libjingle-0.5.8/talk/base/stream.cc 2011-07-25 11:39:55.260452171 -0400 -@@ -26,6 +26,7 @@ - */ - - #if defined(POSIX) -+#include <time.h> - #include <sys/file.h> - #endif // POSIX - #include <sys/types.h> diff --git a/libjingle-0.5.8-system-expat.patch b/libjingle-0.5.8-system-expat.patch deleted file mode 100644 index 75ca4f1..0000000 --- a/libjingle-0.5.8-system-expat.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up libjingle-0.5.8/talk/xmllite/xmlbuilder.h.system-expat libjingle-0.5.8/talk/xmllite/xmlbuilder.h ---- libjingle-0.5.8/talk/xmllite/xmlbuilder.h.system-expat 2011-07-25 11:45:52.604310202 -0400 -+++ libjingle-0.5.8/talk/xmllite/xmlbuilder.h 2011-07-25 11:46:04.055287491 -0400 -@@ -36,7 +36,7 @@ - #ifdef EXPAT_RELATIVE_PATH - #include "expat.h" - #else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" -+#include <expat.h> - #endif // EXPAT_RELATIVE_PATH - - namespace buzz { -diff -up libjingle-0.5.8/talk/xmllite/xmlparser.h.system-expat libjingle-0.5.8/talk/xmllite/xmlparser.h ---- libjingle-0.5.8/talk/xmllite/xmlparser.h.system-expat 2011-07-25 11:47:21.209287907 -0400 -+++ libjingle-0.5.8/talk/xmllite/xmlparser.h 2011-07-25 11:47:32.917530191 -0400 -@@ -34,7 +34,7 @@ - #ifdef EXPAT_RELATIVE_PATH - #include "expat.h" - #else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" -+#include <expat.h> - #endif // EXPAT_RELATIVE_PATH - - struct XML_ParserStruct; -diff -up libjingle-0.5.8/talk/xmpp/xmppstanzaparser.cc.system-expat libjingle-0.5.8/talk/xmpp/xmppstanzaparser.cc ---- libjingle-0.5.8/talk/xmpp/xmppstanzaparser.cc.system-expat 2011-07-25 11:45:19.013287946 -0400 -+++ libjingle-0.5.8/talk/xmpp/xmppstanzaparser.cc 2011-07-25 11:45:30.391424695 -0400 -@@ -33,7 +33,7 @@ - #ifdef EXPAT_RELATIVE_PATH - #include "expat.h" - #else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" -+#include <expat.h> - #endif - - namespace buzz { diff --git a/libjingle-0.5.8-system-srtp.patch b/libjingle-0.5.8-system-srtp.patch deleted file mode 100644 index 4274551..0000000 --- a/libjingle-0.5.8-system-srtp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libjingle-0.5.8/talk/session/phone/srtpfilter.cc.system-srtp libjingle-0.5.8/talk/session/phone/srtpfilter.cc ---- libjingle-0.5.8/talk/session/phone/srtpfilter.cc.system-srtp 2011-07-25 11:56:10.950441446 -0400 -+++ libjingle-0.5.8/talk/session/phone/srtpfilter.cc 2011-07-25 11:56:21.599308183 -0400 -@@ -58,7 +58,7 @@ - #ifdef SRTP_RELATIVE_PATH - #include "srtp.h" // NOLINT - #else --#include "third_party/libsrtp/include/srtp.h" -+#include <srtp.h> - #endif // SRTP_RELATIVE_PATH - #ifdef _DEBUG - extern "C" debug_module_t mod_srtp; diff --git a/libjingle-0.5.8-v4llookup-fix.patch b/libjingle-0.5.8-v4llookup-fix.patch deleted file mode 100644 index 8dbdf2e..0000000 --- a/libjingle-0.5.8-v4llookup-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up libjingle-0.5.8/talk/session/phone/v4llookup.cc.v4lfix libjingle-0.5.8/talk/session/phone/v4llookup.cc ---- libjingle-0.5.8/talk/session/phone/v4llookup.cc.v4lfix 2011-07-25 11:59:39.205287888 -0400 -+++ libjingle-0.5.8/talk/session/phone/v4llookup.cc 2011-07-25 11:59:56.120536871 -0400 -@@ -6,7 +6,7 @@ - * The functionality is implemented as a class with virtual methods for - * the purpose of unit testing. - */ --#include "talk/session/phone/v4llookup.h" -+#include "config.h" - - #include <errno.h> - #include <fcntl.h> -@@ -18,6 +18,7 @@ - - #include <cstring> - -+#include "talk/session/phone/v4llookup.h" - #include "talk/base/logging.h" - - namespace cricket { diff --git a/libjingle-0.6.0-build-sanity.patch b/libjingle-0.6.0-build-sanity.patch deleted file mode 100644 index 1d0f21f..0000000 --- a/libjingle-0.6.0-build-sanity.patch +++ /dev/null @@ -1,659 +0,0 @@ -diff -up libjingle-0.6.0/configure.ac.SANITY libjingle-0.6.0/configure.ac ---- libjingle-0.6.0/configure.ac.SANITY 2011-09-27 16:25:02.575566945 -0400 -+++ libjingle-0.6.0/configure.ac 2011-09-27 16:37:31.896056423 -0400 -@@ -0,0 +1,95 @@ -+AC_INIT([libjingle], [0.6.0], [google-talk-open(a)googlegroups.com]) -+AC_CANONICAL_SYSTEM -+AM_CONFIG_HEADER(config.h) -+AM_INIT_AUTOMAKE([dist-zip]) -+AC_PROG_CC -+AC_PROG_CXX -+AM_PROG_LIBTOOL -+LIBTOOL="$LIBTOOL --silent" -+AC_PROG_INSTALL -+AC_DEFINE(PRODUCTION_BUILD, 1, [Build as a production build]) -+AC_DEFINE(PRODUCTION, 1, [Build as a production build]) -+AC_DEFINE(POSIX, 1, [If we're using configure, we're on POSIX]) -+AC_DEFINE(FEATURE_ENABLE_VOICEMAIL, 1, [voice mail]) -+AC_DEFINE(LOGGING, 1, [Logging]) -+ -+LIBJINGLE_MAJORMINOR=0.6 -+AC_SUBST(LIBJINGLE_MAJORMINOR) -+ -+LIBJINGLE_LIBRARY_VERSION=1:0:0 -+AC_SUBST(LIBJINGLE_LIBRARY_VERSION) -+ -+HAVE_EXPAT=no -+AC_CHECK_LIB(expat, XML_ParserCreate, HAVE_EXPAT="yes") -+if test "x$HAVE_EXPAT" = xyes ; then -+ EXPAT_LIBS="-lexpat" -+ AC_SUBST(EXPAT_LIBS) -+else -+ AC_ERROR([Expat is required to build libjingle. You can get it from http://expat.sourceforge.net/]) -+fi -+ -+if test `uname -s` = Linux ; then -+ AC_DEFINE(LINUX, 1, [Building on Linux]) -+ HAVE_ALSA=no -+ AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA="yes") -+ if test "x$HAVE_ALSA" = xyes ; then -+ ALSA_LIBS="-lasound" -+ AC_SUBST(ALSA_LIBS) -+ AC_DEFINE(HAVE_ALSA, 1, [Using ALSA]) -+ else -+ AC_ERROR([libasound is required to build libjingle. You can get it from http://www.alsa-project.org/]) -+ fi -+ -+ AC_CHECK_HEADER(openssl/ssl.h, HAVE_OPENSSL_SSL_H=yes, HAVE_OPENSSL_SSL_H=no) -+ if test x$HAVE_OPENSSL_SSL_H = xyes; then -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 1, [Found openssl/ssl.h]) -+ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7g, HAVE_OPENSSL=yes, HAVE_OPENSSL=no) -+ AC_SUBST(OPENSSL_CFLAGS) -+ AC_SUBST(OPENSSL_LIBS) -+ AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL]) -+ AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled]) -+ CPPFLAGS+="$OPENSSL_CFLAGS" -+ LDFLAGS+=" $OPENSSL_LIBS" -+ else -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 0, [Did not find openssl/ssl.h]) -+ fi -+ -+ PKG_CHECK_MODULES(GTK2, gtk+-2.0, enable_gtk=yes, enable_gtk=no) -+ if test x$enable_gtk = xno ; then -+ AC_ERROR([GTK2 is required to build libjingle.]) -+ else -+ AC_SUBST(GTK2_CFLAGS) -+ AC_SUBST(GTK2_LIBS) -+ AC_DEFINE(HAVE_GTK2, 1, [GTK2 present]) -+ fi -+fi -+ -+PKG_CHECK_MODULES(LIBSRTP, libsrtp >= 1.4.4, enable_srtp=yes, enable_srtp=no) -+if test x$enable_srtp = xno ; then -+ HAVE_SRTP=no -+else -+ AC_SUBST(LIBSRTP_CFLAGS) -+ AC_SUBST(LIBSRTP_LIBS) -+ AC_DEFINE(HAVE_SRTP, 1, [libSRTP provides SRTP supprt]) -+fi -+ -+AC_OUTPUT([Makefile -+ talk/Makefile -+ talk/base/Makefile -+ talk/examples/Makefile -+ talk/examples/login/Makefile -+ talk/examples/call/Makefile -+ talk/p2p/Makefile -+ talk/p2p/base/Makefile -+ talk/p2p/client/Makefile -+ talk/session/Makefile -+ talk/session/tunnel/Makefile -+ talk/session/phone/Makefile -+ talk/xmllite/Makefile -+ talk/xmpp/Makefile -+ pkgconfig/Makefile -+ pkgconfig/jinglebase.pc -+ pkgconfig/jinglep2p.pc -+ pkgconfig/jinglesessiontunnel.pc -+ pkgconfig/jinglesessionphone.pc -+ ]) -diff -up libjingle-0.6.0/Makefile.am.SANITY libjingle-0.6.0/Makefile.am ---- libjingle-0.6.0/Makefile.am.SANITY 2011-09-27 16:25:02.575566945 -0400 -+++ libjingle-0.6.0/Makefile.am 2011-09-27 16:25:02.575566945 -0400 -@@ -0,0 +1,4 @@ -+SUBDIRS=talk pkgconfig -+ -+configdir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk -+config_HEADERS = config.h -diff -up libjingle-0.6.0/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.6.0/pkgconfig/jinglebase.pc.in ---- libjingle-0.6.0/pkgconfig/jinglebase.pc.in.SANITY 2011-09-27 16:25:02.579566893 -0400 -+++ libjingle-0.6.0/pkgconfig/jinglebase.pc.in 2011-09-27 16:25:02.575566945 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglebase -+Description: Jingle Base Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglebase -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.0/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.6.0/pkgconfig/jinglep2p.pc.in ---- libjingle-0.6.0/pkgconfig/jinglep2p.pc.in.SANITY 2011-09-27 16:25:02.580566881 -0400 -+++ libjingle-0.6.0/pkgconfig/jinglep2p.pc.in 2011-09-27 16:25:02.580566881 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglep2p -+Description: Jingle P2P Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -ljinglep2pbase -ljinglep2pclient -ljinglexmllite -ljinglexmpp -lexpat -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.0/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.6.0/pkgconfig/jinglesessionphone.pc.in ---- libjingle-0.6.0/pkgconfig/jinglesessionphone.pc.in.SANITY 2011-09-27 16:25:02.580566881 -0400 -+++ libjingle-0.6.0/pkgconfig/jinglesessionphone.pc.in 2011-09-27 16:25:02.580566881 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessionphone -+Description: Jingle Session Phone Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.0/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.6.0/pkgconfig/jinglesessiontunnel.pc.in ---- libjingle-0.6.0/pkgconfig/jinglesessiontunnel.pc.in.SANITY 2011-09-27 16:25:02.580566881 -0400 -+++ libjingle-0.6.0/pkgconfig/jinglesessiontunnel.pc.in 2011-09-27 16:25:02.580566881 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessiontunnel -+Description: Jingle Session Tunnel Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessiontunnel -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.0/pkgconfig/Makefile.am.SANITY libjingle-0.6.0/pkgconfig/Makefile.am ---- libjingle-0.6.0/pkgconfig/Makefile.am.SANITY 2011-09-27 16:25:02.580566881 -0400 -+++ libjingle-0.6.0/pkgconfig/Makefile.am 2011-09-27 16:25:02.580566881 -0400 -@@ -0,0 +1,20 @@ -+### all of the standard pc files we need to generate -+pcfiles = jinglebase-@LIBJINGLE_MAJORMINOR@.pc jinglep2p-@LIBJINGLE_MAJORMINOR@.pc jinglesessiontunnel-@LIBJINGLE_MAJORMINOR@.pc jinglesessionphone-@LIBJINGLE_MAJORMINOR@.pc -+ -+all-local: $(pcfiles) -+ -+### how to generate pc files -+%-@LIBJINGLE_MAJORMINOR@.pc: %.pc -+ cp $< $@ -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = $(pcfiles) -+ -+EXTRA_DIST = \ -+ jinglebase.pc.in \ -+ jinglep2p.pc.in \ -+ jinglesessionphone.pc.in \ -+ jinglesessiontunnel.pc.in -+ -+CLEANFILES = $(pcfiles) -+ -diff -up libjingle-0.6.0/talk/base/Makefile.am.SANITY libjingle-0.6.0/talk/base/Makefile.am ---- libjingle-0.6.0/talk/base/Makefile.am.SANITY 2011-09-27 16:25:02.581566869 -0400 -+++ libjingle-0.6.0/talk/base/Makefile.am 2011-09-27 16:25:02.581566869 -0400 -@@ -0,0 +1,142 @@ -+lib_LTLIBRARIES = libjinglebase.la -+ -+libjinglebase_la_SOURCES = asyncfile.cc \ -+ asynchttprequest.cc \ -+ asyncsocket.cc \ -+ asynctcpsocket.cc \ -+ asyncudpsocket.cc \ -+ autodetectproxy.cc \ -+ base64.cc \ -+ basicpacketsocketfactory.cc \ -+ bytebuffer.cc \ -+ checks.cc \ -+ common.cc \ -+ diskcache.cc \ -+ event.cc \ -+ fileutils.cc \ -+ firewallsocketserver.cc \ -+ flags.cc \ -+ helpers.cc \ -+ host.cc \ -+ httpbase.cc \ -+ httpclient.cc \ -+ httpcommon.cc \ -+ httprequest.cc \ -+ linux.cc \ -+ logging.cc \ -+ md5c.c \ -+ messagehandler.cc \ -+ messagequeue.cc \ -+ nethelpers.cc \ -+ network.cc \ -+ openssladapter.cc \ -+ opensslidentity.cc \ -+ opensslstreamadapter.cc \ -+ pathutils.cc \ -+ physicalsocketserver.cc \ -+ proxydetect.cc \ -+ proxyinfo.cc \ -+ ratetracker.cc \ -+ signalthread.cc \ -+ socketadapters.cc \ -+ socketaddress.cc \ -+ socketaddresspair.cc \ -+ socketpool.cc \ -+ socketstream.cc \ -+ ssladapter.cc \ -+ sslsocketfactory.cc \ -+ sslstreamadapter.cc \ -+ stream.cc \ -+ stringdigest.cc \ -+ stringencode.cc \ -+ stringutils.cc \ -+ task.cc \ -+ taskparent.cc \ -+ taskrunner.cc \ -+ thread.cc \ -+ time.cc \ -+ unixfilesystem.cc \ -+ urlencode.cc -+ -+libjinglebase_la_LIBADD = -lrt -+ -+libjinglebase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglebase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/base -+ -+libjinglebase_include_HEADERS = asyncfile.h \ -+ asynchttprequest.h \ -+ asyncpacketsocket.h \ -+ asyncsocket.h \ -+ asynctcpsocket.h \ -+ asyncudpsocket.h \ -+ autodetectproxy.h \ -+ base64.h \ -+ basicdefs.h \ -+ basicpacketsocketfactory.h \ -+ basictypes.h \ -+ bytebuffer.h \ -+ byteorder.h \ -+ checks.h \ -+ common.h \ -+ constructormagic.h \ -+ criticalsection.h \ -+ cryptstring.h \ -+ diskcache.h \ -+ event.h \ -+ fileutils.h \ -+ firewallsocketserver.h \ -+ flags.h \ -+ helpers.h \ -+ host.h \ -+ httpbase.h \ -+ httpclient.h \ -+ httpcommon-inl.h \ -+ httpcommon.h \ -+ httprequest.h \ -+ linked_ptr.h \ -+ linux.h \ -+ logging.h \ -+ md5.h \ -+ messagehandler.h \ -+ messagequeue.h \ -+ nethelpers.h \ -+ network.h \ -+ openssladapter.h \ -+ opensslidentity.h \ -+ opensslstreamadapter.h \ -+ packetsocketfactory.h \ -+ pathutils.h \ -+ physicalsocketserver.h \ -+ proxydetect.h \ -+ proxyinfo.h \ -+ ratetracker.h \ -+ scoped_ptr.h \ -+ sec_buffer.h \ -+ signalthread.h \ -+ sigslot.h \ -+ sigslotrepeater.h \ -+ socket.h \ -+ socketadapters.h \ -+ socketaddress.h \ -+ socketaddresspair.h \ -+ socketfactory.h \ -+ socketpool.h \ -+ socketserver.h \ -+ socketstream.h \ -+ ssladapter.h \ -+ sslsocketfactory.h \ -+ sslstreamadapter.h \ -+ stream.h \ -+ stringdigest.h \ -+ stringencode.h \ -+ stringutils.h \ -+ task.h \ -+ taskparent.h \ -+ taskrunner.h \ -+ thread.h \ -+ time.h \ -+ unixfilesystem.h \ -+ urlencode.h -+ -+AM_CXXFLAGS = -DPOSIX -diff -up libjingle-0.6.0/talk/examples/call/Makefile.am.SANITY libjingle-0.6.0/talk/examples/call/Makefile.am ---- libjingle-0.6.0/talk/examples/call/Makefile.am.SANITY 2011-09-27 16:25:02.581566869 -0400 -+++ libjingle-0.6.0/talk/examples/call/Makefile.am 2011-09-27 16:25:02.581566869 -0400 -@@ -0,0 +1,23 @@ -+bin_PROGRAMS = call -+call_CXXFLAGS = $(AM_CXXFLAGS) -+call_SOURCES = call_main.cc \ -+ callclient.cc \ -+ console.cc \ -+ discoitemsquerytask.cc \ -+ friendinvitesendtask.cc \ -+ mucinviterecvtask.cc \ -+ mucinvitesendtask.cc \ -+ presenceouttask.cc \ -+ presencepushtask.cc \ -+ voicemailjidrequester.cc -+noinst_HEADERS = callclient.h console.h -+call_LDADD = $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(top_srcdir)/talk/session/phone/libjinglesessionphone.la \ -+ $(top_srcdir)/talk/p2p/client/libjinglep2pclient.la \ -+ $(top_srcdir)/talk/p2p/base/libjinglep2pbase.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) $(ALSA_LIBS) $(LIBSRTP_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.0/talk/examples/login/Makefile.am.SANITY libjingle-0.6.0/talk/examples/login/Makefile.am ---- libjingle-0.6.0/talk/examples/login/Makefile.am.SANITY 2011-09-27 16:25:02.581566869 -0400 -+++ libjingle-0.6.0/talk/examples/login/Makefile.am 2011-09-27 16:25:02.581566869 -0400 -@@ -0,0 +1,24 @@ -+noinst_LTLIBRARIES= libxmpphelp.la -+libxmpphelp_la_SOURCES = xmppsocket.cc \ -+ xmppauth.cc \ -+ xmpppump.cc -+ -+noinst_HEADERS = xmppauth.h \ -+ xmpppump.h \ -+ xmppsocket.h \ -+ xmppthread.h \ -+ jingleinfotask.h \ -+ presenceouttask.h \ -+ presencepushtask.h \ -+ status.h -+ -+bin_PROGRAMS = login -+login_CXXFLAGS = $(AM_CXXFLAGS) -+login_SOURCES = login_main.cc xmppthread.cc -+login_LDADD = $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.0/talk/examples/Makefile.am.SANITY libjingle-0.6.0/talk/examples/Makefile.am ---- libjingle-0.6.0/talk/examples/Makefile.am.SANITY 2011-09-27 16:25:02.581566869 -0400 -+++ libjingle-0.6.0/talk/examples/Makefile.am 2011-09-27 16:25:02.581566869 -0400 -@@ -0,0 +1 @@ -+SUBDIRS=login call -diff -up libjingle-0.6.0/talk/Makefile.am.SANITY libjingle-0.6.0/talk/Makefile.am ---- libjingle-0.6.0/talk/Makefile.am.SANITY 2011-09-27 16:25:02.582566857 -0400 -+++ libjingle-0.6.0/talk/Makefile.am 2011-09-27 16:25:02.582566857 -0400 -@@ -0,0 +1 @@ -+SUBDIRS=base xmllite xmpp p2p session -diff -up libjingle-0.6.0/talk/p2p/base/Makefile.am.SANITY libjingle-0.6.0/talk/p2p/base/Makefile.am ---- libjingle-0.6.0/talk/p2p/base/Makefile.am.SANITY 2011-09-27 16:25:02.582566857 -0400 -+++ libjingle-0.6.0/talk/p2p/base/Makefile.am 2011-09-27 16:25:02.582566857 -0400 -@@ -0,0 +1,74 @@ -+lib_LTLIBRARIES = libjinglep2pbase.la -+ -+libjinglep2pbase_la_SOURCES = stun.cc \ -+ port.cc \ -+ udpport.cc \ -+ tcpport.cc \ -+ stunport.cc \ -+ relayport.cc \ -+ relayserver.cc \ -+ stunrequest.cc \ -+ stunserver.cc \ -+ sessionmanager.cc \ -+ sessionmessages.cc \ -+ session.cc \ -+ sessiondescription.cc \ -+ transport.cc \ -+ transportchannel.cc \ -+ transportchannelproxy.cc \ -+ p2ptransport.cc \ -+ p2ptransportchannel.cc \ -+ rawtransport.cc \ -+ rawtransportchannel.cc \ -+ constants.cc \ -+ pseudotcp.cc \ -+ parsing.cc -+ -+libjinglep2pbase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/base -+libjinglep2pbase_include_HEADERS = candidate.h \ -+ portallocator.h \ -+ relayport.h \ -+ session.h \ -+ stunport.h \ -+ tcpport.h \ -+ port.h \ -+ sessionid.h \ -+ stunrequest.h \ -+ udpport.h \ -+ pseudotcp.h \ -+ sessiondescription.h \ -+ sessionmanager.h \ -+ stun.h \ -+ relayserver.h \ -+ stunserver.h \ -+ sessionclient.h \ -+ transport.h \ -+ transportchannel.h \ -+ transportchannelproxy.h \ -+ transportchannelimpl.h \ -+ p2ptransport.h \ -+ p2ptransportchannel.h \ -+ rawtransport.h \ -+ rawtransportchannel.h \ -+ constants.h \ -+ common.h \ -+ parsing.h \ -+ sessionmessages.h -+ -+libjinglep2pbase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+libjinglep2pbase_la_LIBADD = $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la -+ -+AM_CPPFLAGS = -DPOSIX -DENABLE_DEBUG -D_DEBUG -g -+ -+P2PLIBS = libjinglep2pbase.la ../../base/libjinglebase.la -lpthread -+XMLLIBS = ../../xmllite/libjinglexmllite.la ../../xmpp/libjinglexmpp.la $(EXPAT_LIBS) -+ -+bin_PROGRAMS = relayserver stunserver -+relayserver_SOURCES = relayserver.cc relayserver_main.cc -+relayserver_LDADD = $(P2PLIBS) -+relayserver_CPPFLAGS = $(AM_CPPFLAGS) -+ -+stunserver_SOURCES = stunserver.cc stunserver_main.cc -+stunserver_LDADD = $(P2PLIBS) -+stunserver_CPPFLAGS = $(AM_CPPFLAGS) -diff -up libjingle-0.6.0/talk/p2p/client/Makefile.am.SANITY libjingle-0.6.0/talk/p2p/client/Makefile.am ---- libjingle-0.6.0/talk/p2p/client/Makefile.am.SANITY 2011-09-27 16:25:02.582566857 -0400 -+++ libjingle-0.6.0/talk/p2p/client/Makefile.am 2011-09-27 16:25:02.582566857 -0400 -@@ -0,0 +1,18 @@ -+lib_LTLIBRARIES = libjinglep2pclient.la -+ -+libjinglep2pclient_la_SOURCES = basicportallocator.cc \ -+ httpportallocator.cc \ -+ socketmonitor.cc -+ -+libjinglep2pclient_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/client -+ -+libjinglep2pclient_include_HEADERS = basicportallocator.h \ -+ socketmonitor.h \ -+ sessionmanagertask.h \ -+ sessionsendtask.h \ -+ httpportallocator.h -+ -+libjinglep2pclient_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD -+ -diff -up libjingle-0.6.0/talk/p2p/Makefile.am.SANITY libjingle-0.6.0/talk/p2p/Makefile.am ---- libjingle-0.6.0/talk/p2p/Makefile.am.SANITY 2011-09-27 16:25:02.582566857 -0400 -+++ libjingle-0.6.0/talk/p2p/Makefile.am 2011-09-27 16:25:02.582566857 -0400 -@@ -0,0 +1 @@ -+SUBDIRS=base client -diff -up libjingle-0.6.0/talk/session/Makefile.am.SANITY libjingle-0.6.0/talk/session/Makefile.am ---- libjingle-0.6.0/talk/session/Makefile.am.SANITY 2011-09-27 16:25:02.583566844 -0400 -+++ libjingle-0.6.0/talk/session/Makefile.am 2011-09-27 16:25:02.583566844 -0400 -@@ -0,0 +1 @@ -+SUBDIRS = tunnel phone -diff -up libjingle-0.6.0/talk/session/phone/Makefile.am.SANITY libjingle-0.6.0/talk/session/phone/Makefile.am ---- libjingle-0.6.0/talk/session/phone/Makefile.am.SANITY 2011-09-27 16:25:02.583566844 -0400 -+++ libjingle-0.6.0/talk/session/phone/Makefile.am 2011-09-27 16:37:01.185446766 -0400 -@@ -0,0 +1,55 @@ -+lib_LTLIBRARIES = libjinglesessionphone.la -+ -+libjinglesessionphone_la_SOURCES = audiomonitor.cc \ -+ call.cc \ -+ channel.cc \ -+ channelmanager.cc \ -+ codec.cc \ -+ currentspeakermonitor.cc \ -+ devicemanager.cc \ -+ filemediaengine.cc \ -+ gtkvideorenderer.cc \ -+ libudevsymboltable.cc \ -+ mediaengine.cc \ -+ mediamessages.cc \ -+ mediamonitor.cc \ -+ mediasession.cc \ -+ mediasessionclient.cc \ -+ rtcpmuxfilter.cc \ -+ rtpdump.cc \ -+ rtputils.cc \ -+ soundclip.cc \ -+ srtpfilter.cc \ -+ v4llookup.cc -+ -+libjinglesessionphone_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/phone -+libjinglesessionphone_include_HEADERS = audiomonitor.h \ -+ call.h \ -+ codec.h \ -+ channel.h \ -+ channelmanager.h \ -+ currentspeakermonitor.h \ -+ filemediaengine.h \ -+ libudevsymboltable.h \ -+ mediachannel.h \ -+ mediacommon.h \ -+ mediaengine.h \ -+ mediamessages.h \ -+ mediasessionclient.h \ -+ mediasink.h \ -+ rtcpmuxfilter.h \ -+ rtpdump.h \ -+ rtputils.h \ -+ soundclip.h \ -+ srtpfilter.h \ -+ voicechannel.h \ -+ videocommon.h \ -+ videoframe.h \ -+ videorenderer.h \ -+ videorendererfactory.h -+ -+libjinglesessionphone_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglesessionphone_la_LIBADD = $(LIBSRTP_LIBS) $(GTK2_LIBS) -+ -+AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS) $(GTK2_CFLAGS) -diff -up libjingle-0.6.0/talk/session/tunnel/Makefile.am.SANITY libjingle-0.6.0/talk/session/tunnel/Makefile.am ---- libjingle-0.6.0/talk/session/tunnel/Makefile.am.SANITY 2011-09-27 16:25:02.583566844 -0400 -+++ libjingle-0.6.0/talk/session/tunnel/Makefile.am 2011-09-27 16:25:02.583566844 -0400 -@@ -0,0 +1,16 @@ -+lib_LTLIBRARIES = libjinglesessiontunnel.la -+ -+libjinglesessiontunnel_la_SOURCES = tunnelsessionclient.cc \ -+ securetunnelsessionclient.cc \ -+ pseudotcpchannel.cc -+ -+libjinglesessiontunnel_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/tunnel -+ -+libjinglesessiontunnel_include_HEADERS = tunnelsessionclient.h \ -+ pseudotcpchannel.h \ -+ securetunnelsessionclient.h -+ -+libjinglesessiontunnel_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CXXFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.0/talk/xmllite/Makefile.am.SANITY libjingle-0.6.0/talk/xmllite/Makefile.am ---- libjingle-0.6.0/talk/xmllite/Makefile.am.SANITY 2011-09-27 16:25:02.583566844 -0400 -+++ libjingle-0.6.0/talk/xmllite/Makefile.am 2011-09-27 16:25:02.583566844 -0400 -@@ -0,0 +1,21 @@ -+lib_LTLIBRARIES = libjinglexmllite.la -+ -+libjinglexmllite_la_SOURCES = qname.cc \ -+ xmlbuilder.cc \ -+ xmlconstants.cc \ -+ xmlelement.cc \ -+ xmlnsstack.cc \ -+ xmlparser.cc \ -+ xmlprinter.cc -+ -+libjinglexmllite_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmllite -+libjinglexmllite_include_HEADERS = qname.h \ -+ xmlbuilder.h \ -+ xmlconstants.h \ -+ xmlelement.h \ -+ xmlnsstack.h \ -+ xmlparser.h \ -+ xmlprinter.h -+AM_CPPFLAGS = -DPOSIX -+ -+libjinglexmllite_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) $(EXPAT_LIBS) -diff -up libjingle-0.6.0/talk/xmpp/Makefile.am.SANITY libjingle-0.6.0/talk/xmpp/Makefile.am ---- libjingle-0.6.0/talk/xmpp/Makefile.am.SANITY 2011-09-27 16:25:02.584566831 -0400 -+++ libjingle-0.6.0/talk/xmpp/Makefile.am 2011-09-27 16:25:02.584566831 -0400 -@@ -0,0 +1,35 @@ -+lib_LTLIBRARIES = libjinglexmpp.la -+ -+libjinglexmpp_la_SOURCES = constants.cc \ -+ jid.cc \ -+ saslmechanism.cc \ -+ xmppclient.cc \ -+ xmppengineimpl.cc \ -+ xmppengineimpl_iq.cc \ -+ xmpplogintask.cc \ -+ xmppstanzaparser.cc \ -+ xmpptask.cc \ -+ ratelimitmanager.cc -+ -+libjinglexmpp_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmpp -+libjinglexmpp_include_HEADERS = asyncsocket.h \ -+ prexmppauth.h \ -+ saslhandler.h \ -+ xmpplogintask.h \ -+ jid.h \ -+ saslmechanism.h \ -+ xmppclient.h \ -+ constants.h \ -+ saslplainmechanism.h \ -+ xmppclientsettings.h \ -+ xmppstanzaparser.h \ -+ xmppengine.h \ -+ xmpptask.h \ -+ plainsaslhandler.h \ -+ saslcookiemechanism.h \ -+ xmppengineimpl.h \ -+ ratelimitmanager.h -+ -+libjinglexmpp_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -DPOSIX diff --git a/libjingle-0.6.0-devicemanager-fix.patch b/libjingle-0.6.0-devicemanager-fix.patch deleted file mode 100644 index cc533c4..0000000 --- a/libjingle-0.6.0-devicemanager-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up libjingle-0.6.0/talk/session/phone/devicemanager.cc.alsa libjingle-0.6.0/talk/session/phone/devicemanager.cc ---- libjingle-0.6.0/talk/session/phone/devicemanager.cc.alsa 2011-09-13 18:47:01.000000000 -0400 -+++ libjingle-0.6.0/talk/session/phone/devicemanager.cc 2011-09-27 11:09:52.213322502 -0400 -@@ -25,7 +25,7 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/session/phone/devicemanager.h" -+#include "config.h" - - #if WIN32 - #include <atlbase.h> -@@ -58,6 +58,7 @@ - #include "talk/sound/soundsysteminterface.h" - #endif - -+#include "talk/session/phone/devicemanager.h" - #include "talk/base/logging.h" - #include "talk/base/stringutils.h" - #include "talk/base/thread.h" diff --git a/libjingle-0.6.0-qname-threadsafe.patch b/libjingle-0.6.0-qname-threadsafe.patch deleted file mode 100644 index 25f3a75..0000000 --- a/libjingle-0.6.0-qname-threadsafe.patch +++ /dev/null @@ -1,284 +0,0 @@ -diff -up libjingle-0.6.0/talk/xmllite/qname.cc.threadsafe libjingle-0.6.0/talk/xmllite/qname.cc ---- libjingle-0.6.0/talk/xmllite/qname.cc.threadsafe 2011-09-13 18:47:01.000000000 -0400 -+++ libjingle-0.6.0/talk/xmllite/qname.cc 2011-09-27 11:10:27.002907179 -0400 -@@ -1,112 +1,23 @@ --/* -- * libjingle -- * Copyright 2004--2005, Google Inc. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions are met: -- * -- * 1. Redistributions of source code must retain the above copyright notice, -- * this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright notice, -- * this list of conditions and the following disclaimer in the documentation -- * and/or other materials provided with the distribution. -- * 3. The name of the author may not be used to endorse or promote products -- * derived from this software without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -+// Copyright (c) 2010 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#include "talk/xmllite/qname.h" - --#include <string> - #include "talk/base/common.h" - #include "talk/xmllite/xmlelement.h" --#include "talk/xmllite/qname.h" - #include "talk/xmllite/xmlconstants.h" - - namespace buzz { - --static int QName_Hash(const std::string & ns, const char * local) { -- int result = static_cast<int>(ns.size()) * 101; -- while (*local) { -- result *= 19; -- result += *local; -- local += 1; -- } -- return result; --} -- --static const int bits = 9; --static QName::Data * get_qname_table() { -- static QName::Data qname_table[1 << bits]; -- return qname_table; --} -- --static QName::Data * --AllocateOrFind(const std::string & ns, const char * local) { -- int index = QName_Hash(ns, local); -- int increment = index >> (bits - 1) | 1; -- QName::Data * qname_table = get_qname_table(); -- for (;;) { -- index &= ((1 << bits) - 1); -- if (!qname_table[index].Occupied()) { -- return new QName::Data(ns, local); -- } -- if (qname_table[index].localPart_ == local && -- qname_table[index].namespace_ == ns) { -- qname_table[index].AddRef(); -- return qname_table + index; -- } -- index += increment; -- } --} -- --static QName::Data * --Add(const std::string & ns, const char * local) { -- int index = QName_Hash(ns, local); -- int increment = index >> (bits - 1) | 1; -- QName::Data * qname_table = get_qname_table(); -- for (;;) { -- index &= ((1 << bits) - 1); -- if (!qname_table[index].Occupied()) { -- qname_table[index].namespace_ = ns; -- qname_table[index].localPart_ = local; -- qname_table[index].AddRef(); // AddRef twice so it's never deleted -- qname_table[index].AddRef(); -- return qname_table + index; -- } -- if (qname_table[index].localPart_ == local && -- qname_table[index].namespace_ == ns) { -- qname_table[index].AddRef(); -- return qname_table + index; -- } -- index += increment; -- } --} -- --QName::~QName() { -- data_->Release(); --} -- --QName::QName() : data_(QN_EMPTY.data_) { -- data_->AddRef(); --} -+QName::QName() : namespace_(QN_EMPTY.namespace_), -+ local_part_(QN_EMPTY.local_part_) {} - --QName::QName(bool add, const std::string & ns, const char * local) : -- data_(add ? Add(ns, local) : AllocateOrFind(ns, local)) {} -+QName::QName(const std::string & ns, const std::string & local) : -+ namespace_(ns), local_part_(local) {} - - QName::QName(bool add, const std::string & ns, const std::string & local) : -- data_(add ? Add(ns, local.c_str()) : AllocateOrFind(ns, local.c_str())) {} -- --QName::QName(const std::string & ns, const char * local) : -- data_(AllocateOrFind(ns, local)) {} -+ namespace_(ns), local_part_(local) {} - - static std::string - QName_LocalPart(const std::string & name) { -@@ -125,38 +36,30 @@ QName_Namespace(const std::string & name - } - - QName::QName(const std::string & mergedOrLocal) : -- data_(AllocateOrFind(QName_Namespace(mergedOrLocal), -- QName_LocalPart(mergedOrLocal).c_str())) {} -+ namespace_(QName_Namespace(mergedOrLocal)), -+ local_part_(QName_LocalPart(mergedOrLocal)) {} - - std::string - QName::Merged() const { -- if (data_->namespace_ == STR_EMPTY) -- return data_->localPart_; -- -- std::string result(data_->namespace_); -- result.reserve(result.length() + 1 + data_->localPart_.length()); -- result += ':'; -- result += data_->localPart_; -- return result; -+ if (namespace_ == STR_EMPTY) -+ return local_part_; -+ return namespace_ + ':' + local_part_; - } - - bool - QName::operator==(const QName & other) const { -- return other.data_ == data_ || -- (data_->localPart_ == other.data_->localPart_ && -- data_->namespace_ == other.data_->namespace_); -+ return -+ local_part_ == other.local_part_ && -+ namespace_ == other.namespace_; - } - - int - QName::Compare(const QName & other) const { -- if (data_ == other.data_) -- return 0; -- -- int result = data_->localPart_.compare(other.data_->localPart_); -+ int result = local_part_.compare(other.local_part_); - if (result) - return result; - -- return data_->namespace_.compare(other.data_->namespace_); -+ return namespace_.compare(other.namespace_); - } - --} -+} // namespace buzz -diff -up libjingle-0.6.0/talk/xmllite/qname.h.threadsafe libjingle-0.6.0/talk/xmllite/qname.h ---- libjingle-0.6.0/talk/xmllite/qname.h.threadsafe 2011-09-13 18:47:01.000000000 -0400 -+++ libjingle-0.6.0/talk/xmllite/qname.h 2011-09-27 11:14:11.961092612 -0400 -@@ -1,88 +1,38 @@ --/* -- * libjingle -- * Copyright 2004--2005, Google Inc. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions are met: -- * -- * 1. Redistributions of source code must retain the above copyright notice, -- * this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright notice, -- * this list of conditions and the following disclaimer in the documentation -- * and/or other materials provided with the distribution. -- * 3. The name of the author may not be used to endorse or promote products -- * derived from this software without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -+// Copyright (c) 2010 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. - --#ifndef _qname_h_ --#define _qname_h_ -+#ifndef TALK_XMLLITE_QNAME_H_ -+#define TALK_XMLLITE_QNAME_H_ - - #include <string> --#include "talk/base/criticalsection.h" - - namespace buzz { - -- -+// Default libjingle's implementation of QName class is not threadsafe. This -+// one is. - class QName - { - public: -- explicit QName(); -- QName(const QName & qname) : data_(qname.data_) { data_->AddRef(); } -- explicit QName(bool add, const std::string & ns, const char * local); -- explicit QName(bool add, const std::string & ns, const std::string & local); -- explicit QName(const std::string & ns, const char * local); -+ QName(); -+ QName(const std::string & ns, const std::string & local); -+ QName(bool add, const std::string & ns, const std::string & local); - explicit QName(const std::string & mergedOrLocal); -- QName & operator=(const QName & qn) { -- qn.data_->AddRef(); -- data_->Release(); -- data_ = qn.data_; -- return *this; -- } -- ~QName(); - -- const std::string & Namespace() const { return data_->namespace_; } -- const std::string & LocalPart() const { return data_->localPart_; } -+ const std::string & Namespace() const { return namespace_; } -+ const std::string & LocalPart() const { return local_part_; } - std::string Merged() const; - int Compare(const QName & other) const; - bool operator==(const QName & other) const; - bool operator!=(const QName & other) const { return !operator==(other); } - bool operator<(const QName & other) const { return Compare(other) < 0; } - -- class Data { -- public: -- Data(const std::string & ns, const std::string & local) : -- namespace_(ns), -- localPart_(local), -- refcount_(1) {} -- -- Data() : refcount_(0) {} -- -- std::string namespace_; -- std::string localPart_; -- void AddRef() { talk_base::AtomicOps::Increment(&refcount_); } -- void Release() { if (!talk_base::AtomicOps::Decrement(&refcount_)) { delete this; } } -- bool Occupied() { return !!refcount_; } -- -- private: -- int refcount_; -- }; -- - private: -- Data * data_; -+ std::string namespace_; -+ std::string local_part_; - }; - - --} -+} // namespace buzz - --#endif -+#endif // TALK_XMLLITE_QNAME_H_ diff --git a/libjingle-0.6.0-size_t.patch b/libjingle-0.6.0-size_t.patch deleted file mode 100644 index 4604c81..0000000 --- a/libjingle-0.6.0-size_t.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up libjingle-0.6.0/talk/p2p/base/pseudotcp.h.size_t libjingle-0.6.0/talk/p2p/base/pseudotcp.h ---- libjingle-0.6.0/talk/p2p/base/pseudotcp.h.size_t 2011-09-13 18:47:00.000000000 -0400 -+++ libjingle-0.6.0/talk/p2p/base/pseudotcp.h 2011-09-27 11:15:48.274865394 -0400 -@@ -29,6 +29,7 @@ - #define TALK_P2P_BASE_PSEUDOTCP_H_ - - #include <list> -+#include <cstdlib> - - #include "talk/base/basictypes.h" - #include "talk/base/stream.h" diff --git a/libjingle-0.6.10-build-sanity.patch b/libjingle-0.6.10-build-sanity.patch deleted file mode 100644 index 17c0cfc..0000000 --- a/libjingle-0.6.10-build-sanity.patch +++ /dev/null @@ -1,825 +0,0 @@ -diff -up libjingle-0.6.10/configure.ac.SANITY libjingle-0.6.10/configure.ac ---- libjingle-0.6.10/configure.ac.SANITY 2012-02-13 22:26:51.884198702 -0500 -+++ libjingle-0.6.10/configure.ac 2012-02-13 22:27:13.077985984 -0500 -@@ -0,0 +1,96 @@ -+AC_INIT([libjingle], [0.6.0], [google-talk-open(a)googlegroups.com]) -+AC_CANONICAL_SYSTEM -+AM_CONFIG_HEADER(config.h) -+AM_INIT_AUTOMAKE([dist-zip]) -+AC_PROG_CC -+AC_PROG_CXX -+AM_PROG_LIBTOOL -+LIBTOOL="$LIBTOOL --silent" -+AC_PROG_INSTALL -+AC_DEFINE(PRODUCTION_BUILD, 1, [Build as a production build]) -+AC_DEFINE(PRODUCTION, 1, [Build as a production build]) -+AC_DEFINE(POSIX, 1, [If we're using configure, we're on POSIX]) -+AC_DEFINE(FEATURE_ENABLE_VOICEMAIL, 1, [voice mail]) -+AC_DEFINE(LOGGING, 1, [Logging]) -+ -+LIBJINGLE_MAJORMINOR=0.6 -+AC_SUBST(LIBJINGLE_MAJORMINOR) -+ -+LIBJINGLE_LIBRARY_VERSION=1:0:0 -+AC_SUBST(LIBJINGLE_LIBRARY_VERSION) -+ -+HAVE_EXPAT=no -+AC_CHECK_LIB(expat, XML_ParserCreate, HAVE_EXPAT="yes") -+if test "x$HAVE_EXPAT" = xyes ; then -+ EXPAT_LIBS="-lexpat" -+ AC_SUBST(EXPAT_LIBS) -+else -+ AC_ERROR([Expat is required to build libjingle. You can get it from http://expat.sourceforge.net/]) -+fi -+ -+if test `uname -s` = Linux ; then -+ AC_DEFINE(LINUX, 1, [Building on Linux]) -+ HAVE_ALSA=no -+ AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA="yes") -+ if test "x$HAVE_ALSA" = xyes ; then -+ ALSA_LIBS="-lasound" -+ AC_SUBST(ALSA_LIBS) -+ AC_DEFINE(HAVE_ALSA, 1, [Using ALSA]) -+ else -+ AC_ERROR([libasound is required to build libjingle. You can get it from http://www.alsa-project.org/]) -+ fi -+ -+ AC_CHECK_HEADER(openssl/ssl.h, HAVE_OPENSSL_SSL_H=yes, HAVE_OPENSSL_SSL_H=no) -+ if test x$HAVE_OPENSSL_SSL_H = xyes; then -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 1, [Found openssl/ssl.h]) -+ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7g, HAVE_OPENSSL=yes, HAVE_OPENSSL=no) -+ AC_SUBST(OPENSSL_CFLAGS) -+ AC_SUBST(OPENSSL_LIBS) -+ AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL]) -+ AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled]) -+ CPPFLAGS+="$OPENSSL_CFLAGS" -+ LDFLAGS+=" $OPENSSL_LIBS" -+ else -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 0, [Did not find openssl/ssl.h]) -+ fi -+ -+ PKG_CHECK_MODULES(GTK2, gtk+-2.0, enable_gtk=yes, enable_gtk=no) -+ if test x$enable_gtk = xno ; then -+ AC_ERROR([GTK2 is required to build libjingle.]) -+ else -+ AC_SUBST(GTK2_CFLAGS) -+ AC_SUBST(GTK2_LIBS) -+ AC_DEFINE(HAVE_GTK2, 1, [GTK2 present]) -+ fi -+fi -+ -+PKG_CHECK_MODULES(LIBSRTP, libsrtp >= 1.4.4, enable_srtp=yes, enable_srtp=no) -+if test x$enable_srtp = xno ; then -+ HAVE_SRTP=no -+else -+ AC_SUBST(LIBSRTP_CFLAGS) -+ AC_SUBST(LIBSRTP_LIBS) -+ AC_DEFINE(HAVE_SRTP, 1, [libSRTP provides SRTP supprt]) -+fi -+ -+AC_OUTPUT([Makefile -+ talk/Makefile -+ talk/base/Makefile -+ talk/examples/Makefile -+ talk/examples/login/Makefile -+ talk/examples/call/Makefile -+ talk/p2p/Makefile -+ talk/p2p/base/Makefile -+ talk/p2p/client/Makefile -+ talk/session/Makefile -+ talk/session/tunnel/Makefile -+ talk/session/phone/Makefile -+ talk/sound/Makefile -+ talk/xmllite/Makefile -+ talk/xmpp/Makefile -+ pkgconfig/Makefile -+ pkgconfig/jinglebase.pc -+ pkgconfig/jinglep2p.pc -+ pkgconfig/jinglesessiontunnel.pc -+ pkgconfig/jinglesessionphone.pc -+ ]) -diff -up libjingle-0.6.10/Makefile.am.SANITY libjingle-0.6.10/Makefile.am ---- libjingle-0.6.10/Makefile.am.SANITY 2012-02-13 22:26:51.884198702 -0500 -+++ libjingle-0.6.10/Makefile.am 2012-02-13 22:26:51.884198702 -0500 -@@ -0,0 +1,4 @@ -+SUBDIRS=talk pkgconfig -+ -+configdir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk -+config_HEADERS = config.h -diff -up libjingle-0.6.10/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.6.10/pkgconfig/jinglebase.pc.in ---- libjingle-0.6.10/pkgconfig/jinglebase.pc.in.SANITY 2012-02-13 22:26:51.885198691 -0500 -+++ libjingle-0.6.10/pkgconfig/jinglebase.pc.in 2012-02-13 22:26:51.885198691 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglebase -+Description: Jingle Base Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglebase -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.10/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.6.10/pkgconfig/jinglep2p.pc.in ---- libjingle-0.6.10/pkgconfig/jinglep2p.pc.in.SANITY 2012-02-13 22:26:51.885198691 -0500 -+++ libjingle-0.6.10/pkgconfig/jinglep2p.pc.in 2012-02-13 22:26:51.885198691 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglep2p -+Description: Jingle P2P Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -ljinglep2pbase -ljinglep2pclient -ljinglexmllite -ljinglexmpp -lexpat -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.10/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.6.10/pkgconfig/jinglesessionphone.pc.in ---- libjingle-0.6.10/pkgconfig/jinglesessionphone.pc.in.SANITY 2012-02-13 22:26:51.886198681 -0500 -+++ libjingle-0.6.10/pkgconfig/jinglesessionphone.pc.in 2012-02-13 22:26:51.886198681 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessionphone -+Description: Jingle Session Phone Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.10/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.6.10/pkgconfig/jinglesessiontunnel.pc.in ---- libjingle-0.6.10/pkgconfig/jinglesessiontunnel.pc.in.SANITY 2012-02-13 22:26:51.886198681 -0500 -+++ libjingle-0.6.10/pkgconfig/jinglesessiontunnel.pc.in 2012-02-13 22:26:51.886198681 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessiontunnel -+Description: Jingle Session Tunnel Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessiontunnel -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.10/pkgconfig/Makefile.am.SANITY libjingle-0.6.10/pkgconfig/Makefile.am ---- libjingle-0.6.10/pkgconfig/Makefile.am.SANITY 2012-02-13 22:26:51.887198671 -0500 -+++ libjingle-0.6.10/pkgconfig/Makefile.am 2012-02-13 22:26:51.887198671 -0500 -@@ -0,0 +1,20 @@ -+### all of the standard pc files we need to generate -+pcfiles = jinglebase-@LIBJINGLE_MAJORMINOR@.pc jinglep2p-@LIBJINGLE_MAJORMINOR@.pc jinglesessiontunnel-@LIBJINGLE_MAJORMINOR@.pc jinglesessionphone-@LIBJINGLE_MAJORMINOR@.pc -+ -+all-local: $(pcfiles) -+ -+### how to generate pc files -+%-@LIBJINGLE_MAJORMINOR@.pc: %.pc -+ cp $< $@ -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = $(pcfiles) -+ -+EXTRA_DIST = \ -+ jinglebase.pc.in \ -+ jinglep2p.pc.in \ -+ jinglesessionphone.pc.in \ -+ jinglesessiontunnel.pc.in -+ -+CLEANFILES = $(pcfiles) -+ -diff -up libjingle-0.6.10/talk/base/Makefile.am.SANITY libjingle-0.6.10/talk/base/Makefile.am ---- libjingle-0.6.10/talk/base/Makefile.am.SANITY 2012-02-13 22:26:51.888198661 -0500 -+++ libjingle-0.6.10/talk/base/Makefile.am 2012-02-13 22:26:51.888198661 -0500 -@@ -0,0 +1,205 @@ -+lib_LTLIBRARIES = libjinglebase.la -+ -+libjinglebase_la_SOURCES = asyncfile.cc \ -+ asynchttprequest.cc \ -+ asyncsocket.cc \ -+ asynctcpsocket.cc \ -+ asyncudpsocket.cc \ -+ autodetectproxy.cc \ -+ bandwidthsmoother.cc \ -+ base64.cc \ -+ basicpacketsocketfactory.cc \ -+ bytebuffer.cc \ -+ checks.cc \ -+ common.cc \ -+ cpuid.cc \ -+ cpumonitor.cc \ -+ dbus.cc \ -+ diskcache.cc \ -+ event.cc \ -+ filelock.cc \ -+ fileutils.cc \ -+ firewallsocketserver.cc \ -+ flags.cc \ -+ helpers.cc \ -+ host.cc \ -+ httpbase.cc \ -+ httpclient.cc \ -+ httpcommon.cc \ -+ httprequest.cc \ -+ httpserver.cc \ -+ ipaddress.cc \ -+ latebindingsymboltable.cc \ -+ libdbusglibsymboltable.cc \ -+ linux.cc \ -+ logging.cc \ -+ md5c.c \ -+ messagehandler.cc \ -+ messagequeue.cc \ -+ multipart.cc \ -+ natserver.cc \ -+ natsocketfactory.cc \ -+ nattypes.cc \ -+ nethelpers.cc \ -+ network.cc \ -+ openssladapter.cc \ -+ opensslidentity.cc \ -+ opensslstreamadapter.cc \ -+ optionsfile.cc \ -+ pathutils.cc \ -+ physicalsocketserver.cc \ -+ posix.cc \ -+ proxydetect.cc \ -+ proxyinfo.cc \ -+ proxyserver.cc \ -+ ratetracker.cc \ -+ sharedexclusivelock.cc \ -+ signalthread.cc \ -+ socketadapters.cc \ -+ socketaddress.cc \ -+ socketaddresspair.cc \ -+ socketpool.cc \ -+ socketstream.cc \ -+ ssladapter.cc \ -+ sslidentity.cc \ -+ sslsocketfactory.cc \ -+ sslstreamadapter.cc \ -+ stream.cc \ -+ stringdigest.cc \ -+ stringencode.cc \ -+ stringutils.cc \ -+ systeminfo.cc \ -+ task.cc \ -+ taskparent.cc \ -+ taskrunner.cc \ -+ thread.cc \ -+ timeutils.cc \ -+ timing.cc \ -+ transformadapter.cc \ -+ unixfilesystem.cc \ -+ urlencode.cc \ -+ versionparsing.cc \ -+ virtualsocketserver.cc \ -+ worker.cc -+ -+libjinglebase_la_LIBADD = -lrt -+ -+libjinglebase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglebase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/base -+ -+libjinglebase_include_HEADERS = asyncfile.h \ -+ asynchttprequest.h \ -+ asyncpacketsocket.h \ -+ asyncsocket.h \ -+ asynctcpsocket.h \ -+ asyncudpsocket.h \ -+ atomicops.h \ -+ autodetectproxy.h \ -+ bandwidthsmoother.h \ -+ base64.h \ -+ basicdefs.h \ -+ basicpacketsocketfactory.h \ -+ basictypes.h \ -+ buffer.h \ -+ bytebuffer.h \ -+ byteorder.h \ -+ checks.h \ -+ common.h \ -+ constructormagic.h \ -+ cpuid.h \ -+ cpumonitor.h \ -+ criticalsection.h \ -+ cryptstring.h \ -+ dbus.h \ -+ diskcache.h \ -+ event.h \ -+ fakenetwork.h \ -+ faketaskrunner.h \ -+ filelock.h \ -+ fileutils.h \ -+ fileutils_mock.h \ -+ firewallsocketserver.h \ -+ flags.h \ -+ gunit.h \ -+ helpers.h \ -+ host.h \ -+ httpbase.h \ -+ httpclient.h \ -+ httpcommon-inl.h \ -+ httpcommon.h \ -+ httprequest.h \ -+ httpserver.h \ -+ ipaddress.h \ -+ latebindingsymboltable.h \ -+ libdbusglibsymboltable.h \ -+ linked_ptr.h \ -+ linux.h \ -+ linuxfdwalk.h \ -+ logging.h \ -+ mathutils.h \ -+ md5.h \ -+ messagehandler.h \ -+ messagequeue.h \ -+ multipart.h \ -+ natserver.h \ -+ natsocketfactory.h \ -+ nattypes.h \ -+ nethelpers.h \ -+ network.h \ -+ openssladapter.h \ -+ opensslidentity.h \ -+ opensslstreamadapter.h \ -+ packetsocketfactory.h \ -+ pathutils.h \ -+ physicalsocketserver.h \ -+ posix.h \ -+ proxydetect.h \ -+ proxyinfo.h \ -+ proxyserver.h \ -+ ratetracker.h \ -+ refcount.h \ -+ referencecountedsingletonfactory.h \ -+ rollingaccumulator.h \ -+ scoped_autorelease_pool.h \ -+ scoped_ptr.h \ -+ scoped_ref_ptr.h \ -+ sec_buffer.h \ -+ sharedexclusivelock.h \ -+ signalthread.h \ -+ sigslot.h \ -+ sigslotrepeater.h \ -+ socket.h \ -+ socketadapters.h \ -+ socketaddress.h \ -+ socketaddresspair.h \ -+ socketfactory.h \ -+ socketpool.h \ -+ socketserver.h \ -+ socketstream.h \ -+ ssladapter.h \ -+ sslidentity.h \ -+ sslroots.h \ -+ sslsocketfactory.h \ -+ sslstreamadapter.h \ -+ stream.h \ -+ stringdigest.h \ -+ stringencode.h \ -+ stringutils.h \ -+ systeminfo.h \ -+ task.h \ -+ taskparent.h \ -+ taskrunner.h \ -+ thread.h \ -+ timeutils.h \ -+ timing.h \ -+ transformadapter.h \ -+ unixfilesystem.h \ -+ urlencode.h \ -+ versionparsing.h \ -+ virtualsocketserver.h \ -+ window.h \ -+ windowpicker.h \ -+ worker.h -+ -+AM_CXXFLAGS = -DPOSIX -DLINUX -diff -up libjingle-0.6.10/talk/examples/call/Makefile.am.SANITY libjingle-0.6.10/talk/examples/call/Makefile.am ---- libjingle-0.6.10/talk/examples/call/Makefile.am.SANITY 2012-02-13 22:26:51.888198661 -0500 -+++ libjingle-0.6.10/talk/examples/call/Makefile.am 2012-02-13 22:26:51.888198661 -0500 -@@ -0,0 +1,23 @@ -+bin_PROGRAMS = call -+call_CXXFLAGS = $(AM_CXXFLAGS) -+call_SOURCES = call_main.cc \ -+ callclient.cc \ -+ console.cc \ -+ discoitemsquerytask.cc \ -+ friendinvitesendtask.cc \ -+ mucinviterecvtask.cc \ -+ mucinvitesendtask.cc \ -+ presenceouttask.cc \ -+ presencepushtask.cc \ -+ voicemailjidrequester.cc -+noinst_HEADERS = callclient.h console.h -+call_LDADD = $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(top_srcdir)/talk/session/phone/libjinglesessionphone.la \ -+ $(top_srcdir)/talk/p2p/client/libjinglep2pclient.la \ -+ $(top_srcdir)/talk/p2p/base/libjinglep2pbase.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) $(ALSA_LIBS) $(LIBSRTP_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.10/talk/examples/login/Makefile.am.SANITY libjingle-0.6.10/talk/examples/login/Makefile.am ---- libjingle-0.6.10/talk/examples/login/Makefile.am.SANITY 2012-02-13 22:26:51.889198651 -0500 -+++ libjingle-0.6.10/talk/examples/login/Makefile.am 2012-02-13 22:26:51.889198651 -0500 -@@ -0,0 +1,24 @@ -+noinst_LTLIBRARIES= libxmpphelp.la -+libxmpphelp_la_SOURCES = xmppsocket.cc \ -+ xmppauth.cc \ -+ xmpppump.cc -+ -+noinst_HEADERS = xmppauth.h \ -+ xmpppump.h \ -+ xmppsocket.h \ -+ xmppthread.h \ -+ jingleinfotask.h \ -+ presenceouttask.h \ -+ presencepushtask.h \ -+ status.h -+ -+bin_PROGRAMS = login -+login_CXXFLAGS = $(AM_CXXFLAGS) -+login_SOURCES = login_main.cc xmppthread.cc -+login_LDADD = $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.10/talk/examples/Makefile.am.SANITY libjingle-0.6.10/talk/examples/Makefile.am ---- libjingle-0.6.10/talk/examples/Makefile.am.SANITY 2012-02-13 22:26:51.889198651 -0500 -+++ libjingle-0.6.10/talk/examples/Makefile.am 2012-02-13 22:26:51.889198651 -0500 -@@ -0,0 +1 @@ -+SUBDIRS=login call -diff -up libjingle-0.6.10/talk/Makefile.am.SANITY libjingle-0.6.10/talk/Makefile.am ---- libjingle-0.6.10/talk/Makefile.am.SANITY 2012-02-13 22:26:51.890198641 -0500 -+++ libjingle-0.6.10/talk/Makefile.am 2012-02-13 22:26:51.890198641 -0500 -@@ -0,0 +1 @@ -+SUBDIRS=base xmllite xmpp p2p session sound -diff -up libjingle-0.6.10/talk/p2p/base/Makefile.am.SANITY libjingle-0.6.10/talk/p2p/base/Makefile.am ---- libjingle-0.6.10/talk/p2p/base/Makefile.am.SANITY 2012-02-13 22:26:51.891198631 -0500 -+++ libjingle-0.6.10/talk/p2p/base/Makefile.am 2012-02-13 22:26:51.890198641 -0500 -@@ -0,0 +1,74 @@ -+lib_LTLIBRARIES = libjinglep2pbase.la -+ -+libjinglep2pbase_la_SOURCES = stun.cc \ -+ port.cc \ -+ udpport.cc \ -+ tcpport.cc \ -+ stunport.cc \ -+ relayport.cc \ -+ relayserver.cc \ -+ stunrequest.cc \ -+ stunserver.cc \ -+ sessionmanager.cc \ -+ sessionmessages.cc \ -+ session.cc \ -+ sessiondescription.cc \ -+ transport.cc \ -+ transportchannel.cc \ -+ transportchannelproxy.cc \ -+ p2ptransport.cc \ -+ p2ptransportchannel.cc \ -+ rawtransport.cc \ -+ rawtransportchannel.cc \ -+ constants.cc \ -+ pseudotcp.cc \ -+ parsing.cc -+ -+libjinglep2pbase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/base -+libjinglep2pbase_include_HEADERS = candidate.h \ -+ portallocator.h \ -+ relayport.h \ -+ session.h \ -+ stunport.h \ -+ tcpport.h \ -+ port.h \ -+ sessionid.h \ -+ stunrequest.h \ -+ udpport.h \ -+ pseudotcp.h \ -+ sessiondescription.h \ -+ sessionmanager.h \ -+ stun.h \ -+ relayserver.h \ -+ stunserver.h \ -+ sessionclient.h \ -+ transport.h \ -+ transportchannel.h \ -+ transportchannelproxy.h \ -+ transportchannelimpl.h \ -+ p2ptransport.h \ -+ p2ptransportchannel.h \ -+ rawtransport.h \ -+ rawtransportchannel.h \ -+ constants.h \ -+ common.h \ -+ parsing.h \ -+ sessionmessages.h -+ -+libjinglep2pbase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+libjinglep2pbase_la_LIBADD = $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la -+ -+AM_CPPFLAGS = -DPOSIX -DENABLE_DEBUG -D_DEBUG -g -+ -+P2PLIBS = libjinglep2pbase.la ../../base/libjinglebase.la -lpthread -+XMLLIBS = ../../xmllite/libjinglexmllite.la ../../xmpp/libjinglexmpp.la $(EXPAT_LIBS) -+ -+bin_PROGRAMS = relayserver stunserver -+relayserver_SOURCES = relayserver.cc relayserver_main.cc -+relayserver_LDADD = $(P2PLIBS) -+relayserver_CPPFLAGS = $(AM_CPPFLAGS) -+ -+stunserver_SOURCES = stunserver.cc stunserver_main.cc -+stunserver_LDADD = $(P2PLIBS) -+stunserver_CPPFLAGS = $(AM_CPPFLAGS) -diff -up libjingle-0.6.10/talk/p2p/client/Makefile.am.SANITY libjingle-0.6.10/talk/p2p/client/Makefile.am ---- libjingle-0.6.10/talk/p2p/client/Makefile.am.SANITY 2012-02-13 22:26:51.891198631 -0500 -+++ libjingle-0.6.10/talk/p2p/client/Makefile.am 2012-02-13 22:26:51.891198631 -0500 -@@ -0,0 +1,20 @@ -+lib_LTLIBRARIES = libjinglep2pclient.la -+ -+libjinglep2pclient_la_SOURCES = basicportallocator.cc \ -+ connectivitychecker.cc \ -+ httpportallocator.cc \ -+ socketmonitor.cc -+ -+libjinglep2pclient_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/client -+ -+libjinglep2pclient_include_HEADERS = basicportallocator.h \ -+ connectivitychecker.h \ -+ socketmonitor.h \ -+ sessionmanagertask.h \ -+ sessionsendtask.h \ -+ httpportallocator.h -+ -+libjinglep2pclient_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD -+ -diff -up libjingle-0.6.10/talk/p2p/Makefile.am.SANITY libjingle-0.6.10/talk/p2p/Makefile.am ---- libjingle-0.6.10/talk/p2p/Makefile.am.SANITY 2012-02-13 22:26:51.892198620 -0500 -+++ libjingle-0.6.10/talk/p2p/Makefile.am 2012-02-13 22:26:51.892198620 -0500 -@@ -0,0 +1 @@ -+SUBDIRS=base client -diff -up libjingle-0.6.10/talk/session/Makefile.am.SANITY libjingle-0.6.10/talk/session/Makefile.am ---- libjingle-0.6.10/talk/session/Makefile.am.SANITY 2012-02-13 22:26:51.893198609 -0500 -+++ libjingle-0.6.10/talk/session/Makefile.am 2012-02-13 22:26:51.892198620 -0500 -@@ -0,0 +1 @@ -+SUBDIRS = tunnel phone -diff -up libjingle-0.6.10/talk/session/phone/Makefile.am.SANITY libjingle-0.6.10/talk/session/phone/Makefile.am ---- libjingle-0.6.10/talk/session/phone/Makefile.am.SANITY 2012-02-13 22:26:51.893198609 -0500 -+++ libjingle-0.6.10/talk/session/phone/Makefile.am 2012-02-13 22:26:51.893198609 -0500 -@@ -0,0 +1,93 @@ -+lib_LTLIBRARIES = libjinglesessionphone.la -+ -+libjinglesessionphone_la_SOURCES = audiomonitor.cc \ -+ call.cc \ -+ channel.cc \ -+ channelmanager.cc \ -+ codec.cc \ -+ currentspeakermonitor.cc \ -+ devicemanager.cc \ -+ filemediaengine.cc \ -+ filevideocapturer.cc \ -+ gtkvideorenderer.cc \ -+ libudevsymboltable.cc \ -+ linuxdevicemanager.cc \ -+ mediaengine.cc \ -+ mediamessages.cc \ -+ mediamonitor.cc \ -+ mediarecorder.cc \ -+ mediasession.cc \ -+ mediasessionclient.cc \ -+ rtcpmuxfilter.cc \ -+ rtpdump.cc \ -+ rtputils.cc \ -+ soundclip.cc \ -+ srtpfilter.cc \ -+ ssrcmuxfilter.cc \ -+ v4llookup.cc \ -+ videoadapter.cc \ -+ videocapturer.cc \ -+ videocommon.cc \ -+ videoframe.cc -+ -+libjinglesessionphone_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/phone -+libjinglesessionphone_include_HEADERS = audioframe.h \ -+ audiomonitor.h \ -+ call.h \ -+ channel.h \ -+ channelmanager.h \ -+ codec.h \ -+ cryptoparams.h \ -+ currentspeakermonitor.h \ -+ devicemanager.h \ -+ fakedevicemanager.h \ -+ fakemediaengine.h \ -+ fakemediaprocessor.h \ -+ fakenetworkinterface.h \ -+ fakertp.h \ -+ fakevideocapturer.h \ -+ fakevideorenderer.h \ -+ fakewebrtccommon.h \ -+ fakewebrtcdeviceinfo.h \ -+ fakewebrtcvcmfactory.h \ -+ fakewebrtcvideocapturemodule.h \ -+ fakewebrtcvideoengine.h \ -+ fakewebrtcvoiceengine.h \ -+ filemediaengine.h \ -+ gtkvideorenderer.h \ -+ libudevsymboltable.h \ -+ linuxdevicemanager.h \ -+ mediachannel.h \ -+ mediacommon.h \ -+ mediaengine.h \ -+ mediamessages.h \ -+ mediamonitor.h \ -+ mediarecorder.h \ -+ mediasessionclient.h \ -+ mediasession.h \ -+ mediasink.h \ -+ nullvideorenderer.h \ -+ rtcpmuxfilter.h \ -+ rtpdump.h \ -+ rtputils.h \ -+ screencastid.h \ -+ soundclip.h \ -+ srtpfilter.h \ -+ ssrcmuxfilter.h \ -+ streamparams.h \ -+ v4llookup.h \ -+ videoadapter.h \ -+ videocapturer.h \ -+ videocommon.h \ -+ videoframe.h \ -+ videoprocessor.h \ -+ videorenderer.h \ -+ videorendererfactory.h \ -+ voicechannel.h \ -+ voiceprocessor.h -+ -+libjinglesessionphone_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglesessionphone_la_LIBADD = $(LIBSRTP_LIBS) $(GTK2_LIBS) -+ -+AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS) $(GTK2_CFLAGS) -diff -up libjingle-0.6.10/talk/session/tunnel/Makefile.am.SANITY libjingle-0.6.10/talk/session/tunnel/Makefile.am ---- libjingle-0.6.10/talk/session/tunnel/Makefile.am.SANITY 2012-02-13 22:26:51.894198599 -0500 -+++ libjingle-0.6.10/talk/session/tunnel/Makefile.am 2012-02-13 22:26:51.894198599 -0500 -@@ -0,0 +1,16 @@ -+lib_LTLIBRARIES = libjinglesessiontunnel.la -+ -+libjinglesessiontunnel_la_SOURCES = tunnelsessionclient.cc \ -+ securetunnelsessionclient.cc \ -+ pseudotcpchannel.cc -+ -+libjinglesessiontunnel_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/tunnel -+ -+libjinglesessiontunnel_include_HEADERS = tunnelsessionclient.h \ -+ pseudotcpchannel.h \ -+ securetunnelsessionclient.h -+ -+libjinglesessiontunnel_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CXXFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.10/talk/sound/Makefile.am.SANITY libjingle-0.6.10/talk/sound/Makefile.am ---- libjingle-0.6.10/talk/sound/Makefile.am.SANITY 2012-02-13 22:26:51.894198599 -0500 -+++ libjingle-0.6.10/talk/sound/Makefile.am 2012-02-13 22:26:51.894198599 -0500 -@@ -0,0 +1,36 @@ -+lib_LTLIBRARIES = libjinglesound.la -+ -+libjinglesound_la_SOURCES = alsasoundsystem.cc \ -+ alsasymboltable.cc \ -+ linuxsoundsystem.cc \ -+ nullsoundsystem.cc \ -+ platformsoundsystem.cc \ -+ platformsoundsystemfactory.cc \ -+ pulseaudiosoundsystem.cc \ -+ pulseaudiosymboltable.cc \ -+ soundsysteminterface.cc \ -+ soundsystemproxy.cc -+ -+libjinglesound_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/sound -+ -+libjinglesound_include_HEADERS = alsasoundsystem.h \ -+ alsasymboltable.h \ -+ automaticallychosensoundsystem.h \ -+ linuxsoundsystem.h \ -+ nullsoundsystem.h \ -+ nullsoundsystemfactory.h \ -+ platformsoundsystem.h \ -+ platformsoundsystemfactory.h \ -+ pulseaudiosoundsystem.h \ -+ pulseaudiosymboltable.h \ -+ sounddevicelocator.h \ -+ soundinputstreaminterface.h \ -+ soundoutputstreaminterface.h \ -+ soundsystemfactory.h \ -+ soundsysteminterface.h \ -+ soundsystemproxy.h -+ -+libjinglesound_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CXXFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.10/talk/xmllite/Makefile.am.SANITY libjingle-0.6.10/talk/xmllite/Makefile.am ---- libjingle-0.6.10/talk/xmllite/Makefile.am.SANITY 2012-02-13 22:26:51.895198590 -0500 -+++ libjingle-0.6.10/talk/xmllite/Makefile.am 2012-02-13 22:26:51.895198590 -0500 -@@ -0,0 +1,21 @@ -+lib_LTLIBRARIES = libjinglexmllite.la -+ -+libjinglexmllite_la_SOURCES = qname.cc \ -+ xmlbuilder.cc \ -+ xmlconstants.cc \ -+ xmlelement.cc \ -+ xmlnsstack.cc \ -+ xmlparser.cc \ -+ xmlprinter.cc -+ -+libjinglexmllite_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmllite -+libjinglexmllite_include_HEADERS = qname.h \ -+ xmlbuilder.h \ -+ xmlconstants.h \ -+ xmlelement.h \ -+ xmlnsstack.h \ -+ xmlparser.h \ -+ xmlprinter.h -+AM_CPPFLAGS = -DPOSIX -+ -+libjinglexmllite_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) $(EXPAT_LIBS) -diff -up libjingle-0.6.10/talk/xmpp/Makefile.am.SANITY libjingle-0.6.10/talk/xmpp/Makefile.am ---- libjingle-0.6.10/talk/xmpp/Makefile.am.SANITY 2012-02-13 22:26:51.896198581 -0500 -+++ libjingle-0.6.10/talk/xmpp/Makefile.am 2012-02-13 22:26:51.895198590 -0500 -@@ -0,0 +1,57 @@ -+lib_LTLIBRARIES = libjinglexmpp.la -+ -+libjinglexmpp_la_SOURCES = constants.cc \ -+ hangoutpubsubclient.cc \ -+ iqtask.cc \ -+ jid.cc \ -+ moduleimpl.cc \ -+ mucroomconfigtask.cc \ -+ mucroomhistorytask.cc \ -+ mucroomlookuptask.cc \ -+ pubsubclient.cc \ -+ pubsub_task.cc \ -+ pubsubtasks.cc \ -+ receivetask.cc \ -+ saslmechanism.cc \ -+ xmppclient.cc \ -+ xmppengineimpl.cc \ -+ xmppengineimpl_iq.cc \ -+ xmpplogintask.cc \ -+ xmppstanzaparser.cc \ -+ xmpptask.cc -+ -+libjinglexmpp_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmpp -+libjinglexmpp_include_HEADERS = asyncsocket.h \ -+ chatroommodule.h \ -+ constants.h \ -+ fakexmppclient.h \ -+ hangoutpubsubclient.h \ -+ iqtask.h \ -+ jid.h \ -+ module.h \ -+ moduleimpl.h \ -+ mucroomconfigtask.h \ -+ mucroomhistorytask.h \ -+ mucroomlookuptask.h \ -+ plainsaslhandler.h \ -+ prexmppauth.h \ -+ pubsubclient.h \ -+ pubsub_task.h \ -+ pubsubtasks.h \ -+ receivetask.h \ -+ rostermodule.h \ -+ saslcookiemechanism.h \ -+ saslhandler.h \ -+ saslmechanism.h \ -+ saslplainmechanism.h \ -+ xmppclient.h \ -+ xmppclientsettings.h \ -+ xmppengine.h \ -+ xmppengineimpl.h \ -+ xmpplogintask.h \ -+ xmppstanzaparser.h \ -+ xmpptask.h -+ -+libjinglexmpp_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -DPOSIX diff --git a/libjingle-0.6.10-fdwalk.patch b/libjingle-0.6.10-fdwalk.patch deleted file mode 100644 index 8ffc3e3..0000000 --- a/libjingle-0.6.10-fdwalk.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff -up libjingle-0.6.10/talk/base/linuxfdwalk.c.fdwalk libjingle-0.6.10/talk/base/linuxfdwalk.c ---- libjingle-0.6.10/talk/base/linuxfdwalk.c.fdwalk 2012-02-13 22:27:40.573710020 -0500 -+++ libjingle-0.6.10/talk/base/linuxfdwalk.c 2012-02-13 22:27:40.573710020 -0500 -@@ -0,0 +1,98 @@ -+/* -+ * libjingle -+ * Copyright 2004--2009, Google Inc. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include <sys/types.h> -+#include <dirent.h> -+#include <errno.h> -+#include <stdlib.h> -+#include <string.h> -+ -+#include "talk/base/linuxfdwalk.h" -+ -+// Parses a file descriptor number in base 10, requiring the strict format used -+// in /proc/*/fd. Returns the value, or -1 if not a valid string. -+static int parse_fd(const char *s) { -+ if (!*s) { -+ // Empty string is invalid. -+ return -1; -+ } -+ int val = 0; -+ do { -+ if (*s < '0' || *s > '9') { -+ // Non-numeric characters anywhere are invalid. -+ return -1; -+ } -+ int digit = *s++ - '0'; -+ val = val * 10 + digit; -+ } while (*s); -+ return val; -+} -+ -+int fdwalk(void (*func)(void *, int), void *opaque) { -+ DIR *dir = opendir("/proc/self/fd"); -+ if (!dir) { -+ return -1; -+ } -+ int opendirfd = dirfd(dir); -+ int parse_errors = 0; -+ struct dirent *ent; -+ // Have to clear errno to distinguish readdir() completion from failure. -+ while (errno = 0, (ent = readdir(dir)) != NULL) { -+ if (strcmp(ent->d_name, ".") == 0 || -+ strcmp(ent->d_name, "..") == 0) { -+ continue; -+ } -+ // We avoid atoi or strtol because those are part of libc and they involve -+ // locale stuff, which is probably not safe from a post-fork context in a -+ // multi-threaded app. -+ int fd = parse_fd(ent->d_name); -+ if (fd < 0) { -+ parse_errors = 1; -+ continue; -+ } -+ if (fd != opendirfd) { -+ (*func)(opaque, fd); -+ } -+ } -+ int saved_errno = errno; -+ if (closedir(dir) < 0) { -+ if (!saved_errno) { -+ // Return the closedir error. -+ return -1; -+ } -+ // Else ignore it because we have a more relevant error to return. -+ } -+ if (saved_errno) { -+ errno = saved_errno; -+ return -1; -+ } else if (parse_errors) { -+ errno = EBADF; -+ return -1; -+ } else { -+ return 0; -+ } -+} -diff -up libjingle-0.6.10/talk/base/Makefile.am.fdwalk libjingle-0.6.10/talk/base/Makefile.am ---- libjingle-0.6.10/talk/base/Makefile.am.fdwalk 2012-02-13 22:28:41.816095350 -0500 -+++ libjingle-0.6.10/talk/base/Makefile.am 2012-02-13 22:29:00.871904092 -0500 -@@ -32,6 +32,7 @@ libjinglebase_la_SOURCES = asyncfile.cc - latebindingsymboltable.cc \ - libdbusglibsymboltable.cc \ - linux.cc \ -+ linuxfdwalk.c \ - logging.cc \ - md5c.c \ - messagehandler.cc \ diff --git a/libjingle-0.6.10-gcc47.patch b/libjingle-0.6.10-gcc47.patch deleted file mode 100644 index d0eea2d..0000000 --- a/libjingle-0.6.10-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up libjingle-0.6.10/talk/base/rollingaccumulator.h.gcc47 libjingle-0.6.10/talk/base/rollingaccumulator.h ---- libjingle-0.6.10/talk/base/rollingaccumulator.h.gcc47 2012-03-20 14:26:40.942543661 -0400 -+++ libjingle-0.6.10/talk/base/rollingaccumulator.h 2012-03-20 14:26:49.219519117 -0400 -@@ -29,6 +29,7 @@ - #define TALK_BASE_ROLLINGACCUMULATOR_H_ - - #include <vector> -+#include <unistd.h> - - #include "talk/base/common.h" - diff --git a/libjingle-0.6.10-nextfix.patch b/libjingle-0.6.10-nextfix.patch deleted file mode 100644 index 2182884..0000000 --- a/libjingle-0.6.10-nextfix.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -up libjingle-0.6.10/talk/base/messagequeue.h.nextfix libjingle-0.6.10/talk/base/messagequeue.h ---- libjingle-0.6.10/talk/base/messagequeue.h.nextfix 2012-01-12 17:59:48.000000000 -0500 -+++ libjingle-0.6.10/talk/base/messagequeue.h 2012-02-13 20:59:48.528641310 -0500 -@@ -42,7 +42,7 @@ - #include "talk/base/scoped_ref_ptr.h" - #include "talk/base/sigslot.h" - #include "talk/base/socketserver.h" --#include "talk/base/timeutils.h" -+#include "talk/base/time.h" - - namespace talk_base { - -diff -up libjingle-0.6.10/talk/base/timeutils.h.nextfix libjingle-0.6.10/talk/base/timeutils.h ---- libjingle-0.6.10/talk/base/timeutils.h.nextfix 2012-01-12 17:59:48.000000000 -0500 -+++ libjingle-0.6.10/talk/base/timeutils.h 2012-02-13 20:59:48.529641300 -0500 -@@ -30,8 +30,7 @@ - - #ifndef WIN32 - #include <time.h> --#endif -- -+#else - #include "talk/base/basictypes.h" - - namespace talk_base { -@@ -86,5 +85,6 @@ inline int32 TimeUntil(uint32 later) { - } - - } // namespace talk_base -+#endif // WIN32 - - #endif // TALK_BASE_TIMEUTILS_H_ -diff -up libjingle-0.6.10/talk/p2p/base/pseudotcp.cc.nextfix libjingle-0.6.10/talk/p2p/base/pseudotcp.cc ---- libjingle-0.6.10/talk/p2p/base/pseudotcp.cc.nextfix 2012-01-12 17:59:48.000000000 -0500 -+++ libjingle-0.6.10/talk/p2p/base/pseudotcp.cc 2012-02-13 20:59:48.531641280 -0500 -@@ -38,7 +38,7 @@ - #include "talk/base/logging.h" - #include "talk/base/socket.h" - #include "talk/base/stringutils.h" --#include "talk/base/timeutils.h" -+#include "talk/base/time.h" - - // The following logging is for detailed (packet-level) analysis only. - #define _DBG_NONE 0 -diff -up libjingle-0.6.10/talk/session/phone/rtpdump.cc.nextfix libjingle-0.6.10/talk/session/phone/rtpdump.cc ---- libjingle-0.6.10/talk/session/phone/rtpdump.cc.nextfix 2012-01-12 17:59:48.000000000 -0500 -+++ libjingle-0.6.10/talk/session/phone/rtpdump.cc 2012-02-13 20:59:48.532641270 -0500 -@@ -33,7 +33,7 @@ - - #include "talk/base/byteorder.h" - #include "talk/base/logging.h" --#include "talk/base/timeutils.h" -+#include "talk/base/time.h" - #include "talk/session/phone/rtputils.h" - - namespace cricket { -diff -up libjingle-0.6.10/talk/session/phone/videocommon.h.nextfix libjingle-0.6.10/talk/session/phone/videocommon.h ---- libjingle-0.6.10/talk/session/phone/videocommon.h.nextfix 2012-01-12 17:59:48.000000000 -0500 -+++ libjingle-0.6.10/talk/session/phone/videocommon.h 2012-02-13 20:59:48.533641259 -0500 -@@ -31,7 +31,7 @@ - #include <string> - - #include "talk/base/basictypes.h" --#include "talk/base/timeutils.h" -+#include "talk/base/time.h" - - namespace cricket { - diff --git a/libjingle-0.6.14-build-sanity.patch b/libjingle-0.6.14-build-sanity.patch deleted file mode 100644 index de37bdf..0000000 --- a/libjingle-0.6.14-build-sanity.patch +++ /dev/null @@ -1,853 +0,0 @@ -diff -up libjingle-0.6.14/configure.ac.SANITY libjingle-0.6.14/configure.ac ---- libjingle-0.6.14/configure.ac.SANITY 2012-06-11 15:19:25.240335579 -0400 -+++ libjingle-0.6.14/configure.ac 2012-06-11 15:23:05.590338885 -0400 -@@ -0,0 +1,114 @@ -+AC_INIT([libjingle], [0.6.0], [google-talk-open(a)googlegroups.com]) -+AC_CANONICAL_SYSTEM -+AM_CONFIG_HEADER(config.h) -+AM_INIT_AUTOMAKE([dist-zip]) -+AC_PROG_CC -+AC_PROG_CXX -+AM_PROG_LIBTOOL -+LIBTOOL="$LIBTOOL --silent" -+AC_PROG_INSTALL -+AC_DEFINE(PRODUCTION_BUILD, 1, [Build as a production build]) -+AC_DEFINE(PRODUCTION, 1, [Build as a production build]) -+AC_DEFINE(POSIX, 1, [If we're using configure, we're on POSIX]) -+AC_DEFINE(FEATURE_ENABLE_VOICEMAIL, 1, [voice mail]) -+AC_DEFINE(LOGGING, 1, [Logging]) -+ -+LIBJINGLE_MAJORMINOR=0.6 -+AC_SUBST(LIBJINGLE_MAJORMINOR) -+ -+LIBJINGLE_LIBRARY_VERSION=1:0:0 -+AC_SUBST(LIBJINGLE_LIBRARY_VERSION) -+ -+HAVE_EXPAT=no -+AC_CHECK_LIB(expat, XML_ParserCreate, HAVE_EXPAT="yes") -+if test "x$HAVE_EXPAT" = xyes ; then -+ EXPAT_LIBS="-lexpat" -+ AC_SUBST(EXPAT_LIBS) -+else -+ AC_ERROR([Expat is required to build libjingle. You can get it from http://expat.sourceforge.net/]) -+fi -+ -+if test `uname -s` = Linux ; then -+ AC_DEFINE(LINUX, 1, [Building on Linux]) -+ HAVE_ALSA=no -+ AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA="yes") -+ if test "x$HAVE_ALSA" = xyes ; then -+ ALSA_LIBS="-lasound" -+ AC_SUBST(ALSA_LIBS) -+ AC_DEFINE(HAVE_ALSA, 1, [Using ALSA]) -+ else -+ AC_ERROR([libasound is required to build libjingle. You can get it from http://www.alsa-project.org/]) -+ fi -+ -+ AC_CHECK_HEADER(openssl/ssl.h, HAVE_OPENSSL_SSL_H=yes, HAVE_OPENSSL_SSL_H=no) -+ if test x$HAVE_OPENSSL_SSL_H = xyes; then -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 1, [Found openssl/ssl.h]) -+ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7g, HAVE_OPENSSL=yes, HAVE_OPENSSL=no) -+ AC_SUBST(OPENSSL_CFLAGS) -+ AC_SUBST(OPENSSL_LIBS) -+ AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL]) -+ AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled]) -+ CPPFLAGS+="$OPENSSL_CFLAGS" -+ LDFLAGS+=" $OPENSSL_LIBS" -+ else -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 0, [Did not find openssl/ssl.h]) -+ fi -+ -+ PKG_CHECK_MODULES(GTK2, gtk+-2.0, enable_gtk=yes, enable_gtk=no) -+ if test x$enable_gtk = xno ; then -+ AC_ERROR([GTK2 is required to build libjingle.]) -+ else -+ AC_SUBST(GTK2_CFLAGS) -+ AC_SUBST(GTK2_LIBS) -+ AC_DEFINE(HAVE_GTK2, 1, [GTK2 present]) -+ fi -+fi -+ -+PKG_CHECK_MODULES(LIBSRTP, libsrtp >= 1.4.4, enable_srtp=yes, enable_srtp=no) -+if test x$enable_srtp = xno ; then -+ HAVE_SRTP=no -+else -+ AC_SUBST(LIBSRTP_CFLAGS) -+ AC_SUBST(LIBSRTP_LIBS) -+ AC_DEFINE(HAVE_SRTP, 1, [libSRTP provides SRTP supprt]) -+fi -+ -+PKG_CHECK_MODULES(XRENDER, xrender, enable_xrender=yes, enable_xrender=no) -+if test x$enable_xrender = xno ; then -+ AC_ERROR([xrender is required to build libjingle.]) -+else -+ AC_SUBST(XRENDER_CFLAGS) -+ AC_SUBST(XRENDER_LIBS) -+ AC_DEFINE(HAVE_XRENDER, 1, [xrender present]) -+fi -+ -+PKG_CHECK_MODULES(XCOMPOSITE, xcomposite, enable_xcomposite=yes, enable_xcomposite=no) -+if test x$enable_xcomposite = xno ; then -+ AC_ERROR([xcomposite is required to build libjingle.]) -+else -+ AC_SUBST(XCOMPOSITE_CFLAGS) -+ AC_SUBST(XCOMPOSITE_LIBS) -+ AC_DEFINE(HAVE_XCOMPOSITE, 1, [xcomposite present]) -+fi -+ -+AC_OUTPUT([Makefile -+ talk/Makefile -+ talk/base/Makefile -+ talk/examples/Makefile -+ talk/examples/login/Makefile -+ talk/examples/call/Makefile -+ talk/p2p/Makefile -+ talk/p2p/base/Makefile -+ talk/p2p/client/Makefile -+ talk/session/Makefile -+ talk/session/tunnel/Makefile -+ talk/session/phone/Makefile -+ talk/sound/Makefile -+ talk/xmllite/Makefile -+ talk/xmpp/Makefile -+ pkgconfig/Makefile -+ pkgconfig/jinglebase.pc -+ pkgconfig/jinglep2p.pc -+ pkgconfig/jinglesessiontunnel.pc -+ pkgconfig/jinglesessionphone.pc -+ ]) -diff -up libjingle-0.6.14/Makefile.am.SANITY libjingle-0.6.14/Makefile.am ---- libjingle-0.6.14/Makefile.am.SANITY 2012-06-11 15:19:25.240335579 -0400 -+++ libjingle-0.6.14/Makefile.am 2012-06-11 15:19:25.240335579 -0400 -@@ -0,0 +1,4 @@ -+SUBDIRS=talk pkgconfig -+ -+configdir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk -+config_HEADERS = config.h -diff -up libjingle-0.6.14/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.6.14/pkgconfig/jinglebase.pc.in ---- libjingle-0.6.14/pkgconfig/jinglebase.pc.in.SANITY 2012-06-11 15:19:25.241335579 -0400 -+++ libjingle-0.6.14/pkgconfig/jinglebase.pc.in 2012-06-11 15:19:25.241335579 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglebase -+Description: Jingle Base Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglebase -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.14/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.6.14/pkgconfig/jinglep2p.pc.in ---- libjingle-0.6.14/pkgconfig/jinglep2p.pc.in.SANITY 2012-06-11 15:19:25.241335579 -0400 -+++ libjingle-0.6.14/pkgconfig/jinglep2p.pc.in 2012-06-11 15:19:25.241335579 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglep2p -+Description: Jingle P2P Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -ljinglep2pbase -ljinglep2pclient -ljinglexmllite -ljinglexmpp -lexpat -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.14/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.6.14/pkgconfig/jinglesessionphone.pc.in ---- libjingle-0.6.14/pkgconfig/jinglesessionphone.pc.in.SANITY 2012-06-11 15:19:25.241335579 -0400 -+++ libjingle-0.6.14/pkgconfig/jinglesessionphone.pc.in 2012-06-11 15:19:25.241335579 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessionphone -+Description: Jingle Session Phone Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.14/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.6.14/pkgconfig/jinglesessiontunnel.pc.in ---- libjingle-0.6.14/pkgconfig/jinglesessiontunnel.pc.in.SANITY 2012-06-11 15:19:25.242335579 -0400 -+++ libjingle-0.6.14/pkgconfig/jinglesessiontunnel.pc.in 2012-06-11 15:19:25.242335579 -0400 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessiontunnel -+Description: Jingle Session Tunnel Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessiontunnel -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.14/pkgconfig/Makefile.am.SANITY libjingle-0.6.14/pkgconfig/Makefile.am ---- libjingle-0.6.14/pkgconfig/Makefile.am.SANITY 2012-06-11 15:19:25.242335579 -0400 -+++ libjingle-0.6.14/pkgconfig/Makefile.am 2012-06-11 15:19:25.242335579 -0400 -@@ -0,0 +1,20 @@ -+### all of the standard pc files we need to generate -+pcfiles = jinglebase-@LIBJINGLE_MAJORMINOR@.pc jinglep2p-@LIBJINGLE_MAJORMINOR@.pc jinglesessiontunnel-@LIBJINGLE_MAJORMINOR@.pc jinglesessionphone-@LIBJINGLE_MAJORMINOR@.pc -+ -+all-local: $(pcfiles) -+ -+### how to generate pc files -+%-@LIBJINGLE_MAJORMINOR@.pc: %.pc -+ cp $< $@ -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = $(pcfiles) -+ -+EXTRA_DIST = \ -+ jinglebase.pc.in \ -+ jinglep2p.pc.in \ -+ jinglesessionphone.pc.in \ -+ jinglesessiontunnel.pc.in -+ -+CLEANFILES = $(pcfiles) -+ -diff -up libjingle-0.6.14/talk/base/Makefile.am.SANITY libjingle-0.6.14/talk/base/Makefile.am ---- libjingle-0.6.14/talk/base/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400 -+++ libjingle-0.6.14/talk/base/Makefile.am 2012-06-11 15:19:25.243335579 -0400 -@@ -0,0 +1,208 @@ -+lib_LTLIBRARIES = libjinglebase.la -+ -+libjinglebase_la_SOURCES = asyncfile.cc \ -+ asynchttprequest.cc \ -+ asyncsocket.cc \ -+ asynctcpsocket.cc \ -+ asyncudpsocket.cc \ -+ autodetectproxy.cc \ -+ bandwidthsmoother.cc \ -+ base64.cc \ -+ basicpacketsocketfactory.cc \ -+ bytebuffer.cc \ -+ checks.cc \ -+ common.cc \ -+ cpuid.cc \ -+ cpumonitor.cc \ -+ dbus.cc \ -+ diskcache.cc \ -+ event.cc \ -+ filelock.cc \ -+ fileutils.cc \ -+ firewallsocketserver.cc \ -+ flags.cc \ -+ helpers.cc \ -+ host.cc \ -+ httpbase.cc \ -+ httpclient.cc \ -+ httpcommon.cc \ -+ httprequest.cc \ -+ httpserver.cc \ -+ ipaddress.cc \ -+ latebindingsymboltable.cc \ -+ libdbusglibsymboltable.cc \ -+ linux.cc \ -+ linuxfdwalk.cc \ -+ linuxwindowpicker.cc \ -+ logging.cc \ -+ md5c.c \ -+ messagehandler.cc \ -+ messagequeue.cc \ -+ multipart.cc \ -+ natserver.cc \ -+ natsocketfactory.cc \ -+ nattypes.cc \ -+ nethelpers.cc \ -+ network.cc \ -+ openssladapter.cc \ -+ opensslidentity.cc \ -+ opensslstreamadapter.cc \ -+ optionsfile.cc \ -+ pathutils.cc \ -+ physicalsocketserver.cc \ -+ posix.cc \ -+ proxydetect.cc \ -+ proxyinfo.cc \ -+ proxyserver.cc \ -+ ratetracker.cc \ -+ sharedexclusivelock.cc \ -+ signalthread.cc \ -+ socketadapters.cc \ -+ socketaddress.cc \ -+ socketaddresspair.cc \ -+ socketpool.cc \ -+ socketstream.cc \ -+ ssladapter.cc \ -+ sslidentity.cc \ -+ sslsocketfactory.cc \ -+ sslstreamadapter.cc \ -+ stream.cc \ -+ stringdigest.cc \ -+ stringencode.cc \ -+ stringutils.cc \ -+ systeminfo.cc \ -+ task.cc \ -+ taskparent.cc \ -+ taskrunner.cc \ -+ testclient.cc \ -+ thread.cc \ -+ timeutils.cc \ -+ timing.cc \ -+ transformadapter.cc \ -+ unixfilesystem.cc \ -+ urlencode.cc \ -+ versionparsing.cc \ -+ virtualsocketserver.cc \ -+ worker.cc -+ -+libjinglebase_la_LIBADD = -lrt $(XRENDER_LIBS) $(XCOMPOSITE_LIBS) -+ -+libjinglebase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglebase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/base -+ -+libjinglebase_include_HEADERS = asyncfile.h \ -+ asynchttprequest.h \ -+ asyncpacketsocket.h \ -+ asyncsocket.h \ -+ asynctcpsocket.h \ -+ asyncudpsocket.h \ -+ atomicops.h \ -+ autodetectproxy.h \ -+ bandwidthsmoother.h \ -+ base64.h \ -+ basicdefs.h \ -+ basicpacketsocketfactory.h \ -+ basictypes.h \ -+ buffer.h \ -+ bytebuffer.h \ -+ byteorder.h \ -+ checks.h \ -+ common.h \ -+ constructormagic.h \ -+ cpuid.h \ -+ cpumonitor.h \ -+ criticalsection.h \ -+ cryptstring.h \ -+ dbus.h \ -+ diskcache.h \ -+ event.h \ -+ fakenetwork.h \ -+ faketaskrunner.h \ -+ filelock.h \ -+ fileutils.h \ -+ fileutils_mock.h \ -+ firewallsocketserver.h \ -+ flags.h \ -+ gunit.h \ -+ helpers.h \ -+ host.h \ -+ httpbase.h \ -+ httpclient.h \ -+ httpcommon-inl.h \ -+ httpcommon.h \ -+ httprequest.h \ -+ httpserver.h \ -+ ipaddress.h \ -+ latebindingsymboltable.h \ -+ libdbusglibsymboltable.h \ -+ linked_ptr.h \ -+ linux.h \ -+ linuxfdwalk.h \ -+ logging.h \ -+ mathutils.h \ -+ md5.h \ -+ messagehandler.h \ -+ messagequeue.h \ -+ multipart.h \ -+ natserver.h \ -+ natsocketfactory.h \ -+ nattypes.h \ -+ nethelpers.h \ -+ network.h \ -+ openssladapter.h \ -+ opensslidentity.h \ -+ opensslstreamadapter.h \ -+ packetsocketfactory.h \ -+ pathutils.h \ -+ physicalsocketserver.h \ -+ posix.h \ -+ proxydetect.h \ -+ proxyinfo.h \ -+ proxyserver.h \ -+ ratetracker.h \ -+ refcount.h \ -+ referencecountedsingletonfactory.h \ -+ rollingaccumulator.h \ -+ scoped_autorelease_pool.h \ -+ scoped_ptr.h \ -+ scoped_ref_ptr.h \ -+ sec_buffer.h \ -+ sharedexclusivelock.h \ -+ signalthread.h \ -+ sigslot.h \ -+ sigslotrepeater.h \ -+ socket.h \ -+ socketadapters.h \ -+ socketaddress.h \ -+ socketaddresspair.h \ -+ socketfactory.h \ -+ socketpool.h \ -+ socketserver.h \ -+ socketstream.h \ -+ ssladapter.h \ -+ sslidentity.h \ -+ sslroots.h \ -+ sslsocketfactory.h \ -+ sslstreamadapter.h \ -+ stream.h \ -+ stringdigest.h \ -+ stringencode.h \ -+ stringutils.h \ -+ systeminfo.h \ -+ task.h \ -+ taskparent.h \ -+ taskrunner.h \ -+ thread.h \ -+ timeutils.h \ -+ timing.h \ -+ transformadapter.h \ -+ unixfilesystem.h \ -+ urlencode.h \ -+ versionparsing.h \ -+ virtualsocketserver.h \ -+ window.h \ -+ windowpicker.h \ -+ worker.h -+ -+AM_CXXFLAGS = -DPOSIX -DLINUX -DFEATURE_ENABLE_VOICEMAIL $(XRENDER_CFLAGS) $(XCOMPOSITE_CFLAGS) -diff -up libjingle-0.6.14/talk/examples/call/Makefile.am.SANITY libjingle-0.6.14/talk/examples/call/Makefile.am ---- libjingle-0.6.14/talk/examples/call/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400 -+++ libjingle-0.6.14/talk/examples/call/Makefile.am 2012-06-11 15:19:25.243335579 -0400 -@@ -0,0 +1,23 @@ -+bin_PROGRAMS = call -+call_CXXFLAGS = $(AM_CXXFLAGS) -+call_SOURCES = call_main.cc \ -+ callclient.cc \ -+ console.cc \ -+ discoitemsquerytask.cc \ -+ friendinvitesendtask.cc \ -+ mucinviterecvtask.cc \ -+ mucinvitesendtask.cc \ -+ presenceouttask.cc \ -+ presencepushtask.cc \ -+ voicemailjidrequester.cc -+noinst_HEADERS = callclient.h console.h -+call_LDADD = $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(top_srcdir)/talk/session/phone/libjinglesessionphone.la \ -+ $(top_srcdir)/talk/p2p/client/libjinglep2pclient.la \ -+ $(top_srcdir)/talk/p2p/base/libjinglep2pbase.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) $(ALSA_LIBS) $(LIBSRTP_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.14/talk/examples/login/Makefile.am.SANITY libjingle-0.6.14/talk/examples/login/Makefile.am ---- libjingle-0.6.14/talk/examples/login/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400 -+++ libjingle-0.6.14/talk/examples/login/Makefile.am 2012-06-11 15:19:25.243335579 -0400 -@@ -0,0 +1,24 @@ -+noinst_LTLIBRARIES= libxmpphelp.la -+libxmpphelp_la_SOURCES = xmppsocket.cc \ -+ xmppauth.cc \ -+ xmpppump.cc -+ -+noinst_HEADERS = xmppauth.h \ -+ xmpppump.h \ -+ xmppsocket.h \ -+ xmppthread.h \ -+ jingleinfotask.h \ -+ presenceouttask.h \ -+ presencepushtask.h \ -+ status.h -+ -+bin_PROGRAMS = login -+login_CXXFLAGS = $(AM_CXXFLAGS) -+login_SOURCES = login_main.cc xmppthread.cc -+login_LDADD = $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.14/talk/examples/Makefile.am.SANITY libjingle-0.6.14/talk/examples/Makefile.am ---- libjingle-0.6.14/talk/examples/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400 -+++ libjingle-0.6.14/talk/examples/Makefile.am 2012-06-11 15:19:25.243335579 -0400 -@@ -0,0 +1 @@ -+SUBDIRS=login call -diff -up libjingle-0.6.14/talk/Makefile.am.SANITY libjingle-0.6.14/talk/Makefile.am ---- libjingle-0.6.14/talk/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400 -+++ libjingle-0.6.14/talk/Makefile.am 2012-06-11 15:19:25.243335579 -0400 -@@ -0,0 +1 @@ -+SUBDIRS=base xmllite xmpp p2p session sound -diff -up libjingle-0.6.14/talk/p2p/base/Makefile.am.SANITY libjingle-0.6.14/talk/p2p/base/Makefile.am ---- libjingle-0.6.14/talk/p2p/base/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400 -+++ libjingle-0.6.14/talk/p2p/base/Makefile.am 2012-06-11 15:19:25.243335579 -0400 -@@ -0,0 +1,82 @@ -+lib_LTLIBRARIES = libjinglep2pbase.la -+ -+libjinglep2pbase_la_SOURCES = constants.cc \ -+ p2ptransport.cc \ -+ p2ptransportchannel.cc \ -+ parsing.cc \ -+ port.cc \ -+ portallocator.cc \ -+ portallocatorsessionproxy.cc \ -+ portproxy.cc \ -+ pseudotcp.cc \ -+ relayport.cc \ -+ relayserver.cc \ -+ rawtransport.cc \ -+ rawtransportchannel.cc \ -+ session.cc \ -+ sessiondescription.cc \ -+ sessionmanager.cc \ -+ sessionmessages.cc \ -+ stun.cc \ -+ stunport.cc \ -+ stunrequest.cc \ -+ stunserver.cc \ -+ tcpport.cc \ -+ transport.cc \ -+ transportchannel.cc \ -+ transportchannelproxy.cc \ -+ udpport.cc -+ -+libjinglep2pbase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/base -+libjinglep2pbase_include_HEADERS = candidate.h \ -+ common.h \ -+ constants.h \ -+ fakesession.h \ -+ p2ptransportchannel.h \ -+ p2ptransport.h \ -+ parsing.h \ -+ portallocator.h \ -+ portallocatorsessionproxy.h \ -+ port.h \ -+ portproxy.h \ -+ pseudotcp.h \ -+ rawtransportchannel.h \ -+ rawtransport.h \ -+ relayport.h \ -+ relayserver.h \ -+ sessionclient.h \ -+ sessiondescription.h \ -+ session.h \ -+ sessionid.h \ -+ sessionmanager.h \ -+ sessionmessages.h \ -+ stun.h \ -+ stunport.h \ -+ stunrequest.h \ -+ stunserver.h \ -+ tcpport.h \ -+ testrelayserver.h \ -+ teststunserver.h \ -+ transportchannel.h \ -+ transportchannelimpl.h \ -+ transportchannelproxy.h \ -+ transport.h \ -+ udpport.h -+ -+libjinglep2pbase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+libjinglep2pbase_la_LIBADD = $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la -+ -+AM_CPPFLAGS = -DPOSIX -DENABLE_DEBUG -D_DEBUG -g -DFEATURE_ENABLE_VOICEMAIL -+ -+P2PLIBS = libjinglep2pbase.la ../../base/libjinglebase.la -lpthread -+XMLLIBS = ../../xmllite/libjinglexmllite.la ../../xmpp/libjinglexmpp.la $(EXPAT_LIBS) -+ -+bin_PROGRAMS = relayserver stunserver -+relayserver_SOURCES = relayserver.cc relayserver_main.cc -+relayserver_LDADD = $(P2PLIBS) -+relayserver_CPPFLAGS = $(AM_CPPFLAGS) -+ -+stunserver_SOURCES = stunserver.cc stunserver_main.cc -+stunserver_LDADD = $(P2PLIBS) -+stunserver_CPPFLAGS = $(AM_CPPFLAGS) -diff -up libjingle-0.6.14/talk/p2p/client/Makefile.am.SANITY libjingle-0.6.14/talk/p2p/client/Makefile.am ---- libjingle-0.6.14/talk/p2p/client/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400 -+++ libjingle-0.6.14/talk/p2p/client/Makefile.am 2012-06-11 15:19:25.243335579 -0400 -@@ -0,0 +1,20 @@ -+lib_LTLIBRARIES = libjinglep2pclient.la -+ -+libjinglep2pclient_la_SOURCES = basicportallocator.cc \ -+ connectivitychecker.cc \ -+ httpportallocator.cc \ -+ socketmonitor.cc -+ -+libjinglep2pclient_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/client -+ -+libjinglep2pclient_include_HEADERS = basicportallocator.h \ -+ connectivitychecker.h \ -+ socketmonitor.h \ -+ sessionmanagertask.h \ -+ sessionsendtask.h \ -+ httpportallocator.h -+ -+libjinglep2pclient_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD -DFEATURE_ENABLE_VOICEMAIL -+ -diff -up libjingle-0.6.14/talk/p2p/Makefile.am.SANITY libjingle-0.6.14/talk/p2p/Makefile.am ---- libjingle-0.6.14/talk/p2p/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400 -+++ libjingle-0.6.14/talk/p2p/Makefile.am 2012-06-11 15:19:25.243335579 -0400 -@@ -0,0 +1 @@ -+SUBDIRS=base client -diff -up libjingle-0.6.14/talk/session/Makefile.am.SANITY libjingle-0.6.14/talk/session/Makefile.am ---- libjingle-0.6.14/talk/session/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400 -+++ libjingle-0.6.14/talk/session/Makefile.am 2012-06-11 15:19:25.243335579 -0400 -@@ -0,0 +1 @@ -+SUBDIRS = tunnel phone -diff -up libjingle-0.6.14/talk/session/phone/Makefile.am.SANITY libjingle-0.6.14/talk/session/phone/Makefile.am ---- libjingle-0.6.14/talk/session/phone/Makefile.am.SANITY 2012-06-11 15:19:25.244335579 -0400 -+++ libjingle-0.6.14/talk/session/phone/Makefile.am 2012-06-11 15:19:25.244335579 -0400 -@@ -0,0 +1,93 @@ -+lib_LTLIBRARIES = libjinglesessionphone.la -+ -+libjinglesessionphone_la_SOURCES = audiomonitor.cc \ -+ call.cc \ -+ channel.cc \ -+ channelmanager.cc \ -+ codec.cc \ -+ currentspeakermonitor.cc \ -+ devicemanager.cc \ -+ filemediaengine.cc \ -+ filevideocapturer.cc \ -+ gtkvideorenderer.cc \ -+ libudevsymboltable.cc \ -+ linuxdevicemanager.cc \ -+ mediaengine.cc \ -+ mediamessages.cc \ -+ mediamonitor.cc \ -+ mediarecorder.cc \ -+ mediasession.cc \ -+ mediasessionclient.cc \ -+ rtcpmuxfilter.cc \ -+ rtpdump.cc \ -+ rtputils.cc \ -+ soundclip.cc \ -+ srtpfilter.cc \ -+ ssrcmuxfilter.cc \ -+ v4llookup.cc \ -+ videoadapter.cc \ -+ videocapturer.cc \ -+ videocommon.cc \ -+ videoframe.cc -+ -+libjinglesessionphone_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/phone -+libjinglesessionphone_include_HEADERS = audioframe.h \ -+ audiomonitor.h \ -+ call.h \ -+ channel.h \ -+ channelmanager.h \ -+ codec.h \ -+ cryptoparams.h \ -+ currentspeakermonitor.h \ -+ devicemanager.h \ -+ fakedevicemanager.h \ -+ fakemediaengine.h \ -+ fakemediaprocessor.h \ -+ fakenetworkinterface.h \ -+ fakertp.h \ -+ fakevideocapturer.h \ -+ fakevideorenderer.h \ -+ fakewebrtccommon.h \ -+ fakewebrtcdeviceinfo.h \ -+ fakewebrtcvcmfactory.h \ -+ fakewebrtcvideocapturemodule.h \ -+ fakewebrtcvideoengine.h \ -+ fakewebrtcvoiceengine.h \ -+ filemediaengine.h \ -+ gtkvideorenderer.h \ -+ libudevsymboltable.h \ -+ linuxdevicemanager.h \ -+ mediachannel.h \ -+ mediacommon.h \ -+ mediaengine.h \ -+ mediamessages.h \ -+ mediamonitor.h \ -+ mediarecorder.h \ -+ mediasessionclient.h \ -+ mediasession.h \ -+ mediasink.h \ -+ nullvideorenderer.h \ -+ rtcpmuxfilter.h \ -+ rtpdump.h \ -+ rtputils.h \ -+ screencastid.h \ -+ soundclip.h \ -+ srtpfilter.h \ -+ ssrcmuxfilter.h \ -+ streamparams.h \ -+ v4llookup.h \ -+ videoadapter.h \ -+ videocapturer.h \ -+ videocommon.h \ -+ videoframe.h \ -+ videoprocessor.h \ -+ videorenderer.h \ -+ videorendererfactory.h \ -+ voicechannel.h \ -+ voiceprocessor.h -+ -+libjinglesessionphone_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglesessionphone_la_LIBADD = $(LIBSRTP_LIBS) $(GTK2_LIBS) -+ -+AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS) $(GTK2_CFLAGS) -DFEATURE_ENABLE_VOICEMAIL -diff -up libjingle-0.6.14/talk/session/tunnel/Makefile.am.SANITY libjingle-0.6.14/talk/session/tunnel/Makefile.am ---- libjingle-0.6.14/talk/session/tunnel/Makefile.am.SANITY 2012-06-11 15:19:25.244335579 -0400 -+++ libjingle-0.6.14/talk/session/tunnel/Makefile.am 2012-06-11 15:19:25.244335579 -0400 -@@ -0,0 +1,16 @@ -+lib_LTLIBRARIES = libjinglesessiontunnel.la -+ -+libjinglesessiontunnel_la_SOURCES = tunnelsessionclient.cc \ -+ securetunnelsessionclient.cc \ -+ pseudotcpchannel.cc -+ -+libjinglesessiontunnel_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/tunnel -+ -+libjinglesessiontunnel_include_HEADERS = tunnelsessionclient.h \ -+ pseudotcpchannel.h \ -+ securetunnelsessionclient.h -+ -+libjinglesessiontunnel_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CXXFLAGS = -DPOSIX -DFEATURE_ENABLE_VOICEMAIL -+ -diff -up libjingle-0.6.14/talk/sound/Makefile.am.SANITY libjingle-0.6.14/talk/sound/Makefile.am ---- libjingle-0.6.14/talk/sound/Makefile.am.SANITY 2012-06-11 15:19:25.244335579 -0400 -+++ libjingle-0.6.14/talk/sound/Makefile.am 2012-06-11 15:19:25.244335579 -0400 -@@ -0,0 +1,35 @@ -+lib_LTLIBRARIES = libjinglesound.la -+ -+libjinglesound_la_SOURCES = alsasoundsystem.cc \ -+ alsasymboltable.cc \ -+ linuxsoundsystem.cc \ -+ nullsoundsystem.cc \ -+ platformsoundsystem.cc \ -+ platformsoundsystemfactory.cc \ -+ pulseaudiosoundsystem.cc \ -+ pulseaudiosymboltable.cc \ -+ soundsysteminterface.cc \ -+ soundsystemproxy.cc -+ -+libjinglesound_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/sound -+ -+libjinglesound_include_HEADERS = alsasoundsystem.h \ -+ alsasymboltable.h \ -+ automaticallychosensoundsystem.h \ -+ linuxsoundsystem.h \ -+ nullsoundsystem.h \ -+ nullsoundsystemfactory.h \ -+ platformsoundsystem.h \ -+ platformsoundsystemfactory.h \ -+ pulseaudiosoundsystem.h \ -+ pulseaudiosymboltable.h \ -+ sounddevicelocator.h \ -+ soundinputstreaminterface.h \ -+ soundoutputstreaminterface.h \ -+ soundsystemfactory.h \ -+ soundsysteminterface.h \ -+ soundsystemproxy.h -+ -+libjinglesound_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CXXFLAGS = -DPOSIX -DFEATURE_ENABLE_VOICEMAIL -diff -up libjingle-0.6.14/talk/xmllite/Makefile.am.SANITY libjingle-0.6.14/talk/xmllite/Makefile.am ---- libjingle-0.6.14/talk/xmllite/Makefile.am.SANITY 2012-06-11 15:19:25.244335579 -0400 -+++ libjingle-0.6.14/talk/xmllite/Makefile.am 2012-06-11 15:19:25.244335579 -0400 -@@ -0,0 +1,21 @@ -+lib_LTLIBRARIES = libjinglexmllite.la -+ -+libjinglexmllite_la_SOURCES = qname.cc \ -+ xmlbuilder.cc \ -+ xmlconstants.cc \ -+ xmlelement.cc \ -+ xmlnsstack.cc \ -+ xmlparser.cc \ -+ xmlprinter.cc -+ -+libjinglexmllite_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmllite -+libjinglexmllite_include_HEADERS = qname.h \ -+ xmlbuilder.h \ -+ xmlconstants.h \ -+ xmlelement.h \ -+ xmlnsstack.h \ -+ xmlparser.h \ -+ xmlprinter.h -+AM_CPPFLAGS = -DPOSIX -+ -+libjinglexmllite_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) $(EXPAT_LIBS) -diff -up libjingle-0.6.14/talk/xmpp/Makefile.am.SANITY libjingle-0.6.14/talk/xmpp/Makefile.am ---- libjingle-0.6.14/talk/xmpp/Makefile.am.SANITY 2012-06-11 15:19:25.244335579 -0400 -+++ libjingle-0.6.14/talk/xmpp/Makefile.am 2012-06-11 15:19:25.244335579 -0400 -@@ -0,0 +1,57 @@ -+lib_LTLIBRARIES = libjinglexmpp.la -+ -+libjinglexmpp_la_SOURCES = constants.cc \ -+ hangoutpubsubclient.cc \ -+ iqtask.cc \ -+ jid.cc \ -+ moduleimpl.cc \ -+ mucroomconfigtask.cc \ -+ mucroomhistorytask.cc \ -+ mucroomlookuptask.cc \ -+ pubsubclient.cc \ -+ pubsub_task.cc \ -+ pubsubtasks.cc \ -+ receivetask.cc \ -+ saslmechanism.cc \ -+ xmppclient.cc \ -+ xmppengineimpl.cc \ -+ xmppengineimpl_iq.cc \ -+ xmpplogintask.cc \ -+ xmppstanzaparser.cc \ -+ xmpptask.cc -+ -+libjinglexmpp_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmpp -+libjinglexmpp_include_HEADERS = asyncsocket.h \ -+ chatroommodule.h \ -+ constants.h \ -+ fakexmppclient.h \ -+ hangoutpubsubclient.h \ -+ iqtask.h \ -+ jid.h \ -+ module.h \ -+ moduleimpl.h \ -+ mucroomconfigtask.h \ -+ mucroomhistorytask.h \ -+ mucroomlookuptask.h \ -+ plainsaslhandler.h \ -+ prexmppauth.h \ -+ pubsubclient.h \ -+ pubsub_task.h \ -+ pubsubtasks.h \ -+ receivetask.h \ -+ rostermodule.h \ -+ saslcookiemechanism.h \ -+ saslhandler.h \ -+ saslmechanism.h \ -+ saslplainmechanism.h \ -+ xmppclient.h \ -+ xmppclientsettings.h \ -+ xmppengine.h \ -+ xmppengineimpl.h \ -+ xmpplogintask.h \ -+ xmppstanzaparser.h \ -+ xmpptask.h -+ -+libjinglexmpp_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -DPOSIX -DFEATURE_ENABLE_VOICEMAIL diff --git a/libjingle-0.6.14-devicemanager-fix.patch b/libjingle-0.6.14-devicemanager-fix.patch deleted file mode 100644 index 9b3a45e..0000000 --- a/libjingle-0.6.14-devicemanager-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libjingle-0.6.14/talk/session/phone/devicemanager.cc.alsa libjingle-0.6.14/talk/session/phone/devicemanager.cc ---- libjingle-0.6.14/talk/session/phone/devicemanager.cc.alsa 2012-02-28 19:22:42.000000000 -0500 -+++ libjingle-0.6.14/talk/session/phone/devicemanager.cc 2012-06-11 14:16:26.367278877 -0400 -@@ -25,6 +25,8 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include "config.h" -+ - #include "talk/session/phone/devicemanager.h" - - #include "talk/base/fileutils.h" diff --git a/libjingle-0.6.14-openssl-1.1.patch b/libjingle-0.6.14-openssl-1.1.patch deleted file mode 100644 index d470bbc..0000000 --- a/libjingle-0.6.14-openssl-1.1.patch +++ /dev/null @@ -1,247 +0,0 @@ -diff -up libjingle-0.6.14/talk/base/openssladapter.cc.openssl11 libjingle-0.6.14/talk/base/openssladapter.cc ---- libjingle-0.6.14/talk/base/openssladapter.cc.openssl11 2017-02-20 15:00:27.678103635 -0500 -+++ libjingle-0.6.14/talk/base/openssladapter.cc 2017-02-20 15:57:36.884341533 -0500 -@@ -84,6 +84,7 @@ static long socket_ctrl(BIO* h, int cmd, - static int socket_new(BIO* h); - static int socket_free(BIO* data); - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - static BIO_METHOD methods_socket = { - BIO_TYPE_BIO, - "socket", -@@ -98,16 +99,36 @@ static BIO_METHOD methods_socket = { - }; - - BIO_METHOD* BIO_s_socket2() { return(&methods_socket); } -+#else -+static BIO_METHOD *methods_socket = NULL; -+ -+static const BIO_METHOD * BIO_s_socket2(void) { -+ if (methods_socket == NULL) { -+ methods_socket = BIO_meth_new (BIO_TYPE_BIO | BIO_get_new_index (), "socket"); -+ if (methods_socket == NULL || -+ BIO_meth_set_write (methods_socket, socket_write) || -+ BIO_meth_set_read (methods_socket, socket_read) || -+ BIO_meth_set_puts (methods_socket, socket_puts) || -+ BIO_meth_set_gets (methods_socket, 0) || -+ BIO_meth_set_ctrl (methods_socket, socket_ctrl) || -+ BIO_meth_set_create (methods_socket, socket_new) || -+ BIO_meth_set_destroy (methods_socket, socket_free)) -+ return NULL; -+ } -+ return methods_socket; -+} -+#endif - - BIO* BIO_new_socket(talk_base::AsyncSocket* socket) { - BIO* ret = BIO_new(BIO_s_socket2()); - if (ret == NULL) { - return NULL; - } -- ret->ptr = socket; -+ BIO_set_data(ret, socket); - return ret; - } - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - static int socket_new(BIO* b) { - b->shutdown = 0; - b->init = 1; -@@ -115,6 +136,14 @@ static int socket_new(BIO* b) { - b->ptr = 0; - return 1; - } -+#else -+static int socket_new(BIO* b) { -+ BIO_set_shutdown(b, 0); -+ BIO_set_init(b, 1); -+ BIO_set_data(b, 0); -+ return 1; -+} -+#endif - - static int socket_free(BIO* b) { - if (b == NULL) -@@ -125,13 +154,11 @@ static int socket_free(BIO* b) { - static int socket_read(BIO* b, char* out, int outl) { - if (!out) - return -1; -- talk_base::AsyncSocket* socket = static_cast<talk_base::AsyncSocket*>(b->ptr); -+ talk_base::AsyncSocket* socket = static_cast<talk_base::AsyncSocket*>(BIO_get_data(b)); - BIO_clear_retry_flags(b); - int result = socket->Recv(out, outl); - if (result > 0) { - return result; -- } else if (result == 0) { -- b->num = 1; - } else if (socket->IsBlocking()) { - BIO_set_retry_read(b); - } -@@ -141,7 +168,7 @@ static int socket_read(BIO* b, char* out - static int socket_write(BIO* b, const char* in, int inl) { - if (!in) - return -1; -- talk_base::AsyncSocket* socket = static_cast<talk_base::AsyncSocket*>(b->ptr); -+ talk_base::AsyncSocket* socket = static_cast<talk_base::AsyncSocket*>(BIO_get_data(b)); - BIO_clear_retry_flags(b); - int result = socket->Send(in, inl); - if (result > 0) { -@@ -164,7 +191,6 @@ static long socket_ctrl(BIO* b, int cmd, - case BIO_CTRL_RESET: - return 0; - case BIO_CTRL_EOF: -- return b->num; - case BIO_CTRL_WPENDING: - case BIO_CTRL_PENDING: - return 0; -@@ -696,7 +722,9 @@ bool OpenSSLAdapter::VerifyServerName(SS - // We assign this to a local variable, instead of passing the address - // directly to ASN1_item_d2i. - // See http://readlist.com/lists/openssl.org/openssl-users/0/4761.html. -- unsigned char* ext_value_data = extension->value->data; -+ ASN1_OCTET_STRING *extension_data = X509_EXTENSION_get_data(extension); -+ unsigned char* ext_value_data = extension_data->data; -+ long length = extension_data->length; - - #if OPENSSL_VERSION_NUMBER >= 0x0090800fL - const unsigned char **ext_value_data_ptr = -@@ -707,10 +735,10 @@ bool OpenSSLAdapter::VerifyServerName(SS - - if (meth->it) { - ext_str = ASN1_item_d2i(NULL, ext_value_data_ptr, -- extension->value->length, -+ length, - ASN1_ITEM_ptr(meth->it)); - } else { -- ext_str = meth->d2i(NULL, ext_value_data_ptr, extension->value->length); -+ ext_str = meth->d2i(NULL, ext_value_data_ptr, length); - } - - STACK_OF(CONF_VALUE)* value = meth->i2v(meth, ext_str, NULL); -diff -up libjingle-0.6.14/talk/base/opensslidentity.cc.openssl11 libjingle-0.6.14/talk/base/opensslidentity.cc ---- libjingle-0.6.14/talk/base/opensslidentity.cc.openssl11 2017-02-20 15:58:26.642105790 -0500 -+++ libjingle-0.6.14/talk/base/opensslidentity.cc 2017-02-20 16:04:05.130707597 -0500 -@@ -168,7 +168,12 @@ OpenSSLKeyPair::~OpenSSLKeyPair() { - } - - void OpenSSLKeyPair::AddReference() { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - CRYPTO_add(&pkey_->references, 1, CRYPTO_LOCK_EVP_PKEY); -+#else -+ EVP_PKEY_up_ref(pkey_); -+#endif -+ - } - - #ifdef _DEBUG -@@ -314,7 +319,11 @@ std::string OpenSSLCertificate::ToPEMStr - } - - void OpenSSLCertificate::AddReference() { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - CRYPTO_add(&x509_->references, 1, CRYPTO_LOCK_X509); -+#else -+ X509_up_ref(x509_); -+#endif - } - - OpenSSLIdentity* OpenSSLIdentity::Generate(const std::string& common_name) { -diff -up libjingle-0.6.14/talk/base/opensslstreamadapter.cc.openssl11 libjingle-0.6.14/talk/base/opensslstreamadapter.cc ---- libjingle-0.6.14/talk/base/opensslstreamadapter.cc.openssl11 2017-02-20 16:05:03.402259071 -0500 -+++ libjingle-0.6.14/talk/base/opensslstreamadapter.cc 2017-02-20 16:12:45.682795913 -0500 -@@ -86,6 +86,7 @@ static long stream_ctrl(BIO* h, int cmd, - static int stream_new(BIO* h); - static int stream_free(BIO* data); - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - static BIO_METHOD methods_stream = { - BIO_TYPE_BIO, - "stream", -@@ -100,17 +101,37 @@ static BIO_METHOD methods_stream = { - }; - - static BIO_METHOD* BIO_s_stream() { return(&methods_stream); } -+#else -+static BIO_METHOD *methods_stream = NULL; -+ -+static const BIO_METHOD * BIO_s_stream(void) { -+ if (methods_stream == NULL) { -+ methods_stream = BIO_meth_new (BIO_TYPE_BIO | BIO_get_new_index (), "stream"); -+ if (methods_stream == NULL || -+ BIO_meth_set_write (methods_stream, stream_write) || -+ BIO_meth_set_read (methods_stream, stream_read) || -+ BIO_meth_set_puts (methods_stream, stream_puts) || -+ BIO_meth_set_gets (methods_stream, 0) || -+ BIO_meth_set_ctrl (methods_stream, stream_ctrl) || -+ BIO_meth_set_create (methods_stream, stream_new) || -+ BIO_meth_set_destroy (methods_stream, stream_free)) -+ return NULL; -+ } -+ return methods_stream; -+} -+#endif - - static BIO* BIO_new_stream(StreamInterface* stream) { - BIO* ret = BIO_new(BIO_s_stream()); - if (ret == NULL) - return NULL; -- ret->ptr = stream; -+ BIO_set_data(ret, stream); - return ret; - } - - // bio methods return 1 (or at least non-zero) on success and 0 on failure. - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - static int stream_new(BIO* b) { - b->shutdown = 0; - b->init = 1; -@@ -118,6 +139,14 @@ static int stream_new(BIO* b) { - b->ptr = 0; - return 1; - } -+#else -+static int stream_new(BIO* b) { -+ BIO_set_shutdown(b, 0); -+ BIO_set_init(b, 1); -+ BIO_set_data(b, 0); -+ return 1; -+} -+#endif - - static int stream_free(BIO* b) { - if (b == NULL) -@@ -128,15 +157,13 @@ static int stream_free(BIO* b) { - static int stream_read(BIO* b, char* out, int outl) { - if (!out) - return -1; -- StreamInterface* stream = static_cast<StreamInterface*>(b->ptr); -+ StreamInterface* stream = static_cast<StreamInterface*>(BIO_get_data(b)); - BIO_clear_retry_flags(b); - size_t read; - int error; - StreamResult result = stream->Read(out, outl, &read, &error); - if (result == SR_SUCCESS) { - return read; -- } else if (result == SR_EOS) { -- b->num = 1; - } else if (result == SR_BLOCK) { - BIO_set_retry_read(b); - } -@@ -146,7 +173,7 @@ static int stream_read(BIO* b, char* out - static int stream_write(BIO* b, const char* in, int inl) { - if (!in) - return -1; -- StreamInterface* stream = static_cast<StreamInterface*>(b->ptr); -+ StreamInterface* stream = static_cast<StreamInterface*>(BIO_get_data(b)); - BIO_clear_retry_flags(b); - size_t written; - int error; -@@ -171,7 +198,6 @@ static long stream_ctrl(BIO* b, int cmd, - case BIO_CTRL_RESET: - return 0; - case BIO_CTRL_EOF: -- return b->num; - case BIO_CTRL_WPENDING: - case BIO_CTRL_PENDING: - return 0; diff --git a/libjingle-0.6.6-build-sanity.patch b/libjingle-0.6.6-build-sanity.patch deleted file mode 100644 index ae0255d..0000000 --- a/libjingle-0.6.6-build-sanity.patch +++ /dev/null @@ -1,661 +0,0 @@ -diff -up libjingle-0.6.6/configure.ac.SANITY libjingle-0.6.6/configure.ac ---- libjingle-0.6.6/configure.ac.SANITY 2012-01-05 14:15:32.619937860 -0500 -+++ libjingle-0.6.6/configure.ac 2012-01-05 14:15:32.619937860 -0500 -@@ -0,0 +1,95 @@ -+AC_INIT([libjingle], [0.6.0], [google-talk-open(a)googlegroups.com]) -+AC_CANONICAL_SYSTEM -+AM_CONFIG_HEADER(config.h) -+AM_INIT_AUTOMAKE([dist-zip]) -+AC_PROG_CC -+AC_PROG_CXX -+AM_PROG_LIBTOOL -+LIBTOOL="$LIBTOOL --silent" -+AC_PROG_INSTALL -+AC_DEFINE(PRODUCTION_BUILD, 1, [Build as a production build]) -+AC_DEFINE(PRODUCTION, 1, [Build as a production build]) -+AC_DEFINE(POSIX, 1, [If we're using configure, we're on POSIX]) -+AC_DEFINE(FEATURE_ENABLE_VOICEMAIL, 1, [voice mail]) -+AC_DEFINE(LOGGING, 1, [Logging]) -+ -+LIBJINGLE_MAJORMINOR=0.6 -+AC_SUBST(LIBJINGLE_MAJORMINOR) -+ -+LIBJINGLE_LIBRARY_VERSION=1:0:0 -+AC_SUBST(LIBJINGLE_LIBRARY_VERSION) -+ -+HAVE_EXPAT=no -+AC_CHECK_LIB(expat, XML_ParserCreate, HAVE_EXPAT="yes") -+if test "x$HAVE_EXPAT" = xyes ; then -+ EXPAT_LIBS="-lexpat" -+ AC_SUBST(EXPAT_LIBS) -+else -+ AC_ERROR([Expat is required to build libjingle. You can get it from http://expat.sourceforge.net/]) -+fi -+ -+if test `uname -s` = Linux ; then -+ AC_DEFINE(LINUX, 1, [Building on Linux]) -+ HAVE_ALSA=no -+ AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA="yes") -+ if test "x$HAVE_ALSA" = xyes ; then -+ ALSA_LIBS="-lasound" -+ AC_SUBST(ALSA_LIBS) -+ AC_DEFINE(HAVE_ALSA, 1, [Using ALSA]) -+ else -+ AC_ERROR([libasound is required to build libjingle. You can get it from http://www.alsa-project.org/]) -+ fi -+ -+ AC_CHECK_HEADER(openssl/ssl.h, HAVE_OPENSSL_SSL_H=yes, HAVE_OPENSSL_SSL_H=no) -+ if test x$HAVE_OPENSSL_SSL_H = xyes; then -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 1, [Found openssl/ssl.h]) -+ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7g, HAVE_OPENSSL=yes, HAVE_OPENSSL=no) -+ AC_SUBST(OPENSSL_CFLAGS) -+ AC_SUBST(OPENSSL_LIBS) -+ AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL]) -+ AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled]) -+ CPPFLAGS+="$OPENSSL_CFLAGS" -+ LDFLAGS+=" $OPENSSL_LIBS" -+ else -+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 0, [Did not find openssl/ssl.h]) -+ fi -+ -+ PKG_CHECK_MODULES(GTK2, gtk+-2.0, enable_gtk=yes, enable_gtk=no) -+ if test x$enable_gtk = xno ; then -+ AC_ERROR([GTK2 is required to build libjingle.]) -+ else -+ AC_SUBST(GTK2_CFLAGS) -+ AC_SUBST(GTK2_LIBS) -+ AC_DEFINE(HAVE_GTK2, 1, [GTK2 present]) -+ fi -+fi -+ -+PKG_CHECK_MODULES(LIBSRTP, libsrtp >= 1.4.4, enable_srtp=yes, enable_srtp=no) -+if test x$enable_srtp = xno ; then -+ HAVE_SRTP=no -+else -+ AC_SUBST(LIBSRTP_CFLAGS) -+ AC_SUBST(LIBSRTP_LIBS) -+ AC_DEFINE(HAVE_SRTP, 1, [libSRTP provides SRTP supprt]) -+fi -+ -+AC_OUTPUT([Makefile -+ talk/Makefile -+ talk/base/Makefile -+ talk/examples/Makefile -+ talk/examples/login/Makefile -+ talk/examples/call/Makefile -+ talk/p2p/Makefile -+ talk/p2p/base/Makefile -+ talk/p2p/client/Makefile -+ talk/session/Makefile -+ talk/session/tunnel/Makefile -+ talk/session/phone/Makefile -+ talk/xmllite/Makefile -+ talk/xmpp/Makefile -+ pkgconfig/Makefile -+ pkgconfig/jinglebase.pc -+ pkgconfig/jinglep2p.pc -+ pkgconfig/jinglesessiontunnel.pc -+ pkgconfig/jinglesessionphone.pc -+ ]) -diff -up libjingle-0.6.6/Makefile.am.SANITY libjingle-0.6.6/Makefile.am ---- libjingle-0.6.6/Makefile.am.SANITY 2012-01-05 14:15:32.619937860 -0500 -+++ libjingle-0.6.6/Makefile.am 2012-01-05 14:15:32.619937860 -0500 -@@ -0,0 +1,4 @@ -+SUBDIRS=talk pkgconfig -+ -+configdir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk -+config_HEADERS = config.h -diff -up libjingle-0.6.6/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.6.6/pkgconfig/jinglebase.pc.in ---- libjingle-0.6.6/pkgconfig/jinglebase.pc.in.SANITY 2012-01-05 14:15:32.620937850 -0500 -+++ libjingle-0.6.6/pkgconfig/jinglebase.pc.in 2012-01-05 14:15:32.620937850 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglebase -+Description: Jingle Base Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglebase -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.6/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.6.6/pkgconfig/jinglep2p.pc.in ---- libjingle-0.6.6/pkgconfig/jinglep2p.pc.in.SANITY 2012-01-05 14:15:32.621937840 -0500 -+++ libjingle-0.6.6/pkgconfig/jinglep2p.pc.in 2012-01-05 14:15:32.620937850 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglep2p -+Description: Jingle P2P Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -ljinglep2pbase -ljinglep2pclient -ljinglexmllite -ljinglexmpp -lexpat -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.6/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.6.6/pkgconfig/jinglesessionphone.pc.in ---- libjingle-0.6.6/pkgconfig/jinglesessionphone.pc.in.SANITY 2012-01-05 14:15:32.621937840 -0500 -+++ libjingle-0.6.6/pkgconfig/jinglesessionphone.pc.in 2012-01-05 14:15:32.621937840 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessionphone -+Description: Jingle Session Phone Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.6/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.6.6/pkgconfig/jinglesessiontunnel.pc.in ---- libjingle-0.6.6/pkgconfig/jinglesessiontunnel.pc.in.SANITY 2012-01-05 14:15:32.621937840 -0500 -+++ libjingle-0.6.6/pkgconfig/jinglesessiontunnel.pc.in 2012-01-05 14:15:32.621937840 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: jinglesessiontunnel -+Description: Jingle Session Tunnel Library -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lpthread -ljinglesessiontunnel -+Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX -+ -diff -up libjingle-0.6.6/pkgconfig/Makefile.am.SANITY libjingle-0.6.6/pkgconfig/Makefile.am ---- libjingle-0.6.6/pkgconfig/Makefile.am.SANITY 2012-01-05 14:15:32.622937831 -0500 -+++ libjingle-0.6.6/pkgconfig/Makefile.am 2012-01-05 14:15:32.622937831 -0500 -@@ -0,0 +1,20 @@ -+### all of the standard pc files we need to generate -+pcfiles = jinglebase-@LIBJINGLE_MAJORMINOR@.pc jinglep2p-@LIBJINGLE_MAJORMINOR@.pc jinglesessiontunnel-@LIBJINGLE_MAJORMINOR@.pc jinglesessionphone-@LIBJINGLE_MAJORMINOR@.pc -+ -+all-local: $(pcfiles) -+ -+### how to generate pc files -+%-@LIBJINGLE_MAJORMINOR@.pc: %.pc -+ cp $< $@ -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = $(pcfiles) -+ -+EXTRA_DIST = \ -+ jinglebase.pc.in \ -+ jinglep2p.pc.in \ -+ jinglesessionphone.pc.in \ -+ jinglesessiontunnel.pc.in -+ -+CLEANFILES = $(pcfiles) -+ -diff -up libjingle-0.6.6/talk/base/Makefile.am.SANITY libjingle-0.6.6/talk/base/Makefile.am ---- libjingle-0.6.6/talk/base/Makefile.am.SANITY 2012-01-05 14:15:32.622937831 -0500 -+++ libjingle-0.6.6/talk/base/Makefile.am 2012-01-05 14:16:31.803383756 -0500 -@@ -0,0 +1,144 @@ -+lib_LTLIBRARIES = libjinglebase.la -+ -+libjinglebase_la_SOURCES = asyncfile.cc \ -+ asynchttprequest.cc \ -+ asyncsocket.cc \ -+ asynctcpsocket.cc \ -+ asyncudpsocket.cc \ -+ autodetectproxy.cc \ -+ base64.cc \ -+ basicpacketsocketfactory.cc \ -+ bytebuffer.cc \ -+ checks.cc \ -+ common.cc \ -+ diskcache.cc \ -+ event.cc \ -+ fileutils.cc \ -+ firewallsocketserver.cc \ -+ flags.cc \ -+ helpers.cc \ -+ host.cc \ -+ httpbase.cc \ -+ httpclient.cc \ -+ httpcommon.cc \ -+ httprequest.cc \ -+ ipaddress.cc \ -+ linux.cc \ -+ logging.cc \ -+ md5c.c \ -+ messagehandler.cc \ -+ messagequeue.cc \ -+ nethelpers.cc \ -+ network.cc \ -+ openssladapter.cc \ -+ opensslidentity.cc \ -+ opensslstreamadapter.cc \ -+ pathutils.cc \ -+ physicalsocketserver.cc \ -+ proxydetect.cc \ -+ proxyinfo.cc \ -+ ratetracker.cc \ -+ signalthread.cc \ -+ socketadapters.cc \ -+ socketaddress.cc \ -+ socketaddresspair.cc \ -+ socketpool.cc \ -+ socketstream.cc \ -+ ssladapter.cc \ -+ sslsocketfactory.cc \ -+ sslstreamadapter.cc \ -+ stream.cc \ -+ stringdigest.cc \ -+ stringencode.cc \ -+ stringutils.cc \ -+ task.cc \ -+ taskparent.cc \ -+ taskrunner.cc \ -+ thread.cc \ -+ time.cc \ -+ unixfilesystem.cc \ -+ urlencode.cc -+ -+libjinglebase_la_LIBADD = -lrt -+ -+libjinglebase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglebase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/base -+ -+libjinglebase_include_HEADERS = asyncfile.h \ -+ asynchttprequest.h \ -+ asyncpacketsocket.h \ -+ asyncsocket.h \ -+ asynctcpsocket.h \ -+ asyncudpsocket.h \ -+ autodetectproxy.h \ -+ base64.h \ -+ basicdefs.h \ -+ basicpacketsocketfactory.h \ -+ basictypes.h \ -+ bytebuffer.h \ -+ byteorder.h \ -+ checks.h \ -+ common.h \ -+ constructormagic.h \ -+ criticalsection.h \ -+ cryptstring.h \ -+ diskcache.h \ -+ event.h \ -+ fileutils.h \ -+ firewallsocketserver.h \ -+ flags.h \ -+ helpers.h \ -+ host.h \ -+ httpbase.h \ -+ httpclient.h \ -+ httpcommon-inl.h \ -+ httpcommon.h \ -+ httprequest.h \ -+ ipaddress.h \ -+ linked_ptr.h \ -+ linux.h \ -+ logging.h \ -+ md5.h \ -+ messagehandler.h \ -+ messagequeue.h \ -+ nethelpers.h \ -+ network.h \ -+ openssladapter.h \ -+ opensslidentity.h \ -+ opensslstreamadapter.h \ -+ packetsocketfactory.h \ -+ pathutils.h \ -+ physicalsocketserver.h \ -+ proxydetect.h \ -+ proxyinfo.h \ -+ ratetracker.h \ -+ scoped_ptr.h \ -+ sec_buffer.h \ -+ signalthread.h \ -+ sigslot.h \ -+ sigslotrepeater.h \ -+ socket.h \ -+ socketadapters.h \ -+ socketaddress.h \ -+ socketaddresspair.h \ -+ socketfactory.h \ -+ socketpool.h \ -+ socketserver.h \ -+ socketstream.h \ -+ ssladapter.h \ -+ sslsocketfactory.h \ -+ sslstreamadapter.h \ -+ stream.h \ -+ stringdigest.h \ -+ stringencode.h \ -+ stringutils.h \ -+ task.h \ -+ taskparent.h \ -+ taskrunner.h \ -+ thread.h \ -+ time.h \ -+ unixfilesystem.h \ -+ urlencode.h -+ -+AM_CXXFLAGS = -DPOSIX -diff -up libjingle-0.6.6/talk/examples/call/Makefile.am.SANITY libjingle-0.6.6/talk/examples/call/Makefile.am ---- libjingle-0.6.6/talk/examples/call/Makefile.am.SANITY 2012-01-05 14:15:32.623937822 -0500 -+++ libjingle-0.6.6/talk/examples/call/Makefile.am 2012-01-05 14:15:32.623937822 -0500 -@@ -0,0 +1,23 @@ -+bin_PROGRAMS = call -+call_CXXFLAGS = $(AM_CXXFLAGS) -+call_SOURCES = call_main.cc \ -+ callclient.cc \ -+ console.cc \ -+ discoitemsquerytask.cc \ -+ friendinvitesendtask.cc \ -+ mucinviterecvtask.cc \ -+ mucinvitesendtask.cc \ -+ presenceouttask.cc \ -+ presencepushtask.cc \ -+ voicemailjidrequester.cc -+noinst_HEADERS = callclient.h console.h -+call_LDADD = $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(top_srcdir)/talk/session/phone/libjinglesessionphone.la \ -+ $(top_srcdir)/talk/p2p/client/libjinglep2pclient.la \ -+ $(top_srcdir)/talk/p2p/base/libjinglep2pbase.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) $(ALSA_LIBS) $(LIBSRTP_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.6/talk/examples/login/Makefile.am.SANITY libjingle-0.6.6/talk/examples/login/Makefile.am ---- libjingle-0.6.6/talk/examples/login/Makefile.am.SANITY 2012-01-05 14:15:32.624937812 -0500 -+++ libjingle-0.6.6/talk/examples/login/Makefile.am 2012-01-05 14:15:32.623937822 -0500 -@@ -0,0 +1,24 @@ -+noinst_LTLIBRARIES= libxmpphelp.la -+libxmpphelp_la_SOURCES = xmppsocket.cc \ -+ xmppauth.cc \ -+ xmpppump.cc -+ -+noinst_HEADERS = xmppauth.h \ -+ xmpppump.h \ -+ xmppsocket.h \ -+ xmppthread.h \ -+ jingleinfotask.h \ -+ presenceouttask.h \ -+ presencepushtask.h \ -+ status.h -+ -+bin_PROGRAMS = login -+login_CXXFLAGS = $(AM_CXXFLAGS) -+login_SOURCES = login_main.cc xmppthread.cc -+login_LDADD = $(top_srcdir)/talk/xmpp/libjinglexmpp.la \ -+ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/base/libjinglebase.la \ -+ $(top_srcdir)/talk/examples/login/libxmpphelp.la \ -+ $(EXPAT_LIBS) $(OPENSSL_LIBS) -lpthread -+AM_CPPFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.6/talk/examples/Makefile.am.SANITY libjingle-0.6.6/talk/examples/Makefile.am ---- libjingle-0.6.6/talk/examples/Makefile.am.SANITY 2012-01-05 14:15:32.624937812 -0500 -+++ libjingle-0.6.6/talk/examples/Makefile.am 2012-01-05 14:15:32.624937812 -0500 -@@ -0,0 +1 @@ -+SUBDIRS=login call -diff -up libjingle-0.6.6/talk/Makefile.am.SANITY libjingle-0.6.6/talk/Makefile.am ---- libjingle-0.6.6/talk/Makefile.am.SANITY 2012-01-05 14:15:32.624937812 -0500 -+++ libjingle-0.6.6/talk/Makefile.am 2012-01-05 14:15:32.624937812 -0500 -@@ -0,0 +1 @@ -+SUBDIRS=base xmllite xmpp p2p session -diff -up libjingle-0.6.6/talk/p2p/base/Makefile.am.SANITY libjingle-0.6.6/talk/p2p/base/Makefile.am ---- libjingle-0.6.6/talk/p2p/base/Makefile.am.SANITY 2012-01-05 14:15:32.625937802 -0500 -+++ libjingle-0.6.6/talk/p2p/base/Makefile.am 2012-01-05 14:15:32.625937802 -0500 -@@ -0,0 +1,74 @@ -+lib_LTLIBRARIES = libjinglep2pbase.la -+ -+libjinglep2pbase_la_SOURCES = stun.cc \ -+ port.cc \ -+ udpport.cc \ -+ tcpport.cc \ -+ stunport.cc \ -+ relayport.cc \ -+ relayserver.cc \ -+ stunrequest.cc \ -+ stunserver.cc \ -+ sessionmanager.cc \ -+ sessionmessages.cc \ -+ session.cc \ -+ sessiondescription.cc \ -+ transport.cc \ -+ transportchannel.cc \ -+ transportchannelproxy.cc \ -+ p2ptransport.cc \ -+ p2ptransportchannel.cc \ -+ rawtransport.cc \ -+ rawtransportchannel.cc \ -+ constants.cc \ -+ pseudotcp.cc \ -+ parsing.cc -+ -+libjinglep2pbase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/base -+libjinglep2pbase_include_HEADERS = candidate.h \ -+ portallocator.h \ -+ relayport.h \ -+ session.h \ -+ stunport.h \ -+ tcpport.h \ -+ port.h \ -+ sessionid.h \ -+ stunrequest.h \ -+ udpport.h \ -+ pseudotcp.h \ -+ sessiondescription.h \ -+ sessionmanager.h \ -+ stun.h \ -+ relayserver.h \ -+ stunserver.h \ -+ sessionclient.h \ -+ transport.h \ -+ transportchannel.h \ -+ transportchannelproxy.h \ -+ transportchannelimpl.h \ -+ p2ptransport.h \ -+ p2ptransportchannel.h \ -+ rawtransport.h \ -+ rawtransportchannel.h \ -+ constants.h \ -+ common.h \ -+ parsing.h \ -+ sessionmessages.h -+ -+libjinglep2pbase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+libjinglep2pbase_la_LIBADD = $(top_srcdir)/talk/xmllite/libjinglexmllite.la \ -+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la -+ -+AM_CPPFLAGS = -DPOSIX -DENABLE_DEBUG -D_DEBUG -g -+ -+P2PLIBS = libjinglep2pbase.la ../../base/libjinglebase.la -lpthread -+XMLLIBS = ../../xmllite/libjinglexmllite.la ../../xmpp/libjinglexmpp.la $(EXPAT_LIBS) -+ -+bin_PROGRAMS = relayserver stunserver -+relayserver_SOURCES = relayserver.cc relayserver_main.cc -+relayserver_LDADD = $(P2PLIBS) -+relayserver_CPPFLAGS = $(AM_CPPFLAGS) -+ -+stunserver_SOURCES = stunserver.cc stunserver_main.cc -+stunserver_LDADD = $(P2PLIBS) -+stunserver_CPPFLAGS = $(AM_CPPFLAGS) -diff -up libjingle-0.6.6/talk/p2p/client/Makefile.am.SANITY libjingle-0.6.6/talk/p2p/client/Makefile.am ---- libjingle-0.6.6/talk/p2p/client/Makefile.am.SANITY 2012-01-05 14:15:32.626937793 -0500 -+++ libjingle-0.6.6/talk/p2p/client/Makefile.am 2012-01-05 14:15:32.625937802 -0500 -@@ -0,0 +1,18 @@ -+lib_LTLIBRARIES = libjinglep2pclient.la -+ -+libjinglep2pclient_la_SOURCES = basicportallocator.cc \ -+ httpportallocator.cc \ -+ socketmonitor.cc -+ -+libjinglep2pclient_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/p2p/client -+ -+libjinglep2pclient_include_HEADERS = basicportallocator.h \ -+ socketmonitor.h \ -+ sessionmanagertask.h \ -+ sessionsendtask.h \ -+ httpportallocator.h -+ -+libjinglep2pclient_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD -+ -diff -up libjingle-0.6.6/talk/p2p/Makefile.am.SANITY libjingle-0.6.6/talk/p2p/Makefile.am ---- libjingle-0.6.6/talk/p2p/Makefile.am.SANITY 2012-01-05 14:15:32.626937793 -0500 -+++ libjingle-0.6.6/talk/p2p/Makefile.am 2012-01-05 14:15:32.626937793 -0500 -@@ -0,0 +1 @@ -+SUBDIRS=base client -diff -up libjingle-0.6.6/talk/session/Makefile.am.SANITY libjingle-0.6.6/talk/session/Makefile.am ---- libjingle-0.6.6/talk/session/Makefile.am.SANITY 2012-01-05 14:15:32.626937793 -0500 -+++ libjingle-0.6.6/talk/session/Makefile.am 2012-01-05 14:15:32.626937793 -0500 -@@ -0,0 +1 @@ -+SUBDIRS = tunnel phone -diff -up libjingle-0.6.6/talk/session/phone/Makefile.am.SANITY libjingle-0.6.6/talk/session/phone/Makefile.am ---- libjingle-0.6.6/talk/session/phone/Makefile.am.SANITY 2012-01-05 14:15:32.627937784 -0500 -+++ libjingle-0.6.6/talk/session/phone/Makefile.am 2012-01-05 14:15:32.627937784 -0500 -@@ -0,0 +1,55 @@ -+lib_LTLIBRARIES = libjinglesessionphone.la -+ -+libjinglesessionphone_la_SOURCES = audiomonitor.cc \ -+ call.cc \ -+ channel.cc \ -+ channelmanager.cc \ -+ codec.cc \ -+ currentspeakermonitor.cc \ -+ devicemanager.cc \ -+ filemediaengine.cc \ -+ gtkvideorenderer.cc \ -+ libudevsymboltable.cc \ -+ mediaengine.cc \ -+ mediamessages.cc \ -+ mediamonitor.cc \ -+ mediasession.cc \ -+ mediasessionclient.cc \ -+ rtcpmuxfilter.cc \ -+ rtpdump.cc \ -+ rtputils.cc \ -+ soundclip.cc \ -+ srtpfilter.cc \ -+ v4llookup.cc -+ -+libjinglesessionphone_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/phone -+libjinglesessionphone_include_HEADERS = audiomonitor.h \ -+ call.h \ -+ codec.h \ -+ channel.h \ -+ channelmanager.h \ -+ currentspeakermonitor.h \ -+ filemediaengine.h \ -+ libudevsymboltable.h \ -+ mediachannel.h \ -+ mediacommon.h \ -+ mediaengine.h \ -+ mediamessages.h \ -+ mediasessionclient.h \ -+ mediasink.h \ -+ rtcpmuxfilter.h \ -+ rtpdump.h \ -+ rtputils.h \ -+ soundclip.h \ -+ srtpfilter.h \ -+ voicechannel.h \ -+ videocommon.h \ -+ videoframe.h \ -+ videorenderer.h \ -+ videorendererfactory.h -+ -+libjinglesessionphone_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+libjinglesessionphone_la_LIBADD = $(LIBSRTP_LIBS) $(GTK2_LIBS) -+ -+AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS) $(GTK2_CFLAGS) -diff -up libjingle-0.6.6/talk/session/tunnel/Makefile.am.SANITY libjingle-0.6.6/talk/session/tunnel/Makefile.am ---- libjingle-0.6.6/talk/session/tunnel/Makefile.am.SANITY 2012-01-05 14:15:32.627937784 -0500 -+++ libjingle-0.6.6/talk/session/tunnel/Makefile.am 2012-01-05 14:15:32.627937784 -0500 -@@ -0,0 +1,16 @@ -+lib_LTLIBRARIES = libjinglesessiontunnel.la -+ -+libjinglesessiontunnel_la_SOURCES = tunnelsessionclient.cc \ -+ securetunnelsessionclient.cc \ -+ pseudotcpchannel.cc -+ -+libjinglesessiontunnel_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/session/tunnel -+ -+libjinglesessiontunnel_include_HEADERS = tunnelsessionclient.h \ -+ pseudotcpchannel.h \ -+ securetunnelsessionclient.h -+ -+libjinglesessiontunnel_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CXXFLAGS = -DPOSIX -+ -diff -up libjingle-0.6.6/talk/xmllite/Makefile.am.SANITY libjingle-0.6.6/talk/xmllite/Makefile.am ---- libjingle-0.6.6/talk/xmllite/Makefile.am.SANITY 2012-01-05 14:15:32.628937775 -0500 -+++ libjingle-0.6.6/talk/xmllite/Makefile.am 2012-01-05 14:15:32.628937775 -0500 -@@ -0,0 +1,21 @@ -+lib_LTLIBRARIES = libjinglexmllite.la -+ -+libjinglexmllite_la_SOURCES = qname.cc \ -+ xmlbuilder.cc \ -+ xmlconstants.cc \ -+ xmlelement.cc \ -+ xmlnsstack.cc \ -+ xmlparser.cc \ -+ xmlprinter.cc -+ -+libjinglexmllite_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmllite -+libjinglexmllite_include_HEADERS = qname.h \ -+ xmlbuilder.h \ -+ xmlconstants.h \ -+ xmlelement.h \ -+ xmlnsstack.h \ -+ xmlparser.h \ -+ xmlprinter.h -+AM_CPPFLAGS = -DPOSIX -+ -+libjinglexmllite_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) $(EXPAT_LIBS) -diff -up libjingle-0.6.6/talk/xmpp/Makefile.am.SANITY libjingle-0.6.6/talk/xmpp/Makefile.am ---- libjingle-0.6.6/talk/xmpp/Makefile.am.SANITY 2012-01-05 14:15:32.628937775 -0500 -+++ libjingle-0.6.6/talk/xmpp/Makefile.am 2012-01-05 14:15:32.628937775 -0500 -@@ -0,0 +1,35 @@ -+lib_LTLIBRARIES = libjinglexmpp.la -+ -+libjinglexmpp_la_SOURCES = constants.cc \ -+ jid.cc \ -+ saslmechanism.cc \ -+ xmppclient.cc \ -+ xmppengineimpl.cc \ -+ xmppengineimpl_iq.cc \ -+ xmpplogintask.cc \ -+ xmppstanzaparser.cc \ -+ xmpptask.cc \ -+ ratelimitmanager.cc -+ -+libjinglexmpp_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/xmpp -+libjinglexmpp_include_HEADERS = asyncsocket.h \ -+ prexmppauth.h \ -+ saslhandler.h \ -+ xmpplogintask.h \ -+ jid.h \ -+ saslmechanism.h \ -+ xmppclient.h \ -+ constants.h \ -+ saslplainmechanism.h \ -+ xmppclientsettings.h \ -+ xmppstanzaparser.h \ -+ xmppengine.h \ -+ xmpptask.h \ -+ plainsaslhandler.h \ -+ saslcookiemechanism.h \ -+ xmppengineimpl.h \ -+ ratelimitmanager.h -+ -+libjinglexmpp_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) -+ -+AM_CPPFLAGS = -DPOSIX diff --git a/libjingle-0.6.6-compilefix.patch b/libjingle-0.6.6-compilefix.patch deleted file mode 100644 index c3412bc..0000000 --- a/libjingle-0.6.6-compilefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up libjingle-0.6.6/talk/base/ratetracker.cc.compilefix libjingle-0.6.6/talk/base/ratetracker.cc ---- libjingle-0.6.6/talk/base/ratetracker.cc.compilefix 2011-12-14 10:58:28.000000000 -0500 -+++ libjingle-0.6.6/talk/base/ratetracker.cc 2012-01-05 13:38:54.590475337 -0500 -@@ -25,8 +25,8 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/base/ratetracker.h" - #include "talk/base/timeutils.h" -+#include "talk/base/ratetracker.h" - - namespace talk_base { - diff --git a/libjingle-0.6.6-devicemanager-fix.patch b/libjingle-0.6.6-devicemanager-fix.patch deleted file mode 100644 index ab3c414..0000000 --- a/libjingle-0.6.6-devicemanager-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libjingle-0.6.6/talk/session/phone/devicemanager.cc.alsa libjingle-0.6.6/talk/session/phone/devicemanager.cc ---- libjingle-0.6.6/talk/session/phone/devicemanager.cc.alsa 2011-12-14 10:58:28.000000000 -0500 -+++ libjingle-0.6.6/talk/session/phone/devicemanager.cc 2012-01-05 13:31:43.238535696 -0500 -@@ -25,6 +25,8 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include "config.h" -+ - #include "talk/session/phone/devicemanager.h" - - #include "talk/base/logging.h" diff --git a/libjingle-0.6.6-fixconflict.patch b/libjingle-0.6.6-fixconflict.patch deleted file mode 100644 index c29a3b5..0000000 --- a/libjingle-0.6.6-fixconflict.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up libjingle-0.6.6/talk/base/basictypes.h.fixconflict libjingle-0.6.6/talk/base/basictypes.h -diff -up libjingle-0.6.6/talk/base/constructormagic.h.fixconflict libjingle-0.6.6/talk/base/constructormagic.h ---- libjingle-0.6.6/talk/base/constructormagic.h.fixconflict 2011-12-14 10:58:28.000000000 -0500 -+++ libjingle-0.6.6/talk/base/constructormagic.h 2012-01-05 13:32:07.109312351 -0500 -@@ -28,14 +28,11 @@ - #ifndef TALK_BASE_CONSTRUCTORMAGIC_H_ - #define TALK_BASE_CONSTRUCTORMAGIC_H_ - --#define DISALLOW_ASSIGN(TypeName) \ -- void operator=(const TypeName&) -- - // A macro to disallow the evil copy constructor and operator= functions - // This should be used in the private: declarations for a class - #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName&); \ -- DISALLOW_ASSIGN(TypeName) -+ void operator=(const TypeName&) - - // Alternative, less-accurate legacy name. - #define DISALLOW_EVIL_CONSTRUCTORS(TypeName) \ -@@ -49,7 +46,7 @@ - // especially useful for classes containing only static methods. - #define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ - TypeName(); \ -- DISALLOW_EVIL_CONSTRUCTORS(TypeName) -+ DISALLOW_COPY_AND_ASSIGN(TypeName) - - - #endif // TALK_BASE_CONSTRUCTORMAGIC_H_ diff --git a/libjingle-0.6.6-nextfix.patch b/libjingle-0.6.6-nextfix.patch deleted file mode 100644 index 628e0f4..0000000 --- a/libjingle-0.6.6-nextfix.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -up libjingle-0.6.6/talk/base/messagequeue.h.nextfix libjingle-0.6.6/talk/base/messagequeue.h ---- libjingle-0.6.6/talk/base/messagequeue.h.nextfix 2011-12-14 10:58:28.000000000 -0500 -+++ libjingle-0.6.6/talk/base/messagequeue.h 2012-01-05 14:17:27.509862222 -0500 -@@ -42,7 +42,7 @@ - #include "talk/base/scoped_ref_ptr.h" - #include "talk/base/sigslot.h" - #include "talk/base/socketserver.h" --#include "talk/base/timeutils.h" -+#include "talk/base/time.h" - - namespace talk_base { - -diff -up libjingle-0.6.6/talk/base/timeutils.h.nextfix libjingle-0.6.6/talk/base/timeutils.h ---- libjingle-0.6.6/talk/base/timeutils.h.nextfix 2011-12-14 10:58:28.000000000 -0500 -+++ libjingle-0.6.6/talk/base/timeutils.h 2012-01-05 14:17:27.511862203 -0500 -@@ -30,8 +30,7 @@ - - #ifndef WIN32 - #include <time.h> --#endif -- -+#else - #include "talk/base/basictypes.h" - - namespace talk_base { -@@ -86,5 +85,6 @@ inline int32 TimeUntil(uint32 later) { - } - - } // namespace talk_base -+#endif // WIN32 - - #endif // TALK_BASE_TIMEUTILS_H_ -diff -up libjingle-0.6.6/talk/p2p/base/pseudotcp.cc.nextfix libjingle-0.6.6/talk/p2p/base/pseudotcp.cc ---- libjingle-0.6.6/talk/p2p/base/pseudotcp.cc.nextfix 2011-12-14 10:58:28.000000000 -0500 -+++ libjingle-0.6.6/talk/p2p/base/pseudotcp.cc 2012-01-05 14:17:27.513862185 -0500 -@@ -38,7 +38,7 @@ - #include "talk/base/logging.h" - #include "talk/base/socket.h" - #include "talk/base/stringutils.h" --#include "talk/base/timeutils.h" -+#include "talk/base/time.h" - - // The following logging is for detailed (packet-level) analysis only. - #define _DBG_NONE 0 -diff -up libjingle-0.6.6/talk/session/phone/rtpdump.cc.nextfix libjingle-0.6.6/talk/session/phone/rtpdump.cc ---- libjingle-0.6.6/talk/session/phone/rtpdump.cc.nextfix 2012-01-05 14:22:34.942983933 -0500 -+++ libjingle-0.6.6/talk/session/phone/rtpdump.cc 2012-01-05 14:22:39.937937168 -0500 -@@ -33,7 +33,7 @@ - - #include "talk/base/byteorder.h" - #include "talk/base/logging.h" --#include "talk/base/timeutils.h" -+#include "talk/base/time.h" - #include "talk/session/phone/rtputils.h" - - namespace cricket { -diff -up libjingle-0.6.6/talk/session/phone/videocommon.h.nextfix libjingle-0.6.6/talk/session/phone/videocommon.h ---- libjingle-0.6.6/talk/session/phone/videocommon.h.nextfix 2012-01-05 14:20:45.106012263 -0500 -+++ libjingle-0.6.6/talk/session/phone/videocommon.h 2012-01-05 14:22:04.719266897 -0500 -@@ -31,7 +31,7 @@ - #include <string> - - #include "talk/base/basictypes.h" --#include "talk/base/timeutils.h" -+#include "talk/base/time.h" - - namespace cricket { - -diff -up libjingle-0.6.6/talk/xmpp/ratelimitmanager.h.nextfix libjingle-0.6.6/talk/xmpp/ratelimitmanager.h ---- libjingle-0.6.6/talk/xmpp/ratelimitmanager.h.nextfix 2011-12-14 10:58:28.000000000 -0500 -+++ libjingle-0.6.6/talk/xmpp/ratelimitmanager.h 2012-01-05 14:17:27.514862176 -0500 -@@ -28,7 +28,7 @@ - #ifndef _RATELIMITMANAGER_H_ - #define _RATELIMITMANAGER_H_ - --#include "talk/base/timeutils.h" -+#include "talk/base/time.h" - #include "talk/base/taskrunner.h" - #include <map> - diff --git a/libjingle-0.6.6-unistd.patch b/libjingle-0.6.6-unistd.patch deleted file mode 100644 index a2b1742..0000000 --- a/libjingle-0.6.6-unistd.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up libjingle-0.6.6/talk/base/openssladapter.cc.unistd libjingle-0.6.6/talk/base/openssladapter.cc ---- libjingle-0.6.6/talk/base/openssladapter.cc.unistd 2011-12-14 10:58:28.000000000 -0500 -+++ libjingle-0.6.6/talk/base/openssladapter.cc 2012-01-05 14:17:27.519862129 -0500 -@@ -45,6 +45,8 @@ - #include "talk/base/sslroots.h" - #include "talk/base/stringutils.h" - -+#include <unistd.h> -+ - // TODO: Use a nicer abstraction for mutex. - - #if defined(WIN32) -diff -up libjingle-0.6.6/talk/session/phone/v4llookup.cc.unistd libjingle-0.6.6/talk/session/phone/v4llookup.cc ---- libjingle-0.6.6/talk/session/phone/v4llookup.cc.unistd 2012-01-05 14:24:09.442099202 -0500 -+++ libjingle-0.6.6/talk/session/phone/v4llookup.cc 2012-01-05 14:24:16.253035437 -0500 -@@ -15,6 +15,7 @@ - #include <sys/ioctl.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <unistd.h> - - #include <cstring> - -diff -up libjingle-0.6.10/talk/base/rollingaccumulator.h.gcc47 libjingle-0.6.10/talk/base/rollingaccumulator.h ---- libjingle-0.6.10/talk/base/rollingaccumulator.h.gcc47 2012-02-13 21:59:27.755326807 -0500 -+++ libjingle-0.6.10/talk/base/rollingaccumulator.h 2012-02-13 21:59:37.185231575 -0500 -@@ -29,6 +29,7 @@ - #define TALK_BASE_ROLLINGACCUMULATOR_H_ - - #include <vector> -+#include <unistd.h> - - #include "talk/base/common.h" - diff --git a/libjingle.spec b/libjingle.spec deleted file mode 100644 index 393a10a..0000000 --- a/libjingle.spec +++ /dev/null @@ -1,307 +0,0 @@ -Name: libjingle -Version: 0.6.14 -Release: 18%{?dist} -Summary: GoogleTalk implementation of Jingle -Group: System Environment/Libraries -License: BSD -URL: http://code.google.com/apis/talk/libjingle/ -Source0: http://libjingle.googlecode.com/files/%{name}-%{version}.zip -# Use Makefiles, dammit. -Patch0: libjingle-0.6.14-build-sanity.patch -# talk/base/basictypes.h and talk/base/logging.h must be included -# before any header with __BEGIN_DECLS, notably, sys/types.h -Patch1: libjingle-0.5.1-C-linkage-fix.patch -# We need <cstdlib> for NULL. -Patch2: libjingle-0.5.8-NULL-fix.patch -# In file included from /usr/include/fcntl.h:41:0, -# from physicalsocketserver.cc:37: -#/usr/include/bits/stat.h:91:21: error: field 'st_atim' has incomplete type -#/usr/include/bits/stat.h:92:21: error: field 'st_mtim' has incomplete type -#/usr/include/bits/stat.h:93:21: error: field 'st_ctim' has incomplete type -# FIX: Include <time.h> first. -Patch3: libjingle-0.5.8-statfix.patch -# md5.h had a typedef for uint32 that did not match the one in basictypes.h -Patch4: libjingle-0.5.1-uint32-fix.patch -# thread.cc: In static member function static bool talk_base::Thread::SleepMs(int): -# thread.cc:199:19: error: aggregate timespec ts has incomplete type and cannot be defined -# thread.cc:202:34: error: nanosleep was not declared in this scope -# This happens because a local header is included before time.h -Patch5: libjingle-0.5.1-timefix.patch -# unixfilesystem.cc wouldn't compile. -Patch6: libjingle-0.5.1-unixfilesystemfix.patch -# Google seems to love to be stupid with headers. -# Especially when they're in "third_party" code. -# Hardcoding paths in include files is dumb. -Patch7: libjingle-0.5.8-system-expat.patch -Patch8: libjingle-0.5.8-system-srtp.patch -# Fix devicemanager.cc to compile -Patch9: libjingle-0.6.14-devicemanager-fix.patch -# Fix v4llookup.cc to compile -Patch10: libjingle-0.5.8-v4llookup-fix.patch -# Fix type and definition conflicts with Chromium -Patch11: libjingle-0.6.6-fixconflict.patch -# Make sure linux.h/linux.cc pulls in config.h for LINUX define -Patch14: libjingle-0.5.8-config-linux.patch -# Fix 0.5.2 compilation -Patch16: libjingle-0.6.6-compilefix.patch -# Fix missing cstdlib for size_t -Patch17: libjingle-0.6.0-size_t.patch -# Fix obsolete macro usage -Patch18: libjingle-0.5.8-fixmacro.patch -# Gcc 4.7.0 no longer includes unistd.h by default -Patch20: libjingle-0.6.6-unistd.patch -# Support for OpenSSL 1.1 -# This all looks mostly sane to me, but it is entirely untested. -Patch21: libjingle-0.6.14-openssl-1.1.patch - -BuildRequires: gcc-c++ -BuildRequires: libtool, autoconf, automake -BuildRequires: openssl-devel -BuildRequires: expat-devel -BuildRequires: libsrtp-devel -BuildRequires: alsa-lib-devel -BuildRequires: pkgconfig -BuildRequires: kernel-headers -# Really, we only need libudev-devel. -BuildRequires: systemd-devel -BuildRequires: gtk2-devel -BuildRequires: libXrender-devel, libXcomposite-devel - -ExclusiveArch: %{ix86} x86_64 %{arm} - -%description -Libjingle is Google Talk's implementation of Jingle and Jingle-Audio -(proposed extensions to XMPP) to interoperate with Google Talk's -peer-to-peer and voice calling capabilities. - -In addition, it is a P2P (peer-to-peer) and RTC (real-time communication) -stack that builds on XMPP. If you don't need any P2P or RTC, you can use any -XMPP stack. If you do, then you might want to use libjingle. In fact, you -can even use libjingle on top of another XMPP stack. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires: openssl-devel -Requires: expat-devel -Requires: libsrtp-devel -Requires: gtk2-devel -Requires: libXrender-devel - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - -%prep -%setup -q -%patch0 -p1 -b .SANITY -%patch1 -p1 -b .linkage -%patch2 -p1 -b .NULL -%patch3 -p1 -b .statfix -%patch4 -p1 -b .uint32 -%patch5 -p1 -b .timefix -%patch6 -p1 -b .unixfilesystem -%patch7 -p1 -b .system-expat -%patch8 -p1 -b .system-srtp -%patch9 -p1 -b .alsa -%patch10 -p1 -b .v4lfix -%patch11 -p1 -b .fixconflict -%patch14 -p1 -b .config -%patch16 -p1 -b .compilefix -%patch17 -p1 -b .size_t -%patch18 -p1 -b .fixmacro -%patch20 -p1 -b .unistd -%if 0%{?fedora} >= 26 -%patch21 -p1 -b .openssl11 -%endif - -touch NEWS ChangeLog -autoreconf -i - -rm -rf talk/base/time.h - -%build -%configure --disable-static -# Remove rpath. -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - - - -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - -%files -%license COPYING -%doc ChangeLog -%{_bindir}/relayserver -%{_bindir}/stunserver -%{_libdir}/*.so.* - - -%files devel -%{_includedir}/%{name}-0.6/ -%{_libdir}/*.so -%{_libdir}/pkgconfig/jingle*-0.6.pc - - -%changelog -* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.14-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.14-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.14-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.14-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.14-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Mon Feb 20 2017 Tom Callaway <spot(a)fedoraproject.org> - 0.6.14-13 -- fix build against openssl 1.1 (well, I think so...) - -* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.14-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.14-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.14-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 0.6.14-9 -- Rebuilt for GCC 5 C++11 ABI change - -* Fri Nov 14 2014 Tom Callaway <spot(a)fedoraproject.org> - 0.6.14-8 -- rebuild for libsrtp - -* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.14-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.14-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.14-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.14-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.14-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 2 2012 Tom Callaway <spot(a)fedoraproject.org> - 0.6.14-2 -- use new BR for libudev - -* Mon Jun 11 2012 Tom Callaway <spot(a)fedoraproject.org> - 0.6.14-1 -- update to 0.6.14 - -* Sun Apr 1 2012 Dan Hork <dan[at]danny.cz> - 0.6.10-3 -- set ExclusiveArch - -* Wed Mar 21 2012 Tom Callaway <spot(a)fedoraproject.org> - 0.6.10-2 -- resolve patch confusion - -* Mon Feb 13 2012 Tom Callaway <spot(a)fedoraproject.org> - 0.6.10-1 -- update to 0.6.10 - -* Thu Jan 5 2012 Tom Callaway <spot(a)fedoraproject.org> - 0.6.6-1 -- update to 0.6.6 - -* Tue Sep 27 2011 Tom Callaway <spot(a)fedoraproject.org> - 0.6.0-2 -- fix phone bits up -- properly bump to 0.6 - -* Tue Sep 27 2011 Tom Callaway <spot(a)fedoraproject.org> - 0.6.0-1 -- update to 0.6.0 - -* Tue Jul 26 2011 Tom Callaway <spot(a)fedoraproject.org> - 0.5.8-1 -- update to 0.5.8 -- merge Google's unpublished Chromium 14 changes - -* Wed Mar 30 2011 Tom Callaway <spot(a)fedoraproject.org> - 0.5.2-1 -- update to 0.5.2 -- merge Google's unpublished Chromium 12 changes - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jan 13 2011 Tom Callaway <spot(a)fedoraproject.org> - 0.5.1-4 -- fix linux.h so that LINUX define is pulled in from config.h - -* Fri Dec 10 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.5.1-3 -- apply change from Chromium to make qname threadsafe - -* Fri Dec 10 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.5.1-2 -- fix build to properly install config.h -- fix 64bit issues -- fix conflicts with Chromium - -* Fri Nov 19 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.5.1-1 -- update to 0.5.1 - -* Tue Aug 25 2009 Tomas Mraz <tmraz(a)redhat.com> - 0.3.12-6 -- rebuilt with new openssl - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.3.12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Mar 2 2009 Brian Pepple <bpepple(a)fedoraproject.org> - 0.3.12-4 -- Add patch to fix gcc-4.4.0 errors. - -* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.3.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 0.3.12-2 -- rebuild with new openssl - -* Wed Sep 17 2008 Brian Pepple <bpepple(a)fedoraproject.org> - 0.3.12-1 -- Update to 0.3.12. -- Add hack to remove rpath. -- Update source url. -- Drop gcc patch. Fixed upstream. -- Drop expat-devel BR. Not needed anymore. -- Drop *.pc files no longer available. - -* Sun Mar 16 2008 Brian Pepple <bpepple(a)fedoraproject.org> - 0.3.11-8 -- Add patch to fix build w/ gcc4.3. - -* Mon Feb 18 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.3.11-7 -- Autorebuild for GCC 4.3 - -* Fri Feb 8 2008 Brian Pepple <bpepple(a)fedoraproject.org> - 0.3.11-6 -- Rebuild for gcc-4.3. - -* Wed Dec 5 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 0.3.11-5 -- rebuild for new libssl.so.6/libcrypto.so.6 - -* Tue Aug 28 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 0.3.11-4 -- Rebuild for expat 2.0. - -* Tue Aug 21 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 0.3.11-3 -- Rebuild. - -* Wed Jun 27 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 0.3.11-2 -- Update URL. - -* Fri May 18 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 0.3.11-1 -- Update 0.3.11. - -* Mon Sep 4 2006 Brian Pepple <bpepple(a)fedoraproject.org> - 0.3.10-1 -- Initial FE spec. diff --git a/sources b/sources deleted file mode 100644 index c075760..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -b3906436df810620ced9ea7ec300799d libjingle-0.6.14.zip

5 years, 9 months

1
0
0 / 0

Architecture specific change in rpms/qca.git

by githook-noreply＠fedoraproject.org

The package rpms/qca.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qca.git/commit/?id=e459a8d3602467.... Change: +%ifnarch s390x ppc64 Thanks. Full change: ============ commit e459a8d3602467bbd17921865a7204d90a5c66ef Author: Rex Dieter <rdieter(a)gmail.com> Date: Tue Jul 24 11:13:54 2018 -0500 skip slow archs (for now) diff --git a/qca.spec b/qca.spec index 03526a9..996825b 100644 --- a/qca.spec +++ b/qca.spec @@ -273,6 +273,8 @@ cp -a %{_target_platform}/apidocs/html/ \ %check export CTEST_OUTPUT_ON_FAILURE=1 export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig +# skip slow archs +%ifnarch s390x ppc64 %if 0%{?qt4} test "$(pkg-config --modversion qca2)" = "%{version}" make test ARGS="--timeout 180 --output-on-failure" -C %{_target_platform} @@ -281,6 +283,7 @@ make test ARGS="--timeout 180 --output-on-failure" -C %{_target_platform} test "$(pkg-config --modversion qca2-qt5)" = "%{version}" make test ARGS="--timeout 180 --output-on-failure" -C %{_target_platform}-qt5 %endif +%endif %if 0%{?qt4}

5 years, 9 months

1
0
0 / 0

Architecture specific change in rpms/nuxwdog.git

by githook-noreply＠fedoraproject.org

The package rpms/nuxwdog.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/nuxwdog.git/commit/?id=99b08f6e8d.... Change: +%ifarch ppc64 s390x sparc64 x86_64 Thanks. Full change: ============ commit 99b08f6e8da628a0cab5fd3d866f177c12c85889 Author: Dinesh Prasanth M K <mkdineshprasanth(a)gmail.com> Date: Tue Jul 24 11:38:30 2018 -0400 Syncing up with upstream Bumping the version to 1.0.4 and sync up with the upstream version diff --git a/.gitignore b/.gitignore index 718d3b2..be5e6b5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /nuxwdog-1.0.1.tar.gz /nuxwdog-1.0.2.tar.gz /nuxwdog-1.0.3.tar.gz +/nuxwdog-1.0.4.tar.gz diff --git a/nuxwdog-Allow-unlimited-conf-line-length.patch b/nuxwdog-Allow-unlimited-conf-line-length.patch deleted file mode 100644 index 513c483..0000000 --- a/nuxwdog-Allow-unlimited-conf-line-length.patch +++ /dev/null @@ -1,127 +0,0 @@ -From f4b47d21560fd57c7d2e326ebfae66f42b66864f Mon Sep 17 00:00:00 2001 -From: Ade Lee <alee(a)redhat.com> -Date: Mon, 30 Oct 2017 22:47:15 -0400 -Subject: [PATCH] Allow unlimited conf line length - -Errors occurred because the line length was being truncated, -especially for long lines like JVM args. Now the line length -will be allocated correctly. - -Change-Id: I77553817931883e05180a1082d45a20e3a6afe4c ---- - src/com/redhat/nuxwdog/wdconf.cpp | 45 ++++++++++++++++++++++----------------- - 1 file changed, 26 insertions(+), 19 deletions(-) - -diff --git a/src/com/redhat/nuxwdog/wdconf.cpp b/src/com/redhat/nuxwdog/wdconf.cpp -index 086bc5ae36c79ff3570ba0e39da10a42d8ab9687..95603c96dbd021289b60a001ee6fba0b15f9f540 100644 ---- a/src/com/redhat/nuxwdog/wdconf.cpp -+++ b/src/com/redhat/nuxwdog/wdconf.cpp -@@ -29,24 +29,23 @@ - #include "wdconf.h" - #include "wdlog.h" - --#define MAX_CONF_LINE_LENGTH 1024 -+#define CHUNK 1024 - - /* Read config file line like util_getline() */ --static int _watchdog_readconf_line(char *line, int maxlen, FILE *file) -+static char * _watchdog_readconf_line(FILE *file) - { - int len = 0; - int nlseen = 0; -- int src; -- int dst; -- char *bufp = line; -+ int src = 0; -+ int dst = 0; -+ char bufp[CHUNK]; - -- if (feof(file)) { -- return -1; -- } -+ char *line = (char *) malloc(1); -+ line[0] = '\0'; - -- while (!nlseen && (len < maxlen - 1)) { -+ while (!nlseen && !feof(file)) { - -- if (!fgets(bufp, maxlen - len, file)) -+ if (!fgets(bufp, CHUNK, file)) - break; - - /* Scan what was just read */ -@@ -68,26 +67,31 @@ static int _watchdog_readconf_line(char *line, int maxlen, FILE *file) - ++dst; - } - } -+ bufp[dst] = '\0'; - - if (dst > 0) { - /* Check for continuation */ - if (nlseen && (bufp[dst-1] == '\\')) { -+ bufp[dst-1] = '\0'; - dst -= 1; - nlseen = 0; - } - - len += dst; -- bufp += dst; -+ -+ line = (char *) realloc(line, len+1); -+ strcat(line, bufp); - } - } - - if ((len <= 0) && !nlseen) { -- return -1; -+ if (line) { -+ free(line); -+ } -+ return NULL; - } - -- line[len] = '\0'; -- -- return len; -+ return line; - } - - static int -@@ -95,8 +99,7 @@ _watchdog_parse_conffile(char *conffile, - watchdog_conf_info_t *info) - { - FILE *cfile; -- char line[MAX_CONF_LINE_LENGTH]; -- char *name, *value; -+ char *line, *name, *value; - int len; - - cfile = fopen(conffile, "r"); -@@ -110,7 +113,8 @@ _watchdog_parse_conffile(char *conffile, - return -1; - } - -- while ((len = _watchdog_readconf_line(line, MAX_CONF_LINE_LENGTH, cfile)) >= 0) { -+ while ((line = _watchdog_readconf_line(cfile)) != NULL) { -+ len = strlen(line); - name = line; - if ((*name) == '#') - continue; -@@ -154,10 +158,13 @@ _watchdog_parse_conffile(char *conffile, - if (!strcasecmp(name, "ChildSecurity")) { - info->childSecurity = atoi(value); - } -+ if (line != NULL) { -+ free(line); -+ line = NULL; -+ } - } - - fclose(cfile); -- - return 0; - } - --- -2.9.5 - diff --git a/nuxwdog-set-uid.patch b/nuxwdog-set-uid.patch deleted file mode 100644 index 9f725fe..0000000 --- a/nuxwdog-set-uid.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 3d7adfbe0788f33a67c3ed65e12ba9d32074a674 Mon Sep 17 00:00:00 2001 -From: Ade Lee <alee(a)redhat.com> -Date: Mon, 15 Jan 2018 15:25:36 -0500 -Subject: [PATCH] Add parameter to set the uid of the invoked process - ---- - src/com/redhat/nuxwdog/watchdog.cpp | 36 ++++++++++++++++++++++++++++++++++-- - src/com/redhat/nuxwdog/wdconf.cpp | 7 +++++++ - src/com/redhat/nuxwdog/wdconf.h | 3 ++- - 3 files changed, 43 insertions(+), 3 deletions(-) - -diff --git a/src/com/redhat/nuxwdog/watchdog.cpp b/src/com/redhat/nuxwdog/watchdog.cpp -index a4d6a77..36b13e4 100644 ---- a/src/com/redhat/nuxwdog/watchdog.cpp -+++ b/src/com/redhat/nuxwdog/watchdog.cpp -@@ -33,6 +33,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <errno.h> -+#include <cerrno> - #include <signal.h> - #include <fcntl.h> - #include <pwd.h> -@@ -280,7 +281,7 @@ watchdog_exit(int status) - - int - _watchdog_exec(int server_starts, char *server_exe, char *args[], -- char * envp[], int *spid) -+ char * envp[], int *spid, int uid) - { - int server_background = 0; - char *server_out = NULL; -@@ -412,6 +413,14 @@ _watchdog_exec(int server_starts, char *server_exe, char *args[], - free(server_context); - } - -+ if (uid >= 0) { -+ rv = setuid(uid); -+ if (rv != 0) { -+ watchdog_error("unable to setuid"); -+ watchdog_exit(1); -+ } -+ } -+ - rv = execv(server_exe, args); - if (rv < 0) { - watchdog_error("could not execute server binary"); -@@ -757,10 +766,12 @@ int main(int argc, char **argv, char **envp) - int ver=0; - int server_starts; - int server_stat; -+ int uid=-1; - char *server_exe = NULL; - char *server_args = NULL; - char *conffile = NULL; - char *pch; -+ char *user = NULL; - char *args[100]; - struct stat statbuf; - UDS_NAME[0]=0; -@@ -833,6 +844,11 @@ int main(int argc, char **argv, char **envp) - watchdog_exit(1); - } - -+ /* user */ -+ if (confinfo->user) { -+ user = strdup(confinfo->user); -+ } -+ - if (detach) { - parent_watchdog_create_signal_handlers(); - -@@ -883,6 +899,22 @@ int main(int argc, char **argv, char **envp) - watchdog_exit(1); - } - -+ if (user != NULL) { -+ struct passwd *pw = getpwnam(user); -+ if (pw == NULL) { -+ sprintf(errmsgstr, "user %s does not exist", user); -+ watchdog_error(errmsgstr); -+ watchdog_exit(1); -+ } -+ -+ if (chown(UDS_NAME, pw->pw_uid, pw->pw_gid) != 0) { -+ sprintf(errmsgstr, "chown failed errno %d %s", errno, strerror(errno)); -+ watchdog_error(errmsgstr); -+ watchdog_exit(1); -+ } -+ uid = pw->pw_uid; -+ } -+ - for (server_starts = 0;; ++server_starts) { - - _watchdog_death = 0; -@@ -895,7 +927,7 @@ int main(int argc, char **argv, char **envp) - - watchdog_create_signal_handlers(); - -- rv = _watchdog_exec(server_starts, server_exe, args, envp, &server_pid); -+ rv = _watchdog_exec(server_starts, server_exe, args, envp, &server_pid, uid); - - if (server_pid < 0) { - // exec failed: kill parent if it's still waiting -diff --git a/src/com/redhat/nuxwdog/wdconf.cpp b/src/com/redhat/nuxwdog/wdconf.cpp -index 95603c9..2d50575 100644 ---- a/src/com/redhat/nuxwdog/wdconf.cpp -+++ b/src/com/redhat/nuxwdog/wdconf.cpp -@@ -158,6 +158,9 @@ _watchdog_parse_conffile(char *conffile, - if (!strcasecmp(name, "ChildSecurity")) { - info->childSecurity = atoi(value); - } -+ if (!strcasecmp(name, "User")) { -+ info->user = strdup(value); -+ } - if (line != NULL) { - free(line); - line = NULL; -@@ -227,5 +230,9 @@ watchdog_confinfo_free(watchdog_conf_info_t *info) - free(info->childPidFile); - } - -+ if (info->user) { -+ free(info->user); -+ } -+ - free(info); - } -diff --git a/src/com/redhat/nuxwdog/wdconf.h b/src/com/redhat/nuxwdog/wdconf.h -index bb2e7b1..94f02e3 100644 ---- a/src/com/redhat/nuxwdog/wdconf.h -+++ b/src/com/redhat/nuxwdog/wdconf.h -@@ -36,7 +36,8 @@ typedef struct watchdog_conf_info_t { - char *exeContext; /* selinux type context */ - char *pidFile; /* pidFile */ - char *childPidFile; /* child pid file */ -- int childSecurity; /* enforce child security */ -+ int childSecurity; /* enforce child security */ -+ char *user; /* user to execute the process as */ - } watchdog_conf_info_t; - - watchdog_conf_info_t *watchdog_parse(char *conf_file); --- -2.14.3 - diff --git a/nuxwdog.spec b/nuxwdog.spec index 77b4119..a14b2d9 100644 --- a/nuxwdog.spec +++ b/nuxwdog.spec @@ -1,16 +1,13 @@ Name: nuxwdog -Version: 1.0.3 -Release: 16%{?dist} +Version: 1.0.4 +Release: 1%{?dist} Summary: Watchdog server to start and stop processes, and prompt for passwords # The entire source code is LGPLv2 except for the perl module, which is GPL+ or Artistic License: LGPLv2 and (GPL+ or Artistic) Group: System Environment/Libraries URL: http://www.redhat.com/certificate_system +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# For epel5 and fc < 20 compatibility -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - -BuildRequires: gcc-c++ BuildRequires: ant BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils @@ -19,24 +16,23 @@ BuildRequires: nss-devel BuildRequires: pkgconfig BuildRequires: libselinux-devel BuildRequires: perl-devel -BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: keyutils-libs-devel +BuildRequires: gcc-c++ Requires: nss Requires: keyutils-libs Obsoletes: nuxwdog-client +Obsoletes: nuxwdog-client-perl Source0: https://fedorahosted.org/released/nuxwdog/%{name}-%{version}.tar.gz -Patch0: nuxwdog-Allow-unlimited-conf-line-length.patch -Patch1: nuxwdog-set-uid.patch # Note: there is an rpmlint warning about Nuxwdogclient.so being a private-shared-object-provide # This would ordinarily be fixed by calling the macro perl_default_filter, but # this disables rpms file coloring and makes the package fail multilib tests. %if 0%{?rhel} -ExcludeArch: ppc ppc64 ppcle ppc64le s390 s390x +ExcludeArch: ppc ppc64 s390 s390x %endif %description @@ -59,7 +55,7 @@ nuxwdog watchdog server. %package client-java Group: System Environment/Libraries Summary: Nuxwdog Watchdog client JNI Package -Requires: java-headless >= 1:1.6.0 +Requires: java >= 1:1.6.0 Requires: jpackage-utils Requires: %{name} = %{version}-%{release} @@ -68,22 +64,9 @@ The nuxwdog-client-java package contains a JNI interface to the nuxwdog client code, so that Java clients can interact with the nuxwdog watchdog server. -%package client-perl -Group: System Environment/Libraries -Summary: Nuxwdog Watchdog client perl bindings -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: %{name} = %{version}-%{release} - -%description client-perl -The nuxwdog-client-perl package contains a perl interface to nuxwdog. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -%patch1 -p1 - -sed -i \ - -e 's,^NUXWDOGCLIENT_DOCUMENTATION=${NUXWDOGCLIENT_BUILD_PREFIX}/.*$,NUXWDOGCLIENT_DOCUMENTATION=${NUXWDOGCLIENT_BUILD_PREFIX}%{_pkgdocdir},' setup_package %build ant \ @@ -92,17 +75,21 @@ ant \ -Dproduct="nuxwdog" \ -Dversion="%{version}" %configure --disable-static \ -%if 0%{?__isa_bits} == 64 +%ifarch ppc64 s390x sparc64 x86_64 --enable-64bit \ %endif - --docdir=%{_pkgdocdir} -make licensedir=%{_pkgdocdir} + --libdir=%{_libdir} +make %install -make install DESTDIR=%{buildroot} INSTALL="install -p" licensedir=%{_pkgdocdir} +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="install -p" find %{buildroot} -name '*.la' -exec rm -f {} ';' +mkdir -p %{buildroot}%{_docdir} +mv %{buildroot}%{_usr}/doc %{buildroot}%{_docdir}/%{name}-%{version} + find %{buildroot}/%{perl_vendorarch} -name .packlist |xargs rm -f {} find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -name "perllocal.pod" |xargs rm -f {} @@ -115,42 +102,42 @@ mkdir -p %{buildroot}%{_jnidir} cd %{buildroot}/%{_jnidir} ln -s %{_libdir}/nuxwdog-jni/nuxwdog-%{version}.jar nuxwdog.jar rm -rf %{buildroot}%{_usr}/jars +rm -rf %{buildroot}%{_usr}/doc +rm -rf %{buildroot}%{_usr}/share/doc/nuxwdog-%{version} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%clean +rm -rf %{buildroot} + %files -%_pkgdocdir +%defattr(-,root,root,-) +%doc LICENSE %{_bindir}/* %{_libdir}/libnuxwdog.so.* +%{_mandir}/man3/Nuxwdogclient.3pm* %{_mandir}/man1/nuxwdog.1* +%{perl_vendorarch}/* +%exclude %dir %{perl_vendorarch}/auto/ %files devel +%defattr(-,root,root,-) +%doc %{_includedir}/nuxwdog/ %{_libdir}/libnuxwdog.so %files client-java +%defattr(-,root,root,-) +%doc %{_libdir}/nuxwdog-jni/ %{_jnidir}/* -%files client-perl -%{perl_vendorarch}/Nuxwdogclient.pm -%{perl_vendorarch}/auto/Nuxwdogclient -%{_mandir}/man3/Nuxwdogclient.3pm* - %changelog -* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.3-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jun 27 2018 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.0.3-15 -- Perl 5.28 rebuild - -* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 17 2018 Ade Lee <alee(a)redhat.com> 1.0.3-13 +* Mon Jul 23 2018 Dogtag PKI Team (pki-devel(a)redhat.com) 1.0.4-1 - Resolves: 1534030 - add option to set process uid +- Resolves: 1605267 - add gcc-c++ and perl-devel deps * Thu Nov 2 2017 Ade Lee <alee(a)redhat.com> 1.0.3-12 - nuxwdog Pagure Issue #2 - nuxwdog is cutting off long ExeArgs resulting @@ -294,5 +281,4 @@ rm -rf %{buildroot}%{_usr}/jars * Tue Dec 1 2009 Ade Lee <alee(a)redhat.com> 1.0.0-1 - Initial open source version based upon Red Hat - Certificate System (RHCS) 6.1 uxwdog code. - + Certificate System (RHCS) 6.1 uxwdog code. \ No newline at end of file diff --git a/sources b/sources index 526a3fc..9c12075 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nuxwdog-1.0.3.tar.gz) = 20440027b7fcae12217c9925097a4d9e01479342b935c460d4d4be36c2f3f75738a5bf6e49bfe36d6d96389dd6278ebfb0875b625a7ee5c5af24d1ead1956ca5 +SHA512 (nuxwdog-1.0.4.tar.gz) = 55ba9de71bd66953c2d78855f53661d326aacd26be68f7aacf641f5de05386d7d437aa81ed2de5bb9edbcda2ac3e87700e049e7dbc7b6e9602756cf70006509b

5 years, 9 months

1
0
0 / 0

Architecture specific change in rpms/sysbench.git

by githook-noreply＠fedoraproject.org

The package rpms/sysbench.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/sysbench.git/commit/?id=c44176fc9.... Change: +%ifarch armv7hl Thanks. Full change: ============ commit c44176fc9bcfd345e31c4a9d328ec8efff87bb94 Author: Xavier Bachelot <xavier(a)bachelot.org> Date: Tue Jul 24 16:54:27 2018 +0200 Workaround test suite issue on armv7hl diff --git a/sysbench.spec b/sysbench.spec index c7ec90f..c085108 100644 --- a/sysbench.spec +++ b/sysbench.spec @@ -1,7 +1,7 @@ Summary: System performance benchmark Name: sysbench Version: 1.0.15 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source0: https://github.com/akopytov/%{name}/archive/%{version}/%{name}-%{version}... URL: https://github.com/akopytov/sysbench/ @@ -78,10 +78,14 @@ autoreconf -vif %make_install mv %{buildroot}%{_docdir}/sysbench/manual.html . -# Test suite segfaults in koji aarch64 -# Although it works on different aarch64 hardware... %check cd tests +# opt_repot_interval test never returns on armv7hl +%ifarch armv7hl +rm t/opt_report_interval.t +%endif +# Test suite segfaults in koji aarch64 +# Although it works on different aarch64 hardware... %ifnarch aarch64 ./test_run.sh %else @@ -96,6 +100,9 @@ cd tests %changelog +* Tue Jul 24 2018 Xavier Bachelot <xavier(a)bachelot.org> 1.0.15-3 +- Remove opt_report_interval test for armv7hl (RHBZ#1606468). + * Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

5 years, 9 months

1
0
0 / 0

Architecture specific change in rpms/rlog.git

by githook-noreply＠fedoraproject.org

The package rpms/rlog.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rlog.git/commit/?id=9ffea54f569a0.... Change: +%ifarch %{valgrind_arches} Thanks. Full change: ============ commit 9ffea54f569a0cb5af05fc700012afa96874dd8d Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> Date: Tue Jul 24 15:21:01 2018 +0200 modernize spec Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> diff --git a/rlog.spec b/rlog.spec index 2ad33cb..a641901 100644 --- a/rlog.spec +++ b/rlog.spec @@ -1,24 +1,15 @@ -%ifarch %{ix86} x86_64 ppc ppc64 s390x %{arm} -%global have_valgrind 1 -%endif - Name: rlog Summary: Runtime Logging for C++ Version: 1.4 Release: 25%{?dist} License: LGPLv2+ -Group: Development/Libraries Url: http://arg0.net/rlog VCS: http://rlog.googlecode.com/svn/trunk Source0: http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz Source1: http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc -%if 0%{?have_valgrind} -%if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: gcc-c++ +%ifarch %{valgrind_arches} BuildRequires: valgrind-devel -%else -BuildRequires: valgrind -%endif %endif # For autoreconf BuildRequires: autoconf @@ -48,21 +39,19 @@ Files needed for developing apps using rlog %build autoreconf -ivf %configure --disable-static \ -%if 0%{?have_valgrind} +%ifarch %{valgrind_arches} --enable-valgrind %else %{nil} %endif -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot} install +%make_install rm -f %{buildroot}%{_libdir}/*.la rm -rf %{buildroot}%{_docdir}/rlog -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %{_libdir}/librlog.so.*

5 years, 9 months

1
0
0 / 0

[Report] Packages Restricting Arches

by root

New package excluding arches (2) ============================ - rust-git2-curl ExclusiveArch: %{rust_arches} - rust-mio-extras ExclusiveArch: %{rust_arches} Package no longer excluding arches (1) ================================== - nacl-arm-newlib List of packages currently excluding arches (2630) =========================================== - 0ad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - 90-Second-Portraits ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - GtkAda ExclusiveArch: %{GPRbuild_arches} - GtkAda3 ExclusiveArch: %{GPRbuild_arches} - LuxRender ExclusiveArch: x86_64 - OpenTK ExclusiveArch: %mono_arches - PragmARC ExclusiveArch: %{GPRbuild_arches} - RdRand ExclusiveArch: %{ix86} x86_64 - SLOF ExclusiveArch: ppc64le - YafaRay ExclusiveArch: %{ix86} x86_64 - aboot ExclusiveArch: alpha - acpid ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 - ahven ExclusiveArch: %{GPRbuild_arches} - alleyoop ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64 - american-fuzzy-lop ExclusiveArch: %{ix86} x86_64 - anet ExclusiveArch: %{GPRbuild_arches} - apmd ExclusiveArch: %{ix86} - appstream-generator ExclusiveArch: x86_64 %{ix86} %{arm} - arduino ExclusiveArch: %{go_arches} - arduino-builder ExclusiveArch: %{go_arches} - arm-boot-config ExclusiveArch: %{arm} - arm-trusted-firmware ExclusiveArch: aarch64 - atomic ExclusiveArch: %{go_arches} - aunit ExclusiveArch: %GPRbuild_arches - avgtime ExclusiveArch: %{ldc_arches} - aws ExclusiveArch: %GPRbuild_arches - banshee ExclusiveArch: %{mono_arches} - banshee-community-extensions ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x - bareftp ExclusiveArch: %{mono_arches} - bcal ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x - bcc ExclusiveArch: x86_64 %{power64} - bcm283x-firmware ExclusiveArch: %{arm} aarch64 - beignet ExclusiveArch: x86_64 %{ix86} - berusky2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips} - biosdevname ExclusiveArch: %{ix86} x86_64 - bless ExclusiveArch: %mono_arches - boo ExclusiveArch: %{mono_arches} - buildah ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x - bwa ExclusiveArch: x86_64 - caddy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}} - cadvisor ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le - calamares ExclusiveArch: %{ix86} x86_64 - carto ExclusiveArch: %{nodejs_arches} noarch - ccdciel ExclusiveArch: %{fpc_arches} - cdcollect ExclusiveArch: %{mono_arches} - ceph ExclusiveArch: x86_64 aarch64 ppc64 ppc64le ExclusiveArch: x86_64 aarch64 ppc64le s390x - chromium ExclusiveArch: x86_64 i686 ExclusiveArch: x86_64 i686 aarch64 - cjdns ExclusiveArch: %{nodejs_arches} - cmospwd ExclusiveArch: %{ix86} x86_64 - cmrt ExclusiveArch: %{ix86} x86_64 ia64 - coffee-script ExclusiveArch: %{nodejs_arches} noarch - colorful ExclusiveArch: %{fpc_arches} - compat-gcc-296 ExclusiveArch: %{ix86} ia64 ppc - consul ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - containerd ExclusiveArch: %{go_arches} - cpuid ExclusiveArch: %{ix86} x86_64 - cqrlog ExclusiveArch: %{fpc_arches} - crash ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - cri-tools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - criu ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - cryptlib ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le - cryptobone ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64 - daq ExclusiveArch: x86_64 aarch64 - darktable ExclusiveArch: x86_64 aarch64 - dbus-sharp ExclusiveArch: %mono_arches - dbus-sharp-glib ExclusiveArch: %mono_arches - dbxtool ExclusiveArch: i386 x86_64 aarch64 - deepin-api ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - deepin-daemon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-dbus-generator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-gir-generator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - derelict ExclusiveArch: %{ldc_arches} - direnv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - dlm ExclusiveArch: i686 x86_64 - dmidecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - dmtcp ExclusiveArch: %ix86 x86_64 aarch64 - docco ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - docker ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - docker-anaconda-addon ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - docker-distribution ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - docker-latest ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - dolphin-emu ExclusiveArch: x86_64 armv7l aarch64 - douceur ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - dpdk ExclusiveArch: x86_64 i686 aarch64 ppc64le - dssi-vst ExclusiveArch: %{ix86} x86_64 - dustmite ExclusiveArch: %{ldc_arches} - dyninst ExclusiveArch: %{ix86} x86_64 ppc ppc64 - e3 ExclusiveArch: %{ix86} x86_64 - edac-utils ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - edb ExclusiveArch: %{ix86} x86_64 - edk2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: x86_64 aarch64 - efibootmgr ExclusiveArch: %{efi} - efivar ExclusiveArch: %{efi} - elasticdump ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - elk ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - embree ExclusiveArch: x86_64 - embree2 ExclusiveArch: x86_64 - envytools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - exciting ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{power64} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - exercism ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - expresso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - extlinux-bootloader ExclusiveArch: %{arm} aarch64 - fcitx-libpinyin ExclusiveArch: %{qt5_qtwebengine_arches} - fedora-dockerfiles ExclusiveArch: %{go_arches} - fedora-gnat-project-common ExclusiveArch: noarch %{GNAT_arches} - fence-virt ExclusiveArch: i686 x86_64 - fes ExclusiveArch: x86_64 - flannel ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - florist ExclusiveArch: %{GPRbuild_arches} - fluxcapacitor ExclusiveArch: %{ix86} x86_64 %{arm} - fpc ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64 - freshmaker ExclusiveArch: %{ix86} x86_64 - frysk ExclusiveArch: %{ix86} x86_64 ppc64 - fst ExclusiveArch: i686 - fwts ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x %{power64} - fwupdate ExclusiveArch: %{efi} - ga ExclusiveArch: %{ix86} x86_64 - gbrainy ExclusiveArch: %mono_arches - gdata-sharp ExclusiveArch: %mono_arches - gdb-exploitable ExclusiveArch: x86_64 i386 ExclusiveArch: x86_64 noarch - gela-asis ExclusiveArch: %GPRbuild_arches - ghdl ExclusiveArch: %{GNAT_arches} - gio-sharp ExclusiveArch: %mono_arches - gir-to-d ExclusiveArch: %{ldc_arches} - git-lfs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x} - git-octopus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - giver ExclusiveArch: %{mono_arches} - gkeyfile-sharp ExclusiveArch: %mono_arches - gl3n ExclusiveArch: %{ldc_arches} - glibc32 ExclusiveArch: x86_64 ppc64 s390x - glusterd2 ExclusiveArch: %{go_arches} - gmqcc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - gnatcoll ExclusiveArch: %GPRbuild_arches - gnome-boxes ExclusiveArch: x86_64 - gnome-desktop-sharp ExclusiveArch: %mono_arches - gnome-do ExclusiveArch: %mono_arches - gnome-guitar ExclusiveArch: %{mono_arches} - gnome-keyring-sharp ExclusiveArch: %mono_arches - gnome-rdp ExclusiveArch: %{mono_arches} - gnome-sharp ExclusiveArch: %mono_arches - gnome-subtitles ExclusiveArch: %mono_arches - gnu-efi ExclusiveArch: %{efi} - gnu-smalltalk ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - go-bindata ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - go-compilers ExclusiveArch: %{go_arches} - go-i18n ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - gocomplete ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - godep ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - godotenv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - gofed ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - golang ExclusiveArch: %{golang_arches} - golang-bitbucket-kardianos-osext ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-deepin-dbus-factory ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-deepin-go-lib ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-10gen-openssl ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - golang-github-AudriusButkevicius-cli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-AudriusButkevicius-go-nat-pmp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-AudriusButkevicius-kcp-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-AudriusButkevicius-pfilter ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-BurntSushi-freetype-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-graphics-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-toml-test ExclusiveArch: %{go_arches} - golang-github-BurntSushi-xgb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-xgbutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Jeffail-gabs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-goquery ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-purell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-urlesc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-RangelReale-osin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-RangelReale-osincli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-SeanDolphin-bqschema ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-SermoDigital-jose ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-Shopify-sarama ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Shopify-toxiproxy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-assert ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-chroma ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-alecthomas-colour ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-kingpin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-repr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-template ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-units ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-andybalholm-cascadia ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-armon-go-proxyproto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-asaskevich-govalidator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-auth0-go-jwt-middleware ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-axgle-mahonia ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bep-gitmap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bep-inflect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bgentry-go-netrc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bkaradzic-go-lz4 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-boombuler-barcode ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-buger-jsonparser ExclusiveArch: %{go_arches} noarch - golang-github-calmh-du ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-calmh-luhn ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-calmh-xdr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-ccding-go-stun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cespare-xxhash ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-chaseadamsio-goorgeous ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cheekybits-is ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-chmduquesne-rollinghash ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-chrismalek-oktasdk-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-client9-gospell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cockroachdb-cockroach-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-codahale-aesnicheck ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-codegangsta-negroni ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-go-etcd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-cryptix-wav ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-cznic-b ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-fileutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-golex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-internal ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-lex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-lexer ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-lldb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-mathutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-ql ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-sortutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-strutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-zappy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-d4l3k-messagediff ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-danwakefield-fnmatch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dchest-cssmin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dchest-siphash ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-denisenkom-go-mssqldb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-disintegration-imaging ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-dlclark-regexp2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-docker-libkv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docopt-docopt-go ExclusiveArch: %{go_arches} - golang-github-duosecurity-duo_api_golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-edsrzf-mmap-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-eknkc-amber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-endophage-gotuf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fatih-color ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fatih-structs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-flynn-go-shlex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fortytw2-leaktest ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fsnotify-fsnotify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fsouza-go-dockerclient ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fullsailor-pkcs7 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-git-lfs-wildmatch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-glacjay-goini ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-errors-errors ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-macaron-inject ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-go-mgo-mgo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-tomb-tomb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gobuffalo-envy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gobwas-glob ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gocql-gocql ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-image ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-google-go-cmp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-google-go-github ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-goraft-raft ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-css ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gosexy-gettext ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hailocab-go-hostpool ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-hclog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-plugin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-rootcerts ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-howeyc-fsnotify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-inconshreveable-go-vhost ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-influxdb-influxdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jackpal-gateway ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jdkato-prose ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jdkato-syllables ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jefferai-jsonx ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-justinas-alice ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-keybase-go-crypto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-klauspost-cpuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-klauspost-reedsolomon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-knieriem-markdown ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kyokomi-emoji ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-linuxdeepin-go-x11-client ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-lpabon-godbc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-markbates-inflect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-colorable ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mgutz-ansi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mgutz-logxi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-michaelklishin-rabbit-hole ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-miekg-mmark ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-milochristiansen-axis2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-milochristiansen-lua ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-minio-sha256-simd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-go-testing-interface ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-goamz ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-montanaflynn-stats ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-msteinert-pam ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-muesli-smartcrop ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mvo5-goconfigparser ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mvo5-uboot-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-neurosnap-sentences ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-nfnt-resize ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-noahdesu-go-ceph ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-ojii-gettext.go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-opencontainers-specs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-openshift-go-json-rest ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-openshift-go-systemd ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-openshift-openshift-sdn ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-oschwald-geoip2-golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-oschwald-maxminddb-golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-patrickmn-go-cache ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-paulrosania-go-charset ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-petermattis-goid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-pquerna-otp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-prometheus-prometheus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-rackspace-gophercloud ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-rakyll-globalconf ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rakyll-pb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-rakyll-statik ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rasky-go-xdr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-remeh-sizedwaitgroup ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-remyoudompheng-bigfft ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-ryanuber-go-glob ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-samuel-go-zookeeper ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-sasha-s-go-deadlock ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-seccomp-libseccomp-golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-sergi-go-diff ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-sethgrid-pester ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shiena-ansicolor ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shogo82148-go-shuffle ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shurcooL-sanitized_anchor_name ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-skarademir-naturalsort ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-skratchdot-open-golang ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-skynetservices-skydns ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-smartystreets-assertions ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-smartystreets-go-aws-auth ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-smartystreets-goconvey ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spacejam-loghisto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-spacemonkeygo-openssl ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm} ppc64le s390x} - golang-github-spaolacci-murmur3 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-afero ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-fsync ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-nitro ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-sstarcher-go-okta ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stathat-go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-stevvooe-resumable ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-streadway-amqp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stretchr-objx ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-syndtr-gocapability ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-syndtr-goleveldb ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-syndtr-gosnappy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-templexxx-cpufeat ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-templexxx-reedsolomon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-templexxx-xor ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-tent-http-link-go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-thejerf-suture ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-tjfoc-gmsm ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-tonnerre-golang-pretty ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-urfave-cli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-vaughan0-go-ini ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-vbatts-tar-split ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vishvananda-netlink ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} aarch64 x86_64 %{arm}} - golang-github-vishvananda-netns ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vitrun-qart ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-vjeantet-asn1-ber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vmware-govcloudair ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-wsxiaoys-terminal ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonpointer ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonreference ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonschema ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xiang90-probing ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-xrash-smetrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xtaci-kcp-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xtaci-smux ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yosssi-ace ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yosssi-gohtml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yvasiyarov-go-metrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-yvasiyarov-gorelic ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-yvasiyarov-newrelic_platform_go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-zillode-notify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-gcfg ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-go-decimal-inf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-go-exp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-googlecode-log4go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-sqlite ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-uuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-check ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-go-check-check ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-gopkg-go-macaroon-macaroon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-gopkg-retry-v1 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-torproject-pluggable-transports-goptlib ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golint ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gomtree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gotags ExclusiveArch: %{go_arches} - gotun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: x86_64 - gprbuild ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch} - gprolog ExclusiveArch: x86_64 %{ix86} ppc alpha - gsf-sharp ExclusiveArch: %mono_arches - gtk-sharp-beans ExclusiveArch: %mono_arches - gtk-sharp2 ExclusiveArch: %mono_arches - gtk-sharp3 ExclusiveArch: %{mono_arches} - gtkd ExclusiveArch: %{ldc_arches} - gudev-sharp ExclusiveArch: %mono_arches - hedgewars ExclusiveArch: %{fpc_arches} - heketi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - hsakmt ExclusiveArch: x86_64 aarch64 - hub ExclusiveArch: %{go_arches} - hugo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - hyena ExclusiveArch: %{mono_arches} - hyperscan ExclusiveArch: x86_64 - hyperv-daemons ExclusiveArch: i686 x86_64 - icaro ExclusiveArch: %{ix86} %{arm} x86_64 noarch - ignition ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - ikarus ExclusiveArch: %{ix86} - imvirt ExclusiveArch: %{ix86} x86_64 ia64 - indistarter ExclusiveArch: %{fpc_arches} - infinipath-psm ExclusiveArch: x86_64 - insect ExclusiveArch: %{nodejs_arches} noarch - intel-cmt-cat ExclusiveArch: x86_64 i686 i586 ExclusiveArch: x86_64 i686 i586 - ioport ExclusiveArch: %{ix86} x86_64 - ipw2100-firmware ExclusiveArch: noarch i386 x86_64 - ipw2200-firmware ExclusiveArch: noarch i386 x86_64 - ispc ExclusiveArch: %{arm} %{ix86} x86_64 - iucode-tool ExclusiveArch: %{ix86} x86_64 - iwyu ExclusiveArch: %{ix86} x86_64 - ixpdimm_sw ExclusiveArch: x86_64 - jake ExclusiveArch: %{nodejs_arches} noarch - jasmine-node ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - java-1.8.0-openjdk-aarch32 ExclusiveArch: %{arm} - josm ExclusiveArch: %{ix86} x86_64 - julia ExclusiveArch: %{ix86} x86_64 - keepass ExclusiveArch: %{mono_arches} - kernel ExclusiveArch: %{all_x86} x86_64 ppc64 s390x %{arm} aarch64 ppc64le - kicad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - knot-resolver ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - kompose ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x - kosmtik ExclusiveArch: %{nodejs_arches} noarch - kubernetes ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm} - latrace ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - lazarus ExclusiveArch: %{fpc_arches} - ldc ExclusiveArch: %{ldc_arches} - libbsr ExclusiveArch: %{power64} - libclc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x - libcxl ExclusiveArch: %{power64} - libflatarray ExclusiveArch: %{ix86} x86_64 - libica ExclusiveArch: s390 s390x - libipt ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - libjingle ExclusiveArch: %{ix86} x86_64 %{arm} - libmfx ExclusiveArch: %{ix86} x86_64 - libocxl ExclusiveArch: ppc64le - libpsm2 ExclusiveArch: x86_64 - libquentier ExclusiveArch: %{qt5_qtwebengine_arches} - librtas ExclusiveArch: %{power64} - libseccomp ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x - libservicelog ExclusiveArch: ppc %{power64} - libsmbios ExclusiveArch: x86_64 %{ix86} - libunwind ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64 - libva-intel-hybrid-driver ExclusiveArch: %{ix86} x86_64 ia64 - libvmi ExclusiveArch: x86_64 - libvpd ExclusiveArch: %{power64} - libxsmm ExclusiveArch: x86_64 - libzfcphbaapi ExclusiveArch: s390 s390x - lldb ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - lodash ExclusiveArch: %{nodejs_arches} noarch - log4net ExclusiveArch: %mono_arches - lrmi ExclusiveArch: %{ix86} - lsvpd ExclusiveArch: %{power64} - luajit ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mactel-boot ExclusiveArch: x86_64 - manifest-tool ExclusiveArch: x86_64 aarch64 ppc64le s390x - marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - matreshka ExclusiveArch: %GPRbuild_arches - maven-eclipse-plugin ExclusiveArch: %{ix86} x86_64 - maxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - mcelog ExclusiveArch: i686 x86_64 - mediaconch ExclusiveArch: %{qt5_qtwebengine_arches} - mellowplayer ExclusiveArch: %{qt5_qtwebengine_arches} - memkind ExclusiveArch: x86_64 - memtest86+ ExclusiveArch: %{ix86} x86_64 - mesos ExclusiveArch: x86_64 - microcode_ctl ExclusiveArch: %{ix86} x86_64 - micropython ExclusiveArch: %{arm} x86_64 - mine_detector ExclusiveArch: %{GPRbuild_arches} - minetest ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mingw-wine-gecko ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - mkbootdisk ExclusiveArch: %{ix86} sparc sparc64 x86_64 - mnemosyne ExclusiveArch: noarch %{qt5_qtwebengine_arches} - mocha ExclusiveArch: %{nodejs_arches} noarch - mod_mono ExclusiveArch: %mono_arches - module-build-service ExclusiveArch: %{ix86} x86_64 noarch - mokutil ExclusiveArch: %{ix86} x86_64 aarch64 - mongo-tools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - mongodb ExclusiveArch: %{upstream_arches} - mono ExclusiveArch: %mono_arches - mono-addins ExclusiveArch: %mono_arches - mono-basic ExclusiveArch: %{mono_arches} - mono-bouncycastle ExclusiveArch: %mono_arches - mono-cecil ExclusiveArch: %mono_arches - mono-cecil-flowanalysis ExclusiveArch: %mono_arches - mono-debugger ExclusiveArch: %ix86 x86_64 - mono-reflection ExclusiveArch: %mono_arches - mono-tools ExclusiveArch: %mono_arches - mono-zeroconf ExclusiveArch: %mono_arches - monobristol ExclusiveArch: %{mono_arches} - monodevelop ExclusiveArch: %mono_arches - monodevelop-debugger-gdb ExclusiveArch: %{mono_arches} - monosim ExclusiveArch: %mono_arches - mrrescue ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - msr-tools ExclusiveArch: %{ix86} x86_64 - mustache-d ExclusiveArch: %{ldc_arches} - mysql-connector-net ExclusiveArch: %{mono_arches} - nacl-arm-binutils ExclusiveArch: x86_64 - nacl-binutils ExclusiveArch: x86_64 - nacl-gcc ExclusiveArch: x86_64 - nacl-newlib ExclusiveArch: x86_64 - nant ExclusiveArch: %mono_arches - nbc ExclusiveArch: %{fpc_arches} - nbdkit ExclusiveArch: x86_64 - ndesk-dbus ExclusiveArch: %{mono_arches} - ndesk-dbus-glib ExclusiveArch: %{mono_arches} - newtonsoft-json ExclusiveArch: %{mono_arches} - nim ExclusiveArch: %{nim_arches} - nini ExclusiveArch: %{mono_arches} - node-gyp ExclusiveArch: %{nodejs_arches} noarch - nodejs ExclusiveArch: %{nodejs_arches} - nodejs-Base64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-abbrev ExclusiveArch: %{nodejs_arches} noarch - nodejs-accepts ExclusiveArch: %{nodejs_arches} noarch - nodejs-acorn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-acorn-dynamic-import ExclusiveArch: %{nodejs_arches} noarch - nodejs-acorn-jsx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-acorn-object-spread ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-add-stream ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-after ExclusiveArch: %{nodejs_arches} noarch - nodejs-agent-base ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-agentkeepalive ExclusiveArch: %{nodejs_arches} noarch - nodejs-ain2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-align-text ExclusiveArch: %{nodejs_arches} noarch - nodejs-alter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblack ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgcyan ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bggreen ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgmagenta ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgred ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgwhite ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgyellow ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-black ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-blue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bold ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-cyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-dim ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-escapes ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-font ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-gray ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-green ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-grey ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-hidden ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-inverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-italic ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-magenta ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-red ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-reset ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-strikethrough ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-styles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-underline ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-white ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-wrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-yellow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansicolors ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansidiff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansistyles ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-any-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-any-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ap ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-field ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-aproba ExclusiveArch: %{nodejs_arches} noarch - nodejs-archiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-archiver-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-archy ExclusiveArch: %{nodejs_arches} noarch - nodejs-are-we-there-yet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-argparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-argsparser ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-exclude ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-union ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-buffer-from-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-differ ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-events ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-find ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-find-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-foreach ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-ify ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-union ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-uniq ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-unique ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arraybuffer-dot-slice ExclusiveArch: %{nodejs_arches} noarch - nodejs-arraybuffer-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-arrify ExclusiveArch: %{nodejs_arches} noarch - nodejs-as-number ExclusiveArch: %{nodejs_arches} noarch - nodejs-asap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ascii-tree ExclusiveArch: %{nodejs_arches} noarch - nodejs-ascli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-asn1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-assert-plus ExclusiveArch: %{nodejs_arches} noarch - nodejs-assertion-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-assume ExclusiveArch: %{nodejs_arches} noarch - nodejs-ast-traverse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ast-types ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-astral ExclusiveArch: %{nodejs_arches} noarch - nodejs-astral-angular-annotate ExclusiveArch: %{nodejs_arches} noarch - nodejs-astral-pass ExclusiveArch: %{nodejs_arches} noarch - nodejs-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-async-arrays ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-limiter ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-queue ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-some ExclusiveArch: %{nodejs_arches} noarch - nodejs-asynckit ExclusiveArch: %{nodejs_arches} noarch - nodejs-atob ExclusiveArch: %{nodejs_arches} noarch - nodejs-auto-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-autoresolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-ava-init ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-aws-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws-sign2 ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-code-frame ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-messages ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-plugin-syntax-async-functions ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-plugin-syntax-async-generators ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-runtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-babylon ExclusiveArch: %{nodejs_arches} noarch - nodejs-backbone ExclusiveArch: %{nodejs_arches} noarch - nodejs-backoff ExclusiveArch: %{nodejs_arches} noarch - nodejs-balanced-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-base ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-option ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-plugins ExclusiveArch: %{nodejs_arches} noarch - nodejs-base32-encode ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-arraybuffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64id ExclusiveArch: %{nodejs_arches} noarch - nodejs-bash-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-basic-auth-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-batch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bcrypt ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-bcryptjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-beeper ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-benchmark ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-than-before ExclusiveArch: %{nodejs_arches} noarch - nodejs-bignumber-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-bind-obj-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-bindings ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bit-mask ExclusiveArch: %{nodejs_arches} noarch - nodejs-bl ExclusiveArch: %{nodejs_arches} noarch - nodejs-blob ExclusiveArch: %{nodejs_arches} noarch - nodejs-block-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-bluebird ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-body-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-boolbase ExclusiveArch: %{nodejs_arches} noarch - nodejs-boom ExclusiveArch: %{nodejs_arches} noarch - nodejs-brace-expansion ExclusiveArch: %{nodejs_arches} noarch - nodejs-braces ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-breakable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-browser-request ExclusiveArch: %{nodejs_arches} noarch - nodejs-browser-stdout ExclusiveArch: %{nodejs_arches} noarch - nodejs-bson ExclusiveArch: %{nodejs_arches} noarch - nodejs-buble ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buf-compare ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-crc32 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-shims ExclusiveArch: %{nodejs_arches} noarch - nodejs-buffer-writer ExclusiveArch: %{nodejs_arches} noarch - nodejs-buffertools ExclusiveArch: %{nodejs_arches} - nodejs-bufferutil ExclusiveArch: %{nodejs_arches} - nodejs-builtin-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-builtins ExclusiveArch: %{nodejs_arches} noarch - nodejs-bundle-dependencies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-burrito ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-busboy ExclusiveArch: %{nodejs_arches} noarch - nodejs-byline ExclusiveArch: %{nodejs_arches} noarch - nodejs-bytes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cache-base ExclusiveArch: %{nodejs_arches} noarch - nodejs-caching-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-call-delayed ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-matcher ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-me-maybe ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-callback-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsites ExclusiveArch: %{nodejs_arches} noarch - nodejs-camel-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-caniuse-db ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-capture-stack-trace ExclusiveArch: %{nodejs_arches} noarch - nodejs-carrier ExclusiveArch: %{nodejs_arches} noarch - nodejs-caseless ExclusiveArch: %{nodejs_arches} noarch - nodejs-center-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-as-promised ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-cheerio ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-connect-middleware ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-json-schema ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-oauth2orize-grant ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-passport-strategy ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-spies-next ExclusiveArch: %{nodejs_arches} noarch - nodejs-chainer ExclusiveArch: %{nodejs_arches} noarch - nodejs-chainsaw ExclusiveArch: %{nodejs_arches} noarch - nodejs-chalk ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-change-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-char-spinner ExclusiveArch: %{nodejs_arches} noarch - nodejs-character-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-charenc ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-charm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-check-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-cheerio ExclusiveArch: %{nodejs_arches} noarch - nodejs-child-process-close ExclusiveArch: %{nodejs_arches} noarch - nodejs-chmodr ExclusiveArch: %{nodejs_arches} noarch - nodejs-chownr ExclusiveArch: %{nodejs_arches} noarch - nodejs-chroma-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-chrono ExclusiveArch: %{nodejs_arches} noarch - nodejs-ci-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-circular-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-cjson ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-class-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-clean-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clean-yaml-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clear-require ExclusiveArch: %{nodejs_arches} noarch - nodejs-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-spinner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-cliui ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-stats ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-closure-compiler ExclusiveArch: %{nodejs_arches} noarch - nodejs-cls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cmd-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-co ExclusiveArch: %{nodejs_arches} noarch - nodejs-co-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-co-with-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-coa ExclusiveArch: %{nodejs_arches} noarch - nodejs-code-point-at ExclusiveArch: %{nodejs_arches} noarch - nodejs-codemirror ExclusiveArch: %{nodejs_arches} noarch - nodejs-coffee-coverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-collection-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-collections ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-color-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-colour ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-columnify ExclusiveArch: %{nodejs_arches} noarch - nodejs-combined-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-commander ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-common-path-prefix ExclusiveArch: %{nodejs_arches} noarch - nodejs-commondir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-commoner ExclusiveArch: %{nodejs_arches} noarch - nodejs-commonmark ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compare-func ExclusiveArch: %{nodejs_arches} noarch - nodejs-compare-versions ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-emitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-inherit ExclusiveArch: %{nodejs_arches} noarch - nodejs-compress-commons ExclusiveArch: %{nodejs_arches} noarch - nodejs-compressible ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compression ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-map ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-config-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-connect-livereload ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-connect-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-console-browserify ExclusiveArch: %{nodejs_arches} noarch - nodejs-console-dot-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-console-group ExclusiveArch: %{nodejs_arches} noarch - nodejs-consolemd ExclusiveArch: %{nodejs_arches} noarch - nodejs-constant-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-constantinople ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-disposition ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-conventional-changelog-angular ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-atom ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-codemirror ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-core ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-conventional-changelog-ember ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-eslint ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-express ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-jquery ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-jscs ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-jshint ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-preset-loader ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-writer ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-filter ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-recommended-bump ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-hex ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie-jar ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookie-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookie-session ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookiejar ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-copy-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-core-assert ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-core-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-core-util-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-couch-login ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-coveralls ExclusiveArch: %{nodejs_arches} noarch - nodejs-crc ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-crc32-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-create-error-class ExclusiveArch: %{nodejs_arches} noarch - nodejs-cross-spawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cross-spawn-async ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-crypt ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cryptiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-csrf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-select ExclusiveArch: %{nodejs_arches} noarch - nodejs-css-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-tree ExclusiveArch: %{nodejs_arches} noarch - nodejs-css-what ExclusiveArch: %{nodejs_arches} noarch - nodejs-csscomb-core ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cssom ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csurf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-generate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-spectrum ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ctype ExclusiveArch: %{nodejs_arches} noarch - nodejs-currently-unhandled ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cycle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cyclist ExclusiveArch: %{nodejs_arches} noarch - nodejs-d ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dargs ExclusiveArch: %{nodejs_arches} noarch - nodejs-dashdash ExclusiveArch: %{nodejs_arches} noarch - nodejs-data-uri-to-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-date-now ExclusiveArch: %{nodejs_arches} noarch - nodejs-dateformat ExclusiveArch: %{nodejs_arches} noarch - nodejs-death ExclusiveArch: %{nodejs_arches} noarch - nodejs-debug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-debug-fabulous ExclusiveArch: %{nodejs_arches} noarch - nodejs-debug-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-debuglog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-decamelize ExclusiveArch: %{nodejs_arches} noarch - nodejs-decamelize-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-decimal-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-decompress-response ExclusiveArch: %{nodejs_arches} noarch - nodejs-dedent ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-eql ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deep-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-default-require-extensions ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-default-resolution ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defaults ExclusiveArch: %{nodejs_arches} noarch - nodejs-defence ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defence-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-properties ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-defined ExclusiveArch: %{nodejs_arches} noarch - nodejs-defs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-degenerator ExclusiveArch: %{nodejs_arches} noarch - nodejs-del ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-delayed-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-delegates ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-delete ExclusiveArch: %{nodejs_arches} noarch - nodejs-dep-graph ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-depd ExclusiveArch: %{nodejs_arches} noarch - nodejs-deprecated ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-newline ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-detective ExclusiveArch: %{nodejs_arches} noarch - nodejs-dezalgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-dicer ExclusiveArch: %{nodejs_arches} noarch - nodejs-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dirty-chai ExclusiveArch: %{nodejs_arches} noarch - nodejs-docopt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-doctrine ExclusiveArch: %{nodejs_arches} noarch - nodejs-dom-serializer ExclusiveArch: %{nodejs_arches} noarch - nodejs-domelementtype ExclusiveArch: %{nodejs_arches} noarch - nodejs-domhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-domutils ExclusiveArch: %{nodejs_arches} noarch - nodejs-dot-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-dot-prop ExclusiveArch: %{nodejs_arches} noarch - nodejs-dotfile-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dreamopt ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-dryice ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dtree ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplex ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexer ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexer2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-duplexer3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexify ExclusiveArch: %{nodejs_arches} noarch - nodejs-duration ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-ebnf-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-echomd ExclusiveArch: %{nodejs_arches} noarch - nodejs-ecstatic ExclusiveArch: %{nodejs_arches} noarch - nodejs-editor ExclusiveArch: %{nodejs_arches} noarch - nodejs-ee-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-ejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-emojione ExclusiveArch: %{nodejs_arches} noarch - nodejs-empty-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-encodeurl ExclusiveArch: %{nodejs_arches} noarch - nodejs-encoding ExclusiveArch: %{nodejs_arches} noarch - nodejs-end-of-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-client ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-entities ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-ex ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-errorhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-errs ExclusiveArch: %{nodejs_arches} noarch - nodejs-es-abstract ExclusiveArch: %{nodejs_arches} noarch - nodejs-es-to-primitive ExclusiveArch: %{nodejs_arches} noarch - nodejs-es5-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es5-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-iterator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-promisify ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-set ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escallmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-html ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-regexp-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escape-string-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-escodegen ExclusiveArch: %{nodejs_arches} noarch - nodejs-escope ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espower ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espower-location-detector ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima-fb ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima-harmony-jscs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espurify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-esrecurse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse-fb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estree-walker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-esutils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-etag ExclusiveArch: %{nodejs_arches} noarch - nodejs-event-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-event-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-eventemitter2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-eventemitter3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-events ExclusiveArch: %{nodejs_arches} noarch - nodejs-events-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-everything-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-execa ExclusiveArch: %{nodejs_arches} noarch - nodejs-exit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-brackets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-tilde ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expect-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-express ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-express-session ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extended-emitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extsprintf ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-eyes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fake ExclusiveArch: %{nodejs_arches} noarch - nodejs-fancy-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-far ExclusiveArch: %{nodejs_arches} noarch - nodejs-fast-levenshtein ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fastfall ExclusiveArch: %{nodejs_arches} noarch - nodejs-faucet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-faye-websocket ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fd ExclusiveArch: %{nodejs_arches} noarch - nodejs-fd-slicer ExclusiveArch: %{nodejs_arches} noarch - nodejs-fg-lodash ExclusiveArch: %{nodejs_arches} noarch - nodejs-figures ExclusiveArch: %{nodejs_arches} noarch - nodejs-file-entry-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-file-sync-cmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-file-uri-to-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-filed ExclusiveArch: %{nodejs_arches} noarch - nodejs-filelist ExclusiveArch: %{nodejs_arches} noarch - nodejs-filename-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fileset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fill-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-fill-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-finalhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-find-cache-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-find-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-findup-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-first-chunk-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flagged-respawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flat-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flot ExclusiveArch: %{nodejs_arches} noarch - nodejs-flush-write-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fmix ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-dot-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-follow ExclusiveArch: %{nodejs_arches} noarch - nodejs-follow-redirects ExclusiveArch: %{nodejs_arches} noarch - nodejs-for-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-for-in ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-for-own ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-foreach ExclusiveArch: %{nodejs_arches} noarch - nodejs-foreground-child ExclusiveArch: %{nodejs_arches} noarch - nodejs-forever-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-form-data ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-formatio ExclusiveArch: %{nodejs_arches} noarch - nodejs-formidable ExclusiveArch: %{nodejs_arches} noarch - nodejs-forwarded ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fragment-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-freetree ExclusiveArch: %{nodejs_arches} noarch - nodejs-fresh ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-from2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-dot-notify ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-cached ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fs-ext ExclusiveArch: %{nodejs_arches} - nodejs-fs-extra ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-temp ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-vacuum ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-write-stream-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs2 ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-ignore ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-npm ExclusiveArch: %{nodejs_arches} noarch - nodejs-ftp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-function-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-function-loop ExclusiveArch: %{nodejs_arches} noarch - nodejs-gauge ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gaze ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gdal ExclusiveArch: %{nodejs_arches} - nodejs-generate-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-generate-object-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-generic-pool ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-get-pkg-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-port ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-stdin ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-uri ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-get-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-getobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gettext-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-dummy-commit ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-raw-commits ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-remote-origin-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-semver-tags ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-tails ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gitconfiglocal ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-git ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-username-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob-base ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-expand ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-parent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-to-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-global-modules ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-global-prefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globby ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globule ExclusiveArch: %{nodejs_arches} noarch - nodejs-glogg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gnode ExclusiveArch: %{nodejs_arches} noarch - nodejs-gonzales-pe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-got ExclusiveArch: %{nodejs_arches} noarch - nodejs-graceful-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-graceful-readlink ExclusiveArch: %{nodejs_arches} noarch - nodejs-grip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-growl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-angular-templates ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-banner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-cli ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-compare-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-clean ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-concat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-cssmin ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-htmlmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-internal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-less ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-nodeunit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-requirejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-uglify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-watch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-git-authors ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-html-validation ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-init ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-known-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-lib-contrib ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-saucelabs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-sed ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-simple-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-svgmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-args ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-process ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-wrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-gulp-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulp-ng-classify ExclusiveArch: %{nodejs_arches} noarch - nodejs-gulp-util ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gzip-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-handle-thing ExclusiveArch: %{nodejs_arches} noarch - nodejs-handlebars ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-har-validator ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-has ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-flag ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-unicode ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-yarn ExclusiveArch: %{nodejs_arches} noarch - nodejs-hash_file ExclusiveArch: %{nodejs_arches} noarch - nodejs-hawk ExclusiveArch: %{nodejs_arches} noarch - nodejs-he ExclusiveArch: %{nodejs_arches} noarch - nodejs-heap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hex-to-array-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-highlight-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-historic-readline ExclusiveArch: %{nodejs_arches} noarch - nodejs-hock ExclusiveArch: %{nodejs_arches} noarch - nodejs-hoek ExclusiveArch: %{nodejs_arches} noarch - nodejs-homedir-polyfill ExclusiveArch: %{nodejs_arches} noarch - nodejs-hook-std ExclusiveArch: %{nodejs_arches} noarch - nodejs-hooker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hosted-git-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-hsluv ExclusiveArch: %{nodejs_arches} noarch - nodejs-html-minifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-htmlparser2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-deceiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-errors ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-http-proxy ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-http-server ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-signature ExclusiveArch: %{nodejs_arches} noarch - nodejs-http2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-https-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-humanize-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-i ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-i18n-transform ExclusiveArch: %{nodejs_arches} noarch - nodejs-i2c ExclusiveArch: %{nodejs_arches} - nodejs-iconv ExclusiveArch: %{nodejs_arches} - nodejs-iconv-lite ExclusiveArch: %{nodejs_arches} noarch - nodejs-iferr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ignore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-immutable ExclusiveArch: %{nodejs_arches} noarch - nodejs-import-local ExclusiveArch: %{nodejs_arches} noarch - nodejs-imul ExclusiveArch: %{nodejs_arches} noarch - nodejs-imurmurhash ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-indent-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-infinity-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-inflight ExclusiveArch: %{nodejs_arches} noarch - nodejs-info-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-inherit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-inherits ExclusiveArch: %{nodejs_arches} noarch - nodejs-inherits1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-ini ExclusiveArch: %{nodejs_arches} noarch - nodejs-init-package-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-inline-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-install ExclusiveArch: %{nodejs_arches} noarch - nodejs-int64-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-intercept-require ExclusiveArch: %{nodejs_arches} noarch - nodejs-interpret ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-into-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-invert-kv ExclusiveArch: %{nodejs_arches} noarch - nodejs-ip ExclusiveArch: %{nodejs_arches} noarch - nodejs-ipaddr-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-irc-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-irregular-plurals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-absolute ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-accessor-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-arrayish ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-arrow-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-boolean-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-builtin-module ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-callable ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-data-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-date-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-dotfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-equal-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-extendable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-finite ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-fullwidth-code-point ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-generator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-lower-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-module ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-my-json-valid ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-negated-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-number ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-number-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-odd ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-path-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-in-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-inside ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-plain-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-plain-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-primitive ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-redirect ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-registered ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-relative ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-retry-allowed ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-subset ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-text-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-typedarray ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-unc-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-upper-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-valid-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-valid-instance ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-windows ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isarray ExclusiveArch: %{nodejs_arches} noarch - nodejs-isexe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-iso8601 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isodate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-coverage ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-hook ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-report ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-source-maps ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-reports ExclusiveArch: %{nodejs_arches} noarch - nodejs-jade ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jasmine-growl-reporter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jasmine-reporters ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jest-mock ExclusiveArch: %{nodejs_arches} noarch - nodejs-jison ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jison-lex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jju ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joose ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joosex-namespace-depended ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joosex-simplerequest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-base64 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-string-escape ExclusiveArch: %{nodejs_arches} noarch - nodejs-js-tokens ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-yaml ExclusiveArch: %{nodejs_arches} noarch - nodejs-jschardet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jscoverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jshint ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-localizer ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-parse-better-errors ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-parse-helpfulerror ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stable-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stringify-safe ExclusiveArch: %{nodejs_arches} noarch - nodejs-json3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonm ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonpointer ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonpointer-dot-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonselect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jwt-simple ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keep-alive-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-keygrip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keypress ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-kind-of ExclusiveArch: %{nodejs_arches} noarch - nodejs-klaw ExclusiveArch: %{nodejs_arches} noarch - nodejs-kuler2gpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-langdetect ExclusiveArch: %{nodejs_arches} noarch - nodejs-latest-version ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lazy-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lazystream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lcid ExclusiveArch: %{nodejs_arches} noarch - nodejs-lcov-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-leaflet ExclusiveArch: %{nodejs_arches} noarch - nodejs-leaflet-formbuilder ExclusiveArch: %{nodejs_arches} noarch - nodejs-leaflet-hash ExclusiveArch: %{nodejs_arches} noarch - nodejs-leche ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-left-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-less ExclusiveArch: %{nodejs_arches} noarch - nodejs-levn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lex-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-libpq ExclusiveArch: %{nodejs_arches} - nodejs-libxmljs ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-line-numbers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-line-reader ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linkify-it ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-load-grunt-tasks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-load-json-file ExclusiveArch: %{nodejs_arches} noarch - nodejs-locate-character ExclusiveArch: %{nodejs_arches} noarch - nodejs-locate-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-lockfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-log-driver ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-ok ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-symbols ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-lolex ExclusiveArch: %{nodejs_arches} noarch - nodejs-longest ExclusiveArch: %{nodejs_arches} noarch - nodejs-loophole ExclusiveArch: %{nodejs_arches} noarch - nodejs-loud-rejection ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lower-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-lower-case-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-lowercase-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ltx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-magic-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-make-arrow-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-generator-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-makedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-makeerror ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-mapnik ExclusiveArch: %{nodejs_arches} - nodejs-mapnik-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-mapnik-vector-tile ExclusiveArch: %{nodejs_arches} noarch - nodejs-markdown ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-markdown-it-testgen ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-matched ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-max-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-maxmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-mbtiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-md5 ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5-hex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5-o-matic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mdn-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-mdurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-media-typer ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoizee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-memwatch-next ExclusiveArch: %{nodejs_arches} - nodejs-meow ExclusiveArch: %{nodejs_arches} noarch - nodejs-merge-descriptors ExclusiveArch: %{nodejs_arches} noarch - nodejs-merge-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-metascript ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-method-override ExclusiveArch: %{nodejs_arches} noarch - nodejs-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-micromatch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-millstone ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mime-db ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-mimeparse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mimic-response ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimalistic-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-minimist-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-minipass ExclusiveArch: %{nodejs_arches} noarch - nodejs-minstache ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkdirp ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkfiletree ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-bin ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-git ExclusiveArch: %{nodejs_arches} noarch - nodejs-modify-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-module-not-found-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-moment ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-moment-timezone ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb-core ExclusiveArch: %{nodejs_arches} noarch - nodejs-monocle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-morgan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-muffin ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multiline ExclusiveArch: %{nodejs_arches} noarch - nodejs-multimatch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multiparty ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multipipe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-murmur-32 ExclusiveArch: %{nodejs_arches} noarch - nodejs-mustache ExclusiveArch: %{nodejs_arches} noarch - nodejs-mutate-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-mute-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-mv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mysql ExclusiveArch: %{nodejs_arches} noarch - nodejs-mz ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-nan0 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nan1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-nanomatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-nanoseconds ExclusiveArch: %{nodejs_arches} noarch - nodejs-native-or-bluebird ExclusiveArch: %{nodejs_arches} noarch - nodejs-ncp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-needle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-negotiator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nested-error-stacks ExclusiveArch: %{nodejs_arches} noarch - nodejs-net-browserify-alt ExclusiveArch: %{nodejs_arches} noarch - nodejs-netmask ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-next ExclusiveArch: %{nodejs_arches} noarch - nodejs-next-tick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ng-classify ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-dot-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-expat ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-node-int64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-print ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-static ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-status-codes ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-stringprep ExclusiveArch: %{nodejs_arches} - nodejs-node-uuid ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nomnom ExclusiveArch: %{nodejs_arches} noarch - nodejs-noncharacters ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt-usage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-noptify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-normalize-git-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-package-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-cache-filename ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-install-checks ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-npm-package-arg ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-registry-client ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-npm-run-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-user-validate ExclusiveArch: %{nodejs_arches} noarch - nodejs-npmlog ExclusiveArch: %{nodejs_arches} noarch - nodejs-nsp-api ExclusiveArch: %{nodejs_arches} noarch - nodejs-nsp-audit-shrinkwrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-nth-check ExclusiveArch: %{nodejs_arches} noarch - nodejs-number-is-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-numeral ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth2orize ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-assign ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-dot-entries ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-dot-omit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-dot-pick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-inspect ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-observable-to-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-obuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-okay ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-finished ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-headers ExclusiveArch: %{nodejs_arches} noarch - nodejs-once ExclusiveArch: %{nodejs_arches} noarch - nodejs-onetime ExclusiveArch: %{nodejs_arches} noarch - nodejs-only-shallow ExclusiveArch: %{nodejs_arches} noarch - nodejs-oop ExclusiveArch: %{nodejs_arches} noarch - nodejs-opal-runtime ExclusiveArch: %{nodejs_arches} noarch - nodejs-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-opener ExclusiveArch: %{nodejs_arches} noarch - nodejs-opn ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-option-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-option-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-optionator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-optjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-opts ExclusiveArch: %{nodejs_arches} noarch - nodejs-orchestrator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ordered-read-streams ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-os-homedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-locale ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-tmpdir ExclusiveArch: %{nodejs_arches} noarch - nodejs-osenv ExclusiveArch: %{nodejs_arches} noarch - nodejs-output-file-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-own-or ExclusiveArch: %{nodejs_arches} noarch - nodejs-own-or-env ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-finally ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-is-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-locate ExclusiveArch: %{nodejs_arches} noarch - nodejs-pac-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pac-resolver ExclusiveArch: %{nodejs_arches} noarch - nodejs-package ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-package-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-package-json ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-package-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-packaging ExclusiveArch: %{nodejs_arches} noarch - nodejs-packet-reader ExclusiveArch: %{nodejs_arches} noarch - nodejs-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pad-left ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-paperboy ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parallel-transform ExclusiveArch: %{nodejs_arches} noarch - nodejs-param-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-github-repo-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parse-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-passwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-parsejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseqs ExclusiveArch: %{nodejs_arches} noarch - nodejs-parserlib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parseuri ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pascal-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-pascalcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-http-bearer ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth2-client-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-strategy ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-array ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-dirname ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-exists ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-extra ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-absolute ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-inside ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-key ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-parse ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-to-regexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-path2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pathval ExclusiveArch: %{nodejs_arches} noarch - nodejs-pause ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pause-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-pbkdf2-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-pedding ExclusiveArch: %{nodejs_arches} noarch - nodejs-pegjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-pem ExclusiveArch: %{nodejs_arches} noarch - nodejs-pend ExclusiveArch: %{nodejs_arches} noarch - nodejs-pff ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-connection-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-cursor ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-escape ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-int8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-native ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-pgpass ExclusiveArch: %{nodejs_arches} noarch - nodejs-pify ExclusiveArch: %{nodejs_arches} noarch - nodejs-pinkie ExclusiveArch: %{nodejs_arches} noarch - nodejs-pinkie-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkg-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pkg-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkginfo ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-platform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-plur ExclusiveArch: %{nodejs_arches} noarch - nodejs-portfinder ExclusiveArch: %{nodejs_arches} noarch - nodejs-portscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-posix-character-classes ExclusiveArch: %{nodejs_arches} noarch - nodejs-posix-getopt ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-bytea ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-date ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-interval ExclusiveArch: %{nodejs_arches} noarch - nodejs-precond ExclusiveArch: %{nodejs_arches} noarch - nodejs-prelude-ls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-prepend-http ExclusiveArch: %{nodejs_arches} noarch - nodejs-preserve ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-bytes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-hrtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-pretty-time ExclusiveArch: %{nodejs_arches} noarch - nodejs-private ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-process-nextick-args ExclusiveArch: %{nodejs_arches} noarch - nodejs-proclaim ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promises-aplus-tests ExclusiveArch: %{nodejs_arches} noarch - nodejs-prompt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promzard ExclusiveArch: %{nodejs_arches} noarch - nodejs-propagate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-propget ExclusiveArch: %{nodejs_arches} noarch - nodejs-proto-list ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy-addr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-proxyquire ExclusiveArch: %{nodejs_arches} noarch - nodejs-pruddy-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-pseudomap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pubcontrol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pump ExclusiveArch: %{nodejs_arches} noarch - nodejs-pumpify ExclusiveArch: %{nodejs_arches} noarch - nodejs-q ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-q-io ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-qs ExclusiveArch: %{nodejs_arches} noarch - nodejs-qtdatastream ExclusiveArch: %{nodejs_arches} noarch - nodejs-queue-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-quick-lru ExclusiveArch: %{nodejs_arches} noarch - nodejs-qunit-extras ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-qunitjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-rainbowsocks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-random-bytes ExclusiveArch: %{nodejs_arches} noarch - nodejs-random-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-randomatic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-range-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-raw-body ExclusiveArch: %{nodejs_arches} noarch - nodejs-rc ExclusiveArch: %{nodejs_arches} noarch - nodejs-re-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-all-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-cmd-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-dir-files ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-installed ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-json-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-package-json ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-package-tree ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-pkg ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-pkg-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-readable-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-readdir-enhanced ExclusiveArch: %{nodejs_arches} noarch - nodejs-readdir-scoped-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-readdirp ExclusiveArch: %{nodejs_arches} noarch - nodejs-realize-package-specifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-recast ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rechoir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-redent ExclusiveArch: %{nodejs_arches} noarch - nodejs-reduce-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regenerator ExclusiveArch: %{nodejs_arches} noarch - nodejs-regex-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regex-not ExclusiveArch: %{nodejs_arches} noarch - nodejs-registry-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-relateurl ExclusiveArch: %{nodejs_arches} noarch - nodejs-remove-trailing-separator ExclusiveArch: %{nodejs_arches} noarch - nodejs-repeat-element ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeat-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeating ExclusiveArch: %{nodejs_arches} noarch - nodejs-repl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-replace ExclusiveArch: %{nodejs_arches} noarch - nodejs-replace-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-replace-require-self ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-request ExclusiveArch: %{nodejs_arches} noarch - nodejs-requestretry ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-cs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-require-directory ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-inject ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-main-filename ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-relative ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-uncached ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-yaml ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-requirejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-requires-port ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-cwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-pkg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-response-time ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resumer ExclusiveArch: %{nodejs_arches} noarch - nodejs-ret ExclusiveArch: %{nodejs_arches} noarch - nodejs-retry ExclusiveArch: %{nodejs_arches} noarch - nodejs-reusify ExclusiveArch: %{nodejs_arches} noarch - nodejs-revalidator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rewire ExclusiveArch: %{nodejs_arches} noarch - nodejs-rfile ExclusiveArch: %{nodejs_arches} noarch - nodejs-rhea ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-right-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-rimraf ExclusiveArch: %{nodejs_arches} noarch - nodejs-rndm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rollup ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rollup-plugin-buble ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-commonjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-node-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-pluginutils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ronn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-run-parallel-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-runforcover ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safe-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-safe-json-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safe-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-safecb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-samsam ExclusiveArch: %{nodejs_arches} noarch - nodejs-sauce-tunnel ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-saucelabs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sax ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-scmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-secure-random ExclusiveArch: %{nodejs_arches} noarch - nodejs-seedrandom ExclusiveArch: %{nodejs_arches} noarch - nodejs-select-hose ExclusiveArch: %{nodejs_arches} noarch - nodejs-semver ExclusiveArch: %{nodejs_arches} noarch - nodejs-send ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sentence-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-sentiment ExclusiveArch: %{nodejs_arches} noarch - nodejs-seq ExclusiveArch: %{nodejs_arches} noarch - nodejs-sequencify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serialize-error ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serve-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serve-static ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-server-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-blocking ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-getter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-set-immediate ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-immediate-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-setimmediate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-setprototypeof ExclusiveArch: %{nodejs_arches} noarch - nodejs-sha ExclusiveArch: %{nodejs_arches} noarch - nodejs-shallow-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-command ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-shelljs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-shelljs-nodecli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-should ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-should-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-format ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-http ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-showdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-sift ExclusiveArch: %{nodejs_arches} noarch - nodejs-sigmund ExclusiveArch: %{nodejs_arches} noarch - nodejs-signal-exit ExclusiveArch: %{nodejs_arches} noarch - nodejs-silent-npm-registry-client ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-asyncify ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-fmt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-single-line-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon-chai ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sinon-restore ExclusiveArch: %{nodejs_arches} noarch - nodejs-slash ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sliced ExclusiveArch: %{nodejs_arches} noarch - nodejs-slide ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-smart-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-snake-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture-set ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-snockets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sntp ExclusiveArch: %{nodejs_arches} noarch - nodejs-socket-dot-io-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-socks-client ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-socks-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sort-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-sorted-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-fixtures ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-sparkles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-spawn-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-spawn-wrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-correct ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-exceptions ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-expression-parse ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-license-ids ExclusiveArch: %{nodejs_arches} noarch - nodejs-spec ExclusiveArch: %{nodejs_arches} noarch - nodejs-spec-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-speedometer ExclusiveArch: %{nodejs_arches} noarch - nodejs-split ExclusiveArch: %{nodejs_arches} noarch - nodejs-split-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-split2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-sqlite3 ExclusiveArch: %{nodejs_arches} - nodejs-srs ExclusiveArch: %{nodejs_arches} noarch - nodejs-ssri ExclusiveArch: %{nodejs_arches} noarch - nodejs-st ExclusiveArch: %{nodejs_arches} noarch - nodejs-stable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-trace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-utils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-static-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-static-favicon ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-statuses ExclusiveArch: %{nodejs_arches} noarch - nodejs-std-mocks ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-combiner ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-consume ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-counter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-pair ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-reduce ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-replace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-shift ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-spigot ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-streamsearch ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamsink ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamtest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-repeat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-trim ExclusiveArch: %{nodejs_arches} noarch - nodejs-string-width ExclusiveArch: %{nodejs_arches} noarch - nodejs-string_decoder ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringmap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-ansi ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-bom-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-color ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-eof ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-json-comments ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strong-log-transformer ExclusiveArch: %{nodejs_arches} noarch - nodejs-strscanner ExclusiveArch: %{nodejs_arches} noarch - nodejs-stylus ExclusiveArch: %{nodejs_arches} noarch - nodejs-success-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-superagent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-superagent-proxy ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-supertest ExclusiveArch: %{nodejs_arches} noarch - nodejs-supervisor ExclusiveArch: %{nodejs_arches} noarch - nodejs-supports-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-suspend ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-swap-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-symbol-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-mocha-reporter ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-out ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-spec ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tape ExclusiveArch: %{nodejs_arches} noarch - nodejs-tapes ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar-pack ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp-write ExclusiveArch: %{nodejs_arches} noarch - nodejs-tempfile ExclusiveArch: %{nodejs_arches} noarch - nodejs-temporary ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-cordovajs ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-liferay ExclusiveArch: %{nodejs_arches} noarch - nodejs-terst ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-test ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-test-exclude ExclusiveArch: %{nodejs_arches} noarch - nodejs-testdata-w3c-json-form ExclusiveArch: %{nodejs_arches} noarch - nodejs-testjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testswarm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testutil ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-extensions ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-thenify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thenify-all ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-through ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-through2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-through2-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thunkify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tildify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tilejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-tilelive ExclusiveArch: %{nodejs_arches} noarch - nodejs-tilelive-mapnik ExclusiveArch: %{nodejs_arches} noarch - nodejs-tiletype ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-diff ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-stamp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-timed-out ExclusiveArch: %{nodejs_arches} noarch - nodejs-timekeeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-timers-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tiny-lr-fork ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tippex ExclusiveArch: %{nodejs_arches} noarch - nodejs-title-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-tlds ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmp ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-absolute-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-object-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-regex-range ExclusiveArch: %{nodejs_arches} noarch - nodejs-touch ExclusiveArch: %{nodejs_arches} noarch - nodejs-tough-cookie ExclusiveArch: %{nodejs_arches} noarch - nodejs-tracejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-transformers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-traverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-treeify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tressa ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-trim-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim-off-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trivial-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-try-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-try-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-tryor ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tsame ExclusiveArch: %{nodejs_arches} noarch - nodejs-tslib ExclusiveArch: %{nodejs_arches} noarch - nodejs-tsscmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ttembed-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-tunnel-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-tv4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-check ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-type-detect ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-name ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-typeahead.js ExclusiveArch: %{nodejs_arches} noarch - nodejs-typedarray ExclusiveArch: %{nodejs_arches} noarch - nodejs-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-uc-dot-micro ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uglify-to-browserify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid-number ExclusiveArch: %{nodejs_arches} noarch - nodejs-uid-safe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ultron ExclusiveArch: %{nodejs_arches} noarch - nodejs-umask ExclusiveArch: %{nodejs_arches} noarch - nodejs-unc-path-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore-dot-logger ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unicode-7.0.0 ExclusiveArch: %{nodejs_arches} noarch - nodejs-unicode-length ExclusiveArch: %{nodejs_arches} noarch - nodejs-union ExclusiveArch: %{nodejs_arches} noarch - nodejs-union-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-unique-filename ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-slug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-unpipe ExclusiveArch: %{nodejs_arches} noarch - nodejs-unset-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-upper-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-upper-case-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-uri-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-urix ExclusiveArch: %{nodejs_arches} noarch - nodejs-url-join ExclusiveArch: %{nodejs_arches} noarch - nodejs-url-parse-lax ExclusiveArch: %{nodejs_arches} noarch - nodejs-url2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-use ExclusiveArch: %{nodejs_arches} noarch - nodejs-user-home ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-utfx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-deprecate ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-inspect ExclusiveArch: %{nodejs_arches} noarch - nodejs-utile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utilities ExclusiveArch: %{nodejs_arches} noarch - nodejs-utils-merge ExclusiveArch: %{nodejs_arches} noarch - nodejs-uuid ExclusiveArch: %{nodejs_arches} noarch - nodejs-vali-date ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-validate-npm-package-license ExclusiveArch: %{nodejs_arches} noarch - nodejs-validate-npm-package-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-vary ExclusiveArch: %{nodejs_arches} noarch - nodejs-vasync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-verror ExclusiveArch: %{nodejs_arches} noarch - nodejs-vhost ExclusiveArch: %{nodejs_arches} noarch - nodejs-vinyl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vlq ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-vow-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vows ExclusiveArch: %{nodejs_arches} noarch - nodejs-w3cjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-walkdir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-walker ExclusiveArch: %{nodejs_arches} noarch - nodejs-ware ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-warning-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-watchit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-watershed ExclusiveArch: %{nodejs_arches} noarch - nodejs-wbuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-wcwidth ExclusiveArch: %{nodejs_arches} noarch - nodejs-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-websocket-driver ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-when ExclusiveArch: %{nodejs_arches} noarch - nodejs-whet-dot-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-which ExclusiveArch: %{nodejs_arches} noarch - nodejs-win-spawn ExclusiveArch: %{nodejs_arches} noarch - nodejs-window-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-winston ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-with ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wolfy87-eventemitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-woothee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wordwrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrap-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-wrap-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrappy ExclusiveArch: %{nodejs_arches} noarch - nodejs-write ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-write-file-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-json-file ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-pkg ExclusiveArch: %{nodejs_arches} noarch - nodejs-ws ExclusiveArch: %{nodejs_arches} noarch - nodejs-xdg-basedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-xml2js ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlbuilder ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmldom ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlhttprequest ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlhttprequest-ssl ExclusiveArch: %{nodejs_arches} noarch - nodejs-xregexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-xtend ExclusiveArch: %{nodejs_arches} noarch - nodejs-y18n ExclusiveArch: %{nodejs_arches} noarch - nodejs-yallist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yapool ExclusiveArch: %{nodejs_arches} noarch - nodejs-yargs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yargs-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-yarn ExclusiveArch: %{nodejs_arches} noarch - nodejs-yauzl ExclusiveArch: %{nodejs_arches} noarch - nodejs-yeast ExclusiveArch: %{nodejs_arches} noarch - nodejs-yn ExclusiveArch: %{nodejs_arches} noarch - nodejs-zap ExclusiveArch: %{nodejs_arches} noarch - nodejs-zip-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-zipfile ExclusiveArch: %{nodejs_arches} - nodejs-zlib-browserify ExclusiveArch: %{nodejs_arches} noarch - nodejs-zlibjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodeunit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - notify-sharp ExclusiveArch: %{mono_arches} - notify-sharp3 ExclusiveArch: %{mono_arches} - nuget ExclusiveArch: %{mono_arches} - numatop ExclusiveArch: %{ix86} x86_64 - nunit ExclusiveArch: %{mono_arches} - nunit2 ExclusiveArch: %{mono_arches} - nvml ExclusiveArch: x86_64 - nwchem ExclusiveArch: x86_64 %{ix86} - obfs4 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-kvm-hook ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-register-machine ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - oci-umount ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - ocitools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - odcs ExclusiveArch: %{ix86} x86_64 - olpc-kbdshim ExclusiveArch: %{ix86} %{arm} - olpc-netutils ExclusiveArch: %{ix86} %{arm} - olpc-powerd ExclusiveArch: %{ix86} %{arm} - olpc-utils ExclusiveArch: %{ix86} %{arm} - onedrive ExclusiveArch: %{ldc_arches} - opal-prd ExclusiveArch: ppc64le - open-vm-tools ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 - openblas ExclusiveArch: %{openblas_arches} - openjfx ExclusiveArch: %{ix86} x86_64 - openlibm ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64} - openmx ExclusiveArch: x86_64 %{ix86} - openni ExclusiveArch: %{ix86} x86_64 %{arm} - openni-primesense ExclusiveArch: %{ix86} x86_64 %{arm} - openssl-ibmca ExclusiveArch: s390 s390x - openvswitch ExclusiveArch: x86_64 aarch64 ppc64le s390x - origin ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x - orion ExclusiveArch: %{qt5_qtwebengine_arches} - orthorobot ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - paflib ExclusiveArch: ppc %{power64} - pcc ExclusiveArch: %{ix86} x86_64 - pcmciautils ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm} - pdfmod ExclusiveArch: %mono_arches - peripety ExclusiveArch: %{rust_arches} - perl-Dumbbench ExclusiveArch: %{ix86} x86_64 noarch - perl-Parse-DMIDecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - pesign ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm} - pesign-test-app ExclusiveArch: i686 x86_64 ia64 aarch64 - pinta ExclusiveArch: %mono_arches - pioneer ExclusiveArch: %{ix86} x86_64 - playonlinux ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - plv8 ExclusiveArch: %v8_arches - pocl ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - podman ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 - poppler-sharp ExclusiveArch: %mono_arches - popub ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - powerpc-utils ExclusiveArch: ppc %{power64} - ppc64-diag ExclusiveArch: ppc %{power64} - publican-jboss ExclusiveArch: i686 x86_64 - pvs-sbcl ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - python-afl ExclusiveArch: %{ix86} x86_64 - python-etcd ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - python-healpy ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-openoffice ExclusiveArch: noarch x86_64 - python-ovirt-register ExclusiveArch: %{ix86} x86_64 - python-pymoc ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-rpi-gpio ExclusiveArch: %{arm} aarch64 - q4wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - qcint ExclusiveArch: x86_64 - qclib ExclusiveArch: s390 s390x - qevercloud ExclusiveArch: %{qt5_qtwebengine_arches} - qt4pas ExclusiveArch: %{fpc_arches} - qt5-qtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - quantum-espresso ExclusiveArch: x86_64 %{ix86} ExclusiveArch: %{openblas_arches} - quentier ExclusiveArch: %{qt5_qtwebengine_arches} - rear ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 - redhat-lsb ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - reg ExclusiveArch: x86_64 - renderdoc ExclusiveArch: %{ix86} x86_64 - reptyr ExclusiveArch: %{ix86} x86_64 %{arm} - rescene ExclusiveArch: %{mono_arches} - restsharp ExclusiveArch: %{mono_arches} - rhythmbox-alternative-toolbar ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le - rkt ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - rocm-runtime ExclusiveArch: x86_64 aarch64 - rpm-ostree ExclusiveArch: %{rust_arches} - rssguard ExclusiveArch: %{qt5_qtwebengine_arches} - runc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x - rust ExclusiveArch: %{rust_arches} - rust-addr2line ExclusiveArch: %{rust_arches} - rust-adler32 ExclusiveArch: %{rust_arches} - rust-aho-corasick ExclusiveArch: %{rust_arches} - rust-ansi_term ExclusiveArch: %{rust_arches} - rust-antidote ExclusiveArch: %{rust_arches} - rust-arrayref ExclusiveArch: %{rust_arches} - rust-arrayvec ExclusiveArch: %{rust_arches} - rust-atk-sys ExclusiveArch: %{rust_arches} - rust-atty ExclusiveArch: %{rust_arches} - rust-backtrace ExclusiveArch: %{rust_arches} - rust-backtrace-sys ExclusiveArch: %{rust_arches} - rust-base100 ExclusiveArch: %{rust_arches} - rust-base64 ExclusiveArch: %{rust_arches} - rust-bencher ExclusiveArch: %{rust_arches} - rust-bincode ExclusiveArch: %{rust_arches} - rust-bincode0.8 ExclusiveArch: %{rust_arches} - rust-bitflags ExclusiveArch: %{rust_arches} - rust-bitflags0.9 ExclusiveArch: %{rust_arches} - rust-brev ExclusiveArch: %{rust_arches} - rust-bufstream ExclusiveArch: %{rust_arches} - rust-build_const ExclusiveArch: %{rust_arches} - rust-bytecount ExclusiveArch: %{rust_arches} - rust-byteorder ExclusiveArch: %{rust_arches} - rust-bytes ExclusiveArch: %{rust_arches} - rust-bytes0.3 ExclusiveArch: %{rust_arches} - rust-c_vec ExclusiveArch: %{rust_arches} - rust-cairo-rs ExclusiveArch: %{rust_arches} - rust-cairo-sys-rs ExclusiveArch: %{rust_arches} - rust-cbindgen ExclusiveArch: %{rust_arches} - rust-cc ExclusiveArch: %{rust_arches} - rust-cfg-if ExclusiveArch: %{rust_arches} - rust-chan ExclusiveArch: %{rust_arches} - rust-chrono ExclusiveArch: %{rust_arches} - rust-clap ExclusiveArch: %{rust_arches} - rust-cmake ExclusiveArch: %{rust_arches} - rust-coco ExclusiveArch: %{rust_arches} - rust-config ExclusiveArch: %{rust_arches} - rust-cpp_demangle ExclusiveArch: %{rust_arches} - rust-crc ExclusiveArch: %{rust_arches} - rust-crc-core ExclusiveArch: %{rust_arches} - rust-crossbeam ExclusiveArch: %{rust_arches} - rust-crossbeam-deque ExclusiveArch: %{rust_arches} - rust-crossbeam-epoch ExclusiveArch: %{rust_arches} - rust-crossbeam-utils ExclusiveArch: %{rust_arches} - rust-crypto-hash ExclusiveArch: %{rust_arches} - rust-cryptovec ExclusiveArch: %{rust_arches} - rust-cssparser ExclusiveArch: %{rust_arches} - rust-cssparser-macros ExclusiveArch: %{rust_arches} - rust-csv ExclusiveArch: %{rust_arches} - rust-csv-core ExclusiveArch: %{rust_arches} - rust-ctrlc ExclusiveArch: %{rust_arches} - rust-curl ExclusiveArch: %{rust_arches} - rust-curl-sys ExclusiveArch: %{rust_arches} - rust-custom_derive ExclusiveArch: %{rust_arches} - rust-data-encoding ExclusiveArch: %{rust_arches} - rust-datetime ExclusiveArch: %{rust_arches} - rust-dbus ExclusiveArch: %{rust_arches} - rust-deque ExclusiveArch: %{rust_arches} - rust-devicemapper ExclusiveArch: %{rust_arches} - rust-diff ExclusiveArch: %{rust_arches} - rust-difference ExclusiveArch: %{rust_arches} - rust-docopt ExclusiveArch: %{rust_arches} - rust-downcast-rs ExclusiveArch: %{rust_arches} - rust-dtoa ExclusiveArch: %{rust_arches} - rust-dtoa-short ExclusiveArch: %{rust_arches} - rust-edit-distance ExclusiveArch: %{rust_arches} - rust-either ExclusiveArch: %{rust_arches} - rust-encoding ExclusiveArch: %{rust_arches} - rust-encoding-index-japanese ExclusiveArch: %{rust_arches} - rust-encoding-index-korean ExclusiveArch: %{rust_arches} - rust-encoding-index-simpchinese ExclusiveArch: %{rust_arches} - rust-encoding-index-singlebyte ExclusiveArch: %{rust_arches} - rust-encoding-index-tradchinese ExclusiveArch: %{rust_arches} - rust-encoding_index_tests ExclusiveArch: %{rust_arches} - rust-encoding_rs ExclusiveArch: %{rust_arches} - rust-enum_primitive ExclusiveArch: %{rust_arches} - rust-env_logger ExclusiveArch: %{rust_arches} - rust-env_logger0.4 ExclusiveArch: %{rust_arches} - rust-errln ExclusiveArch: %{rust_arches} - rust-errno ExclusiveArch: %{rust_arches} - rust-error-chain ExclusiveArch: %{rust_arches} - rust-exa ExclusiveArch: %{rust_arches} - rust-extprim ExclusiveArch: %{rust_arches} - rust-extprim_literals_macros ExclusiveArch: %{rust_arches} - rust-failure ExclusiveArch: %{rust_arches} - rust-failure_derive ExclusiveArch: %{rust_arches} - rust-fake_clock ExclusiveArch: %{rust_arches} - rust-fallible-iterator ExclusiveArch: %{rust_arches} - rust-fd-find ExclusiveArch: %{rust_arches} - rust-filetime ExclusiveArch: %{rust_arches} - rust-fixedbitset ExclusiveArch: %{rust_arches} - rust-flame ExclusiveArch: %{rust_arches} - rust-flate2 ExclusiveArch: %{rust_arches} - rust-float-cmp ExclusiveArch: %{rust_arches} - rust-fnv ExclusiveArch: %{rust_arches} - rust-foreign-types ExclusiveArch: %{rust_arches} - rust-foreign-types-shared ExclusiveArch: %{rust_arches} - rust-fs2 ExclusiveArch: %{rust_arches} - rust-futures ExclusiveArch: %{rust_arches} - rust-futures-async-runtime ExclusiveArch: %{rust_arches} - rust-futures-channel ExclusiveArch: %{rust_arches} - rust-futures-core ExclusiveArch: %{rust_arches} - rust-futures-cpupool ExclusiveArch: %{rust_arches} - rust-futures-executor ExclusiveArch: %{rust_arches} - rust-futures-io ExclusiveArch: %{rust_arches} - rust-futures-macro-async ExclusiveArch: %{rust_arches} - rust-futures-macro-await ExclusiveArch: %{rust_arches} - rust-futures-sink ExclusiveArch: %{rust_arches} - rust-futures-stable ExclusiveArch: %{rust_arches} - rust-futures-timer ExclusiveArch: %{rust_arches} - rust-futures-util ExclusiveArch: %{rust_arches} - rust-futures0.1 ExclusiveArch: %{rust_arches} - rust-gdk ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf-sys ExclusiveArch: %{rust_arches} - rust-gdk-sys ExclusiveArch: %{rust_arches} - rust-getopts ExclusiveArch: %{rust_arches} - rust-gimli ExclusiveArch: %{rust_arches} - rust-gio ExclusiveArch: %{rust_arches} - rust-gio-sys ExclusiveArch: %{rust_arches} - rust-git2 ExclusiveArch: %{rust_arches} - rust-git2-curl ExclusiveArch: %{rust_arches} - rust-glib ExclusiveArch: %{rust_arches} - rust-glib-sys ExclusiveArch: %{rust_arches} - rust-glob ExclusiveArch: %{rust_arches} - rust-globset ExclusiveArch: %{rust_arches} - rust-gobject-sys ExclusiveArch: %{rust_arches} - rust-goblin ExclusiveArch: %{rust_arches} - rust-grep ExclusiveArch: %{rust_arches} - rust-gtk ExclusiveArch: %{rust_arches} - rust-gtk-rs-lgpl-docs ExclusiveArch: %{rust_arches} - rust-gtk-source-sys ExclusiveArch: %{rust_arches} - rust-gtk-sys ExclusiveArch: %{rust_arches} - rust-gzip-header ExclusiveArch: %{rust_arches} - rust-h2 ExclusiveArch: %{rust_arches} - rust-hamcrest ExclusiveArch: %{rust_arches} - rust-handlebars ExclusiveArch: %{rust_arches} - rust-heapsize ExclusiveArch: %{rust_arches} - rust-hex ExclusiveArch: %{rust_arches} - rust-home ExclusiveArch: %{rust_arches} - rust-horrorshow ExclusiveArch: %{rust_arches} - rust-http ExclusiveArch: %{rust_arches} - rust-httparse ExclusiveArch: %{rust_arches} - rust-humantime ExclusiveArch: %{rust_arches} - rust-hyper ExclusiveArch: %{rust_arches} - rust-hyper-native-tls ExclusiveArch: %{rust_arches} - rust-hyper-tls ExclusiveArch: %{rust_arches} - rust-hyper0.10 ExclusiveArch: %{rust_arches} - rust-idna ExclusiveArch: %{rust_arches} - rust-ignore ExclusiveArch: %{rust_arches} - rust-indexmap ExclusiveArch: %{rust_arches} - rust-intervaltree ExclusiveArch: %{rust_arches} - rust-iovec ExclusiveArch: %{rust_arches} - rust-iso8601 ExclusiveArch: %{rust_arches} - rust-itertools ExclusiveArch: %{rust_arches} - rust-itoa ExclusiveArch: %{rust_arches} - rust-jobserver ExclusiveArch: %{rust_arches} - rust-language-tags ExclusiveArch: %{rust_arches} - rust-lazy-init ExclusiveArch: %{rust_arches} - rust-lazy_static ExclusiveArch: %{rust_arches} - rust-lazycell ExclusiveArch: %{rust_arches} - rust-libc ExclusiveArch: %{rust_arches} - rust-libdbus-sys ExclusiveArch: %{rust_arches} - rust-libgit2-sys ExclusiveArch: %{rust_arches} - rust-libloading ExclusiveArch: %{rust_arches} - rust-libmount ExclusiveArch: %{rust_arches} - rust-libssh2-sys ExclusiveArch: %{rust_arches} - rust-libudev ExclusiveArch: %{rust_arches} - rust-libudev-sys ExclusiveArch: %{rust_arches} - rust-libz-sys ExclusiveArch: %{rust_arches} - rust-linked-hash-map ExclusiveArch: %{rust_arches} - rust-lipsum ExclusiveArch: %{rust_arches} - rust-locale ExclusiveArch: %{rust_arches} - rust-log ExclusiveArch: %{rust_arches} - rust-log0.3 ExclusiveArch: %{rust_arches} - rust-loopdev ExclusiveArch: %{rust_arches} - rust-lru_time_cache ExclusiveArch: %{rust_arches} - rust-lzma-sys ExclusiveArch: %{rust_arches} - rust-macro-attr ExclusiveArch: %{rust_arches} - rust-maplit ExclusiveArch: %{rust_arches} - rust-matches ExclusiveArch: %{rust_arches} - rust-md5 ExclusiveArch: %{rust_arches} - rust-memchr ExclusiveArch: %{rust_arches} - rust-memmap ExclusiveArch: %{rust_arches} - rust-memoffset ExclusiveArch: %{rust_arches} - rust-metadeps ExclusiveArch: %{rust_arches} - rust-mime ExclusiveArch: %{rust_arches} - rust-mime-sniffer ExclusiveArch: %{rust_arches} - rust-mime0.2 ExclusiveArch: %{rust_arches} - rust-miniz-sys ExclusiveArch: %{rust_arches} - rust-miniz_oxide ExclusiveArch: %{rust_arches} - rust-miniz_oxide_c_api ExclusiveArch: %{rust_arches} - rust-mio ExclusiveArch: %{rust_arches} - rust-mio-extras ExclusiveArch: %{rust_arches} - rust-mio-uds ExclusiveArch: %{rust_arches} - rust-mnt ExclusiveArch: %{rust_arches} - rust-modifier ExclusiveArch: %{rust_arches} - rust-multimap ExclusiveArch: %{rust_arches} - rust-native-tls ExclusiveArch: %{rust_arches} - rust-native-tls0.1 ExclusiveArch: %{rust_arches} - rust-natord ExclusiveArch: %{rust_arches} - rust-net2 ExclusiveArch: %{rust_arches} - rust-newtype_derive ExclusiveArch: %{rust_arches} - rust-nix ExclusiveArch: %{rust_arches} - rust-nodrop ExclusiveArch: %{rust_arches} - rust-nom ExclusiveArch: %{rust_arches} - rust-nom3 ExclusiveArch: %{rust_arches} - rust-num ExclusiveArch: %{rust_arches} - rust-num-bigint ExclusiveArch: %{rust_arches} - rust-num-complex ExclusiveArch: %{rust_arches} - rust-num-integer ExclusiveArch: %{rust_arches} - rust-num-iter ExclusiveArch: %{rust_arches} - rust-num-rational ExclusiveArch: %{rust_arches} - rust-num-traits ExclusiveArch: %{rust_arches} - rust-num-traits0.1 ExclusiveArch: %{rust_arches} - rust-num_cpus ExclusiveArch: %{rust_arches} - rust-number_prefix ExclusiveArch: %{rust_arches} - rust-object ExclusiveArch: %{rust_arches} - rust-openssl ExclusiveArch: %{rust_arches} - rust-openssl-probe ExclusiveArch: %{rust_arches} - rust-openssl-sys ExclusiveArch: %{rust_arches} - rust-ordermap ExclusiveArch: %{rust_arches} - rust-owning_ref ExclusiveArch: %{rust_arches} - rust-packaging ExclusiveArch: %{rust_arches} noarch - rust-pad ExclusiveArch: %{rust_arches} - rust-pager ExclusiveArch: %{rust_arches} - rust-pango ExclusiveArch: %{rust_arches} - rust-pango-sys ExclusiveArch: %{rust_arches} - rust-pangocairo ExclusiveArch: %{rust_arches} - rust-pangocairo-sys ExclusiveArch: %{rust_arches} - rust-peeking_take_while ExclusiveArch: %{rust_arches} - rust-peg ExclusiveArch: %{rust_arches} - rust-percent-encoding ExclusiveArch: %{rust_arches} - rust-permutate ExclusiveArch: %{rust_arches} - rust-permutohedron ExclusiveArch: %{rust_arches} - rust-pest ExclusiveArch: %{rust_arches} - rust-pest_derive ExclusiveArch: %{rust_arches} - rust-phf ExclusiveArch: %{rust_arches} - rust-phf_codegen ExclusiveArch: %{rust_arches} - rust-phf_generator ExclusiveArch: %{rust_arches} - rust-phf_shared ExclusiveArch: %{rust_arches} - rust-pkg-config ExclusiveArch: %{rust_arches} - rust-plain ExclusiveArch: %{rust_arches} - rust-pretty-git-prompt ExclusiveArch: %{rust_arches} - rust-pretty_env_logger ExclusiveArch: %{rust_arches} - rust-proc-macro2 ExclusiveArch: %{rust_arches} - rust-proc-macro2-0.3 ExclusiveArch: %{rust_arches} - rust-procedural-masquerade ExclusiveArch: %{rust_arches} - rust-pulldown-cmark ExclusiveArch: %{rust_arches} - rust-quick-error ExclusiveArch: %{rust_arches} - rust-quickcheck ExclusiveArch: %{rust_arches} - rust-quickersort ExclusiveArch: %{rust_arches} - rust-quote ExclusiveArch: %{rust_arches} - rust-quote0.3 ExclusiveArch: %{rust_arches} - rust-quote0.5 ExclusiveArch: %{rust_arches} - rust-rand ExclusiveArch: %{rust_arches} - rust-rand0.4 ExclusiveArch: %{rust_arches} - rust-rand_core ExclusiveArch: %{rust_arches} - rust-rayon ExclusiveArch: %{rust_arches} - rust-rayon-core ExclusiveArch: %{rust_arches} - rust-regex ExclusiveArch: %{rust_arches} - rust-regex-syntax ExclusiveArch: %{rust_arches} - rust-relay ExclusiveArch: %{rust_arches} - rust-remove_dir_all ExclusiveArch: %{rust_arches} - rust-ripgrep ExclusiveArch: %{rust_arches} - rust-rust-ini ExclusiveArch: %{rust_arches} - rust-rustc-demangle ExclusiveArch: %{rust_arches} - rust-rustc-serialize ExclusiveArch: %{rust_arches} - rust-rustc-test ExclusiveArch: %{rust_arches} - rust-rustc_version ExclusiveArch: %{rust_arches} - rust-rustdoc-stripper ExclusiveArch: %{rust_arches} - rust-rustfilt ExclusiveArch: %{rust_arches} - rust-safemem ExclusiveArch: %{rust_arches} - rust-same-file ExclusiveArch: %{rust_arches} - rust-scoped-tls ExclusiveArch: %{rust_arches} - rust-scoped_threadpool ExclusiveArch: %{rust_arches} - rust-scopeguard ExclusiveArch: %{rust_arches} - rust-scroll ExclusiveArch: %{rust_arches} - rust-scroll_derive ExclusiveArch: %{rust_arches} - rust-seahash ExclusiveArch: %{rust_arches} - rust-semver ExclusiveArch: %{rust_arches} - rust-semver-parser ExclusiveArch: %{rust_arches} - rust-serde ExclusiveArch: %{rust_arches} - rust-serde0.8 ExclusiveArch: %{rust_arches} - rust-serde_bytes ExclusiveArch: %{rust_arches} - rust-serde_cbor ExclusiveArch: %{rust_arches} - rust-serde_derive ExclusiveArch: %{rust_arches} - rust-serde_ignored ExclusiveArch: %{rust_arches} - rust-serde_json ExclusiveArch: %{rust_arches} - rust-serde_json0.8 ExclusiveArch: %{rust_arches} - rust-serde_test ExclusiveArch: %{rust_arches} - rust-serde_urlencoded ExclusiveArch: %{rust_arches} - rust-serde_yaml ExclusiveArch: %{rust_arches} - rust-sha1 ExclusiveArch: %{rust_arches} - rust-shell-escape ExclusiveArch: %{rust_arches} - rust-shlex ExclusiveArch: %{rust_arches} - rust-siphasher ExclusiveArch: %{rust_arches} - rust-slab ExclusiveArch: %{rust_arches} - rust-slab0.3 ExclusiveArch: %{rust_arches} - rust-smallvec ExclusiveArch: %{rust_arches} - rust-snowflake ExclusiveArch: %{rust_arches} - rust-socket2 ExclusiveArch: %{rust_arches} - rust-sourceview ExclusiveArch: %{rust_arches} - rust-spin ExclusiveArch: %{rust_arches} - rust-spmc ExclusiveArch: %{rust_arches} - rust-stable_deref_trait ExclusiveArch: %{rust_arches} - rust-streaming-stats ExclusiveArch: %{rust_arches} - rust-string ExclusiveArch: %{rust_arches} - rust-strings ExclusiveArch: %{rust_arches} - rust-strsim ExclusiveArch: %{rust_arches} - rust-structopt ExclusiveArch: %{rust_arches} - rust-structopt-derive ExclusiveArch: %{rust_arches} - rust-syn ExclusiveArch: %{rust_arches} - rust-syn0.11 ExclusiveArch: %{rust_arches} - rust-syn0.13 ExclusiveArch: %{rust_arches} - rust-synom ExclusiveArch: %{rust_arches} - rust-synstructure ExclusiveArch: %{rust_arches} - rust-synstructure0.6 ExclusiveArch: %{rust_arches} - rust-sys-info ExclusiveArch: %{rust_arches} - rust-tabwriter ExclusiveArch: %{rust_arches} - rust-take ExclusiveArch: %{rust_arches} - rust-take_mut ExclusiveArch: %{rust_arches} - rust-tar ExclusiveArch: %{rust_arches} - rust-tempdir ExclusiveArch: %{rust_arches} - rust-tempfile ExclusiveArch: %{rust_arches} - rust-term ExclusiveArch: %{rust_arches} - rust-term_grid ExclusiveArch: %{rust_arches} - rust-term_size ExclusiveArch: %{rust_arches} - rust-termcolor ExclusiveArch: %{rust_arches} - rust-termion ExclusiveArch: %{rust_arches} - rust-test-assembler ExclusiveArch: %{rust_arches} - rust-textwrap ExclusiveArch: %{rust_arches} - rust-thread-id ExclusiveArch: %{rust_arches} - rust-thread_local ExclusiveArch: %{rust_arches} - rust-threadpool ExclusiveArch: %{rust_arches} - rust-time ExclusiveArch: %{rust_arches} - rust-tokei ExclusiveArch: %{rust_arches} - rust-tokio ExclusiveArch: %{rust_arches} - rust-tokio-codec ExclusiveArch: %{rust_arches} - rust-tokio-core ExclusiveArch: %{rust_arches} - rust-tokio-current-thread ExclusiveArch: %{rust_arches} - rust-tokio-executor ExclusiveArch: %{rust_arches} - rust-tokio-fs ExclusiveArch: %{rust_arches} - rust-tokio-io ExclusiveArch: %{rust_arches} - rust-tokio-mockstream ExclusiveArch: %{rust_arches} - rust-tokio-process ExclusiveArch: %{rust_arches} - rust-tokio-proto ExclusiveArch: %{rust_arches} - rust-tokio-reactor ExclusiveArch: %{rust_arches} - rust-tokio-service ExclusiveArch: %{rust_arches} - rust-tokio-signal ExclusiveArch: %{rust_arches} - rust-tokio-tcp ExclusiveArch: %{rust_arches} - rust-tokio-threadpool ExclusiveArch: %{rust_arches} - rust-tokio-timer ExclusiveArch: %{rust_arches} - rust-tokio-udp ExclusiveArch: %{rust_arches} - rust-toml ExclusiveArch: %{rust_arches} - rust-traitobject ExclusiveArch: %{rust_arches} - rust-try-lock ExclusiveArch: %{rust_arches} - rust-typeable ExclusiveArch: %{rust_arches} - rust-typed-arena ExclusiveArch: %{rust_arches} - rust-ucd-util ExclusiveArch: %{rust_arches} - rust-unicase ExclusiveArch: %{rust_arches} - rust-unicase1 ExclusiveArch: %{rust_arches} - rust-unicode-bidi ExclusiveArch: %{rust_arches} - rust-unicode-normalization ExclusiveArch: %{rust_arches} - rust-unicode-segmentation ExclusiveArch: %{rust_arches} - rust-unicode-width ExclusiveArch: %{rust_arches} - rust-unicode-xid ExclusiveArch: %{rust_arches} - rust-unindent ExclusiveArch: %{rust_arches} - rust-unix_socket ExclusiveArch: %{rust_arches} - rust-unreachable ExclusiveArch: %{rust_arches} - rust-unsafe-any ExclusiveArch: %{rust_arches} - rust-untrusted ExclusiveArch: %{rust_arches} - rust-url ExclusiveArch: %{rust_arches} - rust-users ExclusiveArch: %{rust_arches} - rust-utf8-ranges ExclusiveArch: %{rust_arches} - rust-uuid ExclusiveArch: %{rust_arches} - rust-varlink ExclusiveArch: %{rust_arches} - rust-varlink-cli ExclusiveArch: %{rust_arches} - rust-varlink_parser ExclusiveArch: %{rust_arches} - rust-vec_map ExclusiveArch: %{rust_arches} - rust-version-sync ExclusiveArch: %{rust_arches} - rust-version_check ExclusiveArch: %{rust_arches} - rust-void ExclusiveArch: %{rust_arches} - rust-wait-timeout ExclusiveArch: %{rust_arches} - rust-walkdir ExclusiveArch: %{rust_arches} - rust-want ExclusiveArch: %{rust_arches} - rust-which ExclusiveArch: %{rust_arches} - rust-xattr ExclusiveArch: %{rust_arches} - rust-xz2 ExclusiveArch: %{rust_arches} - rust-yaml-rust ExclusiveArch: %{rust_arches} - rust-yaml-rust0.3 ExclusiveArch: %{rust_arches} - rust-yubibomb ExclusiveArch: %{rust_arches} - rust-zoneinfo_compiled ExclusiveArch: %{rust_arches} - s390utils ExclusiveArch: s390 s390x - safetyblanket ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - sagemath ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9 - sbcl ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - sbd ExclusiveArch: i686 x86_64 s390x - sbsigntools ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - seabios ExclusiveArch: x86_64 - seamonkey ExclusiveArch: %{ix86} x86_64 - servicelog ExclusiveArch: ppc %{power64} - sgabios ExclusiveArch: %{ix86} x86_64 - sharpfont ExclusiveArch: %mono_arches - sharpziplib ExclusiveArch: %{mono_arches} - shim ExclusiveArch: %{efi} - shim-unsigned-aarch64 ExclusiveArch: aarch64 - shim-unsigned-x64 ExclusiveArch: x86_64 - sigul ExclusiveArch: x86_64 - skychart ExclusiveArch: %{fpc_arches} - smuxi ExclusiveArch: %{ix86} x86_64 %{arm} ppc64le - snapd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - source-to-image ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - sparkleshare ExclusiveArch: %{mono_arches} - spicctrl ExclusiveArch: %{ix86} x86_64 - spice ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - spring ExclusiveArch: %{ix86} x86_64 - springlobby ExclusiveArch: %{ix86} x86_64 - startdde ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - statsd ExclusiveArch: %{nodejs_arches} noarch - stratis-cli ExclusiveArch: %{rust_arches} noarch - stratisd ExclusiveArch: %{rust_arches} - stripesnoop ExclusiveArch: %{ix86} x86_64 - supermin ExclusiveArch: x86_64 - swift-lang ExclusiveArch: x86_64 - syncthing ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - sysbench ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - syslinux ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - taglib-sharp ExclusiveArch: %{mono_arches} - tarantool ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl aarch64 - tboot ExclusiveArch: %{ix86} x86_64 - templates_parser ExclusiveArch: %GPRbuild_arches - ternimal ExclusiveArch: %{rust_arches} - themonospot-base ExclusiveArch: %mono_arches - themonospot-console ExclusiveArch: %mono_arches - themonospot-gui-gtk ExclusiveArch: %mono_arches - themonospot-plugin-avi ExclusiveArch: %mono_arches - themonospot-plugin-mkv ExclusiveArch: %mono_arches - thermald ExclusiveArch: %{ix86} x86_64 - thunderbird-enigmail ExclusiveArch: %{ix86} %{arm} ppc64 ppc64le s390x x86_64 noarch - tilix ExclusiveArch: %{ldc_arches} - tmux-top ExclusiveArch: %{go_arches} - tomboy ExclusiveArch: %{mono_arches} - tuned-profiles-nfv-host-bin ExclusiveArch: %{ix86} x86_64 - uClibc ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} - ucx ExclusiveArch: aarch64 ppc64le x86_64 - ugene ExclusiveArch: %{ix86} x86_64 - uglify-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - uglify-js1 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - unetbootin ExclusiveArch: %{ix86} x86_64 - v8 ExclusiveArch: %{ix86} x86_64 %{arm} ppc mipsel mips64el - v8-314 ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64 - valgrind ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 - vboot-utils ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - vdsm ExclusiveArch: x86_64 %{power64} aarch64 - vim-go ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}} - virtualbox-guest-additions ExclusiveArch: i686 x86_64 - virtualplanet ExclusiveArch: %{fpc_arches} - vrq ExclusiveArch: %{ix86} x86_64 - warsow ExclusiveArch: %{ix86} x86_64 %{arm} - warsow-data ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{ix86} x86_64 %{arm} - webkit-sharp ExclusiveArch: %mono_arches - webkit2-sharp ExclusiveArch: %mono_arches - wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: %{ix86} %{arm} - winetricks ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - wiredtiger ExclusiveArch: x86_64 aarch64 ppc64le - wraplinux ExclusiveArch: %{ix86} x86_64 - wxMaxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 - x2goclient ExclusiveArch: x86_64 - x86info ExclusiveArch: %{ix86} x86_64 - xen ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 - xorg-x11-drv-armsoc ExclusiveArch: %{arm} aarch64 - xorg-x11-drv-geode ExclusiveArch: %{ix86} - xorg-x11-drv-intel ExclusiveArch: %{ix86} x86_64 ia64 - xorg-x11-drv-omap ExclusiveArch: %{arm} - xorg-x11-drv-openchrome ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-opentegra ExclusiveArch: %{arm} - xorg-x11-drv-vesa ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vmware ExclusiveArch: %{ix86} x86_64 ia64 - xsp ExclusiveArch: %mono_arches - xsupplicant ExclusiveArch: %{ix86} x86_64 ppc %{power64} - ycssmin ExclusiveArch: %{nodejs_arches} noarch - zeromq-ada ExclusiveArch: %{GPRbuild_arches} - zlib-ada ExclusiveArch: %{GPRbuild_arches}

5 years, 9 months

1
0
0 / 0

Architecture specific change in rpms/mlton.git

by githook-noreply＠fedoraproject.org

The package rpms/mlton.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/mlton.git/commit/?id=b6bc14318db1.... Change: -%ifarch riscv64 Thanks. Full change: ============ commit b6bc14318db13fe2d336183fd1d9b478ef5f2d9a Author: Adam Goode <adam(a)spicenitz.org> Date: Mon Jul 23 19:26:45 2018 -0400 finish bootstrap diff --git a/.gitignore b/.gitignore index 4f980c8..97a3461 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /mlton-20180207.src.tgz -/mlton-bootstrap-riscv64-redhat-linux.tar.gz diff --git a/mlton.spec b/mlton.spec index 67030e6..fcfad6a 100644 --- a/mlton.spec +++ b/mlton.spec @@ -1,10 +1,8 @@ -%ifarch riscv64 -%global bootstrap 1 -%endif +%global bootstrap 0 Name: mlton Version: 20180207 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Optimizing compiler for Standard ML License: MIT @@ -13,7 +11,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tgz # Generated sources (non-binary) for bootstrapping. # See http://mlton.org/PortingMLton#_bootstrap -Source100: mlton-bootstrap-riscv64-redhat-linux.tar.gz +#Source100: mlton-bootstrap-riscv64-redhat-linux.tar.gz BuildRequires: gcc gmp-devel tex(latex) @@ -107,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/mlton/sml/ckit-lib/regression %changelog +* Mon Jul 23 2018 Adam Goode <adam(a)spicenitz.org> - 20180207-9 +- BuildRequires: gcc +- Remove bootstrap + * Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 20180207-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index d3697f4..7e331e5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (mlton-20180207.src.tgz) = 3599159950e857d257abce92abf5c548dd9c0b0cdc4ba0d7cdf9badb5d997f73386cd1ff79f563221b394dd831cb344e287927f90683b0715678edb3ca0ae15a -SHA512 (mlton-bootstrap-riscv64-redhat-linux.tar.gz) = 5dce89100693e4a2a78852fba85ab3a1c43da150e9d10debe1fb5a6fe7530f1c2c19fd85b096f83b72ba7044f807dd65326b2cbb2d7cf04b161e3c0b46c08d76 commit 5c9665b3ea1577a3b0d4083dde05719fc5722c79 Author: Adam Goode <adam(a)spicenitz.org> Date: Mon Jul 23 19:25:08 2018 -0400 BuildRequires gcc diff --git a/mlton.spec b/mlton.spec index 3186902..67030e6 100644 --- a/mlton.spec +++ b/mlton.spec @@ -15,7 +15,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tgz # See http://mlton.org/PortingMLton#_bootstrap Source100: mlton-bootstrap-riscv64-redhat-linux.tar.gz -BuildRequires: gmp-devel tex(latex) +BuildRequires: gcc gmp-devel tex(latex) %if ! 0%{?bootstrap} BuildRequires: mlton

5 years, 9 months

1
0
0 / 0

Architecture specific change in rpms/llvm4.0.git

by githook-noreply＠fedoraproject.org

The package rpms/llvm4.0.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/llvm4.0.git/commit/?id=d04aef4d68.... Change: -%ifarch s390 Thanks. Full change: ============ commit d04aef4d681d122e9fdf8cd53f6d7ffa4f28e1c3 Author: Tom Stellard <tstellar(a)redhat.com> Date: Mon Jul 23 20:58:14 2018 +0000 LLVM4.0 compatiblity package is no longer used. diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e928fbc..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/llvm-4.0.1.src.tar.xz diff --git a/0001-CMake-Split-static-library-exports-into-their-own-ex.patch b/0001-CMake-Split-static-library-exports-into-their-own-ex.patch deleted file mode 100644 index 2804e1b..0000000 --- a/0001-CMake-Split-static-library-exports-into-their-own-ex.patch +++ /dev/null @@ -1,86 +0,0 @@ -From a5f39924a3466eb12d764993aaa8c1c308f92925 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <tstellar(a)redhat.com> -Date: Sat, 29 Apr 2017 02:03:23 +0000 -Subject: [PATCH] CMake: Split static library exports into their own export - file - -Summary: -This is to better support distros which split the static libraries into -their own package. - -The current problem is that any project the includes LLVMConfig.cmake -will fail to configure unless the static libraries are installed. This -is because LLVMConfig.cmake includes LLVMExports.cmake, which throws an -error if it can't find files linked to one of the exported targets. - -This patch resolves the problem by putting the static library targets -into their own export file, LLVMStaticExports.cmake. This file -is optionally included by LLVMConfig.cmake, so distros can put this -new file in their static library package to make LLVMConfig.cmake -no longer depend on these libraries when they are not installed. - -Reviewers: beanz, mgorny, chapuni - -Subscribers: llvm-commits - -Differential Revision: https://reviews.llvm.org/D32668 ---- - cmake/modules/AddLLVM.cmake | 6 +++++- - cmake/modules/CMakeLists.txt | 3 +++ - cmake/modules/LLVMConfig.cmake.in | 2 ++ - 3 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index b3c7746..7d9d253 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -587,7 +587,11 @@ macro(add_llvm_library name) - - if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR - NOT LLVM_DISTRIBUTION_COMPONENTS) -- set(export_to_llvmexports EXPORT LLVMExports) -+ if (ARG_SHARED) -+ set(export_to_llvmexports EXPORT LLVMExports) -+ else() -+ set(export_to_llvmexports EXPORT LLVMStaticExports) -+ endif() - set_property(GLOBAL PROPERTY LLVM_HAS_EXPORTS True) - endif() - -diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index ac4b0b7..f77c905 100644 ---- a/cmake/modules/CMakeLists.txt -+++ b/cmake/modules/CMakeLists.txt -@@ -91,6 +91,7 @@ set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") - set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") - set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") - set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") -+set(LLVM_CONFIG_STATIC_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMStaticExports.cmake") - configure_file( - LLVMConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLVMConfig.cmake -@@ -107,6 +108,8 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - if(llvm_has_exports) - install(EXPORT LLVMExports DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} - COMPONENT cmake-exports) -+ install(EXPORT LLVMStaticExports DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} -+ COMPONENT cmake-exports) - endif() - - install(FILES -diff --git a/cmake/modules/LLVMConfig.cmake.in b/cmake/modules/LLVMConfig.cmake.in -index c30c92b..f0f17b2 100644 ---- a/cmake/modules/LLVMConfig.cmake.in -+++ b/cmake/modules/LLVMConfig.cmake.in -@@ -73,6 +73,8 @@ if(NOT TARGET LLVMSupport) - set(LLVM_EXPORTED_TARGETS "@LLVM_CONFIG_EXPORTS@") - include("@LLVM_CONFIG_EXPORTS_FILE@") - @llvm_config_include_buildtree_only_exports@ -+ -+ include("@LLVM_CONFIG_STATIC_EXPORTS_FILE@" OPTIONAL) - endif() - - include(${LLVM_CMAKE_DIR}/LLVM-Config.cmake) --- -2.9.3 - diff --git a/0001-DebugInfo-Fix-potential-CU-mismatch-for-SubprogramSc.patch b/0001-DebugInfo-Fix-potential-CU-mismatch-for-SubprogramSc.patch deleted file mode 100644 index 1b30efe..0000000 --- a/0001-DebugInfo-Fix-potential-CU-mismatch-for-SubprogramSc.patch +++ /dev/null @@ -1,153 +0,0 @@ -From fd80342a58ead0dc7b008ce6ce8523cdea765f5f Mon Sep 17 00:00:00 2001 -From: Jonas Devlieghere <jonas(a)devlieghere.com> -Date: Wed, 15 Nov 2017 10:57:05 +0000 -Subject: [PATCH] [DebugInfo] Fix potential CU mismatch for - SubprogramScopeDIEs. - -In constructAbstractSubprogramScopeDIE there can be a potential mismatch -between `this` and the CU of ContextDIE when a scope is shared between -two DISubprograms belonging to a different CU. In that case, `this` is -the CU that was specified in the IR, but the CU of ContextDIE is that of -the first subprogram that was emitted. This patch fixes the mismatch by -looking up the CU of ContextDIE, and switching to use that. - -This fixes PR35212 (https://bugs.llvm.org/show_bug.cgi?id=35212) - -Patch by Philip Craig! - -Differential revision: https://reviews.llvm.org/D39981 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@318289 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp | 20 ++++++++---- - lib/CodeGen/AsmPrinter/DwarfDebug.h | 6 +++- - test/DebugInfo/cross-cu-scope.ll | 50 +++++++++++++++++++++++++++++ - 3 files changed, 68 insertions(+), 8 deletions(-) - create mode 100644 test/DebugInfo/cross-cu-scope.ll - -diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp -index d904372..eea30a7 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp -+++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp -@@ -616,6 +616,7 @@ void DwarfCompileUnit::constructAbstractSubprogramScopeDIE( - auto *SP = cast<DISubprogram>(Scope->getScopeNode()); - - DIE *ContextDIE; -+ DwarfCompileUnit *ContextCU = this; - - if (includeMinimalInlineScopes()) - ContextDIE = &getUnitDie(); -@@ -626,18 +627,23 @@ void DwarfCompileUnit::constructAbstractSubprogramScopeDIE( - else if (auto *SPDecl = SP->getDeclaration()) { - ContextDIE = &getUnitDie(); - getOrCreateSubprogramDIE(SPDecl); -- } else -+ } else { - ContextDIE = getOrCreateContextDIE(resolve(SP->getScope())); -+ // The scope may be shared with a subprogram that has already been -+ // constructed in another CU, in which case we need to construct this -+ // subprogram in the same CU. -+ ContextCU = DD->lookupCU(ContextDIE->getUnitDie()); -+ } - - // Passing null as the associated node because the abstract definition - // shouldn't be found by lookup. -- AbsDef = &createAndAddDIE(dwarf::DW_TAG_subprogram, *ContextDIE, nullptr); -- applySubprogramAttributesToDefinition(SP, *AbsDef); -+ AbsDef = &ContextCU->createAndAddDIE(dwarf::DW_TAG_subprogram, *ContextDIE, nullptr); -+ ContextCU->applySubprogramAttributesToDefinition(SP, *AbsDef); - -- if (!includeMinimalInlineScopes()) -- addUInt(*AbsDef, dwarf::DW_AT_inline, None, dwarf::DW_INL_inlined); -- if (DIE *ObjectPointer = createAndAddScopeChildren(Scope, *AbsDef)) -- addDIEEntry(*AbsDef, dwarf::DW_AT_object_pointer, *ObjectPointer); -+ if (!ContextCU->includeMinimalInlineScopes()) -+ ContextCU->addUInt(*AbsDef, dwarf::DW_AT_inline, None, dwarf::DW_INL_inlined); -+ if (DIE *ObjectPointer = ContextCU->createAndAddScopeChildren(Scope, *AbsDef)) -+ ContextCU->addDIEEntry(*AbsDef, dwarf::DW_AT_object_pointer, *ObjectPointer); - } - - DIE *DwarfCompileUnit::constructImportedEntityDIE( -diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.h b/lib/CodeGen/AsmPrinter/DwarfDebug.h -index 253e3f0..9ade921 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfDebug.h -+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.h -@@ -280,7 +280,7 @@ class DwarfDebug : public DebugHandlerBase { - // 0, referencing the comp_dir of all the type units that use it. - MCDwarfDwoLineTable SplitTypeUnitFileTable; - /// @} -- -+ - /// True iff there are multiple CUs in this module. - bool SingleCU; - bool IsDarwin; -@@ -555,6 +555,10 @@ public: - /// A helper function to check whether the DIE for a given Scope is - /// going to be null. - bool isLexicalScopeDIENull(LexicalScope *Scope); -+ -+ /// Find the matching DwarfCompileUnit for the given CU DIE. -+ DwarfCompileUnit *lookupCU(const DIE *Die) { return CUDieMap.lookup(Die); } -+ - }; - } // End of namespace llvm - -diff --git a/test/DebugInfo/cross-cu-scope.ll b/test/DebugInfo/cross-cu-scope.ll -new file mode 100644 -index 0000000..7c71f27 ---- /dev/null -+++ b/test/DebugInfo/cross-cu-scope.ll -@@ -0,0 +1,50 @@ -+; RUN: %llc_dwarf %s -filetype=obj -o %t -+; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s -+ -+; Reduced test case from PR35212. Two DISubprogram belong to a different CU but -+; share a scope. Both are declarations and end up in the scope's CU. We want to -+; check that the CU from the context DIE is used (rather than from the IR). -+; This manifests itself by the DW_base_type ending up in the second CU, rather -+; than in the first one as specified in the IR. -+ -+; CHECK: DW_TAG_compile_unit -+; CHECK-NEXT: discriminator 0 -+; CHECK: DW_TAG_compile_unit -+; CHECK-NEXT: discriminator 1 -+; CHECK: DW_TAG_structure_type -+; CHECK-NOT: NULL -+; CHECK: DW_TAG_subprogram -+; CHECK-NOT: NULL -+; CHECK: DW_TAG_formal_parameter -+; CHECK-NOT: NULL -+; CHECK: DW_AT_type{{.*}}{[[USIZE_LABEL:0x[0-9a-f]+]]} -+; CHECK: NULL -+; CHECK: [[USIZE_LABEL]]: DW_TAG_base_type -+; CHECK-NOT: NULL -+; CHECK: DW_AT_name{{.*}}"usize" -+ -+define hidden void @foo() !dbg !4 { -+ ret void, !dbg !7 -+} -+ -+!llvm.dbg.cu = !{!0, !2} -+!llvm.module.flags = !{!3} -+ -+!0 = distinct !DICompileUnit(language: DW_LANG_Rust, file: !1, producer: "clang LLVM (rustc version 1.23.0-nightly (discriminator 0))", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug) -+!1 = !DIFile(filename: "../lib.rs", directory: "/home/alex/code/rust4/lol") -+!2 = distinct !DICompileUnit(language: DW_LANG_Rust, file: !1, producer: "clang LLVM (rustc version 1.23.0-nightly (discriminator 1))", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug) -+!3 = !{i32 2, !"Debug Info Version", i32 3} -+!4 = distinct !DISubprogram(name: "clone<alloc::string::String>", linkageName: "_ZN5alloc3vec8{{impl}}28clone<alloc::string::String>E", scope: null, file: !1, line: 1519, type: !5, isLocal: false, isDefinition: true, scopeLine: 1519, flags: DIFlagPrototyped, isOptimized: true, unit: !0, templateParams: !6, variables: !6) -+!5 = !DISubroutineType(types: !6) -+!6 = !{} -+!7 = !DILocation(line: 1612, scope: !8, inlinedAt: !11) -+!8 = distinct !DILexicalBlock(scope: !9, file: !1, line: 86, column: 12) -+!9 = distinct !DISubprogram(name: "allocate_in<alloc::string::String,alloc::heap::Heap>", linkageName: "_ZN5alloc7raw_vec8{{impl}}52allocate_in<alloc::string::String,alloc::heap::Heap>E", scope: !10, file: !1, line: 82, type: !5, isLocal: false, isDefinition: true, scopeLine: 82, flags: DIFlagPrototyped, isOptimized: true, unit: !2, templateParams: !6, variables: !6) -+!10 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "RawVec<alloc::string::String, alloc::heap::Heap>", file: !1, size: 128, align: 64, elements: !6, identifier: "5c6e4db16d2c64555e40661d70c4d81e") -+!11 = distinct !DILocation(line: 86, scope: !8, inlinedAt: !12) -+!12 = distinct !DILocation(line: 141, scope: !13, inlinedAt: !17) -+!13 = distinct !DISubprogram(name: "with_capacity<alloc::string::String>", linkageName: "_ZN5alloc7raw_vec8{{impl}}36with_capacity<alloc::string::String>E", scope: !10, file: !1, line: 140, type: !5, isLocal: false, isDefinition: true, scopeLine: 140, flags: DIFlagPrototyped, isOptimized: true, unit: !0, templateParams: !6, variables: !14) -+!14 = !{!15} -+!15 = !DILocalVariable(name: "cap", arg: 1, scope: !13, file: !1, line: 1, type: !16) -+!16 = !DIBasicType(name: "usize", size: 64, encoding: DW_ATE_unsigned) -+!17 = !DILocation(line: 1521, scope: !4) --- -2.9.3 - diff --git a/0001-Fix-llvm-config-paths-on-Fedora.patch b/0001-Fix-llvm-config-paths-on-Fedora.patch deleted file mode 100644 index 29fcf3f..0000000 --- a/0001-Fix-llvm-config-paths-on-Fedora.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c193854e9e732a7ca69732bd3ead38e007f34342 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <tstellar(a)redhat.com> -Date: Thu, 18 May 2017 12:10:20 -0400 -Subject: [PATCH] Fix llvm-config paths on Fedora - ---- - tools/llvm-config/llvm-config.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 25344e4..cd79649 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -332,7 +332,7 @@ int main(int argc, char **argv) { - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); - } else { - ActivePrefix = CurrentExecPrefix; -- ActiveIncludeDir = ActivePrefix + "/include"; -+ ActiveIncludeDir = ActivePrefix + "/../../include/llvm4.0"; - ActiveBinDir = ActivePrefix + "/bin"; - ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; - ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; --- -1.8.3.1 - diff --git a/0001-Fix-return-type-in-ORC-readMem-client-interface.patch b/0001-Fix-return-type-in-ORC-readMem-client-interface.patch deleted file mode 100644 index 21f8482..0000000 --- a/0001-Fix-return-type-in-ORC-readMem-client-interface.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5cea35478aaaac7728a50cbafd3770f96162f7ac Mon Sep 17 00:00:00 2001 -From: Tilmann Scheller <tschelle(a)redhat.com> -Date: Thu, 1 Feb 2018 11:40:01 -0600 -Subject: [PATCH] Fix return type in ORC readMem() client interface. - -GCC 8.0.1 detects the type mismatch and causes the compilation to fail. Clang -and earlier versions of GCC don't detect the issue. - -Fixes rhbz#1540620. ---- - include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h -index da02250ba16..bed472e2e0e 100644 ---- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h -+++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h -@@ -713,8 +713,8 @@ private: - - uint32_t getTrampolineSize() const { return RemoteTrampolineSize; } - -- Expected<std::vector<char>> readMem(char *Dst, JITTargetAddress Src, -- uint64_t Size) { -+ Expected<std::vector<uint8_t>> readMem(char *Dst, JITTargetAddress Src, -+ uint64_t Size) { - // Check for an 'out-of-band' error, e.g. from an MM destructor. - if (ExistingError) - return std::move(ExistingError); --- -2.16.1 - diff --git a/0001-Ignore-all-duplicate-frame-index-expression.patch b/0001-Ignore-all-duplicate-frame-index-expression.patch deleted file mode 100644 index 3ddae2c..0000000 --- a/0001-Ignore-all-duplicate-frame-index-expression.patch +++ /dev/null @@ -1,95 +0,0 @@ -From c0cb6fd6d6ace716248731e027b492825fd8518d Mon Sep 17 00:00:00 2001 -From: Bjorn Steinbrink <bsteinbr(a)gmail.com> -Date: Tue, 10 Oct 2017 07:46:17 +0000 -Subject: [PATCH] Ignore all duplicate frame index expression - -Some passes might duplicate calls to llvm.dbg.declare creating -duplicate frame index expression which currently trigger an assertion -which is meant to catch erroneous, overlapping fragment declarations. -But identical frame index expressions are just redundant and don't -actually conflict with each other, so we can be more lenient and just -ignore the duplicates. - -Reviewers: aprantl, rnk - -Subscribers: llvm-commits, JDevlieghere - -Differential Revision: https://reviews.llvm.org/D38540 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315279 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 25 +++++++++++++++++++++++++ - lib/CodeGen/AsmPrinter/DwarfDebug.h | 18 +----------------- - 2 files changed, 26 insertions(+), 17 deletions(-) - -diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -index 91a3d09..88ba0e6 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -@@ -205,9 +205,34 @@ ArrayRef<DbgVariable::FrameIndexExpr> DbgVariable::getFrameIndexExprs() const { - return A.Expr->getFragmentInfo()->OffsetInBits < - B.Expr->getFragmentInfo()->OffsetInBits; - }); -+ - return FrameIndexExprs; - } - -+void DbgVariable::addMMIEntry(const DbgVariable &V) { -+ assert(DebugLocListIndex == ~0U && !MInsn && "not an MMI entry"); -+ assert(V.DebugLocListIndex == ~0U && !V.MInsn && "not an MMI entry"); -+ assert(V.Var == Var && "conflicting variable"); -+ assert(V.IA == IA && "conflicting inlined-at location"); -+ -+ assert(!FrameIndexExprs.empty() && "Expected an MMI entry"); -+ assert(!V.FrameIndexExprs.empty() && "Expected an MMI entry"); -+ -+ for (const auto &FIE : V.FrameIndexExprs) -+ // Ignore duplicate entries. -+ if (llvm::none_of(FrameIndexExprs, [&](const FrameIndexExpr &Other) { -+ return FIE.FI == Other.FI && FIE.Expr == Other.Expr; -+ })) -+ FrameIndexExprs.push_back(FIE); -+ -+ assert((FrameIndexExprs.size() == 1 || -+ llvm::all_of(FrameIndexExprs, -+ [](FrameIndexExpr &FIE) { -+ return FIE.Expr && FIE.Expr->isFragment(); -+ })) && -+ "conflicting locations for variable"); -+} -+ - static const DwarfAccelTable::Atom TypeAtoms[] = { - DwarfAccelTable::Atom(dwarf::DW_ATOM_die_offset, dwarf::DW_FORM_data4), - DwarfAccelTable::Atom(dwarf::DW_ATOM_die_tag, dwarf::DW_FORM_data2), -diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.h b/lib/CodeGen/AsmPrinter/DwarfDebug.h -index 253e3f0..1e6a25e 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfDebug.h -+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.h -@@ -124,23 +124,7 @@ public: - /// Get the FI entries, sorted by fragment offset. - ArrayRef<FrameIndexExpr> getFrameIndexExprs() const; - bool hasFrameIndexExprs() const { return !FrameIndexExprs.empty(); } -- -- void addMMIEntry(const DbgVariable &V) { -- assert(DebugLocListIndex == ~0U && !MInsn && "not an MMI entry"); -- assert(V.DebugLocListIndex == ~0U && !V.MInsn && "not an MMI entry"); -- assert(V.Var == Var && "conflicting variable"); -- assert(V.IA == IA && "conflicting inlined-at location"); -- -- assert(!FrameIndexExprs.empty() && "Expected an MMI entry"); -- assert(!V.FrameIndexExprs.empty() && "Expected an MMI entry"); -- -- FrameIndexExprs.append(V.FrameIndexExprs.begin(), V.FrameIndexExprs.end()); -- assert(all_of(FrameIndexExprs, -- [](FrameIndexExpr &FIE) { -- return FIE.Expr && FIE.Expr->isFragment(); -- }) && -- "conflicting locations for variable"); -- } -+ void addMMIEntry(const DbgVariable &V); - - // Translate tag to proper Dwarf tag. - dwarf::Tag getTag() const { --- -1.8.3.1 - diff --git a/README.md b/README.md deleted file mode 100644 index 87d77c2..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# llvm4.0 - -The llvm4.0 package \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a4c09a5 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +LLVM4.0 compatiblity package is no longer used. diff --git a/llvm-3.7.1-cmake-s390.patch b/llvm-3.7.1-cmake-s390.patch deleted file mode 100644 index bc9b583..0000000 --- a/llvm-3.7.1-cmake-s390.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up llvm-3.7.1.src/cmake/config-ix.cmake.s390 llvm-3.7.1.src/cmake/config-ix.cmake ---- llvm-3.7.1.src/cmake/config-ix.cmake.s390 2016-02-16 12:27:36.000000000 +0100 -+++ llvm-3.7.1.src/cmake/config-ix.cmake 2016-02-16 12:27:52.000000000 +0100 -@@ -356,6 +356,8 @@ elseif (LLVM_NATIVE_ARCH MATCHES "msp430 - set(LLVM_NATIVE_ARCH MSP430) - elseif (LLVM_NATIVE_ARCH MATCHES "hexagon") - set(LLVM_NATIVE_ARCH Hexagon) -+elseif (LLVM_NATIVE_ARCH MATCHES "s390") -+ set(LLVM_NATIVE_ARCH SystemZ) - elseif (LLVM_NATIVE_ARCH MATCHES "s390x") - set(LLVM_NATIVE_ARCH SystemZ) - elseif (LLVM_NATIVE_ARCH MATCHES "wasm32") diff --git a/llvm4.0.spec b/llvm4.0.spec deleted file mode 100644 index 3ba5f63..0000000 --- a/llvm4.0.spec +++ /dev/null @@ -1,275 +0,0 @@ -# Components enabled if supported by target architecture: -%ifarch %ix86 x86_64 - %bcond_without gold -%else - %bcond_with gold -%endif - -%global ver_major_minor 4.0 -%global exec_suffix -%{ver_major_minor} -%global install_prefix %{_libdir}/%{name} -%global install_bindir %{install_prefix}/bin -%global install_includedir %{install_prefix}/include -%global install_libdir %{install_prefix}/lib - -%global pkg_bindir %{install_bindir} -%global pkg_includedir %{_includedir}/%{name} -%global pkg_libdir %{install_libdir} - -Name: llvm%{ver_major_minor} -Version: %ver_major_minor.1 -Release: 6%{?dist} -Summary: The Low Level Virtual Machine - -License: NCSA -URL: http://llvm.org -Source0: http://llvm.org/releases/%{version}/llvm-%{version}.src.tar.xz - -# recognize s390 as SystemZ when configuring build -Patch0: llvm-3.7.1-cmake-s390.patch -Patch1: rust-lang-llvm-pr67.patch -Patch2: 0001-Fix-llvm-config-paths-on-Fedora.patch -Patch3: 0001-CMake-Split-static-library-exports-into-their-own-ex.patch -Patch4: 0001-DebugInfo-Fix-potential-CU-mismatch-for-SubprogramSc.patch -Patch5: 0001-Ignore-all-duplicate-frame-index-expression.patch -Patch6: 0001-Fix-return-type-in-ORC-readMem-client-interface.patch - -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: zlib-devel -BuildRequires: libffi-devel -BuildRequires: ncurses-devel -BuildRequires: python3-sphinx -BuildRequires: multilib-rpm-config -%if %{with gold} -BuildRequires: binutils-devel -%endif -BuildRequires: libstdc++-static -# Enable extra functionality when run the LLVM JIT under valgrind. -BuildRequires: valgrind-devel -# LLVM's LineEditor library will use libedit if it is available. -BuildRequires: libedit-devel - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description -LLVM is a compiler infrastructure designed for compile-time, link-time, -runtime, and idle-time optimization of programs from arbitrary programming -languages. The compiler infrastructure includes mirror sets of programming -tools as well as libraries with equivalent functionality. - -%package devel -Summary: Libraries and header files for LLVM -Requires: %{name}%{?_isa} = %{version}-%{release} -# The installed LLVM cmake files will add -ledit to the linker flags for any -# app that requires the libLLVMLineEditor, so we need to make sure -# libedit-devel is available. -Requires: libedit-devel -Requires(post): %{_sbindir}/alternatives -Requires(postun): %{_sbindir}/alternatives - -%description devel -This package contains library and header files needed to develop new native -programs that use the LLVM infrastructure. - -%package doc -Summary: Documentation for LLVM -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -Documentation for the LLVM compiler infrastructure. - -%package libs -Summary: LLVM shared libraries - -%description libs -Shared libraries for the LLVM compiler infrastructure. - - -%package static -Summary: LLVM %{ver_major_minor} static libraries -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: ncurses-devel%{?_isa} - -%description static -Static libraries for the LLVM compiler infrastructure. - -This package contains LLVM %{ver_major_minor} and can be installed -in parallel with other LLVM versions. - -%prep -%autosetup -n llvm-%{version}.src -p1 - -%ifarch armv7hl - -# These tests are marked as XFAIL, but they still run and hang on ARM. -for f in `grep -Rl 'XFAIL.\+arm' test/ExecutionEngine `; do rm $f; done - -%endif - -%build -mkdir -p _build -cd _build - -%ifarch s390 %{arm} -# use linker flags that prioritize efficiency over speed (try and save memory) -%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads -# Decrease debuginfo verbosity to reduce memory consumption during final library linking -%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') -%endif - -# force off shared libs as cmake macros turns it on. -%cmake .. \ - -DBUILD_SHARED_LIBS:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-Bsymbolic -static-libstdc++" \ -%ifarch s390 - -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \ -%endif - \ - -DCMAKE_INSTALL_PREFIX=%{install_prefix} \ - -DLLVM_TARGETS_TO_BUILD="X86;AMDGPU;PowerPC;NVPTX;SystemZ;AArch64;ARM;Mips;BPF" \ - -DLLVM_ENABLE_LIBCXX:BOOL=OFF \ - -DLLVM_ENABLE_ZLIB:BOOL=ON \ - -DLLVM_ENABLE_FFI:BOOL=ON \ - -DLLVM_ENABLE_RTTI:BOOL=ON \ -%if %{with gold} - -DLLVM_BINUTILS_INCDIR=%{_includedir} \ -%endif - \ - -DLLVM_BUILD_RUNTIME:BOOL=ON \ - \ - -DLLVM_INCLUDE_TOOLS:BOOL=ON \ - -DLLVM_BUILD_TOOLS:BOOL=ON \ - \ - -DLLVM_INCLUDE_TESTS:BOOL=ON \ - -DLLVM_BUILD_TESTS:BOOL=ON \ - \ - -DLLVM_INCLUDE_EXAMPLES:BOOL=ON \ - -DLLVM_BUILD_EXAMPLES:BOOL=OFF \ - \ - -DLLVM_INCLUDE_UTILS:BOOL=ON \ - -DLLVM_INSTALL_UTILS:BOOL=OFF \ - \ - -DLLVM_INCLUDE_DOCS:BOOL=ON \ - -DLLVM_BUILD_DOCS:BOOL=ON \ - -DLLVM_ENABLE_SPHINX:BOOL=ON \ - -DLLVM_ENABLE_DOXYGEN:BOOL=OFF \ - \ - -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \ - -DLLVM_DYLIB_EXPORT_ALL:BOOL=ON \ - -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ - -DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=ON \ - -DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=OFF \ - \ - -DSPHINX_WARNINGS_AS_ERRORS=OFF \ - -DLLVM_INSTALL_SPHINX_HTML_DIR=%{_pkgdocdir}/html \ - -DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3 - -make %{?_smp_mflags} - -%install -cd _build -make install DESTDIR=%{buildroot} - -# Add version suffix to binaries -mkdir -p %{buildroot}/%{_bindir} -for f in `ls %{buildroot}/%{install_bindir}/*`; do - filename=`basename $f` - ln -s %{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename%{exec_suffix} -done - -# Move header files -mkdir -p %{buildroot}/%{pkg_includedir} -mv %{buildroot}/%{install_includedir}/llvm %{buildroot}/%{pkg_includedir}/ -mv %{buildroot}/%{install_includedir}/llvm-c %{buildroot}/%{pkg_includedir}/ - -# Fix multi-lib -mv %{buildroot}%{_bindir}/llvm-config{%{exec_suffix},%{exec_suffix}-%{__isa_bits}} -%multilib_fix_c_header --file %{pkg_includedir}/llvm/Config/llvm-config.h - -# Create ld.so.conf.d entry -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF -%{pkg_libdir} -EOF - -# Add version suffix to man pages and move them to mandir. -mkdir -p %{buildroot}/%{_mandir}/man1 -for f in `ls %{buildroot}%{install_prefix}/share/man/man1/*`; do - filename=`basename $f | cut -f 1 -d '.'` - mv $f %{buildroot}%{_mandir}/man1/$filename%{exec_suffix}.1 -done - -%check -cd _build -#make check-all || : - -#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}/%{_libdir} -test "`%{buildroot}/%{install_bindir}/llvm-config --bindir`" -ef "%{buildroot}/%{pkg_bindir}" -test "`%{buildroot}/%{install_bindir}/llvm-config --libdir`" -ef "%{buildroot}/%{pkg_libdir}" -test "`%{buildroot}/%{install_bindir}/llvm-config --includedir`" -ef "%{buildroot}/%{pkg_includedir}" -test "`%{buildroot}/%{install_bindir}/llvm-config --cmakedir`" -ef "%{buildroot}/%{pkg_libdir}/cmake/llvm" - -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig - -%files -%{_bindir}/* -%{pkg_bindir} -%exclude %{_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} -%exclude %{pkg_bindir}/llvm-config -%{_mandir}/man1/*.1.* -%exclude %{_mandir}/man1/llvm-config%{exec_suffix}.1.gz -%license LICENSE.TXT - -%files libs -%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf -%{pkg_libdir}/BugpointPasses.so -%{pkg_libdir}/LLVMHello.so -%if %{with gold} -%{_libdir}/%{name}/lib/LLVMgold.so -%endif -%{pkg_libdir}/libLLVM-%{ver_major_minor}*.so -%{pkg_libdir}/libLTO.so* -%exclude %{pkg_libdir}/libLTO.so -%license LICENSE.TXT - -%files devel -%{_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} -%{pkg_bindir}/llvm-config -%{_mandir}/man1/llvm-config%{exec_suffix}.1.gz -%{pkg_includedir}/llvm -%{pkg_includedir}/llvm-c -%{pkg_libdir}/libLTO.so -%{pkg_libdir}/libLLVM.so -%{pkg_libdir}/cmake/llvm - -%files static -%{_libdir}/%{name}/lib/*.a - -%files doc -%doc %{_pkgdocdir}/html - -%changelog -* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Mar 07 2018 Adam Williamson <awilliam(a)redhat.com> - 4.0.1-5 -- Rebuild to fix GCC 8 mis-compilation - See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") - -* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 12 2018 Tom Stellard <tstellar(a)redhat.com> - 4.0.1-3 -- Backport r315279 to fix an issue with rust - -* Tue Nov 21 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.1-2 -- Backport r318289 to fix a debuginfo issue with rust. - -* Fri Apr 21 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.1-1 -- 4.0.1 Release. diff --git a/rust-lang-llvm-pr67.patch b/rust-lang-llvm-pr67.patch deleted file mode 100644 index 3edbde9..0000000 --- a/rust-lang-llvm-pr67.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a6fa10c14649c18d299cddf3e823b032460cb6f5 Mon Sep 17 00:00:00 2001 -From: Pirama Arumuga Nainar <pirama(a)google.com> -Date: Thu, 23 Mar 2017 16:47:47 +0000 -Subject: [PATCH] Fix computeKnownBits for ARMISD::CMOV - -Summary: -The true and false operands for the CMOV are operands 0 and 1. -ARMISelLowering.cpp::computeKnownBits was looking at operands 1 and 2 -instead. This can cause CMOV instructions to be incorrectly folded into -BFI if value set by the CMOV is another CMOV, whose known bits are -computed incorrectly. - -This patch fixes the issue and adds a test case. - -Reviewers: kristof.beyls, jmolloy - -Subscribers: llvm-commits, aemerson, srhines, rengolin - -Differential Revision: https://reviews.llvm.org/D31265 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298624 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Target/ARM/ARMISelLowering.cpp | 4 ++-- - test/CodeGen/ARM/no-cmov2bfi.ll | 19 +++++++++++++++++++ - 2 files changed, 21 insertions(+), 2 deletions(-) - create mode 100644 test/CodeGen/ARM/no-cmov2bfi.ll - -diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp -index 4a227a3cd7b1..cf98e60c0657 100644 ---- a/lib/Target/ARM/ARMISelLowering.cpp -+++ b/lib/Target/ARM/ARMISelLowering.cpp -@@ -10806,8 +10806,8 @@ static void computeKnownBits(SelectionDAG &DAG, SDValue Op, APInt &KnownZero, - if (Op.getOpcode() == ARMISD::CMOV) { - APInt KZ2(KnownZero.getBitWidth(), 0); - APInt KO2(KnownOne.getBitWidth(), 0); -- computeKnownBits(DAG, Op.getOperand(1), KnownZero, KnownOne); -- computeKnownBits(DAG, Op.getOperand(2), KZ2, KO2); -+ computeKnownBits(DAG, Op.getOperand(0), KnownZero, KnownOne); -+ computeKnownBits(DAG, Op.getOperand(1), KZ2, KO2); - - KnownZero &= KZ2; - KnownOne &= KO2; -diff --git a/test/CodeGen/ARM/no-cmov2bfi.ll b/test/CodeGen/ARM/no-cmov2bfi.ll -new file mode 100644 -index 000000000000..c8b512048905 ---- /dev/null -+++ b/test/CodeGen/ARM/no-cmov2bfi.ll -@@ -0,0 +1,19 @@ -+; RUN: llc < %s -mtriple=thumbv7 | FileCheck --check-prefix=CHECK-NOBFI %s -+ -+declare zeroext i1 @dummy() -+ -+define i8 @test(i8 %a1, i1 %c) { -+; CHECK-NOBFI-NOT: bfi -+; CHECK-NOBFI: bl dummy -+; CHECK-NOBFI: cmp r0, #0 -+; CHECK-NOBFI: it ne -+; CHECK-NOBFI: orrne [[REG:r[0-9]+]], [[REG]], #8 -+; CHECK-NOBFI: mov r0, [[REG]] -+ -+ %1 = and i8 %a1, -9 -+ %2 = select i1 %c, i8 %1, i8 %a1 -+ %3 = tail call zeroext i1 @dummy() -+ %4 = or i8 %2, 8 -+ %ret = select i1 %3, i8 %4, i8 %2 -+ ret i8 %ret -+} --- -2.9.3 - diff --git a/sources b/sources deleted file mode 100644 index 3a5f77a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (llvm-4.0.1.src.tar.xz) = 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d

5 years, 9 months

1
0
0 / 0

Architecture specific change in rpms/nacl-arm-newlib.git

by githook-noreply＠fedoraproject.org

The package rpms/nacl-arm-newlib.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/nacl-arm-newlib.git/commit/?id=8a.... Change: -ExclusiveArch: x86_64 Thanks. Full change: ============ commit 8a1cdac7df26a34da010832ccbdea88740823013 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Jul 23 13:26:17 2018 -0400 no longer builds, chromium does not need anymore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8515159..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/nacl-arm-newlib-2.1.0-git373135e.tar.bz2 -/nacl-headers-42.0.2311.135.tar.bz2 diff --git a/crt1.x b/crt1.x deleted file mode 100644 index 7582a3d..0000000 --- a/crt1.x +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This is a dummy linker script used as crt1.o. - * The actual startup code is just the _start function defined in a library. - * We provide this file for two purposes: - * 1. To keep with the traditional linking sequence that puts crt1.o first. - * 2. To generate references to the main and exit symbols like the real - * startup code would, so that they will be brought in from libraries - * before -lc is encountered in the link. Otherwise a main defined in - * a library wouldn't be referenced until after that library had already - * been examined, and _start's call would get an undefined reference. - */ - -EXTERN ( main exit _exit ) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..31a9674 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +no longer builds, chromium does not need anymore diff --git a/nacl-arm-newlib.spec b/nacl-arm-newlib.spec deleted file mode 100644 index b5fa75f..0000000 --- a/nacl-arm-newlib.spec +++ /dev/null @@ -1,124 +0,0 @@ -%global gitver 373135e - -%define __debug_install_post : > %{_builddir}/%{?buildsubdir}/debugfiles.list -%define debug_package %{nil} - -Name: nacl-arm-newlib -Summary: C library intended for use on embedded systems -Version: 2.1.0 -Release: 8.git%{gitver}%{?dist} -# Generated from git -# git clone https://chromium.googlesource.com/native_client/nacl-newlib -# (Checkout ID taken from native_client/toolchain_build/toolchain_build.py -# well... it used to be there anyways. Now just look at the latest checkout. -# cd nacl-newlib -# git checkout 373135ec5241d09138aa56603742b94b3b64ea1d -# cd .. -# For newlib version, grep PACKAGE_VERSION newlib/libm/configure -# mv nacl-newlib nacl-arm-newlib-2.1.0-git373135e -# tar --exclude-vcs -cjf nacl-arm-newlib-2.1.0-git373135e.tar.bz2 nacl-arm-newlib-2.1.0-git373135e -License: BSD and MIT and LGPLv2+ -Source0: nacl-arm-newlib-%{version}-git%{gitver}.tar.bz2 -# We need to copy some missing header files from chromium -# mkdir ~/nacl-headers-42.0.2311.135 -# cd chromium-42.0.2311.135/native_client/ -# ./src/trusted/service_runtime/export_header.py src/trusted/service_runtime/include ~/nacl-headers-42.0.2311.135/ -# cd ~/nacl-headers-42.0.2311.135 -# tar cfj ~/nacl-headers-42.0.2311.135.tar.bz2 . -Source1: nacl-headers-42.0.2311.135.tar.bz2 -# Taken from chromium-42.0.2311.135/native_client/tools/newlib-libc-script -Source2: newlib-libc-script -# Taken from chromium-42.0.2311.135/native_client/src/untrusted/pthread/pthread.h -Source3: pthread.h -# Taken from chromium-42.0.2311.135/native_client/src/untrusted/pthread/semaphore.h -Source4: semaphore.h -# Taken from chromium-42.0.2311.135/native_client/src/untrusted/stubs/crt1.x -Source5: crt1.x -URL: http://sourceware.org/newlib/ -BuildRequires: nacl-arm-binutils nacl-arm-gcc texinfo -ExclusiveArch: x86_64 -# This is to avoid the duplicate iconv bits -Requires: nacl-newlib - - -%description -Newlib is a C library intended for use on embedded systems. It is a -conglomeration of several library parts, all under free software licenses -that make them easily usable on embedded products. This is the nacl fork. - -%prep -%setup -q -n %{name}-%{version}-git%{?gitver} -pushd newlib/libc/sys/nacl -tar xf %{SOURCE1} -popd -cp -a %{SOURCE2} . - -%build -# export NEWLIB_CFLAGS="-O2 -D_I386MACH_ALLOW_HW_INTERRUPTS -DSIGNAL_PROVIDED -mtls-use-call -fPIC" -%configure \ - --disable-libgloss \ - --enable-newlib-iconv \ - --enable-newlib-io-long-long \ - --enable-newlib-io-long-double \ - --enable-newlib-io-c99-formats \ - --enable-newlib-mb \ - libc_cv_initfinit_array=yes \ - CFLAGS="-O2 -fPIC" \ - --target=arm-nacl - -make %{?_smp_mflags} - -%install -make DESTDIR=%{buildroot} install - -# Conflicts with binutils -rm -rf %{buildroot}%{_infodir}/ - -# The default pthread.h doesn't work right? -rm -rf %{buildroot}%{_prefix}/arm-nacl/include/pthread.h -cp -p %{SOURCE3} %{buildroot}%{_prefix}/arm-nacl/include/ -cp -p %{SOURCE4} %{buildroot}%{_prefix}/arm-nacl/include/ - -# We have to hack up libc.a to get things working. - -# 64bit (default) -mv %{buildroot}%{_prefix}/arm-nacl/lib/libc.a %{buildroot}%{_prefix}/arm-nacl/lib/libcrt_common.a -sed 's|@OBJFORMAT@|"elf32-littlearm-nacl", "elf32-bigarm-nacl", "elf32-littlearm-nacl"|' newlib-libc-script > %{buildroot}%{_prefix}/arm-nacl/lib/libc.a -cp -a %{SOURCE5} %{buildroot}%{_prefix}/arm-nacl/lib/crt1.o -# These bits are identical in the nacl-newlib package, so we'll use them from there. -rm -rf %{buildroot}%{_datadir} - -%files -# %%{_datadir}/iconv_data/ -%license COPYING* -%dir %{_prefix}/arm-nacl/ -%{_prefix}/arm-nacl/include/ -%{_prefix}/arm-nacl/lib/ - -%changelog -* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-8.git373135e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-7.git373135e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-6.git373135e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-5.git373135e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-4.git373135e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Feb 29 2016 Tom Callaway <spot(a)fedoraproject.org> 2.1.0-3.git373135e -- own /usr/arm-nacl/ -- use smp_mflags -- use cp -p to install headers -- license file - -* Thu Oct 1 2015 Tom Callaway <spot(a)fedoraproject.org> 2.1.0-2.git373135e -- new stuff - -* Sat May 23 2015 Tom Callaway <spot(a)fedoraproject.org> 2.1.0-1.gitbf66148 -- initial package (chromium 42) diff --git a/newlib-libc-script b/newlib-libc-script deleted file mode 100644 index 8e79c8f..0000000 --- a/newlib-libc-script +++ /dev/null @@ -1,7 +0,0 @@ -/* - * This is a linker script that gets installed as libc.a for the - * newlib-based NaCl toolchain. It brings in the constituent - * libraries that make up what -lc means semantically. - */ -OUTPUT_FORMAT(@OBJFORMAT@) -GROUP ( libnacl.a libcrt_common.a ) diff --git a/pthread.h b/pthread.h deleted file mode 100644 index 11eeaf8..0000000 --- a/pthread.h +++ /dev/null @@ -1,800 +0,0 @@ -/* - * Copyright (c) 2012 The Native Client Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/** @file - * Defines the API in the - * <a href="group___pthread.html">Pthread library</a> - * - * @addtogroup Pthread - * @{ - */ - -#ifndef _PTHREAD_H -#define _PTHREAD_H 1 - -#include <stdint.h> -#include <sched.h> -#include <time.h> -#include <sys/nacl_nice.h> -#include <sys/queue.h> -#include <sys/types.h> - -/* - * Signed 32-bit integer supporting CompareAndSwap and AtomicIncrement - * (see implementations), as well as atomic loads and stores. - * Instances must be naturally aligned. - */ -typedef int AtomicInt32; - -#ifdef __cplusplus -extern "C" { -#endif - -struct timespec; -struct __nc_basic_thread_data; - -/** Mutex type attributes */ -enum { - /** Fast mutex type; for use with pthread_mutexattr_settype() */ - PTHREAD_MUTEX_FAST_NP, - /** Recursive mutex type; for use with pthread_mutexattr_settype() */ - PTHREAD_MUTEX_RECURSIVE_NP, - /** Error-checking mutex type; for use with pthread_mutexattr_settype() */ - PTHREAD_MUTEX_ERRORCHECK_NP, - PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_FAST_NP, - PTHREAD_MUTEX_RECURSIVE = PTHREAD_MUTEX_RECURSIVE_NP, - PTHREAD_MUTEX_ERRORCHECK = PTHREAD_MUTEX_ERRORCHECK_NP, - - PTHREAD_MUTEX_DEFAULT = PTHREAD_MUTEX_NORMAL -}; - -/* - * The layout of pthread_mutex_t and the static initializers are redefined - * in newlib's sys/lock.h file (including this file from sys/lock.h will - * cause include conflicts). When changing one of the definitions, make sure to - * change the second one. - */ -/** - * A structure representing a thread mutex. It should be considered an - * opaque record; the names of the fields can change anytime. - */ -typedef struct { - /* - * mutex_state is either UNLOCKED (0), LOCKED_WITHOUT_WAITERS (1) or - * LOCKED_WITH_WAITERS (2). See "enum MutexState". - */ - volatile int mutex_state; - - /** - * The kind of mutex: - * PTHREAD_MUTEX_FAST_NP, PTHREAD_MUTEX_RECURSIVE_NP, - * or PTHREAD_MUTEX_ERRORCHECK_NP - */ - int mutex_type; - - /** - * ID of the thread that owns the mutex. This is volatile because - * it is accessed concurrently, and "volatile" is a way to make - * loads and stores atomic in PNaCl. - */ - struct __nc_basic_thread_data *volatile owner_thread_id; - - /** Recursion depth counter for recursive mutexes */ - uint32_t recursion_counter; - - /* - * Padding is for compatibility with libraries (newlib etc.) that - * were built before libpthread switched to using futexes, and to - * match _LOCK_T in newlib's newlib/libc/include/sys/lock.h. - */ - int unused_padding; -} pthread_mutex_t; - -/** - * A structure representing mutex attributes. It should be considered an - * opaque record and accessed only using pthread_mutexattr_settype(). - */ -typedef struct { - /** - * The kind of mutex: - * PTHREAD_MUTEX_FAST_NP, PTHREAD_MUTEX_RECURSIVE_NP, - * or PTHREAD_MUTEX_ERRORCHECK_NP - */ - int kind; -} pthread_mutexattr_t; - -/** - * A structure representing a condition variable. It should be considered an - * opaque record; the names of the fields can change anytime. - */ -typedef struct { - /* This is incremented on each pthread_cond_signal/broadcast() call. */ - int sequence_number; - - /* - * Padding is for compatibility with libraries (newlib etc.) that - * were built before libpthread switched to using futexes. - */ - int unused_padding; -} pthread_cond_t; - -/** - * A structure representing condition variable attributes. Currently - * Native Client condition variables have no attributes. - */ -typedef struct { - int dummy; /**< Reserved; condition variables don't have attributes */ -} pthread_condattr_t; - -/** - * A structure representing a rwlock. It should be considered an - * opaque record; the names of the fields can change anytime. - */ -typedef struct { - pthread_mutex_t mutex; /* mutex for all values in the structure */ - int reader_count; - int writers_waiting; - struct __nc_basic_thread_data *writer_thread_id; - pthread_cond_t read_possible; - pthread_cond_t write_possible; -} pthread_rwlock_t; - -/** - * A structure representing rwlock attributes. It should be considered an - * opaque record. - */ -typedef struct { - int type; -} pthread_rwlockattr_t; - -/** A value that represents an uninitialized handle. */ -#define NC_INVALID_HANDLE -1 - -/** Maximum valid thread ID value. */ -#define MAX_THREAD_ID (0xfffffffe) - -/** Illegal thread ID value. */ -#define NACL_PTHREAD_ILLEGAL_THREAD_ID ((pthread_t) 0) - -/** Statically initializes a pthread_mutex_t representing a recursive mutex. */ -#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \ - {0, 1, NACL_PTHREAD_ILLEGAL_THREAD_ID, 0, NC_INVALID_HANDLE} -/** Statically initializes a pthread_mutex_t representing a fast mutex. */ -#define PTHREAD_MUTEX_INITIALIZER \ - {0, 0, NACL_PTHREAD_ILLEGAL_THREAD_ID, 0, NC_INVALID_HANDLE} -/** - * Statically initializes a pthread_mutex_t representing an - * error-checking mutex. - */ -#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \ - {0, 2, NACL_PTHREAD_ILLEGAL_THREAD_ID, 0, NC_INVALID_HANDLE} -/** Statically initializes a condition variable (pthread_cond_t). */ -#define PTHREAD_COND_INITIALIZER {0, NC_INVALID_HANDLE} - -#define PTHREAD_PROCESS_PRIVATE 0 -#define PTHREAD_PROCESS_SHARED 1 - - -/* Functions for mutex handling. */ - -/** @nqPosix - * Initializes a mutex using attributes in mutex_attr, or using the - * default values if the latter is NULL. - * - * @linkPthread - * - * @param mutex The address of the mutex structure to be initialized. - * @param mutex_attr The address of the attributes structure. - * - * @return 0 upon success, 1 otherwise - */ -extern int pthread_mutex_init(pthread_mutex_t *mutex, - const pthread_mutexattr_t *mutex_attr); - -/** @nqPosix -* Destroys a mutex. -* -* @linkPthread -* -* @param mutex The address of the mutex structure to be destroyed. -* -* @return 0 upon success, non-zero error code otherwise -*/ -extern int pthread_mutex_destroy(pthread_mutex_t *mutex); - -/** @nqPosix -* Tries to lock a mutex. -* -* @linkPthread -* -* @param mutex The address of the mutex structure to be locked. -* -* @return 0 upon success, EBUSY if the mutex is locked by another thread, -* non-zero error code otherwise. -*/ -extern int pthread_mutex_trylock(pthread_mutex_t *mutex); - -/** @nqPosix -* Locks a mutex. -* -* @linkPthread -* -* @param mutex The address of the mutex structure to be locked. -* -* @return 0 upon success, non-zero error code otherwise. -*/ -extern int pthread_mutex_lock(pthread_mutex_t *mutex); - -/* Wait until lock becomes available, or specified time passes. */ -extern int pthread_mutex_timedlock(pthread_mutex_t *mutex, - const struct timespec *abstime); - -/** @nqPosix -* Unlocks a mutex. -* -* @linkPthread -* -* @param mutex The address of the mutex structure to be unlocked. -* -* @return 0 upon success, non-zero error code otherwise. -*/ -extern int pthread_mutex_unlock(pthread_mutex_t *mutex); - -/* Mutex attributes manipulation */ - -/** @nqPosix -* Initializes mutex attributes. -* -* @linkPthread -* -* @param attr The address of the attributes structure to be initialized. -* -* @return 0. -*/ -extern int pthread_mutexattr_init(pthread_mutexattr_t *attr); - -/** @nqPosix -* Destroys mutex attributes structure. -* -* @linkPthread -* -* @param attr The address of the attributes structure to be destroyed. -* -* @return 0. -*/ -extern int pthread_mutexattr_destroy(pthread_mutexattr_t *attr); - -/** @nqPosix -* Sets the mutex type: fast, recursive or error-checking. -* -* @linkPthread -* -* @param attr The address of the attributes structure. -* @param kind PTHREAD_MUTEX_FAST_NP, PTHREAD_MUTEX_RECURSIVE_NP or -* PTHREAD_MUTEX_ERRORCHECK_NP. -* -* @return 0 on success, -1 for illegal values of kind. -*/ -extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr, - int kind); - -/** @nqPosix -* Gets the mutex type: fast, recursive or error-checking. -* -* @linkPthread -* -* @param attr The address of the attributes structure. -* @param kind Pointer to the location where the mutex kind value is copied. -* -* @return 0. -*/ -extern int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, - int *kind); - -/* Functions for handling conditional variables. */ - -/** @nqPosix -* Initializes a condition variable. -* -* @linkPthread -* -* @param cond Pointer to the condition variable structure. -* @param cond_attr Pointer to the attributes structure, should be NULL as -* Native Client does not support any attributes for a condition variable at -* this stage. -* -* @return 0 for success, 1 otherwise. -*/ -extern int pthread_cond_init(pthread_cond_t *cond, - const pthread_condattr_t *cond_attr); - -/** @nqPosix -* Destroys a condition variable. -* -* @linkPthread -* -* @param cond Pointer to the condition variable structure. -* -* @return 0 for success, non-zero error code otherwise. -*/ -extern int pthread_cond_destroy(pthread_cond_t *cond); - -/** @nqPosix -* Signals a condition variable, waking up one of the threads waiting on it. -* -* @linkPthread -* -* @param cond Pointer to the condition variable structure. -* -* @return 0 for success, non-zero error code otherwise. -*/ -extern int pthread_cond_signal(pthread_cond_t *cond); - -/** @nqPosix -* Wakes up all threads waiting on a condition variable. -* -* @linkPthread -* -* @param cond Pointer to the condition variable structure. -* -* @return 0 for success, non-zero error code otherwise. -*/ -extern int pthread_cond_broadcast(pthread_cond_t *cond); - -/** @nqPosix -* Waits for a condition variable to be signaled or broadcast. -* -* @linkPthread -* -* @param cond Pointer to the condition variable structure. -* @param mutex Pointer to the mutex structure. The mutex is assumed to be locked -* when this function is called. -* -* @return 0 for success, non-zero error code otherwise. -*/ -extern int pthread_cond_wait(pthread_cond_t *cond, - pthread_mutex_t *mutex); - -/** @nqPosix -* Waits for condition variable cond to be signaled or broadcast until -* abstime. -* -* @linkPthread -* -* @param cond Pointer to the condition variable structure. -* @param mutex Pointer to the mutex structure. The mutex is assumed to be locked -* when this function is called. -* @param abstime Absolute time specification; zero is the beginning of the epoch -* (00:00:00 GMT, January 1, 1970). -* -* @return 0 for success, non-zero error code otherwise. -*/ -int pthread_cond_timedwait_abs(pthread_cond_t *cond, - pthread_mutex_t *mutex, - const struct timespec *abstime); - -/** @nqPosix -* Waits for condition variable cond to be signaled or broadcast; wait time is -* limited by reltime. -* -* @linkPthread -* -* @param cond Pointer to the condition variable structure. -* @param mutex Pointer to the mutex structure. The mutex is assumed to be locked -* when this function is called. -* @param reltime Time specification, relative to the current time. -* -* @return 0 for success, non-zero error code otherwise. -*/ -int pthread_cond_timedwait_rel(pthread_cond_t *cond, - pthread_mutex_t *mutex, - const struct timespec *reltime); - -/** - * Defined for POSIX compatibility; pthread_cond_timedwait() is actually - * a macro calling pthread_cond_timedwait_abs(). - */ -#define pthread_cond_timedwait pthread_cond_timedwait_abs - -/* Functions for rwlock handling. */ - -int pthread_rwlockattr_init(pthread_rwlockattr_t *attr); -int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *attr, - int *pshared); -int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *attr, int pshared); -int pthread_rwlockattr_destroy(pthread_rwlockattr_t *attr); - -int pthread_rwlock_init(pthread_rwlock_t *rwlock, - const pthread_rwlockattr_t *attr); - -int pthread_rwlock_rdlock(pthread_rwlock_t *rwlock); -int pthread_rwlock_tryrdlock(pthread_rwlock_t *rwlock); -int pthread_rwlock_timedrdlock(pthread_rwlock_t *rwlock, - const struct timespec *abstime); - - -int pthread_rwlock_wrlock(pthread_rwlock_t *rwlock); -int pthread_rwlock_trywrlock(pthread_rwlock_t *rwlock); -int pthread_rwlock_timedwrlock(pthread_rwlock_t *rwlock, - const struct timespec *abstime); - -int pthread_rwlock_unlock(pthread_rwlock_t *rwlock); -int pthread_rwlock_destroy(pthread_rwlock_t *rwlock); - - -/* Threads */ -/** Thread entry function type. */ -typedef void *(*nc_thread_function)(void *p); -/** Thread identifier type. */ -typedef struct __nc_basic_thread_data *pthread_t; - -/** A structure representing thread attributes. */ -typedef struct { - int joinable; /**< 1 if the thread is joinable, 0 otherwise */ - size_t stacksize; /**< The requested thread stack size in bytes. */ -} pthread_attr_t; - - -/** Joinable thread type; for use with pthread_attr_setdetachstate(). */ -#define PTHREAD_CREATE_JOINABLE 1 -/** Detached thread type; for use with pthread_attr_setdetachstate(). */ -#define PTHREAD_CREATE_DETACHED 0 - -/** For use with pthread_attr_setscope(). */ -#define PTHREAD_SCOPE_PROCESS 0 -/** For use with pthread_attr_setscope(). */ -#define PTHREAD_SCOPE_SYSTEM 1 - -/** Minimum stack size; for use with pthread_attr_setstacksize(). */ -#define PTHREAD_STACK_MIN (1024) - -/* default stack size */ -#define PTHREAD_STACK_DEFAULT (512 * 1024) - -/* Thread functions */ - -/** @nqPosix -* Creates a thread. -* -* @linkPthread -* -* @param[out] thread_id A pointer to the location where the identifier of the -* newly created thread is stored on success. -* @param attr Thread attributes structure. -* @param start_routine Thread function. -* @param arg A single argument that is passed to the thread function. -* -* @return 0 for success, non-zero error code otherwise. -*/ -extern int pthread_create(pthread_t *thread_id, - const pthread_attr_t *attr, - void *(*start_routine)(void *p), - void *arg); - -/** @nqPosix -* Obtains the identifier of the current thread. -* -* @linkPthread -* -* @return Thread ID of the current thread. -*/ -extern pthread_t pthread_self(void); - -/** @nqPosix -* Compares two thread identifiers. -* -* @linkPthread -* -* @param thread1 Thread ID of thread A. -* @param thread2 Thread ID of thread B. -* -* @return 1 if both identifiers belong to the same thread, 0 otherwise. -*/ -extern int pthread_equal(pthread_t thread1, pthread_t thread2); - -/** @nqPosix -* Terminates the calling thread. -* -* @linkPthread -* -* @param retval Return value of the thread. -* -* @return The function never returns. -*/ -extern void pthread_exit(void *retval); - -/** @nqPosix -* Makes the calling thread wait for termination of another thread. -* -* @linkPthread -* -* @param th The identifier of the thread to wait for. -* @param thread_return If not NULL, points to the location where the return -* value of the terminated thread is stored upon completion. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_join(pthread_t th, void **thread_return); - -/** @nqPosix -* Indicates that the specified thread is never to be joined with pthread_join(). -* The resources of that thread will therefore be freed immediately when it -* terminates, instead of waiting for another thread to perform pthread_join() -* on it. -* -* @linkPthread -* -* @param th Thread identifier. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_detach(pthread_t th); - -/** @nqPosix -* Sends a signal to a thread. (Currently only a stub implementation.) -* -* @linkPthread -* -* @param thread_id The identifier of the thread to receive the signal. -* @param sig The signal value to send. -* -* @return 0 for success, non-zero error code otherwise. -*/ -extern int pthread_kill(pthread_t thread_id, - int sig); - -/* Functions for handling thread attributes. */ - -/** @nqPosix -* Initializes thread attributes structure attr with default attributes -* (detachstate is PTHREAD_CREATE_JOINABLE). -* -* @linkPthread -* -* @param attr Pointer to thread attributes structure. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_attr_init(pthread_attr_t *attr); - -/** @nqPosix -* Destroys a thread attributes structure. -* -* @linkPthread -* -* @param attr Pointer to thread attributes structure. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_attr_destroy(pthread_attr_t *attr); - -/** @nqPosix -* Sets the detachstate attribute in thread attributes. -* -* @linkPthread -* -* @param attr Pointer to thread attributes structure. -* @param detachstate Value to be set, determines whether the thread is joinable. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_attr_setdetachstate(pthread_attr_t *attr, - int detachstate); - -/** @nqPosix -* Gets the detachstate attribute from thread attributes. -* -* @linkPthread -* -* @param attr Pointer to thread attributes structure. -* @param detachstate Location where the value of `detachstate` is stored upon -* successful completion. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_attr_getdetachstate(const pthread_attr_t *attr, - int *detachstate); - -/** @nqPosix -* Sets the contention scope attribute in thread attributes. -* Native Client (like Linux) only supports PTHREAD_SCOPE_SYSTEM. -* -* @linkPthread -* -* @param attr Pointer to thread attributes structure. -* @param scope Value to be set, determines the contention scope of the thread. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_attr_setscope(pthread_attr_t *attr, int scope); - -/** @nqPosix -* Gets the contention scope attribute from thread attributes. -* Native Client (like Linux) only supports PTHREAD_SCOPE_SYSTEM. -* -* @linkPthread -* -* @param attr Pointer to thread attributes structure. -* @param scope Location where the value of `scope` is stored upon -* successful completion. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_attr_getscope(const pthread_attr_t *attr, int *scope); - -/** @nqPosix -* Sets the stacksize attribute in thread attributes. Has no effect if the -* size is less than PTHREAD_STACK_MIN. -* -* @linkPthread -* -* @param attr Pointer to thread attributes structure. -* @param stacksize Value to be set, determines the minimum stack size. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_attr_setstacksize(pthread_attr_t *attr, - size_t stacksize); - -/** @nqPosix -* Gets the stacksize attribute in thread attributes. -* -* @linkPthread -* -* @param attr Pointer to thread attributes structure. -* @param stacksize Value to be set, determines the minimum stack size. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_attr_getstacksize(const pthread_attr_t *attr, - size_t *stacksize); - -/** @nqPosix - * Gets the maximum address of the stack (assuming stacks grow - * downwards) of the given thread. - * - * If the given thread exits concurrently with the call to this - * function, the behaviour is undefined. - * - * Note that in the future this may be removed and replaced with an - * implementation of pthread_getattr_np(), for consistency with Linux - * glibc. pthread_getattr_np() + pthread_attr_getstack() return the - * stack base (minimum) address and stack size. However, that is - * currently unimplementable under NaCl, because NaCl does not provide - * a way to determine the initial thread's stack size. See: - * https://code.google.com/p/nativeclient/issues/detail?id=3431 - */ -extern int pthread_get_stack_end_np(pthread_t tid, void **stack_end); - -/* Functions for handling thread-specific data. */ - -/** Thread-specific key identifier type */ -typedef int pthread_key_t; - -/** Number of available keys for thread-specific data. */ -#define PTHREAD_KEYS_MAX 512 - -/** @nqPosix -* Creates a key value identifying a location in the thread-specific -* data area. -* -* @linkPthread -* -* @param key Pointer to the location where the value of the key is stored upon -* successful completion. -* @param destr_function Pointer to a cleanup function that is called if the -* thread terminates while the key is still allocated. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_key_create(pthread_key_t *key, - void (*destr_function)(void *p)); - - -/** @nqPosix -* Destroys a thread-specific data key. -* -* @linkPthread -* -* @param key Key value, previously obtained using pthread_key_create(). -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_key_delete(pthread_key_t key); - -/** @nqPosix -* Stores a value in the thread-specific data slot identified by a key value. -* -* @linkPthread -* -* @param key Key value, previously obtained using pthread_key_create(). -* @param pointer The value to be stored. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_setspecific(pthread_key_t key, - const void *pointer); - -/** @nqPosix -* Gets the value currently stored at the thread-specific data slot -* identified by the key. -* -* @linkPthread -* -* @param key Key value, previously obtained using pthread_key_create(). -* -* @return The value that was previously stored using pthread_setspecific is -* returned on success, otherwise NULL. -*/ -extern void *pthread_getspecific(pthread_key_t key); - -/** - * A structure describing a control block - * used with the pthread_once() function. - * It should be considered an opaque record; - * the names of the fields can change anytime. - */ -typedef struct { - /** A flag: 1 if the function was already called, 0 if it wasn't */ - AtomicInt32 done; - - /** Synchronization lock for the flag */ - pthread_mutex_t lock; -} pthread_once_t; - -/** Static initializer for pthread_once_t. */ -#define PTHREAD_ONCE_INIT {0, PTHREAD_MUTEX_INITIALIZER} - -/** @nqPosix -* Ensures that a piece of initialization code is executed at most once. -* -* @linkPthread -* -* @param __once_control Points to a static or extern variable statically -* initialized to PTHREAD_ONCE_INIT. -* @param __init_routine A pointer to the initialization function. -* -* @return 0. -*/ -extern int pthread_once(pthread_once_t *__once_control, - void (*__init_routine)(void)); - -/** @nqPosix -* Sets the scheduling priority of a thread. -* -* @linkPthread -* -* @param thread_id Identifies the thread to operate on. -* @param prio Scheduling priority to apply to that thread. -* -* @return 0 on success, non-zero error code otherwise. -*/ -extern int pthread_setschedprio(pthread_t thread_id, int prio); - -/* - * NOTE: this is only declared here to shut up - * some warning in the c++ system header files. - * We do not define this function anywhere. - */ - -extern int pthread_cancel(pthread_t th); - -/* - * NOTE: There are only stub implementations of these functions. - */ - -void pthread_cleanup_push(void (*func)(void *cleanup_arg), void *arg); -void pthread_cleanup_pop(int execute); - -/** -* @} End of PTHREAD group -*/ - -#ifdef __cplusplus -} -#endif - -#endif /* pthread.h */ diff --git a/semaphore.h b/semaphore.h deleted file mode 100644 index 105df37..0000000 --- a/semaphore.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2011 The Native Client Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* - * NativeClient pthread library semaphores API - */ - -#ifndef NATIVE_CLIENT_SRC_UNTRUSTED_PTHREAD_NC_SEMPAHPORE_H_ -#define NATIVE_CLIENT_SRC_UNTRUSTED_PTHREAD_NC_SEMPAHPORE_H_ 1 - -#include <limits.h> -#include <sys/types.h> - - -/* A pthread semaphore object */ -typedef struct { - /* Current value of the semaphore. This is always non-negative. */ - volatile int count; - /* - * Number of threads waiting for the semaphore in sem_wait(); always - * non-negative. This is used as an optimization to avoid - * unnecessary futex_wake() calls in sem_post(). - */ - volatile int nwaiters; -} sem_t; - -/* - * Maximum value the semaphore can have. This matches glibc's value. - */ -#define SEM_VALUE_MAX INT_MAX - - -#ifdef __cplusplus -extern "C" { -#endif - -/* Initialize semaphore object SEM to VALUE. If PSHARED then share it - with other processes. */ -extern int sem_init(sem_t *sem, int pshared, unsigned int value); - -/* Free resources associated with semaphore object SEM. */ -extern int sem_destroy(sem_t *sem); - -/* Wait for SEM being posted. */ -extern int sem_wait(sem_t *sem); - -/* TODO(gregoryd) - add support for sem_timedwait later */ -#if 0 -/* Similar to `sem_wait' but wait only until ABSTIME. */ -extern int sem_timedwait(sem_t *sem, - const struct timespec *abstime); -#endif - -/* Test whether SEM is posted. */ -extern int sem_trywait(sem_t *sem); - -/* Post SEM. */ -extern int sem_post(sem_t *sem); - -/* Get current value of SEM and store it in *SVAL. */ -extern int sem_getvalue(sem_t *sem, int *sval); - -#ifdef __cplusplus -} -#endif - -#endif /* NATIVE_CLIENT_SRC_UNTRUSTED_PTHREAD_NC_SEMPAHPORE_H_ */ diff --git a/sources b/sources deleted file mode 100644 index c947702..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -a74942b37fce92a2759a3a9bf1c921be nacl-arm-newlib-2.1.0-git373135e.tar.bz2 -8244d099acba87ad1e5346c0f4b3ad87 nacl-headers-42.0.2311.135.tar.bz2

5 years, 9 months

1
0
0 / 0

Architecture specific change in rpms/rust-mio-extras.git

by githook-noreply＠fedoraproject.org

The package rpms/rust-mio-extras.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-mio-extras.git/commit/?id=f6.... Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit f6dffe096313856cbf840b1a9c2fb1a2bed9c243 Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> Date: Mon Jul 23 16:34:38 2018 +0200 initial import Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ec0252 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/mio-extras-2.0.5.crate diff --git a/rust-mio-extras.spec b/rust-mio-extras.spec new file mode 100644 index 0000000..32320db --- /dev/null +++ b/rust-mio-extras.spec @@ -0,0 +1,62 @@ +# Generated by rust2rpm +# Tests are run in infrastructure +%bcond_with check +%global debug_package %{nil} + +%global crate mio-extras + +Name: rust-%{crate} +Version: 2.0.5 +Release: 1%{?dist} +Summary: Extra components for use with Mio + +# https://github.com/dimbleby/mio-extras/pull/1 +License: MIT or ASL 2.0 +URL: https://crates.io/crates/mio-extras +Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{... + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging +# [dependencies] +BuildRequires: (crate(lazycell) >= 1.0.0 with crate(lazycell) < 2.0.0) +BuildRequires: (crate(log) >= 0.4.0 with crate(log) < 0.5.0) +BuildRequires: (crate(mio) >= 0.6.14 with crate(mio) < 0.7.0) +BuildRequires: (crate(slab) >= 0.4.0 with crate(slab) < 0.5.0) + +%description +%{summary}. + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel +Extra components for use with Mio. + +This package contains library source intended for building other packages +which use %{crate} from crates.io. + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files devel +%license LICENSE-MIT LICENSE-APACHE +%doc README.md CHANGELOG.md +%{cargo_registry}/%{crate}-%{version}/ + +%changelog +* Sun Jul 22 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.0.5-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..ba67766 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (mio-extras-2.0.5.crate) = 743fc56546d8bcb09efecda0d60007a175a2db2a75dc882b21fedeb8fc4fcfe98ac0a6d55b0e843b088aac4e24e57145d96b372cdfa39933efee2514ba2ebba9 diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..7af99fe --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,13 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + repositories: + - repo: "https://src.fedoraproject.org/tests/rust.git" + dest: rust + tests: + - rust/cargo-test + environment: + pkg: rust-mio-extras

5 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes July 2018