Attachment 53811 Details for Bug 81411 – file.diff

[patch] file.diff

file.diff (text/plain), 3.80 KB, created by Johan van Selst on 2005-05-23 18:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johan van Selst

Created: 2005-05-23 18:20:11 UTC

Size: 3.80 KB

patch

obsolete

>diff -uNr pftpd/Makefile pftpd/Makefile
>--- pftpd/Makefile	Sun May 22 04:02:18 2005
>+++ pftpd/Makefile	Mon May 23 18:23:06 2005
>@@ -6,14 +6,13 @@
> #
> 
> PORTNAME=	pftpd
>-PORTVERSION=	0.42
>+PORTVERSION=	1.0.1
> CATEGORIES=	ftp
>-MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/unix/pftpd/
>+MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/unix/pftpd/ \
>+	ftp://ftp.ifm.liu.se/pub/unix/pftpd/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Multithreaded anonymous FTP daemon
>-
>-BROKEN=		Unfetchable
> 
> GNU_CONFIGURE=	yes
> USE_REINPLACE=	yes
>diff -uNr pftpd/distinfo pftpd/distinfo
>--- pftpd/distinfo	Wed Mar 31 05:07:48 2004
>+++ pftpd/distinfo	Mon May 23 18:23:16 2005
>@@ -1,2 +1,2 @@
>-MD5 (pftpd-0.42.tar.gz) = 0c810bc09435e520dabd408e000b7962
>-SIZE (pftpd-0.42.tar.gz) = 196314
>+MD5 (pftpd-1.0.1.tar.gz) = 1ca94acbfeeb6f9ed3f9116b3e14fd94
>+SIZE (pftpd-1.0.1.tar.gz) = 270830
>diff -uNr pftpd/files/patch-Makefile.in pftpd/files/patch-Makefile.in
>--- pftpd/files/patch-Makefile.in	Wed May 15 15:15:04 2002
>+++ pftpd/files/patch-Makefile.in	Mon May 23 18:35:30 2005
>@@ -1,11 +1,11 @@
>---- src/Makefile.in.orig	Wed May 15 10:48:26 2002
>-+++ src/Makefile.in	Wed May 15 10:48:34 2002
>-@@ -32,7 +32,7 @@
>+--- src/Makefile.in.orig	Thu Jan  9 14:27:48 2003
>++++ src/Makefile.in	Mon May 23 18:23:31 2005
>+@@ -40,7 +40,7 @@
>  all:	$(PROGRAMS)
>  
>  pftpd:	$(OBJS) $(LIBPLIB)
> -	$(CC) $(CFLAGS) -o $@ $(OBJS) $(KOBJ) $(LIBPLIB) $(LDFLAGS)
> +	$(CC) $(CFLAGS) -o $@ $(OBJS) $(KOBJ) $(LIBPLIB) $(LDFLAGS) -lcompat
>  
>- rpad:	rpad.o $(LIBPLIB)
>- 	$(CC) $(CFLAGS) -o $@ rpad.o $(LIBPLIB) $(LDFLAGS)
>+ rpad:	rpad.o socket.o $(LIBPLIB)
>+ 	$(CC) $(CFLAGS) -o $@ rpad.o socket.o $(LIBPLIB) $(LDFLAGS)
>diff -uNr pftpd/files/patch-doc_Makefile pftpd/files/patch-doc_Makefile
>--- pftpd/files/patch-doc_Makefile	Thu Jan  1 01:00:00 1970
>+++ pftpd/files/patch-doc_Makefile	Mon May 23 18:55:36 2005
>@@ -0,0 +1,19 @@
>+--- doc/Makefile.orig	Mon May 23 18:55:25 2005
>++++ doc/Makefile	Mon May 23 18:55:22 2005
>+@@ -17,11 +17,11 @@ all:	man
>+ 
>+ man:	$(MANPAGES)
>+ 
>+-pftpd.1:	pftpd.sgml
>+-	$(SGML2MAN)	pftpd.sgml
>+-
>+-rpad.1:		rpad.sgml
>+-	$(SGML2MAN)	rpad.sgml
>++#pftpd.1:	pftpd.sgml
>++#	$(SGML2MAN)	pftpd.sgml
>++#
>++#rpad.1:		rpad.sgml
>++#	$(SGML2MAN)	rpad.sgml
>+ 
>+ 
>+ # Installing
>diff -uNr pftpd/files/patch-plib_dirlist.c pftpd/files/patch-plib_dirlist.c
>--- pftpd/files/patch-plib_dirlist.c	Thu Jan  1 01:00:00 1970
>+++ pftpd/files/patch-plib_dirlist.c	Mon May 23 18:55:41 2005
>@@ -0,0 +1,12 @@
>+--- plib/dirlist.c.orig	Tue Feb  1 10:43:35 2005
>++++ plib/dirlist.c	Mon May 23 18:35:47 2005
>+@@ -80,7 +80,9 @@
>+     len = strlen(name);
>+     dp = a_malloc(sizeof(*dp)+len, "struct dirent");
>+     dp->d_ino = ino;
>++#ifdef		linux
>+     dp->d_off = 0;
>++#endif		/* linux */
>+     dp->d_reclen = len;
>+     strcpy(dp->d_name, name);
>+ 
>diff -uNr pftpd/files/patch-src_rpa.c pftpd/files/patch-src_rpa.c
>--- pftpd/files/patch-src_rpa.c	Thu Jan  1 01:00:00 1970
>+++ pftpd/files/patch-src_rpa.c	Mon May 23 18:55:40 2005
>@@ -0,0 +1,38 @@
>+--- src/rpa.c.orig	Tue Feb  1 12:57:33 2005
>++++ src/rpa.c	Mon May 23 18:35:47 2005
>+@@ -27,7 +27,7 @@
>+ #endif
>+ 
>+ #include <sys/uio.h>
>+-#include <stropts.h>
>++#include <sys/un.h>
>+ 
>+ #ifdef HAVE_UNISTD_H
>+ #include <unistd.h>
>+@@ -196,7 +196,7 @@
>+ 	goto Fail;
>+     }
>+     
>+-    memset(&usb, 0, sizeof(sun));
>++    memset(&usb, 0, sizeof(usb));
>+     usb.sun_family = AF_UNIX;
>+     strcpy(usb.sun_path, path);
>+     
>+@@ -210,7 +210,7 @@
>+     
>+     s_snprintf(path, sizeof(path), "%s/%s/unix", PATH_RPAD_DIR, rp->service);
>+ 
>+-    memset(&usb, 0, sizeof(sun));
>++    memset(&usb, 0, sizeof(usb));
>+     usb.sun_family = AF_UNIX;
>+     strcpy(usb.sun_path, path);
>+     
>+@@ -399,8 +399,6 @@
>+     msg.msg_iov = iov;
>+     msg.msg_iovlen = 1;
>+     msg.msg_name = NULL;
>+-    msg.msg_accrights = (void *) &rfd;
>+-    msg.msg_accrightslen = sizeof(rfd);
>+ 
>+     rfd = -1;
>+     rcode = -1;

Actions: View | Diff

Attachments on bug 81411: 53811