Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=20218605c083d22def47a60bc9543f871ee46c73
commit 20218605c083d22def47a60bc9543f871ee46c73 Author: voroskoi <[EMAIL PROTECTED]> Date: Sun Nov 11 20:10:54 2007 +0100 emacs-22.1-2sayshell1-x86_64 secfix relbump, closes #2566 diff --git a/source/xapps/emacs/CVE-2007-5795.diff b/source/xapps/emacs/CVE-2007-5795.diff new file mode 100644 index 0000000..20908d9 --- /dev/null +++ b/source/xapps/emacs/CVE-2007-5795.diff @@ -0,0 +1,13 @@ +--- emacs/lisp/files.el 2007/10/13 14:09:56 1.896.2.28 ++++ emacs/lisp/files.el 2007/11/02 11:02:12 1.896.2.29 +@@ -2764,8 +2764,8 @@ + ;; If caller wants only the safe variables, + ;; install only them. + (dolist (elt result) +- (unless (or (memq (car elt) unsafe-vars) +- (memq (car elt) risky-vars)) ++ (unless (or (member elt unsafe-vars) ++ (member elt risky-vars)) + (hack-one-local-variable (car elt) (cdr elt)))) + ;; Query, except in the case where all are known safe + ;; if the user wants no quuery in that case. diff --git a/source/xapps/emacs/FrugalBuild b/source/xapps/emacs/FrugalBuild index 82c7e9d..1492e07 100644 --- a/source/xapps/emacs/FrugalBuild +++ b/source/xapps/emacs/FrugalBuild @@ -5,7 +5,7 @@ pkgname=emacs pkgver=22.1 pkgextraver= -pkgrel=1 +pkgrel=2sayshell1 pkgdesc="An extensible, customizable, self-documenting real-time display editor" url="http://www.gnu.org/software/emacs/"; Finclude texinfo @@ -14,14 +14,15 @@ depends=('xaw3d' 'libtiff' 'libjpeg' 'libpng' 'libungif' 'ncurses') groups=('xapps') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep stable|sed 's/.*: \([0-9\.]*\) .*/\1/'" -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz emacs-21.4-amd64.patch) -signatures=($source.sig '') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz emacs-21.4-amd64.patch CVE-2007-5795.diff) +signatures=($source.sig '' '') build() { # LDFLAGS="-Wl,--hash-style=both" does not compile LDFLAGS="" Fcd $pkgname-$pkgver - [[ "$CARCH" == "x86_64" ]] && Fpatchall + [[ "$CARCH" == "x86_64" ]] && Fpatch emacs-21.4-amd64.patch + Fpatch CVE-2007-5795.diff Fmake --with-x11 --with-x-toolkit --with-pop Fmakeinstall [ -e $Fdestdir/usr/info/dir.old ] && Frm /usr/info/dir.old _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
