diff options
| -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 @@ -Upstream-Status: Backport - -diff -ruN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c ---- tcp_wrappers_7.6.orig/fix_options.c 2003-08-21 03:41:33.000000000 +0200 -+++ tcp_wrappers_7.6/fix_options.c 2003-08-21 03:41:27.000000000 +0200 -@@ -38,7 +38,11 @@ - #ifdef IP_OPTIONS - unsigned char optbuf[BUFFER_SIZE / 3], *cp; - char lbuf[BUFFER_SIZE], *lp; -+#ifdef __GLIBC__ -+ size_t optsize = sizeof(optbuf), ipproto; -+#else - int optsize = sizeof(optbuf), ipproto; -+#endif - struct protoent *ip; - int fd = request->fd; - unsigned int opt; -diff -ruN tcp_wrappers_7.6.orig/socket.c tcp_wrappers_7.6/socket.c ---- tcp_wrappers_7.6.orig/socket.c 2003-08-21 03:41:33.000000000 +0200 -+++ tcp_wrappers_7.6/socket.c 2003-08-21 03:40:51.000000000 +0200 -@@ -90,7 +90,11 @@ - static struct sockaddr_in client; - static struct sockaddr_in server; - #endif -+#ifdef __GLIBC__ -+ size_t len; -+#else - int len; -+#endif - char buf[BUFSIZ]; - int fd = request->fd; - -@@ -421,7 +425,11 @@ - #else - struct sockaddr_in sin; - #endif -+#ifdef __GLIBC__ -+ size_t size = sizeof(sin); -+#else - int size = sizeof(sin); -+#endif - - /* - * 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" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa" -PR ="r9" +PR ="r10" 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 \ file://safe_finger.patch \ file://sig_fix.patch \ file://siglongjmp.patch \ - file://size_t.patch \ file://tcpdchk_libwrapped.patch \ file://ldflags.patch \ \ |