zfs: update to 0.6.5.5.
This commit is contained in:
parent
7b90434ea4
commit
73726d5660
3 changed files with 6 additions and 31 deletions
|
@ -13,10 +13,10 @@ diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c
|
||||||
index e3e8cfc..91efda6 100644
|
index e3e8cfc..91efda6 100644
|
||||||
--- a/cmd/mount_zfs/mount_zfs.c
|
--- a/cmd/mount_zfs/mount_zfs.c
|
||||||
+++ b/cmd/mount_zfs/mount_zfs.c
|
+++ b/cmd/mount_zfs/mount_zfs.c
|
||||||
@@ -32,6 +32,7 @@
|
@@ -33,6 +33,7 @@
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <libzfs.h>
|
#include <libzfs.h>
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
|
#include <getopt.h>
|
||||||
+#include <fcntl.h>
|
+#include <fcntl.h>
|
||||||
|
|
||||||
#define ZS_COMMENT 0x00000000 /* comment */
|
#define ZS_COMMENT 0x00000000 /* comment */
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
mount.zfs is called by convention (and util-linux) with arguments last, i.e.
|
|
||||||
% mount.zfs <dataset> <mountpoint> -o <options>
|
|
||||||
Use getopt_long so musl will permute arguments.
|
|
||||||
|
|
||||||
Passing 0 as long_opts is unspecified, but safe for glibc and musl getopt_long.
|
|
||||||
|
|
||||||
--- a/cmd/mount_zfs/mount_zfs.c 2016-01-14 13:55:43.352951688 +0100
|
|
||||||
+++ b/cmd/mount_zfs/mount_zfs.c 2016-01-14 13:53:35.685221569 +0100
|
|
||||||
@@ -33,6 +33,7 @@
|
|
||||||
#include <libzfs.h>
|
|
||||||
#include <locale.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
+#include <getopt.h>
|
|
||||||
|
|
||||||
#define ZS_COMMENT 0x00000000 /* comment */
|
|
||||||
#define ZS_ZFSUTIL 0x00000001 /* caller is zfs(8) */
|
|
||||||
@@ -390,7 +391,7 @@
|
|
||||||
opterr = 0;
|
|
||||||
|
|
||||||
/* check options */
|
|
||||||
- while ((c = getopt(argc, argv, "sfnvo:h?")) != -1) {
|
|
||||||
+ while ((c = getopt_long(argc, argv, "sfnvo:h?", 0, 0)) != -1) {
|
|
||||||
switch (c) {
|
|
||||||
case 's':
|
|
||||||
sloppy = 1;
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'zfs'
|
# Template file for 'zfs'
|
||||||
pkgname=zfs
|
pkgname=zfs
|
||||||
version=0.6.5.4
|
version=0.6.5.5
|
||||||
revision=4
|
revision=1
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
wrksrc="${pkgname}-${pkgname}-${version/r/-}"
|
wrksrc="${pkgname}-${pkgname}-${version/r/-}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
|
@ -12,11 +12,11 @@ hostmakedepends="dracut automake libtool pkg-config"
|
||||||
makedepends="spl-devel zlib-devel libuuid-devel libblkid-devel libtirpc-devel"
|
makedepends="spl-devel zlib-devel libuuid-devel libblkid-devel libtirpc-devel"
|
||||||
conf_files="/etc/zfs/zed.d/zed.rc"
|
conf_files="/etc/zfs/zed.d/zed.rc"
|
||||||
short_desc="Z File System -- userland and kernel modules (using DKMS)"
|
short_desc="Z File System -- userland and kernel modules (using DKMS)"
|
||||||
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
|
maintainer="Toyam Cox <Vaelatern@gmail.com>"
|
||||||
license="CDDL"
|
license="CDDL"
|
||||||
homepage="http://zfsonlinux.org/"
|
homepage="http://zfsonlinux.org/"
|
||||||
distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/r/-}.tar.gz"
|
distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/r/-}.tar.gz"
|
||||||
checksum=081c53ff170f61aadadff53f12fdad38d467a4b1d27c11dfe2dcb18b663aaead
|
checksum=4ffedbdc5c576e14187f3f2bdaf8b8f380b676dd8d96cc8dfab3068ae2a47dfb
|
||||||
|
|
||||||
triggers="dkms"
|
triggers="dkms"
|
||||||
dkms_modules="zfs ${version/r/-}"
|
dkms_modules="zfs ${version/r/-}"
|
||||||
|
|
Loading…
Reference in a new issue