rpms/dsniff/EL-5 dsniff-2.4-sysconf_clocks.patch, 1.1, 1.2 dsniff.spec, 1.1, 1.2

[Robert Scheck (robert)]

Author: robert

Update of /cvs/pkgs/rpms/dsniff/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19305/EL-5

Modified Files:
	dsniff-2.4-sysconf_clocks.patch dsniff.spec 
Log Message:
Some small improvements before first building of the package


dsniff-2.4-sysconf_clocks.patch:

Index: dsniff-2.4-sysconf_clocks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dsniff/EL-5/dsniff-2.4-sysconf_clocks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsniff-2.4-sysconf_clocks.patch	3 Dec 2007 22:18:44 -0000	1.1
+++ dsniff-2.4-sysconf_clocks.patch	7 Dec 2007 23:42:54 -0000	1.2
@@ -1,20 +1,26 @@
-Patch by <kees at ubuntu.com> for dsniff >= 2.4b1, which adds a clock fix.
+Patch by <kees at ubuntu.com> for dsniff >= 2.4b1, which adds a clock fix. It
+was improved by Robert Scheck <robert at fedoraproject.org> to work with older
+Linux kernel versions, too.
 
---- dsniff-2.4b1/sshow.c		2001-03-18 22:52:15.000000000 -0800
-+++ dsniff-2.4b1/sshow.c.sysconf_clocks	2006-10-12 13:24:29.299111443 -0700
-@@ -216,6 +216,7 @@
+--- dsniff-2.4b1/sshow.c		2007-12-03 23:50:12.000000000 +0100
++++ dsniff-2.4b1/sshow.c.sysconf_clocks	2007-12-03 23:53:12.000000000 +0100
+@@ -217,6 +217,9 @@
  {
  	clock_t delay;
  	int payload;
-+    long CLK_TCK= sysconf(_SC_CLK_TCK);
++#if defined(_SC_CLK_TCK)
++	long CLK_TCK = sysconf(_SC_CLK_TCK);
++#endif
  
  	delay = add_history(session, 0, cipher_size, plain_range);
  
-@@ -264,6 +265,7 @@
+@@ -265,6 +268,9 @@
  	clock_t delay;
  	int skip;
  	range string_range;
-+    long CLK_TCK= sysconf(_SC_CLK_TCK);
++#if defined(_SC_CLK_TCK)
++	long CLK_TCK = sysconf(_SC_CLK_TCK);
++#endif
  	
  	delay = add_history(session, 1, cipher_size, plain_range);
  	


Index: dsniff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dsniff/EL-5/dsniff.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsniff.spec	3 Dec 2007 22:18:44 -0000	1.1
+++ dsniff.spec	7 Dec 2007 23:42:54 -0000	1.2
@@ -26,7 +26,7 @@
 Patch17:	dsniff-2.4-fedora_dirs.patch
 Patch18:	dsniff-2.4-glib2.patch
 BuildRequires:	libnet-devel, openssl-devel, libnids-devel
-BuildRequires:	glib2-devel, db4-devel, libcap-devel
+BuildRequires:	glib2-devel, db4-devel, %{_includedir}/pcap.h
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -50,7 +50,9 @@
 %patch7 -p1 -b .checksum
 %patch8 -p1 -b .openssl_098
 %patch9 -p1 -b .sshcrypto
+%if 0%{?rhel}%{?fedora} >= 5
 %patch10 -p1 -b .sysconf_clocks
+%endif
 %patch11 -p1 -b .urlsnarf_escape
 %patch12 -p1 -b .string_header
 %patch13 -p1 -b .arpa_inet_header