diff options
| -rw-r--r-- | main/zfs-hardened/0001-Use-the-correct-macro-to-include-backtrace.patch (renamed from main/zfs-grsec/0001-Use-the-correct-macro-to-include-backtrace.patch) | 0 | ||||
| -rw-r--r-- | main/zfs-hardened/0002-Include-sys-types.h-in-devid.h.patch (renamed from main/zfs-grsec/0002-Include-sys-types.h-in-devid.h.patch) | 0 | ||||
| -rw-r--r-- | main/zfs-hardened/0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch (renamed from main/zfs-grsec/0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch) | 0 | ||||
| -rw-r--r-- | main/zfs-hardened/0004-Ensure-correct-return-value-type.patch (renamed from main/zfs-grsec/0004-Ensure-correct-return-value-type.patch) | 0 | ||||
| -rw-r--r-- | main/zfs-hardened/0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch (renamed from main/zfs-grsec/0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch) | 0 | ||||
| -rw-r--r-- | main/zfs-hardened/0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch (renamed from main/zfs-grsec/0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch) | 0 | ||||
| -rw-r--r-- | main/zfs-hardened/0007-Remove-complicated-libspl-assert-wrappers.patch (renamed from main/zfs-grsec/0007-Remove-complicated-libspl-assert-wrappers.patch) | 0 | ||||
| -rw-r--r-- | main/zfs-hardened/0008-Add-support-for-libtirpc.patch (renamed from main/zfs-grsec/0008-Add-support-for-libtirpc.patch) | 0 | ||||
| -rw-r--r-- | main/zfs-hardened/0009-Add-support-for-alpine-linux.patch (renamed from main/zfs-grsec/0009-Add-support-for-alpine-linux.patch) | 0 | ||||
| -rw-r--r-- | main/zfs-hardened/APKBUILD (renamed from main/zfs-grsec/APKBUILD) | 5 | ||||
| -rw-r--r-- | main/zfs-hardened/pax-rap-fixes.patch (renamed from main/zfs-grsec/pax-rap-fixes.patch) | 0 |
11 files changed, 3 insertions, 2 deletions
diff --git a/main/zfs-grsec/0001-Use-the-correct-macro-to-include-backtrace.patch b/main/zfs-hardened/0001-Use-the-correct-macro-to-include-backtrace.patch index aaae11f58a..aaae11f58a 100644 --- a/main/zfs-grsec/0001-Use-the-correct-macro-to-include-backtrace.patch +++ b/main/zfs-hardened/0001-Use-the-correct-macro-to-include-backtrace.patch diff --git a/main/zfs-grsec/0002-Include-sys-types.h-in-devid.h.patch b/main/zfs-hardened/0002-Include-sys-types.h-in-devid.h.patch index 350d2cb6ba..350d2cb6ba 100644 --- a/main/zfs-grsec/0002-Include-sys-types.h-in-devid.h.patch +++ b/main/zfs-hardened/0002-Include-sys-types.h-in-devid.h.patch diff --git a/main/zfs-grsec/0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch b/main/zfs-hardened/0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch index 87ccb78874..87ccb78874 100644 --- a/main/zfs-grsec/0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch +++ b/main/zfs-hardened/0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch diff --git a/main/zfs-grsec/0004-Ensure-correct-return-value-type.patch b/main/zfs-hardened/0004-Ensure-correct-return-value-type.patch index 9897864c02..9897864c02 100644 --- a/main/zfs-grsec/0004-Ensure-correct-return-value-type.patch +++ b/main/zfs-hardened/0004-Ensure-correct-return-value-type.patch diff --git a/main/zfs-grsec/0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch b/main/zfs-hardened/0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch index 37c5a33ffd..37c5a33ffd 100644 --- a/main/zfs-grsec/0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch +++ b/main/zfs-hardened/0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch diff --git a/main/zfs-grsec/0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch b/main/zfs-hardened/0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch index ac844dda62..ac844dda62 100644 --- a/main/zfs-grsec/0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch +++ b/main/zfs-hardened/0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch diff --git a/main/zfs-grsec/0007-Remove-complicated-libspl-assert-wrappers.patch b/main/zfs-hardened/0007-Remove-complicated-libspl-assert-wrappers.patch index 74e8a747c6..74e8a747c6 100644 --- a/main/zfs-grsec/0007-Remove-complicated-libspl-assert-wrappers.patch +++ b/main/zfs-hardened/0007-Remove-complicated-libspl-assert-wrappers.patch diff --git a/main/zfs-grsec/0008-Add-support-for-libtirpc.patch b/main/zfs-hardened/0008-Add-support-for-libtirpc.patch index 4849871483..4849871483 100644 --- a/main/zfs-grsec/0008-Add-support-for-libtirpc.patch +++ b/main/zfs-hardened/0008-Add-support-for-libtirpc.patch diff --git a/main/zfs-grsec/0009-Add-support-for-alpine-linux.patch b/main/zfs-hardened/0009-Add-support-for-alpine-linux.patch index 54d55e6ea5..54d55e6ea5 100644 --- a/main/zfs-grsec/0009-Add-support-for-alpine-linux.patch +++ b/main/zfs-hardened/0009-Add-support-for-alpine-linux.patch diff --git a/main/zfs-grsec/APKBUILD b/main/zfs-hardened/APKBUILD index d9290b1f08..5db25486d8 100644 --- a/main/zfs-grsec/APKBUILD +++ b/main/zfs-hardened/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> -_flavor=${FLAVOR:-grsec} +_flavor=${FLAVOR:-hardened} _realname=zfs _name=$_realname-$_flavor _kpkg=linux-$_flavor _kver=4.9.24 -_kpkgrel=0 +_kpkgrel=1 _realver=0.6.5.9 _mypkgrel=0 @@ -29,6 +29,7 @@ makedepends="$depends_dev automake autoconf libtool linux-headers" install_if="zfs linux-grsec-$_kver" install="" subpackages="$pkgname-dev" +provides="${_realname}-grsec=${pkgver}-r${pkgrel}" source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$_realver/zfs-$_realver.tar.gz 0001-Use-the-correct-macro-to-include-backtrace.patch 0002-Include-sys-types.h-in-devid.h.patch diff --git a/main/zfs-grsec/pax-rap-fixes.patch b/main/zfs-hardened/pax-rap-fixes.patch index 462ef57e48..462ef57e48 100644 --- a/main/zfs-grsec/pax-rap-fixes.patch +++ b/main/zfs-hardened/pax-rap-fixes.patch |