Hello community, here is the log from the commit of package libuser for openSUSE:Factory checked in at 2014-02-12 07:03:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libuser (Old) and /work/SRC/openSUSE:Factory/.libuser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libuser" Changes: -------- --- /work/SRC/openSUSE:Factory/libuser/libuser.changes 2014-01-23 15:48:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libuser.new/libuser.changes 2014-02-12 07:03:13.000000000 +0100 @@ -5,0 +6,3 @@ + +- Fix build for SLE11. Add g_malloc0_n.patch + @@ -21,0 +25,7 @@ + +------------------------------------------------------------------- +Sat Jun 15 16:30:11 UTC 2013 - [email protected] + +- add suse-ldap.dif: fix path to slapd in SUSE + +- update to 0.59 New: ---- g_malloc0_n.patch suse-ldap.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libuser.spec ++++++ --- /var/tmp/diff_new_pack.9IrPwP/_old 2014-02-12 07:03:14.000000000 +0100 +++ /var/tmp/diff_new_pack.9IrPwP/_new 2014-02-12 07:03:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libuser # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -11,29 +11,44 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libuser %define libname %{name}1 Version: 0.60 -Release: 1 +Release: 0 Url: https://fedorahosted.org/libuser/ +Summary: A user and group account administration library License: LGPL-2.0+ Group: System Environment/Base -Summary: A user and group account administration library Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: glib2-devel pam-devel popt-devel python-devel cyrus-sasl-devel libselinux-devel openldap2-devel sgmltool +BuildRequires: cyrus-sasl-devel +BuildRequires: glib2-devel +BuildRequires: libselinux-devel +BuildRequires: openldap2-devel +BuildRequires: pam-devel +BuildRequires: popt-devel +BuildRequires: python-devel +BuildRequires: sgmltool %if 0%{?suse_version} -BuildRequires: automake autoconf libtool -# redefine pkglibdir to honor SUSE shared lib rules +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +# redefine pkglibdir to honor SUSE shared lib rules, [email protected] Patch1: libuser-0.60.patch +# fix path to slapd for SUSE, [email protected] +Patch2: suse-ldap.dif +%if 0%{?suse_version} <= 1110 +# fix SLE11 build, [email protected] +Patch3: g_malloc0_n.patch +BuildRequires: xz +%endif %endif %description @@ -56,8 +71,8 @@ %lang_package -r %libname %package devel -Group: Development/Libraries Summary: Files needed for developing applications which use libuser +Group: Development/Libraries Requires: %{name} = %{version} Requires: glib2-devel @@ -66,8 +81,8 @@ files useful for developing applications with libuser. %package python -Group: Development/Libraries Summary: Python bindings for the libuser library +Group: Development/Libraries Requires: %{name} = %{version} %description python @@ -79,6 +94,10 @@ %setup -q %if 0%{?suse_version} %patch1 -p1 +%patch2 -p1 +%if 0%{?suse_version} <= 1110 +%patch3 -p1 +%endif %endif %build ++++++ g_malloc0_n.patch ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-libuser-0.59/lib/user.h ./lib/user.h --- ../orig-libuser-0.59/lib/user.h 2013-03-29 15:46:36.000000000 +0100 +++ ./lib/user.h 2013-09-27 09:10:40.776591577 +0200 @@ -21,6 +21,9 @@ #include <sys/types.h> #include <glib.h> +/* glib in SLE11 does not define g_malloc0_n or g_malloc_n */ +#define g_malloc0_n(blocks,bytes) g_malloc0((blocks)*(bytes)) +#define g_malloc_n(blocks,bytes) g_malloc((blocks)*(bytes)) #include "config.h" #include "entity.h" #include "error.h" ++++++ suse-ldap.dif ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-libuser-0.60/tests/default_pw_test ./tests/default_pw_test --- ../orig-libuser-0.60/tests/default_pw_test 2013-10-12 23:56:08.000000000 +0200 +++ ./tests/default_pw_test 2014-02-05 13:23:22.696034846 +0100 @@ -98,7 +98,7 @@ # This is racy, but much better than a static port [ -z "$ldap_port" ] && ldap_port=$(tests/alloc_port) # FIXME: path - /usr/sbin/slapd -h ldap://127.0.0.1:"$ldap_port"/ \ + /usr/lib/openldap/slapd -h ldap://127.0.0.1:"$ldap_port"/ \ -f "$workdir"/slapd.conf & tests/wait_for_slapd_start "$workdir"/slapd.pid "$ldap_port" slapd_pid=$(cat "$workdir"/slapd.pid) diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-libuser-0.60/tests/ldap_test ./tests/ldap_test --- ../orig-libuser-0.60/tests/ldap_test 2013-10-12 23:56:08.000000000 +0200 +++ ./tests/ldap_test 2014-02-05 13:23:22.696034846 +0100 @@ -50,7 +50,7 @@ sed "s|@WORKDIR@|$workdir|g" < "$srcdir"/slapd.conf.in > "$workdir"/slapd.conf ldap_port=$(tests/alloc_port) # This is racy, but much better than a static port # FIXME: path -/usr/sbin/slapd -h ldap://127.0.0.1:"$ldap_port"/ -f "$workdir"/slapd.conf & +/usr/lib/openldap/slapd -h ldap://127.0.0.1:"$ldap_port"/ -f "$workdir"/slapd.conf & tests/wait_for_slapd_start "$workdir"/slapd.pid "$ldap_port" slapd_pid=$(cat "$workdir"/slapd.pid) trap 'status=$?; kill $slapd_pid -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
