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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=28

Browse Source
This commit is contained in:
OBS User unknown 2008-09-26 14:51:22 +00:00 committed by Git OBS Bridge
parent d700fbf902
commit 55485debda
7 changed files with 75 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
emacs-22.1-fast-lock.patch
View File

@ -1,37 +0,0 @@
CVE-2008-2142
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2142
http://thread.gmane.org/gmane.emacs.devel/96903
http://article.gmane.org/gmane.emacs.devel/97038
http://article.gmane.org/gmane.emacs.devel/97074
--- lisp/obsolete/fast-lock.el
+++ lisp/obsolete/fast-lock.el 2008-05-13 11:33:10.000000000 +0200
@@ -286,7 +286,7 @@ for buffers in Rmail mode, and size is i
(integer :tag "size")))))
:group 'fast-lock)
-(defcustom fast-lock-cache-directories '("." "~/.emacs-flc")
+(defcustom fast-lock-cache-directories '("~/.emacs-flc")
; - `internal', keep each file's Font Lock cache file in the same file.
; - `external', keep each file's Font Lock cache file in the same directory.
"*Directories in which Font Lock cache files are saved and read.
@@ -304,13 +304,18 @@ For example:
((\"^/your/true/home/directory/\" . \".\") \"~/.emacs-flc\")
would cause a file's current directory to be used if the file is under your
-home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'."
+home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'.
+For security reasons, it is not advisable to use the file's current directory
+to avoid the possibility of using the cache of another user."
:type '(repeat (radio (directory :tag "directory")
(cons :tag "Matching"
(regexp :tag "regexp")
(directory :tag "directory"))))
:group 'fast-lock)
+;;;###autoload
+(put 'fast-lock-cache-directories 'risky-local-variable t)
+
(defcustom fast-lock-save-events '(kill-buffer kill-emacs)
"*Events under which caches will be saved.
Valid events are `save-buffer', `kill-buffer' and `kill-emacs'.

3
emacs-22.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b6eff78d035d4276f18834f05623cdfa6a21a2b2cf317df68dae5d75c7ec397
size 30831525

18
emacs-22.0.99-glibc.patch → emacs-22.3-glibc.patch
View File

@ -3,7 +3,7 @@
-- Stepan Kasal <kasal@suse.cz>
--- lib-src/Makefile.in
+++ lib-src/Makefile.in 2007-05-15 17:48:45.509066296 +0200
+++ lib-src/Makefile.in 2008-09-19 17:19:52.350432740 +0200
@@ -248,6 +248,8 @@ LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_S
the information in ../src/config.h. */
ALL_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
@ -13,7 +13,7 @@
LINK_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
-I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS}
CPP_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
@@ -394,12 +396,17 @@ getopt.h: getopt_.h
@@ -397,12 +399,17 @@ getopt.h: getopt_.h
cp $(srcdir)/getopt_.h $@-t
mv $@-t $@
@ -31,27 +31,27 @@
#ifdef REGEXP_IN_LIBC
REGEXPOBJ =
@@ -413,7 +420,7 @@ regex.o: $(srcdir)/../src/regex.c $(srcd
@@ -416,7 +423,7 @@ regex.o: $(srcdir)/../src/regex.c $(srcd
${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
- $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
+ $(CC) ${ETAGS_CFLAGS} -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
- $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
+ $(CC) ${ETAGS_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse
@@ -421,7 +428,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(
@@ -424,7 +431,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(
/* We depend on etags to assure that parallel makes don\'t write two
etags.o files on top of each other. */
ctags${EXEEXT}: etags${EXEEXT}
- $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
+ $(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
- $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
+ $(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
--- lib-src/etags.c
+++ lib-src/etags.c 2001-10-24 18:13:46.000000000 +0200
@@ -94,7 +94,7 @@ char pot_etags_version[] = "@(#) pot rev
@@ -95,7 +95,7 @@ char pot_etags_version[] = "@(#) pot rev
#endif
#ifdef HAVE_CONFIG_H

37
emacs-22.2.dif → emacs-22.3.dif
View File

@ -1,5 +1,5 @@
--- .pkgextract
+++ .pkgextract 2008-03-31 12:47:06.572601686 +0200
+++ .pkgextract 2008-03-31 12:47:07.000000000 +0200
@@ -0,0 +1,15 @@
+patch -s -p0 -b --suffix=.axp < ../emacs-22.0.99-linkscr.patch
+patch -s -p0 -b --suffix=.glibc < ../emacs-22.0.99-glibc.patch
@ -64,7 +64,7 @@
FRC:
--- configure.in
+++ configure.in 2008-03-31 12:43:19.387363991 +0200
+++ configure.in 2008-03-31 12:43:19.000000000 +0200
@@ -377,11 +377,11 @@ dnl see the `changequote' comment above.
esac
;;
@ -370,7 +370,7 @@
if [ ! -d ${INSTALLDIR} ] ; then \
${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \
--- lib-src/Makefile.in
+++ lib-src/Makefile.in 2007-05-15 18:54:25.000000000 +0200
+++ lib-src/Makefile.in 2008-09-19 17:26:43.744947768 +0200
@@ -106,7 +106,7 @@ INSTALL_STRIP =
# Things that a user might actually run,
@ -385,44 +385,37 @@
/* We depend on etags to assure that parallel makes don\'t write two
etags.o files on top of each other. */
-ctags${EXEEXT}: etags${EXEEXT}
- $(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
- $(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
+gnuctags${EXEEXT}: etags${EXEEXT}
+ $(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o gnuctags
+ $(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o gnuctags
profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
--- lib-src/vcdiff
+++ lib-src/vcdiff 2003-07-23 18:08:55.000000000 +0200
@@ -74,6 +74,17 @@ esac
+++ lib-src/vcdiff 2008-09-19 17:31:00.216981174 +0200
@@ -74,6 +74,8 @@ esac
rev1= rev2= status=0
+rev1=/tmp/geta$$
+rev2=/tmp/getb$$
+rm -f $rev1 $rev2
+if test -e $rev1 -o -e $rev2 ; then
+ echo "$0: temporaray files exists." 1>&2
+ exit 1
+fi
+if test -n "`type -p mktemp`" ; then
+ rev1="`mktemp ${rev1}.XXXXXX`" || exit 1
+ rev2="`mktemp ${rev2}.XXXXXX`" || exit 1
+fi
+rev1=/tmp/getaXXXXXXXX
+rev2=/tmp/getbXXXXXXXX
trap 'status=2; exit' 1 2 13 15
trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
@@ -84,14 +95,12 @@ do
@@ -84,14 +86,14 @@ do
case $f in
s.* | */s.*)
if
- rev1=/tmp/geta$$
- rev1=`mktemp /tmp/geta.XXXXXXXX`
+ rev1=`mktemp ${rev1}` || exit 1
get -s -p -k $sid1 "$f" > $rev1 &&
case $sid2 in
'')
workfile=`expr " /$f" : '.*/s.\(.*\)'`
;;
*)
- rev2=/tmp/getb$$
- rev2=`mktemp /tmp/getb.XXXXXXXX`
+ rev2=`mktemp ${rev2}` || exit 1
get -s -p -k $sid2 "$f" > $rev2
workfile=$rev2
esac
@ -1173,7 +1166,7 @@
/* Lisp files that may or may not be used.
--- src/config.in
+++ src/config.in 2007-05-15 19:25:18.000000000 +0200
@@ -911,6 +911,8 @@ Boston, MA 02110-1301, USA. */
@@ -914,6 +914,8 @@ Boston, MA 02110-1301, USA. */
code using `volatile' can become incorrect without. Disable with care. */
#undef volatile

3
emacs-22.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3940ff1f058fbb2ecace84b7428363ec3efc3ebde0bcf9f7d3f1d8707f44e548
size 31856458

14
emacs.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Sep 19 18:14:04 CEST 2008 - werner@suse.de
- Update to to emacs version 22.3
* Support for several obsolete platforms removed
* Support for systems without alloca will be removed.
* Support for VMS will be removed.
* Several security fixes added
-------------------------------------------------------------------
Wed Sep 10 13:30:40 CEST 2008 - werner@suse.de
- Fix security bug in Emacs python mode (bnc#424340)
-------------------------------------------------------------------
Tue May 13 12:10:45 CEST 2008 - werner@suse.de

44
emacs.spec
View File

@ -1,10 +1,17 @@
#
# spec file for package emacs (Version 22.2)
# spec file for package emacs (Version 22.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -20,18 +27,18 @@ Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mu
Requires: emacs-info ctags emacs_program
Provides: ge_site ge_exec emacs-url Mule-UCS emacs-calc erc
AutoReqProv: on
Version: 22.2
Release: 18
Version: 22.3
Release: 1
Summary: GNU Emacs Base Package
Source: emacs-22.2.tar.bz2
Source: emacs-22.3.tar.bz2
Source1: app-defaults.Emacs
Source2: site-lisp.tar.bz2
Source3: dot.gnu-emacs
Source4: emacs-rpmlintrc
Source5: emacs.desktop
Patch: emacs-22.2.dif
Patch: emacs-22.3.dif
Patch1: emacs-22.0.99-linkscr.patch
Patch2: emacs-22.0.99-glibc.patch
Patch2: emacs-22.3-glibc.patch
Patch3: emacs-22.0.99-decl.dif
Patch4: emacs-21.1-asian-print.patch
Patch5: emacs-22.0.99-ps-bdf.patch
@ -45,7 +52,6 @@ Patch12: emacs-22.0.99-x11r7.patch
Patch13: emacs-22.0.99-s390x.dif
Patch14: emacs-22.1-conf.diff
Patch15: emacs-22.2-iconic.patch
Patch16: emacs-22.1-fast-lock.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
%if "%_exec_prefix" == "/usr/X11R6"
@ -221,7 +227,6 @@ Authors:
%patch13 -p0 -b .s390x
%patch14 -p0 -b .conf
%patch15 -p0 -b .iconic
%patch16 -p0 -b .flc
%patch
if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
install-mh -auto < /dev/null
@ -446,6 +451,7 @@ rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/files.el.CVE20075795
rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/fast-lock.el.flc
rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/obsolete/fast-lock.el.flc
rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/loaddefs.el.flc
rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/progmodes/python.el.python
unelc %{buildroot}/usr/share/emacs/%{version}/lisp/bindings.elc
unelc %{buildroot}/usr/share/emacs/%{version}/lisp/cus-start.elc
unelc %{buildroot}/usr/share/emacs/%{version}/lisp/generic-x.elc
@ -2031,6 +2037,11 @@ done
/usr/share/emacs/%{version}/lisp/textmodes/makeinfo.elc
/usr/share/emacs/%{version}/lisp/textmodes/nroff-mode.elc
/usr/share/emacs/%{version}/lisp/textmodes/org.elc
/usr/share/emacs/%{version}/lisp/textmodes/org-export-latex.elc
/usr/share/emacs/%{version}/lisp/textmodes/org-irc.elc
/usr/share/emacs/%{version}/lisp/textmodes/org-mac-message.elc
/usr/share/emacs/%{version}/lisp/textmodes/org-mouse.elc
/usr/share/emacs/%{version}/lisp/textmodes/org-publish.elc
/usr/share/emacs/%{version}/lisp/textmodes/page-ext.elc
/usr/share/emacs/%{version}/lisp/textmodes/page.elc
/usr/share/emacs/%{version}/lisp/textmodes/paragraphs.elc
@ -3170,6 +3181,11 @@ done
/usr/share/emacs/%{version}/lisp/textmodes/makeinfo.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/nroff-mode.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/org.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/org-export-latex.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/org-irc.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/org-mac-message.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/org-mouse.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/org-publish.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/page-ext.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/page.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/paragraphs.el.gz
@ -3277,6 +3293,14 @@ done
/usr/share/emacs/%{version}/lisp/xt-mouse.el.gz
%changelog
* Fri Sep 19 2008 werner@suse.de
- Update to to emacs version 22.3
* Support for several obsolete platforms removed
* Support for systems without alloca will be removed.
* Support for VMS will be removed.
* Several security fixes added
* Wed Sep 10 2008 werner@suse.de
- Fix security bug in Emacs python mode (bnc#424340)
* Tue May 13 2008 werner@suse.de
- Add fix for fast-lock-mode arbitrary lips code execution (bnc#389154)
* Mon Mar 31 2008 werner@suse.de