diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/size_t.patch | 44 | ||||
-rw-r--r-- | meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | 3 |
2 files changed, 1 insertions, 46 deletions
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/size_t.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/size_t.patch deleted file mode 100644 index 8373e8aa53..0000000000 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/size_t.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | diff -ruN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c | ||
4 | --- tcp_wrappers_7.6.orig/fix_options.c 2003-08-21 03:41:33.000000000 +0200 | ||
5 | +++ tcp_wrappers_7.6/fix_options.c 2003-08-21 03:41:27.000000000 +0200 | ||
6 | @@ -38,7 +38,11 @@ | ||
7 | #ifdef IP_OPTIONS | ||
8 | unsigned char optbuf[BUFFER_SIZE / 3], *cp; | ||
9 | char lbuf[BUFFER_SIZE], *lp; | ||
10 | +#ifdef __GLIBC__ | ||
11 | + size_t optsize = sizeof(optbuf), ipproto; | ||
12 | +#else | ||
13 | int optsize = sizeof(optbuf), ipproto; | ||
14 | +#endif | ||
15 | struct protoent *ip; | ||
16 | int fd = request->fd; | ||
17 | unsigned int opt; | ||
18 | diff -ruN tcp_wrappers_7.6.orig/socket.c tcp_wrappers_7.6/socket.c | ||
19 | --- tcp_wrappers_7.6.orig/socket.c 2003-08-21 03:41:33.000000000 +0200 | ||
20 | +++ tcp_wrappers_7.6/socket.c 2003-08-21 03:40:51.000000000 +0200 | ||
21 | @@ -90,7 +90,11 @@ | ||
22 | static struct sockaddr_in client; | ||
23 | static struct sockaddr_in server; | ||
24 | #endif | ||
25 | +#ifdef __GLIBC__ | ||
26 | + size_t len; | ||
27 | +#else | ||
28 | int len; | ||
29 | +#endif | ||
30 | char buf[BUFSIZ]; | ||
31 | int fd = request->fd; | ||
32 | |||
33 | @@ -421,7 +425,11 @@ | ||
34 | #else | ||
35 | struct sockaddr_in sin; | ||
36 | #endif | ||
37 | +#ifdef __GLIBC__ | ||
38 | + size_t size = sizeof(sin); | ||
39 | +#else | ||
40 | int size = sizeof(sin); | ||
41 | +#endif | ||
42 | |||
43 | /* | ||
44 | * Eat up the not-yet received datagram. Some systems insist on a | ||
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 9b865ba806..51ec7b292f 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | |||
@@ -5,7 +5,7 @@ SECTION = "console/network" | |||
5 | 5 | ||
6 | LICENSE = "BSD" | 6 | LICENSE = "BSD" |
7 | LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa" | 7 | LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa" |
8 | PR ="r9" | 8 | PR ="r10" |
9 | 9 | ||
10 | 10 | ||
11 | PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev libwrap-staticdev ${PN} ${PN}-doc" | 11 | PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev libwrap-staticdev ${PN} ${PN}-doc" |
@@ -36,7 +36,6 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \ | |||
36 | file://safe_finger.patch \ | 36 | file://safe_finger.patch \ |
37 | file://sig_fix.patch \ | 37 | file://sig_fix.patch \ |
38 | file://siglongjmp.patch \ | 38 | file://siglongjmp.patch \ |
39 | file://size_t.patch \ | ||
40 | file://tcpdchk_libwrapped.patch \ | 39 | file://tcpdchk_libwrapped.patch \ |
41 | file://ldflags.patch \ | 40 | file://ldflags.patch \ |
42 | \ | 41 | \ |