- patch from debian and build fix

diff --git a/snarf-build.patch b/snarf-build.patch
new file mode 100644 (file)
index 0000000..958d139
--- /dev/null
+++ b/snarf-build.patch
@@ -0,0 +1,30 @@
+--- snarf-7.0/configure.in~    2000-08-09 02:35:29.000000000 +0200
++++ snarf-7.0/configure.in     2013-02-16 22:09:42.179432419 +0100
+@@ -19,7 +19,6 @@
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+-AM_C_PROTOTYPES
+ AM_PROG_CC_STDC
+ AC_C_CONST
+ AC_PROG_INSTALL
+--- snarf-7.0/Makefile.am~     1999-07-28 22:56:39.000000000 +0200
++++ snarf-7.0/Makefile.am      2013-02-16 22:11:03.524908767 +0100
+@@ -1,5 +1,5 @@
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ bin_PROGRAMS = snarf
+ 
+--- snarf-7.0/util.c~  2013-02-16 22:13:59.659194947 +0100
++++ snarf-7.0/util.c   2013-02-16 22:17:48.654623807 +0100
+@@ -42,6 +42,8 @@
+ 
+ char output_buf[BUFSIZ];
+ 
++Progress *
++progress_new(void);
+ 
+ #ifndef HAVE_STRERROR
+ 

diff --git a/snarf-ipv6.patch b/snarf-ipv6.patch
index b4ada46f2278c661caceb2cb7afabb0565e8f6ca..8400fb00d6b424e5280267e08108fd69d4964f30 100644 (file)
--- a/snarf-ipv6.patch
+++ b/snarf-ipv6.patch
@@ -14,8 +14,8 @@ diff -ur snarf-7.0/ftp.c snarf-7.0-/ftp.c
  {
          unsigned char *addr;
          struct sockaddr_in sa;
--        int sock;
-+        int sock = 0;
+-        int sock, commas;
++        int sock = 0, commas;
          int x;
          char *line, *orig_line;
  

diff --git a/snarf.spec b/snarf.spec
index bed47faef45db3c167badab98223d030a015be67..176c63d74b0d715031aaef41555bf89714f2fe2a 100644 (file)
--- a/snarf.spec
+++ b/snarf.spec
@@ -7,7 +7,10 @@ License:       GPL
 Group:         Networking/Utilities
 Source0:       ftp://ftp.mint.net/pub/snarf/%{name}-%{version}.tar.gz
 # Source0-md5: 7470d8457bc0d347b5cd8668c9e735c4
-Patch0:                %{name}-ipv6.patch
+Patch0:                ftp://ftp.debian.org:/debian/pool/main/s/snarf/snarf_7.0-5.diff.gz
+# Patch0-md5:  d306ec929b852f5a7b52df4aeeb0813c
+Patch1:                %{name}-ipv6.patch
+Patch2:                %{name}-build.patch
 URL:           http://www.xach.com/snarf/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -24,6 +27,8 @@ sieciowych, takich jak WWW, FTP, finger i kilka innych...
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 rm -f missing