Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c38bd1d406b720c6d897020d4589a58884ffaac8
commit c38bd1d406b720c6d897020d4589a58884ffaac8 Author: voroskoi <[EMAIL PROTECTED]> Date: Wed Mar 26 23:18:38 2008 +0100 emacs-22.2-1-x86_64 version bump CVE-2007-5795.diff in upstream diff --git a/source/xapps/emacs/CVE-2007-5795.diff b/source/xapps/emacs/CVE-2007-5795.diff deleted file mode 100644 index 20908d9..0000000 --- a/source/xapps/emacs/CVE-2007-5795.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 3ccb65a..b1ff73f 100644 --- a/source/xapps/emacs/FrugalBuild +++ b/source/xapps/emacs/FrugalBuild @@ -3,26 +3,25 @@ # Maintainer: voroskoi <[EMAIL PROTECTED]> pkgname=emacs -pkgver=22.1 +pkgver=22.2 pkgextraver= -pkgrel=2 +pkgrel=1 pkgdesc="An extensible, customizable, self-documenting real-time display editor" url="http://www.gnu.org/software/emacs/" Finclude texinfo makedepends=('libxaw') -depends=('xaw3d' 'libtiff' 'libjpeg' 'libpng' 'libungif' 'ncurses') +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-2007-5795.diff) -signatures=($source.sig '' '') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz emacs-21.4-amd64.patch) +signatures=($source.sig '') build() { # LDFLAGS="-Wl,--hash-style=both" does not compile LDFLAGS="" Fcd $pkgname-$pkgver [[ "$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