Hello community, here is the log from the commit of package libserf for openSUSE:Factory checked in at 2013-07-25 14:29:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libserf (Old) and /work/SRC/openSUSE:Factory/.libserf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libserf" Changes: -------- --- /work/SRC/openSUSE:Factory/libserf/libserf.changes 2013-06-05 11:54:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libserf.new/libserf.changes 2013-07-25 14:29:11.000000000 +0200 @@ -1,0 +2,28 @@ +Wed Jul 24 22:58:56 UTC 2013 - [email protected] + +- update Serf 1.3.0 +- improvements: + * Improved Basic and Digest authentication: + + remember credentials on a per-server basis + + properly manage authentication realms + + continue functioning when a server sets KeepAlive: off + * Improved 2617 compliance: always use strongest authentication + * SSL connection performance improvements +- fixed issues: + * use PATH rather than URI within an ssltunnel + * improved error reporting from the underlying socket + * Fixed bugs with proxy authentication and SSL tunneling through a proxy + * Fixed bugs the response parser +- build system changes + * Switch to the SCons build system + * retire serfmake, serf.mak, autotools +- Huge expansion of the test suite +- packaging changes: + * use scons + * drop libserf-1.2.1-configure.in-add-gssapi.patch targeting old + build scripts + * add libserf-1.3.x-libdir.patch to fix hardcoded libdir + * add libserf-1.3.x-soname.patch to add soname + * add libserf-1.3.x-gssapi-libs.patch for libs in pkgconfig file + +------------------------------------------------------------------- Old: ---- libserf-1.2.1-configure.in-add-gssapi.patch serf-1.2.1.tar.bz2 New: ---- libserf-1.3.x-gssapi-libs.patch libserf-1.3.x-libdir.patch libserf-1.3.x-soname.patch serf-1.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libserf.spec ++++++ --- /var/tmp/diff_new_pack.nZ1Uv9/_old 2013-07-25 14:29:12.000000000 +0200 +++ /var/tmp/diff_new_pack.nZ1Uv9/_new 2013-07-25 14:29:12.000000000 +0200 @@ -23,22 +23,19 @@ Name: libserf %define soname 0 %define major 1 -Version: 1.2.1 +Version: 1.3.0 Release: 0 Summary: High-Performance Asynchronous HTTP Client Library License: Apache-2.0 Group: System/Libraries Source: https://serf.googlecode.com/files/serf-%{version}.tar.bz2 -Patch0: libserf-1.2.1-configure.in-add-gssapi.patch Url: https://serf.googlecode.com BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: libserf-1.3.x-libdir.patch +Patch1: libserf-1.3.x-soname.patch +Patch2: libserf-1.3.x-gssapi-libs.patch BuildRequires: gcc BuildRequires: glibc-devel -%if %{with gssapi} -BuildRequires: autoconf -BuildRequires: autoconf >= 2.50 -BuildRequires: krb5-devel -%endif BuildRequires: libapr-util1-devel >= %{minimum_apr_version} BuildRequires: libapr1-devel >= %{minimum_apr_version} BuildRequires: libexpat-devel @@ -47,7 +44,11 @@ BuildRequires: make BuildRequires: openldap2-devel BuildRequires: pkgconfig +BuildRequires: scons >= 2.0 BuildRequires: zlib-devel +%if %{with gssapi} +BuildRequires: krb5-devel +%endif %description The serf library is a C-based HTTP client library built upon the Apache @@ -114,32 +115,38 @@ %prep %setup -q -n "serf-%{version}" -%if %{with gssapi} %patch0 -p1 -%endif +%patch1 -p1 +%patch2 -p1 %build +# scons expects coma separated flags +SCONS_OPTFLAGS=`echo %{optflags} | sed "s/ /,/g"` +scons \ + PREFIX=%{_prefix} \ + LIBDIR=%{_libdir} \ + APR=%{_prefix} \ + OPENSSL=%{_prefix} \ + ZLIB=%{_prefix} \ %if %{with gssapi} -# required for libserf-1.2.1-configure.in-add-gssapi.patch -autoreconf -v -%endif - -# krb5-devel has /usr/lib/mit/bin/krb5-config even on 64 bit machines -%configure \ -%if %{with gssapi} - --with-gssapi=/usr/lib/mit \ + GSSAPI=/usr/lib/mit \ %endif - --includedir=%{_includedir}/serf-%{major} \ - -make %{?_smp_mflags} + DEBUG=yes \ + CFLAGS="$SCONS_OPTFLAGS" \ + APR_STATIC=no \ + %{?_smp_mflags} %install -%makeinstall +scons install --install-sandbox=%{buildroot} +pushd %{buildroot}%{_libdir}/ +%__mv libserf-%{major}.so libserf-%{major}.so.%{soname}.0.0 +ln -s libserf-%{major}.so.%{soname}.0.0 libserf-%{major}.so.%{soname} +ln -s libserf-%{major}.so.%{soname}.0.0 libserf-%{major}.so +popd %__rm -f "%{buildroot}%{_libdir}"/lib*.a -%__rm "%{buildroot}%{_libdir}"/lib*.la %check -%__make check +scons CFLAGS="" check %post -n libserf-1-0 -p /sbin/ldconfig ++++++ libserf-1.3.x-gssapi-libs.patch ++++++ From: Andreas Stieger <[email protected]> Date: 2013-07-24 23:58:00 +0100 Subject: [PATCH] add gssapi libs to pkgconfig file, resolve TODO References: https://code.google.com/p/serf/issues/detail?id=113 Upstream: submitted Makes pkgconfig file contain libraries for gssapi --- SConstruct | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: serf-1.3.0/SConstruct =================================================================== --- serf-1.3.0.orig/SConstruct 2013-07-24 23:40:43.000000000 +0100 +++ serf-1.3.0/SConstruct 2013-07-24 23:48:19.000000000 +0100 @@ -345,6 +345,7 @@ else: if gssapi and CALLOUT_OKAY: env.ParseConfig('$GSSAPI --libs gssapi') env.Append(CPPDEFINES='SERF_HAVE_GSSAPI') + gssapi_libs = os.popen(env.subst('$GSSAPI --libs gssapi')).read().strip() if sys.platform == 'win32': env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) @@ -356,7 +357,6 @@ if sys.platform == 'sunos5': env.Append(RPATH=d) # Set up the construction of serf-*.pc -# TODO: add gssapi libs pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,), env.File('build/serf.pc.in'), SUBST_DICT = { @@ -364,7 +364,7 @@ pkgconfig = env.Textfile('serf-%d.pc' % '@PREFIX@': '$PREFIX', '@INCLUDE_SUBDIR@': 'serf-%d' % (MAJOR,), '@VERSION@': '%d.%d.%d' % (MAJOR, MINOR, PATCH), - '@LIBS@': '%s %s -lz' % (apu_libs, apr_libs), + '@LIBS@': '%s %s %s -lz' % (gssapi_libs, apu_libs, apr_libs), }) env.Default(lib_static, lib_shared, pkgconfig) ++++++ libserf-1.3.x-libdir.patch ++++++ From: Andreas Stieger <[email protected]> Date: 2013-07-24 22:23:00 +0100 Subject: [PATCH] fix hardcoded library path References: https://code.google.com/p/serf/issues/detail?id=111 Upstream: submitted Fix hardcoded platform-dependent libdir. Adds LIBDIR option to scons call, fixes build on x86_64. --- SConstruct | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) Index: serf-1.3.0/SConstruct =================================================================== --- serf-1.3.0.orig/SConstruct 2013-07-21 16:04:50.000000000 +0100 +++ serf-1.3.0/SConstruct 2013-07-24 22:15:50.000000000 +0100 @@ -47,10 +47,12 @@ def RawListVariable(key, help, default): # default directories if sys.platform == 'win32': + default_incdir='..' default_libdir='..' default_prefix='Debug' else: - default_libdir='/usr' + default_incdir='/usr' + default_libdir='/usr/local/lib' default_prefix='/usr/local' opts = Variables(files=[SAVED_CONFIG]) @@ -59,21 +61,25 @@ opts.AddVariables( 'Directory to install under', default_prefix, PathVariable.PathIsDir), + PathVariable('LIBDIR', + 'Directory to install architecure dependent libraries under', + default_libdir, + PathVariable.PathIsDir), PathVariable('APR', "Path to apr-1-config, or to APR's install area", - default_libdir, + default_incdir, PathVariable.PathAccept), PathVariable('APU', "Path to apu-1-config, or to APR's install area", - default_libdir, + default_incdir, PathVariable.PathAccept), PathVariable('OPENSSL', "Path to OpenSSL's install area", - default_libdir, + default_incdir, PathVariable.PathIsDir), PathVariable('ZLIB', "Path to zlib's install area", - default_libdir, + default_incdir, PathVariable.PathIsDir), PathVariable('GSSAPI', "Path to GSSAPI's install area", @@ -181,7 +187,7 @@ opts.Save(SAVED_CONFIG, env) # PLATFORM-SPECIFIC BUILD TWEAKS thisdir = os.getcwd() -libdir = '$PREFIX/lib' +libdir = '$LIBDIR' incdir = '$PREFIX/include/serf-$MAJOR' LIBNAME = 'libserf-${MAJOR}' ++++++ libserf-1.3.x-soname.patch ++++++ From: Andreas Stieger <[email protected]> Date: 2013-07-24 22:23:00 +0100 Subject: [PATCH] add soname References: https://code.google.com/p/serf/issues/detail?id=112 Upstream: submitted add an soname to the linker options fixes warning: libserf-1-0.i586: W: no-soname /usr/lib/libserf-1.so.0.0.0 --- SConstruct | 3 +++ 1 file changed, 3 insertions(+) Index: serf-1.3.0/SConstruct =================================================================== --- serf-1.3.0.orig/SConstruct 2013-07-24 22:43:28.000000000 +0100 +++ serf-1.3.0/SConstruct 2013-07-24 22:59:36.000000000 +0100 @@ -191,6 +191,7 @@ libdir = '$LIBDIR' incdir = '$PREFIX/include/serf-$MAJOR' LIBNAME = 'libserf-${MAJOR}' +SONAME='libserf-${MAJOR}.so.0' if sys.platform != 'win32': LIBNAMESTATIC = LIBNAME else: @@ -199,6 +200,8 @@ else: env.Append(RPATH=libdir, PDB='${TARGET.filebase}.pdb') +env.Append(LINKFLAGS='-Wl,-soname,%s' % SONAME ) + if sys.platform == 'darwin': # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)) ++++++ serf-1.2.1.tar.bz2 -> serf-1.3.0.tar.bz2 ++++++ ++++ 24826 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
