Sun Oct 13 19:52:47 2019 UTC ()
proftpd: add a configure check for blacklist, instead of assuming it
always exists. helps non-netbsd/non-freebsd.


(maya)
diff -r1.8 -r1.9 pkgsrc/net/proftpd/Makefile.common
diff -r1.47 -r1.48 pkgsrc/net/proftpd/distinfo
diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-Make.rules.in
diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-include_pfilter.h
diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-src_pfilter.c
diff -r0 -r1.1 pkgsrc/net/proftpd/patches/patch-configure.in
cvs diff -r1.8 -r1.9 pkgsrc/net/proftpd/Makefile.common (expand / switch to unified diff)

--- pkgsrc/net/proftpd/Makefile.common 2019/10/07 19:29:47 1.8
+++ pkgsrc/net/proftpd/Makefile.common 2019/10/13 19:52:47 1.9
@@ -1,48 +1,51 @@ @@ -1,48 +1,51 @@
1# $NetBSD: Makefile.common,v 1.8 2019/10/07 19:29:47 christos Exp $ 1# $NetBSD: Makefile.common,v 1.9 2019/10/13 19:52:47 maya Exp $
2 2
3# used by net/proftpd/Makefile 3# used by net/proftpd/Makefile
4# used by net/proftpd/Makefile.module 4# used by net/proftpd/Makefile.module
5 5
6DISTNAME= proftpd-1.3.6 6DISTNAME= proftpd-1.3.6
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ 8MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/
9MASTER_SITES+= ftp://ftp.servus.at/ProFTPD/distrib/source/ 9MASTER_SITES+= ftp://ftp.servus.at/ProFTPD/distrib/source/
10MASTER_SITES+= ftp://ftp.fsn.hu/pub/proftpd/distrib/source/ 10MASTER_SITES+= ftp://ftp.fsn.hu/pub/proftpd/distrib/source/
11 11
12#PATCH_SITES= https://github.com/proftpd/proftpd/commit/ 12#PATCH_SITES= https://github.com/proftpd/proftpd/commit/
13#PATCH_DIST_STRIP= -p1 13#PATCH_DIST_STRIP= -p1
14# For CVE-2017-7418 14# For CVE-2017-7418
15#PATCHFILES= ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch 15#PATCHFILES= ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch
16 16
17MAINTAINER= pkgsrc-users@NetBSD.org 17MAINTAINER= pkgsrc-users@NetBSD.org
18HOMEPAGE= http://www.proftpd.org/ 18HOMEPAGE= http://www.proftpd.org/
19LICENSE= gnu-gpl-v2 19LICENSE= gnu-gpl-v2
20 20
21DISTINFO_FILE= ${.CURDIR}/../../net/proftpd/distinfo 21DISTINFO_FILE= ${.CURDIR}/../../net/proftpd/distinfo
22PATCHDIR= ${.CURDIR}/../../net/proftpd/patches 22PATCHDIR= ${.CURDIR}/../../net/proftpd/patches
23 23
24USE_TOOLS+= gmake intltool msgfmt perl:run 24USE_TOOLS+= gmake intltool msgfmt perl:run autoconf
25USE_LIBTOOL= yes 25USE_LIBTOOL= yes
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
28CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/proftpd 28CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/proftpd
29CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run 29CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run
30CONFIGURE_ARGS+= --disable-sendfile 30CONFIGURE_ARGS+= --disable-sendfile
31CONFIGURE_ARGS+= --disable-strip 31CONFIGURE_ARGS+= --disable-strip
32CONFIGURE_ARGS+= --enable-ctrls 32CONFIGURE_ARGS+= --enable-ctrls
33CONFIGURE_ARGS+= --enable-nls 33CONFIGURE_ARGS+= --enable-nls
34CONFIGURE_ARGS+= --enable-dso 34CONFIGURE_ARGS+= --enable-dso
35CONFIGURE_ENV+= install_group=${ROOT_GROUP} 35CONFIGURE_ENV+= install_group=${ROOT_GROUP}
36CONFIGURE_ENV+= install_user=${ROOT_USER} 36CONFIGURE_ENV+= install_user=${ROOT_USER}
37 37
38BUILD_DEFS+= VARBASE 38BUILD_DEFS+= VARBASE
39 39
40CHECK_SHLIBS_SKIP= libexec/proftpd/*.a 40CHECK_SHLIBS_SKIP= libexec/proftpd/*.a
41CHECK_SSP_SKIP= ${CHECK_SHLIBS_SKIP} 41CHECK_SSP_SKIP= ${CHECK_SHLIBS_SKIP}
42 42
 43pre-configure:
 44 cd ${WRKSRC} && ${TOOLS_CMD.autoconf}
 45
43.include "options.mk" 46.include "options.mk"
44 47
45.include "../../devel/gettext-lib/buildlink3.mk" 48.include "../../devel/gettext-lib/buildlink3.mk"
46.include "../../devel/zlib/buildlink3.mk" 49.include "../../devel/zlib/buildlink3.mk"
47.include "../../mk/curses.buildlink3.mk" 50.include "../../mk/curses.buildlink3.mk"
48.include "../../security/openssl/buildlink3.mk" 51.include "../../security/openssl/buildlink3.mk"
cvs diff -r1.47 -r1.48 pkgsrc/net/proftpd/distinfo (expand / switch to unified diff)

--- pkgsrc/net/proftpd/distinfo 2019/10/07 19:29:47 1.47
+++ pkgsrc/net/proftpd/distinfo 2019/10/13 19:52:47 1.48
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.47 2019/10/07 19:29:47 christos Exp $ 1$NetBSD: distinfo,v 1.48 2019/10/13 19:52:47 maya Exp $
2 2
3SHA1 (proftpd-1.3.6.tar.gz) = 7e9269f9448c37f82e6faa9edaa3186ff5ba82d2 3SHA1 (proftpd-1.3.6.tar.gz) = 7e9269f9448c37f82e6faa9edaa3186ff5ba82d2
4RMD160 (proftpd-1.3.6.tar.gz) = 5da3934e46ea517ee6652382e5e3a9f87e591dd6 4RMD160 (proftpd-1.3.6.tar.gz) = 5da3934e46ea517ee6652382e5e3a9f87e591dd6
5SHA512 (proftpd-1.3.6.tar.gz) = 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0 5SHA512 (proftpd-1.3.6.tar.gz) = 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0
6Size (proftpd-1.3.6.tar.gz) = 20251898 bytes 6Size (proftpd-1.3.6.tar.gz) = 20251898 bytes
7SHA1 (patch-Make.rules.in) = 6ce8ab0f65270f701b455a3fd3f008c9f24511c3 7SHA1 (patch-Make.rules.in) = 4689fcb4aff5c9b3a2e47a43b93e76101d54e812
8SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421 8SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421
 9SHA1 (patch-configure.in) = ed8e190a89cbfc3276d9e77f0bbb624f6d19f816
9SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee 10SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee
10SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed 11SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed
11SHA1 (patch-include_pfilter.h) = 399ba8873e6a58db89c3be44b4f09a1f4ab04e60 12SHA1 (patch-include_pfilter.h) = abc00fe5cc14115c937e9b3790d3c0ca259ee12c
12SHA1 (patch-modules_mod__auth.c) = b1ff5c3236edabce5016da3230e0bd30ec92db48 13SHA1 (patch-modules_mod__auth.c) = b1ff5c3236edabce5016da3230e0bd30ec92db48
13SHA1 (patch-src_main.c) = c00e1b1830d36d17bea5a10d8e13ec2328d3df88 14SHA1 (patch-src_main.c) = c00e1b1830d36d17bea5a10d8e13ec2328d3df88
14SHA1 (patch-src_pfilter.c) = 0f83e751072586f2b6359952b09328d820accc8f 15SHA1 (patch-src_pfilter.c) = c4447aea0cf84c83f6dd18316b007254c87ac510
cvs diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-Make.rules.in (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-Make.rules.in 2019/10/07 19:29:47 1.1
+++ pkgsrc/net/proftpd/patches/patch-Make.rules.in 2019/10/13 19:52:47 1.2
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1--- Make.rules.in.orig 2015-05-27 20:25:54.000000000 -0400 1--- Make.rules.in.orig 2015-05-27 20:25:54.000000000 -0400
2+++ Make.rules.in 2016-01-25 21:48:47.000000000 -0500 2+++ Make.rules.in 2016-01-25 21:48:47.000000000 -0500
3@@ -110,3 +110,8 @@ 3--- Make.rules.in.orig 2017-04-10 02:31:02.000000000 +0000
 4+++ Make.rules.in
 5@@ -113,3 +113,6 @@ BUILD_FTPTOP_OBJS=utils/ftptop.o utils/s
4  6
5 FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o 7 FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o
6 BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o 8 BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o
7+ 9+
8+CPPFLAGS+=-DHAVE_BLACKLIST 
9+LIBS+=-lblacklist 
10+OBJS+= pfilter.o 10+OBJS+= pfilter.o
11+BUILD_OBJS+= src/pfilter.o 11+BUILD_OBJS+= src/pfilter.o
cvs diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-include_pfilter.h (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-include_pfilter.h 2019/10/07 19:29:47 1.1
+++ pkgsrc/net/proftpd/patches/patch-include_pfilter.h 2019/10/13 19:52:47 1.2
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1--- /dev/null 2016-01-22 17:30:55.000000000 -0500 1--- /dev/null 2016-01-22 17:30:55.000000000 -0500
2+++ include/pfilter.h 2016-01-22 16:18:33.000000000 -0500 2+++ include/pfilter.h 2016-01-22 16:18:33.000000000 -0500
 3--- include/pfilter.h.orig 2019-10-13 19:47:58.412725364 +0000
 4+++ include/pfilter.h
3@@ -0,0 +1,3 @@ 5@@ -0,0 +1,3 @@
4+ 6+
5+void pfilter_notify(int); 7+void pfilter_notify(int);
6+void pfilter_init(void); 8+void pfilter_init(void);
cvs diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-src_pfilter.c (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-src_pfilter.c 2019/10/07 19:29:47 1.1
+++ pkgsrc/net/proftpd/patches/patch-src_pfilter.c 2019/10/13 19:52:47 1.2
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1--- /dev/null 2016-01-22 17:30:55.000000000 -0500 1--- /dev/null 2016-01-22 17:30:55.000000000 -0500
2+++ src/pfilter.c 2016-01-22 16:37:55.000000000 -0500 2+++ src/pfilter.c 2016-01-22 16:37:55.000000000 -0500
 3--- src/pfilter.c.orig 2019-10-13 19:47:58.437871822 +0000
 4+++ src/pfilter.c
3@@ -0,0 +1,41 @@ 5@@ -0,0 +1,41 @@
4+#include "pfilter.h" 6+#include "pfilter.h"
5+#include "conf.h" 7+#include "conf.h"
6+#include "privs.h" 8+#include "privs.h"
7+#ifdef HAVE_BLACKLIST 9+#ifdef HAVE_BLACKLIST
8+#include <blacklist.h> 10+#include <blacklist.h>
9+#endif 11+#endif
10+ 12+
11+static struct blacklist *blstate; 13+static struct blacklist *blstate;
12+ 14+
13+void 15+void
14+pfilter_init(void) 16+pfilter_init(void)
15+{ 17+{
File Added: pkgsrc/net/proftpd/patches/patch-configure.in
$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"