vstinner / rpms / python34

Forked from rpms/python34 5 years ago
Clone

Blame 00290-cryptmodule-Include-crypt.h-for-declaration-of-crypt.patch

bded33c
diff -U3 -r Python-3.4.8-orig/configure Python-3.4.8/configure
bded33c
--- Python-3.4.8-orig/configure	2018-02-13 11:08:48.126741021 +0100
bded33c
+++ Python-3.4.8/configure	2018-02-13 11:32:32.579790986 +0100
bded33c
@@ -7006,7 +7006,7 @@
bded33c
 
bded33c
 fi
bded33c
 
bded33c
-for ac_header in asm/types.h conio.h direct.h dlfcn.h errno.h \
bded33c
+for ac_header in asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \
bded33c
 fcntl.h grp.h \
bded33c
 ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
bded33c
 sched.h shadow.h signal.h stdint.h stropts.h termios.h \
bded33c
diff -U3 -r Python-3.4.8-orig/configure.ac Python-3.4.8/configure.ac
bded33c
--- Python-3.4.8-orig/configure.ac	2018-02-13 11:08:48.060740742 +0100
bded33c
+++ Python-3.4.8/configure.ac	2018-02-13 11:09:59.208039082 +0100
bded33c
@@ -1563,7 +1563,7 @@
bded33c
 
bded33c
 # checks for header files
bded33c
 AC_HEADER_STDC
bded33c
-AC_CHECK_HEADERS(asm/types.h conio.h direct.h dlfcn.h errno.h \
bded33c
+AC_CHECK_HEADERS(asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \
bded33c
 fcntl.h grp.h \
bded33c
 ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
bded33c
 sched.h shadow.h signal.h stdint.h stropts.h termios.h \
bded33c
diff -U3 -r Python-3.4.8-orig/Include/Python.h Python-3.4.8/Include/Python.h
bded33c
--- Python-3.4.8-orig/Include/Python.h	2018-02-05 00:40:38.000000000 +0100
bded33c
+++ Python-3.4.8/Include/Python.h	2018-02-13 11:09:40.689963273 +0100
bded33c
@@ -35,6 +35,9 @@
bded33c
 #ifdef HAVE_UNISTD_H
bded33c
 #include <unistd.h>
bded33c
 #endif
bded33c
+#ifdef HAVE_CRYPT_H
bded33c
+#include <crypt.h>
bded33c
+#endif
bded33c
 
bded33c
 /* For size_t? */
bded33c
 #ifdef HAVE_STDDEF_H
bded33c
diff -U3 -r Python-3.4.8-orig/Modules/_cryptmodule.c Python-3.4.8/Modules/_cryptmodule.c
bded33c
--- Python-3.4.8-orig/Modules/_cryptmodule.c	2018-02-05 00:40:38.000000000 +0100
bded33c
+++ Python-3.4.8/Modules/_cryptmodule.c	2018-02-13 12:00:51.636164978 +0100
bded33c
@@ -69,7 +69,8 @@
bded33c
 {
bded33c
     /* On some platforms (AtheOS) crypt returns NULL for an invalid
bded33c
        salt. Return None in that case. XXX Maybe raise an exception?  */
bded33c
-    return Py_BuildValue("s", crypt(word, salt));
666196f
+    char *result = crypt(word, salt);
bded33c
+    return Py_BuildValue("s", result);
bded33c
 }
bded33c
 
bded33c