[skipfish] Upgrade to version 2.05b

[rebus]

commit 0bdf8941966c506134528e5a4a7fe410f15ce0d0
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sun Apr 8 14:59:53 2012 +0200

    Upgrade to version 2.05b

 .gitignore              |    1 +
 skipfish-makefile.patch |   27 ++++++++++++++++-----------
 skipfish.spec           |   20 +++++++++-----------
 sources                 |    2 +-
 4 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 58562bd..e3789b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /skipfish-1.85b.tgz
 /skipfish-2.01b.tgz
 /skipfish-2.03b.tgz
+/skipfish-2.05b.tgz
diff --git a/skipfish-makefile.patch b/skipfish-makefile.patch
index d845136..ea80686 100644
--- a/skipfish-makefile.patch
+++ b/skipfish-makefile.patch
@@ -1,23 +1,22 @@
-diff -ru skipfish-2.03b.old/config.h skipfish-2.03b/config.h
---- skipfish-2.03b.old/config.h	2011-10-03 23:24:04.696818565 +0200
-+++ skipfish-2.03b/config.h	2011-10-03 23:17:46.059306238 +0200
-@@ -35,8 +35,11 @@
+diff -ru skipfish-2.05b/config.h skipfish-2.05b.new/config.h
+--- skipfish-2.05b/config.h	2012-03-05 20:38:32.000000000 +0100
++++ skipfish-2.05b.new/config.h	2012-04-08 13:19:39.423542025 +0200
+@@ -35,7 +35,9 @@
  
  /* Default paths to runtime files: */
  
 -#define ASSETS_DIR              "assets"
--#define DEF_WORDLIST            "skipfish.wl"
 +/* #define ASSETS_DIR              "assets" */
-+/* #define DEF_WORDLIST            "skipfish.wl"  */
 +#define ASSETS_DIR              "/usr/share/skipfish/assets"
-+#define DEF_WORDLIST            "/var/cache/skipfish/skipfish.wl"
 +
  
  /* Various default settings for HTTP client (cmdline override): */
  
-diff -ru skipfish-2.03b.old/Makefile skipfish-2.03b/Makefile
---- skipfish-2.03b.old/Makefile	2011-10-03 23:24:04.690818685 +0200
-+++ skipfish-2.03b/Makefile	2011-10-03 23:23:24.792615060 +0200
+Only in skipfish-2.05b: config.h.1makefile
+Only in skipfish-2.05b: COPYING.icons
+diff -ru skipfish-2.05b/Makefile skipfish-2.05b.new/Makefile
+--- skipfish-2.05b/Makefile	2012-03-05 20:38:32.000000000 +0100
++++ skipfish-2.05b.new/Makefile	2012-04-08 14:53:20.116636605 +0200
 @@ -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
@@ -36,7 +35,7 @@ diff -ru skipfish-2.03b.old/Makefile skipfish-2.03b/Makefile
  
  LDFLAGS   += -L/usr/local/lib/ -L/opt/local/lib
  LIBS      += -lcrypto -lssl -lidn -lz
-@@ -63,3 +68,12 @@
+@@ -63,3 +68,15 @@
  	cd ..; rm -rf skipfish-$(VERSION); cp -pr skipfish skipfish-$(VERSION); \
  	  tar cfvz ~/www/skipfish.tgz skipfish-$(VERSION)
  	chmod 644 ~/www/skipfish.tgz
@@ -48,4 +47,10 @@ diff -ru skipfish-2.03b.old/Makefile skipfish-2.03b/Makefile
 +	install -m 755 skipfish $(DESTDIR)$(PREFIX)$(BINDIR)
 +	cp -r assets $(DESTDIR)$(PREFIX)$(DATADIR)
 +	cp -r dictionaries $(DESTDIR)$(PREFIX)$(DATADIR)
++	gzip skipfish.1
++	install -m 755 -d $(DESTDIR)$(PREFIX)/share/man/man1
++	cp -r skipfish.1.gz $(DESTDIR)$(PREFIX)/share/man/man1
 +
+Only in skipfish-2.05b: Makefile.1makefile
+Only in skipfish-2.05b: skipfish
+Only in skipfish-2.05b: skipfish.1.gz
diff --git a/skipfish.spec b/skipfish.spec
index ea8884f..3bfa4e2 100644
--- a/skipfish.spec
+++ b/skipfish.spec
@@ -1,6 +1,6 @@
 Name:           skipfish
-Version:        2.03
-Release:        0.2.b%{?dist}
+Version:        2.05
+Release:        0.1.b%{?dist}
 Summary:        Web application security scanner
 
 Group:          Applications/Internet
@@ -53,10 +53,6 @@ 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}
@@ -68,11 +64,11 @@ rm -rf %{buildroot}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/assets
 %dir %{_datadir}/%{name}/dictionaries
-%dir %{_var}/cache/%{name}
 %{_datadir}/%{name}/dictionaries/*
 %{_datadir}/%{name}/assets/index.html
 %{_bindir}/%{name}
-%{_var}/cache/%{name}/%{name}.wl
+%{_mandir}/man1/%{name}.1*
+
 
 
 #Icons are licensed as LGPLv3 http://www.everaldo.com/crystal/
@@ -81,10 +77,12 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.03-0.2.b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Sun Apr 08 2012 Michal Ambroz <rebus AT seznam.cz> - 2.05-0.1.b
+- rebuild for version 2.05b
+- removed the default skipfish.wl as this version no longer an option
+- addedd manpage
 
-* Mon Oct 03 2011 Michal Ambroz <rebus AT seznam.cz> - 2.03.1.b
+* Mon Oct 03 2011 Michal Ambroz <rebus AT seznam.cz> - 2.03-0.1.b
 - rebuild for version 2.03b
 
 * Sun Mar 27 2011 Michal Ambroz <rebus AT seznam.cz> - 1.85-0.1.b
diff --git a/sources b/sources
index 47456c2..77b04b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff860b840ec7e579e9fac08e4fd8f4e2  skipfish-2.03b.tgz
+8147e3365820526e295cfca768ef60cd  skipfish-2.05b.tgz