From 40faff93e5c546122975659131f6b2f434dc80df Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 24 Jul 2012 14:15:16 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/init-getname | 15 +++++++++++++-- patches/refresh-temp | 21 --------------------- 3 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index a50dac11..1791b1b6 100644 --- a/meta +++ b/meta @@ -1,13 +1,12 @@ Version: 1 -Previous: 4876f3b00d3b4a12dd10f23c3526633c7e289eb5 -Head: f03df925b750d890d606dc69a14375eb3ec7a7dc +Previous: 0406177d0735f2a65e9f19d3e449e8b02d962262 +Head: 0b5ff94aacdd00d2a3e8a8a548249d43c88dc719 Applied: cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771 transpose: 7856c0c353736cee5399eb2f706a6ac2913cc368 fork: bf9af8d174dcad2841cb78ce7a44bcf307e7be82 rstream-fork: e968946ba3b1b6f18b00c54621068ba3996362df - init-getname: 5098657d3eec71d72b8fe41766be15506fa83135 - refresh-temp: f03df925b750d890d606dc69a14375eb3ec7a7dc + init-getname: 0b5ff94aacdd00d2a3e8a8a548249d43c88dc719 Unapplied: dbg: 3ec7b3dd2db8422fd840e3cee062c629e7b8f5b6 waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 diff --git a/patches/init-getname b/patches/init-getname index b93194b6..783166b1 100644 --- a/patches/init-getname +++ b/patches/init-getname @@ -1,5 +1,5 @@ Bottom: a645d25e6d21e31afe2da3f99b55be8c8e6f4ca6 -Top: a645d25e6d21e31afe2da3f99b55be8c8e6f4ca6 +Top: 9ac57390fafeb98c18db72a4b2a0198a58383713 Author: Sean Hefty Date: 2012-07-24 14:13:55 -0700 @@ -15,4 +15,15 @@ Signed-off-by: Sean Hefty --- - +diff --git a/src/preload.c b/src/preload.c +index e88c958..c8ad747 100644 +--- a/src/preload.c ++++ b/src/preload.c +@@ -841,6 +841,7 @@ int getpeername(int socket, struct sockaddr *addr, socklen_t *addrlen) + int getsockname(int socket, struct sockaddr *addr, socklen_t *addrlen) + { + int fd; ++ init_preload(); + return (fd_get(socket, &fd) == fd_rsocket) ? + rgetsockname(fd, addr, addrlen) : + real.getsockname(fd, addr, addrlen); diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 506e5cf6..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,21 +0,0 @@ -Bottom: a645d25e6d21e31afe2da3f99b55be8c8e6f4ca6 -Top: 9ac57390fafeb98c18db72a4b2a0198a58383713 -Author: Sean Hefty -Date: 2012-07-24 14:15:16 -0700 - -Refresh of init-getname - ---- - -diff --git a/src/preload.c b/src/preload.c -index e88c958..c8ad747 100644 ---- a/src/preload.c -+++ b/src/preload.c -@@ -841,6 +841,7 @@ int getpeername(int socket, struct sockaddr *addr, socklen_t *addrlen) - int getsockname(int socket, struct sockaddr *addr, socklen_t *addrlen) - { - int fd; -+ init_preload(); - return (fd_get(socket, &fd) == fd_rsocket) ? - rgetsockname(fd, addr, addrlen) : - real.getsockname(fd, addr, addrlen); -- 2.41.0