change depends to libdaq-nfqueue

3 files changed, 9 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abd0f67cace3..47b4b6f7eaa2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
-# Generated by mksrcinfo v8
-# Sat Mar  4 15:24:31 UTC 2017
 pkgbase = snort-nfqueue
 	pkgdesc = A lightweight network intrusion detection system.
 	pkgver = 2.9.9.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.snort.org
 	install = snort.install
 	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = libdaq
+	depends = libdaq-nfqueue
 	depends = libdnet
 	depends = libnetfilter_queue
 	depends = libpcap
 	depends = openssl
 	depends = pcre
 	depends = zlib
-	provides = snort=2.9.9.0
+	provides = snort
 	conflicts = snort
 	options = !makeflags
 	options = !libtool
@@ -36,7 +34,7 @@ pkgbase = snort-nfqueue
 	source = logrotate
 	source = snort.service
 	sha256sums = 71b147125e96390a12f3d55796ed5073df77206bd3563d84d3e5a1f19e7d7a56
-	sha256sums = fde9236d0f17944fb58ad9016163f6781f7c3464ee28cb388d9abce032dc01f7
+	sha256sums = 8ba237d55d753af880db217811ff0fad3812caf014b7b239a1cd067f58e61883
 	sha256sums = c947dcf8b243647537ca998bd6271fc06f9e6a33af29aff7ff0951430bebcff4
 	sha256sums = b65d8d8e37f686244dfb7293b1ea378f1dfd8141c14dbaf5e83dba9440152808
 	sha256sums = ec4d81936b3905ba980ee694ae77ad15d5adda45c9f87fa0c27adc38f11bca08
diff --git a/PKGBUILD b/PKGBUILD
index 3eedf1fc0db6..174986be6758 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,14 @@
 pkgname=snort-nfqueue
 _pkgname=snort
 pkgver=2.9.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A lightweight network intrusion detection system.'
 arch=('i686' 'x86_64')
 url='http://www.snort.org'
 license=('GPL')
-provides=("snort=${pkgver}")
+provides=('snort')
 conflicts=('snort')
-depends=('libdaq' 'libdnet' 'libnetfilter_queue' 'libpcap' 'openssl' 'pcre' 'zlib')
+depends=('libdaq-nfqueue' 'libdnet' 'libnetfilter_queue' 'libpcap' 'openssl' 'pcre' 'zlib')
 backup=('etc/snort/snort.conf'
         'etc/snort/homenet.conf'
         'etc/snort/rules/local.rules'
@@ -35,22 +35,13 @@ source=("https://www.snort.org/downloads/snort/${_pkgname}-${pkgver}.tar.gz"
         'logrotate'
 	'snort.service')
 sha256sums=('71b147125e96390a12f3d55796ed5073df77206bd3563d84d3e5a1f19e7d7a56'
-            'fde9236d0f17944fb58ad9016163f6781f7c3464ee28cb388d9abce032dc01f7'
+            '8ba237d55d753af880db217811ff0fad3812caf014b7b239a1cd067f58e61883'
             'c947dcf8b243647537ca998bd6271fc06f9e6a33af29aff7ff0951430bebcff4'
             'b65d8d8e37f686244dfb7293b1ea378f1dfd8141c14dbaf5e83dba9440152808'
             'ec4d81936b3905ba980ee694ae77ad15d5adda45c9f87fa0c27adc38f11bca08'
             '4df93871c41f94d688a6c8b9762fa221a703b54d309ee1436c90eebbd3fb8c9d'
             'b904ed172ea0c1a4eeaddb30745aadb8db21e333eb9faaf93400ce3db166f90d')
 
-prepare() {
-  if [ ! -x "/usr/lib/daq/daq_nfq.so" ]; then
-    echo 'ERROR: daq is without NFQUEUE support'
-    echo 'ERROR: first download libdaq source, makepkg and install it'
-    echo 'WEBSITE: https://www.archlinux.org/packages/?q=libdaq'
-    exit
-  fi 
-}
-
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc/snort --with-libpcap-includes=/usr/include/pcap \
@@ -67,7 +58,7 @@ package() {
   install -d -m750 "${pkgdir}/var/log/snort/old"
   chmod 750 "${pkgdir}/var/log/snort"
   chown -R 29:29 "${pkgdir}/var/log/snort"
-  install -d -m755 "${pkgdir}/etc/snort/rules" "${pkgdir}/etc/snort/dynamicrules"
+  install -d -m755 "${pkgdir}"/etc/snort/{dynamic,}rules
   install -D -m644 etc/{*.conf*,*.map} "${pkgdir}/etc/snort/"
   install -D -m644 ../snort.conf ../homenet.conf "${pkgdir}/etc/snort/"
   install -D -m644 ../local.rules "${pkgdir}/etc/snort/rules/"
diff --git a/snort.install b/snort.install
index 8a6460c317e3..4a06663022c9 100644
--- a/snort.install
+++ b/snort.install
@@ -19,15 +19,6 @@ cat << _EOF
 >>>   use barnyard2 to store them in database
 
 _EOF
-
-  if [ ! -x "/usr/lib/daq/daq_nfq.so" ]; then
-    echo
-    echo 'WARNING: daq is without NFQUEUE support snort-nfqueue will NOT work'
-    echo 'WARNING: first download libdaq source, makepkg and install it'
-    echo
-    echo 'WEBSITE: https://www.archlinux.org/packages/?q=libdaq'
-    echo
-  fi
 }
 
 post_upgrade() {