Attachment 217442 Details for Bug 248831 – Update

[patch] Update

tnftpd.diff (text/plain), 4.26 KB, created by Rudolf Čejka on 2020-08-22 14:28:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rudolf Čejka

Created: 2020-08-22 14:28:45 UTC

Size: 4.26 KB

patch

obsolete

>diff -ruN tnftpd/Makefile tnftpd.new/Makefile
>--- tnftpd/Makefile	2020-02-12 16:40:42.292600000 +0100
>+++ tnftpd.new/Makefile	2020-08-20 13:55:48.924011000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/ftp/tnftpd/Makefile 514132 2019-10-09 10:40:21Z bapt $
> 
> PORTNAME=	tnftpd
>-PORTVERSION=	20130325
>+PORTVERSION=	20200704
> CATEGORIES=	ftp
> MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
> 
>diff -ruN tnftpd/distinfo tnftpd.new/distinfo
>--- tnftpd/distinfo	2013-06-28 16:02:22.000000000 +0200
>+++ tnftpd.new/distinfo	2020-08-20 13:55:55.649995000 +0200
>@@ -1,2 +1,3 @@
>-SHA256 (tnftpd-20130325.tar.gz) = 331006f0bcee593af3f4faaaf1de8db825e2aa60449be1c961916b37d562e147
>-SIZE (tnftpd-20130325.tar.gz) = 518350
>+TIMESTAMP = 1597924555
>+SHA256 (tnftpd-20200704.tar.gz) = 92de915e1b4b7e4bd403daac5d89ce67fa73e49e8dda18e230fa86ee98e26ab7
>+SIZE (tnftpd-20200704.tar.gz) = 529105
>diff -ruN tnftpd/files/patch-configure.ac tnftpd.new/files/patch-configure.ac
>--- tnftpd/files/patch-configure.ac	2013-06-28 16:02:27.000000000 +0200
>+++ tnftpd.new/files/patch-configure.ac	1970-01-01 01:00:00.000000000 +0100
>@@ -1,13 +0,0 @@
>-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()
>- 
>diff -ruN tnftpd/files/patch-src-Makefile.am tnftpd.new/files/patch-src-Makefile.am
>--- tnftpd/files/patch-src-Makefile.am	2013-06-28 16:02:27.000000000 +0200
>+++ tnftpd.new/files/patch-src-Makefile.am	2020-08-20 14:02:39.097484000 +0200
>@@ -1,25 +1,23 @@
> FreeBSD does have support for utmp/utmpx, so include relevant files into
> a build.
> 
>---- src/Makefile.am.orig	2010-01-04 06:46:29.000000000 +0100
>-+++ src/Makefile.am	2010-01-04 06:46:29.000000000 +0100
>-@@ -7,7 +7,9 @@
>- 	conf.c \
>+--- 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 @@
>  	ftpd.c \
>  	ftpcmd.y \
>+ 	pfilter.c \
> -	popen.c
> +	popen.c \
> +	logutmp.c \
> +	logwtmp.c
>  
>- AM_CPPFLAGS = \
>- 	-DHAVE_TNFTPD_H=1 \
>-@@ -45,8 +47,6 @@
>+ noinst_HEADERS = \
>  	extern.h \
>+@@ -51,6 +53,4 @@
>+ EXTRA_DIST = \
>  	ftpd.conf.manin \
>  	ftpusers.manin \
> -	logutmp.c \
> -	logwtmp.c \
>- 	pathnames.h \
>- 	tnftpd.manin \
>- 	version.h
>+ 	tnftpd.manin
>diff -ruN tnftpd/files/patch-src-ftpd.c tnftpd.new/files/patch-src-ftpd.c
>--- tnftpd/files/patch-src-ftpd.c	2013-06-28 16:02:27.000000000 +0200
>+++ tnftpd.new/files/patch-src-ftpd.c	2020-08-20 14:27:20.955130000 +0200
>@@ -1,9 +1,9 @@
> Rewrite utmpx support.
> 
>---- src/ftpd.c.orig	2009-11-07 04:26:48.000000000 +0100
>-+++ src/ftpd.c	2009-11-07 04:26:48.000000000 +0100
>-@@ -504,9 +504,6 @@
>- 		confdir = _DEFAULT_CONFDIR;
>+--- 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
>@@ -12,7 +12,7 @@
>  #ifdef SUPPORT_UTMP
>  		ftpd_initwtmp();
>  #endif
>-@@ -1320,23 +1317,18 @@
>+@@ -1336,23 +1333,18 @@
>  	(void)gettimeofday(&tv, NULL);
>  #endif
>  #ifdef SUPPORT_UTMPX
>@@ -41,7 +41,7 @@
>  #endif
>  #ifdef SUPPORT_UTMP
>  	if (doutmp) {
>-@@ -1356,17 +1348,23 @@
>+@@ -1372,17 +1364,23 @@
>  logout_utmp(void)
>  {
>  #ifdef SUPPORT_UTMPX
>diff -ruN tnftpd/files/patch-tnftpd.h tnftpd.new/files/patch-tnftpd.h
>--- tnftpd/files/patch-tnftpd.h	2013-06-28 16:02:27.000000000 +0200
>+++ tnftpd.new/files/patch-tnftpd.h	2020-08-20 14:31:13.238900000 +0200
>@@ -1,8 +1,8 @@
> 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	2009-11-07 10:59:09.000000000 +0100
>-+++ tnftpd.h	2009-11-07 10:59:09.000000000 +0100
>+--- 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)
>@@ -12,7 +12,7 @@
>  #endif
>  
>  #if defined(HAVE_POLL)
>-@@ -561,8 +563,12 @@
>+@@ -565,7 +567,11 @@
>  #define TM_YEAR_BASE	1900
>  
>  #if !defined(LOGIN_NAME_MAX)
>@@ -20,8 +20,7 @@
> +# 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

Flags:

cejkar: maintainer-approval+

Actions: View | Diff

Attachments on bug 248831: 217442