aboutsummaryrefslogtreecommitdiffstats
path: root/main/udisks2
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-04-29 13:33:38 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-04-29 13:33:38 +0000
commit79a1cfb24f2e1e93136dbf52552fd683b1daf1c3 (patch)
tree635e134fbb4c4e14129253a33a4b8892966655a5 /main/udisks2
parent66cd6f658b7af61110d11fa18c1824f0416e6580 (diff)
downloadaports-79a1cfb24f2e1e93136dbf52552fd683b1daf1c3.tar.bz2
aports-79a1cfb24f2e1e93136dbf52552fd683b1daf1c3.tar.xz
main/udisks2: upgrade to 2.1.7
Diffstat (limited to 'main/udisks2')
-rw-r--r--main/udisks2/APKBUILD24
-rw-r--r--main/udisks2/fix-stdio.patch13
-rw-r--r--main/udisks2/sys-wait.patch10
3 files changed, 8 insertions, 39 deletions
diff --git a/main/udisks2/APKBUILD b/main/udisks2/APKBUILD
index 6fe035288f..fa9f26f7d6 100644
--- a/main/udisks2/APKBUILD
+++ b/main/udisks2/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=udisks2
-pkgver=2.1.6
+pkgver=2.1.7
pkgrel=0
pkgdesc="A Disk Manager"
url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -9,14 +9,12 @@ arch="all"
license="GPL2+"
depends=""
depends_dev="gobject-introspection-dev polkit-dev libatasmart-dev
- eudev-dev acl-dev"
+ libgudev-dev acl-dev"
makedepends="$depends_dev glib-dev intltool gtk-doc linux-headers"
install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
source="http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2
O_CLOEXEC.patch
- sys-wait.patch
- fix-stdio.patch
"
_builddir="$srcdir"/udisks-$pkgver
@@ -58,15 +56,9 @@ libs() {
"$subpkgdir"/usr/lib/
}
-md5sums="ea181c13c43af039fded88f0ef546e24 udisks-2.1.6.tar.bz2
-fd70ee4163c5bfd9bd474c28a2548c46 O_CLOEXEC.patch
-4c7aa82c180c809f565c55325ce9eb20 sys-wait.patch
-0cf34713e15675760cf547e36ac13683 fix-stdio.patch"
-sha256sums="dec5f5c85fa0f74f39336acbfba1770f9988c096be23873714543c304b09f46a udisks-2.1.6.tar.bz2
-2c325c131e8d66d09ec3ec4f2c022113822c494da37dd2316d87ac4dc721c82b O_CLOEXEC.patch
-ed4c6a17a97cc01854c7adde56984cade1da8a58f41c30788f5bcdc428ff26ca sys-wait.patch
-abb9a09fff960eb0ffadd9ba27a2fdff37c7674d9c42ba20251e7ff7b23ba1f1 fix-stdio.patch"
-sha512sums="33badcf87986504cf13926f23f1ac0386d732920918871e5bdbcbd704bfcee17d9d3c5002bbdd497bf88a47f844595ad06fc2049bc805099c052943ba3750770 udisks-2.1.6.tar.bz2
-269ba55cc755e2a484670258bc530790691b66c9fce9479a2a17d78cff5d52dd1be89290979efd44a0ba82be665f52a356a57f2cbb67951d91fe09d4e24c2a6a O_CLOEXEC.patch
-138593a97a35ba405e65d8f207fb16f4e056c09e3f4a51edd4ee8f8aeb37914663bbf0b016a5a0055ef5ec5191f850a3680f1f47fe0b07e9abe0ce01d2c0af0d sys-wait.patch
-205a3a51170082f05c546a3185a929e0aa2659bfdc46e48b8bf48fd12a44ed7e08c41603e32aee670b9303f9791372db9188389b0a8df3f08e9d3fe2be4c67cb fix-stdio.patch"
+md5sums="8bccd36573b75286538bd5bd2c424f45 udisks-2.1.7.tar.bz2
+fd70ee4163c5bfd9bd474c28a2548c46 O_CLOEXEC.patch"
+sha256sums="abae2bb3bdc691ca13c1e4c244630b8c881c4f3b35c207299f1b39b7bec83785 udisks-2.1.7.tar.bz2
+2c325c131e8d66d09ec3ec4f2c022113822c494da37dd2316d87ac4dc721c82b O_CLOEXEC.patch"
+sha512sums="d32ec0741b4c55e863587a27095f69cf0375e0c80db70f2540cde70382dcafdce07a098a55b52a450c2014a6e09a4af0b70192bbc5b92ffd57b05a3bf3ab3111 udisks-2.1.7.tar.bz2
+269ba55cc755e2a484670258bc530790691b66c9fce9479a2a17d78cff5d52dd1be89290979efd44a0ba82be665f52a356a57f2cbb67951d91fe09d4e24c2a6a O_CLOEXEC.patch"
diff --git a/main/udisks2/fix-stdio.patch b/main/udisks2/fix-stdio.patch
deleted file mode 100644
index 32ec03e8ee..0000000000
--- a/main/udisks2/fix-stdio.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- udisks-2.1.1.orig/tools/udisksctl.c
-+++ udisks-2.1.1/tools/udisksctl.c
-@@ -229,8 +229,8 @@
- }
- else
- {
-- fclose (stdout);
-- stdout = _color_pager_out;
-+ fflush (stdout);
-+ dup2 (fileno(_color_pager_out), fileno(stdout));
- }
-
- out:
diff --git a/main/udisks2/sys-wait.patch b/main/udisks2/sys-wait.patch
deleted file mode 100644
index 1ac86d50d0..0000000000
--- a/main/udisks2/sys-wait.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/udiskslinuxfilesystem.c.orig
-+++ ./src/udiskslinuxfilesystem.c
-@@ -30,6 +30,7 @@
- #include <mntent.h>
- #include <sys/types.h>
- #include <sys/acl.h>
-+#include <sys/wait.h>
- #include <errno.h>
-
- #include <glib/gstdio.h>