Attachment 125478 Details for Bug 169096 – bsdftpd-ssl-1.1.0_3.patch

[patch] bsdftpd-ssl-1.1.0_3.patch

bsdftpd-ssl-1.1.0_3.patch (text/plain), 4.39 KB, created by Hung-te Liang on 2012-06-15 10:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hung-te Liang

Created: 2012-06-15 10:40:01 UTC

Size: 4.39 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/ftp/bsdftpd-ssl/Makefile /amd/cs/91/9123034/testports/ftp/bsdftpd-ssl/Makefile
>--- /usr/ports/ftp/bsdftpd-ssl/Makefile	2010-03-20 21:59:03.000000000 +0800
>+++ /amd/cs/91/9123034/testports/ftp/bsdftpd-ssl/Makefile	2012-06-15 16:24:55.000000000 +0800
>@@ -7,10 +7,10 @@
> 
> PORTNAME=	bsdftpd-ssl
> PORTVERSION=	1.1.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	ftp
>-MASTER_SITES=	http://bsdftpd.org/files/bsdftpd-ssl/archive/1.1/src/
>-DISTNAME=	bsdftpd-ssl-${PORTVERSION}
>+MASTER_SITES=	http://bsdftpd.org/files/bsdftpd-ssl/archive/1.1/src/ \
>+		http://www.sourcefiles.org/System/Daemons/FTP/
> 
> MAINTAINER=	skynick@mail.sc.ru
> 
>@@ -18,10 +18,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} > 900007
>-BROKEN=		fails to build with new utmpx
>-.endif
>-
> # Client only part
> .if defined(CLIENT_ONLY)
> PKGNAMESUFFIX=	-client
>diff -ruN --exclude=CVS /usr/ports/ftp/bsdftpd-ssl/files/patch-ftpd-logwtmp.c /amd/cs/91/9123034/testports/ftp/bsdftpd-ssl/files/patch-ftpd-logwtmp.c
>--- /usr/ports/ftp/bsdftpd-ssl/files/patch-ftpd-logwtmp.c	1970-01-01 08:00:00.000000000 +0800
>+++ /amd/cs/91/9123034/testports/ftp/bsdftpd-ssl/files/patch-ftpd-logwtmp.c	2012-06-15 15:37:02.000000000 +0800
>@@ -0,0 +1,72 @@
>+diff -urN bsdftpd-ssl-1.1.0.ORI/ftpd/logwtmp.c ftpd/logwtmp.c
>+--- bsdftpd-ssl-1.1.0.ORI/ftpd/logwtmp.c	2004-12-20 02:44:42.000000000 +0800
>++++ ftpd/logwtmp.c	2012-06-15 15:34:03.000000000 +0800
>+@@ -48,13 +48,18 @@
>+ #include <arpa/inet.h>
>+ #include <sys/socket.h>
>+ 
>++#include <sys/param.h>
>++#if __FreeBSD_version < 900007
>+ #include <fcntl.h>
>+ #include <time.h>
>+-#if 0 /* Original FreeBSD 5.0 code */
>++#if 1 /* Original FreeBSD 5.0 code */
>+ #include <timeconv.h>
>+ #endif
>+ #include <netdb.h>
>+ #include <utmp.h>
>++#else
>++#include <utmpx.h>
>++#endif
>+ #include <unistd.h>
>+ #include <stdio.h>
>+ #include <string.h>
>+@@ -63,6 +68,7 @@
>+ 
>+ #include <port_base.h>
>+ 
>++#ifndef _UTMPX_H_
>+ static int fd = -1;
>+ 
>+ /*
>+@@ -94,7 +100,7 @@
>+ 		(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
>+ 		(void)strncpy(ut.ut_name, name, sizeof(ut.ut_name));
>+ 		(void)strncpy(ut.ut_host, host, sizeof(ut.ut_host));
>+-#if 0 /* Original FreeBSD 5.0 code */
>++#if 1 /* Original FreeBSD 5.0 code */
>+ 		ut.ut_time = _time_to_time32(time(NULL));
>+ #else /* Portable code from FreeBSD 4.8 */
>+ 		(void)time(&ut.ut_time);
>+@@ -104,3 +110,31 @@
>+ 			(void)ftruncate(fd, buf.st_size);
>+ 	}
>+ }
>++#else /* Original FreeBSD 9.0 code */
>++void
>++ftpd_logwtmp(char *id, char *user, struct sockaddr *addr)
>++{
>++	struct utmpx ut;
>++
>++	memset(&ut, 0, sizeof(ut));
>++
>++	if (user != NULL) {
>++		/* Log in. */
>++		ut.ut_type = USER_PROCESS;
>++		(void)strncpy(ut.ut_user, user, sizeof(ut.ut_user));
>++		if (addr != NULL)
>++			realhostname_sa(ut.ut_host, sizeof(ut.ut_host),
>++			    addr, addr->sa_len);
>++	} else {
>++		/* Log out. */
>++		ut.ut_type = DEAD_PROCESS;
>++	}
>++
>++	ut.ut_pid = getpid();
>++	gettimeofday(&ut.ut_tv, NULL);
>++	(void)strncpy(ut.ut_id, id, sizeof(ut.ut_id));
>++	(void)strncpy(ut.ut_line, "ftpd", sizeof(ut.ut_line));
>++
>++	pututxline(&ut);
>++}
>++#endif
>diff -ruN --exclude=CVS /usr/ports/ftp/bsdftpd-ssl/files/patch-gcc4 /amd/cs/91/9123034/testports/ftp/bsdftpd-ssl/files/patch-gcc4
>--- /usr/ports/ftp/bsdftpd-ssl/files/patch-gcc4	2007-08-31 01:58:16.000000000 +0800
>+++ /amd/cs/91/9123034/testports/ftp/bsdftpd-ssl/files/patch-gcc4	2012-06-15 15:19:22.000000000 +0800
>@@ -151,27 +151,6 @@
>  	char *p, *a;
>  
>  	if (pdata >= 0)		/* close old port if one set */
>-diff -urN bsdftpd-ssl-1.1.0.ORI/ftpd/logwtmp.c ftpd/logwtmp.c
>---- bsdftpd-ssl-1.1.0.ORI/ftpd/logwtmp.c	2004-12-19 21:44:42.000000000 +0300
>-+++ ftpd/logwtmp.c	2007-08-26 15:37:16.000000000 +0400
>-@@ -50,7 +50,7 @@
>- 
>- #include <fcntl.h>
>- #include <time.h>
>--#if 0 /* Original FreeBSD 5.0 code */
>-+#if 1 /* Original FreeBSD 5.0 code */
>- #include <timeconv.h>
>- #endif
>- #include <netdb.h>
>-@@ -94,7 +94,7 @@
>- 		(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
>- 		(void)strncpy(ut.ut_name, name, sizeof(ut.ut_name));
>- 		(void)strncpy(ut.ut_host, host, sizeof(ut.ut_host));
>--#if 0 /* Original FreeBSD 5.0 code */
>-+#if 1 /* Original FreeBSD 5.0 code */
>- 		ut.ut_time = _time_to_time32(time(NULL));
>- #else /* Portable code from FreeBSD 4.8 */
>- 		(void)time(&ut.ut_time);
> diff -urN bsdftpd-ssl-1.1.0.ORI/port/bsd_prog.mk port/bsd_prog.mk
> --- bsdftpd-ssl-1.1.0.ORI/port/bsd_prog.mk	2003-04-05 13:42:20.000000000 +0400
> +++ port/bsd_prog.mk	2007-08-26 14:53:23.000000000 +0400

Actions: View | Diff

Attachments on bug 169096: 125478