[packages/snarf] - patch from debian and build fix
arekm
arekm at pld-linux.org
Sat Feb 16 22:18:40 CET 2013
commit 23b19ac90d798c81c86172d9aa515f9e44e525a4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Feb 16 22:18:36 2013 +0100
- patch from debian and build fix
snarf-build.patch | 30 ++++++++++++++++++++++++++++++
snarf-ipv6.patch | 4 ++--
snarf.spec | 7 ++++++-
3 files changed, 38 insertions(+), 3 deletions(-)
---
diff --git a/snarf.spec b/snarf.spec
index bed47fa..176c63d 100644
--- 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
diff --git a/snarf-build.patch b/snarf-build.patch
new file mode 100644
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 b4ada46..8400fb0 100644
--- 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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/snarf.git/commitdiff/23b19ac90d798c81c86172d9aa515f9e44e525a4
More information about the pld-cvs-commit
mailing list