[skipfish/el5/master] Rebuild for 1.54b
rebus
rebus at fedoraproject.org
Sun Aug 8 01:23:33 UTC 2010
commit 78e0acebbff9e1a4c4f1d8832b5967286c9f0ea9
Author: Michal Ambroz <rebus at seznam.cz>
Date: Sun Aug 8 03:23:13 2010 +0200
Rebuild for 1.54b
skipfish-1.54b.tgz | Bin 0 -> 179830 bytes
skipfish-fortify.patch | 462 -----------------------------------------------
skipfish-makefile.patch | 53 +++---
skipfish.spec | 22 ++-
sources | 1 -
5 files changed, 46 insertions(+), 492 deletions(-)
---
diff --git a/skipfish-1.54b.tgz b/skipfish-1.54b.tgz
new file mode 100644
index 0000000..7f6abb1
Binary files /dev/null and b/skipfish-1.54b.tgz differ
diff --git a/skipfish-makefile.patch b/skipfish-makefile.patch
index 8c11897..4bb5d63 100644
--- a/skipfish-makefile.patch
+++ b/skipfish-makefile.patch
@@ -1,13 +1,33 @@
---- skipfish.old/Makefile 2010-03-30 17:53:01.000000000 +0200
-+++ skipfish.new/Makefile 2010-04-02 21:40:59.000000000 +0200
-@@ -25,10 +25,14 @@
+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 @@
+
+ /* 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 "/usr/share/skipfish/dictionaries/default.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 @@
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=2
-+CFLAGS = -Wall -g -ggdb -D_FORTIFY_SOURCE=2 -O3
-+CFLAGS_GEN = -funsigned-char -I/usr/local/include/ -I/opt/local/include/ $(CFLAGS)
+- -I/opt/local/include/ $(CFLAGS) -D_FORTIFY_SOURCE=0 \
++CFLAGS = -Wall -g -ggdb -D_FORTIFY_SOURCE=0 -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)
@@ -18,11 +38,12 @@
LDFLAGS += -L/usr/local/lib/ -L/opt/local/lib
LIBS += -lcrypto -lssl -lidn -lz
-@@ -60,3 +64,11 @@
- publish: clean
- cd ..; tar cfvz ~/www/skipfish.tgz skipfish
+@@ -64,3 +65,12 @@
+ cd ..; rm -rf skipfish-$(VERSION); cp -pr skipfish skipfish-$(VERSION); \
+ tar cfvz ~/www/skipfish.tgz skipfish-$(VERSION)
chmod 644 ~/www/skipfish.tgz
+
++
+install: $(PROGNAME)
+ install -m 755 -d $(DESTDIR)$(PREFIX)$(DATADIR)
+ install -m 755 -d $(DESTDIR)$(PREFIX)$(BINDIR)
@@ -30,16 +51,4 @@
+ cp -r assets $(DESTDIR)$(PREFIX)$(DATADIR)
+ cp -r dictionaries $(DESTDIR)$(PREFIX)$(DATADIR)
+
---- skipfish.old/config.h 2010-04-02 19:08:40.000000000 +0200
-+++ skipfish.new/config.h 2010-04-02 20:48:08.000000000 +0200
-@@ -29,8 +29,8 @@
-
- /* Default paths to runtime files: */
-
--#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"
-
- /* Various default settings for HTTP client (cmdline override): */
-
+Only in skipfish-1.54b.new: skipfish
diff --git a/skipfish.spec b/skipfish.spec
index fc9df0c..d6e4a5f 100644
--- a/skipfish.spec
+++ b/skipfish.spec
@@ -1,5 +1,5 @@
Name: skipfish
-Version: 1.34
+Version: 1.54
Release: 0.1.b%{?dist}
Summary: Web application security scanner
@@ -12,11 +12,16 @@ 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
-#Patch by Tomas Mraz to stop using undocumented memory_usable_size,
-#which is not compatible with FORTIFY_SOURCE
+
#http://code.google.com/p/skipfish/issues/detail?id=61
-Patch0: %{name}-fortify.patch
+#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
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel
@@ -31,9 +36,9 @@ checks capable of detecting blind injection vulnerabilities, stored XSS,
and so forth.
%prep
-%setup -q -n %{name}
-%patch0 -p 1 -b .0fortify
-%patch1 -p 1 -b .1makefile
+%setup -q -n %{name}-%{version}b
+#patch0 -p 1 -b .0fortify
+%patch1 -p1 -b .1makefile
cp -p assets/COPYING COPYING.icons
@@ -68,6 +73,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Aug 08 2010 Michal Ambroz <rebus AT seznam.cz> - 1.54-0.1.b
+- rebuild for version 1.54b
+
* Sun May 09 2010 Michal Ambroz <rebus AT seznam.cz> - 1.34-0.1.b
- update to new version
diff --git a/sources b/sources
index e8173d5..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-b988a2d8ddbef7c3cbecbbafd2ec7269 skipfish-1.34b.tgz
More information about the scm-commits
mailing list