diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/paxd-libre/PKGBUILD | 21 | ||||
| -rw-r--r-- | libre/paxd-libre/fix_issues.patch | 54 |
2 files changed, 8 insertions, 67 deletions
diff --git a/libre/paxd-libre/PKGBUILD b/libre/paxd-libre/PKGBUILD index ebba6335c..41792771e 100644 --- a/libre/paxd-libre/PKGBUILD +++ b/libre/paxd-libre/PKGBUILD @@ -4,8 +4,8 @@ _pkgname=paxd pkgname=paxd-libre -pkgver=1.3 -pkgrel=3 +pkgver=1.5 +pkgrel=1 pkgdesc='PaX exception daemon (a libre fork of paxd)' arch=(i686 x86_64) url='https://github.com/g4jc/paxd-libre/' @@ -13,19 +13,12 @@ license=(MIT) 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 - fix_issues.patch) -md5sums=('0eb1c2271cd3e893d4ed1bdf4772d714' - 'a40677d2cd39ada4c2560927c67e0ea2' - '65b14c96ced5d3e98f3bfb8ab9ca3894') +depends=(glib2) +source=(https://github.com/g4jc/paxd-libre/archive/$pkgver.tar.gz 10-enable-pax.conf) +sha1sums=('b25b021658bc8e92f8f738cd6e9d2311d0177db2' + '8ee73dd288bc32438078e032dfc50a2f8ea6a5f2') backup=(etc/paxd-libre.conf) -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i "$srcdir/fix_issues.patch" -} - build() { cd $pkgname-$pkgver make CC=gcc @@ -37,4 +30,6 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm644 ../10-enable-pax.conf "$pkgdir/usr/lib/sysctl.d/10-enable-pax.conf" + ln -s paxd-libre.conf "$pkgdir/etc/paxd.conf" + ln -s ../paxd-libre.service "$pkgdir/usr/lib/systemd/system/sysinit.target.wants/paxd.service" } diff --git a/libre/paxd-libre/fix_issues.patch b/libre/paxd-libre/fix_issues.patch deleted file mode 100644 index e91508962..000000000 --- a/libre/paxd-libre/fix_issues.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Nur paxd-libre-1.3.orig/flags.c paxd-libre-1.3/flags.c ---- paxd-libre-1.3.orig/flags.c 2014-11-08 19:40:27.000000000 -0200 -+++ paxd-libre-1.3/flags.c 2014-12-29 23:04:54.096274926 -0200 -@@ -16,13 +16,13 @@ - } - - static void line_ignored(size_t n, const char *line) { -- fprintf(stderr, "ignored invalid line %zu in /etc/paxd-libre-libre.conf: %s", n, line); -+ fprintf(stderr, "ignored invalid line %zu in /etc/paxd-libre.conf: %s", n, line); - } - - void update_attributes(void) { -- FILE *conf = fopen("/etc/paxd-libre-libre.conf", "r"); -+ FILE *conf = fopen("/etc/paxd-libre.conf", "r"); - if (!conf) { -- perror("could not open /etc/paxd-libre-libre.conf"); -+ perror("could not open /etc/paxd-libre.conf"); - return; - } - -@@ -33,7 +33,7 @@ - ssize_t bytes_read = getline(&line, &line_len, conf); - if (bytes_read == -1) { - if (ferror(conf)) { -- perror("failed to read line from /etc/paxd-libre-libre.conf"); -+ perror("failed to read line from /etc/paxd-libre.conf"); - break; - } else { - break; -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 { |