aboutsummaryrefslogtreecommitdiffstats
path: root/main/libasr/0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/libasr/0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch')
-rw-r--r--main/libasr/0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch26
1 files changed, 12 insertions, 14 deletions
diff --git a/main/libasr/0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch b/main/libasr/0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch
index 7383976d20..a843125a5a 100644
--- a/main/libasr/0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch
+++ b/main/libasr/0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch
@@ -15,26 +15,25 @@ diff --git a/configure.ac b/configure.ac
index 10aff04..fa0e896 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -264,6 +264,8 @@ AC_ARG_WITH([Werror],
- )
- #l325
+@@ -87,6 +87,8 @@
+ # libasr specific checks.
+ #
+LIBS="-lcrypto -lbsd $LIBS"
+
- AC_CHECK_HEADERS([ \
- crypt.h \
- dirent.h \
+ # This ought to be part of the generic compat library, but we don't want to force
+ # linking against other libs (-lresolv for instance) in all cases.
+ # It has to be improved at some point.
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index c30591c..9be2e0b 100644
---- a/openbsd-compat/openbsd-compat.h
-+++ b/openbsd-compat/openbsd-compat.h
-@@ -123,4 +123,6 @@ int res_hnok(const char *);
- int clock_gettime(int, struct timespec *);
+--- a/openbsd-compat/includes/compat-stdlib.h
++++ b/openbsd-compat/includes/compat-stdlib.h
+@@ -30,3 +30,5 @@
+ long long strtonum(const char *nptr, long long minval, long long maxval,
+ const char **errstr);
#endif
-
-+unsigned int arc4random(void);
+
- #endif /* _OPENBSD_COMPAT_H */
++unsigned int arc4random(void);
diff --git a/src/res_mkquery.c b/src/res_mkquery.c
index 27ed21e..cce4029 100644
--- a/src/res_mkquery.c
@@ -63,4 +62,3 @@ index a60aa0d..a0f4704 100644
h.qdcount = 1;
--
2.11.1
-