Browse Source

shadow-utils-4.10-1

Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
93d8cc89a8
1 changed files with 10 additions and 15 deletions
  1. 10 15
      s/shadow-utils/shadow-utils-vl.spec

+ 10 - 15
s/shadow-utils/shadow-utils-vl.spec

@@ -4,7 +4,7 @@ Summary: Utilities for managing accounts and shadow password files.
 Summary(ja): シャドウパスワードファイルとアカウントを管理するユーティリティ
 Name: shadow-utils
 Epoch: 2
-Version: 4.9
+Version: 4.10
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -23,8 +23,6 @@ Source4: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 Patch0: shadow-4.9-redhat.patch
 # Be more lenient with acceptable user/group names - non upstreamable
 Patch1: shadow-4.8-goodname.patch
-# Move create home to the end of main - upstreamability unknown
-Patch2: shadow-4.9-move-create-home.patch
 # SElinux related - upstreamability unknown
 Patch3: shadow-4.9-default-range.patch
 # Misc manual page changes - non-upstreamable
@@ -47,12 +45,6 @@ Patch11: shadow-4.8-long-entry.patch
 Patch12: shadow-4.6-sysugid-min-limit.patch
 # Ignore LOGIN_PLAIN_PROMPT in login.defs - upstreamability unknown
 Patch13: shadow-4.8-ignore-login-prompt.patch
-# https://github.com/shadow-maint/shadow/commit/c6847011e8b656adacd9a0d2a78418cad0de34cb
-Patch14: shadow-4.9-newuidmap-libeconf-dependency.patch
-# https://github.com/shadow-maint/shadow/commit/e481437ab9ebe9a8bf8fbaabe986d42b2f765991
-Patch15: shadow-4.9-usermod-allow-all-group-types.patch
-# https://github.com/shadow-maint/shadow/pull/399
-Patch16: shadow-4.9-useradd-avoid-generating-empty-subid-range.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gcc
@@ -117,7 +109,6 @@ Development files for shadow-utils-subid.
 %setup -q -n shadow-%{version}
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .goodname
-%patch2 -p1 -b .move-create-home
 %patch3 -p1 -b .default-range
 %patch4 -p1 -b .manfix
 %patch5 -p1 -b .date-parsing
@@ -131,9 +122,6 @@ Development files for shadow-utils-subid.
 %patch11 -p1 -b .long-entry
 %patch12 -p1 -b .sysugid-min-limit
 %patch13 -p1 -b .login-prompt
-%patch14 -p1 -b .newuidmap-libeconf-dependency
-%patch15 -p1 -b .usermod-allow-all-group-types
-%patch16 -p1 -b .useradd-avoid-generating-empty-subid-range
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -245,8 +233,8 @@ echo $(ls)
 mkdir -p $RPM_BUILD_ROOT/%{includesubiddir}
 install -m 644 libsubid/subid.h $RPM_BUILD_ROOT/%{includesubiddir}/
 
-# Remove .la files created by libsubid
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la
+# Remove .a and .la files created by libsubid
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.{a,la}
 
 
 %clean
@@ -304,7 +292,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/vigr.8*
 
 %files subid
+%{_bindir}/getsubids
 %{_libdir}/libsubid.so.*
+%{_mandir}/man1/getsubids.1*
 
 %files subid-devel
 %{includesubiddir}/subid.h
@@ -312,6 +302,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2:4.10-1
+- updated to 4.10.
+- dropped Patch2 and 14-16: fixed in upstream.
+- updated Patch7.
+
 * Fri Aug 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2:4.9-1
 - updated to 4.9.
 - updated patches.