This commit is contained in:
parent
10661cf33d
commit
fb2c061ad9
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 11 00:33:29 CEST 2008 - crrodriguez@suse.de
|
||||
|
||||
- fix build with glibc 2.8, ARG_MAX no longer defined
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 29 11:11:58 CEST 2007 - meissner@suse.de
|
||||
|
||||
|
33
ftp.spec
33
ftp.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ftp (Version 0.17)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
@ -10,21 +10,23 @@
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: ftp
|
||||
URL: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit
|
||||
Url: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit
|
||||
Prefix: /usr
|
||||
License: BSD License and BSD-like
|
||||
License: BSD 3-Clause
|
||||
BuildRequires: ncurses-devel
|
||||
Group: Productivity/Networking/Ftp/Clients
|
||||
Conflicts: lukemftp
|
||||
Autoreqprov: on
|
||||
AutoReqProv: on
|
||||
Version: 0.17
|
||||
Release: 578
|
||||
Release: 639
|
||||
Summary: The Standard UNIX FTP Client
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source: netkit-ftp-%{version}.tar.bz2
|
||||
Patch: netkit-ftp-%{version}.dif
|
||||
Patch1: ipv6-usagi-20010122.diff
|
||||
Patch2: netkit-ftp-0.17-glibc28.patch
|
||||
|
||||
%description
|
||||
This package provides the standard UNIX command line FTP client. FTP is
|
||||
@ -41,6 +43,7 @@ Authors:
|
||||
%setup -n netkit-ftp-%{version}
|
||||
%patch
|
||||
%patch1 -p2
|
||||
%patch2
|
||||
|
||||
%build
|
||||
CFLAGS=$RPM_OPT_FLAGS ./configure --without-readline
|
||||
@ -55,9 +58,7 @@ make INSTALLROOT=$RPM_BUILD_ROOT install
|
||||
#echo ".so man1/ftp.1" > $RPM_BUILD_ROOT%{_mandir}/man1/pftp.1
|
||||
|
||||
%clean
|
||||
if [ -n "$RPM_BUILD_ROOT" ] ; then
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
fi
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@ -69,17 +70,19 @@ fi
|
||||
%doc %{_mandir}/man5/netrc.5.gz
|
||||
|
||||
%changelog
|
||||
* Thu Mar 29 2007 - meissner@suse.de
|
||||
* Fri Apr 11 2008 crrodriguez@suse.de
|
||||
- fix build with glibc 2.8, ARG_MAX no longer defined
|
||||
* Thu Mar 29 2007 meissner@suse.de
|
||||
- added ncurses-devel
|
||||
* Wed Jan 25 2006 - mls@suse.de
|
||||
* Wed Jan 25 2006 mls@suse.de
|
||||
- converted neededforbuild to BuildRequires
|
||||
* Fri Jan 13 2006 - schwab@suse.de
|
||||
* Fri Jan 13 2006 schwab@suse.de
|
||||
- Don't strip binaries.
|
||||
* Sun Jan 11 2004 - adrian@suse.de
|
||||
* Sun Jan 11 2004 adrian@suse.de
|
||||
- add %%defattr
|
||||
* Wed Sep 26 2001 - kukuk@suse.de
|
||||
* Wed Sep 26 2001 kukuk@suse.de
|
||||
- Add patch for LFS support
|
||||
* Sun Apr 22 2001 - kukuk@suse.de
|
||||
* Sun Apr 22 2001 kukuk@suse.de
|
||||
- Add USAGI IPv6 patches
|
||||
* Fri Sep 29 2000 - kukuk@suse.de
|
||||
* Fri Sep 29 2000 kukuk@suse.de
|
||||
- initial version
|
||||
|
26
netkit-ftp-0.17-glibc28.patch
Normal file
26
netkit-ftp-0.17-glibc28.patch
Normal file
@ -0,0 +1,26 @@
|
||||
Index: ftp/glob.c
|
||||
===================================================================
|
||||
--- ftp/glob.c.orig 1999-10-02 15:25:23.000000000 +0200
|
||||
+++ ftp/glob.c 2008-04-11 00:27:09.000000000 +0200
|
||||
@@ -50,7 +50,7 @@ char glob_rcsid[] =
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
-
|
||||
+#include <unistd.h>
|
||||
#include "ftp_var.h" /* for protos only */
|
||||
#include "glob.h"
|
||||
|
||||
@@ -60,6 +60,12 @@ char glob_rcsid[] =
|
||||
#define GAVSIZ (ARG_MAX/6)
|
||||
#define isdir(d) ((d.st_mode & S_IFMT) == S_IFDIR)
|
||||
|
||||
+#ifndef ARG_MAX
|
||||
+ #ifdef _SC_ARG_MAX
|
||||
+ #define ARG_MAX sysconf(_SC_ARG_MAX)
|
||||
+ #endif
|
||||
+#endif
|
||||
+
|
||||
const char *globerr;
|
||||
extern const char *home;
|
||||
|
Loading…
Reference in New Issue
Block a user