diff --git a/emacs-compiled-timestamps.patch b/emacs-compiled-timestamps.patch new file mode 100644 index 0000000..78ab491 --- /dev/null +++ b/emacs-compiled-timestamps.patch @@ -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 diff --git a/emacs.spec b/emacs.spec index 405f3a9..e8e1e85 100644 --- a/emacs.spec +++ b/emacs.spec @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 24.3 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -40,6 +40,7 @@ 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 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 @@ -188,6 +189,7 @@ packages that add functionality to Emacs. %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 # We prefer our emacs.desktop file cp %SOURCE1 etc/emacs.desktop @@ -470,6 +472,9 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Tue Jul 29 2014 Petr Hracek - 1:24.3-18 +- Add patch to remove timstamp from .elc files (#1122157) + * Tue May 20 2014 Petr Hracek - 1:24.3-17 - CVE-2014-3421 CVE-2014-3422 CVE-2014-3423 CVE-2014-3424 (#1095587)