Attachment #217442 for bug #248831

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

Lines 2-8 Link Here

(-)tnftpd.new/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/ftp/tnftpd/Makefile 514132 2019-10-09 10:40:21Z bapt $	2	# $FreeBSD: head/ftp/tnftpd/Makefile 514132 2019-10-09 10:40:21Z bapt $
3		3
4	PORTNAME= tnftpd	4	PORTNAME= tnftpd
5	PORTVERSION= 20130325	5	PORTVERSION= 20200704
6	CATEGORIES= ftp	6	CATEGORIES= ftp
7	MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/	7	MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
8		8

Lines 1-2 Link Here

(-)tnftpd.new/distinfo (-2 / +3 lines)
1	SHA256 (tnftpd-20130325.tar.gz) = 331006f0bcee593af3f4faaaf1de8db825e2aa60449be1c961916b37d562e147	1	TIMESTAMP = 1597924555
2	SIZE (tnftpd-20130325.tar.gz) = 518350	2	SHA256 (tnftpd-20200704.tar.gz) = 92de915e1b4b7e4bd403daac5d89ce67fa73e49e8dda18e230fa86ee98e26ab7
		3	SIZE (tnftpd-20200704.tar.gz) = 529105




Fix compilation error.

--- configure.ac.orig	2013-03-25 04:52:48.000000000 +0100
+++ configure.ac	2013-03-25 17:03:53.000000000 +0100
@@ -22,6 +22,8 @@
 AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc silent-rules])
 AM_MAINTAINER_MODE()
 
+AM_PROG_AR()
+
 LT_PREREQ([2.4])
 LT_INIT()
 




FreeBSD does have support for utmp/utmpx, so include relevant files into
a build.

--- src/Makefile.am.orig	2020-08-20 14:01:03.673963000 +0200
+++ src/Makefile.am	2020-08-20 14:01:34.224994000 +0200
@@ -8,7 +8,9 @@
 	conf.c \
 	ftpd.c \
 	ftpcmd.y \
 	pfilter.c \
-	popen.c
+	popen.c \
+	logutmp.c \
+	logwtmp.c
 
 noinst_HEADERS = \
 	-DHAVE_TNFTPD_H=1 \
@@ -45,8 +47,6 @@
 	extern.h \
@@ -51,6 +53,4 @@
 EXTRA_DIST = \
 	ftpd.conf.manin \
 	ftpusers.manin \
-	logutmp.c \
-	logwtmp.c \
 	tnftpd.manin
 	tnftpd.manin \
 	version.h




Rewrite utmpx support.

--- src/ftpd.c.orig	2020-08-20 14:20:47.994787000 +0200
+++ src/ftpd.c	2020-08-20 14:26:20.778476000 +0200
@@ -514,9 +514,6 @@
 	pfilter_open();
 
 	if (dowtmp) {
-#ifdef SUPPORT_UTMPX

 #ifdef SUPPORT_UTMP
 		ftpd_initwtmp();
 #endif
@@ -1336,23 +1333,18 @@
 	(void)gettimeofday(&tv, NULL);
 #endif
 #ifdef SUPPORT_UTMPX

 #endif
 #ifdef SUPPORT_UTMP
 	if (doutmp) {
@@ -1372,17 +1364,23 @@
 logout_utmp(void)
 {
 #ifdef SUPPORT_UTMPX




FreeBSD does not have LOGIN_NAME_MAX, but it has MAXLOGNAME instead,
so use it as much as possible. Rewrite utmpx support.

--- tnftpd.h.orig	2020-08-20 14:21:18.580517000 +0200
+++ tnftpd.h	2020-08-20 14:30:38.005942000 +0200
@@ -119,6 +119,8 @@
 #endif
 #if defined(HAVE_UTMP_H)

 #endif
 
 #if defined(HAVE_POLL)
@@ -565,7 +567,11 @@
 #define TM_YEAR_BASE	1900
 
 #if !defined(LOGIN_NAME_MAX)

+# define LOGIN_NAME_MAX MAXLOGNAME
+#else
 # define LOGIN_NAME_MAX (9)
 #endif
+#endif
 #endif
 
 #if !defined(_POSIX_LOGIN_NAME_MAX)
 # define _POSIX_LOGIN_NAME_MAX LOGIN_NAME_MAX

Return to bug 248831

Lines 1-13 Link Here

(-)tnftpd.new/files/patch-configure.ac (-13 lines)
1	Fix compilation error.
2
3	--- configure.ac.orig 2013-03-25 04:52:48.000000000 +0100
4	+++ configure.ac 2013-03-25 17:03:53.000000000 +0100
5	@@ -22,6 +22,8 @@
6	AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc silent-rules])
7	AM_MAINTAINER_MODE()
8
9	+AM_PROG_AR()
10	+
11	LT_PREREQ([2.4])
12	LT_INIT()
13

Lines 1-25 Link Here

(-)tnftpd.new/files/patch-src-Makefile.am (-10 / +8 lines)
1	FreeBSD does have support for utmp/utmpx, so include relevant files into	1	FreeBSD does have support for utmp/utmpx, so include relevant files into
2	a build.	2	a build.
3		3
4	--- src/Makefile.am.orig 2010-01-04 06:46:29.000000000 +0100	4	--- src/Makefile.am.orig 2020-08-20 14:01:03.673963000 +0200
5	+++ src/Makefile.am 2010-01-04 06:46:29.000000000 +0100	5	+++ src/Makefile.am 2020-08-20 14:01:34.224994000 +0200
6	@@ -7,7 +7,9 @@	6	@@ -8,7 +8,9 @@
7	conf.c \
8	ftpd.c \	7	ftpd.c \
9	ftpcmd.y \	8	ftpcmd.y \
		9	pfilter.c \
10	- popen.c	10	- popen.c
11	+ popen.c \	11	+ popen.c \
12	+ logutmp.c \	12	+ logutmp.c \
13	+ logwtmp.c	13	+ logwtmp.c
14		14
15	AM_CPPFLAGS = \	15	noinst_HEADERS = \
16	-DHAVE_TNFTPD_H=1 \
17	@@ -45,8 +47,6 @@
18	extern.h \	16	extern.h \
		17	@@ -51,6 +53,4 @@
		18	EXTRA_DIST = \
19	ftpd.conf.manin \	19	ftpd.conf.manin \
20	ftpusers.manin \	20	ftpusers.manin \
21	- logutmp.c \	21	- logutmp.c \
22	- logwtmp.c \	22	- logwtmp.c \
23	pathnames.h \	23	tnftpd.manin
24	tnftpd.manin \
25	version.h

Lines 1-9 Link Here

(-)tnftpd.new/files/patch-src-ftpd.c (-6 / +6 lines)
1	Rewrite utmpx support.	1	Rewrite utmpx support.
2		2
3	--- src/ftpd.c.orig 2009-11-07 04:26:48.000000000 +0100	3	--- src/ftpd.c.orig 2020-08-20 14:20:47.994787000 +0200
4	+++ src/ftpd.c 2009-11-07 04:26:48.000000000 +0100	4	+++ src/ftpd.c 2020-08-20 14:26:20.778476000 +0200
5	@@ -504,9 +504,6 @@	5	@@ -514,9 +514,6 @@
6	confdir = _DEFAULT_CONFDIR;	6	pfilter_open();
7		7
8	if (dowtmp) {	8	if (dowtmp) {
9	-#ifdef SUPPORT_UTMPX	9	-#ifdef SUPPORT_UTMPX
Lines 12-18 Link Here
12	#ifdef SUPPORT_UTMP	12	#ifdef SUPPORT_UTMP
13	ftpd_initwtmp();	13	ftpd_initwtmp();
14	#endif	14	#endif
15	@@ -1320,23 +1317,18 @@	15	@@ -1336,23 +1333,18 @@
16	(void)gettimeofday(&tv, NULL);	16	(void)gettimeofday(&tv, NULL);
17	#endif	17	#endif
18	#ifdef SUPPORT_UTMPX	18	#ifdef SUPPORT_UTMPX
Lines 41-47 Link Here
41	#endif	41	#endif
42	#ifdef SUPPORT_UTMP	42	#ifdef SUPPORT_UTMP
43	if (doutmp) {	43	if (doutmp) {
44	@@ -1356,17 +1348,23 @@	44	@@ -1372,17 +1364,23 @@
45	logout_utmp(void)	45	logout_utmp(void)
46	{	46	{
47	#ifdef SUPPORT_UTMPX	47	#ifdef SUPPORT_UTMPX

Lines 1-8 Link Here

(-)tnftpd.new/files/patch-tnftpd.h (-5 / +4 lines)
1	FreeBSD does not have LOGIN_NAME_MAX, but it has MAXLOGNAME instead,	1	FreeBSD does not have LOGIN_NAME_MAX, but it has MAXLOGNAME instead,
2	so use it as much as possible. Rewrite utmpx support.	2	so use it as much as possible. Rewrite utmpx support.
3		3
4	--- tnftpd.h.orig 2009-11-07 10:59:09.000000000 +0100	4	--- tnftpd.h.orig 2020-08-20 14:21:18.580517000 +0200
5	+++ tnftpd.h 2009-11-07 10:59:09.000000000 +0100	5	+++ tnftpd.h 2020-08-20 14:30:38.005942000 +0200
6	@@ -119,6 +119,8 @@	6	@@ -119,6 +119,8 @@
7	#endif	7	#endif
8	#if defined(HAVE_UTMP_H)	8	#if defined(HAVE_UTMP_H)
Lines 12-18 Link Here
12	#endif	12	#endif
13		13
14	#if defined(HAVE_POLL)	14	#if defined(HAVE_POLL)
15	@@ -561,8 +563,12 @@	15	@@ -565,7 +567,11 @@
16	#define TM_YEAR_BASE 1900	16	#define TM_YEAR_BASE 1900
17		17
18	#if !defined(LOGIN_NAME_MAX)	18	#if !defined(LOGIN_NAME_MAX)
Lines 20-27 Link Here
20	+# define LOGIN_NAME_MAX MAXLOGNAME	20	+# define LOGIN_NAME_MAX MAXLOGNAME
21	+#else	21	+#else
22	# define LOGIN_NAME_MAX (9)	22	# define LOGIN_NAME_MAX (9)
23	#endif
24	+#endif	23	+#endif
		24	#endif
25		25
26	#if !defined(_POSIX_LOGIN_NAME_MAX)	26	#if !defined(_POSIX_LOGIN_NAME_MAX)
27	# define _POSIX_LOGIN_NAME_MAX LOGIN_NAME_MAX