Hello community, here is the log from the commit of package libapr1 checked in at Fri May 4 00:17:55 CEST 2007. -------- --- libapr1/libapr1.changes 2006-12-11 15:55:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/libapr1/libapr1.changes 2007-05-02 14:05:50.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 2 14:05:42 CEST 2007 - dmueller@suse.de + +- Fix comparison with string literal + +------------------------------------------------------------------- New: ---- string-compare.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libapr1.spec ++++++ --- /var/tmp/diff_new_pack.qN6623/_old 2007-05-04 00:17:27.000000000 +0200 +++ /var/tmp/diff_new_pack.qN6623/_new 2007-05-04 00:17:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libapr1 (Version 1.2.8) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -15,14 +15,15 @@ BuildRequires: doxygen %endif URL: http://apr.apache.org/ -License: Other uncritical OpenSource License, Other License(s), see package +License: Other uncritical OpenSource License, The Apache Software License Group: Development/Libraries/Other Autoreqprov: on Version: 1.2.8 -Release: 1 +Release: 16 Summary: Apache Portable Runtime (APR) Library Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Patch: apr-1.2.7.diff +Patch1: string-compare.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define aprver 1 %define installbuilddir %{_libdir}/apr-%{aprver}/build @@ -75,6 +76,7 @@ %prep %setup -n apr-%{version} %patch +%patch1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -fPIC" @@ -141,7 +143,9 @@ %{_libdir}/pkgconfig/apr-%{aprver}.pc %{_libdir}/apr-%{aprver} -%changelog -n libapr1 +%changelog +* Wed May 02 2007 - dmueller@suse.de +- Fix comparison with string literal * Mon Dec 11 2006 - poeml@suse.de - update to 1.2.8 *) Correctly retrieve 'empty' environment values with apr_env_get ++++++ string-compare.diff ++++++ --- strings/apr_snprintf.c +++ strings/apr_snprintf.c @@ -1258,7 +1258,7 @@ APR_DECLARE(int) apr_vformatter(int (*fl break; } - if (prefix_char != NUL && s != S_NULL && s != char_buf) { + if (prefix_char != NUL && strcmp(s, S_NULL) && s != char_buf) { *--s = prefix_char; s_len++; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org