summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2017-06-21 15:38:16 +0300
committerIgor Pashev <pashev.igor@gmail.com>2017-06-21 15:38:16 +0300
commit0d3bd3f5d806fe9b38fcb7eae6dfa31c8633d3fb (patch)
tree16ece07d64a05175f052f4d48c4b4f763b49c5f9
parent65a4d253a164865f410ab3078f1f6b37c7901f17 (diff)
downloadsudo-0d3bd3f5d806fe9b38fcb7eae6dfa31c8633d3fb.tar.gz
Add debian/patches/dyson.patch
-rw-r--r--debian/patches/dyson.patch38
-rw-r--r--debian/patches/series1
2 files changed, 39 insertions, 0 deletions
diff --git a/debian/patches/dyson.patch b/debian/patches/dyson.patch
new file mode 100644
index 0000000..daed916
--- /dev/null
+++ b/debian/patches/dyson.patch
@@ -0,0 +1,38 @@
+Index: sudo-1.8.19p1/src/sudo_edit.c
+===================================================================
+--- sudo-1.8.19p1.orig/src/sudo_edit.c
++++ sudo-1.8.19p1/src/sudo_edit.c
+@@ -377,6 +377,11 @@ dir_is_writable(int dfd, struct user_det
+ * Directory open flags for use with openat(2).
+ * Use O_SEARCH/O_PATH and/or O_DIRECTORY where possible.
+ */
++
++#ifndef O_DIRECTORY
++# define O_DIRECTORY 0
++#endif
++
+ #if defined(O_SEARCH)
+ # define DIR_OPEN_FLAGS (O_SEARCH|O_DIRECTORY)
+ #elif defined(O_PATH)
+Index: sudo-1.8.19p1/configure.ac
+===================================================================
+--- sudo-1.8.19p1.orig/configure.ac
++++ sudo-1.8.19p1/configure.ac
+@@ -1680,8 +1680,6 @@ fi
+
+ case "$host" in
+ *-*-solaris2*)
+- AC_DEFINE([PAM_SUN_CODEBASE])
+-
+ # LD_PRELOAD is space-delimited
+ RTLD_PRELOAD_DELIM=" "
+
+@@ -1693,8 +1691,6 @@ case "$host" in
+ if test "$with_AFS" = "yes"; then
+ AFS_LIBS="-lc -lucb"
+ fi
+- : ${mansectsu='1m'}
+- : ${mansectform='4'}
+ test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
+ AC_CHECK_FUNCS([priv_set], [PSMAN=1])
+ ;;
diff --git a/debian/patches/series b/debian/patches/series
index 3fd503a..3b63429 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ paths-in-samples.diff
CVE-2017-1000367.patch
use-proc-self-consistently-on-linux.diff
CVE-2017-1000368.diff
+dyson.patch