Attachment #135570 for bug #180508

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




# Created by: Gea-Suan Lin <gslin@ccca.nctu.edu.tw>
# Date created:				17 Mar 2002
# Whom:					Gea-Suan Lin <gslin@ccca.nctu.edu.tw>
#
# $FreeBSD: head/ftp/pftpd/Makefile 300896 2012-07-14 13:54:48Z beat $
#

PORTNAME=	pftpd
PORTVERSION=	1.0.3
CATEGORIES=	ftp
MASTER_SITES=	ftp://ftp.ifm.liu.se/pub/unix/pftpd/
		ftp://ftp.ifm.liu.se/pub/unix/pftpd/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Multithreaded anonymous FTP daemon

MAN1=		pftpd.1 rpad.1
PLIST_FILES=	sbin/pftpd

post-extract:
.for f in ${MAN1}
	@${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/doc/${f}
.endfor

post-patch:
	@${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
		's|-lpthread|${PTHREAD_LIBS}|g'
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
		${WRKSRC}/configure \
		${WRKSRC}/plib/configure

do-install:
	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} pftpd ${PREFIX}/sbin)
	(cd ${WRKSRC}/doc && ${INSTALL_MAN} *.1 ${MANPREFIX}/man/man1)
	@${CAT} ${WRKSRC}/ISSUES

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)ftp/pftpd/distinfo (-2 / +2 lines)
1	SHA256 (pftpd-1.0.2.tar.gz) = 9067f957b408dd2ac2760adc869f8c2f5fc85530c0c27eefde00d38ea2705913	1	SHA256 (pftpd-1.0.3.tar.gz) = 2e60df82de5302d904823287931ac6b001bee0fea0de3155fadc0b70cfbf444e
2	SIZE (pftpd-1.0.2.tar.gz) = 273656	2	SIZE (pftpd-1.0.3.tar.gz) = 234154




--- plib/support.c.orig	Thu Jan  9 22:25:01 2003
+++ plib/support.c	Wed Apr  6 00:38:41 2005
@@ -369,11 +369,13 @@
     return code;
     
 #else
+    pthread_once_t grp_once;
+    pthread_mutex_t grp_lock;
     struct group *gp;
     int i, len;
 
     
-    pthread_once(&grp_once, grp_lock_init);
+    pthread_once(&grp_once, NULL);
     pthread_mutex_lock(&grp_lock);
 
     gp = getgrgid(gid);
@@ -452,11 +454,13 @@
     return code;
     
 #else
+    pthread_once_t grp_once;
+    pthread_mutex_t grp_lock;
     struct group *gp;
     int i, len;
 
     
-    pthread_once(&grp_once, grp_lock_init);
+    pthread_once(&grp_once, NULL);
     pthread_mutex_lock(&grp_lock);
 
     gp = getgrnam(name);

Lines 9-15 Link Here

(-)ftp/pftpd/files/patch-src_rpa.c (-3 / +11 lines)
9		9
10	#ifdef HAVE_UNISTD_H	10	#ifdef HAVE_UNISTD_H
11	#include <unistd.h>	11	#include <unistd.h>
12	@@ -196,7 +196,7 @@	12	@@ -198,14 +198,14 @@
		13	}
		14
		15	strcpy(path, "/var/tmp/rpa.XXXXXX");
		16	- mktemp(path);
		17	+ mkstemp(path);
		18	if (!path[0])
		19	{
		20	syslog(LOG_ERR, "rpa_unix_open: unable to create local socket name");
13	goto Fail;	21	goto Fail;
14	}	22	}
15		23
Lines 18-24 Link Here
18	usb.sun_family = AF_UNIX;	26	usb.sun_family = AF_UNIX;
19	strcpy(usb.sun_path, path);	27	strcpy(usb.sun_path, path);
20		28
21	@@ -210,7 +210,7 @@	29	@@ -219,7 +219,7 @@
22		30
23	s_snprintf(path, sizeof(path), "%s/%s/unix", PATH_RPAD_DIR, rp->service);	31	s_snprintf(path, sizeof(path), "%s/%s/unix", PATH_RPAD_DIR, rp->service);
24		32
Lines 27-33 Link Here
27	usb.sun_family = AF_UNIX;	35	usb.sun_family = AF_UNIX;
28	strcpy(usb.sun_path, path);	36	strcpy(usb.sun_path, path);
29		37
30	@@ -399,8 +399,6 @@	38	@@ -408,8 +408,6 @@
31	msg.msg_iov = iov;	39	msg.msg_iov = iov;
32	msg.msg_iovlen = 1;	40	msg.msg_iovlen = 1;
33	msg.msg_name = NULL;	41	msg.msg_name = NULL;

Return to bug 180508

Lines 1-15 Link Here

(-)ftp/pftpd/Makefile (-19 / +8 lines)
1	# New ports collection makefile for: vsftpd	1	# Created by: Gea-Suan Lin <gslin@ccca.nctu.edu.tw>
2	# Date created: 17 Mar 2002
3	# Whom: Gea-Suan Lin <gslin@ccca.nctu.edu.tw>
4	#
5	# $FreeBSD: head/ftp/pftpd/Makefile 300896 2012-07-14 13:54:48Z beat $	2	# $FreeBSD: head/ftp/pftpd/Makefile 300896 2012-07-14 13:54:48Z beat $
6	#
7		3
8	PORTNAME= pftpd	4	PORTNAME= pftpd
9	PORTVERSION= 1.0.2	5	PORTVERSION= 1.0.3
10	CATEGORIES= ftp	6	CATEGORIES= ftp
11	MASTER_SITES= ftp://ftp.lysator.liu.se/pub/unix/pftpd/ \	7	MASTER_SITES= ftp://ftp.ifm.liu.se/pub/unix/pftpd/
12	ftp://ftp.ifm.liu.se/pub/unix/pftpd/
13		8
14	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Multithreaded anonymous FTP daemon	10	COMMENT= Multithreaded anonymous FTP daemon
Lines 20-38 Link Here
20	MAN1= pftpd.1 rpad.1	15	MAN1= pftpd.1 rpad.1
21	PLIST_FILES= sbin/pftpd	16	PLIST_FILES= sbin/pftpd
22		17
23	post-extract:
24	.for f in ${MAN1}
25	@${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/doc/${f}
26	.endfor
27
28	post-patch:	18	post-patch:
29	@${REINPLACE_CMD} -e 's\|mktemp\|mkstemp\|g' \	19	@${FIND} ${WRKSRC} -name "configure" \| ${XARGS} ${REINPLACE_CMD} -e \
30	${WRKSRC}/src/rpa.c	20	's\|-lpthread\|${PTHREAD_LIBS}\|g'
31	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \
32	${WRKSRC}/configure \
33	${WRKSRC}/plib/configure
34		21
35	post-install:	22	do-install:
		23	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} pftpd ${PREFIX}/sbin)
		24	(cd ${WRKSRC}/doc && ${INSTALL_MAN} *.1 ${MANPREFIX}/man/man1)
36	@${CAT} ${WRKSRC}/ISSUES	25	@${CAT} ${WRKSRC}/ISSUES
37		26
38	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)ftp/pftpd/files/patch-plib-support.c (-17 / +31 lines)
1	--- plib/support.c.orig Thu Jan 9 14:25:01 2003	1	--- plib/support.c.orig Thu Jan 9 22:25:01 2003
2	+++ plib/support.c Mon May 23 20:46:01 2005	2	+++ plib/support.c Wed Apr 6 00:38:41 2005
3	@@ -145,6 +145,15 @@	3	@@ -369,11 +369,13 @@
4	pthread_mutex_init(&pwd_lock, NULL);	4	return code;
5	}	5
		6	#else
		7	+ pthread_once_t grp_once;
		8	+ pthread_mutex_t grp_lock;
		9	struct group *gp;
		10	int i, len;
6		11
7	+static pthread_mutex_t grp_lock;	12
8	+static pthread_once_t grp_once = PTHREAD_ONCE_INIT;	13	- pthread_once(&grp_once, grp_lock_init);
9	+	14	+ pthread_once(&grp_once, NULL);
10	+static void	15	pthread_mutex_lock(&grp_lock);
11	+grp_lock_init(void)	16
12	+{	17	gp = getgrgid(gid);
13	+ pthread_mutex_init(&grp_lock, NULL);	18	@@ -452,11 +454,13 @@
14	+}	19	return code;
15	+	20
16	static char *	21	#else
17	strcopy(const char str, char buf, size_t avail)	22	+ pthread_once_t grp_once;
18	{	23	+ pthread_mutex_t grp_lock;
		24	struct group *gp;
		25	int i, len;
		26
		27
		28	- pthread_once(&grp_once, grp_lock_init);
		29	+ pthread_once(&grp_once, NULL);
		30	pthread_mutex_lock(&grp_lock);
		31
		32	gp = getgrnam(name);