util-linux-selinux 2.26.2-1 update

3 files changed, 11 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e126801cc1a2..9ef215ec804f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = util-linux-selinux
 	pkgdesc = SELinux aware miscellaneous system utilities for Linux
-	pkgver = 2.26.1
+	pkgver = 2.26.2
 	pkgrel = 1
 	url = https://www.kernel.org/pub/linux/utils/util-linux/
 	arch = i686
@@ -12,13 +12,13 @@ pkgbase = util-linux-selinux
 	makedepends = libselinux
 	options = strip
 	options = debug
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.26/util-linux-2.26.1.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.26/util-linux-2.26.1.tar.sign
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.26/util-linux-2.26.2.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.26/util-linux-2.26.2.tar.sign
 	source = uuidd.tmpfiles
 	source = pam-login
 	source = pam-common
 	source = pam-su
-	md5sums = 2308850946766677f3fabe0685e85de8
+	md5sums = 9bdf368c395f1b70325d0eb22c7f48fb
 	md5sums = SKIP
 	md5sums = a39554bfd65cccfd8254bb46922f4a67
 	md5sums = 4368b3f98abd8a32662e094c54e7f9b1
@@ -33,11 +33,11 @@ pkgname = util-linux-selinux
 	depends = libsystemd-selinux
 	depends = libutil-linux-selinux
 	optdepends = python: python bindings to libmount
-	provides = util-linux-ng=2.26.1
+	provides = util-linux-ng=2.26.2
 	provides = eject
 	provides = zramctl
-	provides = util-linux=2.26.1-
-	provides = selinux-util-linux=2.26.1-
+	provides = util-linux=2.26.2-
+	provides = selinux-util-linux=2.26.2-
 	conflicts = util-linux-ng
 	conflicts = eject
 	conflicts = zramctl
@@ -57,6 +57,6 @@ pkgname = libutil-linux-selinux
 	provides = libmount.so
 	provides = libsmartcols.so
 	provides = libuuid.so
-	provides = libutil-linux=2.26.1-
+	provides = libutil-linux=2.26.2-
 	conflicts = libutil-linux
 
diff --git a/PKGBUILD b/PKGBUILD
index 84c56adb9af0..4a8625f0235f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgbase=util-linux-selinux
 pkgname=(util-linux-selinux libutil-linux-selinux)
-pkgver=2.26.1
+pkgver=2.26.2
 pkgrel=1
 pkgdesc="SELinux aware miscellaneous system utilities for Linux"
 url="https://www.kernel.org/pub/linux/utils/util-linux/"
@@ -26,7 +26,7 @@ validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
 source=("https://www.kernel.org/pub/linux/utils/util-linux/v2.26/${pkgname/-selinux}-$pkgver.tar."{xz,sign}
         uuidd.tmpfiles
         pam-{login,common,su})
-md5sums=('2308850946766677f3fabe0685e85de8'
+md5sums=('9bdf368c395f1b70325d0eb22c7f48fb'
          'SKIP'
          'a39554bfd65cccfd8254bb46922f4a67'
          '4368b3f98abd8a32662e094c54e7f9b1'
diff --git a/util-linux.install b/util-linux.install
index 4c0bb107c08a..3fbfc2187d3a 100644
--- a/util-linux.install
+++ b/util-linux.install
@@ -1,21 +1,12 @@
 post_install() {
   # we don't want use systemd-tmpfiles here because
   # the package dependency would create a circular dep.
-  if [ ! -d run/uuidd ]; then
+  if [[ ! -d run/uuidd ]]; then
     # refer to uid/gid by number to avoid dependency on filesystem
     install -o 68 -g 68 -dm755 run/uuidd
   fi
 }
 
 post_upgrade() {
-  if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then
-    if [ -f /var/lib/hwclock/adjtime ]; then
-      mv /var/lib/hwclock/adjtime /etc/adjtime
-    fi
-    if [ -d /var/lib/hwclock ]; then
-      rmdir /var/lib/hwclock
-    fi
-  fi
-
   post_install
 }