rebuild boost related packages

2025-02-03 07:47:20 +08:00 · 2017-03-17 15:59:41 +00:00 · 2017-03-17 15:59:41 +00:00 · 6d05e75161
commit 6d05e75161
parent f0f8a6bd96
15 changed files with 575 additions and 206 deletions
--- a/e4rat/PKGBUILD
+++ b/e4rat/PKGBUILD
@ -1,6 +1,6 @@
 pkgname=e4rat
 pkgver=0.2.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions."
 arch=('i686' 'x86_64')
 url="http://e4rat.sourceforge.net/"
@ -10,11 +10,13 @@ makedepends=('audit' 'boost' 'cmake')
 options=('!strip')
 backup=(etc/e4rat.conf)
 source=( "http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz" \
-        'boost-fs3-v2.patch' )
+        'boost-fs3-v2.patch'
+        'cxx.patch' )

 prepare () {
  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 < "$srcdir/boost-fs3-v2.patch"
+  patch -Np1 -i "$srcdir/boost-fs3-v2.patch"
+  patch -Np1 -i "$srcdir/cxx.patch"
  [[ ! -d build ]] && mkdir build
 }

@ -35,4 +37,5 @@ package() {
 }

 sha256sums=('f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0'
-            '9a9786d6167e4a47d1733735745b0eadeabf487886405df9e6771a28f3a20965')
+            '9a9786d6167e4a47d1733735745b0eadeabf487886405df9e6771a28f3a20965'
+            '19d163527955a9dfdb7a7c6e35f8e7b674422a8c5bd7888293e9e30fe58c4663')
--- a/e4rat/cxx.patch
+++ b/e4rat/cxx.patch
@ -0,0 +1,11 @@
+--- e4rat-0.2.3/src/logging.hh.orig	2017-03-17 15:15:58.603287712 +0000
+++ e4rat-0.2.3/src/logging.hh	2017-03-17 15:16:12.265147263 +0000
+@@ -93,7 +93,7 @@
+ #define dump_log(...) logger.write(__VA_ARGS__)
+ 
+ #ifdef DEBUG_ENABLED
+-    #define debug(format,args...) dump_log(Debug, "%s:%d in %s(): "format, __FILE__, __LINE__, __FUNCTION__, ## args)
+    #define debug(format,args...) dump_log(Debug, "%s:%d in %s(): " format, __FILE__, __LINE__, __FUNCTION__, ## args)
+ #else
+     #define debug(format,args...)
+ #endif
--- a/encfs/PKGBUILD
+++ b/encfs/PKGBUILD
@ -1,37 +1,49 @@
 pkgname=encfs
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Encrypted filesystem in user-space'
 arch=('x86_64')
-url='http://www.arg0.net/encfs'
-license=('GPL')
-depends=('openssl' 'fuse' 'boost-libs')
-makedepends=('boost' 'cmake')
-options=('!libtool')
-source=("https://github.com/vgough/encfs/releases/download/v${pkgver}/encfs-${pkgver}.tar.gz")
-md5sums=('7cbf9cc3c5af49b46703ce6ba70d22a4')
+url='https://vgough.github.io/encfs/'
+license=('LGPL')
+depends=('openssl' 'fuse2' 'tinyxml2')
+makedepends=('cmake')
+source=(https://github.com/vgough/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.asc} encfs-openssl-1.1.patch)
+validpgpkeys=('E583187B2E26D6EF8BF4556333C65E29813C14DF') # Valient Gough
+sha256sums=('67203aeff7a06ce7be83df4948db296be89a00cffe1108a0a41c96d7481106a4'
+            'SKIP'
+            '2ffc0bbde3aed0c86b5d64865108b0538503ec0ccc9a7a3c1a0156cec4ebc937')

-build(){
-  cd ${srcdir}
+prepare() {
+  cd $pkgname-$pkgver
+  # fix build with openssl 1.1 (Debian)
+  patch -p1 -i ../encfs-openssl-1.1.patch
+}

-  mkdir build && cd build
-  cmake ../${pkgname}-${pkgver} \
-	  -DUSE_INTERNAL_TINYXML=ON \
-	  -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DINSTALL_LIBENCFS=ON \
-	  -DBUILD_SHARED_LIBS=ON
+build() {
+  cd "${srcdir}"
+
+  mkdir build
+  cd build
+
+  cmake ../$pkgname-$pkgver \
+      -DUSE_INTERNAL_TINYXML=OFF \
+      -DINSTALL_LIBENCFS=ON \
+      -DBUILD_SHARED_LIBS=ON \
+      -DCMAKE_INSTALL_PREFIX=/usr
  make
 }

 check() {
-  cd ${srcdir}/build
+  cd "${srcdir}"/build
+
  make test
 }

 package() {
-  cd ${srcdir}/build
+  cd "${srcdir}"/build

-  make DESTDIR=${pkgdir} install
-  cp internal/tinyxml2-3.0.0/libtinyxml2.so.3 "${pkgdir}"/usr/lib/libtinyxml2.so.3
+  make DESTDIR="${pkgdir}" install
+ 
+# FS#51802
  chmod +x "${pkgdir}"/usr/bin/encfssh
 }
--- a/encfs/encfs-openssl-1.1.patch
+++ b/encfs/encfs-openssl-1.1.patch
@ -0,0 +1,350 @@
+diff --git a/encfs/SSL_Cipher.cpp b/encfs/SSL_Cipher.cpp
+index e9ba424..4d14755 100644
+--- a/encfs/SSL_Cipher.cpp
+++ b/encfs/SSL_Cipher.cpp
+@@ -36,6 +36,7 @@
+ #include "Interface.h"
+ #include "Mutex.h"
+ #include "Range.h"
+#include "SSL_Compat.h"
+ #include "SSL_Cipher.h"
+ #include "intl/gettext.h"
+ 
+@@ -74,19 +75,19 @@ int BytesToKey(int keyLen, int ivLen, const EVP_MD *md,
+   int nkey = key ? keyLen : 0;
+   int niv = iv ? ivLen : 0;
+ 
+-  EVP_MD_CTX cx;
+-  EVP_MD_CTX_init(&cx);
+  EVP_MD_CTX *cx = EVP_MD_CTX_new();
+  EVP_MD_CTX_init(cx);
+ 
+   for (;;) {
+-    EVP_DigestInit_ex(&cx, md, NULL);
+-    if (addmd++) EVP_DigestUpdate(&cx, mdBuf, mds);
+-    EVP_DigestUpdate(&cx, data, dataLen);
+-    EVP_DigestFinal_ex(&cx, mdBuf, &mds);
+    EVP_DigestInit_ex(cx, md, NULL);
+    if (addmd++) EVP_DigestUpdate(cx, mdBuf, mds);
+    EVP_DigestUpdate(cx, data, dataLen);
+    EVP_DigestFinal_ex(cx, mdBuf, &mds);
+ 
+     for (unsigned int i = 1; i < rounds; ++i) {
+-      EVP_DigestInit_ex(&cx, md, NULL);
+-      EVP_DigestUpdate(&cx, mdBuf, mds);
+-      EVP_DigestFinal_ex(&cx, mdBuf, &mds);
+      EVP_DigestInit_ex(cx, md, NULL);
+      EVP_DigestUpdate(cx, mdBuf, mds);
+      EVP_DigestFinal_ex(cx, mdBuf, &mds);
+     }
+ 
+     int offset = 0;
+@@ -106,7 +107,7 @@ int BytesToKey(int keyLen, int ivLen, const EVP_MD *md,
+     }
+     if ((nkey == 0) && (niv == 0)) break;
+   }
+-  EVP_MD_CTX_cleanup(&cx);
+  EVP_MD_CTX_free(cx);
+   OPENSSL_cleanse(mdBuf, sizeof(mdBuf));
+ 
+   return keyLen;
+@@ -229,12 +230,12 @@ class SSLKey : public AbstractCipherKey {
+   // followed by iv of _ivLength bytes,
+   unsigned char *buffer;
+ 
+-  EVP_CIPHER_CTX block_enc;
+-  EVP_CIPHER_CTX block_dec;
+-  EVP_CIPHER_CTX stream_enc;
+-  EVP_CIPHER_CTX stream_dec;
+  EVP_CIPHER_CTX *block_enc;
+  EVP_CIPHER_CTX *block_dec;
+  EVP_CIPHER_CTX *stream_enc;
+  EVP_CIPHER_CTX *stream_dec;
+ 
+-  HMAC_CTX mac_ctx;
+  HMAC_CTX *mac_ctx;
+ 
+   SSLKey(int keySize, int ivLength);
+   ~SSLKey();
+@@ -251,11 +252,16 @@ SSLKey::SSLKey(int keySize_, int ivLength_) {
+   // kernel patch is applied..
+   mlock(buffer, keySize + ivLength);
+ 
+-  EVP_CIPHER_CTX_init(&block_enc);
+-  EVP_CIPHER_CTX_init(&block_dec);
+-  EVP_CIPHER_CTX_init(&stream_enc);
+-  EVP_CIPHER_CTX_init(&stream_dec);
+-  HMAC_CTX_init(&mac_ctx);
+  block_enc = EVP_CIPHER_CTX_new();
+  EVP_CIPHER_CTX_init(block_enc);
+  block_dec = EVP_CIPHER_CTX_new();
+  EVP_CIPHER_CTX_init(block_dec);
+  stream_enc = EVP_CIPHER_CTX_new();
+  EVP_CIPHER_CTX_init(stream_enc);
+  stream_dec = EVP_CIPHER_CTX_new();
+  EVP_CIPHER_CTX_init(stream_dec);
+  mac_ctx = HMAC_CTX_new();
+  HMAC_CTX_reset(mac_ctx);
+ }
+ 
+ SSLKey::~SSLKey() {
+@@ -268,12 +274,11 @@ SSLKey::~SSLKey() {
+   ivLength = 0;
+   buffer = 0;
+ 
+-  EVP_CIPHER_CTX_cleanup(&block_enc);
+-  EVP_CIPHER_CTX_cleanup(&block_dec);
+-  EVP_CIPHER_CTX_cleanup(&stream_enc);
+-  EVP_CIPHER_CTX_cleanup(&stream_dec);
+-
+-  HMAC_CTX_cleanup(&mac_ctx);
+  EVP_CIPHER_CTX_free(block_enc);
+  EVP_CIPHER_CTX_free(block_dec);
+  EVP_CIPHER_CTX_free(stream_enc);
+  EVP_CIPHER_CTX_free(stream_dec);
+  HMAC_CTX_free(mac_ctx);
+ 
+   pthread_mutex_destroy(&mutex);
+ }
+@@ -290,27 +295,27 @@ void initKey(const std::shared_ptr<SSLKey> &key, const EVP_CIPHER *_blockCipher,
+   Lock lock(key->mutex);
+   // initialize the cipher context once so that we don't have to do it for
+   // every block..
+-  EVP_EncryptInit_ex(&key->block_enc, _blockCipher, NULL, NULL, NULL);
+-  EVP_DecryptInit_ex(&key->block_dec, _blockCipher, NULL, NULL, NULL);
+-  EVP_EncryptInit_ex(&key->stream_enc, _streamCipher, NULL, NULL, NULL);
+-  EVP_DecryptInit_ex(&key->stream_dec, _streamCipher, NULL, NULL, NULL);
+-
+-  EVP_CIPHER_CTX_set_key_length(&key->block_enc, _keySize);
+-  EVP_CIPHER_CTX_set_key_length(&key->block_dec, _keySize);
+-  EVP_CIPHER_CTX_set_key_length(&key->stream_enc, _keySize);
+-  EVP_CIPHER_CTX_set_key_length(&key->stream_dec, _keySize);
+-
+-  EVP_CIPHER_CTX_set_padding(&key->block_enc, 0);
+-  EVP_CIPHER_CTX_set_padding(&key->block_dec, 0);
+-  EVP_CIPHER_CTX_set_padding(&key->stream_enc, 0);
+-  EVP_CIPHER_CTX_set_padding(&key->stream_dec, 0);
+-
+-  EVP_EncryptInit_ex(&key->block_enc, NULL, NULL, KeyData(key), NULL);
+-  EVP_DecryptInit_ex(&key->block_dec, NULL, NULL, KeyData(key), NULL);
+-  EVP_EncryptInit_ex(&key->stream_enc, NULL, NULL, KeyData(key), NULL);
+-  EVP_DecryptInit_ex(&key->stream_dec, NULL, NULL, KeyData(key), NULL);
+-
+-  HMAC_Init_ex(&key->mac_ctx, KeyData(key), _keySize, EVP_sha1(), 0);
+  EVP_EncryptInit_ex(key->block_enc, _blockCipher, NULL, NULL, NULL);
+  EVP_DecryptInit_ex(key->block_dec, _blockCipher, NULL, NULL, NULL);
+  EVP_EncryptInit_ex(key->stream_enc, _streamCipher, NULL, NULL, NULL);
+  EVP_DecryptInit_ex(key->stream_dec, _streamCipher, NULL, NULL, NULL);
+
+  EVP_CIPHER_CTX_set_key_length(key->block_enc, _keySize);
+  EVP_CIPHER_CTX_set_key_length(key->block_dec, _keySize);
+  EVP_CIPHER_CTX_set_key_length(key->stream_enc, _keySize);
+  EVP_CIPHER_CTX_set_key_length(key->stream_dec, _keySize);
+
+  EVP_CIPHER_CTX_set_padding(key->block_enc, 0);
+  EVP_CIPHER_CTX_set_padding(key->block_dec, 0);
+  EVP_CIPHER_CTX_set_padding(key->stream_enc, 0);
+  EVP_CIPHER_CTX_set_padding(key->stream_dec, 0);
+
+  EVP_EncryptInit_ex(key->block_enc, NULL, NULL, KeyData(key), NULL);
+  EVP_DecryptInit_ex(key->block_dec, NULL, NULL, KeyData(key), NULL);
+  EVP_EncryptInit_ex(key->stream_enc, NULL, NULL, KeyData(key), NULL);
+  EVP_DecryptInit_ex(key->stream_dec, NULL, NULL, KeyData(key), NULL);
+
+  HMAC_Init_ex(key->mac_ctx, KeyData(key), _keySize, EVP_sha1(), 0);
+ }
+ 
+ SSL_Cipher::SSL_Cipher(const Interface &iface_, const Interface &realIface_,
+@@ -451,8 +456,8 @@ static uint64_t _checksum_64(SSLKey *key, const unsigned char *data,
+   unsigned char md[EVP_MAX_MD_SIZE];
+   unsigned int mdLen = EVP_MAX_MD_SIZE;
+ 
+-  HMAC_Init_ex(&key->mac_ctx, 0, 0, 0, 0);
+-  HMAC_Update(&key->mac_ctx, data, dataLen);
+  HMAC_Init_ex(key->mac_ctx, 0, 0, 0, 0);
+  HMAC_Update(key->mac_ctx, data, dataLen);
+   if (chainedIV) {
+     // toss in the chained IV as well
+     uint64_t tmp = *chainedIV;
+@@ -462,10 +467,10 @@ static uint64_t _checksum_64(SSLKey *key, const unsigned char *data,
+       tmp >>= 8;
+     }
+ 
+-    HMAC_Update(&key->mac_ctx, h, 8);
+    HMAC_Update(key->mac_ctx, h, 8);
+   }
+ 
+-  HMAC_Final(&key->mac_ctx, md, &mdLen);
+  HMAC_Final(key->mac_ctx, md, &mdLen);
+ 
+   rAssert(mdLen >= 8);
+ 
+@@ -636,10 +641,10 @@ void SSL_Cipher::setIVec(unsigned char *ivec, uint64_t seed,
+     }
+ 
+     // combine ivec and seed with HMAC
+-    HMAC_Init_ex(&key->mac_ctx, 0, 0, 0, 0);
+-    HMAC_Update(&key->mac_ctx, ivec, _ivLength);
+-    HMAC_Update(&key->mac_ctx, md, 8);
+-    HMAC_Final(&key->mac_ctx, md, &mdLen);
+    HMAC_Init_ex(key->mac_ctx, 0, 0, 0, 0);
+    HMAC_Update(key->mac_ctx, ivec, _ivLength);
+    HMAC_Update(key->mac_ctx, md, 8);
+    HMAC_Final(key->mac_ctx, md, &mdLen);
+     rAssert(mdLen >= _ivLength);
+ 
+     memcpy(ivec, md, _ivLength);
+@@ -731,17 +736,17 @@ bool SSL_Cipher::streamEncode(unsigned char *buf, int size, uint64_t iv64,
+   shuffleBytes(buf, size);
+ 
+   setIVec(ivec, iv64, key);
+-  EVP_EncryptInit_ex(&key->stream_enc, NULL, NULL, NULL, ivec);
+-  EVP_EncryptUpdate(&key->stream_enc, buf, &dstLen, buf, size);
+-  EVP_EncryptFinal_ex(&key->stream_enc, buf + dstLen, &tmpLen);
+  EVP_EncryptInit_ex(key->stream_enc, NULL, NULL, NULL, ivec);
+  EVP_EncryptUpdate(key->stream_enc, buf, &dstLen, buf, size);
+  EVP_EncryptFinal_ex(key->stream_enc, buf + dstLen, &tmpLen);
+ 
+   flipBytes(buf, size);
+   shuffleBytes(buf, size);
+ 
+   setIVec(ivec, iv64 + 1, key);
+-  EVP_EncryptInit_ex(&key->stream_enc, NULL, NULL, NULL, ivec);
+-  EVP_EncryptUpdate(&key->stream_enc, buf, &dstLen, buf, size);
+-  EVP_EncryptFinal_ex(&key->stream_enc, buf + dstLen, &tmpLen);
+  EVP_EncryptInit_ex(key->stream_enc, NULL, NULL, NULL, ivec);
+  EVP_EncryptUpdate(key->stream_enc, buf, &dstLen, buf, size);
+  EVP_EncryptFinal_ex(key->stream_enc, buf + dstLen, &tmpLen);
+ 
+   dstLen += tmpLen;
+   if (dstLen != size) {
+@@ -765,17 +770,17 @@ bool SSL_Cipher::streamDecode(unsigned char *buf, int size, uint64_t iv64,
+   int dstLen = 0, tmpLen = 0;
+ 
+   setIVec(ivec, iv64 + 1, key);
+-  EVP_DecryptInit_ex(&key->stream_dec, NULL, NULL, NULL, ivec);
+-  EVP_DecryptUpdate(&key->stream_dec, buf, &dstLen, buf, size);
+-  EVP_DecryptFinal_ex(&key->stream_dec, buf + dstLen, &tmpLen);
+  EVP_DecryptInit_ex(key->stream_dec, NULL, NULL, NULL, ivec);
+  EVP_DecryptUpdate(key->stream_dec, buf, &dstLen, buf, size);
+  EVP_DecryptFinal_ex(key->stream_dec, buf + dstLen, &tmpLen);
+ 
+   unshuffleBytes(buf, size);
+   flipBytes(buf, size);
+ 
+   setIVec(ivec, iv64, key);
+-  EVP_DecryptInit_ex(&key->stream_dec, NULL, NULL, NULL, ivec);
+-  EVP_DecryptUpdate(&key->stream_dec, buf, &dstLen, buf, size);
+-  EVP_DecryptFinal_ex(&key->stream_dec, buf + dstLen, &tmpLen);
+  EVP_DecryptInit_ex(key->stream_dec, NULL, NULL, NULL, ivec);
+  EVP_DecryptUpdate(key->stream_dec, buf, &dstLen, buf, size);
+  EVP_DecryptFinal_ex(key->stream_dec, buf + dstLen, &tmpLen);
+ 
+   unshuffleBytes(buf, size);
+ 
+@@ -796,7 +801,7 @@ bool SSL_Cipher::blockEncode(unsigned char *buf, int size, uint64_t iv64,
+   rAssert(key->ivLength == _ivLength);
+ 
+   // data must be integer number of blocks
+-  const int blockMod = size % EVP_CIPHER_CTX_block_size(&key->block_enc);
+  const int blockMod = size % EVP_CIPHER_CTX_block_size(key->block_enc);
+   if (blockMod != 0)
+     throw Error("Invalid data size, not multiple of block size");
+ 
+@@ -807,9 +812,9 @@ bool SSL_Cipher::blockEncode(unsigned char *buf, int size, uint64_t iv64,
+   int dstLen = 0, tmpLen = 0;
+   setIVec(ivec, iv64, key);
+ 
+-  EVP_EncryptInit_ex(&key->block_enc, NULL, NULL, NULL, ivec);
+-  EVP_EncryptUpdate(&key->block_enc, buf, &dstLen, buf, size);
+-  EVP_EncryptFinal_ex(&key->block_enc, buf + dstLen, &tmpLen);
+  EVP_EncryptInit_ex(key->block_enc, NULL, NULL, NULL, ivec);
+  EVP_EncryptUpdate(key->block_enc, buf, &dstLen, buf, size);
+  EVP_EncryptFinal_ex(key->block_enc, buf + dstLen, &tmpLen);
+   dstLen += tmpLen;
+ 
+   if (dstLen != size) {
+@@ -828,7 +833,7 @@ bool SSL_Cipher::blockDecode(unsigned char *buf, int size, uint64_t iv64,
+   rAssert(key->ivLength == _ivLength);
+ 
+   // data must be integer number of blocks
+-  const int blockMod = size % EVP_CIPHER_CTX_block_size(&key->block_dec);
+  const int blockMod = size % EVP_CIPHER_CTX_block_size(key->block_dec);
+   if (blockMod != 0)
+     throw Error("Invalid data size, not multiple of block size");
+ 
+@@ -839,9 +844,9 @@ bool SSL_Cipher::blockDecode(unsigned char *buf, int size, uint64_t iv64,
+   int dstLen = 0, tmpLen = 0;
+   setIVec(ivec, iv64, key);
+ 
+-  EVP_DecryptInit_ex(&key->block_dec, NULL, NULL, NULL, ivec);
+-  EVP_DecryptUpdate(&key->block_dec, buf, &dstLen, buf, size);
+-  EVP_DecryptFinal_ex(&key->block_dec, buf + dstLen, &tmpLen);
+  EVP_DecryptInit_ex(key->block_dec, NULL, NULL, NULL, ivec);
+  EVP_DecryptUpdate(key->block_dec, buf, &dstLen, buf, size);
+  EVP_DecryptFinal_ex(key->block_dec, buf + dstLen, &tmpLen);
+   dstLen += tmpLen;
+ 
+   if (dstLen != size) {
+diff --git a/encfs/SSL_Compat.h b/encfs/SSL_Compat.h
+new file mode 100644
+index 0000000..f7b1629
+--- /dev/null
+++ b/encfs/SSL_Compat.h
+@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Author:   Rogelio Dominguez Hernandez <rogelio.dominguez@gmail.com>
+ *
+ *****************************************************************************
+ * Copyright (c) 2016, Rogelio Dominguez Hernandez
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _SSL_Compat_incl_
+#define _SSL_Compat_incl_
+
+// OpenSSL < 1.1.0
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+
+// Equivalent methods
+#define EVP_MD_CTX_new EVP_MD_CTX_create
+#define EVP_MD_CTX_free EVP_MD_CTX_destroy
+#define HMAC_CTX_reset HMAC_CTX_cleanup
+
+// Missing methods (based on 1.1.0 versions)
+HMAC_CTX *HMAC_CTX_new(void)
+{
+  HMAC_CTX *ctx = (HMAC_CTX *)OPENSSL_malloc(sizeof(HMAC_CTX));
+  if (ctx != NULL) {
+    memset(ctx, 0, sizeof(HMAC_CTX));
+    HMAC_CTX_reset(ctx);
+  }
+  return ctx;
+}
+
+void HMAC_CTX_free(HMAC_CTX *ctx)
+{
+  if (ctx != NULL) {
+    HMAC_CTX_cleanup(ctx);
+    OPENSSL_free(ctx);
+  }
+}
+#endif
+
+#endif
+diff --git a/encfs/encfssh b/encfs/encfssh
+old mode 100755
+new mode 100644
+
--- a/fuse2/PKGBUILD
+++ b/fuse2/PKGBUILD
@ -0,0 +1,46 @@
+# Arch contributor: /chakra/core/e4rat/src/e4rat-0.2.3/src/logging.hh:96:51:
+
+pkgname=fuse2
+pkgver=2.9.7
+pkgrel=1
+pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
+arch=('x86_64')
+url='https://github.com/libfuse/libfuse'
+license=('GPL2')
+provides=(fuse=$pkgver) # TODO: remove it once all packages start to use 'fuse2' name
+replaces=('fuse')
+conflicts=('fuse')
+depends=('glibc' 'fuse-common')
+makedepends=('pkg-config')
+options=(!emptydirs)
+source=(https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.gz{,.asc})
+sha1sums=('cd174e3d37995a42fad32fac92f76cd18e24174f'
+          'SKIP')
+validpgpkeys=(ED31791B2C5C1613AF388B8AD113FCAC3C4E599F) # Nikolaus Rath <Nikolaus@rath.org>
+
+build() {
+  cd fuse-$pkgver
+
+  export MOUNT_FUSE_PATH=/usr/bin
+  ./configure --prefix=/usr --libdir=/usr/lib --enable-lib --enable-util --disable-example
+  make
+}
+
+package() {
+  cd fuse-$pkgver
+
+  make DESTDIR=${pkgdir} install
+
+  # Remove init script in wrong path
+  # Don't add our own for now, as fusectl fs oopses on 2.6.18
+  rm -r ${pkgdir}/etc/init.d
+
+  # remove udev rules (is in the udev package}
+  rm -rf ${pkgdir}/etc/udev
+
+  # static device nodes are handled by udev
+  rm -r ${pkgdir}/dev
+
+  # part of fuse-common package
+  rm ${pkgdir}/usr/share/man/man8/mount.fuse.8
+}
--- a/fuse3/PKGBUILD
+++ b/fuse3/PKGBUILD
@ -0,0 +1,65 @@
+# Arch Contributor: https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/fuse3
+
+pkgbase=fuse3
+pkgname=(fuse-common fuse3)
+pkgver=3.0.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='https://github.com/libfuse/libfuse'
+license=('GPL2')
+makedepends=('pkg-config')
+options=(!emptydirs)
+source=(https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.gz{,.asc}
+	'fuse.conf')
+sha1sums=('0aa9a250a91cc6de028eeaf853d6c581c0824b04'
+          'SKIP'
+          '3b42e37a741d4651099225987dc40e7f02a716ad')
+validpgpkeys=(ED31791B2C5C1613AF388B8AD113FCAC3C4E599F) # Nikolaus Rath <Nikolaus@rath.org>
+
+build() {
+  cd fuse-$pkgver
+
+  export MOUNT_FUSE_PATH=/usr/bin
+  ./configure --prefix=/usr --libdir=/usr/lib --enable-lib --enable-util --disable-example
+  make
+}
+
+package_fuse-common() {
+  pkgdesc="Common files for fuse2/3 packages"
+  backup=(etc/fuse.conf)
+
+  cd fuse-$pkgver
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
+
+  # static device nodes are handled by udev
+  rm -r ${pkgdir}/dev
+
+  # Remove init script in wrong path
+  # Don't add our own for now, as fusectl fs oopses on 2.6.18
+  rm -r ${pkgdir}/usr/etc/init.d
+
+  # part of fuse3 package
+  rm -r ${pkgdir}/usr/{bin,include,lib/{pkgconfig,libfuse3.so*,*.a},share/man/man1/fusermount3.1}
+}
+
+package_fuse3() {
+  pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
+  depends=('glibc' 'fuse-common')
+
+  cd fuse-$pkgver
+
+  make DESTDIR=${pkgdir} install
+
+  # Remove init script in wrong path
+  # Don't add our own for now, as fusectl fs oopses on 2.6.18
+  rm -r ${pkgdir}/usr/etc/init.d
+
+  # static device nodes are handled by udev
+  rm -r ${pkgdir}/dev
+
+  # part of fuse-common package
+  rm -r ${pkgdir}/usr/lib/udev/rules.d
+  rm ${pkgdir}/usr/share/man/man8/mount.fuse.8
+}
--- a/fuse3/fuse.conf
+++ b/fuse3/fuse.conf
@ -0,0 +1,9 @@
+# Set the maximum number of FUSE mounts allowed to non-root users.
+# The default is 1000.
+#
+#mount_max = 1000
+
+# Allow non-root users to specify the 'allow_other' or 'allow_root'
+# mount options.
+#
+#user_allow_other
--- a/hugin-tools/PKGBUILD
+++ b/hugin-tools/PKGBUILD
@ -1,18 +1,13 @@
 pkgname=hugin-tools
 _pkgname=hugin
-<<<<<<< HEAD
 pkgver=2016.2.0
-pkgrel=1
-=======
-pkgver=2016.0.0
-pkgrel=3
->>>>>>> 059e8ba17fd296d619fbbcc83d5793c2f7b89874
+pkgrel=4
 pkgdesc="Hugin libs and tools to be used by Kipi-plugins"
 arch=('x86_64')
 url="http://hugin.sourceforge.net/"
 license=('LGPL')
 depends=('boost-libs' 'enblend-enfuse' 'exiv2>=0.25' 'fftw' 'perl-exiftool' 'openexr' 'libpano13>=2.9.19'
-         'sqlite3' 'lapack' 'desktop-file-utils' 'icu' 'libxt' 'libpng' 'libxrandr' 'openexr')
+         'sqlite3' 'lapack' 'glew' 'desktop-file-utils' 'icu' 'libxt' 'libpng' 'libxrandr' 'openexr')
 makedepends=('zip' 'cmake' 'boost' 'mesa' 'tclap')
 source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2")
 sha1sums=('9d28609d973fa72b95b1e2506cf1de7d24578e67')
--- a/lightspark/PKGBUILD
+++ b/lightspark/PKGBUILD
@ -1,50 +0,0 @@
-#
-# Platform Packages for Chakra, part of chakra-project.org
-#
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
-pkgname=lightspark
-pkgver=0.5.2.1
-pkgrel=2
-pkgdesc='An alternative Flash Player for Linux.'
-arch=('i686' 'x86_64')
-url='http://lightspark.sourceforge.net'
-license=('LGPL3')
-conflicts=('lightspark-git')
-depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'desktop-file-utils' 'libxml++' 'libxml2')
-makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig')
-optdepends=('gnash-gtk: fallback support')
-install="$pkgname.install"
-source=("http://launchpad.net/$pkgname/trunk/$pkgname-${pkgver}/+download/$pkgname-${pkgver}.tar.gz"
-        'llvm29.diff')
-md5sums=('ac2233a83e8bf0b305563bbce322cd76'
-         'e9efe78b9462d9834a01fe2cb1ef9697')
-
-build() {
-  cd $pkgname-${pkgver}
-  patch -Np0 -i ${srcdir}/llvm29.diff
-  cd ${srcdir}
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCOMPILE_PLUGIN=1 \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \
-    ../$pkgname-${pkgver}
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-}
--- a/lightspark/lightspark.install
+++ b/lightspark/lightspark.install
@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
--- a/lightspark/llvm29.diff
+++ b/lightspark/llvm29.diff
@ -1,12 +0,0 @@
--- CMakeLists.txt.old	2011-11-01 22:07:52.475608726 +0000
-+++ CMakeLists.txt	2011-11-01 22:08:52.046241925 +0000
-@@ -152,7 +152,8 @@
-	MESSAGE(FATAL_ERROR "LLVM >=2.8 is required!")
- ENDIF(${LLVM_STRING_VERSION} VERSION_LESS 2.8)
- IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9)
-	MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!")
-+	#MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!")
-+	ADD_DEFINITIONS(-DLLVM_29)
- ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9)
- IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8)
-	ADD_DEFINITIONS(-DLLVM_28)
--- a/mariadb/PKGBUILD
+++ b/mariadb/PKGBUILD
@ -2,7 +2,7 @@ pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
 pkgver=10.1.22
 _pkgver=${pkgver/.a/a}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('GPL')
 url='http://mariadb.org/'
--- a/strigi-git/PKGBUILD
+++ b/strigi-git/PKGBUILD
@ -1,82 +0,0 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# from AUR package: https://aur.archlinux.org/packages.php?ID=45165
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
-pkgname=strigi-git
-pkgver=20110925
-pkgrel=1
-pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
-arch=('i686' 'x86_64')
-url="http://strigi.sourceforge.net/"
-license=('GPL')
-depends=('qt' 'bzip2' 'exiv2' 'libxml2' 'boost-libs')
-makedepends=('git' 'cmake' 'boost')
-replaces=('strigi')
-conflicts=('strigi')
-provides=('strigi')
-
-_gitroot="git://anongit.kde.org/strigi"
-_gitname="strigi"
-
-# create tarball: source PKGBUILD && mksource
-
-mksource() {
-  git clone git://anongit.kde.org/strigi
-  pushd strigi
-  popd
-  tar -cvJf strigi-${pkgver}.tar.xz strigi/*
-  md5sum strigi-${pkgver}.tar.xz
-}
-
-build() {
-  cd $srcdir
-  msg "Connecting to the GIT server...."
-  
-  if [[ -d $srcdir/$_gitname ]] ; then
-    cd $srcdir/$_gitname 
-    git pull origin
-    git submodule update
-    msg "The local files are updated."
-  else
-    git clone $_gitroot
-    cd $srcdir/$_gitname
-    git submodule update --init
-  fi
-  
-  msg "GIT checkout done"
-  msg "Starting make..."
-  if [[ -d ${srcdir}/build ]]; then
-    msg "Cleaning the previous build directory..."
-    rm -rf ${srcdir}/build
-  fi
-  mkdir $srcdir/build
-  cd $srcdir/build
-  cmake ${srcdir}/$_gitname -DCMAKE_BUILD_TYPE=debugfull \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DENABLE_INOTIFY=ON \
-		-DENABLE_LOG4CXX=OFF \
-		-DENABLE_FAM=OFF \
-		-DENABLE_CLUCENE=OFF \
-		-DENABLE_CLUCENE_NG=OFF \
-		-DENABLE_FFMPEG=OFF \
-		-DENABLE_XINE=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}/build/libstreams"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/build/libstreamanalyzer"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/build/strigiclient/lib/searchclient/qtdbus"
-  make DESTDIR="${pkgdir}" install
-  
-  cd "${srcdir}/build/strigiutils"
-  make DESTDIR="${pkgdir}" install
-}
--- a/tinyxml2/PKGBUILD
+++ b/tinyxml2/PKGBUILD
@ -0,0 +1,35 @@
+# Arch Contributor: https://projects.archlinux.org/svntogit/community.git/plain/trunk/PKGBUILD?h=packages/tinyxml2
+
+pkgname=tinyxml2
+pkgver=4.0.1
+pkgrel=1
+pkgdesc='Simple, small, C++ XML parser that can be easily integrated into other programs'
+url='http://www.grinninglizard.com/tinyxml2/'
+arch=('x86_64' 'i686')
+license=('zlib')
+depends=('gcc-libs')
+makedepends=('git' 'cmake' 'ninja')
+source=("git://github.com/leethomason/tinyxml2#tag=$pkgver")
+md5sums=('SKIP')
+
+build() {
+  cd "$pkgname"
+
+  mkdir -p build
+  cd build
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_BUILD_TYPE=Release \
+    -G Ninja
+  ninja
+}
+
+package() {
+  cd "$pkgname"
+
+  DESTDIR="$pkgdir" ninja -C build install
+  install -Dm644 readme.md "$pkgdir/usr/share/licenses/$pkgname/README.md"
+}
+
+# vim:set ts=2 sw=2 et:
--- a/vigra/PKGBUILD
+++ b/vigra/PKGBUILD
@ -2,46 +2,44 @@

 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
-pkgver=1.10.0
-pkgrel=3
-pkgdesc="Computer vision library"
+pkgver=1.11.0
+pkgrel=1
 arch=('x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
 license=('custom:MIT')
-makedepends=( # runtime deps
-             'libpng' 'libtiff' 'hdf5' 'fftw' 'openexr'
+makedepends=(# runtime deps
+             'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw'
              # buildtime deps
             'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 'python2-numpy' 'python3-sphinx')
-source=("https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/${pkgname}-${pkgver}-src-with-docu.tar.gz")
-md5sums=('85e2968e4ee5f9541b5dd8b3fb9cc433')
+source=("https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/${pkgname}-${pkgver}-src.tar.gz")
+md5sums=('7f80d289e03a2f2e8c8e85f3ff29d988')

 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  
+  cd "${srcdir}"/${pkgbase}-${pkgver}
  cmake -DCMAKE_INSTALL_PREFIX=/usr \
      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+      -DWITH_OPENEXR=true \
      -DWITH_VIGRANUMPY=1 \
-      -DWITH_OPENEXR=1 \
-      -DDOCINSTALL=share/doc 
+      -DDOCINSTALL=share/doc
  make
 }

 #check() {
 #  cd "${srcdir}"/${pkgname}-${pkgver}
-#  make -k check
+#  make -j1 -k check #|| /bin/true # i686 fails
 #}
-# Currently failed due to limitation of buildsystem

 package_vigra() {
-  depends=('libpng' 'libtiff' 'hdf5' 'fftw' 'openexr')
+  pkgdesc="Computer vision library"
+  depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw')
  optdepends=('python2: for python bindings'
              'boost-libs: for python bindings')

-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgbase}-${pkgver}
  make DESTDIR="${pkgdir}" install
  # license
  install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
+  
  # remove doc
  rm -rf "${pkgdir}"/usr/share/doc

@ -50,7 +48,9 @@ package_vigra() {
 }

 package_vigra-doc() {
-  pkgdesc+=" - documentation and examples"
+  pkgdesc="Computer vision library - documentation and examples"
+  #depends=('vigra')
+  #arch=('any')

  cd "${srcdir}"/${pkgbase}-${pkgver}
  make DESTDIR="${pkgdir}" install