开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:tar_scm:libnice.spec Changed

@@ -1,19 +1,15 @@
 Name:           libnice
-Version:        0.1.14
-Release:        11
+Version:        0.1.19
+Release:        1
 Summary:        An implementation of ICE standard
 License:        LGPLv2 and MPLv1.1
 URL:            https://nice.freedesktop.org/wiki/
 Source0:        https://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz
-Patch0001:      libnice-0.1.14-85-g34d6044.patch
-Patch0002:      libnice-0.1.14-tests-i686.patch
-Patch0003:      libnice-0.1.14-tests-koji.patch
-Patch0004:      libnice-0.1.14-turn-verify.patch
 
 BuildRequires:  autoconf automake glib2-devel gnutls-devel >= 2.12.0
 BuildRequires:  gobject-introspection-devel gstreamer1-devel >= 0.11.91
 BuildRequires:  gstreamer1-plugins-base-devel >= 0.11.91
-BuildRequires:  gtk-doc
+BuildRequires:  gtk-doc gupnp-igd-devel >= 0.1.2 graphviz meson
 
 %description
 Libnice is an implementation of the IETF's Interactive Connectivity
@@ -40,25 +36,18 @@
 
 %prep
 %autosetup -n %{name}-%{version} -p1
-chmod 0755 scripts/valgrind-test-driver
-sed -e 's/test-new-dribble/#&/' -e 's/test-send-recv/#&/' -i tests/Makefile.am
-autoreconf -fiv
+sed -e "s/^  'test-set-port-range'/#&/" -i tests/meson.build
 
 %build
-%configure --enable-compile-warnings=yes --disable-static --without-gstreamer-0.10
-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_build V=1
+%meson -D gtk_doc=enabled
+%meson_build
 
 %install
-%make_install
+%meson_install
 %delete_la
 
 %check
-%ifarch x86_64 %{ix86}
-export LD_LIBRARY_PATH="$PWD/nice/.libs"
-make check
-%endif
+%meson_test
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -78,6 +67,12 @@
 %{_datadir}/{gtk-doc/html/libnice/,gir-1.0/Nice-0.1.gir}
 
 %changelog
+* Thu Aug 04 2022 yaoxin <yaoxin30@h-partners.com> - 0.1.19-1
+- Update to 0.1.19
+
+* Tue Mar 29 2022 wangkai <wangkai385@h-partners.com> - 0.1.14-12
+- Do check on X86 and ARM64
+
 * Tue Mar 29 2022 yaoxin <yaoxin30@huawei.com> - 0.1.14-11
 - Repair failed to execute "gtkdocize"

_service:tar_scm:libnice-0.1.14-85-g34d6044.patch Deleted

@@ -1,11963 +0,0 @@
-From a4bacb2fe2ff06ccb1a2d7f7c0b62bd41674565b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Mon, 3 Apr 2017 14:30:10 -0400
-Subject: PATCH 01/70 Version 0.1.14.1
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5fabdb4..b39bfe3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,8 +5,8 @@ dnl Always compile with -Wall; if --enable-compile-warnings=error is passed,
- dnl also use -Werror. git and pre-releases default to -Werror
- 
- dnl use a three digit version number for releases, and four for cvs/prerelease
--AC_INIT(libnice,0.1.14)
--LIBNICE_RELEASE="yes"
-+AC_INIT(libnice,0.1.14.1)
-+LIBNICE_RELEASE="no"
- 
- AC_CANONICAL_TARGET
- 
--- 
-2.13.6
-
-
-From 59ce41dfb837adf4222b25490cde2e394384ad15 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miguel=20Par=C3=ADs=20D=C3=ADaz?= <mparisdiaz@gmail.com>
-Date: Fri, 31 Mar 2017 20:20:38 -0400
-Subject: PATCH 02/70 conncheck: consider answer received when remote
- credentials are set
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Consider that the answer is received when remote credentials
-are set instead of when a remote candidate is set,
-which could not happen or could cause more delay for the
-connection establishment.
-
-Ported to git master by Olivier Crête
-
-Differential Revision: https://phabricator.freedesktop.org/D1704
----
- agent/agent.c     |   4 +-
- agent/conncheck.c | 225 +++++++++++++++++++++++++++---------------------------
- agent/conncheck.h |   2 +-
- 3 files changed, 117 insertions(+), 114 deletions(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 555fd16..4d9381c 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -3240,6 +3240,8 @@ nice_agent_set_remote_credentials (
-     g_strlcpy (stream->remote_ufrag, ufrag, NICE_STREAM_MAX_UFRAG);
-     g_strlcpy (stream->remote_password, pwd, NICE_STREAM_MAX_PWD);
- 
-+    conn_check_remote_credentials_set(agent, stream);
-+
-     ret = TRUE;
-     goto done;
-   }
-@@ -3342,8 +3344,6 @@ _set_remote_candidates_locked (NiceAgent *agent, NiceStream *stream,
-     }
-   }
- 
--  conn_check_remote_candidates_set(agent, stream, component);
--
-   if (added > 0) {
-     conn_check_schedule_next (agent);
-   }
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index dda2f2f..2abbc5e 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -1243,124 +1243,124 @@ static GSList *prune_cancelled_conn_check (GSList *conncheck_list)
- 
- /*
-  * Handle any processing steps for connectivity checks after
-- * remote candidates have been set. This function handles
-+ * remote credentials have been set. This function handles
-  * the special case where answerer has sent us connectivity
-- * checks before the answer (containing candidate information),
-+ * checks before the answer (containing credentials information),
-  * reaches us. The special case is documented in sect 7.2 
-  * if ICE spec (ID-19).
-  */
--void conn_check_remote_candidates_set(NiceAgent *agent, NiceStream *stream, NiceComponent *component)
-+void conn_check_remote_credentials_set(NiceAgent *agent, NiceStream *stream)
- {
--  GSList *j, *k, *l, *m, *n;
-+  GSList *j, *k, *l, *m, *n, *o;
- 
-   for (j = stream->conncheck_list; j ; j = j->next) {
-     CandidateCheckPair *pair = j->data;
--    if (pair->component_id == component->id) {
--      gboolean match = FALSE;
--
--      /* performn delayed processing of spec steps section 7.2.1.4,
--	 and section 7.2.1.5 */
--      priv_preprocess_conn_check_pending_data (agent, stream, component, pair);
--
--      for (k = component->incoming_checks; k; k = k->next) {
--	IncomingCheck *icheck = k->data;
--	/* sect 7.2.1.3., "Learning Peer Reflexive Candidates", has to
--	 * be handled separately */
--	for (l = component->remote_candidates; l; l = l->next) {
--	  NiceCandidate *cand = l->data;
--	  if (nice_address_equal (&icheck->from, &cand->addr)) {
--	    match = TRUE;
--	    break;
--	  }
--	}
--	if (match != TRUE) {
--	  /* note: we have gotten an incoming connectivity check from
--	   *       an address that is not a known remote candidate */
--
--          NiceCandidate *local_candidate = NULL;
--          NiceCandidate *remote_candidate = NULL;
--
--          if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE ||
--              agent->compatibility == NICE_COMPATIBILITY_MSN ||
--              agent->compatibility == NICE_COMPATIBILITY_OC2007) {
--            /* We need to find which local candidate was used */
--            uint8_t unameNICE_STREAM_MAX_UNAME;
--            guint uname_len;
--
--            nice_debug ("Agent %p: We have a peer-reflexive candidate in a "
--                "stored pending check", agent);
--
--            for (m = component->remote_candidates;
--                 m != NULL && remote_candidate == NULL; m = m->next) {
--              for (n = component->local_candidates; n; n = n->next) {
--                NiceCandidate *rcand = m->data;
--                NiceCandidate *lcand = n->data;
--
--                uname_len = priv_create_username (agent, stream,
--                    component->id,  rcand, lcand,
--                    uname, sizeof (uname), TRUE);
--
--                stun_debug ("pending check, comparing usernames of len %d and %d, equal=%d",
--                    icheck->username_len, uname_len,
--                    icheck->username && uname_len == icheck->username_len &&
--                    memcmp (uname, icheck->username, icheck->username_len) == 0);
--                stun_debug_bytes ("  first username:  ",
--                    icheck->username,
--                    icheck->username? icheck->username_len : 0);
--                stun_debug_bytes ("  second username: ", uname, uname_len);
--
--                if (icheck->username &&
--                    uname_len == icheck->username_len &&
--                    memcmp (uname, icheck->username, icheck->username_len) == 0) {
--                  local_candidate = lcand;
--                  remote_candidate = rcand;
--                  break;
--                }
--              }
--            }
--          } else {
--            for (l = component->local_candidates; l; l = l->next) {
--              NiceCandidate *cand = l->data;
--              if (nice_address_equal (&cand->addr, &icheck->local_socket->addr)) {
--                local_candidate = cand;
-+    NiceComponent *component =
-+        nice_stream_find_component_by_id (stream, pair->component_id);
-+    gboolean match = FALSE;
-+
-+    /* performn delayed processing of spec steps section 7.2.1.4,
-+       and section 7.2.1.5 */
-+    priv_preprocess_conn_check_pending_data (agent, stream, component, pair);
-+
-+    for (k = component->incoming_checks; k; k = k->next) {
-+      IncomingCheck *icheck = k->data;
-+      /* sect 7.2.1.3., "Learning Peer Reflexive Candidates", has to
-+       * be handled separately */
-+      for (l = component->remote_candidates; l; l = l->next) {
-+        NiceCandidate *cand = l->data;
-+        if (nice_address_equal (&icheck->from, &cand->addr)) {
-+          match = TRUE;
-+          break;
-+        }
-+      }
-+      if (match != TRUE) {
-+        /* note: we have gotten an incoming connectivity check from
-+         *       an address that is not a known remote candidate */
-+
-+        NiceCandidate *local_candidate = NULL;
-+        NiceCandidate *remote_candidate = NULL;
-+
-+        if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE ||
-+            agent->compatibility == NICE_COMPATIBILITY_MSN ||
-+            agent->compatibility == NICE_COMPATIBILITY_OC2007) {
-+          /* We need to find which local candidate was used */
-+          uint8_t unameNICE_STREAM_MAX_UNAME;
-+          guint uname_len;
-+
-+          nice_debug ("Agent %p: We have a peer-reflexive candidate in a "

_service:tar_scm:libnice-0.1.14-tests-i686.patch Deleted

@@ -1,48 +0,0 @@
-From 3f8364b41207d8c26d3d3be518a7d9ebf4243b92 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 9 Feb 2018 18:01:57 +0100
-Subject: PATCH tests: make them compile on i686
-
----
- tests/test-pseudotcp-fuzzy.c | 4 ++--
- tests/test-pseudotcp.c       | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/test-pseudotcp-fuzzy.c b/tests/test-pseudotcp-fuzzy.c
-index 4a714e6..030c03f 100644
---- a/tests/test-pseudotcp-fuzzy.c
-+++ b/tests/test-pseudotcp-fuzzy.c
-@@ -129,7 +129,7 @@ write_to_sock (PseudoTcpSocket *sock)
-       total += wlen;
-       total_read += wlen;
-       if (wlen < (gint) len) {
--        g_debug ("seeking  %ld from %lu", wlen - len, ftell (in));
-+        g_debug ("seeking  %ld from %lu", (long) wlen - len, ftell (in));
-         fseek (in, wlen - len, SEEK_CUR);
-         g_assert (!feof (in));
-         g_debug ("Socket queue full after %d bytes written", total);
-@@ -355,7 +355,7 @@ static void adjust_clock (PseudoTcpSocket *sock)
- 
-   if (pseudo_tcp_socket_get_next_clock (sock, &timeout)) {
-     timeout -= g_get_monotonic_time () / 1000;
--    g_debug ("Socket %p: Adjusting clock to %ld ms", sock, timeout);
-+    g_debug ("Socket %p: Adjusting clock to %ld ms", sock, (long) timeout);
-     if (sock == left) {
-       if (left_clock != 0)
-          g_source_remove (left_clock);
-diff --git a/tests/test-pseudotcp.c b/tests/test-pseudotcp.c
-index 1a8391a..584a0d0 100644
---- a/tests/test-pseudotcp.c
-+++ b/tests/test-pseudotcp.c
-@@ -81,7 +81,7 @@ static void write_to_sock (PseudoTcpSocket *sock)
-       total += wlen;
-       total_read += wlen;
-       if (wlen < (gint) len) {
--        g_debug ("seeking  %ld from %lu", wlen - len, ftell (in));
-+        g_debug ("seeking  %ld from %lu", (long) wlen - len, ftell (in));
-         fseek (in, wlen - len, SEEK_CUR);
-         g_assert (!feof (in));
-         g_debug ("Socket queue full after %d bytes written", total);
--- 
-2.13.6
-

_service:tar_scm:libnice-0.1.14-tests-koji.patch Deleted

@@ -1,36 +0,0 @@
-From 527c30ba453753e75d3d31be29a277ea6adc17c0 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 9 Feb 2018 19:10:20 +0100
-Subject: PATCH tests: make the test-suite more verbose
-
-... and skip test-gstreamer if user's home is not /builddir (a heuristic
-to detect mock) because multicast traffic is blocked on Koji buildhosts.
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 16988ad..b7b74fa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -12,7 +12,7 @@ AC_CANONICAL_TARGET
- 
- AC_CONFIG_SRCDIR(agent/agent.c)
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE(1.12 -Wall -Wno-portability subdir-objects)
-+AM_INIT_AUTOMAKE(1.12 -Wall -Wno-portability subdir-objects serial-tests)
- 
- AC_CONFIG_FILES(
- 	Makefile
-@@ -263,7 +263,7 @@ AC_SUBST(gstplugindir)
- AC_SUBST(gstplugin010dir)
- 
- AM_CONDITIONAL(WITH_GSTREAMER, test "$with_gstreamer" = yes)
--AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
-+AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes -a "$HOME" != /builddir)
- AM_CONDITIONAL(WITH_GSTREAMER010, test "$with_gstreamer010" = yes)
- 
- GUPNP_IGD_REQUIRED=0.2.4
--- 
-2.13.6
-

_service:tar_scm:libnice-0.1.14-turn-verify.patch Deleted

@@ -1,32 +0,0 @@
-From e4d92bf96d0bb64df35790e5b49c58bfa6e9fbcc Mon Sep 17 00:00:00 2001
-From: Jakub Adam <jakub.adam@ktknet.cz>
-Date: Thu, 20 Apr 2017 06:47:00 +0200
-Subject: PATCH component: accept TURN in
- nice_component_verify_remote_candidate()
-
-When TURN is in operation, agent_recv_message_unlocked() may receive from
-NiceSocket with type = NICE_SOCKET_TYPE_UDP_TURN. Such messages were always
-dropped due to failed nice_component_verify_remote_candidate().
-
-Bug: https://phabricator.freedesktop.org/D1727
----
- agent/component.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/agent/component.c b/agent/component.c
-index 6eee90e..3e8a7a6 100644
---- a/agent/component.c
-+++ b/agent/component.c
-@@ -1510,7 +1510,8 @@ nice_component_verify_remote_candidate (NiceComponent *component,
-                 (cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE ||
-                     cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE ||
-                     cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_SO)) ||
--            cand->transport == NICE_CANDIDATE_TRANSPORT_UDP) &&
-+            cand->transport == NICE_CANDIDATE_TRANSPORT_UDP ||
-+            nicesock->type == NICE_SOCKET_TYPE_UDP_TURN) &&
-         nice_address_equal (address, &cand->addr)) {
-       /* fast return if it's already the first */
-       if (item == component->valid_candidates)
--- 
-2.14.3
-

_service Changed

_service:tar_scm:libnice-0.1.14.tar.gz -> _service:tar_scm:libnice-0.1.19.tar.gz Changed