Update to libuser-0.57

Resolves: #497333 #610172
This commit is contained in:
Miloslav Trmač 2011-01-10 19:01:57 +01:00
parent b5a19ade39
commit 35f9f0a28d
5 changed files with 12 additions and 55 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
libuser-0.56.16.tar.xz
/libuser-0.56.17.tar.xz
/libuser-0.56.18.tar.xz
/libuser-0.57.tar.xz

View File

@ -1,16 +0,0 @@
2010-09-01 Miloslav Trmač <mitr@redhat.com>
* libuser.conf (crypt_style): Change default to sha512.
diff -r f359c24398cc -r 276fa0a3078b libuser.conf
--- a/libuser.conf Sun Aug 29 12:08:06 2010 +0000
+++ b/libuser.conf Wed Sep 01 16:13:31 2010 +0200
@@ -17,7 +17,7 @@
# skeleton = /etc/skel
# mailspooldir = /var/mail
-crypt_style = md5
+crypt_style = sha512
modules = files shadow
create_modules = files shadow
# modules = files shadow ldap

View File

@ -1,30 +0,0 @@
Handle matchpathcon() failing with ENOENT.
2010-09-29 Miloslav Trmač <mitr@redhat.com>
* lib/util.c (lu_util_fscreate_for_path): Handle cases when a path is
not in the matchpathcon database.
diff -r cf42457692b4 -r 2744aecc92b1 lib/util.c
--- a/lib/util.c Mon Sep 27 19:27:26 2010 +0200
+++ b/lib/util.c Wed Sep 29 23:02:56 2010 +0200
@@ -756,10 +756,15 @@
security_context_t ctx;
if (matchpathcon(path, mode, &ctx) < 0) {
- lu_error_new(error, lu_error_stat,
- _("couldn't determine security context "
- "for `%s': %s"), path, strerror(errno));
- return FALSE;
+ if (errno == ENOENT)
+ ctx = NULL;
+ else {
+ lu_error_new(error, lu_error_stat,
+ _("couldn't determine security "
+ "context for `%s': %s"), path,
+ strerror(errno));
+ return FALSE;
+ }
}
if (setfscreatecon(ctx) < 0) {
lu_error_new(error, lu_error_generic,

View File

@ -1,20 +1,18 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: libuser
Version: 0.56.18
Release: 2%{?dist}
Version: 0.57
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 commit 276fa0a3078b431e18289285f84a77381b89726c
Patch0: libuser-0.56.17-crypt_style.patch
# Upstream commit 2744aecc92b1f0c78d19022bf9e8107450544e18
Patch1: libuser-0.56.18-matchpathcon.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
BuildRequires: nscd
# For %%check
BuildRequires: openldap-clients, openldap-servers
Summary: A user and group account administration library
%description
@ -47,8 +45,6 @@ administering user and group accounts.
%prep
%setup -q
%patch0 -p1 -b .crypt_style
%patch1 -p1 -b .matchpathcon
%build
%configure --with-selinux --with-ldap --with-html-dir=%{_datadir}/gtk-doc/html
@ -64,6 +60,8 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
%check
make check
# Verify that all python modules load, just in case.
LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
@ -104,6 +102,10 @@ python -c "import libuser"
%{_datadir}/gtk-doc/html/*
%changelog
* Mon Jan 10 2011 Miloslav Trmač <mitr@redhat.com> - 0.57-1
- Update to libuser-0.57
Resolves: #497333 #610172
* Wed Sep 29 2010 Miloslav Trmač <mitr@redhat.com> - 0.56.18-2
- Handle matchpathcon() failing with ENOENT
Resolves: #631717

View File

@ -1 +1 @@
de074409153f690821d9340cb33ee435 libuser-0.56.18.tar.xz
f4ff22c4ffe679df5e0e3c180c36b09d libuser-0.57.tar.xz