From c68deeb4b9c22787b8ae73196afc2e48355365f1 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Fri, 28 Nov 2014 15:36:05 -0200
Subject: paxd-libre-1.3-2: add fix_issues.patch to solve paxd-libre.conf path
 issue

---
 libre/paxd-libre/PKGBUILD         | 12 +++++++++---
 libre/paxd-libre/fix_issues.patch | 25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 libre/paxd-libre/fix_issues.patch

diff --git a/libre/paxd-libre/PKGBUILD b/libre/paxd-libre/PKGBUILD
index eb0f65388..245b00035 100644
--- a/libre/paxd-libre/PKGBUILD
+++ b/libre/paxd-libre/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=paxd
 pkgname=paxd-libre
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc='PaX exception daemon (a libre fork of paxd)'
 arch=(i686 x86_64)
 url='https://github.com/g4jc/paxd-libre/'
@@ -14,11 +14,17 @@ replaces=($_pkgname linux-pax-flags)
 conflicts=($_pkgname linux-pax-flags)
 provides=($_pkgname linux-pax-flags)
 depends=(glibc)
-source=(https://github.com/g4jc/paxd-libre/archive/$pkgver.tar.gz 10-enable-pax.conf)
+source=(https://github.com/g4jc/paxd-libre/archive/$pkgver.tar.gz 10-enable-pax.conf
+        fix_issues.patch)
 md5sums=('0eb1c2271cd3e893d4ed1bdf4772d714'
-         'a40677d2cd39ada4c2560927c67e0ea2')
+         'a40677d2cd39ada4c2560927c67e0ea2'
+         'b4c7f8929ddcf94e19155d27c11d0231')
 backup=(etc/paxd-libre.conf)
 
+prepare() {
+  patch -Np1 -i "$srcdir/fix_issues.patch"
+}
+
 build() {
   cd $pkgname-$pkgver
   make CC=gcc
diff --git a/libre/paxd-libre/fix_issues.patch b/libre/paxd-libre/fix_issues.patch
new file mode 100644
index 000000000..07120cd51
--- /dev/null
+++ b/libre/paxd-libre/fix_issues.patch
@@ -0,0 +1,25 @@
+diff -Nur paxd-libre-1.3.orig/paxd-libre.c paxd-libre-1.3/paxd-libre.c
+--- paxd-libre-1.3.orig/paxd-libre.c	2014-11-08 19:40:27.000000000 -0200
++++ paxd-libre-1.3/paxd-libre.c	2014-11-28 15:30:42.304537269 -0200
+@@ -28,7 +28,7 @@
+         perror("inotify");
+         return EXIT_FAILURE;
+     }
+-    int watch_conf = inotify_add_watch_x(inotify, "/etc/paxd.conf", IN_MODIFY);
++    int watch_conf = inotify_add_watch_x(inotify, "/etc/paxd-libre.conf", IN_MODIFY);
+     int watch_conf_dir = inotify_add_watch_x(inotify, "/etc/", IN_CREATE | IN_MOVED_TO);
+     int watch_pacman = inotify_add_watch_x(inotify, "/var/lib/pacman/", IN_DELETE);
+ 
+@@ -45,10 +45,10 @@
+ 
+             if (event->wd == watch_conf) {
+                 fprintf(stderr, "configuration modified, updating attributes\n");
+-            } else if (event->wd == watch_conf_dir && !strcmp(event->name, "paxd.conf")) {
++            } else if (event->wd == watch_conf_dir && !strcmp(event->name, "paxd-libre.conf")) {
+                 fprintf(stderr, "configuration created or moved to, updating attributes\n");
+                 close(watch_conf);
+-                watch_conf = inotify_add_watch_x(inotify, "/etc/paxd.conf", IN_MODIFY);
++                watch_conf = inotify_add_watch_x(inotify, "/etc/paxd-libre.conf", IN_MODIFY);
+             } else if (event->wd == watch_pacman && !strcmp(event->name, "db.lck")) {
+                 fprintf(stderr, "pacman finished a transaction, updating attributes\n");
+             } else {
-- 
cgit v1.2.3