* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.3/
@ 2013-03-11 19:26 Ulrich Mueller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Mueller @ 2013-03-11 19:26 UTC (permalink / raw
To: gentoo-commits
commit: 3b936ca8df9416506b4c749b915c169204dc31d3
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 18:56:46 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 18:56:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=3b936ca8
Fix misspelled symbol in pop.c, bug 461370.
This caused a failure because of an undeclared identifier when
building with the Heimdal Kerberos implementation. Thanks to
Martin von Gagern for the patch.
---
emacs/24.3/01_all_pop-errmax.patch | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/emacs/24.3/01_all_pop-errmax.patch b/emacs/24.3/01_all_pop-errmax.patch
new file mode 100644
index 0000000..112907f
--- /dev/null
+++ b/emacs/24.3/01_all_pop-errmax.patch
@@ -0,0 +1,16 @@
+Avoid using an undefined name with the Heimdal Kerberos implementation.
+Patch by Martin von Gagern.
+https://bugs.gentoo.org/461370
+http://debbugs.gnu.org/13925
+
+--- emacs-24.3-orig/lib-src/pop.c
++++ emacs-24.3/lib-src/pop.c
+@@ -1198,7 +1198,7 @@ socket_connection (char *host, int flags
+ }
+ #elif defined HAVE_KRB5_ERROR_E_TEXT
+ if (err_ret && err_ret->e_text && **err_ret->e_text)
+- snprintf (pop_error + pop_error_len, ERRMAX - pop_error_len,
++ snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len,
+ " [server says '%s']", *err_ret->e_text);
+ #endif
+ if (err_ret)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.3/
@ 2013-05-23 16:30 Ulrich Mueller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Mueller @ 2013-05-23 16:30 UTC (permalink / raw
To: gentoo-commits
commit: 4939bef36b98bffa13c44dca6ebf7522b11775f5
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 16:27:19 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu May 23 16:27:19 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=4939bef3
Fix Info reader to support Info files created by makeinfo 5, bug 464368.
---
emacs/24.3/02_all_texinfo-5.patch | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/emacs/24.3/02_all_texinfo-5.patch b/emacs/24.3/02_all_texinfo-5.patch
new file mode 100644
index 0000000..e7f1f43
--- /dev/null
+++ b/emacs/24.3/02_all_texinfo-5.patch
@@ -0,0 +1,16 @@
+Fix Info reader to support Info files created by makeinfo 5.
+Patch from upstream.
+https://bugs.gentoo.org/464368
+http://debbugs.gnu.org/14125
+
+--- emacs-24.3-orig/lisp/info.el
++++ emacs-24.3/lisp/info.el
+@@ -1525,7 +1525,7 @@
+ (forward-char 1)
+ (search-forward "\n\^_"))
+ (if (numberp nodepos)
+- (+ (- nodepos lastfilepos) (point)))))
++ (+ (- nodepos lastfilepos) (point-min)))))
+
+ (defun Info-unescape-quotes (value)
+ "Unescape double quotes and backslashes in VALUE."
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.3/
@ 2013-07-13 9:36 Ulrich Mueller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Mueller @ 2013-07-13 9:36 UTC (permalink / raw
To: gentoo-commits
commit: 678160a4fcfedb76d491e44ef04d86c9e287ee91
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 08:31:31 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 08:31:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=678160a4
Fix build failure on FreeBSD 9.1 with GCC 4.6.3, bug 473364.
---
emacs/24.3/03_all_gnulib-fbsd-9.1.patch | 98 +++++++++++++++++++++++++++++++++
1 file changed, 98 insertions(+)
diff --git a/emacs/24.3/03_all_gnulib-fbsd-9.1.patch b/emacs/24.3/03_all_gnulib-fbsd-9.1.patch
new file mode 100644
index 0000000..e8c9196
--- /dev/null
+++ b/emacs/24.3/03_all_gnulib-fbsd-9.1.patch
@@ -0,0 +1,98 @@
+Fix build failure on FreeBSD 9.1 with GCC 4.6.3.
+Patch from upstream bzr, backported to Emacs 24.3.
+https://bugs.gentoo.org/show_bug.cgi?id=473364
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14812
+
+2013-07-08 Paul Eggert <eggert@cs.ucla.edu>
+
+Try to fix FreeBSD 9.1 porting problem (Bug#14812).
+This incorporates the following merge from gnulib:
+2013-07-07 stdalign, verify: port to FreeBSD 9.1, to C11, and to C++11
+
+--- emacs-24.3-orig/lib/stdalign.in.h
++++ emacs-24.3/lib/stdalign.in.h
+@@ -41,13 +41,28 @@
+ are 4 unless the option '-malign-double' is used.
+
+ The result cannot be used as a value for an 'enum' constant, if you
+- want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. */
++ want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc.
++
++ Include <stddef.h> for offsetof. */
+ #include <stddef.h>
+-#if defined __cplusplus
++
++/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
++ standard headers, defines conflicting implementations of _Alignas
++ and _Alignof that are no better than ours; override them. */
++#undef _Alignas
++#undef _Alignof
++
++#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
++# ifdef __cplusplus
++# if 201103 <= __cplusplus
++# define _Alignof(type) alignof (type)
++# else
+ template <class __t> struct __alignof_helper { char __a; __t __b; };
+-# define _Alignof(type) offsetof (__alignof_helper<type>, __b)
+-#else
+-# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
++# define _Alignof(type) offsetof (__alignof_helper<type>, __b)
++# endif
++# else
++# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
++# endif
+ #endif
+ #define alignof _Alignof
+ #define __alignof_is_defined 1
+@@ -77,12 +92,16 @@
+
+ */
+
+-#if __GNUC__ || __IBMC__ || __IBMCPP__ || 0x5110 <= __SUNPRO_C
+-# define _Alignas(a) __attribute__ ((__aligned__ (a)))
+-#elif 1300 <= _MSC_VER
+-# define _Alignas(a) __declspec (align (a))
++#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
++# if defined __cplusplus && 201103 <= __cplusplus
++# define _Alignas(a) alignas (a)
++# elif __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC || 0x5110 <= __SUNPRO_C
++# define _Alignas(a) __attribute__ ((__aligned__ (a)))
++# elif 1300 <= _MSC_VER
++# define _Alignas(a) __declspec (align (a))
++# endif
+ #endif
+-#ifdef _Alignas
++#if defined _Alignas || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__)
+ # define alignas _Alignas
+ # define __alignas_is_defined 1
+ #endif
+--- emacs-24.3-orig/lib/verify.h
++++ emacs-24.3/lib/verify.h
+@@ -40,6 +40,14 @@
+ # define _GL_HAVE_STATIC_ASSERT 1
+ # endif
+
++/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
++ system headers, defines a conflicting _Static_assert that is no
++ better than ours; override it. */
++#ifndef _GL_HAVE_STATIC_ASSERT
++# include <stddef.h>
++# undef _Static_assert
++#endif
++
+ /* Each of these macros verifies that its argument R is nonzero. To
+ be portable, R should be an integer constant expression. Unlike
+ assert (R), there is no run-time overhead.
+--- emacs-24.3-orig/m4/stdalign.m4
++++ emacs-24.3/m4/stdalign.m4
+@@ -31,7 +31,8 @@ AC_DEFUN([gl_STDALIGN_H],
+
+ /* Test _Alignas only on platforms where gnulib can help. */
+ #if \
+- (__GNUC__ || __IBMC__ || __IBMCPP__ \
++ ((defined __cplusplus && 201103 <= __cplusplus) \
++ || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \
+ || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER)
+ int alignas (8) alignas_int = 1;
+ char test_alignas[_Alignof (alignas_int) == 8 ? 1 : -1];
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.3/
@ 2016-01-17 2:42 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2016-01-17 2:42 UTC (permalink / raw
To: gentoo-commits
commit: 6379e064984c8027bbf29fa053435011b55a3f61
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 02:42:07 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 02:42:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=6379e064
Remove 24.3 patchset.
emacs/24.3/01_all_pop-errmax.patch | 16 ----
emacs/24.3/02_all_texinfo-5.patch | 16 ----
emacs/24.3/03_all_gnulib-fbsd-9.1.patch | 98 ---------------------
emacs/24.3/04_all_pax-xattr.patch | 46 ----------
emacs/24.3/05_all_gnus-fun-tmpfile.patch | 41 ---------
emacs/24.3/06_all_find-gc-tmpfile.patch | 135 -----------------------------
emacs/24.3/07_all_browse-url-tmpfile.patch | 59 -------------
emacs/24.3/08_all_tramp-sh-tmpfile.patch | 84 ------------------
8 files changed, 495 deletions(-)
diff --git a/emacs/24.3/01_all_pop-errmax.patch b/emacs/24.3/01_all_pop-errmax.patch
deleted file mode 100644
index 112907f..0000000
--- a/emacs/24.3/01_all_pop-errmax.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid using an undefined name with the Heimdal Kerberos implementation.
-Patch by Martin von Gagern.
-https://bugs.gentoo.org/461370
-http://debbugs.gnu.org/13925
-
---- emacs-24.3-orig/lib-src/pop.c
-+++ emacs-24.3/lib-src/pop.c
-@@ -1198,7 +1198,7 @@ socket_connection (char *host, int flags
- }
- #elif defined HAVE_KRB5_ERROR_E_TEXT
- if (err_ret && err_ret->e_text && **err_ret->e_text)
-- snprintf (pop_error + pop_error_len, ERRMAX - pop_error_len,
-+ snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len,
- " [server says '%s']", *err_ret->e_text);
- #endif
- if (err_ret)
diff --git a/emacs/24.3/02_all_texinfo-5.patch b/emacs/24.3/02_all_texinfo-5.patch
deleted file mode 100644
index e7f1f43..0000000
--- a/emacs/24.3/02_all_texinfo-5.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix Info reader to support Info files created by makeinfo 5.
-Patch from upstream.
-https://bugs.gentoo.org/464368
-http://debbugs.gnu.org/14125
-
---- emacs-24.3-orig/lisp/info.el
-+++ emacs-24.3/lisp/info.el
-@@ -1525,7 +1525,7 @@
- (forward-char 1)
- (search-forward "\n\^_"))
- (if (numberp nodepos)
-- (+ (- nodepos lastfilepos) (point)))))
-+ (+ (- nodepos lastfilepos) (point-min)))))
-
- (defun Info-unescape-quotes (value)
- "Unescape double quotes and backslashes in VALUE."
diff --git a/emacs/24.3/03_all_gnulib-fbsd-9.1.patch b/emacs/24.3/03_all_gnulib-fbsd-9.1.patch
deleted file mode 100644
index e8c9196..0000000
--- a/emacs/24.3/03_all_gnulib-fbsd-9.1.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Fix build failure on FreeBSD 9.1 with GCC 4.6.3.
-Patch from upstream bzr, backported to Emacs 24.3.
-https://bugs.gentoo.org/show_bug.cgi?id=473364
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14812
-
-2013-07-08 Paul Eggert <eggert@cs.ucla.edu>
-
-Try to fix FreeBSD 9.1 porting problem (Bug#14812).
-This incorporates the following merge from gnulib:
-2013-07-07 stdalign, verify: port to FreeBSD 9.1, to C11, and to C++11
-
---- emacs-24.3-orig/lib/stdalign.in.h
-+++ emacs-24.3/lib/stdalign.in.h
-@@ -41,13 +41,28 @@
- are 4 unless the option '-malign-double' is used.
-
- The result cannot be used as a value for an 'enum' constant, if you
-- want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. */
-+ want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc.
-+
-+ Include <stddef.h> for offsetof. */
- #include <stddef.h>
--#if defined __cplusplus
-+
-+/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
-+ standard headers, defines conflicting implementations of _Alignas
-+ and _Alignof that are no better than ours; override them. */
-+#undef _Alignas
-+#undef _Alignof
-+
-+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
-+# ifdef __cplusplus
-+# if 201103 <= __cplusplus
-+# define _Alignof(type) alignof (type)
-+# else
- template <class __t> struct __alignof_helper { char __a; __t __b; };
--# define _Alignof(type) offsetof (__alignof_helper<type>, __b)
--#else
--# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
-+# define _Alignof(type) offsetof (__alignof_helper<type>, __b)
-+# endif
-+# else
-+# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
-+# endif
- #endif
- #define alignof _Alignof
- #define __alignof_is_defined 1
-@@ -77,12 +92,16 @@
-
- */
-
--#if __GNUC__ || __IBMC__ || __IBMCPP__ || 0x5110 <= __SUNPRO_C
--# define _Alignas(a) __attribute__ ((__aligned__ (a)))
--#elif 1300 <= _MSC_VER
--# define _Alignas(a) __declspec (align (a))
-+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
-+# if defined __cplusplus && 201103 <= __cplusplus
-+# define _Alignas(a) alignas (a)
-+# elif __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC || 0x5110 <= __SUNPRO_C
-+# define _Alignas(a) __attribute__ ((__aligned__ (a)))
-+# elif 1300 <= _MSC_VER
-+# define _Alignas(a) __declspec (align (a))
-+# endif
- #endif
--#ifdef _Alignas
-+#if defined _Alignas || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__)
- # define alignas _Alignas
- # define __alignas_is_defined 1
- #endif
---- emacs-24.3-orig/lib/verify.h
-+++ emacs-24.3/lib/verify.h
-@@ -40,6 +40,14 @@
- # define _GL_HAVE_STATIC_ASSERT 1
- # endif
-
-+/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
-+ system headers, defines a conflicting _Static_assert that is no
-+ better than ours; override it. */
-+#ifndef _GL_HAVE_STATIC_ASSERT
-+# include <stddef.h>
-+# undef _Static_assert
-+#endif
-+
- /* Each of these macros verifies that its argument R is nonzero. To
- be portable, R should be an integer constant expression. Unlike
- assert (R), there is no run-time overhead.
---- emacs-24.3-orig/m4/stdalign.m4
-+++ emacs-24.3/m4/stdalign.m4
-@@ -31,7 +31,8 @@ AC_DEFUN([gl_STDALIGN_H],
-
- /* Test _Alignas only on platforms where gnulib can help. */
- #if \
-- (__GNUC__ || __IBMC__ || __IBMCPP__ \
-+ ((defined __cplusplus && 201103 <= __cplusplus) \
-+ || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \
- || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER)
- int alignas (8) alignas_int = 1;
- char test_alignas[_Alignof (alignas_int) == 8 ? 1 : -1];
diff --git a/emacs/24.3/04_all_pax-xattr.patch b/emacs/24.3/04_all_pax-xattr.patch
deleted file mode 100644
index 06396c3..0000000
--- a/emacs/24.3/04_all_pax-xattr.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix failure in unexec with hardened Linux kernel and XATTR_PAX_FLAGS=y.
-https://bugs.gentoo.org/456970
-https://bugs.gentoo.org/497498
-
---- emacs-24.3-orig/configure.ac
-+++ emacs-24.3/configure.ac
-@@ -790,6 +790,18 @@
- fi
- fi
-
-+AC_PATH_PROG(SETFATTR, setfattr)
-+if test "X$SETFATTR" != X; then
-+ AC_MSG_CHECKING([whether extended attributes are supported])
-+ touch conftest.tmp
-+ if $SETFATTR -n user.pax.flags conftest.tmp >/dev/null 2>&1; then
-+ AC_MSG_RESULT(yes)
-+ else
-+ AC_MSG_RESULT(no); SETFATTR=""
-+ fi
-+ rm -f conftest.tmp
-+fi
-+
- ## Need makeinfo >= 4.7 (?) to build the manuals.
- AC_PATH_PROG(MAKEINFO, makeinfo, no)
- dnl By this stage, configure has already checked for egrep and set EGREP,
---- emacs-24.3-orig/src/Makefile.in
-+++ emacs-24.3/src/Makefile.in
-@@ -115,6 +115,9 @@
- ## memory randomization in temacs with "paxctl -r". See bug#11398.
- PAXCTL = @PAXCTL@
-
-+## If available, the full path to the setfattr program.
-+SETFATTR = @SETFATTR@
-+
- ## Some systems define this to request special libraries.
- LIBS_SYSTEM=@LIBS_SYSTEM@
-
-@@ -467,6 +470,8 @@
- -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES)
- test "$(CANNOT_DUMP)" = "yes" || \
- test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)
-+ test "$(CANNOT_DUMP)" = "yes" || test "X$(SETFATTR)" = X || \
-+ $(SETFATTR) -n user.pax.flags -v er temacs$(EXEEXT)
-
- ## The following oldxmenu-related rules are only (possibly) used if
- ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them
diff --git a/emacs/24.3/05_all_gnus-fun-tmpfile.patch b/emacs/24.3/05_all_gnus-fun-tmpfile.patch
deleted file mode 100644
index 227935d..0000000
--- a/emacs/24.3/05_all_gnus-fun-tmpfile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Fix insecure use of temporary files.
-Patch from upstream bzr, backported to Emacs 24.3.
-https://bugs.gentoo.org/509830
-CVE-2014-3421
-
-revno: 117066
-fixes bug: http://bugs.debian.org/747100
-committer: Glenn Morris <rgm@gnu.org>
-branch nick: emacs-24
-timestamp: Mon 2014-05-05 20:50:51 -0700
-message:
- * gnus-fun.el (gnus-grab-cam-face): Do not use predictable temp-file name.
-
---- emacs-24.3-orig/lisp/gnus/gnus-fun.el
-+++ emacs-24.3/lisp/gnus/gnus-fun.el
-@@ -250,20 +250,21 @@
- (interactive)
- (shell-command "xawtv-remote snap ppm")
- (let ((file nil)
-+ (tempfile (make-temp-file "gnus-face-" nil ".ppm"))
- result)
- (while (null (setq file (directory-files "/tftpboot/sparky/tmp"
- t "snap.*ppm")))
- (sleep-for 1))
- (setq file (car file))
- (shell-command
-- (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm"
-- file))
-+ (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm >> %s"
-+ file tempfile))
- (let ((gnus-convert-image-to-face-command
- (format "cat '%%s' | ppmquant %%d | ppmchange %s | pnmtopng"
- (gnus-fun-ppm-change-string))))
-- (setq result (gnus-face-from-file "/tmp/gnus.face.ppm")))
-+ (setq result (gnus-face-from-file tempfile)))
- (delete-file file)
-- ;;(delete-file "/tmp/gnus.face.ppm")
-+ ;;(delete-file tempfile) ; FIXME why are we not deleting it?!
- result))
-
- (defun gnus-fun-ppm-change-string ()
diff --git a/emacs/24.3/06_all_find-gc-tmpfile.patch b/emacs/24.3/06_all_find-gc-tmpfile.patch
deleted file mode 100644
index 3c640f3..0000000
--- a/emacs/24.3/06_all_find-gc-tmpfile.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Fix insecure use of temporary files.
-Patch from upstream bzr, backported to Emacs 24.3.
-https://bugs.gentoo.org/509830
-CVE-2014-3422
-
-revno: 117067
-fixes bug: http://bugs.debian.org/747100
-committer: Glenn Morris <rgm@gnu.org>
-branch nick: emacs-24
-timestamp: Mon 2014-05-05 20:53:31 -0700
-message:
- find-gc.el misc fixes
-
- The whole file looks obsolete and/or broken.
-
- * lisp/emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value.
- (find-gc-source-files): Update some names.
- (trace-call-tree): Simplify and update. Avoid predictable temp-file names.
-
---- emacs-24.3-orig/lisp/emacs-lisp/find-gc.el
-+++ emacs-24.3/lisp/emacs-lisp/find-gc.el
-@@ -23,14 +23,15 @@
-
- ;; Produce in find-gc-unsafe-list the set of all functions that may invoke GC.
- ;; This expects the Emacs sources to live in find-gc-source-directory.
--;; It creates a temporary working directory /tmp/esrc.
-
- ;;; Code:
-
- (defvar find-gc-unsafe-list nil
- "The list of unsafe functions is placed here by `find-gc-unsafe'.")
-
--(defvar find-gc-source-directory)
-+(defvar find-gc-source-directory
-+ (file-name-as-directory (expand-file-name "src" source-directory))
-+ "Directory containing Emacs C sources.")
-
- (defvar find-gc-subrs-callers nil
- "Alist of users of subrs, from GC testing.
-@@ -59,14 +60,14 @@
- "indent.c" "search.c" "regex.c" "undo.c"
- "alloc.c" "data.c" "doc.c" "editfns.c"
- "callint.c" "eval.c" "fns.c" "print.c" "lread.c"
-- "abbrev.c" "syntax.c" "unexcoff.c"
-+ "syntax.c" "unexcoff.c"
- "bytecode.c" "process.c" "callproc.c" "doprnt.c"
-- "x11term.c" "x11fns.c"))
-+ "xterm.c" "xfns.c"))
-
-
- (defun find-gc-unsafe ()
- "Return a list of unsafe functions--that is, which can call GC.
--Also store it in `find-gc-unsafe'."
-+Also store it in `find-gc-unsafe-list'."
- (trace-call-tree nil)
- (trace-use-tree)
- (find-unsafe-funcs 'Fgarbage_collect)
-@@ -102,47 +103,38 @@
-
-
-
--(defun trace-call-tree (&optional already-setup)
-+(defun trace-call-tree (&optional ignored)
- (message "Setting up directories...")
-- (or already-setup
-- (progn
-- ;; Gee, wouldn't a built-in "system" function be handy here.
-- (call-process "csh" nil nil nil "-c" "rm -rf /tmp/esrc")
-- (call-process "csh" nil nil nil "-c" "mkdir /tmp/esrc")
-- (call-process "csh" nil nil nil "-c"
-- (format "ln -s %s/*.[ch] /tmp/esrc"
-- find-gc-source-directory))))
-- (with-current-buffer (get-buffer-create "*Trace Call Tree*")
-- (setq find-gc-subrs-called nil)
-- (let ((case-fold-search nil)
-- (files find-gc-source-files)
-- name entry)
-- (while files
-- (message "Compiling %s..." (car files))
-- (call-process "csh" nil nil nil "-c"
-- (format "gcc -dr -c /tmp/esrc/%s -o /dev/null"
-- (car files)))
-- (erase-buffer)
-- (insert-file-contents (concat "/tmp/esrc/" (car files) ".rtl"))
-- (while (re-search-forward ";; Function \\|(call_insn " nil t)
-- (if (= (char-after (- (point) 3)) ?o)
-- (progn
-- (looking-at "[a-zA-Z0-9_]+")
-- (setq name (intern (buffer-substring (match-beginning 0)
-- (match-end 0))))
-- (message "%s : %s" (car files) name)
-- (setq entry (list name)
-- find-gc-subrs-called (cons entry find-gc-subrs-called)))
-- (if (looking-at ".*\n?.*\"\\([A-Za-z0-9_]+\\)\"")
-+ (setq find-gc-subrs-called nil)
-+ (let ((case-fold-search nil)
-+ (default-directory find-gc-source-directory)
-+ (files find-gc-source-files)
-+ name entry rtlfile)
-+ (dolist (file files)
-+ (message "Compiling %s..." file)
-+ (call-process "gcc" nil nil nil "-I" "." "-I" "../lib"
-+ "-fdump-rtl-expand" "-o" null-device "-c" file)
-+ (setq rtlfile
-+ (file-expand-wildcards (format "%s.*.expand" file) t))
-+ (if (/= 1 (length rtlfile))
-+ (message "Error compiling `%s'?" file)
-+ (with-temp-buffer
-+ (insert-file-contents (setq rtlfile (car rtlfile)))
-+ (delete-file rtlfile)
-+ (while (re-search-forward ";; Function \\|(call_insn " nil t)
-+ (if (= (char-after (- (point) 3)) ?o)
- (progn
-- (setq name (intern (buffer-substring (match-beginning 1)
-- (match-end 1))))
-- (or (memq name (cdr entry))
-- (setcdr entry (cons name (cdr entry))))))))
-- (delete-file (concat "/tmp/esrc/" (car files) ".rtl"))
-- (setq files (cdr files)))))
--)
--
-+ (looking-at "[a-zA-Z0-9_]+")
-+ (setq name (intern (match-string 0)))
-+ (message "%s : %s" (car files) name)
-+ (setq entry (list name)
-+ find-gc-subrs-called
-+ (cons entry find-gc-subrs-called)))
-+ (if (looking-at ".*\n?.*\"\\([A-Za-z0-9_]+\\)\"")
-+ (progn
-+ (setq name (intern (match-string 1)))
-+ (or (memq name (cdr entry))
-+ (setcdr entry (cons name (cdr entry)))))))))))))
-
- (defun trace-use-tree ()
- (setq find-gc-subrs-callers (mapcar 'list (mapcar 'car find-gc-subrs-called)))
diff --git a/emacs/24.3/07_all_browse-url-tmpfile.patch b/emacs/24.3/07_all_browse-url-tmpfile.patch
deleted file mode 100644
index b0a0fe4..0000000
--- a/emacs/24.3/07_all_browse-url-tmpfile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Fix insecure use of temporary files.
-Patch from upstream bzr, backported to Emacs 24.3.
-https://bugs.gentoo.org/509830
-CVE-2014-3423
-
-revno: 117087
-fixes bug: http://debbugs.gnu.org/17428
-committer: Glenn Morris <rgm@gnu.org>
-branch nick: emacs-24
-timestamp: Thu 2014-05-08 14:10:36 -0400
-message:
- * browse-url.el (browse-url-mosaic): Be careful when writing /tmp/Mosaic.PID.
-
---- emacs-24.3-orig/lisp/net/browse-url.el
-+++ emacs-24.3/lisp/net/browse-url.el
-@@ -1328,28 +1328,26 @@
- (let ((pidfile (expand-file-name browse-url-mosaic-pidfile))
- pid)
- (if (file-readable-p pidfile)
-- (save-excursion
-- (find-file pidfile)
-- (goto-char (point-min))
-- (setq pid (read (current-buffer)))
-- (kill-buffer nil)))
-- (if (and pid (zerop (signal-process pid 0))) ; Mosaic running
-- (save-excursion
-- (find-file (format "/tmp/Mosaic.%d" pid))
-- (erase-buffer)
-- (insert (if (browse-url-maybe-new-window new-window)
-- "newwin\n"
-- "goto\n")
-- url "\n")
-- (save-buffer)
-- (kill-buffer nil)
-+ (with-temp-buffer
-+ (insert-file-contents pidfile)
-+ (setq pid (read (current-buffer)))))
-+ (if (and (integerp pid) (zerop (signal-process pid 0))) ; Mosaic running
-+ (progn
-+ (with-temp-buffer
-+ (insert (if (browse-url-maybe-new-window new-window)
-+ "newwin\n"
-+ "goto\n")
-+ url "\n")
-+ (if (file-exists-p (setq pidfile (format "/tmp/Mosaic.%d" pid)))
-+ (delete-file pidfile))
-+ ;; http://debbugs.gnu.org/17428. Use O_EXCL.
-+ (write-region nil nil pidfile nil 'silent nil 'excl))
- ;; Send signal SIGUSR to Mosaic
- (message "Signaling Mosaic...")
- (signal-process pid 'SIGUSR1)
- ;; Or you could try:
- ;; (call-process "kill" nil 0 nil "-USR1" (int-to-string pid))
-- (message "Signaling Mosaic...done")
-- )
-+ (message "Signaling Mosaic...done"))
- ;; Mosaic not running - start it
- (message "Starting %s..." browse-url-mosaic-program)
- (apply 'start-process "xmosaic" nil browse-url-mosaic-program
diff --git a/emacs/24.3/08_all_tramp-sh-tmpfile.patch b/emacs/24.3/08_all_tramp-sh-tmpfile.patch
deleted file mode 100644
index 80cdb3f..0000000
--- a/emacs/24.3/08_all_tramp-sh-tmpfile.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Fix insecure use of temporary files.
-Patch from upstream bzr, backported to Emacs 24.3.
-https://bugs.gentoo.org/509830
-CVE-2014-3424
-
-revno: 117071
-committer: Michael Albinus <michael.albinus@gmx.de>
-branch nick: emacs-24
-timestamp: Tue 2014-05-06 11:51:05 +0200
-message:
- Fix Bug#17415.
-
- * net/tramp-sh.el (tramp-uudecode): Replace the hard-coded temporary
- file name by a format specifier.
- (tramp-remote-coding-commands): Enhance docstring.
- (tramp-find-inline-encoding): Replace "%t" by a temporary file name.
-
---- emacs-24.3-orig/lisp/net/tramp-sh.el
-+++ emacs-24.3/lisp/net/tramp-sh.el
-@@ -605,9 +605,9 @@
- See `tramp-actions-before-shell' for more info.")
-
- (defconst tramp-uudecode
-- "(echo begin 600 /tmp/tramp.$$; tail +2) | uudecode
--cat /tmp/tramp.$$
--rm -f /tmp/tramp.$$"
-+ "(echo begin 600 %t; tail -n +2) | uudecode
-+cat %t
-+rm -f %t"
- "Shell function to implement `uudecode' to standard output.
- Many systems support `uudecode -o /dev/stdout' or `uudecode -o -'
- for this or `uudecode -p', but some systems don't, and for them
-@@ -3938,7 +3938,7 @@
-
- \(FORMAT ENCODING DECODING [TEST]\)
-
--FORMAT is symbol describing the encoding/decoding format. It can be
-+FORMAT is a symbol describing the encoding/decoding format. It can be
- `b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
-
- ENCODING and DECODING can be strings, giving commands, or symbols,
-@@ -3948,9 +3948,11 @@
- specifier is not present, the input should be read from standard
- input.
-
--If they are variables, this variable is a string containing a Perl
--implementation for this functionality. This Perl program will be transferred
--to the remote host, and it is available as shell function with the same name.
-+If they are variables, this variable is a string containing a
-+Perl or Shell implementation for this functionality. This
-+program will be transferred to the remote host, and it is
-+available as shell function with the same name. A \"%t\" format
-+specifier in the variable value denotes a temporary file.
-
- The optional TEST command can be used for further tests, whether
- ENCODING and DECODING are applicable.")
-@@ -4025,10 +4027,25 @@
- (throw 'wont-work-remote nil))
-
- (when (not (stringp rem-dec))
-- (let ((name (symbol-name rem-dec)))
-+ (let ((name (symbol-name rem-dec))
-+ (value (symbol-value rem-dec))
-+ tmpfile)
- (while (string-match (regexp-quote "-") name)
- (setq name (replace-match "_" nil t name)))
-- (tramp-maybe-send-script vec (symbol-value rem-dec) name)
-+ (when (string-match "%t" value)
-+ (setq tmpfile
-+ (make-temp-name
-+ (expand-file-name
-+ tramp-temp-name-prefix
-+ (tramp-get-remote-tmpdir vec)))
-+ value
-+ (format-spec
-+ value
-+ (format-spec-make
-+ ?t
-+ (tramp-file-name-handler
-+ 'file-remote-p tmpfile 'localname)))))
-+ (tramp-maybe-send-script vec value name)
- (setq rem-dec name)))
- (tramp-message
- vec 5
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-17 2:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-13 9:36 [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.3/ Ulrich Mueller
-- strict thread matches above, loose matches on Subject: below --
2016-01-17 2:42 Ulrich Müller
2013-05-23 16:30 Ulrich Mueller
2013-03-11 19:26 Ulrich Mueller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox