Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c596e68c6bb541bc5d8ab723ca2f3ef5a37ff71d
commit c596e68c6bb541bc5d8ab723ca2f3ef5a37ff71d
Author: voroskoi <[EMAIL PROTECTED]>
Date: Mon Sep 29 09:45:49 2008 +0200
emacs-22.3-1-i686
version bump
CVE patches are in upstream
reworked FB to use Fpatchall
removed LD hack
diff --git a/source/xapps/emacs/CVE-2008-1694.patch
b/source/xapps/emacs/CVE-2008-1694.patch
deleted file mode 100644
index 7f59d6a..0000000
--- a/source/xapps/emacs/CVE-2008-1694.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Steve Grubb of Red Hat discovered that vcdiff script as shipped with Emacs
-(confirmed in versions 20.7 to 22.1.50) uses temporary files insecurely,
-which makes it possible for local attacker to conduct a symlink attack and
-make the victim overwrite arbitrary file.
-
-diff -ur emacs-21.4.orig/lib-src/vcdiff emacs-21.4/lib-src/vcdiff
---- emacs-21.4.orig/lib-src/vcdiff 2006-09-28 12:07:51.000000000 -0400
-+++ emacs-21.4/lib-src/vcdiff 2006-09-28 15:58:53.000000000 -0400
-@@ -86,14 +86,14 @@
- case $f in
- s.* | */s.*)
- if
-- rev1=/tmp/geta$$
-+ rev1=`mktemp /tmp/geta.XXXXXXXX`
- get -s -p -k $sid1 "$f" > $rev1 &&
- case $sid2 in
- '')
- workfile=`expr " /$f" : '.*/s.\(.*\)'`
- ;;
- *)
-- rev2=/tmp/getb$$
-+ rev2=`mktemp /tmp/getb.XXXXXXXX`
- get -s -p -k $sid2 "$f" > $rev2
- workfile=$rev2
- esac
diff --git a/source/xapps/emacs/CVE-2008-2142.patch
b/source/xapps/emacs/CVE-2008-2142.patch
deleted file mode 100644
index e60159b..0000000
--- a/source/xapps/emacs/CVE-2008-2142.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- lisp/obsolete/fast-lock.el.orig 2008-05-14 08:00:17.000000000 +0300
-+++ lisp/obsolete/fast-lock.el 2008-05-14 08:16:32.000000000 +0300
-@@ -270,7 +270,7 @@
- (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.
-@@ -288,13 +288,19 @@
- ((\"^/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'.
diff --git a/source/xapps/emacs/FrugalBuild b/source/xapps/emacs/FrugalBuild
index 0bdee01..33e59a9 100644
--- a/source/xapps/emacs/FrugalBuild
+++ b/source/xapps/emacs/FrugalBuild
@@ -3,9 +3,9 @@
# Maintainer: voroskoi <[EMAIL PROTECTED]>
pkgname=emacs
-pkgver=22.2
+pkgver=22.3
pkgextraver=
-pkgrel=3
+pkgrel=1
pkgdesc="An extensible, customizable, self-documenting real-time display editor"
url="http://www.gnu.org/software/emacs/";
Finclude texinfo
@@ -14,16 +14,13 @@ depends=('xaw3d' 'libtiff' 'libjpeg' 'libpng' 'libungif'
'ncurses' 'libxcb')
groups=('xapps')
archs=('i686' 'x86_64')
up2date="lynx -dump http://ftp.gnu.org/pub/gnu/emacs/ |Flasttar"
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz
emacs-21.4-amd64.patch \
- CVE-2008-1694.patch CVE-2008-2142.patch)
-signatures=($source.sig '' '' '')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz)
+[[ "$CARCH" == "x86_64" ]] && source=([EMAIL PROTECTED]
'emacs-21.4-amd64.patch')
+signatures=($source.sig)
+[[ "$CARCH" == "x86_64" ]] && signatures=([EMAIL PROTECTED] '')
build() {
- # LDFLAGS="-Wl,--hash-style=both" does not compile
- LDFLAGS=""
- Fcd $pkgname-$pkgver
- [[ "$CARCH" == "x86_64" ]] && Fpatch emacs-21.4-amd64.patch
- Fpatch CVE-2008-1694.patch
+ Fpatchall
Fmake --with-x11 --with-x-toolkit --with-pop
Fmakeinstall
[ -e $Fdestdir/usr/info/dir.old ] && Frm /usr/info/dir.old
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
