summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD9
-rw-r--r--disable_logind_support.patch24
3 files changed, 22 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bbe56a7e2616..bcc1c961fbbe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Jul 29 05:31:25 UTC 2019
pkgbase = udisks2-nosystemd
pkgdesc = Disk Management Service, version 2
- pkgver = 2.8.4
+ pkgver = 2.9.0
pkgrel = 1
url = http://www.freedesktop.org/wiki/Software/udisks
arch = i686
@@ -17,23 +15,24 @@ pkgbase = udisks2-nosystemd
depends = polkit-consolekit
depends = libatasmart
depends = libgudev
- depends = libblockdev>=2.19
+ depends = libblockdev>=2.24
optdepends = gptfdisk: GUID partition table support
optdepends = parted: partition management
optdepends = gptfdisk: GUID partition table support
optdepends = ntfs-3g: NTFS filesystem management support
optdepends = dosfstools: VFAT filesystem management support
optdepends = libiscsi: iSCSI support
- provides = udisks2=2.8.4
+ provides = udisks2=2.9.0
conflicts = udisks2
conflicts = udisks2-eudev
replaces = udisks2
replaces = udisks2-eudev
options = !libtool
- source = https://github.com/storaged-project/udisks/archive/udisks-2.8.4.tar.gz
+ backup = etc/udisks2/udisks2.conf
+ source = https://github.com/storaged-project/udisks/archive/udisks-2.9.0.tar.gz
source = disable_logind_support.patch
- sha512sums = 6a002f45e9713e891f8944138541db13665b8dad76a84bcd7449a4aa3a966dfb45cf8629812dec1827ce2ea8790b3eafa235cca4a00ceac2430c8cadfa25ec49
- sha512sums = 379c9600d06a1a6d1a59cc93b2b15fbafc6c756a4dcbcf1b6b7995e991c0758e19db6f08511351b1a764b747d183373423e1bc396147eb8da5b2d85c420c25b4
+ sha512sums = d3ee7dac016e03b7d4fc6e2c64450953fe22469d854b5e7232ad95b356b05930ddf2c8372a74280825e6fff693ab53294cb5c071e2d85b347703dd58289a605e
+ sha512sums = 22041d363bd7e7a6cc3a7c49c169800a0fad0bc5d3fba5f8663bcd26e2ea09ed78dbdd31ace26a9700863d565be6026b4d2259d5ebbf234ad8571ce2795588ad
pkgname = udisks2-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index 84dc04efaf17..b382a4b3eb0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
# Contributor: Ionut Biru <ibiru@archlinux.org>
pkgname=udisks2-nosystemd
-pkgver=2.8.4
+pkgver=2.9.0
pkgrel=1
pkgdesc="Disk Management Service, version 2"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/udisks"
license=('GPL2')
groups=('eudev-base')
-depends=('polkit-consolekit' 'libatasmart' 'libgudev' 'libblockdev>=2.19')
+depends=('polkit-consolekit' 'libatasmart' 'libgudev' 'libblockdev>=2.24')
makedepends=('docbook-xsl' 'gobject-introspection' 'parted' 'libiscsi' 'gtk-doc')
optdepends=('gptfdisk: GUID partition table support'
'parted: partition management'
@@ -22,10 +22,11 @@ provides=("udisks2=${pkgver}")
conflicts=('udisks2' 'udisks2-eudev')
replaces=('udisks2' 'udisks2-eudev')
options=(!libtool)
+backup=('etc/udisks2/udisks2.conf')
source=(https://github.com/storaged-project/udisks/archive/udisks-$pkgver.tar.gz
disable_logind_support.patch)
-sha512sums=('6a002f45e9713e891f8944138541db13665b8dad76a84bcd7449a4aa3a966dfb45cf8629812dec1827ce2ea8790b3eafa235cca4a00ceac2430c8cadfa25ec49'
- '379c9600d06a1a6d1a59cc93b2b15fbafc6c756a4dcbcf1b6b7995e991c0758e19db6f08511351b1a764b747d183373423e1bc396147eb8da5b2d85c420c25b4')
+sha512sums=('d3ee7dac016e03b7d4fc6e2c64450953fe22469d854b5e7232ad95b356b05930ddf2c8372a74280825e6fff693ab53294cb5c071e2d85b347703dd58289a605e'
+ '22041d363bd7e7a6cc3a7c49c169800a0fad0bc5d3fba5f8663bcd26e2ea09ed78dbdd31ace26a9700863d565be6026b4d2259d5ebbf234ad8571ce2795588ad')
prepare() {
cd "udisks-udisks-$pkgver"
diff --git a/disable_logind_support.patch b/disable_logind_support.patch
index 76fbd3174c80..3e7b18420870 100644
--- a/disable_logind_support.patch
+++ b/disable_logind_support.patch
@@ -1,14 +1,10 @@
---- udisks-udisks-2.7.2_orig/configure.ac 2017-09-11 18:28:05.242977535 +0300
-+++ udisks-udisks-2.7.2/configure.ac 2017-09-09 20:45:08.274150812 +0300
-@@ -170,10 +170,7 @@
- AC_SUBST(LIBATASMART_CFLAGS)
- AC_SUBST(LIBATASMART_LIBS)
-
--PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd >= 209], [have_libsystemd_login=yes],
-- [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44 libsystemd-daemon],
-- [have_libsystemd_login=yes],
-- [have_libsystemd_login=no])])
-+have_libsystemd_login=no
- AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes)
- if test "x$have_libsystemd_login" = "xyes"; then
- AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
+--- udisks-udisks-2.9.0_orig/configure.ac 2020-05-26 18:07:07.000000000 +0300
++++ udisks-udisks-2.9.0/configure.ac 2020-06-04 10:07:53.578649448 +0300
+@@ -201,6 +201,7 @@
+ [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44 libsystemd-daemon],
+ [have_libsystemd_login=yes],
+ [have_libsystemd_login=no])])
++ have_libsystemd_login=no
+ if test "x$have_libsystemd_login" = "xyes"; then
+ AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
+ fi