Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=abed4b0a26ea83b0e1975e52523e77d261b2d2fa
commit abed4b0a26ea83b0e1975e52523e77d261b2d2fa Author: voroskoi <[EMAIL PROTECTED]> Date: Mon Sep 29 09:16:40 2008 +0200 emacs-22.2-4solaria1-i686 CVE-2008-2142.patch was not applied use Fpatchall to avoid such situations diff --git a/source/xapps/emacs/FrugalBuild b/source/xapps/emacs/FrugalBuild index 0bdee01..c0b1eef 100644 --- a/source/xapps/emacs/FrugalBuild +++ b/source/xapps/emacs/FrugalBuild @@ -5,7 +5,7 @@ pkgname=emacs pkgver=22.2 pkgextraver= -pkgrel=3 +pkgrel=4solaria1 pkgdesc="An extensible, customizable, self-documenting real-time display editor" url="http://www.gnu.org/software/emacs/"; Finclude texinfo @@ -14,16 +14,16 @@ 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 \ +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz \ CVE-2008-1694.patch CVE-2008-2142.patch) -signatures=($source.sig '' '' '') +[[ "$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
