diff options
author | mm <mm@FreeBSD.org> | 2012-08-04 15:11:32 +0800 |
---|---|---|
committer | mm <mm@FreeBSD.org> | 2012-08-04 15:11:32 +0800 |
commit | 26f9f03d00c11dada11c6d0e47eff6f537d5353c (patch) | |
tree | 67dd3d841fd8e98436c32c0a8d135c9385028cae /ftp/proftpd/files | |
parent | f6af475f149151f82e009f277beadf9c55a2ba90 (diff) | |
download | freebsd-ports-gnome-26f9f03d00c11dada11c6d0e47eff6f537d5353c.tar.gz freebsd-ports-gnome-26f9f03d00c11dada11c6d0e47eff6f537d5353c.tar.zst freebsd-ports-gnome-26f9f03d00c11dada11c6d0e47eff6f537d5353c.zip |
Update ProFTPd to 1.3.4b
Diffstat (limited to 'ftp/proftpd/files')
-rw-r--r-- | ftp/proftpd/files/patch-sample-configurations_basic.conf | 4 | ||||
-rw-r--r-- | ftp/proftpd/files/patch-src-wtmp.c | 23 |
2 files changed, 4 insertions, 23 deletions
diff --git a/ftp/proftpd/files/patch-sample-configurations_basic.conf b/ftp/proftpd/files/patch-sample-configurations_basic.conf index af53b7c8cc5f..5fffdea99ab1 100644 --- a/ftp/proftpd/files/patch-sample-configurations_basic.conf +++ b/ftp/proftpd/files/patch-sample-configurations_basic.conf @@ -2,8 +2,8 @@ +++ sample-configurations/basic.conf 2009-01-28 11:25:31.000000000 -0900 @@ -1,3 +1,7 @@ +# -+# For more informations about Proftpd configuration -+# look at : http://www.proftpd.org/ ++# For more information about Proftpd configuration ++# see http://www.proftpd.org/ +# # This is a basic ProFTPD configuration file (rename it to # 'proftpd.conf' for actual use. It establishes a single server diff --git a/ftp/proftpd/files/patch-src-wtmp.c b/ftp/proftpd/files/patch-src-wtmp.c index 43c542ea179a..a73ecf1f7fe5 100644 --- a/ftp/proftpd/files/patch-src-wtmp.c +++ b/ftp/proftpd/files/patch-src-wtmp.c @@ -1,14 +1,5 @@ ---- src/wtmp.c.orig 2011-05-23 23:22:24.000000000 +0200 -+++ src/wtmp.c 2012-07-17 16:19:34.188505949 +0200 -@@ -42,7 +42,7 @@ - !(defined(LINUX) || defined(__hpux) || defined (_AIX)) - /* This "auxilliary" utmp doesn't exist under linux. */ - --#if defined(__sparcv9) && !defined(__NetBSD__) -+#if defined(__sparcv9) && !defined(__NetBSD__) && !defined(__FreeBSD__) - struct futmpx utx; - time_t t; - +--- src/wtmp.c.orig 2012-08-04 08:45:32.292505678 +0200 ++++ src/wtmp.c 2012-08-04 08:45:35.508505108 +0200 @@ -97,7 +97,7 @@ #else /* SVR4 */ utx.ut_syslen = strlen(utx.ut_host)+1; @@ -18,13 +9,3 @@ time(&t); utx.ut_tv.tv_sec = (time32_t)t; # else -@@ -126,7 +126,9 @@ - } - - #else /* Non-SVR4 systems */ -+#if !defined(__FreeBSD_version) || __FreeBSD_version < 900007 || !defined(HAVE_UTMPX_H) - struct utmp ut; -+#endif - static int fd = -1; - - if (fd < 0 && |