[skipfish] Update to version 1.84

[rebus]

commit 633c74e9310dad19b3cbfe5d6772c486306e32ca
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sat Jan 22 03:55:27 2011 +0100

    Update to version 1.84

 skipfish-1.54b.tgz      |  Bin 179830 -> 0 bytes
 skipfish-1.84b.tgz      |  Bin 0 -> 184015 bytes
 skipfish-makefile.patch |   19 +++++++------------
 skipfish.spec           |   15 +++++++++++++--
 4 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/skipfish-1.84b.tgz b/skipfish-1.84b.tgz
new file mode 100644
index 0000000..5ba7ccd
Binary files /dev/null and b/skipfish-1.84b.tgz differ
diff --git a/skipfish-makefile.patch b/skipfish-makefile.patch
index 4bb5d63..579c05b 100644
--- a/skipfish-makefile.patch
+++ b/skipfish-makefile.patch
@@ -1,4 +1,3 @@
-diff -ru skipfish-1.54b/config.h skipfish-1.54b.new/config.h
 --- skipfish-1.54b/config.h	2010-07-05 23:09:38.000000000 +0200
 +++ skipfish-1.54b.new/config.h	2010-08-08 01:52:03.000000000 +0200
 @@ -27,8 +27,11 @@
@@ -10,24 +9,21 @@ diff -ru skipfish-1.54b/config.h skipfish-1.54b.new/config.h
 +/* #define ASSETS_DIR              "assets" */
 +/* #define DEF_WORDLIST            "skipfish.wl"  */
 +#define ASSETS_DIR              "/usr/share/skipfish/assets"
-+#define DEF_WORDLIST            "/usr/share/skipfish/dictionaries/default.wl"
++#define DEF_WORDLIST            "/var/cache/skipfish/skipfish.wl"
 +
  
  /* Various default settings for HTTP client (cmdline override): */
  
-diff -ru skipfish-1.54b/Makefile skipfish-1.54b.new/Makefile
---- skipfish-1.54b/Makefile	2010-08-06 22:45:24.000000000 +0200
-+++ skipfish-1.54b.new/Makefile	2010-08-08 01:52:04.000000000 +0200
-@@ -26,11 +26,16 @@
+--- skipfish-1.84b/Makefile.1makefile	2010-12-15 21:32:15.000000000 +0100
++++ skipfish-1.84b/Makefile	2011-01-22 01:34:47.000000000 +0100
+@@ -26,10 +26,15 @@
  INCFILES   = alloc-inl.h string-inl.h debug.h types.h http_client.h \
               database.h crawler.h analysis.h config.h report.h
  
 -CFLAGS_GEN = -Wall -funsigned-char -g -ggdb -I/usr/local/include/ \
--             -I/opt/local/include/ $(CFLAGS) -D_FORTIFY_SOURCE=0 \
-+CFLAGS     = -Wall -g -ggdb -D_FORTIFY_SOURCE=0 -O3
++CFLAGS     = -Wall -g -ggdb -O3
 +CFLAGS_GEN = -funsigned-char -I/usr/local/include/ \
-+             -I/opt/local/include/ $(CFLAGS) \
-              -DVERSION=\"$(VERSION)\"
+              -I/opt/local/include/ $(CFLAGS) -DVERSION=\"$(VERSION)\"
  CFLAGS_DBG = -DLOG_STDERR=1 -DDEBUG_ALLOCATOR=1 $(CFLAGS_GEN) 
 -CFLAGS_OPT = -O3 -Wno-format $(CFLAGS_GEN)
 +CFLAGS_OPT = -Wno-format $(CFLAGS_GEN)
@@ -38,7 +34,7 @@ diff -ru skipfish-1.54b/Makefile skipfish-1.54b.new/Makefile
  
  LDFLAGS   += -L/usr/local/lib/ -L/opt/local/lib
  LIBS      += -lcrypto -lssl -lidn -lz
-@@ -64,3 +65,12 @@
+@@ -63,3 +68,12 @@
  	cd ..; rm -rf skipfish-$(VERSION); cp -pr skipfish skipfish-$(VERSION); \
  	  tar cfvz ~/www/skipfish.tgz skipfish-$(VERSION)
  	chmod 644 ~/www/skipfish.tgz
@@ -51,4 +47,3 @@ diff -ru skipfish-1.54b/Makefile skipfish-1.54b.new/Makefile
 +	cp -r assets $(DESTDIR)$(PREFIX)$(DATADIR)
 +	cp -r dictionaries $(DESTDIR)$(PREFIX)$(DATADIR)
 +
-Only in skipfish-1.54b.new: skipfish
diff --git a/skipfish.spec b/skipfish.spec
index d6e4a5f..7bc9826 100644
--- a/skipfish.spec
+++ b/skipfish.spec
@@ -1,5 +1,5 @@
 Name:           skipfish
-Version:        1.54
+Version:        1.84
 Release:        0.1.b%{?dist}
 Summary:        Web application security scanner
 
@@ -53,6 +53,11 @@ make install DESTDIR=%{buildroot}
 
 rm -f %{buildroot}%{_datadir}/%{name}/assets/COPYING
 
+#Default wordlist cache file
+install -D -d -m 777 %{buildroot}%{_var}/cache/%{name}
+install -D -m 666 dictionaries/minimal.wl %{buildroot}%{_var}/cache/%{name}/%{name}.wl
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -62,10 +67,13 @@ rm -rf %{buildroot}
 %doc COPYING ChangeLog README 
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/assets
-%{_datadir}/%{name}/assets/index.html
 %dir %{_datadir}/%{name}/dictionaries
+%dir %{_var}/cache/%{name}
 %{_datadir}/%{name}/dictionaries/*
+%{_datadir}/%{name}/assets/index.html
 %{_bindir}/%{name}
+%{_var}/cache/%{name}/%{name}.wl
+
 
 #Icons are licensed as LGPLv3 http://www.everaldo.com/crystal/
 %doc COPYING.icons
@@ -73,6 +81,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 21 2011 Michal Ambroz <rebus AT seznam.cz> - 1.84-0.1.b
+- rebuild for version 1.84b
+
 * Wed Aug 08 2010 Michal Ambroz <rebus AT seznam.cz> - 1.54-0.1.b
 - rebuild for version 1.54b