Attachment #53811 for bug #81411

View | Details | Raw Unified | Return to bug 81411
Collapse All | Expand All




#

PORTNAME=	pftpd
PORTVERSION=	1.0.1
CATEGORIES=	ftp
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

Lines 1-2 Link Here

(-)pftpd/distinfo (-2 / +2 lines)
1	MD5 (pftpd-0.42.tar.gz) = 0c810bc09435e520dabd408e000b7962	1	MD5 (pftpd-1.0.1.tar.gz) = 1ca94acbfeeb6f9ed3f9116b3e14fd94
2	SIZE (pftpd-0.42.tar.gz) = 196314	2	SIZE (pftpd-1.0.1.tar.gz) = 270830

Lines 1-11 Link Here

(-)pftpd/files/patch-Makefile.in (-5 / +5 lines)
1	--- src/Makefile.in.orig Wed May 15 10:48:26 2002	1	--- src/Makefile.in.orig Thu Jan 9 14:27:48 2003
2	+++ src/Makefile.in Wed May 15 10:48:34 2002	2	+++ src/Makefile.in Mon May 23 18:23:31 2005
3	@@ -32,7 +32,7 @@	3	@@ -40,7 +40,7 @@
4	all: $(PROGRAMS)	4	all: $(PROGRAMS)
5		5
6	pftpd: $(OBJS) $(LIBPLIB)	6	pftpd: $(OBJS) $(LIBPLIB)
7	- $(CC) $(CFLAGS) -o $@ $(OBJS) $(KOBJ) $(LIBPLIB) $(LDFLAGS)	7	- $(CC) $(CFLAGS) -o $@ $(OBJS) $(KOBJ) $(LIBPLIB) $(LDFLAGS)
8	+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(KOBJ) $(LIBPLIB) $(LDFLAGS) -lcompat	8	+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(KOBJ) $(LIBPLIB) $(LDFLAGS) -lcompat
9		9
10	rpad: rpad.o $(LIBPLIB)	10	rpad: rpad.o socket.o $(LIBPLIB)
11	$(CC) $(CFLAGS) -o $@ rpad.o $(LIBPLIB) $(LDFLAGS)	11	$(CC) $(CFLAGS) -o $@ rpad.o socket.o $(LIBPLIB) $(LDFLAGS)




--- 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




--- 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);
 




--- 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;

Return to bug 81411

Lines 6-19 Link Here

(-)pftpd/Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= pftpd	8	PORTNAME= pftpd
9	PORTVERSION= 0.42	9	PORTVERSION= 1.0.1
10	CATEGORIES= ftp	10	CATEGORIES= ftp
11	MASTER_SITES= ftp://ftp.lysator.liu.se/pub/unix/pftpd/	11	MASTER_SITES= ftp://ftp.lysator.liu.se/pub/unix/pftpd/ \
		12	ftp://ftp.ifm.liu.se/pub/unix/pftpd/
12		13
13	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Multithreaded anonymous FTP daemon	15	COMMENT= Multithreaded anonymous FTP daemon
15
16	BROKEN= Unfetchable
17		16
18	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
19	USE_REINPLACE= yes	18	USE_REINPLACE= yes

Line 0 Link Here

(-)pftpd/files/patch-doc_Makefile (+19 lines)
	1	--- doc/Makefile.orig Mon May 23 18:55:25 2005
	2	+++ doc/Makefile Mon May 23 18:55:22 2005
	3	@@ -17,11 +17,11 @@ all: man
	4
	5	man: $(MANPAGES)
	6
	7	-pftpd.1: pftpd.sgml
	8	- $(SGML2MAN) pftpd.sgml
	9	-
	10	-rpad.1: rpad.sgml
	11	- $(SGML2MAN) rpad.sgml
	12	+#pftpd.1: pftpd.sgml
	13	+# $(SGML2MAN) pftpd.sgml
	14	+#
	15	+#rpad.1: rpad.sgml
	16	+# $(SGML2MAN) rpad.sgml
	17
	18
	19	# Installing

Line 0 Link Here

(-)pftpd/files/patch-plib_dirlist.c (+12 lines)
	1	--- plib/dirlist.c.orig Tue Feb 1 10:43:35 2005
	2	+++ plib/dirlist.c Mon May 23 18:35:47 2005
	3	@@ -80,7 +80,9 @@
	4	len = strlen(name);
	5	dp = a_malloc(sizeof(*dp)+len, "struct dirent");
	6	dp->d_ino = ino;
	7	+#ifdef linux
	8	dp->d_off = 0;
	9	+#endif /* linux */
	10	dp->d_reclen = len;
	11	strcpy(dp->d_name, name);
	12

Line 0 Link Here

(-)pftpd/files/patch-src_rpa.c (+38 lines)
	1	--- src/rpa.c.orig Tue Feb 1 12:57:33 2005
	2	+++ src/rpa.c Mon May 23 18:35:47 2005
	3	@@ -27,7 +27,7 @@
	4	#endif
	5
	6	#include <sys/uio.h>
	7	-#include <stropts.h>
	8	+#include <sys/un.h>
	9
	10	#ifdef HAVE_UNISTD_H
	11	#include <unistd.h>
	12	@@ -196,7 +196,7 @@
	13	goto Fail;
	14	}
	15
	16	- memset(&usb, 0, sizeof(sun));
	17	+ memset(&usb, 0, sizeof(usb));
	18	usb.sun_family = AF_UNIX;
	19	strcpy(usb.sun_path, path);
	20
	21	@@ -210,7 +210,7 @@
	22
	23	s_snprintf(path, sizeof(path), "%s/%s/unix", PATH_RPAD_DIR, rp->service);
	24
	25	- memset(&usb, 0, sizeof(sun));
	26	+ memset(&usb, 0, sizeof(usb));
	27	usb.sun_family = AF_UNIX;
	28	strcpy(usb.sun_path, path);
	29
	30	@@ -399,8 +399,6 @@
	31	msg.msg_iov = iov;
	32	msg.msg_iovlen = 1;
	33	msg.msg_name = NULL;
	34	- msg.msg_accrights = (void *) &rfd;
	35	- msg.msg_accrightslen = sizeof(rfd);
	36
	37	rfd = -1;
	38	rcode = -1;