]>
Commit | Line | Data |
---|---|---|
c0c40ac3 JB |
1 | With -Werror=implicit-function-declaration prototypes must exist. |
2 | ||
3 | mod_wrap doesn't need -lnsl (it's dependency of libwrap on some systems). | |
4 | ||
5 | --- proftpd-1.3.7a/configure.in.orig 2020-08-30 11:46:50.771847975 +0200 | |
6 | +++ proftpd-1.3.7a/configure.in 2020-08-30 12:26:24.125657081 +0200 | |
7 | @@ -1367,7 +1367,10 @@ | |
8 | ||
9 | dnl Checks for libraries. Yes, this is the hard way, but it's necessary. | |
10 | AC_CACHE_CHECK(for standalone crypt,pr_cv_lib_standalone_crypt, | |
11 | - AC_TRY_LINK(,[crypt();], | |
12 | + AC_TRY_LINK([ | |
13 | + #define _MISC_SOURCE | |
14 | + #include <unistd.h> | |
15 | + ],[crypt("", "");], | |
16 | pr_cv_lib_standalone_crypt="yes", pr_cv_lib_standalone_crypt="no" )) | |
17 | ||
18 | if test "$pr_cv_lib_standalone_crypt" = "no"; then | |
19 | @@ -1375,7 +1378,7 @@ | |
20 | fi | |
21 | ||
22 | AC_CACHE_CHECK(for standalone gethostbyname,pr_cv_lib_standalone_gethost, | |
23 | - AC_TRY_LINK(,[gethostbyname();], | |
24 | + AC_TRY_LINK([#include <netdb.h>],[gethostbyname("");], | |
25 | pr_cv_lib_standalone_gethost="yes", | |
26 | pr_cv_lib_standalone_gethost="no" )) | |
27 | ||
28 | @@ -1385,7 +1388,12 @@ | |
29 | fi | |
30 | ||
31 | AC_CACHE_CHECK(for standalone inet_aton,pr_cv_lib_standalone_aton, | |
32 | - AC_TRY_LINK(,[inet_aton();], | |
33 | + AC_TRY_LINK([ | |
34 | + #define _DEFAULT_SOURCE | |
35 | + #include <sys/socket.h> | |
36 | + #include <netinet/in.h> | |
37 | + #include <arpa/inet.h> | |
38 | + ],[inet_aton("", (void*)0);], | |
39 | pr_cv_lib_standalone_aton="yes", | |
40 | pr_cv_lib_standalone_aton="no" )) | |
41 | ||
42 | @@ -1394,7 +1402,7 @@ | |
43 | fi | |
44 | ||
45 | AC_CACHE_CHECK(for standalone nsl functions,pr_cv_lib_standalone_nsl,[ | |
46 | - AC_TRY_LINK(,[gethostent();], | |
47 | + AC_TRY_LINK([#include <netdb.h>],[gethostent();], | |
48 | pr_cv_lib_standalone_nsl="yes", pr_cv_lib_standalone_nsl="no") ]) | |
49 | ||
50 | if test "$pr_cv_lib_standalone_nsl" = "no"; then | |
51 | @@ -1402,7 +1410,7 @@ | |
52 | fi | |
53 | ||
54 | AC_CACHE_CHECK(for standalone socket functions,pr_cv_lib_standalone_sockets, | |
55 | - AC_TRY_LINK(,[bind();], | |
56 | + AC_TRY_LINK([#include <sys/socket.h>],[bind(0, (void*)0, 0);], | |
57 | pr_cv_lib_standalone_sockets="yes", pr_cv_lib_standalone_sockets="no")) | |
58 | ||
59 | if test "$pr_cv_lib_standalone_sockets" = "no"; then | |
60 | --- proftpd-1.3.7a/contrib/mod_wrap.c.orig 2020-08-30 12:55:56.649387829 +0200 | |
61 | +++ proftpd-1.3.7a/contrib/mod_wrap.c 2020-08-30 12:56:04.492678672 +0200 | |
62 | @@ -22,7 +22,7 @@ | |
63 | * the source code for OpenSSL in the source distribution. | |
64 | * | |
65 | * -- DO NOT MODIFY THE TWO LINES BELOW -- | |
66 | - * $Libraries: -lwrap -lnsl$ | |
67 | + * $Libraries: -lwrap$ | |
68 | */ | |
69 | ||
70 | #define MOD_WRAP_VERSION "mod_wrap/1.2.4" |