diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | disable_logind_support.patch | 24 | ||||
| -rw-r--r-- | remove_check.patch | 16 |
4 files changed, 46 insertions, 27 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Wed Jun 26 05:52:49 UTC 2019 pkgbase = udisks2-nosystemd pkgdesc = Disk Management Service, version 2 - pkgver = 2.8.3 + pkgver = 2.9.2 pkgrel = 1 url = http://www.freedesktop.org/wiki/Software/udisks arch = i686 @@ -17,23 +15,26 @@ 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.3 + provides = udisks2=2.9.2 conflicts = udisks2 conflicts = udisks2-eudev replaces = udisks2 replaces = udisks2-eudev options = !libtool - source = https://github.com/storaged-project/udisks/archive/udisks-2.8.3.tar.gz + backup = etc/udisks2/udisks2.conf + source = https://github.com/storaged-project/udisks/archive/udisks-2.9.2.tar.gz source = disable_logind_support.patch - sha512sums = 4e8d1b8afbe2d1c62b48ee6a0cde5515663f334f6ffd9a98d090628ec91139766bc8484e6acb7502c8e62a55adb07291e60565bebe5391ea338f611f338a64d0 - sha512sums = 379c9600d06a1a6d1a59cc93b2b15fbafc6c756a4dcbcf1b6b7995e991c0758e19db6f08511351b1a764b747d183373423e1bc396147eb8da5b2d85c420c25b4 + source = remove_check.patch + sha512sums = 8c4cd266d97fd01e8b7b6e15e53774a52d723a5b382307c6fefba0ec1eda0178caa760358260180da6cc793af73fd40499b09a2c271d83524a81a260072432e6 + sha512sums = 22041d363bd7e7a6cc3a7c49c169800a0fad0bc5d3fba5f8663bcd26e2ea09ed78dbdd31ace26a9700863d565be6026b4d2259d5ebbf234ad8571ce2795588ad + sha512sums = e98ef1d34b690e776dfaa9b8a801a98bac395aad38db55933caa843f685471ce9ccfe63287507396925234d17768400d8c38d735f209e515c708f7515ea7ba4f pkgname = udisks2-nosystemd @@ -3,14 +3,14 @@ # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=udisks2-nosystemd -pkgver=2.8.3 +pkgver=2.9.2 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,13 @@ 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=('4e8d1b8afbe2d1c62b48ee6a0cde5515663f334f6ffd9a98d090628ec91139766bc8484e6acb7502c8e62a55adb07291e60565bebe5391ea338f611f338a64d0' - '379c9600d06a1a6d1a59cc93b2b15fbafc6c756a4dcbcf1b6b7995e991c0758e19db6f08511351b1a764b747d183373423e1bc396147eb8da5b2d85c420c25b4') + disable_logind_support.patch + remove_check.patch) +sha512sums=('8c4cd266d97fd01e8b7b6e15e53774a52d723a5b382307c6fefba0ec1eda0178caa760358260180da6cc793af73fd40499b09a2c271d83524a81a260072432e6' + '22041d363bd7e7a6cc3a7c49c169800a0fad0bc5d3fba5f8663bcd26e2ea09ed78dbdd31ace26a9700863d565be6026b4d2259d5ebbf234ad8571ce2795588ad' + 'e98ef1d34b690e776dfaa9b8a801a98bac395aad38db55933caa843f685471ce9ccfe63287507396925234d17768400d8c38d735f209e515c708f7515ea7ba4f') prepare() { cd "udisks-udisks-$pkgver" @@ -35,6 +38,9 @@ prepare() { # initsystem which supports tmpfiles.d configs. patch -p1 -i "$srcdir"/disable_logind_support.patch + # Allow to build with ZRAM support but without systemd installed + patch -p1 -i "$srcdir"/remove_check.patch + NOCONFIGURE=1 ./autogen.sh } 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 diff --git a/remove_check.patch b/remove_check.patch new file mode 100644 index 000000000000..ff39df5cb8c3 --- /dev/null +++ b/remove_check.patch @@ -0,0 +1,16 @@ +diff --git a/configure.ac b/configure.ac +index b5f25905..b9a15afb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -463,11 +463,6 @@ if test "x$enable_zram" = "xyes" \ + fi + fi + +- # needs systemd +- if test -z "$systemdsystemunitdir"; then +- AC_MSG_ERROR([systemd is required for ZRAM support]) +- fi +- + have_zram="yes" + + if test "$have_kbd" = "yes" -a "$have_swap" = "yes"; then |