diff --git a/.gitignore b/.gitignore index c2de3a8..c764ab7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libuser-0.56.16.tar.xz /libuser-0.57.1.tar.xz /libuser-0.57.2.tar.xz /libuser-0.57.3.tar.xz +/libuser-0.57.4.tar.xz diff --git a/libuser-0.57.3-wait_for_slapd.patch b/libuser-0.57.3-wait_for_slapd.patch deleted file mode 100644 index f17d062..0000000 --- a/libuser-0.57.3-wait_for_slapd.patch +++ /dev/null @@ -1,101 +0,0 @@ -# HG changeset patch -# User Miloslav Trmač -# Date 1317734450 -7200 -# Node ID 748913706e6a78f934489cc24e88e20965eed742 -# Parent 4efd04928ae217db09806d4c8d47a1336f8ba782 -Use common code to wait for slapd, wait up to 30 seconds - -diff -r 4efd04928ae2 -r 748913706e6a ChangeLog ---- a/ChangeLog Tue Oct 04 12:56:32 2011 +0200 -+++ b/ChangeLog Tue Oct 04 15:20:50 2011 +0200 -@@ -1,5 +1,10 @@ - 2011-10-04 Miloslav Trmač - -+ * tests/test_utils.sh: New file. -+ * tests/default_pw_test -+ * tests/ldap_test: Use common wait_for_slapd, also increasing the -+ timeout to 30 seconds. -+ - * po/*.po (many): Mark an invalid translation as fuzzy. - - * configure.in: Release 0.57.3. -diff -r 4efd04928ae2 -r 748913706e6a tests/default_pw_test ---- a/tests/default_pw_test Tue Oct 04 12:56:32 2011 +0200 -+++ b/tests/default_pw_test Tue Oct 04 15:20:50 2011 +0200 -@@ -20,6 +20,7 @@ - # Author: Miloslav Trmač - - srcdir=$srcdir/tests -+. $srcdir/test_utils.sh - - workdir=$(pwd)/test_default_pw - -@@ -100,7 +101,7 @@ - # FIXME: path - /usr/sbin/slapd -h ldap://127.0.0.1:"$ldap_port"/ \ - -f "$workdir"/slapd.conf & -- sleep 3 # Time for slapd to initialize -+ wait_for_slapd "$workdir"/slapd.pid - slapd_pid=$(cat "$workdir"/slapd.pid) - trap 'status=$?; kill $slapd_pid; rm -rf "$workdir"; exit $status' 0 - ldapadd -h 127.0.0.1 -p "$ldap_port" -f "$srcdir/ldap_skel.ldif" -x \ -diff -r 4efd04928ae2 -r 748913706e6a tests/ldap_test ---- a/tests/ldap_test Tue Oct 04 12:56:32 2011 +0200 -+++ b/tests/ldap_test Tue Oct 04 15:20:50 2011 +0200 -@@ -20,6 +20,7 @@ - # Author: Miloslav Trmac - - srcdir=$srcdir/tests -+. $srcdir/test_utils.sh - - workdir=$(pwd)/test_ldap - -@@ -51,7 +52,7 @@ - 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 & --sleep 3 # Time for slapd to initialize -+wait_for_slapd "$workdir"/slapd.pid - slapd_pid=$(cat "$workdir"/slapd.pid) - trap 'status=$?; kill $slapd_pid; rm -rf "$workdir"; exit $status' 0 - ldapadd -h 127.0.0.1 -p "$ldap_port" -f "$srcdir/ldap_skel.ldif" -x \ -diff -r 4efd04928ae2 -r 748913706e6a tests/test_utils.sh ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/tests/test_utils.sh Tue Oct 04 15:20:50 2011 +0200 -@@ -0,0 +1,36 @@ -+#! /bin/sh -+# Shared utilities for test suites -+# -+# Copyright (c) 2004, 2010 Red Hat, Inc. All rights reserved. -+# -+# This is free software; you can redistribute it and/or modify it under -+# the terms of the GNU Library General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+# -+# Author: Miloslav Trmač -+ -+# Wait for slapd to start and write its pid into $1 -+wait_for_slapd() { -+ counter=0 -+ while [ "$counter" -lt 30 ]; do -+ printf "\rWaiting for slapd: $counter..." -+ counter=$(expr "$counter" + 1) -+ if [ -s "$1" ]; then -+ echo -+ return -+ fi -+ sleep 1 -+ done -+ echo -+ echo "Timeout waiting for slapd" >&2 -+} diff --git a/libuser.spec b/libuser.spec index a3a1fa9..601d1df 100644 --- a/libuser.spec +++ b/libuser.spec @@ -1,14 +1,12 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: libuser -Version: 0.57.3 -Release: 3%{?dist} +Version: 0.57.4 +Release: 1%{?dist} Group: System Environment/Base License: LGPLv2+ URL: https://fedorahosted.org/libuser/ Source: https://fedorahosted.org/releases/l/i/libuser/libuser-%{version}.tar.xz -# Upstream changeset 748913706e6a78f934489cc24e88e20965eed742 -Patch1: libuser-0.57.3-wait_for_slapd.patch BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt-devel, python2-devel BuildRequires: cyrus-sasl-devel, libselinux-devel, openldap-devel # To make sure the configure script can find it @@ -47,7 +45,6 @@ administering user and group accounts. %prep %setup -q -%patch1 -p1 -b .wait_for_slapd %build %configure --with-selinux --with-ldap --with-html-dir=%{_datadir}/gtk-doc/html @@ -105,6 +102,10 @@ python -c "import libuser" %{_datadir}/gtk-doc/html/* %changelog +* Fri Feb 10 2012 Miloslav Trmač - 0.57.4-1 +- Update to libuser-0.57.4 + Resolves: #788521 + * Fri Jan 13 2012 Fedora Release Engineering - 0.57.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 95567ec..3148a31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -60f94ca286923cfc0d52932388f87c8e libuser-0.57.3.tar.xz +6ff4325ee7dc0b6593f1d54e8a985315 libuser-0.57.4.tar.xz