From a6ec761d8b7bd5554c1ad156f66e871f85793d04 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 17 Mar 2016 16:51:06 -0300
Subject: linux-libre-grsec{,-knock}-4.4.5_gnu.201603142220-1: updating version

---
 ...n-of-function-atomic_inc_return_unchecked.patch | 26 ----------------------
 libre/linux-libre-grsec/PKGBUILD                   | 14 ++++--------
 2 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 libre/linux-libre-grsec/0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.patch

(limited to 'libre')

diff --git a/libre/linux-libre-grsec/0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.patch b/libre/linux-libre-grsec/0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.patch
deleted file mode 100644
index 0f311bdc2..000000000
--- a/libre/linux-libre-grsec/0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/linux/atomic.h b/include/linux/atomic.h
-index a8efdc4..b65a2b9 100644
---- a/include/linux/atomic.h
-+++ b/include/linux/atomic.h
-@@ -103,6 +103,11 @@
- #define  atomic_inc_return(...)						\
- 	__atomic_op_fence(atomic_inc_return, __VA_ARGS__)
- #endif
-+
-+#ifndef atomic_inc_return_unchecked
-+#define  atomic_inc_return_unchecked(...)				\
-+	__atomic_op_fence(atomic_inc_return_unchecked, __VA_ARGS__)
-+#endif
- #endif /* atomic_inc_return_relaxed */
- 
- /* atomic_sub_return_relaxed */
-@@ -255,6 +260,11 @@
- #define  atomic64_inc_return(...)					\
- 	__atomic_op_fence(atomic64_inc_return, __VA_ARGS__)
- #endif
-+
-+#ifndef atomic64_inc_return_unchecked
-+#define  atomic64_inc_return_unchecked(...)				\
-+	__atomic_op_fence(atomic64_inc_return_unchecked, __VA_ARGS__)
-+#endif
- #endif /* atomic64_inc_return_relaxed */
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index c8cece190..795ce0de0 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -10,9 +10,9 @@
 
 pkgbase=linux-libre-grsec
 _pkgbasever=4.4-gnu
-_pkgver=4.4.4-gnu
+_pkgver=4.4.5-gnu
 _grsecver=3.1
-_timestamp=201603032158
+_timestamp=201603142220
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -53,7 +53,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # armv7h patches
         "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
         "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig"
-        '0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.patch'
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
         '0003-SMILE-Plug-device-tree-file.patch'
@@ -65,9 +64,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0009-ARM-dts-dove-add-Dove-divider-clocks.patch')
 sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
             'SKIP'
-            '5b52578afb3bab7a50748e9b8e26bd9df851b3dcfbb55079d2abf3d3ad46aaff'
+            '4adf791c9d7e52ac72c60d337e3fa59f8cef5fb1f497a192345b70ac915674f1'
             'SKIP'
-            'bd005e43a54213a4dc065cee68cbaacae54547c916d21762547ee14bec5d6726'
+            'a4b7f9354fe09ea8938c79d2d158600bba426190a009900d3af33e0fe1d3b8c2'
             'SKIP'
             'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
             'SKIP'
@@ -84,7 +83,6 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
             '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
             '5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319'
             'SKIP'
-            'faa25001a32551b5201c4e803a913100ef875a750e01596d202b5c61a3f4be82'
             'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
             '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4'
             '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08'
@@ -126,10 +124,6 @@ prepare() {
     # RCN patch (CM3 firmware deblobbed)
     git apply -v "${srcdir}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
 
-    # fix implicit declaration of function 'atomic_inc_return_unchecked'
-    # https://forums.grsecurity.net/viewtopic.php?f=3&t=4410
-    patch -p1 -i "${srcdir}/0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.patch"
-
     # ALARM patches
     patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
     patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch"
-- 
cgit v1.2.3-54-g00ecf