127 lines
5.0 KiB
Diff
127 lines
5.0 KiB
Diff
diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py
|
|
index cc9c570..b405f01 100644
|
|
--- a/Lib/test/test_resource.py
|
|
+++ b/Lib/test/test_resource.py
|
|
@@ -148,9 +148,6 @@ class ResourceTest(unittest.TestCase):
|
|
@support.requires_linux_version(2, 6, 36)
|
|
def test_prlimit(self):
|
|
self.assertRaises(TypeError, resource.prlimit)
|
|
- if os.geteuid() != 0:
|
|
- self.assertRaises(PermissionError, resource.prlimit,
|
|
- 1, resource.RLIMIT_AS)
|
|
self.assertRaises(ProcessLookupError, resource.prlimit,
|
|
-1, resource.RLIMIT_AS)
|
|
limit = resource.getrlimit(resource.RLIMIT_AS)
|
|
diff --git a/configure b/configure
|
|
index ed37d5d..a00eb55 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -783,6 +783,7 @@ infodir
|
|
docdir
|
|
oldincludedir
|
|
includedir
|
|
+runstatedir
|
|
localstatedir
|
|
sharedstatedir
|
|
sysconfdir
|
|
@@ -895,6 +896,7 @@ datadir='${datarootdir}'
|
|
sysconfdir='${prefix}/etc'
|
|
sharedstatedir='${prefix}/com'
|
|
localstatedir='${prefix}/var'
|
|
+runstatedir='${localstatedir}/run'
|
|
includedir='${prefix}/include'
|
|
oldincludedir='/usr/include'
|
|
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
|
@@ -1147,6 +1149,15 @@ do
|
|
| -silent | --silent | --silen | --sile | --sil)
|
|
silent=yes ;;
|
|
|
|
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
|
|
+ | --runstate | --runstat | --runsta | --runst | --runs \
|
|
+ | --run | --ru | --r)
|
|
+ ac_prev=runstatedir ;;
|
|
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
|
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
|
+ | --run=* | --ru=* | --r=*)
|
|
+ runstatedir=$ac_optarg ;;
|
|
+
|
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
|
ac_prev=sbindir ;;
|
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
|
@@ -1284,7 +1295,7 @@ fi
|
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
|
- libdir localedir mandir
|
|
+ libdir localedir mandir runstatedir
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
# Remove trailing slashes.
|
|
@@ -1437,6 +1448,7 @@ Fine tuning of the installation directories:
|
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
|
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
|
--includedir=DIR C header files [PREFIX/include]
|
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
@@ -11290,7 +11302,7 @@ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
|
|
getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
|
|
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
|
|
if_nameindex \
|
|
- initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
|
|
+ initgroups kill killpg lchown lockf linkat lstat lutimes mmap \
|
|
memrchr mbrtowc mkdirat mkfifo \
|
|
mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
|
|
posix_fallocate posix_fadvise pread \
|
|
@@ -11316,6 +11328,22 @@ _ACEOF
|
|
fi
|
|
done
|
|
|
|
+# Force lchmod off for Linux. Linux disallows changing the mode of symbolic
|
|
+# links. Some libc implementations have a stub lchmod implementation that always
|
|
+# returns an error.
|
|
+if test "$MACHDEP" != linux; then
|
|
+ for ac_func in lchmod
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "lchmod" "ac_cv_func_lchmod"
|
|
+if test "x$ac_cv_func_lchmod" = xyes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_LCHMOD 1
|
|
+_ACEOF
|
|
+
|
|
+fi
|
|
+done
|
|
+
|
|
+fi
|
|
|
|
ac_fn_c_check_decl "$LINENO" "dirfd" "ac_cv_have_decl_dirfd" "#include <sys/types.h>
|
|
#include <dirent.h>
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 937bb65..6c7813b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -3370,7 +3370,7 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
|
|
getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
|
|
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
|
|
if_nameindex \
|
|
- initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
|
|
+ initgroups kill killpg lchown lockf linkat lstat lutimes mmap \
|
|
memrchr mbrtowc mkdirat mkfifo \
|
|
mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
|
|
posix_fallocate posix_fadvise pread \
|
|
@@ -3386,6 +3386,13 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
|
|
truncate uname unlinkat unsetenv utimensat utimes waitid waitpid wait3 wait4 \
|
|
wcscoll wcsftime wcsxfrm wmemcmp writev _getpty)
|
|
|
|
+# Force lchmod off for Linux. Linux disallows changing the mode of symbolic
|
|
+# links. Some libc implementations have a stub lchmod implementation that always
|
|
+# returns an error.
|
|
+if test "$MACHDEP" != linux; then
|
|
+ AC_CHECK_FUNCS(lchmod)
|
|
+fi
|
|
+
|
|
AC_CHECK_DECL(dirfd,
|
|
AC_DEFINE(HAVE_DIRFD, 1,
|
|
Define if you have the 'dirfd' function or macro.), ,
|