diff options
| -rw-r--r-- | net/proftpd/Makefile.common | 7 | ||||
| -rw-r--r-- | net/proftpd/distinfo | 9 | ||||
| -rw-r--r-- | net/proftpd/patches/patch-Make.rules.in | 6 | ||||
| -rw-r--r-- | net/proftpd/patches/patch-configure.in | 17 | ||||
| -rw-r--r-- | net/proftpd/patches/patch-include_pfilter.h | 2 | ||||
| -rw-r--r-- | net/proftpd/patches/patch-src_pfilter.c | 2 |
6 files changed, 34 insertions, 9 deletions
diff --git a/net/proftpd/Makefile.common b/net/proftpd/Makefile.common index 64479d296f2..3c2d28ca6d7 100644 --- a/net/proftpd/Makefile.common +++ b/net/proftpd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2019/10/07 19:29:47 christos Exp $ +# $NetBSD: Makefile.common,v 1.9 2019/10/13 19:52:47 maya Exp $ # used by net/proftpd/Makefile # used by net/proftpd/Makefile.module @@ -21,7 +21,7 @@ LICENSE= gnu-gpl-v2 DISTINFO_FILE= ${.CURDIR}/../../net/proftpd/distinfo PATCHDIR= ${.CURDIR}/../../net/proftpd/patches -USE_TOOLS+= gmake intltool msgfmt perl:run +USE_TOOLS+= gmake intltool msgfmt perl:run autoconf USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -40,6 +40,9 @@ BUILD_DEFS+= VARBASE CHECK_SHLIBS_SKIP= libexec/proftpd/*.a CHECK_SSP_SKIP= ${CHECK_SHLIBS_SKIP} +pre-configure: + cd ${WRKSRC} && ${TOOLS_CMD.autoconf} + .include "options.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo index 5c2b81f10ac..2bb91864e16 100644 --- a/net/proftpd/distinfo +++ b/net/proftpd/distinfo @@ -1,14 +1,15 @@ -$NetBSD: distinfo,v 1.47 2019/10/07 19:29:47 christos Exp $ +$NetBSD: distinfo,v 1.48 2019/10/13 19:52:47 maya Exp $ SHA1 (proftpd-1.3.6.tar.gz) = 7e9269f9448c37f82e6faa9edaa3186ff5ba82d2 RMD160 (proftpd-1.3.6.tar.gz) = 5da3934e46ea517ee6652382e5e3a9f87e591dd6 SHA512 (proftpd-1.3.6.tar.gz) = 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0 Size (proftpd-1.3.6.tar.gz) = 20251898 bytes -SHA1 (patch-Make.rules.in) = 6ce8ab0f65270f701b455a3fd3f008c9f24511c3 +SHA1 (patch-Make.rules.in) = 4689fcb4aff5c9b3a2e47a43b93e76101d54e812 SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421 +SHA1 (patch-configure.in) = ed8e190a89cbfc3276d9e77f0bbb624f6d19f816 SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed -SHA1 (patch-include_pfilter.h) = 399ba8873e6a58db89c3be44b4f09a1f4ab04e60 +SHA1 (patch-include_pfilter.h) = abc00fe5cc14115c937e9b3790d3c0ca259ee12c SHA1 (patch-modules_mod__auth.c) = b1ff5c3236edabce5016da3230e0bd30ec92db48 SHA1 (patch-src_main.c) = c00e1b1830d36d17bea5a10d8e13ec2328d3df88 -SHA1 (patch-src_pfilter.c) = 0f83e751072586f2b6359952b09328d820accc8f +SHA1 (patch-src_pfilter.c) = c4447aea0cf84c83f6dd18316b007254c87ac510 diff --git a/net/proftpd/patches/patch-Make.rules.in b/net/proftpd/patches/patch-Make.rules.in index 9b1138354f8..f9225f14720 100644 --- a/net/proftpd/patches/patch-Make.rules.in +++ b/net/proftpd/patches/patch-Make.rules.in @@ -1,11 +1,11 @@ --- Make.rules.in.orig 2015-05-27 20:25:54.000000000 -0400 +++ Make.rules.in 2016-01-25 21:48:47.000000000 -0500 -@@ -110,3 +110,8 @@ +--- Make.rules.in.orig 2017-04-10 02:31:02.000000000 +0000 ++++ Make.rules.in +@@ -113,3 +113,6 @@ BUILD_FTPTOP_OBJS=utils/ftptop.o utils/s FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o + -+CPPFLAGS+=-DHAVE_BLACKLIST -+LIBS+=-lblacklist +OBJS+= pfilter.o +BUILD_OBJS+= src/pfilter.o diff --git a/net/proftpd/patches/patch-configure.in b/net/proftpd/patches/patch-configure.in new file mode 100644 index 00000000000..44c8d05ab84 --- /dev/null +++ b/net/proftpd/patches/patch-configure.in @@ -0,0 +1,17 @@ +$NetBSD: patch-configure.in,v 1.1 2019/10/13 19:52:47 maya Exp $ + +--- configure.in.orig 2017-04-10 02:31:02.000000000 +0000 ++++ configure.in +@@ -2836,6 +2836,12 @@ AC_TRY_RUN( + AC_MSG_RESULT(cross-compiling); AC_DEFINE(HAVE_LU, 1, [Define if you have %lu support]) + ) + ++dnl Test for blacklistd support ++AC_CHECK_LIB(blacklist, blacklist, ++ [AC_DEFINE(HAVE_BLACKLIST, 1, [Define if you have blacklistd support.]) ++ ac_build_addl_libs="$ac_build_addl_libs -lblacklist" ++ ]) ++ + dnl Add the proftpd support library + LIBS="-lsupp $LIBS" + diff --git a/net/proftpd/patches/patch-include_pfilter.h b/net/proftpd/patches/patch-include_pfilter.h index b25ffd9cb87..9cd2087ba3d 100644 --- a/net/proftpd/patches/patch-include_pfilter.h +++ b/net/proftpd/patches/patch-include_pfilter.h @@ -1,5 +1,7 @@ --- /dev/null 2016-01-22 17:30:55.000000000 -0500 +++ include/pfilter.h 2016-01-22 16:18:33.000000000 -0500 +--- include/pfilter.h.orig 2019-10-13 19:47:58.412725364 +0000 ++++ include/pfilter.h @@ -0,0 +1,3 @@ + +void pfilter_notify(int); diff --git a/net/proftpd/patches/patch-src_pfilter.c b/net/proftpd/patches/patch-src_pfilter.c index c204a3a9177..0c77b28f38c 100644 --- a/net/proftpd/patches/patch-src_pfilter.c +++ b/net/proftpd/patches/patch-src_pfilter.c @@ -1,5 +1,7 @@ --- /dev/null 2016-01-22 17:30:55.000000000 -0500 +++ src/pfilter.c 2016-01-22 16:37:55.000000000 -0500 +--- src/pfilter.c.orig 2019-10-13 19:47:58.437871822 +0000 ++++ src/pfilter.c @@ -0,0 +1,41 @@ +#include "pfilter.h" +#include "conf.h" |