[DHG_packages] 01/02: cryptonite: Refresh more-alignment.patch for v0.23

[Ilias Tsitsimpis]

This is an automated email from the git hooks/post-receive script.

iliastsi-guest pushed a commit to branch master
in repository DHG_packages.

commit 808a49158c0f9b8d979d1144e8ebad4de428a101
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Mon Oct 16 19:27:04 2017 +0300

    cryptonite: Refresh more-alignment.patch for v0.23
    
    Thanks to James Clarke for the patch.
    Closes: #876848
---
 p/haskell-cryptonite/debian/changelog              |   7 ++
 .../debian/patches/more-alignment.patch            | 113 ---------------------
 2 files changed, 7 insertions(+), 113 deletions(-)

diff --git a/p/haskell-cryptonite/debian/changelog b/p/haskell-cryptonite/debian/changelog
index 2a54d3a..b217997 100644
--- a/p/haskell-cryptonite/debian/changelog
+++ b/p/haskell-cryptonite/debian/changelog
@@ -1,3 +1,10 @@
+haskell-cryptonite (0.23-2) UNRELEASED; urgency=medium
+
+  * Refresh more-alignment.patch for v0.23.
+    Thanks to James Clarke for the patch (Closes: #876848).
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 16 Oct 2017 19:24:57 +0300
+
 haskell-cryptonite (0.23-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/p/haskell-cryptonite/debian/patches/more-alignment.patch b/p/haskell-cryptonite/debian/patches/more-alignment.patch
index 138d864..c1bb355 100644
--- a/p/haskell-cryptonite/debian/patches/more-alignment.patch
+++ b/p/haskell-cryptonite/debian/patches/more-alignment.patch
@@ -3,119 +3,6 @@ Author: James Clarke <jrtc27 at jrtc27.com>
 Forwarded: https://github.com/haskell-crypto/cryptonite/pull/175
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cbits/cryptonite_align.h
-+++ b/cbits/cryptonite_align.h
-@@ -34,9 +34,24 @@
- #define need_alignment(p,n) IS_ALIGNED(p,n)
- #endif
- 
-+static inline uint32_t load_be32_aligned(const uint8_t *p)
-+{
-+	return be32_to_cpu(*((uint32_t *) p));
-+}
-+
-+static inline uint64_t load_be64_aligned(const uint8_t *p)
-+{
-+	return be64_to_cpu(*((uint64_t *) p));
-+}
-+
-+static inline uint64_t load_le64_aligned(const uint8_t *p)
-+{
-+	return le64_to_cpu(*((uint64_t *) p));
-+}
-+
- static inline uint32_t load_le32_aligned(const uint8_t *p)
- {
--	return le32_to_cpu(*((uint32_t *) p));		
-+	return le32_to_cpu(*((uint32_t *) p));
- }
- 
- static inline void store_le32_aligned(uint8_t *dst, const uint32_t v)
-@@ -60,12 +75,83 @@ static inline void store_be64_aligned(ui
- }
- 
- #ifdef UNALIGNED_ACCESS_OK
--#define load_le32(a) load_le32_aligned(a)
-+
-+#define load_be32(p) load_be32_aligned(p)
-+#define load_be64(p) load_be64_aligned(p)
-+
-+#define store_be32(p, v) store_be32_aligned((p), (v))
-+#define store_be64(p, v) store_be64_aligned((p), (v))
-+
-+#define load_le32(p) load_le32_aligned(p)
-+#define load_le64(p) load_le64_aligned(p)
-+
-+#define store_le32(p, v) store_le32_aligned((p), (v))
-+#define store_le64(p, v) store_le64_aligned((p), (v))
-+
- #else
-+
-+static inline uint32_t load_be32(const uint8_t *p)
-+{
-+	return ((uint32_t)p[0] << 24) | ((uint32_t)p[1] << 16) | ((uint32_t)p[2] <<  8) | ((uint32_t)p[3]);
-+}
-+
-+static inline uint64_t load_be64(const uint8_t *p)
-+{
-+	return ((uint64_t)p[0] << 56) | ((uint64_t)p[1] << 48) | ((uint64_t)p[2] << 40) | ((uint64_t)p[3] << 32) |
-+	       ((uint64_t)p[4] << 24) | ((uint64_t)p[5] << 16) | ((uint64_t)p[6] <<  8) | ((uint64_t)p[7]);
-+}
-+
-+static inline void store_be32(uint8_t *p, uint32_t val)
-+{
-+	p[0] = (val >> 24);
-+	p[1] = (val >> 16) & 0xFF;
-+	p[2] = (val >>  8) & 0xFF;
-+	p[3] = (val      ) & 0xFF;
-+}
-+
-+static inline void store_be64(uint8_t *p, uint64_t val)
-+{
-+	p[0] = (val >> 56);
-+	p[1] = (val >> 48) & 0xFF;
-+	p[2] = (val >> 40) & 0xFF;
-+	p[3] = (val >> 32) & 0xFF;
-+	p[4] = (val >> 24) & 0xFF;
-+	p[5] = (val >> 16) & 0xFF;
-+	p[6] = (val >>  8) & 0xFF;
-+	p[7] = (val      ) & 0xFF;
-+}
-+
- static inline uint32_t load_le32(const uint8_t *p)
- {
- 	return ((uint32_t)p[0]) | ((uint32_t)p[1] <<  8) | ((uint32_t)p[2] << 16) | ((uint32_t)p[3] << 24);
- }
-+
-+static inline uint64_t load_le64(const uint8_t *p)
-+{
-+	return ((uint64_t)p[0]) | ((uint64_t)p[1] <<  8) | ((uint64_t)p[2] << 16) | ((uint64_t)p[3] << 24) |
-+	       ((uint64_t)p[4] << 32) | ((uint64_t)p[5] << 40) | ((uint64_t)p[6] << 48) | ((uint64_t)p[7] << 56);
-+}
-+
-+static inline void store_le32(uint8_t *p, uint32_t val)
-+{
-+	p[0] = (val      ) & 0xFF;
-+	p[1] = (val >>  8) & 0xFF;
-+	p[2] = (val >> 16) & 0xFF;
-+	p[3] = (val >> 24);
-+}
-+
-+static inline void store_le64(uint8_t *p, uint64_t val)
-+{
-+	p[0] = (val      ) & 0xFF;
-+	p[1] = (val >>  8) & 0xFF;
-+	p[2] = (val >> 16) & 0xFF;
-+	p[3] = (val >> 24) & 0xFF;
-+	p[4] = (val >> 32) & 0xFF;
-+	p[5] = (val >> 40) & 0xFF;
-+	p[6] = (val >> 48) & 0xFF;
-+	p[7] = (val >> 56);
-+}
-+
- #endif
- 
- #ifdef UNALIGNED_ACCESS_OK
 --- a/cbits/cryptonite_poly1305.c
 +++ b/cbits/cryptonite_poly1305.c
 @@ -37,11 +37,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git