fbe895940c
* bugfix-only release
- drop upstreamed patches:
pypirc-secure.diff
python-2.7.3-multiprocessing-join.patch
ctypes-libffi-aarch64.patch
- drop python-2.7rc2-configure.patch as it doesn't seem necessary anymore
- removed %docdir/python/README from package (conflict with python-base)
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=137
86 lines
3.1 KiB
Diff
86 lines
3.1 KiB
Diff
Index: Python/sysmodule.c
|
|
===================================================================
|
|
--- Python/sysmodule.c.orig 2013-05-09 15:58:55.927351218 +0200
|
|
+++ Python/sysmodule.c 2013-05-09 16:02:24.137048172 +0200
|
|
@@ -1620,7 +1620,20 @@
|
|
char *p = NULL;
|
|
Py_ssize_t n = 0;
|
|
PyObject *a;
|
|
-#ifdef HAVE_READLINK
|
|
+#ifdef HAVE_CANONICALIZE_FILE_NAME
|
|
+ int errnum;
|
|
+
|
|
+ if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
|
|
+ argv0 = canonicalize_file_name(argv0);
|
|
+ if (argv0 == NULL) argv0 = strdup(argv[0]);
|
|
+ }
|
|
+#elif defined(HAVE_REALPATH)
|
|
+ if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
|
|
+ if (realpath(argv0, fullpath)) {
|
|
+ argv0 = fullpath;
|
|
+ }
|
|
+ }
|
|
+#elif defined(HAVE_READLINK)
|
|
char link[MAXPATHLEN+1];
|
|
char argv0copy[2*MAXPATHLEN+1];
|
|
int nr = 0;
|
|
@@ -1647,7 +1660,8 @@
|
|
}
|
|
}
|
|
}
|
|
-#endif /* HAVE_READLINK */
|
|
+#endif /* resolve method selection */
|
|
+
|
|
#if SEP == '\\' /* Special case for MS filename syntax */
|
|
if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
|
|
char *q;
|
|
@@ -1676,11 +1690,6 @@
|
|
}
|
|
#else /* All other filename syntaxes */
|
|
if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
|
|
-#if defined(HAVE_REALPATH)
|
|
- if (realpath(argv0, fullpath)) {
|
|
- argv0 = fullpath;
|
|
- }
|
|
-#endif
|
|
p = strrchr(argv0, SEP);
|
|
}
|
|
if (p != NULL) {
|
|
@@ -1698,6 +1707,9 @@
|
|
a = PyString_FromStringAndSize(argv0, n);
|
|
if (a == NULL)
|
|
Py_FatalError("no mem for sys.path insertion");
|
|
+#ifdef HAVE_CANONICALIZE_FILE_NAME
|
|
+ if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) free(argv0);
|
|
+#endif /* HAVE_CANONICALIZE_FILE_NAME */
|
|
if (PyList_Insert(path, 0, a) < 0)
|
|
Py_FatalError("sys.path.insert(0) failed");
|
|
Py_DECREF(a);
|
|
Index: pyconfig.h.in
|
|
===================================================================
|
|
--- pyconfig.h.in.orig 2013-05-09 15:58:55.941351601 +0200
|
|
+++ pyconfig.h.in 2013-05-09 16:02:24.138048200 +0200
|
|
@@ -106,6 +106,9 @@
|
|
/* Define to 1 if you have the 'chflags' function. */
|
|
#undef HAVE_CHFLAGS
|
|
|
|
+/* Define to 1 if you have the `canonicalize_file_name' function. */
|
|
+#undef HAVE_CANONICALIZE_FILE_NAME
|
|
+
|
|
/* Define to 1 if you have the `chown' function. */
|
|
#undef HAVE_CHOWN
|
|
|
|
Index: configure.ac
|
|
===================================================================
|
|
--- configure.ac.orig 2013-04-06 16:02:41.000000000 +0200
|
|
+++ configure.ac 2013-05-09 16:03:05.624184370 +0200
|
|
@@ -2878,7 +2878,7 @@
|
|
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
|
|
initgroups kill killpg lchmod lchown lstat mkfifo mknod mktime \
|
|
mremap nice pathconf pause plock poll pthread_init \
|
|
- putenv readlink realpath \
|
|
+ putenv readlink realpath canonicalize_file_name \
|
|
select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \
|
|
setgid \
|
|
setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
|