diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 25 | ||||
| -rw-r--r-- | doubledigitversion.diff | 16 | ||||
| -rw-r--r-- | pulledpork.cron | 3 | ||||
| -rw-r--r-- | pulledpork.install (renamed from install) | 4 | ||||
| -rw-r--r-- | pulledpork.service | 9 | ||||
| -rw-r--r-- | pulledpork.timer | 10 |
7 files changed, 43 insertions, 37 deletions
@@ -1,14 +1,11 @@ -# Generated by mksrcinfo v8 -# Fri Dec 8 01:14:01 UTC 2017 pkgbase = pulledpork pkgdesc = Tool to automatically update rules for snort pkgver = 0.7.3 - pkgrel = 1 + pkgrel = 2 url = https://github.com/shirkdog/pulledpork - install = install + install = pulledpork.install arch = any license = GPL - depends = cron depends = perl depends = perl-lwp-protocol-https depends = perl-crypt-ssleay @@ -24,11 +21,13 @@ pkgbase = pulledpork source = pulledpork-0.7.3.tar.gz::https://github.com/shirkdog/pulledpork/archive/0.7.3.tar.gz source = pulledpork.conf source = pulledpork_update.sh - source = pulledpork.cron + source = pulledpork.service + source = pulledpork.timer sha256sums = 48c66dc9abb7545186d4fba497263c1d1b247c0ea7f0953db4d515e7898461a2 sha256sums = 361f698adbabdb85eaa559e26ae9feaca0ef1f419e76fe301364d9b67358475c sha256sums = 584326ce79c1694849f60f25e4306ae3f2df6228c34c2e6f3ba30993f53e6a3f - sha256sums = c9213d3076424dc391d09a6c19f769631f668f27206585dd98dcbf9390a1b9ee + sha256sums = 629f7f8a5e274a0615f49d81cbc90e5d3697fa3e85af3ca231000761c73554c3 + sha256sums = 2ac59ce33d8c7baefc809030c1a393d2951e936f1a9fb7d72ab392a69f6eb949 pkgname = pulledpork @@ -4,12 +4,12 @@ _user=shirkdog pkgname=pulledpork pkgver=0.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="Tool to automatically update rules for snort" arch=('any') url="https://github.com/${_user}/${pkgname}" license=('GPL') -depends=('cron' 'perl' 'perl-lwp-protocol-https' 'perl-crypt-ssleay' 'perl-archive-tar' 'perl-switch' 'perl-bytes-random-secure') +depends=('perl' 'perl-lwp-protocol-https' 'perl-crypt-ssleay' 'perl-archive-tar' 'perl-switch' 'perl-bytes-random-secure') optdepends=('snort') backup=('etc/pulledpork/pulledpork.conf' 'etc/pulledpork/disablesid.conf' @@ -19,18 +19,23 @@ backup=('etc/pulledpork/pulledpork.conf' source=("pulledpork-${pkgver}.tar.gz::https://github.com/${_user}/${pkgname}/archive/${pkgver}.tar.gz" "pulledpork.conf" "pulledpork_update.sh" - "pulledpork.cron") + "pulledpork.service" + "pulledpork.timer") sha256sums=('48c66dc9abb7545186d4fba497263c1d1b247c0ea7f0953db4d515e7898461a2' '361f698adbabdb85eaa559e26ae9feaca0ef1f419e76fe301364d9b67358475c' '584326ce79c1694849f60f25e4306ae3f2df6228c34c2e6f3ba30993f53e6a3f' - 'c9213d3076424dc391d09a6c19f769631f668f27206585dd98dcbf9390a1b9ee') -install=install + '629f7f8a5e274a0615f49d81cbc90e5d3697fa3e85af3ca231000761c73554c3' + '2ac59ce33d8c7baefc809030c1a393d2951e936f1a9fb7d72ab392a69f6eb949') +install=pulledpork.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -m644 -t etc ../pulledpork.conf +} package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -dm755 "${pkgdir}"/etc/cron.weekly "${pkgdir}"/etc/pulledpork "${pkgdir}"/usr/bin - install -Dm644 etc/* "${pkgdir}"/etc/pulledpork/ - install -Dm644 ../pulledpork.conf "${pkgdir}"/etc/pulledpork/ - install -Dm700 ../pulledpork.cron "${pkgdir}"/etc/cron.weekly/pulledpork - install -Dm755 pulledpork.pl ../pulledpork_update.sh "${pkgdir}"/usr/bin/ + install -Dm644 -t "${pkgdir}"/etc/pulledpork etc/* + install -Dm644 -t "${pkgdir}"/usr/lib/systemd/system ../pulledpork.{service,timer} + install -Dm755 -t "${pkgdir}"/usr/bin pulledpork.pl ../pulledpork_update.sh } diff --git a/doubledigitversion.diff b/doubledigitversion.diff deleted file mode 100644 index 2d0415228a5f..000000000000 --- a/doubledigitversion.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/pulledpork.pl b/pulledpork.pl ---- a/pulledpork.pl -+++ b/pulledpork.pl -@@ -1512,10 +1512,10 @@ sub snort_version { - open( FH, "$cmd 2>&1 |" ); - while (<FH>) { - next unless $_ =~ /Version/; -- if ( $_ =~ /\d\.\d\.\d\.\d/ ) { -+ if ( $_ =~ /\d+\.\d+\.\d+\.\d+/ ) { - $version = $&; - } -- elsif ( $_ =~ /\d\.\d\.\d/ ) { -+ elsif ( $_ =~ /\d+\.\d+\.\d+(?!\.)/ ) { - $version = $& . ".0"; - } - } diff --git a/pulledpork.cron b/pulledpork.cron deleted file mode 100644 index b5a9488f0640..000000000000 --- a/pulledpork.cron +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/bin/pulledpork_update.sh /etc/snort/rules/snort.rules > /dev/null 2>&1 diff --git a/install b/pulledpork.install index e185ca87effb..bb88fdcd5160 100644 --- a/install +++ b/pulledpork.install @@ -15,5 +15,7 @@ _EOF } post_upgrade() { - post_install $1 + if (( $(vercmp $2 0.7.3-2) < 0)); then + systemctl --now enable pulledpork.timer + fi } diff --git a/pulledpork.service b/pulledpork.service new file mode 100644 index 000000000000..23e3bbc9ad1b --- /dev/null +++ b/pulledpork.service @@ -0,0 +1,9 @@ +[Unit] +Description=PulledPork rules downloader +After=network.target + +[Service] +Type=simple +ExecStart=/usr/bin/pulledpork_update.sh /etc/snort/rules/snort.rules +StandardOutput=null +StandardError=null diff --git a/pulledpork.timer b/pulledpork.timer new file mode 100644 index 000000000000..8d9cf1037ea5 --- /dev/null +++ b/pulledpork.timer @@ -0,0 +1,10 @@ +[Unit] +Description=PulledPork rules downloader + +[Timer] +OnCalendar=weekly +Persistent=true +RandomizedDelaySec=12h + +[Install] +WantedBy=timers.target |