Hello community, here is the log from the commit of package libsrtp for openSUSE:Factory checked in at 2015-02-12 10:21:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsrtp (Old) and /work/SRC/openSUSE:Factory/.libsrtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsrtp" Changes: -------- --- /work/SRC/openSUSE:Factory/libsrtp/libsrtp.changes 2014-08-30 16:04:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsrtp.new/libsrtp.changes 2015-02-12 10:21:45.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Jan 3 18:49:15 UTC 2015 - [email protected] + +- Update to new upstream release 1.5.0 +* Add support for OpenSSL crypto +* Add support for AES-GCM crypto suites. +* Add user data API to allow user to associate additional data + with a SRTP context. +- Replace libsrtp-automake.patch by simpler srtp-soname.diff + +------------------------------------------------------------------- Old: ---- libsrtp-automake.patch libsrtp-git7db9eb2.tar.xz New: ---- srtp-soname.diff v1.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsrtp.spec ++++++ --- /var/tmp/diff_new_pack.h9RlQr/_old 2015-02-12 10:21:46.000000000 +0100 +++ /var/tmp/diff_new_pack.h9RlQr/_new 2015-02-12 10:21:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libsrtp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,8 @@ Name: libsrtp -%define library_name libsrtp2 -%define git_snapshot 7db9eb2 -Version: 1.4.5.0.20130918.%{git_snapshot} +%define library_name libsrtp-1_5_0 +Version: 1.5.0 Release: 0 Summary: Secure Real-Time Transport Protocol (SRTP) library License: BSD-3-Clause @@ -27,16 +26,10 @@ Url: http://srtp.sourceforge.net/srtp.html #Git-Clone: git://github.com/cisco/libsrtp -Source: %{name}-git%{git_snapshot}.tar.xz -# PATCH-FEATURE-OPENSUSE libsrtp-automake.patch [email protected] -- Support for automake to easily build shared library. -Patch: %{name}-automake.patch +Source: https://github.com/cisco/libsrtp/archive/v%version.tar.gz +Patch1: srtp-soname.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: dos2unix -BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: xz Provides: srtp = %{version}-%{release} Obsoletes: srtp < %{version} @@ -77,31 +70,31 @@ found on the Secure RTP page. %prep -%setup -q -n %{name} -%patch -p1 +%setup -q +%patch -P 1 -p1 tr '\r' '\n' <doc/draft-irtf-cfrg-icm-00.txt >doc/draft-irtf-cfrg-icm-00.txt.unix touch -r doc/draft-irtf-cfrg-icm-00.txt doc/draft-irtf-cfrg-icm-00.txt.unix mv doc/draft-irtf-cfrg-icm-00.txt.unix doc/draft-irtf-cfrg-icm-00.txt %build -autoreconf -fi +export CFLAGS="%optflags -fPIC" %configure \ --enable-generic-aesicm \ - --enable-syslog + --enable-syslog \ + --disable-static # --enable-gdoi # FIXME: Does not work: # --enable-kernel-linux -make %{?_smp_mflags} +make %{?_smp_mflags} SONAME="libsrtp-%version.so" %install -%makeinstall -rm %{buildroot}%{_libdir}/*.la +%make_install SONAME="libsrtp-%version.so" +rm -f "%buildroot/%_libdir"/*.a -# This file is required by some headers, but missing in the installed files. (bnc#839475) -install -m0644 crypto/include/config.h %{buildroot}%{_includedir}/srtp/ +# This file is required by some headers, but missing in the installed files +# (once upon a time - bnc#839475). Now just check that it is there. +test -f "%buildroot/%_includedir/srtp/config.h" -# We provide verbose messages here. -set +x # Including of files with generic names and quotes is unsafe and can cause include clashes. # Do it in install phase, because rewriting of the source code before building would require deeper changes. # /usr/include is included automatically, so we don't modify .pc file. (bnc#839475#c2) @@ -126,7 +119,6 @@ echo "Rewriting symbol $SYMBOL to SRTP_$SYMBOL..." sed -i 's:\([^A-Z0-9_]\)\('$SYMBOL'\)\([^A-Z0-9_]\|$\):\1SRTP_\2\3:g' %{buildroot}%{_includedir}/srtp/*.h done -set -x %post -n %{library_name} -p /sbin/ldconfig @@ -134,7 +126,7 @@ %files -n %{library_name} %defattr(-,root,root) -%{_libdir}/libsrtp.so.2* +%_libdir/libsrtp-%version.so %files devel %defattr(-,root,root) ++++++ srtp-soname.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2015-02-04 14:19:57.379625407 +0100 build: allow using unique SONAMEs The srtp build totally lacks versioning, so provide the possibility to control one from the specfile. --- Makefile.in | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) Index: libsrtp/Makefile.in =================================================================== --- libsrtp.orig/Makefile.in +++ libsrtp/Makefile.in @@ -19,7 +19,8 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ .PHONY: all test build_table_apps -all: test +SONAME = libsrtp.so +all: test ${SONAME} runtest: build_table_apps test @echo "running libsrtp test applications..." @@ -121,9 +122,10 @@ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi ar cr libsrtp.a $^ $(RANLIB) libsrtp.a -libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi) - $(CC) -shared -Wl,-soname,libsrtp.so \ - -o libsrtp.so $^ $(LDFLAGS) +${SONAME}: $(srtpobj) $(cryptobj) $(gdoi) + $(CC) -shared -Wl,-soname,${SONAME} \ + -o ${SONAME} $^ $(LDFLAGS) + if [ "${SONAME}" != libsrtp.so ]; then ln -s "${SONAME}" libsrtp.so; fi # libcryptomath.a contains general-purpose routines that are used to # generate tables and verify cryptoalgorithm implementations - this @@ -221,7 +223,12 @@ install: cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi - if [ -f libsrtp.so ]; then cp libsrtp.so $(DESTDIR)$(libdir)/; fi + if [ -f "${SONAME}" ]; then \ + cp -a "${SONAME}" ${DESTDIR}${libdir}/; \ + if [ "${SONAME}" != libsrtp.so ]; then \ + cp -a libsrtp.so $(DESTDIR)$(libdir)/; \ + fi; \ + fi if [ "$(pkgconfig_DATA)" != "" ]; then \ $(INSTALL) -d $(DESTDIR)$(pkgconfigdir); \ cp $(srcdir)/$(pkgconfig_DATA) $(DESTDIR)$(pkgconfigdir)/; \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
