From bc41a38cad4a617ac4c9d4c3d104ad7f40c20ba0 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Tue, 15 Dec 2015 07:32:25 +0000
Subject: [PATCH] update unrar 5.3.4

---
 hardening-wrapper/PKGBUILD                    | 25 +++++++++++++++++++
 hardening-wrapper/hardening-wrapper-i686.conf |  6 +++++
 .../hardening-wrapper-x86_64.conf             |  6 +++++
 hardening-wrapper/path.sh                     |  1 +
 unrar/PKGBUILD                                | 10 ++++----
 unrar/unrar-5.3.4-soname.patch                | 11 ++++++++
 6 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 hardening-wrapper/PKGBUILD
 create mode 100644 hardening-wrapper/hardening-wrapper-i686.conf
 create mode 100644 hardening-wrapper/hardening-wrapper-x86_64.conf
 create mode 100644 hardening-wrapper/path.sh
 create mode 100644 unrar/unrar-5.3.4-soname.patch

diff --git a/hardening-wrapper/PKGBUILD b/hardening-wrapper/PKGBUILD
new file mode 100644
index 000000000..2b92871f1
--- /dev/null
+++ b/hardening-wrapper/PKGBUILD
@@ -0,0 +1,25 @@
+# Contributor: Daniel Micay <danielmicay@gmail.com>
+pkgname=hardening-wrapper
+pkgver=10
+pkgrel=1
+pkgdesc='Wrapper scripts for building hardened executables by default'
+arch=(i686 x86_64)
+url='https://github.com/thestinger/hardening-wrapper'
+license=('MIT')
+depends=(bash)
+backup=(etc/hardening-wrapper.conf)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/thestinger/hardening-wrapper/archive/$pkgver.tar.gz"
+        path.sh hardening-wrapper-i686.conf hardening-wrapper-x86_64.conf)
+sha1sums=('61e8c7e3062e6830cd7b190aa6b81834138a7137'
+          '1e5f6d9931f01b26bb4b6fbb839e21d34d534cdc'
+          '6729f0a6d2af72b6def9383e8104d0f763d3f01d'
+          '9453d7984a4a90aa884a51a7bf1bd2c72cbddc9f')
+
+package() {
+  install -Dm644 hardening-wrapper-${CARCH}.conf "$pkgdir/etc/hardening-wrapper.conf"
+  install -Dm644 path.sh "$pkgdir/etc/profile.d/hardening-wrapper.sh"
+
+  cd $pkgname-$pkgver
+  make install DESTDIR="$pkgdir" PREFIX=/usr
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/hardening-wrapper/hardening-wrapper-i686.conf b/hardening-wrapper/hardening-wrapper-i686.conf
new file mode 100644
index 000000000..5bc97ed7d
--- /dev/null
+++ b/hardening-wrapper/hardening-wrapper-i686.conf
@@ -0,0 +1,6 @@
+HARDENING_BINDNOW=0
+HARDENING_PIE=0
+HARDENING_FORTIFY=2
+HARDENING_RELRO=1
+HARDENING_STACK_CHECK=1
+HARDENING_STACK_PROTECTOR=2
diff --git a/hardening-wrapper/hardening-wrapper-x86_64.conf b/hardening-wrapper/hardening-wrapper-x86_64.conf
new file mode 100644
index 000000000..15d4fd1d5
--- /dev/null
+++ b/hardening-wrapper/hardening-wrapper-x86_64.conf
@@ -0,0 +1,6 @@
+HARDENING_BINDNOW=0
+HARDENING_PIE=1
+HARDENING_FORTIFY=2
+HARDENING_RELRO=1
+HARDENING_STACK_CHECK=1
+HARDENING_STACK_PROTECTOR=2
diff --git a/hardening-wrapper/path.sh b/hardening-wrapper/path.sh
new file mode 100644
index 000000000..640ab758c
--- /dev/null
+++ b/hardening-wrapper/path.sh
@@ -0,0 +1 @@
+export PATH="/usr/lib/hardening-wrapper/bin:$PATH"
diff --git a/unrar/PKGBUILD b/unrar/PKGBUILD
index 601699fe8..40f966cc5 100644
--- a/unrar/PKGBUILD
+++ b/unrar/PKGBUILD
@@ -5,21 +5,21 @@
 
 pkgbase=unrar
 pkgname=('unrar' 'libunrar')
-pkgver=5.1.5
+pkgver=5.3.4
 pkgrel=1
 pkgdesc="The RAR uncompression program"
 arch=('i686' 'x86_64')
 url="http://www.rarlab.com/rar_add.htm"
 license=('custom')
-makedepends=('gcc-libs')
+makedepends=('hardening-wrapper')
 source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz"
-        'unrar-5.1.5-soname.patch')
-md5sums=('809db67b74942af7cf1d40edcec92976'
+        'unrar-5.3.4-soname.patch')
+md5sums=('60afbc74a97eff512a6c42425ec43bbf'
          'cd9a5291db0379d73148872cf6e6d3ce')
 
 prepare() {
   cd "${srcdir}/${pkgbase}"
-  patch -Np1 -i "${srcdir}/unrar-5.1.5-soname.patch"
+  patch -Np1 -i "${srcdir}/unrar-5.3.4-soname.patch"
 }
 
 build() {
diff --git a/unrar/unrar-5.3.4-soname.patch b/unrar/unrar-5.3.4-soname.patch
new file mode 100644
index 000000000..24d250a51
--- /dev/null
+++ b/unrar/unrar-5.3.4-soname.patch
@@ -0,0 +1,11 @@
+--- a/makefile	2013-04-29 16:27:05.000000000 +0200
++++ b/makefile	2013-10-01 22:07:29.611485989 +0200
+@@ -133,7 +133,7 @@
+ lib:	CXXFLAGS+=$(LIBFLAGS)
+ lib:	clean $(OBJECTS) $(LIB_OBJ)
+ 	@rm -f libunrar.so
+-	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
++	$(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ 
+ install-unrar:
+ 			install -D unrar $(DESTDIR)/bin/unrar