diff --git a/libnss_usrfiles-2.25.tar.bz2 b/libnss_usrfiles-2.25.tar.bz2 deleted file mode 100644 index f330d7d..0000000 --- a/libnss_usrfiles-2.25.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76ee1fffc0ad468633c534ae640b77dae78ccdfc03800d3f888fb7424ae339b4 -size 255309 diff --git a/libnss_usrfiles-2.27.tar.xz b/libnss_usrfiles-2.27.tar.xz new file mode 100644 index 0000000..b45ccf9 --- /dev/null +++ b/libnss_usrfiles-2.27.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:110d88274e283c9949d65a52a20c9751e78317ec393f3b889f6ee19c2f90268b +size 246492 diff --git a/libnss_usrfiles.changes b/libnss_usrfiles.changes index 4692da0..3d8cf20 100644 --- a/libnss_usrfiles.changes +++ b/libnss_usrfiles.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Feb 2 09:48:41 UTC 2019 - kukuk@suse.de + +- Update to version 2.27 + - Sync with glibc 2.27 source code + - Add support for alias, ethers, protocols, services and rpc +- Add usrfiles to /etc/nsswitch.conf only on first installation, + remove it during de-installation. + ------------------------------------------------------------------- Mon Mar 19 12:01:45 CET 2018 - kukuk@suse.de diff --git a/libnss_usrfiles.spec b/libnss_usrfiles.spec index 653c5c1..4c566c7 100644 --- a/libnss_usrfiles.spec +++ b/libnss_usrfiles.spec @@ -1,7 +1,7 @@ # # spec file for package libnss_usrfiles # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,26 +12,24 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# We need some private NSS functions -%define __filter_GLIBC_PRIVATE 1 Name: libnss_usrfiles -Version: 2.25 +Version: 2.27 Release: 0 Summary: NSS usrfiles plugin for glibc License: LGPL-2.1-only Group: System/Base -URL: http://github.com/thkukuk/libnss_usrfiles -Source: %{name}-%{version}.tar.bz2 +URL: http://github.com/kubic-project/libnss_usrfiles +Source: %{name}-%{version}.tar.xz Source1: baselibs.conf BuildRequires: autoconf BuildRequires: libtool %description -The NSS usrfiles plugin additionally looks in %{_prefix}%{_sysconfdir} for passwd and +The NSS usrfiles plugin additionally looks in /usr/etc for passwd and group data. %package -n libnss_usrfiles2 @@ -41,6 +39,8 @@ Group: System/Libraries Requires(post): coreutils Requires(post): glibc Requires(post): sed +Requires(postun): glibc +Requires(postun): sed %description -n libnss_usrfiles2 The NSS usrfiles plugin looks additional in %{_prefix}%{_sysconfdir} for passwd and @@ -60,10 +60,22 @@ mkdir -p %{buildroot}%{_prefix}%{_sysconfdir} %post -n libnss_usrfiles2 /sbin/ldconfig -cp -a %{_sysconfdir}/nsswitch.conf %{_sysconfdir}/nsswitch.conf.nss_usrfiles -sed -i -e 's|^passwd: compat$|passwd: files usrfiles|g' -e 's|^group: compat$|group: files usrfiles|g' %{_sysconfdir}/nsswitch.conf +if [ "$1" = 1 ] ; then + cp -a %{_sysconfdir}/nsswitch.conf %{_sysconfdir}/nsswitch.conf.nss_usrfiles + sed -i -e 's|^passwd: compat$|passwd: files usrfiles|g' -e 's|^group: compat$|group: files usrfiles|g' %{_sysconfdir}/nsswitch.conf + for service in aliases ethers protocols rpc services ; do + sed -i -e "s|\(^${service}:[[:space:]]\+files\)|\1 usrfiles|g" %{_sysconfdir}/nsswitch.conf + done +fi -%postun -n libnss_usrfiles2 -p /sbin/ldconfig +%postun -n libnss_usrfiles2 +/sbin/ldconfig +if [ "$1" = 0 ] ; then + sed -i -e 's|^passwd: files usrfiles$|passwd: compat|g' -e 's|^group: files usrfiles$|group: compat|g' %{_sysconfdir}/nsswitch.conf + for service in aliases ethers protocols rpc services ; do + sed -i -e "s|usrfiles||g" %{_sysconfdir}/nsswitch.conf + done +fi %files -n libnss_usrfiles2 %license COPYING