Update to 0.7.3 and emergingthreats URL change

3 files changed, 19 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86965181da19..a1afe4d239c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Oct 16 09:48:06 UTC 2017
+# Fri Dec  8 01:14:01 UTC 2017
 pkgbase = pulledpork
 	pkgdesc = Tool to automatically update rules for snort
-	pkgver = 0.7.2
-	pkgrel = 6
+	pkgver = 0.7.3
+	pkgrel = 1
 	url = https://github.com/shirkdog/pulledpork
 	install = install
 	arch = any
@@ -21,14 +21,12 @@ pkgbase = pulledpork
 	backup = etc/pulledpork/dropsid.conf
 	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-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
-	sha256sums = 50046477d5d1a18aec131a56bd3f21170057d8a31fd6f30af706e31d5b14bd0a
-	sha256sums = 6bb80fa140ae5ec164ee6cdf6cf559d63f48c2b5a8c5934eb11296fbdc1ac240
-	sha256sums = 60ae10e636568a216e5629a1e73450d086fd77cd3328f5ba2c90d2483a1e9c08
+	sha256sums = 48c66dc9abb7545186d4fba497263c1d1b247c0ea7f0953db4d515e7898461a2
+	sha256sums = 361f698adbabdb85eaa559e26ae9feaca0ef1f419e76fe301364d9b67358475c
 	sha256sums = 584326ce79c1694849f60f25e4306ae3f2df6228c34c2e6f3ba30993f53e6a3f
 	sha256sums = c9213d3076424dc391d09a6c19f769631f668f27206585dd98dcbf9390a1b9ee
 
diff --git a/PKGBUILD b/PKGBUILD
index 2d0fdf732fd2..3761c4e80b13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _user=shirkdog
 pkgname=pulledpork
-pkgver=0.7.2
-pkgrel=6
+pkgver=0.7.3
+pkgrel=1
 pkgdesc="Tool to automatically update rules for snort"
 arch=('any')
 url="https://github.com/${_user}/${pkgname}"
@@ -17,22 +17,15 @@ 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'
-            '6bb80fa140ae5ec164ee6cdf6cf559d63f48c2b5a8c5934eb11296fbdc1ac240'
-            '60ae10e636568a216e5629a1e73450d086fd77cd3328f5ba2c90d2483a1e9c08'
+sha256sums=('48c66dc9abb7545186d4fba497263c1d1b247c0ea7f0953db4d515e7898461a2'
+            '361f698adbabdb85eaa559e26ae9feaca0ef1f419e76fe301364d9b67358475c'
             '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/pulledpork.conf b/pulledpork.conf
index afb5a0aec05c..11f7a6a510b8 100644
--- a/pulledpork.conf
+++ b/pulledpork.conf
@@ -18,13 +18,13 @@
 # i.e. url|tarball|123456789, 
 #rule_url=https://www.snort.org/reg-rules/|snortrules-snapshot.tar.gz|<oinkcode>
 # NEW Community ruleset:
-#rule_url=https://s3.amazonaws.com/snort-org/www/rules/community/|community-rules.tar.gz|Community
+#rule_url=https://snort.org/downloads/community/|community-rules.tar.gz|Community
 # NEW For IP Blacklisting! Note the format is urltofile|IPBLACKLIST|<oinkcode>
 # This format MUST be followed to let pulledpork know that this is a blacklist
-#rule_url=http://talosintel.com/files/additional_resources/ips_blacklist/ip-filter.blf|IPBLACKLIST|open
+#rule_url=https://talosintelligence.com/documents/ip-blacklist|IPBLACKLIST|open
 # URL for rule documentation! (slow to process)
-#rule_url=https://www.snort.org/reg-rules/|opensource.gz|<oinkcode>
-rule_url=https://rules.emergingthreatspro.com/|emerging.rules.tar.gz|open
+#rule_url=https://snort.org/downloads/community/|opensource.gz|Opensource
+rule_url=https://rules.emergingthreats.net/|emerging.rules.tar.gz|open
 # THE FOLLOWING URL is for emergingthreats downloads, note the tarball name change!
 # and open-nogpl, to avoid conflicts.
 #rule_url=https://rules.emergingthreats.net/|emerging.rules.tar.gz|open-nogpl
@@ -180,7 +180,7 @@ config_path=/etc/snort/snort.conf
 
 
 # Define the path to the pid files of any running process that you want to
-# HUP after PP has completed its run.
+# sent a signal (specified with -H option) after PP has completed its run.
 # pid_path=/var/run/snort.pid,/var/run/barnyard.pid,/var/run/barnyard2.pid
 # and so on...
 # pid_path=/var/run/snort_eth0.pid
@@ -190,6 +190,9 @@ config_path=/etc/snort/snort.conf
 # This value MUST contain all 4 minor version
 # numbers. ET rules are now also dependant on this, verify supported ET versions
 # prior to simply throwing rubbish in this variable kthx!
+#
+# Suricata users - set this to 'suricata-3.x.x' to process rule files
+# for suricata, this mimics the -S flag on the command line.
 # snort_version=2.9.0.0
 
 # Here you can specify what rule modification files to run automatically.
@@ -209,4 +212,4 @@ modifysid=/etc/pulledpork/modifysid.conf
 ####### need to process so_rules, simply comment out the so_rule section
 ####### you can also specify -T at runtime to process only GID 1 rules.
 
-version=0.7.2
+version=0.7.3