- SA_LEN patch to fix build problems

- use %%rpmcflags macro
- Obsoletes: muddleftpd
- release 10

Changed files:
    ftpd-BSD-SA_LEN.patch -> 1.1
    ftpd-BSD.spec -> 1.34

diff --git a/ftpd-BSD-SA_LEN.patch b/ftpd-BSD-SA_LEN.patch
new file mode 100644 (file)
index 0000000..d69fa1c
--- /dev/null
+++ b/ftpd-BSD-SA_LEN.patch
@@ -0,0 +1,14 @@
+--- ftpd-BSD-0.3.2/ftpd/ftpd.c.orig    Thu Apr  5 16:45:08 2001
++++ ftpd-BSD-0.3.2/ftpd/ftpd.c Thu Apr  5 16:55:57 2001
+@@ -300,6 +300,11 @@
+       }
+ #endif /* ORIGINAL_SOURCE */
+ 
++#ifndef SA_LEN
++#define SA_LEN(x) (((x)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : \
++              (((x)->sa_family == AF_INET)?sizeof(struct sockaddr_in):sizeof(struct sockaddr)))
++#endif
++
+ static void    ack __P((char *));
+ static void    myoob __P((int));
+ static int     checkuser __P((char *, char *));

diff --git a/ftpd-BSD.spec b/ftpd-BSD.spec
index 76dd97e9da1443ee43cd50fe276ed79493c546a8..15972072dcaac5a22be897c211d2fa65bf2730a2 100644 (file)
--- a/ftpd-BSD.spec
+++ b/ftpd-BSD.spec
@@ -2,7 +2,7 @@ Summary:        OpenBSD's ftpd ported to Linux (with IPv6 support)
 Summary(pl):   Port ftpd z OpenBSD dla Linuxa (z wsparciem do IPv6)
 Name:          ftpd-BSD
 Version:       0.3.2
-Release:       9
+Release:       10
 License:       BSD-like
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
@@ -15,6 +15,7 @@ Patch0:               %{name}-anonuser.patch
 Patch1:                %{name}-paths.patch
 Patch2:                %{name}-username.patch
 Patch3:                %{name}-overflow.patch
+Patch4:                %{name}-SA_LEN.patch
 Buildrequires: libwrap-devel
 Buildrequires: pam-devel
 Requires:      rc-inetd
@@ -27,6 +28,7 @@ Obsoletes:    linux-ftpd
 Obsoletes:     proftpd
 Obsoletes:     pure-ftpd
 Obsoletes:     wu-ftpd
+Obsoletes:     muddleftpd
 
 %description
 This is a Linux port of the BSD ftp server (ftpd). It doesn't have all
@@ -53,8 +55,9 @@ wersji ftpd to 6.4, za
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %build
-%{__make} -C ftpd OPT_CFLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}"
+%{__make} -C ftpd OPT_CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT