Update to 2.9.8.0-1

4 files changed, 54 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 784002ca18eb..d46acd281f10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sun Dec 13 12:15:23 UTC 2015
 pkgbase = snort-nfqueue
 	pkgdesc = A lightweight network intrusion detection system.
-	pkgver = 2.9.6.1
-	pkgrel = 7
+	pkgver = 2.9.8.0
+	pkgrel = 1
 	url = http://www.snort.org
 	install = snort.install
 	arch = i686
@@ -14,7 +16,7 @@ pkgbase = snort-nfqueue
 	depends = openssl
 	depends = pcre
 	depends = zlib
-	provides = snort=2.9.6.1
+	provides = snort=2.9.8.0
 	conflicts = snort
 	options = !makeflags
 	options = !libtool
@@ -26,18 +28,16 @@ pkgbase = snort-nfqueue
 	backup = etc/snort/reference.config
 	backup = etc/snort/classification.config
 	backup = etc/logrotate.d/snort
-	source = http://www.snort.org/dl/snort-current/snort-2.9.6.1.tar.gz
-	source = http://www.snort.org/dl/snort-current/snort-2.9.6.1.tar.gz.sig
+	source = https://www.snort.org/downloads/snort/snort-2.9.8.0.tar.gz
 	source = http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz
 	source = snort.conf
 	source = homenet.conf
 	source = local.rules
 	source = logrotate
 	source = snort.service
-	sha256sums = 119e4c5df83fe36a8d465e72a0347fe31e7771704da286f04115b0c5baa5f7b8
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = 7eb355f118a80002bc10b6069b641b57041ea9061e4d65f4c5e50d78aa640f84
+	sha256sums = bddd5d01d10d20c182836fa0199cd3549239b7a9d0fd5bbb10226feb8b42d231
+	sha256sums = 153e23ae701bfbfdbe32cb45c07039a0b5b876617f4abe68d8c514c52a98e955
+	sha256sums = c947dcf8b243647537ca998bd6271fc06f9e6a33af29aff7ff0951430bebcff4
 	sha256sums = b65d8d8e37f686244dfb7293b1ea378f1dfd8141c14dbaf5e83dba9440152808
 	sha256sums = ec4d81936b3905ba980ee694ae77ad15d5adda45c9f87fa0c27adc38f11bca08
 	sha256sums = 4df93871c41f94d688a6c8b9762fa221a703b54d309ee1436c90eebbd3fb8c9d
diff --git a/PKGBUILD b/PKGBUILD
index 2d144f2c9534..31b67d204a75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,14 @@
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 
 pkgname=snort-nfqueue
-pkgver=2.9.6.1
-pkgrel=7
+_pkgname=snort
+pkgver=2.9.8.0
+pkgrel=1
 pkgdesc='A lightweight network intrusion detection system.'
 arch=('i686' 'x86_64')
 url='http://www.snort.org'
 license=('GPL')
-provides=("snort=$pkgver")
+provides=("snort=${pkgver}")
 conflicts=('snort')
 depends=('libdaq' 'libdnet' 'libnetfilter_queue' 'libpcap' 'openssl' 'pcre' 'zlib')
 backup=('etc/snort/snort.conf'
@@ -26,17 +27,16 @@ backup=('etc/snort/snort.conf'
         'etc/logrotate.d/snort')
 options=('!makeflags' '!libtool')
 install='snort.install'
-source=("http://www.snort.org/dl/snort-current/snort-${pkgver}.tar.gz"{,.sig}
-	"http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"
+source=("https://www.snort.org/downloads/snort/${_pkgname}-${pkgver}.tar.gz"
+	"http://rules.emergingthreats.net/open/${_pkgname}-2.9.0/emerging.rules.tar.gz"
         'snort.conf'
         'homenet.conf'
         'local.rules'
         'logrotate'
 	'snort.service')
-sha256sums=('119e4c5df83fe36a8d465e72a0347fe31e7771704da286f04115b0c5baa5f7b8'
-            'SKIP'
-            'SKIP'
-            '7eb355f118a80002bc10b6069b641b57041ea9061e4d65f4c5e50d78aa640f84'
+sha256sums=('bddd5d01d10d20c182836fa0199cd3549239b7a9d0fd5bbb10226feb8b42d231'
+            '153e23ae701bfbfdbe32cb45c07039a0b5b876617f4abe68d8c514c52a98e955'
+            'c947dcf8b243647537ca998bd6271fc06f9e6a33af29aff7ff0951430bebcff4'
             'b65d8d8e37f686244dfb7293b1ea378f1dfd8141c14dbaf5e83dba9440152808'
             'ec4d81936b3905ba980ee694ae77ad15d5adda45c9f87fa0c27adc38f11bca08'
             '4df93871c41f94d688a6c8b9762fa221a703b54d309ee1436c90eebbd3fb8c9d'
@@ -52,29 +52,30 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/snort-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc/snort --with-libpcap-includes=/usr/include/pcap \
-	      --with-daq-includes=/usr/include --with-daq-libraries=/usr/lib/ \
+	      --with-daq-includes=/usr/include --with-daq-libraries=/usr/lib/daq/ \
               --enable-zlib --disable-static-daq
   make
 }
 
 package() {
-  cd "${srcdir}/snort-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 
-  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 -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/
-  touch "${pkgdir}"/etc/snort/rules/snort.rules
-  chmod 644 "${pkgdir}"/etc/snort/rules/snort.rules
-  install -D -m644 ../snort.service "${pkgdir}"/usr/lib/systemd/system/snort.service
+  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 -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/"
+  touch "${pkgdir}/etc/snort/rules/snort.rules"
+  chmod 644 "${pkgdir}/etc/snort/rules/snort.rules"
+  install -D -m644 ../snort.service "${pkgdir}/usr/lib/systemd/system/snort.service"
   sed -i 's#/usr/local/lib/#/usr/lib/#' "${pkgdir}/etc/snort/snort.conf"
-  install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/snort
+  install -Dm644 ../logrotate "${pkgdir}/etc/logrotate.d/snort"
 
   # emergingthreats rules
   cp ${srcdir}/rules/* "${pkgdir}/etc/snort/rules"
diff --git a/snort.conf b/snort.conf
index 397c02d1bfac..c027f5e6a7b9 100644
--- a/snort.conf
+++ b/snort.conf
@@ -10,7 +10,7 @@
 #     Snort bugs:                bugs@snort.org
 #
 #     Compatible with Snort Versions:
-#     VERSIONS : 2.9.6.1
+#     VERSIONS : 2.9.8
 #
 #     Snort build options:
 #     OPTIONS : --enable-gre --enable-mpls --enable-targetbased --enable-ppm --enable-perfprofiling --enable-zlib --enable-active-response --enable-normalizer --enable-reload --enable-react --enable-flexresp3
@@ -73,7 +73,7 @@ ipvar FTP_SERVERS $HOME_NET
 ipvar SIP_SERVERS $HOME_NET
 
 # List of ports you run web servers on
-portvar HTTP_PORTS [36,80,81,82,83,84,85,86,87,88,89,90,311,383,555,591,593,631,801,808,818,901,972,1158,1220,1414,1533,1741,1830,2231,2301,2381,2809,3029,3037,3057,3128,3443,3702,4000,4343,4848,5117,5250,6080,6173,6988,7000,7001,7071,7144,7145,7510,7770,7777,7779,8000,8008,8014,8028,8080,8081,8082,8085,8088,8090,8118,8123,8180,8181,8222,8243,8280,8300,8500,8509,8800,8888,8899,9000,9060,9080,9090,9091,9111,9443,9999,10000,11371,12601,15489,29991,33300,34412,34443,34444,41080,44449,50000,50002,51423,53331,55252,55555,56712] 
+portvar HTTP_PORTS [80,81,311,383,591,593,901,1220,1414,1741,1830,2301,2381,2809,3037,3128,3702,4343,4848,5250,6988,7000,7001,7144,7145,7510,7777,7779,8000,8008,8014,8028,8080,8085,8088,8090,8118,8123,8180,8181,8243,8280,8300,8800,8888,8899,9000,9060,9080,9090,9091,9443,9999,11371,34443,34444,41080,50002,55555]
 
 # List of ports you want to look for SHELLCODE on.
 portvar SHELLCODE_PORTS !80
@@ -107,6 +107,10 @@ var SO_RULE_PATH ../so_rules
 var PREPROC_RULE_PATH ../preproc_rules
 
 # If you are using reputation preprocessor set these
+# Currently there is a bug with relative paths, they are relative to where snort is
+# not relative to snort.conf like the above variables
+# This is completely inconsistent with how other vars work, BUG 89986
+# Set the absolute path appropriately
 var WHITE_LIST_PATH ../rules
 var BLACK_LIST_PATH ../rules
 
@@ -281,14 +285,15 @@ preprocessor stream5_global: track_tcp yes, \
    max_udp 131072, \
    max_active_responses 2, \
    min_response_seconds 5
-preprocessor stream5_tcp: policy windows, detect_anomalies, require_3whs 180, \
+preprocessor stream5_tcp: log_asymmetric_traffic no, policy windows, \
+   detect_anomalies, require_3whs 180, \
    overlap_limit 10, small_segments 3 bytes 150, timeout 180, \
-    ports client 21 22 23 25 42 53 70 79 109 110 111 113 119 135 136 137 139 143 \
+    ports client 21 22 23 25 42 53 79 109 110 111 113 119 135 136 137 139 143 \
         161 445 513 514 587 593 691 1433 1521 1741 2100 3306 6070 6665 6666 6667 6668 6669 \
         7000 8181 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779, \
-    ports both 36 80 81 82 83 84 85 86 87 88 89 90 110 311 383 443 465 563 555 591 593 631 636 801 808 818 901 972 989 992 993 994 995 1158 1220 1414 1533 1741 1830 2231 2301 2381 2809 3029 3037 3057 3128 3443 3702 4000 4343 4848 5117 5250 6080 6173 6988 7907 7000 7001 7071 7144 7145 7510 7802 7770 7777 7779 \
+    ports both 80 81 311 383 443 465 563 591 593 636 901 989 992 993 994 995 1220 1414 1830 2301 2381 2809 3037 3128 3702 4343 4848 5250 6988 7907 7000 7001 7144 7145 7510 7802 7777 7779 \
         7801 7900 7901 7902 7903 7904 7905 7906 7908 7909 7910 7911 7912 7913 7914 7915 7916 \
-        7917 7918 7919 7920 8000 8008 8014 8028 8080 8081 8082 8085 8088 8090 8118 8123 8180 8181 8222 8243 8280 8300 8500 8509 8800 8888 8899 9000 9060 9080 9090 9091 9111 9443 9999 10000 11371 12601 15489 29991 33300 34412 34443 34444 41080 44449 50000 50002 51423 53331 55252 55555 56712
+        7917 7918 7919 7920 8000 8008 8014 8028 8080 8085 8088 8090 8118 8123 8180 8243 8280 8300 8800 8888 8899 9000 9060 9080 9090 9091 9443 9999 11371 34443 34444 41080 50002 55555
 preprocessor stream5_udp: timeout 180
 
 # performance statistics.  For more information, see the Snort Manual, Configuring Snort - Preprocessors - Performance Monitor
@@ -307,7 +312,7 @@ preprocessor http_inspect_server: server default \
     max_headers 100 \
     max_spaces 200 \
     small_chunk_length { 10 5 } \
-    ports { 36 80 81 82 83 84 85 86 87 88 89 90 311 383 555 591 593 631 801 808 818 901 972 1158 1220 1414 1741 1830 2231 2301 2381 2809 3029 3037 3057 3128 3443 3702 4000 4343 4848 5117 5250 6080 6173 6988 7000 7001 7071 7144 7145 7510 7770 7777 7779 8000 8008 8014 8028 8080 8081 8082 8085 8088 8090 8118 8123 8180 8181 8222 8243 8280 8300 8500 8509 8800 8888 8899 9000 9060 9080 9090 9091 9111 9443 9999 10000 11371 12601 15489 29991 33300 34412 34443 34444 41080 44449 50000 50002 51423 53331 55252 55555 56712 } \
+    ports { 80 81 311 383 591 593 901 1220 1414 1741 1830 2301 2381 2809 3037 3128 3702 4343 4848 5250 6988 7000 7001 7144 7145 7510 7777 7779 8000 8008 8014 8028 8080 8085 8088 8090 8118 8123 8180 8181 8243 8280 8300 8800 8888 8899 9000 9060 9080 9090 9091 9443 9999 11371 34443 34444 41080 50002 55555 } \
     non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \
     enable_cookie \
     extended_response_inspection \
@@ -581,7 +586,6 @@ include $RULE_PATH/local.rules
 #include $RULE_PATH/file-flash.rules
 #include $RULE_PATH/file-identify.rules
 #include $RULE_PATH/file-image.rules
-#include $RULE_PATH/file-java.rules
 #include $RULE_PATH/file-multimedia.rules
 #include $RULE_PATH/file-office.rules
 #include $RULE_PATH/file-other.rules
@@ -593,7 +597,6 @@ include $RULE_PATH/local.rules
 #include $RULE_PATH/imap.rules
 #include $RULE_PATH/indicator-compromise.rules
 #include $RULE_PATH/indicator-obfuscation.rules
-#include $RULE_PATH/indicator-scan.rules
 #include $RULE_PATH/indicator-shellcode.rules
 #include $RULE_PATH/info.rules
 #include $RULE_PATH/malware-backdoor.rules
@@ -607,7 +610,6 @@ include $RULE_PATH/local.rules
 #include $RULE_PATH/nntp.rules
 #include $RULE_PATH/oracle.rules
 #include $RULE_PATH/os-linux.rules
-#include $RULE_PATH/os-mobile.rules
 #include $RULE_PATH/os-other.rules
 #include $RULE_PATH/os-solaris.rules
 #include $RULE_PATH/os-windows.rules
@@ -621,19 +623,12 @@ include $RULE_PATH/local.rules
 #include $RULE_PATH/policy-spam.rules
 #include $RULE_PATH/pop2.rules
 #include $RULE_PATH/pop3.rules
-#include $RULE_PATH/protocol-dns.rules
 #include $RULE_PATH/protocol-finger.rules
 #include $RULE_PATH/protocol-ftp.rules
 #include $RULE_PATH/protocol-icmp.rules
 #include $RULE_PATH/protocol-imap.rules
-#include $RULE_PATH/protocol-nntp.rules
 #include $RULE_PATH/protocol-pop.rules
-#include $RULE_PATH/protocol-rpc.rules
-#include $RULE_PATH/protocol-scada.rules
 #include $RULE_PATH/protocol-services.rules
-#include $RULE_PATH/protocol-snmp.rules
-#include $RULE_PATH/protocol-telnet.rules
-#include $RULE_PATH/protocol-tftp.rules
 #include $RULE_PATH/protocol-voip.rules
 #include $RULE_PATH/pua-adware.rules
 #include $RULE_PATH/pua-other.rules
@@ -650,7 +645,6 @@ include $RULE_PATH/local.rules
 #include $RULE_PATH/server-mysql.rules
 #include $RULE_PATH/server-oracle.rules
 #include $RULE_PATH/server-other.rules
-#include $RULE_PATH/server-samba.rules
 #include $RULE_PATH/server-webapp.rules
 #include $RULE_PATH/shellcode.rules
 #include $RULE_PATH/smtp.rules
diff --git a/snort.install b/snort.install
index 6d72be791a38..8a6460c317e3 100644
--- a/snort.install
+++ b/snort.install
@@ -1,6 +1,10 @@
 post_install() {
-  getent group snort &>/dev/null || groupadd -r -g 29 snort >/dev/null
-  getent passwd snort &>/dev/null || useradd -r -u 29 -c 'Snort user' -g snort -d /var/log/snort -s /bin/false snort >/dev/null
+  getent group snort >/dev/null || usr/sbin/groupadd -g 29 snort
+  getent passwd snort >/dev/null || usr/sbin/useradd -c 'Snort user' -u 29 -g snort -d /var/log/snort -s /bin/false snort
+  usr/bin/passwd -l snort &>/dev/null
+
+  [ -f var/log/snort/alert ] || : >var/log/snort/alert
+  chown snort.snort var/log/snort/ -R
 
 cat << _EOF  
 
@@ -30,10 +34,9 @@ post_upgrade() {
   post_install $1
 }
 
-post_remove() {
-  getent passwd snort &>/dev/null && userdel snort >/dev/null
-  getent group snort &>/dev/null && groupdel snort >/dev/null
-  return 0
+pre_remove() {
+  usr/sbin/userdel snort &>/dev/null
+  usr/sbin/groupdel snort &>/dev/null
 }
 
 # vim:set ts=2 sw=2 et: