Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
6a2eb9d1ac | ||
|
b377a88515 | ||
|
765b8fb58b | ||
|
e134d3f371 | ||
|
9c0e4f3f58 | ||
|
977cd89954 | ||
|
632bfbdc90 | ||
|
2c2fff5d15 | ||
|
7347071b28 | ||
|
2cd3605c03 | ||
|
910e11febf | ||
|
94d9843509 |
25
emacs-24.3-macro.patch
Normal file
25
emacs-24.3-macro.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From e2261aa685bf67a1596546e7aa05d922d049cb0d Mon Sep 17 00:00:00 2001
|
||||
From: Jan Chaloupka <jchaloup@redhat.com>
|
||||
Date: Tue, 29 Jul 2014 12:30:07 +0200
|
||||
Subject: [PATCH] kbd_macro_ptr and kbd_macro_end of current_kboard initialized to kbd_macro_buffer
|
||||
|
||||
---
|
||||
src/macros.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/macros.c b/src/macros.c
|
||||
index 1eef9b6..e707784 100644
|
||||
--- a/src/macros.c
|
||||
+++ b/src/macros.c
|
||||
@@ -65,6 +65,8 @@ macro before appending to it. */)
|
||||
{
|
||||
current_kboard->kbd_macro_buffer = xmalloc (30 * word_size);
|
||||
current_kboard->kbd_macro_bufsize = 30;
|
||||
+ current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
|
||||
+ current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
|
||||
}
|
||||
update_mode_lines++;
|
||||
if (NILP (append))
|
||||
--
|
||||
1.9.3
|
||||
|
30
emacs-CVE-2014-3421.patch
Normal file
30
emacs-CVE-2014-3421.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
|
||||
index 1c9b4ce..6d43d23 100644
|
||||
--- a/lisp/gnus/gnus-fun.el
|
||||
+++ b/lisp/gnus/gnus-fun.el
|
||||
@@ -250,20 +250,21 @@ colors of the displayed X-Faces."
|
||||
(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)
|
||||
result))
|
||||
|
||||
(defun gnus-fun-ppm-change-string ()
|
119
emacs-CVE-2014-3422.patch
Normal file
119
emacs-CVE-2014-3422.patch
Normal file
@ -0,0 +1,119 @@
|
||||
diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el
|
||||
index 82b3e94..6bdb09d 100644
|
||||
--- a/lisp/emacs-lisp/find-gc.el
|
||||
+++ b/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 @@ Each entry has the form (FUNCTION . FUNCTIONS-IT-CALLS).")
|
||||
"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" "x11fns.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 @@ Also store it in `find-gc-unsafe'."
|
||||
|
||||
|
||||
|
||||
-(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_]+\\)\"")
|
||||
- (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)))))
|
||||
-)
|
||||
-
|
||||
+ (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
|
||||
+ (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)))
|
16
emacs-CVE-2014-3423.patch
Normal file
16
emacs-CVE-2014-3423.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
|
||||
index 19e513a..1a28e26 100644
|
||||
--- a/lisp/net/browse-url.el
|
||||
+++ b/lisp/net/browse-url.el
|
||||
@@ -1335,7 +1335,10 @@ used instead of `browse-url-new-window-flag'."
|
||||
(kill-buffer nil)))
|
||||
(if (and pid (zerop (signal-process pid 0))) ; Mosaic running
|
||||
(save-excursion
|
||||
- (find-file (format "/tmp/Mosaic.%d" pid))
|
||||
+ ;; This is a predictable temp-file name, which is bad,
|
||||
+ ;; but it is what Mosaic uses/used.
|
||||
+ ;; So it's not Emacs's problem. http://bugs.debian.org/747100
|
||||
+ (find-file (format "/tmp/Mosaic.%d" pid))
|
||||
(erase-buffer)
|
||||
(insert (if (browse-url-maybe-new-window new-window)
|
||||
"newwin\n"
|
70
emacs-CVE-2014-3424.patch
Normal file
70
emacs-CVE-2014-3424.patch
Normal file
@ -0,0 +1,70 @@
|
||||
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
|
||||
index 29a6344..f6c6710 100644
|
||||
--- a/lisp/net/tramp-sh.el
|
||||
+++ b/lisp/net/tramp-sh.el
|
||||
@@ -605,9 +605,9 @@ This list is used for copying/renaming with out-of-band methods.
|
||||
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 +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 @@ Each item is a list that looks like this:
|
||||
|
||||
\(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 @@ filename will be put into the command line at that spot. If the
|
||||
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 @@ Goes through the list `tramp-local-coding-commands' and
|
||||
(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)
|
||||
+ (setq name (replace-match "_" nil t 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
|
14
emacs-CVE-2014-9483.patch
Normal file
14
emacs-CVE-2014-9483.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/lisp/simple.el b/lisp/simple.el
|
||||
index 57307ba..10d7797 100644
|
||||
--- a/lisp/simple.el
|
||||
+++ b/lisp/simple.el
|
||||
@@ -3987,7 +3987,8 @@ run `deactivate-mark-hook'."
|
||||
;; the region prior to the last command modifying the buffer.
|
||||
;; Set the selection to that, or to the current region.
|
||||
(cond (saved-region-selection
|
||||
- (x-set-selection 'PRIMARY saved-region-selection)
|
||||
+ (if (x-selection-owner-p 'PRIMARY)
|
||||
+ (x-set-selection 'PRIMARY saved-region-selection))
|
||||
(setq saved-region-selection nil))
|
||||
;; If another program has acquired the selection, region
|
||||
;; deactivation should not clobber it (Bug#11772).
|
17
emacs-compiled-timestamps.patch
Normal file
17
emacs-compiled-timestamps.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
|
||||
index ce3a332..749ec66 100644
|
||||
--- a/lisp/emacs-lisp/bytecomp.el
|
||||
+++ b/lisp/emacs-lisp/bytecomp.el
|
||||
@@ -1981,11 +1981,7 @@ Call from the source buffer."
|
||||
;; >4 byte x version %d
|
||||
(insert
|
||||
";ELC" 23 "\000\000\000\n"
|
||||
- ";;; Compiled by "
|
||||
- (or (and (boundp 'user-mail-address) user-mail-address)
|
||||
- (concat (user-login-name) "@" (system-name)))
|
||||
- " on " (current-time-string) "\n"
|
||||
- ";;; from file " filename "\n"
|
||||
+ ";;; Compiled\n"
|
||||
";;; in Emacs version " emacs-version "\n"
|
||||
";;; with"
|
||||
(cond
|
287
emacs-umlaut-tex-mode.patch
Normal file
287
emacs-umlaut-tex-mode.patch
Normal file
@ -0,0 +1,287 @@
|
||||
diff --git a/leim/quail/latin-ltx.el b/leim/quail/latin-ltx.el
|
||||
index 024bb62..1e2466a 100644
|
||||
--- a/leim/quail/latin-ltx.el
|
||||
+++ b/leim/quail/latin-ltx.el
|
||||
@@ -43,6 +43,26 @@ system, including many technical ones. Examples:
|
||||
t t nil nil nil nil nil nil nil t)
|
||||
|
||||
(eval-when-compile
|
||||
+ (require 'cl-lib)
|
||||
+
|
||||
+ (defconst latin-ltx--mark-map
|
||||
+ '(("DOT BELOW" . "d")
|
||||
+ ("DOT ABOVE" . ".")
|
||||
+ ("OGONEK" . "k")
|
||||
+ ("CEDILLA" . "c")
|
||||
+ ("CARON" . "v")
|
||||
+ ;; ("HOOK ABOVE" . ??)
|
||||
+ ("MACRON" . "=")
|
||||
+ ("BREVE" . "u")
|
||||
+ ("TILDE" . "~")
|
||||
+ ("GRAVE" . "`")
|
||||
+ ("CIRCUMFLEX" . "^")
|
||||
+ ("DIAERESIS" . "\"")
|
||||
+ ("DOUBLE ACUTE" . "H")
|
||||
+ ("ACUTE" . "'")))
|
||||
+
|
||||
+ (defconst latin-ltx--mark-re (regexp-opt (mapcar #'car latin-ltx--mark-map)))
|
||||
+
|
||||
(defun latin-ltx--ascii-p (char)
|
||||
(and (characterp char) (< char 128)))
|
||||
|
||||
@@ -53,7 +73,8 @@ system, including many technical ones. Examples:
|
||||
(pcase rule
|
||||
(`(,_ ,(pred characterp)) (push rule newrules)) ;; Normal quail rule.
|
||||
(`(,seq ,re)
|
||||
- (let ((count 0))
|
||||
+ (let ((count 0)
|
||||
+ (re (eval re t)))
|
||||
(dolist (pair (ucs-names))
|
||||
(let ((name (car pair))
|
||||
(char (cdr pair)))
|
||||
@@ -68,9 +89,27 @@ system, including many technical ones. Examples:
|
||||
(push (list x char) newrules))
|
||||
(setq count (1+ count))
|
||||
(push (list keys char) newrules))))))
|
||||
- ;(message "latin-ltx: %d mapping for %S" count re)
|
||||
+ ;; (message "latin-ltx: %d mapping for %S" count re)
|
||||
))))
|
||||
- `(quail-define-rules ,@(nreverse (delete-dups newrules))))))
|
||||
+ (setq newrules (delete-dups newrules))
|
||||
+ (let ((rules (copy-sequence newrules)))
|
||||
+ (while rules
|
||||
+ (let ((rule (pop rules)))
|
||||
+ (when (assoc (car rule) rules)
|
||||
+ (let ((conflicts (list (cadr rule)))
|
||||
+ (tail rules)
|
||||
+ c)
|
||||
+ (while (setq c (assoc (car rule) tail))
|
||||
+ (push (cadr c) conflicts)
|
||||
+ (setq tail (cdr (memq c tail)))
|
||||
+ (setq rules (delq c rules)))
|
||||
+ (message "Conflict for %S: %S"
|
||||
+ (car rule) (apply #'string conflicts)))))))
|
||||
+ (let ((inputs (mapcar #'car newrules)))
|
||||
+ (setq inputs (delete-dups inputs))
|
||||
+ (message "latin-ltx: %d rules (+ %d conflicts)!"
|
||||
+ (length inputs) (- (length newrules) (length inputs))))
|
||||
+ `(quail-define-rules ,@(nreverse newrules)))))
|
||||
|
||||
(latin-ltx--define-rules
|
||||
("!`" ?¡)
|
||||
@@ -89,69 +128,35 @@ system, including many technical ones. Examples:
|
||||
("$^o$" ?º)
|
||||
("?`" ?¿)
|
||||
|
||||
- ("\\`" ?̀)
|
||||
- ("\\`{}" ?`)
|
||||
- ((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\`{%s}" c) (format "\\`%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH GRAVE")
|
||||
-
|
||||
- ("\\'" ?́)
|
||||
- ("\\'{}" ?´)
|
||||
- ((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\'{%s}" c) (format "\\'%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH ACUTE")
|
||||
-
|
||||
- ("\\^" ?̂)
|
||||
- ("\\^{}" ?^)
|
||||
((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\^{%s}" c) (format "\\^%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH CIRCUMFLEX")
|
||||
-
|
||||
- ("\\~" ?̃)
|
||||
- ("\\~{}" ?˜)
|
||||
- ((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\~{%s}" c) (format "\\~%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH TILDE")
|
||||
-
|
||||
- ("\\\"" ?̈)
|
||||
- ("\\\"{}" ?¨)
|
||||
- ((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\\"{%s}" c) (format "\\\"%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DIAERESIS")
|
||||
-
|
||||
- ("\\k" ?̨)
|
||||
- ("\\k{}" ?˛)
|
||||
+ (let* ((c (if (match-end 1)
|
||||
+ (downcase (match-string 2 name))
|
||||
+ (match-string 2 name)))
|
||||
+ (mark1 (cdr (assoc (match-string 3 name) latin-ltx--mark-map)))
|
||||
+ (mark2 (if (match-end 4)
|
||||
+ (cdr (assoc (match-string 4 name) latin-ltx--mark-map))))
|
||||
+ (marks (if mark2 (concat mark1 "\\" mark2) mark1)))
|
||||
+ (cl-assert mark1)
|
||||
+ (cons (format "\\%s{%s}" marks c)
|
||||
+ ;; Exclude "d" because we use "\\dh" for something else.
|
||||
+ (unless (member (or mark2 mark1) '("d"));; "k"
|
||||
+ (list (format "\\%s%s" marks c))))))
|
||||
+ (concat "\\`LATIN \\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH \\("
|
||||
+ latin-ltx--mark-re "\\)\\(?: AND \\("
|
||||
+ latin-ltx--mark-re "\\)\\)?\\'"))
|
||||
+
|
||||
((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\k{%s}" c) ;; (format "\\k%s" c)
|
||||
- )))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH OGONEK")
|
||||
-
|
||||
- ("\\c" ?̧)
|
||||
- ("\\c{}" ?¸)
|
||||
+ (let* ((mark (cdr (assoc (match-string 1 name) latin-ltx--mark-map))))
|
||||
+ (cl-assert mark)
|
||||
+ (list (format "\\%s" mark))))
|
||||
+ (concat "\\`COMBINING \\(" latin-ltx--mark-re "\\)\\(?: ACCENT\\)?\\'"))
|
||||
+
|
||||
((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\c{%s}" c) (format "\\c%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH CEDILLA")
|
||||
+ (unless (latin-ltx--ascii-p char)
|
||||
+ (let* ((mark (cdr (assoc (match-string 1 name) latin-ltx--mark-map))))
|
||||
+ (cl-assert mark)
|
||||
+ (list (format "\\%s{}" mark)))))
|
||||
+ (concat "\\`\\(?:SPACING \\)?\\(" latin-ltx--mark-re "\\)\\(?: ACCENT\\)?\\'"))
|
||||
|
||||
("\\AA" ?Å) ;; ("{\\AA}" ?Å)
|
||||
("\\AE" ?Æ) ;; ("{\\AE}" ?Æ)
|
||||
@@ -166,42 +171,6 @@ system, including many technical ones. Examples:
|
||||
("$\\div$" ?÷) ("\\div" ?÷)
|
||||
("\\o" ?ø) ;; ("{\\o}" ?ø)
|
||||
|
||||
- ("\\=" ?̄)
|
||||
- ("\\={}" ?¯)
|
||||
- ((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\={%s}" c) (format "\\=%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH MACRON")
|
||||
-
|
||||
- ("\\u" ?̆)
|
||||
- ("\\u{}" ?˘)
|
||||
- ((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\u{%s}" c) (format "\\u%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH BREVE")
|
||||
-
|
||||
- ("\\." ?̇)
|
||||
- ("\\.{}" ?˙)
|
||||
- ((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\.{%s}" c) (format "\\.%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DOT ABOVE")
|
||||
-
|
||||
- ("\\v" ?̌)
|
||||
- ("\\v{}" ?ˇ)
|
||||
- ((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\v{%s}" c) (format "\\v%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH CARON")
|
||||
-
|
||||
("\\~{\\i}" ?ĩ)
|
||||
("\\={\\i}" ?ī)
|
||||
("\\u{\\i}" ?ĭ)
|
||||
@@ -214,12 +183,6 @@ system, including many technical ones. Examples:
|
||||
|
||||
("\\H" ?̋)
|
||||
("\\H{}" ?˝)
|
||||
- ((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\H{%s}" c) (format "\\H%s" c))))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DOUBLE ACUTE")
|
||||
("\\U{o}" ?ő) ("\\Uo" ?ő) ;; FIXME: Was it just a typo?
|
||||
|
||||
("\\OE" ?Œ) ;; ("{\\OE}" ?Œ)
|
||||
@@ -248,16 +211,12 @@ system, including many technical ones. Examples:
|
||||
(string (if (match-end 2) ?^ ?_) basechar))))
|
||||
"\\(.*\\)SU\\(?:B\\|\\(PER\\)\\)SCRIPT \\(.*\\)")
|
||||
|
||||
- ("^\\gamma" ?ˠ)
|
||||
+ ((lambda (name _char)
|
||||
+ (let* ((basename (match-string 2 name))
|
||||
+ (name (if (match-end 1) (capitalize basename) (downcase basename))))
|
||||
+ (concat "^" (if (> (length name) 1) "\\") name)))
|
||||
+ "\\`MODIFIER LETTER \\(?:SMALL\\|CAPITA\\(L\\)\\) \\([[:ascii:]]+\\)\\'")
|
||||
|
||||
- ((lambda (name char)
|
||||
- (let* ((base (format "LATIN %s LETTER %s"
|
||||
- (match-string 1 name) (match-string 2 name)))
|
||||
- (basechar (cdr (assoc base (ucs-names)))))
|
||||
- (when (latin-ltx--ascii-p basechar)
|
||||
- (string ?^ basechar))))
|
||||
- "MODIFIER LETTER \\(SMALL\\|CAPITAL\\) \\(.*\\)")
|
||||
-
|
||||
;; ((lambda (name char) (format "^%s" (downcase (match-string 1 name))))
|
||||
;; "\\`MODIFIER LETTER SMALL \\(.\\)\\'")
|
||||
;; ("^\\1" "\\`MODIFIER LETTER CAPITAL \\(.\\)\\'")
|
||||
@@ -268,22 +227,14 @@ system, including many technical ones. Examples:
|
||||
|
||||
("\\b" ?̱)
|
||||
|
||||
- ("\\d" ?̣)
|
||||
- ;; ("\\d{}" ?) ;; FIXME: can't find the DOT BELOW character.
|
||||
- ((lambda (name char)
|
||||
- (let ((c (if (match-end 1)
|
||||
- (downcase (match-string 2 name))
|
||||
- (match-string 2 name))))
|
||||
- (list (format "\\d{%s}" c) ;; (format "\\d%s" c)
|
||||
- )))
|
||||
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DOT BELOW")
|
||||
-
|
||||
("\\rq" ?’)
|
||||
|
||||
;; FIXME: Provides some useful entries (yen, euro, copyright, registered,
|
||||
;; currency, minus, micro), but also a lot of dubious ones.
|
||||
((lambda (name char)
|
||||
- (unless (latin-ltx--ascii-p char)
|
||||
+ (unless (or (latin-ltx--ascii-p char)
|
||||
+ ;; We prefer COMBINING LONG SOLIDUS OVERLAY for \not.
|
||||
+ (member name '("NOT SIGN")))
|
||||
(concat "\\" (downcase (match-string 1 name)))))
|
||||
"\\`\\([^- ]+\\) SIGN\\'")
|
||||
|
||||
@@ -373,7 +324,6 @@ system, including many technical ones. Examples:
|
||||
("\\circledcirc" ?⊚)
|
||||
("\\circleddash" ?⊝)
|
||||
("\\clubsuit" ?♣)
|
||||
- ("\\colon" ?:) ;FIXME: Conflict with "COLON SIGN" ₡.
|
||||
("\\coloneq" ?≔)
|
||||
("\\complement" ?∁)
|
||||
("\\cong" ?≅)
|
||||
@@ -396,7 +346,6 @@ system, including many technical ones. Examples:
|
||||
("\\ddots" ?⋱)
|
||||
("\\diamond" ?⋄)
|
||||
("\\diamondsuit" ?♢)
|
||||
- ("\\digamma" ?Ϝ)
|
||||
("\\divideontimes" ?⋇)
|
||||
("\\doteq" ?≐)
|
||||
("\\doteqdot" ?≑)
|
11
emacs.service
Normal file
11
emacs.service
Normal file
@ -0,0 +1,11 @@
|
||||
[Unit]
|
||||
Description=Emacs: the extensible, self-documenting text editor
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=/usr/bin/emacs --daemon
|
||||
ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)"
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
82
emacs.spec
82
emacs.spec
@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
|
||||
Name: emacs
|
||||
Epoch: 1
|
||||
Version: 24.3
|
||||
Release: 15%{?dist}
|
||||
Release: 27%{?dist}
|
||||
License: GPLv3+
|
||||
URL: http://www.gnu.org/software/emacs/
|
||||
Group: Applications/Editors
|
||||
@ -16,6 +16,7 @@ Source5: default.el
|
||||
# Emacs Terminal Mode, #551949, #617355
|
||||
Source6: emacs-terminal.desktop
|
||||
Source7: emacs-terminal.sh
|
||||
Source8: emacs.service
|
||||
# rhbz#713600
|
||||
Patch7: emacs-spellchecker.patch
|
||||
|
||||
@ -32,9 +33,19 @@ Patch14: emacs-maximized.patch
|
||||
# Fix for default PDF viewer bug #971162
|
||||
Patch15: emacs-pdf-default.patch
|
||||
# Fix for emacs bug #13460.
|
||||
Patch100: emacs-24.3-hunspell.patch
|
||||
Patch16: emacs-24.3-hunspell.patch
|
||||
# Fix for emacs bug #827033
|
||||
Patch101: emacs-24.3-hunspell.2.patch
|
||||
Patch17: emacs-24.3-hunspell.2.patch
|
||||
# Several CVE fixes
|
||||
Patch18: emacs-CVE-2014-3421.patch
|
||||
Patch19: emacs-CVE-2014-3422.patch
|
||||
Patch20: emacs-CVE-2014-3423.patch
|
||||
Patch21: emacs-CVE-2014-3424.patch
|
||||
Patch22: emacs-compiled-timestamps.patch
|
||||
# BZ1104012, initialize kbd_macro_ptr and kbd_macro_end
|
||||
Patch23: emacs-24.3-macro.patch
|
||||
Patch24: emacs-umlaut-tex-mode.patch
|
||||
Patch25: emacs-CVE-2014-9483.patch
|
||||
|
||||
BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel
|
||||
BuildRequires: libjpeg-devel libtiff-devel libX11-devel libXau-devel libXdmcp-devel libXrender-devel libXt-devel
|
||||
@ -42,6 +53,7 @@ BuildRequires: libXpm-devel ncurses-devel xorg-x11-proto-devel zlib-devel gnutls
|
||||
BuildRequires: librsvg2-devel m17n-lib-devel libotf-devel ImageMagick-devel libselinux-devel
|
||||
BuildRequires: GConf2-devel alsa-lib-devel gpm-devel liblockfile-devel libxml2-devel
|
||||
BuildRequires: bzip2 cairo texinfo gzip desktop-file-utils
|
||||
BuildRequires: systemd
|
||||
|
||||
%if 0%{?rhel} == 6
|
||||
BuildRequires: gtk2-devel
|
||||
@ -177,9 +189,16 @@ packages that add functionality to Emacs.
|
||||
%patch13 -p1 -b .help-update.patch
|
||||
%patch14 -p1 -b .maximized.patch
|
||||
%patch15 -p1 -b .pdf-default.patch
|
||||
|
||||
%patch100 -p1 -b .hunspell
|
||||
%patch101 -p1 -b .hunspell.2
|
||||
%patch16 -p1 -b .hunspell
|
||||
%patch17 -p1 -b .hunspell.2
|
||||
%patch18 -p1 -b .CVE-2014-3421.patch
|
||||
%patch19 -p1 -b .CVE-2014-3422.patch
|
||||
%patch20 -p1 -b .CVE-2014-3423.patch
|
||||
%patch21 -p1 -b .CVE-2014-3424.patch
|
||||
%patch22 -p1 -b .compiled-timestamps
|
||||
%patch23 -p1
|
||||
%patch24 -p1 -b .umlaut-tex-mode
|
||||
%patch25 -p1 -b .CVE-2014-9483
|
||||
|
||||
# We prefer our emacs.desktop file
|
||||
cp %SOURCE1 etc/emacs.desktop
|
||||
@ -330,6 +349,10 @@ install -p -m 755 %SOURCE7 %{buildroot}%{_bindir}/emacs-terminal
|
||||
rm -f %{buildroot}%{_infodir}/dir
|
||||
rm %{buildroot}%{_localstatedir}/games/emacs/*
|
||||
|
||||
# Installing service file
|
||||
mkdir -p %{buildroot}%{_userunitdir}
|
||||
install -p -m 0644 %SOURCE8 %{buildroot}%{_userunitdir}/emacs.service
|
||||
|
||||
# Install desktop files
|
||||
mkdir -p %{buildroot}%{_datadir}/applications
|
||||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
|
||||
@ -387,20 +410,22 @@ fi
|
||||
|
||||
%preun nox
|
||||
%{_sbindir}/alternatives --remove emacs %{_bindir}/emacs-%{version}-nox
|
||||
%{_sbindir}/alternatives --remove emacs-nox %{_bindir}/emacs-%{version}-nox
|
||||
|
||||
%posttrans nox
|
||||
%{_sbindir}/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70
|
||||
%{_sbindir}/alternatives --install %{_bindir}/emacs-nox emacs-nox %{_bindir}/emacs-%{version}-nox 60
|
||||
|
||||
%post common
|
||||
for f in %{info_files}; do
|
||||
/sbin/install-info %{_infodir}/$f %{_infodir}/dir 2> /dev/null || :
|
||||
/sbin/install-info %{_infodir}/$f.info.gz %{_infodir}/dir 2> /dev/null || :
|
||||
done
|
||||
|
||||
%preun common
|
||||
%{_sbindir}/alternatives --remove emacs.etags %{_bindir}/etags.emacs
|
||||
if [ "$1" = 0 ]; then
|
||||
for f in %{info_files}; do
|
||||
/sbin/install-info --delete %{_infodir}/$f %{_infodir}/dir 2> /dev/null || :
|
||||
/sbin/install-info --delete %{_infodir}/$f.info.gz %{_infodir}/dir 2> /dev/null || :
|
||||
done
|
||||
fi
|
||||
|
||||
@ -427,6 +452,7 @@ update-desktop-database &> /dev/null || :
|
||||
%files nox
|
||||
%{_bindir}/emacs-%{version}-nox
|
||||
%attr(0755,-,-) %ghost %{_bindir}/emacs
|
||||
%attr(0755,-,-) %ghost %{_bindir}/emacs-nox
|
||||
|
||||
%files -f common-filelist common
|
||||
%config(noreplace) %{_sysconfdir}/skel/.emacs
|
||||
@ -444,6 +470,7 @@ update-desktop-database &> /dev/null || :
|
||||
%{_datadir}/emacs/%{version}/etc
|
||||
%{_datadir}/emacs/%{version}/site-lisp
|
||||
%{_libexecdir}/emacs
|
||||
%{_userunitdir}/emacs.service
|
||||
%attr(0644,root,root) %config(noreplace) %{_datadir}/emacs/site-lisp/default.el
|
||||
%attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el
|
||||
|
||||
@ -462,6 +489,45 @@ update-desktop-database &> /dev/null || :
|
||||
%dir %{_datadir}/emacs/site-lisp/site-start.d
|
||||
|
||||
%changelog
|
||||
* Tue May 26 2015 Petr Hracek <phracek@redhat.com> - 1:24.3-27
|
||||
- Fixes CVE-2014-9483 (#1181599)
|
||||
|
||||
* Wed Apr 8 2015 Petr Hracek <phracek@redhat.com> - 1:24.3-26
|
||||
- Cannot enter umlaut in TeX input mode (#1145526)
|
||||
|
||||
* Tue Sep 30 2014 jchaloup <jchaloup@redhat.com> - 1:24.3-25
|
||||
- resolves: #1147912
|
||||
Service dont start. Must be replace: "Type=Forking" > "Type=forking".
|
||||
|
||||
* Mon Aug 18 2014 jchaloup <jchaloup@redhat.com> - 1:24.3-24
|
||||
- resolves: #1130587
|
||||
unremove emacs from emacs-nox package, emacs and emacs-nox co-exist
|
||||
|
||||
* Mon Aug 11 2014 Petr Hracek <phracek@redhat.com> - 1:24.3-23
|
||||
- emacs.service file for systemd (#1128723)
|
||||
|
||||
* Tue Aug 05 2014 jchaloup <jchaloup@redhat.com> - 1:24.3-22
|
||||
- resolves: #1104012
|
||||
initialize kbd_macro_ptr and kbd_macro_end to kdb_macro_buffer
|
||||
|
||||
* Mon Aug 04 2014 Petr Hracek <phracek@redhat.com> - 1:24.3-21
|
||||
- remove /usr/bin/emacs-nox from install section
|
||||
|
||||
* Mon Aug 04 2014 Petr Hracek <phracek@redhat.com> - 1:24.3-20
|
||||
- /usr/bin/emacs-nox link marked as %ghost file (#1123573)
|
||||
|
||||
* Fri Aug 01 2014 Petr Hracek <phracek@redhat.com> - 1:24.3-19
|
||||
- Provide /usr/bin/emacs-nox (#1123573)
|
||||
|
||||
* Tue Jul 29 2014 Petr Hracek <phracek@redhat.com> - 1:24.3-18
|
||||
- Add patch to remove timstamp from .elc files (#1122157)
|
||||
|
||||
* Tue May 20 2014 Petr Hracek <phracek@redhat.com> - 1:24.3-17
|
||||
- CVE-2014-3421 CVE-2014-3422 CVE-2014-3423 CVE-2014-3424 (#1095587)
|
||||
|
||||
* Thu Apr 17 2014 Petr Hracek <phracek@redhat.com> - 1:24.3-16
|
||||
- Info files are not installed (#1062792)
|
||||
|
||||
* Tue Apr 01 2014 Richard W.M. Jones <rjones@redhat.com> - 1:24.3-15
|
||||
- Rebuild because of unannounced ImageMagick soname bump in Rawhide.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user