projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: backport fix for CVE-2015-1863, refresh patches
[oweals/openwrt.git]
/
package
/
network
/
services
/
hostapd
/
patches
/
120-daemonize_fix.patch
diff --git
a/package/network/services/hostapd/patches/120-daemonize_fix.patch
b/package/network/services/hostapd/patches/120-daemonize_fix.patch
index 07a146d1a0bcc764ca16d1871d4f371d455bed0f..032e2072a35770628f96831ab3b6c4bbebdb7cf2 100644
(file)
--- a/
package/network/services/hostapd/patches/120-daemonize_fix.patch
+++ b/
package/network/services/hostapd/patches/120-daemonize_fix.patch
@@
-8,7
+8,7
@@
#ifdef ANDROID
#include <sys/capability.h>
#ifdef ANDROID
#include <sys/capability.h>
-@@ -155,59 +156,46 @@ int os_gmtime(os_time_t t, struct os_tm
+@@ -155,59 +156,46 @@ int os_gmtime(os_time_t t, struct os_tm
return 0;
}
return 0;
}
@@
-66,8
+66,8
@@
-#else /* __APPLE__ */
-#define os_daemon daemon
-#endif /* __APPLE__ */
-#else /* __APPLE__ */
-#define os_daemon daemon
-#endif /* __APPLE__ */
--
+-
-int os_daemonize(const char *pid_file)
-{
-#if defined(__uClinux__) || defined(__sun__)
-int os_daemonize(const char *pid_file)
-{
-#if defined(__uClinux__) || defined(__sun__)