Hello community, here is the log from the commit of package libsrtp for openSUSE:Factory checked in at 2015-03-18 13:02:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-02-12 10:21:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libsrtp.new/libsrtp.changes 2015-03-18 13:02:32.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Mar 15 16:35:32 UTC 2015 - [email protected] + +- Update to 1.5.2. +- Remove srtp-soname.diff as upstream now defines ABI in filenames + correctly. +- Spec cleanup. + +------------------------------------------------------------------- @@ -86 +93,0 @@ - Old: ---- srtp-soname.diff v1.5.0.tar.gz New: ---- libsrtp-1.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsrtp.spec ++++++ --- /var/tmp/diff_new_pack.wXsRfl/_old 2015-03-18 13:02:33.000000000 +0100 +++ /var/tmp/diff_new_pack.wXsRfl/_new 2015-03-18 13:02:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libsrtp # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,19 @@ # +%define soname 1 Name: libsrtp -%define library_name libsrtp-1_5_0 -Version: 1.5.0 +Version: 1.5.2 Release: 0 Summary: Secure Real-Time Transport Protocol (SRTP) library License: BSD-3-Clause Group: Development/Libraries/C and C++ -Url: http://srtp.sourceforge.net/srtp.html - +Url: https://github.com/cisco/libsrtp #Git-Clone: git://github.com/cisco/libsrtp -Source: https://github.com/cisco/libsrtp/archive/v%version.tar.gz -Patch1: srtp-soname.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: https://github.com/cisco/libsrtp/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildRequires: gcc BuildRequires: pkg-config +BuildRequires: pkgconfig(openssl) Provides: srtp = %{version}-%{release} Obsoletes: srtp < %{version} @@ -38,24 +37,24 @@ Real-time Transport Protocol (SRTP) originally authored by Cisco Systems, Inc. -%package -n %{library_name} +%package -n %{name}%{soname} Summary: Secure Real-Time Transport Protocol (SRTP) library Group: System/Libraries -%description -n %{library_name} +%description -n %{name}%{soname} The libSRTP library is an open source implementation of the Secure Real-time Transport Protocol (SRTP) originally authored by Cisco Systems, Inc. -SRTP is a security profile for RTP that adds confidentiality, message -authentication, and replay protection to that protocol. It is specified -in RFC 3711. More information about the SRTP protocol itself can be -found on the Secure RTP page. +SRTP is a security profile for RTP that adds confidentiality, +message authentication, and replay protection to that protocol. It +is specified in RFC 3711. More information about the SRTP protocol +itself can be found on the Secure RTP page. %package devel Summary: Secure Real-Time Transport Protocol (SRTP) library Group: Development/Libraries/C and C++ -Requires: %{library_name} = %{version} +Requires: %{name}%{soname} = %{version} Provides: srtp-devel = %{version}-%{release} Obsoletes: srtp-devel < %{version} @@ -64,69 +63,64 @@ Real-time Transport Protocol (SRTP) originally authored by Cisco Systems, Inc. -SRTP is a security profile for RTP that adds confidentiality, message -authentication, and replay protection to that protocol. It is specified -in RFC 3711. More information about the SRTP protocol itself can be -found on the Secure RTP page. +SRTP is a security profile for RTP that adds confidentiality, +message authentication, and replay protection to that protocol. It +is specified in RFC 3711. More information about the SRTP protocol +itself can be found on the Secure RTP page. %prep %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 +sed -i 's/\r/\n/g' doc/draft-irtf-cfrg-icm-00.txt %build -export CFLAGS="%optflags -fPIC" %configure \ --enable-generic-aesicm \ --enable-syslog \ - --disable-static + --enable-openssl # --enable-gdoi # FIXME: Does not work: # --enable-kernel-linux -make %{?_smp_mflags} SONAME="libsrtp-%version.so" + +# Build both shared and static libraries. +make shared_library %{?_smp_mflags} %install -%make_install SONAME="libsrtp-%version.so" -rm -f "%buildroot/%_libdir"/*.a +%make_install -# 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" +# Make libsrtp.so a symlink. +ln -sf %{name}.so.%{soname} %{buildroot}%{_libdir}/%{name}.so # 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) echo "Rewriting #include \"{foo}.h\" to #include <srtp/{foo}.h>..." -sed -i 's:\( *# *include *\)"\([^"]*\.h\)":\1 <srtp/\2>:' %{buildroot}%{_includedir}/srtp/*.h +sed -i 's|\( *# *include *\)"\([^"]*\.h\)"|\1 <srtp/\2>|' %{buildroot}%{_includedir}/srtp/*.h + # Rewrite FOO_H just to make things consistent and prevent name clashes. echo "Rewriting header include check tags from {FOO_H} to SRTP_{FOO_H}..." -sed -i 's:\(# *\(ifdef\|ifndef\|define\|endif */\*\) *\)\([A-Z0-9_]*_H\)\($\| *\*/\):\1SRTP_\3\4:' %{buildroot}%{_includedir}/srtp/*.h -sed -i 's:\(# *\(ifdef\|ifndef\|define\|endif */\*\) *\)\(CRYPTO_KERNEL\|RAND_SOURCE\)\($\| *\*/\):\1SRTP_\3_H\4:' %{buildroot}%{_includedir}/srtp/*.h -sed -i 's:__DATATYPES_H:_DATATYPES_H:' %{buildroot}%{_includedir}/srtp/*.h +sed -i 's|\(# *\(ifdef\|ifndef\|define\|endif */\*\) *\)\([A-Z0-9_]*_H\)\($\| *\*/\)|\1SRTP_\3\4|' %{buildroot}%{_includedir}/srtp/*.h +sed -i 's|\(# *\(ifdef\|ifndef\|define\|endif */\*\) *\)\(CRYPTO_KERNEL\|RAND_SOURCE\)\($\| *\*/\)|\1SRTP_\3_H\4|' %{buildroot}%{_includedir}/srtp/*.h + # And finally, prevent all potential clashes in autoconf based variables in config.h. -for SYMBOL in\ - $( - sed -n ' +for SYMBOL in \ + $(sed -n ' # Everything below const is a definition of the compiler and hopefully undefined. /const/,$d # Search and print autoconf generated defines. - s:\(^# *define\|/\* # *undef\) \([A-Z0-9_]*\).*$:\2:p - ' <%{buildroot}%{_includedir}/srtp/config.h - ) - do + s|\(^# *define\|/\* # *undef\) \([A-Z0-9_]*\).*$|\2|p + ' < %{buildroot}%{_includedir}/srtp/config.h + ); do 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 + sed -i 's|\([^A-Z0-9_]\)\('$SYMBOL'\)\([^A-Z0-9_]\|$\)|\1SRTP_\2\3|g' %{buildroot}%{_includedir}/srtp/*.h done -%post -n %{library_name} -p /sbin/ldconfig +%post -n %{name}%{soname} -p /sbin/ldconfig -%postun -n %{library_name} -p /sbin/ldconfig +%postun -n %{name}%{soname} -p /sbin/ldconfig -%files -n %{library_name} +%files -n %{name}%{soname} %defattr(-,root,root) -%_libdir/libsrtp-%version.so +%{_libdir}/libsrtp.so.* %files devel %defattr(-,root,root) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
