[skipfish] * Wed Jun 20 2012 Athmane Madjoudj <athmane at fedoraproject.org> 2.07-0.1.b - Update to 2.07b - Add sf

Tue Jun 26 00:12:13 UTC 2012

commit c9dc43270bf7887a7e5742b3d6d8afce886d8eab
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Tue Jun 26 02:11:09 2012 +0200

    * Wed Jun 20 2012 Athmane Madjoudj <athmane at fedoraproject.org> 2.07-0.1.b
    - Update to 2.07b
    - Add sfscandiff comparison tool

 .gitignore              |    1 +
 skipfish-makefile.patch |   50 ++++++++++++++++++----------------------------
 skipfish.spec           |   14 +++++-------
 sources                 |    2 +-
 4 files changed, 28 insertions(+), 39 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e3789b7..90fc56b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /skipfish-2.01b.tgz
 /skipfish-2.03b.tgz
 /skipfish-2.05b.tgz
+/skipfish-2.07b.tgz
diff --git a/skipfish-makefile.patch b/skipfish-makefile.patch
index ea80686..53787d3 100644
--- a/skipfish-makefile.patch
+++ b/skipfish-makefile.patch
@@ -1,6 +1,6 @@
-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
+diff -ru skipfish-2.07b/config.h skipfish-2.07b.new/config.h
+--- skipfish-2.07b/config.h	2012-05-23 21:48:10.000000000 +0200
++++ skipfish-2.07b.new/config.h	2012-06-26 01:27:44.655353821 +0200
 @@ -35,7 +35,9 @@
  
  /* Default paths to runtime files: */
@@ -12,45 +12,35 @@ diff -ru skipfish-2.05b/config.h skipfish-2.05b.new/config.h
  
  /* Various default settings for HTTP client (cmdline override): */
  
-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
+diff -ru skipfish-2.07b/Makefile skipfish-2.07b.new/Makefile
+--- skipfish-2.07b/Makefile	2012-05-23 21:48:10.000000000 +0200
++++ skipfish-2.07b.new/Makefile	2012-06-26 01:53:16.645051608 +0200
+@@ -36,6 +36,10 @@
+ LDFLAGS   += -L/usr/local/lib/ -L/opt/local/lib
+ LIBS      += -lcrypto -lssl -lidn -lz
  
--CFLAGS_GEN = -Wall -funsigned-char -g -ggdb -I/usr/local/include/ \
-+CFLAGS     = -Wall -g -ggdb -O3
-+CFLAGS_GEN = -funsigned-char -I/usr/local/include/ \
-              -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)
-+
 +PREFIX     = /usr
 +DATADIR    = /share/skipfish
 +BINDIR     = /bin
- 
- LDFLAGS   += -L/usr/local/lib/ -L/opt/local/lib
- LIBS      += -lcrypto -lssl -lidn -lz
-@@ -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
-+
 +
+ all: $(PROGNAME)
+ 
+ $(PROGNAME): $(PROGNAME).c $(OBJFILES) $(INCFILES)
+@@ -61,6 +65,17 @@
+ 	$(CC) same_test.c -o same_test $(CFLAGS_DBG) $(OBJFILES) $(LDFLAGS) \
+ 	      $(LIBS)
+ 
 +install: $(PROGNAME)
 +	install -m 755 -d $(DESTDIR)$(PREFIX)$(DATADIR)
 +	install -m 755 -d $(DESTDIR)$(PREFIX)$(BINDIR)
 +	install -m 755 skipfish $(DESTDIR)$(PREFIX)$(BINDIR)
++	install -m 755 sfscandiff $(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
+ publish: clean
+ 	cd ..; rm -rf skipfish-$(VERSION); cp -pr skipfish skipfish-$(VERSION); \
+ 	  tar cfvz ~/www/skipfish.tgz skipfish-$(VERSION)
diff --git a/skipfish.spec b/skipfish.spec
index 3bfa4e2..f9e94b5 100644
--- a/skipfish.spec
+++ b/skipfish.spec
@@ -1,5 +1,5 @@
 Name:           skipfish
-Version:        2.05
+Version:        2.07
 Release:        0.1.b%{?dist}
 Summary:        Web application security scanner
 
@@ -13,12 +13,6 @@ License:        ASL 2.0 and BSD and LGPLv3
 URL:            http://code.google.com/p/skipfish/
 Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}b.tgz
 
-#http://code.google.com/p/skipfish/issues/detail?id=61
-#Patch v 1.32b by Tomas Mraz to stop using undocumented memory_usable_size,
-#which is not compatible with FORTIFY_SOURCE
-#Fixed in upstream in 1.47b by implementing some kind of memory tracking structure
-#Patch0:         {name}-fortify.patch
-
 #Use common paths and fedora build options
 Patch1:         %{name}-makefile.patch
 
@@ -37,7 +31,6 @@ and so forth.
 
 %prep
 %setup -q -n %{name}-%{version}b
-#patch0 -p 1 -b .0fortify
 %patch1 -p1 -b .1makefile
 cp -p assets/COPYING COPYING.icons
 
@@ -67,6 +60,7 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/dictionaries/*
 %{_datadir}/%{name}/assets/index.html
 %{_bindir}/%{name}
+%{_bindir}/sfscandiff
 %{_mandir}/man1/%{name}.1*
 
 
@@ -77,6 +71,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 20 2012 Athmane Madjoudj <athmane at fedoraproject.org> 2.07-0.1.b
+- Update to 2.07b
+- Add sfscandiff comparison tool
+
 * 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
diff --git a/sources b/sources
index 77b04b2..f386cf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8147e3365820526e295cfca768ef60cd  skipfish-2.05b.tgz
+91ee5616b22366745e8b6ba00c3a29e1  skipfish-2.07b.tgz
