diff options
| author | Amish | 2017-10-14 12:26:13 +0530 |
|---|---|---|
| committer | Amish | 2017-10-14 12:26:13 +0530 |
| commit | 38c851755b13d7a4bd8c03a45523f09941e79740 (patch) | |
| tree | ba87a7ea1fdd9f3acf77231dfb23c728e1c7882b | |
| parent | 4c325a76cc51454118ed25b79736744f1e81e6a4 (diff) | |
| download | aur-38c851755b13d7a4bd8c03a45523f09941e79740.tar.gz | |
Handle double digit snort version
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | doubledigitversion.diff | 16 |
3 files changed, 28 insertions, 3 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Wed Jun 7 03:32:59 UTC 2017 +# Sat Oct 14 06:55:32 UTC 2017 pkgbase = pulledpork pkgdesc = Tool to automatically update rules for snort pkgver = 0.7.2 - pkgrel = 4 + pkgrel = 5 url = https://github.com/shirkdog/pulledpork install = install arch = any @@ -22,10 +22,12 @@ pkgbase = pulledpork backup = etc/pulledpork/enablesid.conf backup = etc/pulledpork/modifysid.conf source = pulledpork-0.7.2.tar.gz::https://github.com/shirkdog/pulledpork/archive/0.7.2.tar.gz + source = doubledigitversion.diff source = pulledpork.conf source = pulledpork_update.sh source = pulledpork.cron sha256sums = 50046477d5d1a18aec131a56bd3f21170057d8a31fd6f30af706e31d5b14bd0a + sha256sums = db6f4bf8a44f2d8c35c7bfc75fec53619ceb0fd737ce8be004755692a63a33a8 sha256sums = 60ae10e636568a216e5629a1e73450d086fd77cd3328f5ba2c90d2483a1e9c08 sha256sums = 584326ce79c1694849f60f25e4306ae3f2df6228c34c2e6f3ba30993f53e6a3f sha256sums = c9213d3076424dc391d09a6c19f769631f668f27206585dd98dcbf9390a1b9ee @@ -4,7 +4,7 @@ _user=shirkdog pkgname=pulledpork pkgver=0.7.2 -pkgrel=4 +pkgrel=5 pkgdesc="Tool to automatically update rules for snort" arch=('any') url="https://github.com/${_user}/${pkgname}" @@ -17,15 +17,22 @@ backup=('etc/pulledpork/pulledpork.conf' 'etc/pulledpork/enablesid.conf' 'etc/pulledpork/modifysid.conf') source=("pulledpork-${pkgver}.tar.gz::https://github.com/${_user}/${pkgname}/archive/${pkgver}.tar.gz" + "doubledigitversion.diff" "pulledpork.conf" "pulledpork_update.sh" "pulledpork.cron") sha256sums=('50046477d5d1a18aec131a56bd3f21170057d8a31fd6f30af706e31d5b14bd0a' + 'db6f4bf8a44f2d8c35c7bfc75fec53619ceb0fd737ce8be004755692a63a33a8' '60ae10e636568a216e5629a1e73450d086fd77cd3328f5ba2c90d2483a1e9c08' '584326ce79c1694849f60f25e4306ae3f2df6228c34c2e6f3ba30993f53e6a3f' 'c9213d3076424dc391d09a6c19f769631f668f27206585dd98dcbf9390a1b9ee') install=install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ../doubledigitversion.diff +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" install -dm755 "${pkgdir}"/etc/cron.weekly "${pkgdir}"/etc/pulledpork "${pkgdir}"/usr/bin diff --git a/doubledigitversion.diff b/doubledigitversion.diff new file mode 100644 index 000000000000..1441291f1960 --- /dev/null +++ b/doubledigitversion.diff @@ -0,0 +1,16 @@ +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|\d+)/ ) { + $version = $&; + } +- elsif ( $_ =~ /\d\.\d\.\d/ ) { ++ elsif ( $_ =~ /\d+\.\d+\.\d+(?!\.)/ ) { + $version = $& . ".0"; + } + } |