rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

PIE and Groups

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=250
This commit is contained in:
Dr. Werner Fink
2018-06-08 10:53:09 +00:00
committed by Git OBS Bridge
parent 311ae04cc1
commit a612e36798
4 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
emacs-26.1.dif
View File

@@ -3,7 +3,7 @@
configure | 6 --
configure.ac | 6 --
doc/man/etags.1 | 20 ++++----
lib-src/Makefile.in | 4 -
lib-src/Makefile.in | 6 +-
lib-src/pop.c | 1
lisp/cmuscheme.el | 3 -
lisp/international/mule-cmds.el | 1
@@ -16,10 +16,10 @@
site-lisp/term/kvt.el | 97 ++++++++++++++++++++++++++++++++++++++++
site-lisp/term/linux.el | 79 ++++++++++++++++++++++++++++++++
site-lisp/term/locale.el | 13 +++++
17 files changed, 445 insertions(+), 32 deletions(-)
17 files changed, 447 insertions(+), 32 deletions(-)
--- Makefile.in
+++ Makefile.in 2018-05-29 13:03:41.352569948 +0000
+++ Makefile.in 2018-05-29 13:07:53.479965338 +0000
@@ -487,8 +487,8 @@ install-arch-dep: src install-arch-indep
umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
$(MAKE) -C lib-src install
@@ -49,7 +49,7 @@
rm -f hicolor/*x*/apps/"${EMACS_NAME}.png" \
"hicolor/scalable/apps/${EMACS_NAME}.svg" \
--- configure
+++ configure 2018-05-29 12:55:01.286030771 +0000
+++ configure 2018-05-29 13:07:58.359876230 +0000
@@ -10428,10 +10428,8 @@ fi
LD_SWITCH_X_SITE_RPATH=
if test "${x_libraries}" != NONE; then
@@ -64,7 +64,7 @@
x_default_search_path=""
x_search_path=${x_libraries}
--- configure.ac
+++ configure.ac 2018-05-29 12:55:01.290030699 +0000
+++ configure.ac 2018-05-29 13:07:53.515964680 +0000
@@ -1806,10 +1806,8 @@ fi
LD_SWITCH_X_SITE_RPATH=
if test "${x_libraries}" != NONE; then
@@ -79,7 +79,7 @@
x_default_search_path=""
x_search_path=${x_libraries}
--- doc/man/etags.1
+++ doc/man/etags.1 2018-05-29 12:55:01.290030699 +0000
+++ doc/man/etags.1 2018-05-29 13:07:53.515964680 +0000
@@ -7,7 +7,7 @@
..
@@ -163,8 +163,17 @@
.B \-h, \-H, \-\-help
Print usage information. Followed by one or more \-\-language=LANG
--- lib-src/Makefile.in
+++ lib-src/Makefile.in 2018-05-29 12:55:01.290030699 +0000
@@ -158,7 +158,7 @@ MKDIR_P = @MKDIR_P@
+++ lib-src/Makefile.in 2018-06-08 10:22:59.756084963 +0000
@@ -30,6 +30,8 @@ CC=@CC@
CFLAGS=@CFLAGS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
+override CFLAGS := $(CFLAGS:-fno-PIE=-g) -fPIE
+override LDFLAGS += -pie
version=@version@
## Used in $archlibdir.
@@ -158,7 +160,7 @@ MKDIR_P = @MKDIR_P@
CLIENTW = @CLIENTW@
# Things that a user might actually run, which should be installed in bindir.
@@ -173,7 +182,7 @@
ebrowse${EXEEXT}
# Things that Emacs runs internally, or during the build process,
@@ -376,7 +376,7 @@ etags${EXEEXT}: ${etags_deps}
@@ -376,7 +378,7 @@ etags${EXEEXT}: ${etags_deps}
## etags.o files on top of each other.
## FIXME?
## Can't we use a wrapper that calls 'etags --ctags'?
@@ -183,7 +192,7 @@
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
--- lib-src/pop.c
+++ lib-src/pop.c 2018-05-29 12:58:47.821912854 +0000
+++ lib-src/pop.c 2018-05-29 13:07:56.015919030 +0000
@@ -26,6 +26,7 @@ along with GNU Emacs. If not, see <http
#ifdef MAIL_USE_POP
@@ -193,7 +202,7 @@
#include "ntlib.h"
#undef _WIN32_WINNT
--- lisp/cmuscheme.el
+++ lisp/cmuscheme.el 2018-05-29 12:55:02.466009322 +0000
+++ lisp/cmuscheme.el 2018-05-29 13:07:56.015919030 +0000
@@ -241,7 +241,8 @@ is run).
(read-string "Run Scheme: " scheme-program-name)
scheme-program-name)))
@@ -205,7 +214,7 @@
(scheme-start-file (car cmdlist)) (cdr cmdlist)))
(inferior-scheme-mode)))
--- lisp/international/mule-cmds.el
+++ lisp/international/mule-cmds.el 2018-05-29 12:55:02.470009250 +0000
+++ lisp/international/mule-cmds.el 2018-05-29 13:07:56.015919030 +0000
@@ -39,6 +39,7 @@
(defvar mule-keymap
@@ -215,7 +224,7 @@
(define-key map "r" 'revert-buffer-with-coding-system)
(define-key map "F" 'set-file-name-coding-system)
--- lisp/net/ange-ftp.el
+++ lisp/net/ange-ftp.el 2018-05-29 12:55:02.470009250 +0000
+++ lisp/net/ange-ftp.el 2018-05-29 13:07:56.015919030 +0000
@@ -4971,7 +4971,7 @@ NEWNAME should be the name to give the n
; "If a host matches this regexp then it is assumed to be running VOS.")
;
@@ -253,7 +262,7 @@
(defun ange-ftp-add-cms-host (host)
--- lisp/site-load.el
+++ lisp/site-load.el 2018-05-29 12:55:02.470009250 +0000
+++ lisp/site-load.el 2018-05-29 13:07:56.015919030 +0000
@@ -0,0 +1,41 @@
+;;;;
+;;; emacs20.xx/lisp/site-load.el
@@ -297,7 +306,7 @@
+
+;;; site-load.el ends here
--- lisp/speedbar.el
+++ lisp/speedbar.el 2018-05-29 12:55:02.470009250 +0000
+++ lisp/speedbar.el 2018-05-29 13:07:56.015919030 +0000
@@ -794,6 +794,7 @@ If you want to change this while speedba
;; Navigation.
@@ -307,7 +316,7 @@
(define-key map "\M-n" 'speedbar-restricted-next)
(define-key map "\M-p" 'speedbar-restricted-prev)
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el 2018-05-29 13:01:53.978529106 +0000
+++ lisp/textmodes/ispell.el 2018-05-29 13:07:56.015919030 +0000
@@ -200,10 +200,12 @@ Must be greater than 1."
;; cause an error; and one of the other spelling engines below is
;; almost certainly installed in any case, for enchant to use.
@@ -383,7 +392,7 @@
`(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary
:help ,(purecopy "Supply explicit dictionary file name")))
--- site-lisp/term/func-keys.el
+++ site-lisp/term/func-keys.el 2018-05-29 12:55:02.474009176 +0000
+++ site-lisp/term/func-keys.el 2018-05-29 13:07:56.015919030 +0000
@@ -0,0 +1,33 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/func-keys.el for site-lisp path
@@ -419,7 +428,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von func-keys.el
--- site-lisp/term/gnome.el
+++ site-lisp/term/gnome.el 2018-05-29 12:55:02.474009176 +0000
+++ site-lisp/term/gnome.el 2018-05-29 13:07:56.015919030 +0000
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/gnomw.el for site-lisp path
@@ -519,7 +528,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von gnomw.el
--- site-lisp/term/kvt.el
+++ site-lisp/term/kvt.el 2018-05-29 12:55:02.474009176 +0000
+++ site-lisp/term/kvt.el 2018-05-29 13:07:56.019918957 +0000
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/kvt.el for site-lisp path
@@ -619,7 +628,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von kvt.el
--- site-lisp/term/linux.el
+++ site-lisp/term/linux.el 2018-05-29 12:55:02.474009176 +0000
+++ site-lisp/term/linux.el 2018-05-29 13:07:56.019918957 +0000
@@ -0,0 +1,79 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/linux.el for site-lisp path
@@ -701,7 +710,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von linux.el
--- site-lisp/term/locale.el
+++ site-lisp/term/locale.el 2018-05-29 12:55:02.474009176 +0000
+++ site-lisp/term/locale.el 2018-05-29 13:07:56.019918957 +0000
@@ -0,0 +1,13 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/locale.el for site-lisp path

3
emacs-rpmlintrc
View File

@@ -6,3 +6,6 @@ addFilter(".*non-etc-or-var-file-marked-as-conffile.*/usr/share/emacs/site-lisp/
addFilter(".*no-manual-page-for-binary.*emacs-*")
addFilter(".*name-repeated-in-summar.*")
addFilter(".*idden-file-or-dir.*\.dir-locals.el.*")
addFilter(".*position-independent-executable-suggested.*/usr/bin/emacs-.*")
addFilter(".*files-duplicate.*/usr/share/emacs.*")
addFilter(".*desktopfile-without-binary.*/usr/share/applications/emacs.desktop.*emacs.*")

6
emacs.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 7 13:05:03 UTC 2018 - werner@suse.de
- Use -fPIE/-pie for helper binaries
- Use Groups tag Productivity/Text/Editors
-------------------------------------------------------------------
Thu Jun 7 11:33:27 UTC 2018 - werner@suse.de

13
emacs.spec
View File

@@ -97,7 +97,7 @@ Requires: emacs_program = %{version}-%{release}
Requires: etags
Summary: GNU Emacs Base Package
License: GPL-3.0-or-later
Group: Productivity/Editors/Emacs
Group: Productivity/Text/Editors
Provides: nxml-mode = 20041004
Obsoletes: nxml-mode < 20041004
Provides: epg = 1.0.0
@@ -157,7 +157,7 @@ Requires(post): fileutils
Requires: emacs = %{version}-%{release}
Provides: emacs_program = %{version}-%{release}
Summary: GNU Emacs-nox: An Emacs Binary without X Window System Support
Group: Productivity/Editors/Emacs
Group: Productivity/Text/Editors
%description -n emacs-nox
Eight Megabytes And Constantly Swapping. Call it
@@ -176,7 +176,7 @@ Requires: xorg-x11-fonts
Requires: xorg-x11-fonts-core
Enhances: libX11-6
Summary: GNU Emacs: Emacs binary with X Window System Support
Group: Productivity/Editors/Emacs
Group: Productivity/Text/Editors
%description -n emacs-x11
Call it
@@ -189,7 +189,7 @@ Support.
%package -n emacs-el
Requires: emacs = %{version}-%{release}
Summary: Several Lisp Files for GNU Emacs
Group: Productivity/Editors/Emacs
Group: Productivity/Text/Editors
BuildArch: noarch
%description -n emacs-el
@@ -198,7 +198,7 @@ files are pre-byte compiled and therefore not necessary.
%package -n emacs-info
Summary: Info files for GNU Emacs
Group: Productivity/Editors/Emacs
Group: Productivity/Text/Editors
Requires(post): %install_info_prereq
Requires(preun): %install_info_prereq
BuildArch: noarch
@@ -404,13 +404,14 @@ fi
--without-libotf \
--without-m17n-flt \
"
COMP="--without-hesiod \
COMP="--disable-build-details \
%if %{with mailutils}
--without-pop
--with-mailutils
%else
--with-pop \
%endif
--without-hesiod \
--with-gameuser=:games \
--with-kerberos \
--with-kerberos5 \