diff options
| author | Adrian Bunk <bunk@stusta.de> | 2019-06-03 09:57:27 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-04 09:09:42 +0100 |
| commit | 5690aa952a6ad3f8df500636cfe4ce14bc825059 (patch) | |
| tree | 603bedc56dde80766c8cd1ef9d2e87a03e361c40 /meta | |
| parent | 0dc37e9388d0f668aad7307a37d4f3166d2c47d9 (diff) | |
| download | poky-5690aa952a6ad3f8df500636cfe4ce14bc825059.tar.gz | |
tcp-wrappers: Add compile warning fixes from Debian
(From OE-Core rev: cd1dc2334fd3e3d1db9be1d26e888051e3f59c5a)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--
v2: Add comment in the patch headers.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 227 insertions, 0 deletions
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch new file mode 100644 index 0000000000..965544cc0b --- /dev/null +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | Compile warning fixes from Debian | ||
| 2 | |||
| 3 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | ||
| 4 | Upstream-Status: Inappropriate [upstream is dead] | ||
| 5 | |||
| 6 | --- a/options.c | ||
| 7 | +++ b/options.c | ||
| 8 | @@ -41,6 +41,7 @@ static char sccsid[] = "@(#) options.c 1 | ||
| 9 | #include <netinet/in.h> | ||
| 10 | #include <netdb.h> | ||
| 11 | #include <stdio.h> | ||
| 12 | +#include <unistd.h> | ||
| 13 | #include <syslog.h> | ||
| 14 | #include <pwd.h> | ||
| 15 | #include <grp.h> | ||
| 16 | --- a/scaffold.c | ||
| 17 | +++ b/scaffold.c | ||
| 18 | @@ -17,6 +17,7 @@ static char sccs_id[] = "@(#) scaffold.c | ||
| 19 | #include <arpa/inet.h> | ||
| 20 | #include <netdb.h> | ||
| 21 | #include <stdio.h> | ||
| 22 | +#include <stdlib.h> | ||
| 23 | #include <syslog.h> | ||
| 24 | #include <setjmp.h> | ||
| 25 | #include <string.h> | ||
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch new file mode 100644 index 0000000000..27157a2e6d --- /dev/null +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch | |||
| @@ -0,0 +1,200 @@ | |||
| 1 | Compile warning fixes from Debian | ||
| 2 | |||
| 3 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | ||
| 4 | Upstream-Status: Inappropriate [upstream is dead] | ||
| 5 | |||
| 6 | --- a/clean_exit.c | ||
| 7 | +++ b/clean_exit.c | ||
| 8 | @@ -13,6 +13,7 @@ static char sccsid[] = "@(#) clean_exit. | ||
| 9 | #endif | ||
| 10 | |||
| 11 | #include <stdio.h> | ||
| 12 | +#include <unistd.h> | ||
| 13 | |||
| 14 | extern void exit(); | ||
| 15 | |||
| 16 | --- a/hosts_access.c | ||
| 17 | +++ b/hosts_access.c | ||
| 18 | @@ -34,6 +34,7 @@ static char sccsid[] = "@(#) hosts_acces | ||
| 19 | #include <netinet/in.h> | ||
| 20 | #include <arpa/inet.h> | ||
| 21 | #include <stdio.h> | ||
| 22 | +#include <stdlib.h> | ||
| 23 | #include <syslog.h> | ||
| 24 | #include <ctype.h> | ||
| 25 | #include <errno.h> | ||
| 26 | --- a/misc.c | ||
| 27 | +++ b/misc.c | ||
| 28 | @@ -13,6 +13,7 @@ static char sccsic[] = "@(#) misc.c 1.2 | ||
| 29 | #include <netinet/in.h> | ||
| 30 | #include <arpa/inet.h> | ||
| 31 | #include <stdio.h> | ||
| 32 | +#include <stdlib.h> | ||
| 33 | #include <string.h> | ||
| 34 | |||
| 35 | #include "tcpd.h" | ||
| 36 | --- a/options.c | ||
| 37 | +++ b/options.c | ||
| 38 | @@ -41,6 +41,7 @@ static char sccsid[] = "@(#) options.c 1 | ||
| 39 | #include <netinet/in.h> | ||
| 40 | #include <netdb.h> | ||
| 41 | #include <stdio.h> | ||
| 42 | +#include <stdlib.h> | ||
| 43 | #include <unistd.h> | ||
| 44 | #include <syslog.h> | ||
| 45 | #include <pwd.h> | ||
| 46 | --- a/percent_x.c | ||
| 47 | +++ b/percent_x.c | ||
| 48 | @@ -17,6 +17,7 @@ static char sccsid[] = "@(#) percent_x.c | ||
| 49 | /* System libraries. */ | ||
| 50 | |||
| 51 | #include <stdio.h> | ||
| 52 | +#include <unistd.h> | ||
| 53 | #include <syslog.h> | ||
| 54 | #include <string.h> | ||
| 55 | |||
| 56 | --- a/rfc931.c | ||
| 57 | +++ b/rfc931.c | ||
| 58 | @@ -16,6 +16,7 @@ static char sccsid[] = "@(#) rfc931.c 1. | ||
| 59 | /* System libraries. */ | ||
| 60 | |||
| 61 | #include <stdio.h> | ||
| 62 | +#include <unistd.h> | ||
| 63 | #include <syslog.h> | ||
| 64 | #include <sys/types.h> | ||
| 65 | #include <sys/socket.h> | ||
| 66 | --- a/tcpd.c | ||
| 67 | +++ b/tcpd.c | ||
| 68 | @@ -22,6 +22,7 @@ static char sccsid[] = "@(#) tcpd.c 1.10 | ||
| 69 | #include <sys/socket.h> | ||
| 70 | #include <netinet/in.h> | ||
| 71 | #include <stdio.h> | ||
| 72 | +#include <unistd.h> | ||
| 73 | #include <syslog.h> | ||
| 74 | #include <string.h> | ||
| 75 | |||
| 76 | --- a/update.c | ||
| 77 | +++ b/update.c | ||
| 78 | @@ -20,6 +20,7 @@ static char sccsid[] = "@(#) update.c 1. | ||
| 79 | /* System libraries */ | ||
| 80 | |||
| 81 | #include <stdio.h> | ||
| 82 | +#include <unistd.h> | ||
| 83 | #include <syslog.h> | ||
| 84 | #include <string.h> | ||
| 85 | |||
| 86 | --- a/fakelog.c | ||
| 87 | +++ b/fakelog.c | ||
| 88 | @@ -17,7 +17,7 @@ static char sccsid[] = "@(#) fakelog.c 1 | ||
| 89 | |||
| 90 | /* ARGSUSED */ | ||
| 91 | |||
| 92 | -openlog(name, logopt, facility) | ||
| 93 | +void openlog(name, logopt, facility) | ||
| 94 | char *name; | ||
| 95 | int logopt; | ||
| 96 | int facility; | ||
| 97 | @@ -27,7 +27,7 @@ int facility; | ||
| 98 | |||
| 99 | /* vsyslog - format one record */ | ||
| 100 | |||
| 101 | -vsyslog(severity, fmt, ap) | ||
| 102 | +void vsyslog(severity, fmt, ap) | ||
| 103 | int severity; | ||
| 104 | char *fmt; | ||
| 105 | va_list ap; | ||
| 106 | @@ -43,7 +43,7 @@ va_list ap; | ||
| 107 | |||
| 108 | /* VARARGS */ | ||
| 109 | |||
| 110 | -VARARGS(syslog, int, severity) | ||
| 111 | +void VARARGS(syslog, int, severity) | ||
| 112 | { | ||
| 113 | va_list ap; | ||
| 114 | char *fmt; | ||
| 115 | @@ -56,7 +56,7 @@ VARARGS(syslog, int, severity) | ||
| 116 | |||
| 117 | /* closelog - dummy */ | ||
| 118 | |||
| 119 | -closelog() | ||
| 120 | +void closelog() | ||
| 121 | { | ||
| 122 | /* void */ | ||
| 123 | } | ||
| 124 | --- a/safe_finger.c | ||
| 125 | +++ b/safe_finger.c | ||
| 126 | @@ -22,10 +22,15 @@ static char sccsid[] = "@(#) safe_finger | ||
| 127 | |||
| 128 | #include <sys/types.h> | ||
| 129 | #include <sys/stat.h> | ||
| 130 | +#include <sys/wait.h> | ||
| 131 | +#include <fcntl.h> | ||
| 132 | #include <signal.h> | ||
| 133 | #include <stdio.h> | ||
| 134 | +#include <stdlib.h> | ||
| 135 | +#include <unistd.h> | ||
| 136 | #include <ctype.h> | ||
| 137 | #include <pwd.h> | ||
| 138 | +#include <grp.h> | ||
| 139 | #include <syslog.h> | ||
| 140 | |||
| 141 | extern void exit(); | ||
| 142 | @@ -52,7 +59,7 @@ int sig; | ||
| 143 | exit(0); | ||
| 144 | } | ||
| 145 | |||
| 146 | -main(argc, argv) | ||
| 147 | +int main(argc, argv) | ||
| 148 | int argc; | ||
| 149 | char **argv; | ||
| 150 | { | ||
| 151 | --- a/tcpdchk.c | ||
| 152 | +++ b/tcpdchk.c | ||
| 153 | @@ -28,6 +28,8 @@ static char sccsid[] = "@(#) tcpdchk.c 1 | ||
| 154 | #include <netinet/in.h> | ||
| 155 | #include <arpa/inet.h> | ||
| 156 | #include <stdio.h> | ||
| 157 | +#include <stdlib.h> | ||
| 158 | +#include <unistd.h> | ||
| 159 | #include <syslog.h> | ||
| 160 | #include <setjmp.h> | ||
| 161 | #include <errno.h> | ||
| 162 | --- a/tcpdmatch.c | ||
| 163 | +++ b/tcpdmatch.c | ||
| 164 | @@ -26,6 +26,7 @@ static char sccsid[] = "@(#) tcpdmatch.c | ||
| 165 | #include <arpa/inet.h> | ||
| 166 | #include <netdb.h> | ||
| 167 | #include <stdio.h> | ||
| 168 | +#include <unistd.h> | ||
| 169 | #include <syslog.h> | ||
| 170 | #include <setjmp.h> | ||
| 171 | #include <string.h> | ||
| 172 | --- a/try-from.c | ||
| 173 | +++ b/try-from.c | ||
| 174 | @@ -37,7 +37,7 @@ static char sccsid[] = "@(#) try-from.c | ||
| 175 | int allow_severity = SEVERITY; /* run-time adjustable */ | ||
| 176 | int deny_severity = LOG_WARNING; /* ditto */ | ||
| 177 | |||
| 178 | -main(argc, argv) | ||
| 179 | +int main(argc, argv) | ||
| 180 | int argc; | ||
| 181 | char **argv; | ||
| 182 | { | ||
| 183 | --- a/inetcf.c | ||
| 184 | +++ b/inetcf.c | ||
| 185 | @@ -12,6 +12,7 @@ static char sccsid[] = "@(#) inetcf.c 1. | ||
| 186 | #include <sys/types.h> | ||
| 187 | #include <sys/stat.h> | ||
| 188 | #include <stdio.h> | ||
| 189 | +#include <stdlib.h> | ||
| 190 | #include <errno.h> | ||
| 191 | #include <string.h> | ||
| 192 | |||
| 193 | @@ -20,6 +21,7 @@ extern void exit(); | ||
| 194 | |||
| 195 | #include "tcpd.h" | ||
| 196 | #include "inetcf.h" | ||
| 197 | +#include "scaffold.h" | ||
| 198 | |||
| 199 | /* | ||
| 200 | * Network configuration files may live in unusual places. Here are some | ||
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index 0f50674653..6d232a50e4 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | |||
| @@ -47,6 +47,8 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \ | |||
| 47 | file://makefile-fix-parallel.patch \ | 47 | file://makefile-fix-parallel.patch \ |
| 48 | file://musl-decls.patch \ | 48 | file://musl-decls.patch \ |
| 49 | file://0001-Fix-build-with-clang.patch \ | 49 | file://0001-Fix-build-with-clang.patch \ |
| 50 | file://fix_warnings.patch \ | ||
| 51 | file://fix_warnings2.patch \ | ||
| 50 | " | 52 | " |
| 51 | 53 | ||
| 52 | SRC_URI[md5sum] = "e6fa25f71226d090f34de3f6b122fb5a" | 54 | SRC_URI[md5sum] = "e6fa25f71226d090f34de3f6b122fb5a" |
