Package: suricata
Version: 1.4.7-1
Followup-For: Bug #725301
User: [email protected]
Usertags: origin-ubuntu  ubuntu-patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

*** /tmp/tmpTkXpca/bug_body

In Ubuntu, the attached patch was applied to achieve the following:

  * Fixed init script nfnetlink_queue detection for newer kernels. 

Thanks for considering the patch.

- -- System Information:
Debian Release: jessie/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty'), (100, 
'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0-24-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4

iQEcBAEBCgAGBQJTWAm6AAoJEAynk4KHaD/AMEgH/R3i7f62EnEdC+rfbmOySu8x
iKGvMtfbsQH66+WIeYH05OsgQWbT+Wl47abi+nRjhtNtzfqOBnTmt9Jmba32a/bI
tsBge7MIPnQ4YwbcpUMVutG6UJJLNGtDGc2OqWSI9/QtXH+fQO7ro1BD8/YO/xjd
SpkldL3qYObxLusNgVBvdUjwVzijxiTPdL4XTnCbxQZp+PYy60FTbnUOeJMXaqBe
8vyq8d6l74QI6aiSs2/XtgPjib8jtqE+PMx+k+q5ITTkd08zxYS8GsJmzwKB2l65
Op87eUmKfzWXQWyitydois4JmCKS/B/31zCoLbds9j2F1s4NmjZv2y3WBwco67E=
=u9b9
-----END PGP SIGNATURE-----
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2013-12-29 11:29:57 +0000
+++ debian/control	2014-04-23 18:41:55 +0000
@@ -1,7 +1,8 @@
 Source: suricata
 Section: net
 Priority: optional
-Maintainer: Pierre Chifflier <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Pierre Chifflier <[email protected]>
 Build-Depends: debhelper (>= 9),
     autotools-dev,
     dh-autoreconf,

=== modified file 'debian/suricata.init'
--- debian/suricata.init	2013-05-21 12:42:45 +0000
+++ debian/suricata.init	2014-04-23 16:20:50 +0000
@@ -42,9 +42,9 @@
 }
 
 check_nfqueue() {
-if [ ! -e /proc/net/netfilter/nf_queue ]; then
-    log_failure_msg "NFQUEUE support not found !"
-    log_failure_msg "Please ensure the nfnetlink_queue module is loaded or built in kernel"
+if [ $(set +e; ls /proc/net/netfilter/nf*queue > /dev/null 2>&1; echo $?; set -e) -ne 0 ]; then
+    log_failure_msg "NFQUEUE support not found (module: nfnetlink_queue)."
+    log_failure_msg "Please ensure module is loaded or built in kernel"
     exit 5
 fi
 }

Reply via email to