From 284205c4601d383ef4fd1eeebe2123da12c092eb9edb05102b7da6cddb716d70 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 28 Jun 2014 01:31:49 +0000 Subject: [PATCH] ccrtp-2.0.9 OBS-URL: https://build.opensuse.org/package/show/network:telephony/ccrtp?expand=0&rev=18 --- 0001-build-properly-use-autotools.patch | 122 ------------------------ ccrtp-2.0.6.tar.gz | 3 - ccrtp-2.0.6.tar.gz.sig | Bin 543 -> 0 bytes ccrtp-2.0.9.tar.gz | 3 + ccrtp-2.0.9.tar.gz.sig | Bin 0 -> 543 bytes ccrtp.changes | 8 ++ ccrtp.spec | 17 +--- libgcrypt-1.6.diff | 43 --------- 8 files changed, 13 insertions(+), 183 deletions(-) delete mode 100644 0001-build-properly-use-autotools.patch delete mode 100644 ccrtp-2.0.6.tar.gz delete mode 100644 ccrtp-2.0.6.tar.gz.sig create mode 100644 ccrtp-2.0.9.tar.gz create mode 100644 ccrtp-2.0.9.tar.gz.sig delete mode 100644 libgcrypt-1.6.diff diff --git a/0001-build-properly-use-autotools.patch b/0001-build-properly-use-autotools.patch deleted file mode 100644 index f004d2b..0000000 --- a/0001-build-properly-use-autotools.patch +++ /dev/null @@ -1,122 +0,0 @@ -From e060ed1f4ce7d54d092dee5dc02a90361e78392c Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Thu, 6 Jun 2013 00:23:09 +0200 -X-Upstream-Status: submitted, waiting for merge -Subject: [PATCH] build: properly use autotools - ---- - Makefile.am | 1 - - configure.ac | 5 +++-- - demo/Makefile.am | 18 +++++++++--------- - src/Makefile.am | 5 +++-- - 4 files changed, 15 insertions(+), 14 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index eec516b..046d815 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -9,7 +9,6 @@ - # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - --AUTOMAKE_OPTIONS = no-dependencies dist-shar dist-zip - ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = autogen.sh ccrtp.spec ccrtp.spec.in COPYING.addendum \ - ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/* \ -diff --git a/configure.ac b/configure.ac -index b5d8a10..5108a20 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,7 +9,8 @@ - # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - --AC_INIT(src/ccrtp/rtp.h) -+AC_INIT([ccrtp], [2.0.3]) -+AC_CONFIG_SRCDIR([src/ccrtp/rtp.h]) - - cfg_options="" - if test -z "$*" ; then -@@ -42,7 +43,7 @@ AC_PROG_CXXCPP - AC_PROG_CXX - # OST_PROG_CC_POSIX - AM_PROG_LIBTOOL --AM_INIT_AUTOMAKE(ccrtp,[$VERSION]) -+AM_INIT_AUTOMAKE([no-dependencies dist-shar dist-zip]) - AM_CONFIG_HEADER(ccrtp-config.h) - - AC_C_RESTRICT -diff --git a/demo/Makefile.am b/demo/Makefile.am -index 5e6e3a0..5a11837 100644 ---- a/demo/Makefile.am -+++ b/demo/Makefile.am -@@ -19,35 +19,35 @@ ccxxincludedir=$(includedir)/cc++ - if SRTP_GCRYPT - srtp_src = ccsrtptest - ccsrtptest_SOURCES = ccsrtptest.cpp --ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@ -+ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@ - endif - - if SRTP_OPENSSL - srtp_src = ccsrtptest - ccsrtptest_SOURCES = ccsrtptest.cpp --ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@ -+ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@ - endif - - noinst_PROGRAMS = rtpsend rtplisten rtphello rtpduphello audiorx audiotx \ - ccrtptest $(srtp_src) - - rtpsend_SOURCES = rtpsend.cpp --rtpsend_LDFLAGS = ../src/libccrtp.la @GNULIBS@ -+rtpsend_LDADD = ../src/libccrtp.la @GNULIBS@ - - rtplisten_SOURCES = rtplisten.cpp --rtplisten_LDFLAGS = ../src/libccrtp.la @GNULIBS@ -+rtplisten_LDADD = ../src/libccrtp.la @GNULIBS@ - - rtphello_SOURCES = rtphello.cpp --rtphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@ -+rtphello_LDADD = ../src/libccrtp.la @GNULIBS@ - - rtpduphello_SOURCES = rtpduphello.cpp --rtpduphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@ -+rtpduphello_LDADD = ../src/libccrtp.la @GNULIBS@ - - audiorx_SOURCES = audiorx.cpp audio.h --audiorx_LDFLAGS = ../src/libccrtp.la @GNULIBS@ -+audiorx_LDADD = ../src/libccrtp.la @GNULIBS@ - - audiotx_SOURCES = audiotx.cpp --audiotx_LDFLAGS = ../src/libccrtp.la @GNULIBS@ -+audiotx_LDADD = ../src/libccrtp.la @GNULIBS@ - - ccrtptest_SOURCES = ccrtptest.cpp --ccrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@ -+ccrtptest_LDADD = ../src/libccrtp.la @GNULIBS@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 58cf4c1..1683a2d 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -16,7 +16,7 @@ AM_CXXFLAGS= @WARN_FLAGS@ -I$(top_srcdir)/src/ccrtp - AM_CPPFLAGS= @WARN_FLAGS@ -I$(top_srcdir)/src/ccrtp - - # RELEASE = $(LT_VERSION) -release $(LT_RELEASE) --RELEASE = --version-info $(LT_VERSION) -+RELEASE = -version-info $(LT_VERSION) - - lib_LTLIBRARIES = libccrtp.la - -@@ -43,6 +43,7 @@ libccrtp_la_SOURCES = rtppkt.cpp rtcppkt.cpp source.cpp data.cpp incqueue.cpp \ - outqueue.cpp queue.cpp control.cpp members.cpp socket.cpp duplex.cpp pool.cpp \ - CryptoContext.cpp CryptoContextCtrl.cpp $(srtp_src_g) $(srtp_src_o) $(skein_srcs) - --libccrtp_la_LDFLAGS = $(RELEASE) @GNULIBS@ -+libccrtp_la_LDFLAGS = $(RELEASE) -+libccrtp_la_LIBADD = @GNULIBS@ - - noinst_HEADERS = private.h --- -1.8.2 - diff --git a/ccrtp-2.0.6.tar.gz b/ccrtp-2.0.6.tar.gz deleted file mode 100644 index 56d1561..0000000 --- a/ccrtp-2.0.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39fe4cd98635f710800b1d3f4090cae7110cbfee97ad42c77233eac2c5e4381b -size 735455 diff --git a/ccrtp-2.0.6.tar.gz.sig b/ccrtp-2.0.6.tar.gz.sig deleted file mode 100644 index 3c6f0b429481e2555b3c22aa5e48e9f5e920c1a50f359f332f2edfa3ad686eb7..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-m5p#}g72@tV!Dx9-?hq|U-5CFHv!)4lc+Wf`Q>dW8^ zN&|<^i-?-MTEc*qV)aqV-@{b*Hv|$s7n!)RIp#_+QendX=k1@BljSnN6{}$Dg()NL zNptsJY&`Vy3;wjccLV)~EW)&?%xlOGQF%)e0NZH4WO@C_?n!hV;L_UCNI+6LW7!q_ ziUO{CwG%K&Jynk#ORJ#FnLej-U-Sjui8>sY1L5utEZ&;vdef%(FpiQ@&r_ugE05@5 zKQsgQnCV1m)A^fII|jfHiSzYScXvt;rMXpIBgdoH3|6)}XT=48&Bcu+(?)$317leJ zBhr?K|81LHfLZ4?#c9Hb*~uOVeC3lH%@@nu*Y5?+z%~s9WWC4z;Uzf88RD_);#*t^ zYk!*rY&b15W4$$1fBdwvwIX`HS5741!DZecYX6#Vg~k3OP1fKQ(H0X&y`oq8l@uC549FaX$!^kA)&I}OQn6>n0fq7@HD$Ppg@OA<$wd*ny;jm$sd0wy_TU3tOnicQ?+@K ho01DWWg-b3hYlI!m`%>T{M(@b{U;>x3ak>P3#HIs5t9G_ diff --git a/ccrtp-2.0.9.tar.gz b/ccrtp-2.0.9.tar.gz new file mode 100644 index 0000000..db1a8a6 --- /dev/null +++ b/ccrtp-2.0.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2032176f7d64db05d7bc557a045d0b24ec76f264448a30a7de9f12c5a31530df +size 751786 diff --git a/ccrtp-2.0.9.tar.gz.sig b/ccrtp-2.0.9.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..ad7e6e98935847c1da3312932f34e7bb29ae20f011b3846ec2d0eac192e6c2f6 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-q{3~2xg2@tV!Dx9-?hq}rb5C2MIv&ES#-*!~1l-^|F zMm0$J4FxExwv9H802cd0hvx35J?S;1o{tlm7+{h~X^Lc$Xf1AZ6F z*4=%<-)J#62KRPOG(F|=QiV7G40^35cZmfwvSUZaT3{3efofB2xh;ckYWqS zvQQv^Gn(FyRcH(`NtILP;2Jx!XFE*g#gp?WVd@HC5v$T^FFDJlj|=CV`LXC?r7pI7 zF=_k5!pR|*aFszm_b`B}Qd=@PLwR5Ug|TK(g_l22udnZSAOyfpU7b#Uqg8eZM*Pgo zRFLJwR9Nbs(n8185FiD|iHNvg>iBlyrXO;HWeZuNF)^Y+luUoiH4T0cWftHSe$xFq zOTUj)`@xmj>04<8w@28m9r3&GEMnxe|77wI~T@Sy!Kxb9^zcDHW z^mpd!Ed{ZrgW04!5R8`upAcR0P37_lGjpK7wR-%|mou9PO@CcZBU3;}hdNEg8;KhP h1Q>ckLq#YSa~|&XpFj@`Ao*|EWL^_6UK4k;iZrs{`-A`h literal 0 HcmV?d00001 diff --git a/ccrtp.changes b/ccrtp.changes index 58f0c91..ee50331 100644 --- a/ccrtp.changes +++ b/ccrtp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Jun 28 01:25:42 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 2.0.9 +* Fix for initial RTCP sequence number +- Remove 0001-build-properly-use-autotools.patch (merged upstream), + libgcrypt-1.6.diff (merged upstream) + ------------------------------------------------------------------- Mon Jan 6 12:45:33 UTC 2014 - dmueller@suse.com diff --git a/ccrtp.spec b/ccrtp.spec index 00f1857..6093b0c 100644 --- a/ccrtp.spec +++ b/ccrtp.spec @@ -18,7 +18,7 @@ Name: ccrtp %define lname libccrtp2 -Version: 2.0.6 +Version: 2.0.9 Release: 0 Summary: A Common C++ Class Framework for RTP Packets License: SUSE-GPL-2.0+-with-openssl-exception @@ -30,23 +30,15 @@ Url: http://gnu.org/software/ccrtp/ Source: ftp://ftp.gnu.org/pub/gnu/ccrtp/%name-%version.tar.gz Source2: ftp://ftp.gnu.org/pub/gnu/ccrtp/%name-%version.tar.gz.sig Source3: %name.keyring -Patch1: 0001-build-properly-use-autotools.patch -Patch2: libgcrypt-1.6.diff -BuildRequires: autoconf -BuildRequires: automake BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: libgcrypt-devel BuildRequires: libstdc++-devel -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: ucommon-devel >= 5.0.0 %if 0%{?suse_version} BuildRequires: fdupes %endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -90,16 +82,11 @@ Generated class documentation for the ccrtp library from header files, html browsable. %prep -%{?gpg_verify: %gpg_verify %{S:2}} %setup -q -%patch -P 1 -p1 -%patch2 %build -# Got patches to .am -autoreconf -fi; %configure --disable-static -make %{?_smp_mflags} V=1; +make %{?_smp_mflags} %install make install DESTDIR="%buildroot"; diff --git a/libgcrypt-1.6.diff b/libgcrypt-1.6.diff deleted file mode 100644 index 2d06c8b..0000000 --- a/libgcrypt-1.6.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp -+++ src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp -@@ -22,6 +22,7 @@ - #include - #include - -+#if GCRYPT_VERSION_NUMBER < 0x010600 - /* - * The following macro was copied from gcrypt.h and modified to explicitly - * cast the pointer types to keep the compiler happy. -@@ -60,8 +61,6 @@ - * - */ - --static int initialized = 0; -- - #ifdef __cplusplus - extern "C" { - #endif -@@ -70,13 +69,23 @@ - } - #endif - -+#else -+GCRY_THREAD_OPTION_PTHREAD_IMPL; -+#endif -+ -+ -+static int initialized = 0; -+ -+ - int initializeGcrypt () - { - - if (initialized) { - return 1; - } -+#if GCRYPT_VERSION_NUMBER < 0x010600 - gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); -+#endif - gcry_check_version(NULL); - gcry_control(GCRYCTL_DISABLE_SECMEM); - initialized = 1;