From 665890c0effa7fae724d07f58ea9cf40cabbe5736db3898fcc0fccf340e243ae Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Wed, 8 Jun 2016 19:34:48 +0000
Subject: [PATCH 1/3] Add BSC to:     * sulogin supports locked root accounts
 by --force (bsc#968733).

OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=308
---
 python-libmount.changes    | 2 +-
 util-linux-systemd.changes | 2 +-
 util-linux.changes         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python-libmount.changes b/python-libmount.changes
index e0a1faf..d0963b1 100644
--- a/python-libmount.changes
+++ b/python-libmount.changes
@@ -98,7 +98,7 @@ Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
       lslocks, sfdisk and lsipc.
     * script has been massively improved to be more robust and less
       complex (bsc#888678, bsc#930236).
-    * sulogin supports locked root accounts by --force.
+    * sulogin supports locked root accounts by --force (bsc#968733).
     * colors support by default. It is possible to change this
       with --disable-colors-default.
     * more information in cfdisk
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index e0a1faf..d0963b1 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -98,7 +98,7 @@ Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
       lslocks, sfdisk and lsipc.
     * script has been massively improved to be more robust and less
       complex (bsc#888678, bsc#930236).
-    * sulogin supports locked root accounts by --force.
+    * sulogin supports locked root accounts by --force (bsc#968733).
     * colors support by default. It is possible to change this
       with --disable-colors-default.
     * more information in cfdisk
diff --git a/util-linux.changes b/util-linux.changes
index e0a1faf..d0963b1 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -98,7 +98,7 @@ Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
       lslocks, sfdisk and lsipc.
     * script has been massively improved to be more robust and less
       complex (bsc#888678, bsc#930236).
-    * sulogin supports locked root accounts by --force.
+    * sulogin supports locked root accounts by --force (bsc#968733).
     * colors support by default. It is possible to change this
       with --disable-colors-default.
     * more information in cfdisk

From e5ca665f0a0778bec63d7d9cc2f275038c8d9e27d8ffe9878d9b96c9c58238d5 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Wed, 8 Jun 2016 19:46:51 +0000
Subject: [PATCH 2/3] For easier tracking add more SLE bug references.

OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=309
---
 python-libmount.changes    | 8 +++++---
 util-linux-systemd.changes | 8 +++++---
 util-linux.changes         | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/python-libmount.changes b/python-libmount.changes
index d0963b1..1ca162c 100644
--- a/python-libmount.changes
+++ b/python-libmount.changes
@@ -29,7 +29,7 @@ Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
 -------------------------------------------------------------------
 Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
 
-- Update to version 2.28:
+- Update to version 2.28 (bsc#974301):
   * Many changes and improvements, most notably:
     * Now cfdisk, sfdisk and fdisk wipe all filesystem and RAID
       signatures when creating a new disk label in interactive
@@ -54,7 +54,7 @@ Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
     * The commands nsenter and unshare support a new option
       --cgroup for work with cgroups namespaces (CLONE_NEWCGROUP).
     * The library libmount has been improved to properly detect
-      already mounted btrfs subvolumes.
+      already mounted btrfs subvolumes (bsc#947494, bsc#972684).
     * The library libsmartcols has been massively improved to print
       table ranges, multi-line cells, table titles and to support
       continuous printing.
@@ -64,6 +64,7 @@ Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
       openat-family functions anymore.
     * The python binding for libsmartcols is available in separate
       project at https://github.com/ignatenkobrain/python-smartcols
+    * Other bug fixes (bsc#970404, bsc#975082).
   * Security issue: CVE-2016-2779 is NOT FIXED yet.
 - Remove old util-linux-noenc-suse.patch
 
@@ -98,7 +99,8 @@ Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
       lslocks, sfdisk and lsipc.
     * script has been massively improved to be more robust and less
       complex (bsc#888678, bsc#930236).
-    * sulogin supports locked root accounts by --force (bsc#968733).
+    * sulogin supports locked root accounts by --force
+      (bsc#968733, bsc#963399).
     * colors support by default. It is possible to change this
       with --disable-colors-default.
     * more information in cfdisk
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index d0963b1..1ca162c 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -29,7 +29,7 @@ Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
 -------------------------------------------------------------------
 Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
 
-- Update to version 2.28:
+- Update to version 2.28 (bsc#974301):
   * Many changes and improvements, most notably:
     * Now cfdisk, sfdisk and fdisk wipe all filesystem and RAID
       signatures when creating a new disk label in interactive
@@ -54,7 +54,7 @@ Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
     * The commands nsenter and unshare support a new option
       --cgroup for work with cgroups namespaces (CLONE_NEWCGROUP).
     * The library libmount has been improved to properly detect
-      already mounted btrfs subvolumes.
+      already mounted btrfs subvolumes (bsc#947494, bsc#972684).
     * The library libsmartcols has been massively improved to print
       table ranges, multi-line cells, table titles and to support
       continuous printing.
@@ -64,6 +64,7 @@ Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
       openat-family functions anymore.
     * The python binding for libsmartcols is available in separate
       project at https://github.com/ignatenkobrain/python-smartcols
+    * Other bug fixes (bsc#970404, bsc#975082).
   * Security issue: CVE-2016-2779 is NOT FIXED yet.
 - Remove old util-linux-noenc-suse.patch
 
@@ -98,7 +99,8 @@ Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
       lslocks, sfdisk and lsipc.
     * script has been massively improved to be more robust and less
       complex (bsc#888678, bsc#930236).
-    * sulogin supports locked root accounts by --force (bsc#968733).
+    * sulogin supports locked root accounts by --force
+      (bsc#968733, bsc#963399).
     * colors support by default. It is possible to change this
       with --disable-colors-default.
     * more information in cfdisk
diff --git a/util-linux.changes b/util-linux.changes
index d0963b1..1ca162c 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -29,7 +29,7 @@ Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
 -------------------------------------------------------------------
 Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
 
-- Update to version 2.28:
+- Update to version 2.28 (bsc#974301):
   * Many changes and improvements, most notably:
     * Now cfdisk, sfdisk and fdisk wipe all filesystem and RAID
       signatures when creating a new disk label in interactive
@@ -54,7 +54,7 @@ Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
     * The commands nsenter and unshare support a new option
       --cgroup for work with cgroups namespaces (CLONE_NEWCGROUP).
     * The library libmount has been improved to properly detect
-      already mounted btrfs subvolumes.
+      already mounted btrfs subvolumes (bsc#947494, bsc#972684).
     * The library libsmartcols has been massively improved to print
       table ranges, multi-line cells, table titles and to support
       continuous printing.
@@ -64,6 +64,7 @@ Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
       openat-family functions anymore.
     * The python binding for libsmartcols is available in separate
       project at https://github.com/ignatenkobrain/python-smartcols
+    * Other bug fixes (bsc#970404, bsc#975082).
   * Security issue: CVE-2016-2779 is NOT FIXED yet.
 - Remove old util-linux-noenc-suse.patch
 
@@ -98,7 +99,8 @@ Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
       lslocks, sfdisk and lsipc.
     * script has been massively improved to be more robust and less
       complex (bsc#888678, bsc#930236).
-    * sulogin supports locked root accounts by --force (bsc#968733).
+    * sulogin supports locked root accounts by --force
+      (bsc#968733, bsc#963399).
     * colors support by default. It is possible to change this
       with --disable-colors-default.
     * more information in cfdisk

From a120c15d727c4966b1b16f560a434900aae512c5a94dcd60a2abd514d334af72 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 14 Jun 2016 12:46:18 +0000
Subject: [PATCH 3/3] Accepting request 401620 from home:dimstar:Factory

- Do not BuildRequires bash-completion: this is tempting, but it
  pulls bash-completion and its entire dependency stack into Ring0,
  which is inacceptable. Pass the correct path
  (%{_datdir}/bash-completion/completions) via
  --with-bashcompletiondir to configure.

- Do not BuildRequires bash-completion: this is tempting, but it
  pulls bash-completion and its entire dependency stack into Ring0,
  which is inacceptable. Pass the correct path
  (%{_datdir}/bash-completion/completions) via
  --with-bashcompletiondir to configure.

- Do not BuildRequires bash-completion: this is tempting, but it
  pulls bash-completion and its entire dependency stack into Ring0,
  which is inacceptable. Pass the correct path
  (%{_datdir}/bash-completion/completions) via
  --with-bashcompletiondir to configure.

OBS-URL: https://build.opensuse.org/request/show/401620
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=311
---
 python-libmount.changes    | 9 +++++++++
 python-libmount.spec       | 7 +++++--
 util-linux-systemd.changes | 9 +++++++++
 util-linux-systemd.spec    | 4 +++-
 util-linux.changes         | 9 +++++++++
 util-linux.spec            | 4 +++-
 6 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/python-libmount.changes b/python-libmount.changes
index 1ca162c..b98970d 100644
--- a/python-libmount.changes
+++ b/python-libmount.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 13 11:37:33 UTC 2016 - dimstar@opensuse.org
+
+- Do not BuildRequires bash-completion: this is tempting, but it
+  pulls bash-completion and its entire dependency stack into Ring0,
+  which is inacceptable. Pass the correct path
+  (%{_datdir}/bash-completion/completions) via
+  --with-bashcompletiondir to configure.
+
 -------------------------------------------------------------------
 Thu May 19 14:29:27 CEST 2016 - sbrabec@suse.com
 
diff --git a/python-libmount.spec b/python-libmount.spec
index c48bcda..406f70a 100644
--- a/python-libmount.spec
+++ b/python-libmount.spec
@@ -73,9 +73,8 @@ Name:           python-libmount
 %endif
 Summary:        %main_summary
 License:        GPL-2.0+
-Group:          %main_group
+Group:          %group_pl
 BuildRequires:  audit-devel
-BuildRequires:  bash-completion
 BuildRequires:  bc
 BuildRequires:  binutils-devel
 BuildRequires:  fdupes
@@ -379,6 +378,7 @@ SMP systems.
 %if %build_util_linux
 %package -n python-libmount
 Summary:        %summary_pl
+License:        GPL-2.0+
 Group:          %group_pl
 
 %description -n python-libmount
@@ -540,6 +540,7 @@ AUTOPOINT=true autoreconf -vfi
   --with-ncurses \
   --with-selinux \
   $uhead \
+  --with-bashcompletiondir=%{_datadir}/bash-completion/completions \
   --with-systemdsystemunitdir=%{_unitdir} \
   --enable-libmount-force-mountinfo \
   --enable-sulogin-emergency-mount \
@@ -1139,6 +1140,8 @@ fi
 %dir %{_datadir}/getopt
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/*
 %if %build_util_linux_systemd
 %exclude %{_datadir}/bash-completion/completions/logger
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index 1ca162c..b98970d 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 13 11:37:33 UTC 2016 - dimstar@opensuse.org
+
+- Do not BuildRequires bash-completion: this is tempting, but it
+  pulls bash-completion and its entire dependency stack into Ring0,
+  which is inacceptable. Pass the correct path
+  (%{_datdir}/bash-completion/completions) via
+  --with-bashcompletiondir to configure.
+
 -------------------------------------------------------------------
 Thu May 19 14:29:27 CEST 2016 - sbrabec@suse.com
 
diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec
index 1564473..d7fffed 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -75,7 +75,6 @@ Summary:        %main_summary
 License:        GPL-2.0+
 Group:          %main_group
 BuildRequires:  audit-devel
-BuildRequires:  bash-completion
 BuildRequires:  bc
 BuildRequires:  binutils-devel
 BuildRequires:  fdupes
@@ -540,6 +539,7 @@ AUTOPOINT=true autoreconf -vfi
   --with-ncurses \
   --with-selinux \
   $uhead \
+  --with-bashcompletiondir=%{_datadir}/bash-completion/completions \
   --with-systemdsystemunitdir=%{_unitdir} \
   --enable-libmount-force-mountinfo \
   --enable-sulogin-emergency-mount \
@@ -1139,6 +1139,8 @@ fi
 %dir %{_datadir}/getopt
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/*
 %if %build_util_linux_systemd
 %exclude %{_datadir}/bash-completion/completions/logger
diff --git a/util-linux.changes b/util-linux.changes
index 1ca162c..b98970d 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 13 11:37:33 UTC 2016 - dimstar@opensuse.org
+
+- Do not BuildRequires bash-completion: this is tempting, but it
+  pulls bash-completion and its entire dependency stack into Ring0,
+  which is inacceptable. Pass the correct path
+  (%{_datdir}/bash-completion/completions) via
+  --with-bashcompletiondir to configure.
+
 -------------------------------------------------------------------
 Thu May 19 14:29:27 CEST 2016 - sbrabec@suse.com
 
diff --git a/util-linux.spec b/util-linux.spec
index 6ca47c7..8ad1021 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -75,7 +75,6 @@ Summary:        %main_summary
 License:        GPL-2.0+
 Group:          %main_group
 BuildRequires:  audit-devel
-BuildRequires:  bash-completion
 BuildRequires:  bc
 BuildRequires:  binutils-devel
 BuildRequires:  fdupes
@@ -540,6 +539,7 @@ AUTOPOINT=true autoreconf -vfi
   --with-ncurses \
   --with-selinux \
   $uhead \
+  --with-bashcompletiondir=%{_datadir}/bash-completion/completions \
   --with-systemdsystemunitdir=%{_unitdir} \
   --enable-libmount-force-mountinfo \
   --enable-sulogin-emergency-mount \
@@ -1139,6 +1139,8 @@ fi
 %dir %{_datadir}/getopt
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/*
 %if %build_util_linux_systemd
 %exclude %{_datadir}/bash-completion/completions/logger