upgrade v1.13.3

3 files changed, 6 insertions, 102 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c91bc8f1f647..f6416b4397eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
 pkgbase = sofia-sip-fs
 	pkgdesc = An open-source SIP User-Agent library (FreeSWITCH version)
-	pkgver = 1.13.2
+	pkgver = 1.13.3
 	pkgrel = 1
 	url = https://github.com/freeswitch/sofia-sip
 	arch = x86_64
 	license = LGPL
-	source = sofia-sip-1.13.2.tar.gz::https://github.com/freeswitch/sofia-sip/archive/v1.13.2.tar.gz
-	source = 0001-Compatible-with-the-new-version-of-libckeck.patch
-	sha256sums = b9eca9688ce4b28e062daf0933c3bf661fb607e7afafa71bda3e8f07eb88df44
-	sha256sums = 7e52ec8ee1340042982c2d7b5612e37b7140daea5e5b67e2bd392b2c367913de
+	source = sofia-sip-1.13.3.tar.gz::https://github.com/freeswitch/sofia-sip/archive/v1.13.3.tar.gz
+	sha256sums = 6f9cc7ed674e2214809e390728da0df646f94e5b991cff9f393217176de9d7e4
 
 pkgname = sofia-sip-fs
 	depends = glib2
diff --git a/0001-Compatible-with-the-new-version-of-libckeck.patch b/0001-Compatible-with-the-new-version-of-libckeck.patch
deleted file mode 100644
index 2e095e66d622..000000000000
--- a/0001-Compatible-with-the-new-version-of-libckeck.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From d568475eb7291bc72f585a116319b05d80b818e1 Mon Sep 17 00:00:00 2001
-From: Clarence <xjh.azzbcc@gmail.com>
-Date: Fri, 11 Dec 2020 18:23:24 +0800
-Subject: [PATCH] Compatible with the new version of libckeck.
-
----
- s2check/s2check.h |  7 ++++++-
- s2check/s2tcase.c | 20 ++++++++++++++++++--
- 2 files changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/s2check/s2check.h b/s2check/s2check.h
-index 47b9455..a3573aa 100644
---- a/s2check/s2check.h
-+++ b/s2check/s2check.h
-@@ -45,14 +45,19 @@ SOFIA_BEGIN_DECLS
- #undef tcase_add_loop_test
- 
- /* Redirect tcase_add_test() to our function */
-+#if CHECK_MINOR_VERSION >= 13
-+#define tcase_add_test(tc, ttest) s2_tcase_add_test(tc, ttest, 0, 0, 1)
-+
-+void s2_tcase_add_test(TCase *, const TTest *, int signo, int start, int end);
-+#else
- #define tcase_add_test(tc, tf) s2_tcase_add_test(tc, tf, "" #tf "", 0, 0, 1)
- 
- void s2_tcase_add_test(TCase *, TFun, char const *name,
- 		       int signo, int start, int end);
-+#endif
- 
- #define tcase_add_loop_test(tc, tf, s, e) \
-   s2_tcase_add_test(tc, tf, "" #tf "", 0, (s), (e))
--
- void s2_select_tests(char const *pattern);
- 
- SOFIA_END_DECLS
-diff --git a/s2check/s2tcase.c b/s2check/s2tcase.c
-index 382aaa3..955a731 100644
---- a/s2check/s2tcase.c
-+++ b/s2check/s2tcase.c
-@@ -46,10 +46,18 @@ static char const * const *test_patterns = default_patterns;
-  * A special version of tcase_add_test() that inserts test function into
-  * tcase only if its name matches given pattern.
-  */
--void s2_tcase_add_test(TCase *tc, TFun tf, char const *name,
--		       int signo, int start, int end)
-+void s2_tcase_add_test(TCase *tc,
-+#if CHECK_MINOR_VERSION >= 13
-+                       const TTest *ttest,
-+#else
-+                       TFun tf, char const *name,
-+#endif
-+                       int signo, int start, int end)
- {
-   char const * const *patterns;
-+#if CHECK_MINOR_VERSION >= 13
-+  const char *name = ttest->name;
-+#endif
- 
- #if HAVE_FNMATCH_H
-   for (patterns = test_patterns; *patterns; patterns++) {
-@@ -57,7 +65,11 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name,
-       if (strcmp(*patterns, "*")) {
- 	printf("%s: selected\n", name);
-       }
-+#if CHECK_MINOR_VERSION >= 13
-+      _tcase_add_test(tc, ttest, signo, 0, start, end);
-+#else
-       _tcase_add_test(tc, tf, name, signo, 0, start, end);
-+#endif
-       return;
-     }
-   }
-@@ -67,7 +79,11 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name,
-       if (strcmp(*patterns, "*")) {
- 	printf("%s: selected\n", name);
-       }
-+#if CHECK_MINOR_VERSION >= 13
-+      _tcase_add_test(tc, ttest, signo, 0, start, end);
-+#else
-       _tcase_add_test(tc, tf, name, signo, 0, start, end);
-+#endif
-       return;
-     }
-   }
--- 
-2.29.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 529615528053..2496fd428f52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,14 @@
 # Maintainer: Clarence <xjh.azzbcc@gmail.com>
 _pkgname=sofia-sip
 pkgname=(${_pkgname}-fs ${_pkgname}-docs)
-pkgver=1.13.2
+pkgver=1.13.3
 pkgrel=1
 pkgdesc="An open-source SIP User-Agent library (FreeSWITCH version)"
 arch=('x86_64')
 url="https://github.com/freeswitch/sofia-sip"
 license=('LGPL')
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/freeswitch/$_pkgname/archive/v$pkgver.tar.gz"
-        '0001-Compatible-with-the-new-version-of-libckeck.patch')
-sha256sums=('b9eca9688ce4b28e062daf0933c3bf661fb607e7afafa71bda3e8f07eb88df44'
-            '7e52ec8ee1340042982c2d7b5612e37b7140daea5e5b67e2bd392b2c367913de')
-
-prepare() {
-  cd "$_pkgname-$pkgver"
-  patch -p1 -N -b -z .orig < ../0001-Compatible-with-the-new-version-of-libckeck.patch
-}
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/freeswitch/$_pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('6f9cc7ed674e2214809e390728da0df646f94e5b991cff9f393217176de9d7e4')
 
 build() {
   cd "$_pkgname-$pkgver"