2fd8d4df94
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
39 lines
923 B
Diff
39 lines
923 B
Diff
#upstream: no
|
|
--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
|
|
+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
|
|
@@ -66,6 +66,35 @@
|
|
# include <net/if.h>
|
|
#endif
|
|
|
|
+
|
|
+#if !defined(__GLIBC__)
|
|
+/***************************************************************************
|
|
+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
|
|
+ * Note: res_init() is actually deprecated according to
|
|
+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
|
|
+ **************************************************************************/
|
|
+#include <string.h>
|
|
+
|
|
+static inline int res_ninit(res_state statp)
|
|
+{
|
|
+ int rc = res_init();
|
|
+ if (statp != &_res) {
|
|
+ memcpy(statp, &_res, sizeof(*statp));
|
|
+ }
|
|
+ return rc;
|
|
+}
|
|
+
|
|
+static inline int res_nclose(res_state statp)
|
|
+{
|
|
+ if (!statp)
|
|
+ return -1;
|
|
+ if (statp != &_res) {
|
|
+ memset(statp, 0, sizeof(*statp));
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+#endif
|
|
+
|
|
/*
|
|
* resolver(3) and IPv6:
|
|
*
|