From 16cfb1591e87b760e012c28f58974726a934e523 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 17 Aug 2011 11:34:12 +0200
Subject: [PATCH] 2.20.0.2: upgrade to -rc2

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 .gitignore                                       |  1 +
 sources                                          |  2 +-
 ...bit.patch => util-linux-2.20-ipcs-32bit.patch | 16 +++++++++-------
 util-linux.spec                                  | 10 +++++++---
 4 files changed, 18 insertions(+), 11 deletions(-)
 rename util-linux-ng-2.15-ipcs-32bit.patch => util-linux-2.20-ipcs-32bit.patch (75%)

diff --git a/.gitignore b/.gitignore
index 13488f8..a79a8e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /util-linux-2.19.1-rc1.tar.bz2
 /util-linux-2.19.1.tar.bz2
 /util-linux-2.20-rc1.tar.bz2
+/util-linux-2.20-rc2.tar.bz2
diff --git a/sources b/sources
index 11c77ff..255d8c3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a8ae69612162422b2d4d331ba90ef86d  util-linux-2.20-rc1.tar.bz2
+e730bbbe41e4a80926e183b45a337c77  util-linux-2.20-rc2.tar.bz2
 a02aac97c74259ca1b24972c89147ca4  floppy-0.18.tar.bz2
diff --git a/util-linux-ng-2.15-ipcs-32bit.patch b/util-linux-2.20-ipcs-32bit.patch
similarity index 75%
rename from util-linux-ng-2.15-ipcs-32bit.patch
rename to util-linux-2.20-ipcs-32bit.patch
index c3860f1..ae6f060 100644
--- a/util-linux-ng-2.15-ipcs-32bit.patch
+++ b/util-linux-2.20-ipcs-32bit.patch
@@ -1,10 +1,10 @@
-diff -up util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c.kzak util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c
---- util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c.kzak	2009-03-25 13:19:08.000000000 +0100
-+++ util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c	2009-06-04 15:22:48.000000000 +0200
-@@ -243,6 +243,26 @@ print_perms (int id, struct ipc_perm *ip
- 		printf(" %-10d\n", ipcp->gid);
+diff -up util-linux-2.20-rc2/sys-utils/ipcs.c.kzak util-linux-2.20-rc2/sys-utils/ipcs.c
+--- util-linux-2.20-rc2/sys-utils/ipcs.c.kzak	2011-08-12 11:13:00.000000000 +0200
++++ util-linux-2.20-rc2/sys-utils/ipcs.c	2011-08-17 01:16:23.629928605 +0200
+@@ -255,6 +255,28 @@ print_perms (int id, struct ipc_perm *ip
  }
  
+ 
 +static unsigned long long
 +shminfo_from_proc(const char *name, unsigned long def)
 +{
@@ -25,10 +25,12 @@ diff -up util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c.kzak util-linux-ng-2.15.1-rc1
 +	fclose(f);
 +	return res;
 +}
- 
++
++
  void do_shm (char format)
  {
-@@ -266,12 +286,12 @@ void do_shm (char format)
+ 	int maxid, shmid, id;
+@@ -277,12 +299,12 @@ void do_shm (char format)
  			return;
  		/* glibc 2.1.3 and all earlier libc's have ints as fields
  		   of struct shminfo; glibc 2.1.91 has unsigned long; ach */
diff --git a/util-linux.spec b/util-linux.spec
index dc77629..918a995 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -2,12 +2,12 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.20
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: http://kernel.org/~kzak/util-linux/
 
-%define upstream_version %{version}-rc1
+%define upstream_version %{version}-rc2
 
 ### Features
 %if 0%{?rhel}
@@ -82,7 +82,7 @@ Patch5: util-linux-2.20-blkid-cachefile.patch
 # 151635 - makeing /var/log/lastlog
 Patch7: util-linux-ng-2.13-login-lastlog.patch
 # 231192 - ipcs is not printing correct values on pLinux
-Patch8: util-linux-ng-2.15-ipcs-32bit.patch
+Patch8: util-linux-2.20-ipcs-32bit.patch
 
 %description
 The util-linux package contains a large variety of low-level system
@@ -744,6 +744,10 @@ fi
 
 
 %changelog
+* Wed Aug 17 2021 Karel Zak <kzak@redhat.com> 2.20.0.2
+- upgrade to the release 2.20-rc2
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-rc2-ChangeLog
+
 * Fri Aug  2 2021 Karel Zak <kzak@redhat.com> 2.20.0.1
 - upgrade to the release 2.20-rc1
   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-ReleaseNotes