From d286d980d2ff42151e9bc81ec348c864c24f9cc4 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 16 Oct 2011 23:14:27 +0000 Subject: Sun Oct 16 23:14:27 UTC 2011 --- extra/eclipse/PKGBUILD | 5 ++--- extra/gnutls/PKGBUILD | 16 +++++++++------- extra/gnutls/addGNU-stack.diff | 13 +++++++++++++ extra/hyphen/PKGBUILD | 12 ++++++------ extra/libburn/PKGBUILD | 6 +++--- extra/libisoburn/PKGBUILD | 6 +++--- extra/libisofs/PKGBUILD | 6 +++--- extra/midori/PKGBUILD | 17 +++++------------ extra/nettle/PKGBUILD | 6 +++--- extra/ristretto/PKGBUILD | 8 ++++---- extra/squid/PKGBUILD | 16 ++++++---------- extra/squid/squid.install | 6 +++--- extra/zile/PKGBUILD | 8 ++++---- 13 files changed, 64 insertions(+), 61 deletions(-) create mode 100644 extra/gnutls/addGNU-stack.diff (limited to 'extra') diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD index 658b3e79c..3d1f631f8 100644 --- a/extra/eclipse/PKGBUILD +++ b/extra/eclipse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140450 2011-10-14 19:01:32Z ibiru $ +# $Id: PKGBUILD 140489 2011-10-15 15:29:09Z ibiru $ # Maintainer: Paul Mattal # Contributor: Andrew Wright # Contributor: Andreas W. Hauser @@ -7,7 +7,7 @@ pkgname=eclipse pkgver=3.7.1 _internal_pkgver=3.7.1 -pkgrel=1 +pkgrel=2 _date=201109091335 pkgdesc="An IDE for Java and other languages" arch=('i686' 'x86_64') @@ -16,7 +16,6 @@ depends=('java-environment' 'gtk2' 'unzip' 'libwebkit') install=${pkgname}.install makedepends=('zip') license=("EPL/1.1") -backup=('usr/share/eclipse/configuration/config.ini') source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk.tar.gz" 'eclipse.svg' 'eclipse.sh' 'eclipse.desktop' 'eclipse.ini.patch') diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 45e6987be..221a1c59a 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 138216 2011-09-19 03:13:19Z andyrtr $ +# $Id: PKGBUILD 140493 2011-10-15 19:34:21Z andyrtr $ # Maintainer: Jan de Groot pkgname=gnutls -pkgver=3.0.3 -pkgrel=1 +pkgver=3.0.4 +pkgrel=2 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2' 'p11-kit') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') makedepends=('valgrind') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) -md5sums=('7b45b99cb6d314c452f8c0f1c7a736dd') -sha1sums=('0e6c325ae12cf1a4bd7d25125b8d58d51472fc14') +source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz + addGNU-stack.diff) +md5sums=('748d537027978abcb7dd33ec396dc511' + '19b92429e8d1639cfc4dfad0883298cb') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/addGNU-stack.diff ./configure --prefix=/usr \ --with-zlib \ --disable-static \ diff --git a/extra/gnutls/addGNU-stack.diff b/extra/gnutls/addGNU-stack.diff new file mode 100644 index 000000000..8324b5a58 --- /dev/null +++ b/extra/gnutls/addGNU-stack.diff @@ -0,0 +1,13 @@ +Description: Prevent executable stack +Author: Andreas Metzler + +--- gnutls28-3.0.4.orig/lib/accelerated/x86/asm/padlock-common.s ++++ gnutls28-3.0.4/lib/accelerated/x86/asm/padlock-common.s +@@ -38,3 +38,7 @@ is_padlock_nano: + xorl %eax,%eax + ret + .size is_padlock_nano,.-is_padlock_nano ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD index c50ecd886..feee6e8ff 100644 --- a/extra/hyphen/PKGBUILD +++ b/extra/hyphen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104194 2010-12-30 18:07:33Z andyrtr $ +# $Id: PKGBUILD 140476 2011-10-15 10:01:23Z andyrtr $ # Maintainer: AndyRTR pkgbase=hyphen pkgname=('hyphen' 'hyphen-en') -pkgver=2.7.1 -pkgrel=2 +pkgver=2.8.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://hunspell.sf.net" license=('GPL' 'LGPL' 'MPL') @@ -12,7 +12,7 @@ groups=() makedepends=('glibc' 'perl') options=('!libtool') source=(http://downloads.sourceforge.net/hunspell/${pkgname}-${pkgver}.tar.gz) -md5sums=('48a9f787f43a09c0a9b7b00cd1fddbbf') +md5sums=('86261f06c097d3e425a2f6d0b0635380') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,7 +27,7 @@ package_hyphen() { pkgdesc="library for high quality hyphenation and justification" depends=('glibc' 'perl') - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-libLTLIBRARIES make DESTDIR="$pkgdir/" install-binSCRIPTS make DESTDIR="$pkgdir/" install-includeHEADERS @@ -41,7 +41,7 @@ package_hyphen-en() { # arch=('any') optdepends=('hyphen: offers hyphenation library functions') - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-hyphDATA pushd ${pkgdir}/usr/share/hyphen/ diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index d48f1c5a0..e8fbd4cba 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135153 2011-08-10 16:27:10Z andyrtr $ +# $Id: PKGBUILD 140467 2011-10-15 09:28:22Z andyrtr $ # Maintainer: Andreas Radke # Contributor: William Rea pkgname=libburn -pkgver=1.1.4 #.pl01 +pkgver=1.1.6 #.pl01 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool' '!emptydirs') -md5sums=('a337cf8bf044a1bbc367ff35b9bc6a8b') +md5sums=('741604c3d4064502f06bae20293c508c') build() { cd ${srcdir}/${pkgname}-${pkgver} #/.pl??/} diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index 75361f813..a48ca5a20 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135163 2011-08-10 16:43:11Z andyrtr $ +# $Id: PKGBUILD 140472 2011-10-15 09:35:02Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Gour pkgname=libisoburn -pkgver=1.1.4 +pkgver=1.1.6 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" @@ -13,7 +13,7 @@ depends=('libburn' 'libisofs' 'readline') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('db79a0f0622077bb1a901f57cc1e2b67') +md5sums=('132746d3662005fd4dd462fc5d80d588') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index 7bbee2367..c3cfed509 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135158 2011-08-10 16:31:59Z andyrtr $ +# $Id: PKGBUILD 140469 2011-10-15 09:31:03Z andyrtr $ # Maintainer: AndyRTR # Contributor: Hugo Doria # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.1.4 +pkgver=1.1.6 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool') -md5sums=('2bdfda5f47fc986230efe8d05c463d52') +md5sums=('2f6088ba9ae7ed6cc91a51d2b6f2dfa0') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index e517de22b..85094853c 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139590 2011-10-03 14:23:27Z andyrtr $ +# $Id: PKGBUILD 140480 2011-10-15 10:32:49Z andyrtr $ # Maintainer: Andreas Radke # Contributor: rabyte # Contributor: Johannes Krampf pkgname=midori -pkgver=0.4.0 -pkgrel=2 +pkgver=0.4.1 +pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64') url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" @@ -14,19 +14,12 @@ install=midori.install depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') -source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2 - webkit_search.diff) -md5sums=('14aa14ccabf3d003903f1584dab15d7a' - '293c026e1875145e0df9584e1ff2a70e') -sha1sums=('c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585' - '82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c') +source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2) +md5sums=('33dde203cd71ae2b1d2adcc7f5739f65') build() { cd ${srcdir}/${pkgname}-${pkgver} - # FS#26207 - patch -Np1 -i ${srcdir}/webkit_search.diff - # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD index 47e32f558..2509d8bb0 100644 --- a/extra/nettle/PKGBUILD +++ b/extra/nettle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135770 2011-08-18 15:03:50Z andyrtr $ +# $Id: PKGBUILD 140462 2011-10-15 08:19:09Z andyrtr $ # Maintainer: Andreas Radke # Contributor: bender02 at gmx dot com pkgname=nettle -pkgver=2.2 +pkgver=2.4 pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL2') install=$pkgname.install depends=('gmp') source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) -md5sums=('9a9c6102eb9909019f8a13b67578cdfe') +md5sums=(''450be8c4886d46c09f49f568ad6fa013'') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD index 604cf20c1..24dda5eea 100644 --- a/extra/ristretto/PKGBUILD +++ b/extra/ristretto/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 112061 2011-03-03 17:24:57Z andyrtr $ +# $Id: PKGBUILD 140478 2011-10-15 10:11:04Z andyrtr $ # Maintainer: AndyRTR # Contributor: Ronald van Haren pkgname=ristretto -pkgver=0.0.93 +pkgver=0.1.1 pkgrel=1 pkgdesc="Ristretto is a image viewer for Xfce" arch=('i686' 'x86_64') @@ -13,9 +13,9 @@ depends=('libxfce4ui' 'libexif' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') groups=('xfce4-goodies') -source=(http://archive.xfce.org/src/apps/$pkgname/0.0/$pkgname-$pkgver.tar.bz2) +source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) install=ristretto.install -md5sums=('74dcdf0fcbf7039852b817732a91fb6c') +md5sums=('4b0f58c00ef99f13ebf134979ee76980') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD index 3a2dff799..47f2bf91a 100644 --- a/extra/squid/PKGBUILD +++ b/extra/squid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135984 2011-08-21 04:56:14Z eric $ +# $Id: PKGBUILD 140501 2011-10-15 22:54:05Z kevin $ # Maintainer: Kevin Piche # Contributor: Tom Newsom pkgname=squid -pkgver=3.1.14 -pkgrel=2 +pkgver=3.1.16 +pkgrel=1 pkgdesc="A full-featured Web proxy cache server." arch=(i686 x86_64) url="http://www.squid-cache.org" @@ -14,22 +14,18 @@ license=('GPL') backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid) install=squid.install source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2 - squid squid.conf.d squid.pam squid.cron squid-3.1.11-unused.patch) -md5sums=('8f82a451b04c3bf3c29202c548d2f2dd' + squid squid.conf.d squid.pam squid.cron) +md5sums=('675aef4411d41f5b55b15a29ad6e5261' 'd213b0cc1db72b749bb8c88716fdab39' '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' - '5e17df989e2a74e869790c066f61225b' - '8e59089e4a8556fc18df51979f1cfbff') + '5e17df989e2a74e869790c066f61225b') build() { cd "${srcdir}"/${pkgname}-${pkgver} # gcc 4.6 doesn't support -fhuge-objects. sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure - # fix compile errors with gcc 4.6 - # http://bugs.squid-cache.org/show_bug.cgi?id=3178 - #patch -Np1 -i "${srcdir}"/squid-3.1.11-unused.patch # fix cache_dir, cache_dir size, and effective group. sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in diff --git a/extra/squid/squid.install b/extra/squid/squid.install index 44c9130bf..e7aa5ff68 100644 --- a/extra/squid/squid.install +++ b/extra/squid/squid.install @@ -8,9 +8,9 @@ post_install() { chown proxy.proxy var/{cache,log}/squid - cat << EOF -Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html -EOF +# cat << EOF +#Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html +#EOF } post_upgrade() { diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD index e1457b41b..960b19cbf 100644 --- a/extra/zile/PKGBUILD +++ b/extra/zile/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 135981 2011-08-21 03:51:34Z eric $ +# $Id: PKGBUILD 140498 2011-10-15 20:33:55Z kevin $ # Contributor: Tom Newsom # Maintainer: Kevin Piche pkgname=zile -pkgver=2.3.24 +pkgver=2.4.2 pkgrel=1 pkgdesc="A small, fast, and powerful Emacs clone" arch=(i686 x86_64) url="http://www.gnu.org/software/zile/" # Lua is not required, the author uses it to generate some source files. -depends=('ncurses') +depends=('gc' 'ncurses') license=('GPL') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('fe77d801ba69e0fb9b4914a04b9ff506') +md5sums=('2a68ac77cebbeca1eacf170ba9072dbe') build() { cd "${srcdir}"/${pkgname}-${pkgver} -- cgit v1.2.3-54-g00ecf