From a1ba981700ea6943bedc5d7bb769b1f893088c7f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Sep 2013 03:05:25 -0700 Subject: Mon Sep 30 02:50:34 PDT 2013 --- extra/abook/PKGBUILD | 15 ++++++-- extra/abook/vcard.patch | 26 +++++++++++++ extra/arj/PKGBUILD | 14 ++++--- extra/cdparanoia/PKGBUILD | 23 +++++++----- extra/indent/PKGBUILD | 43 +++++++++++----------- extra/mtdev/PKGBUILD | 6 +-- extra/pigeonhole/PKGBUILD | 8 ++-- extra/python-cairo/PKGBUILD | 7 ++-- extra/time/PKGBUILD | 36 +++++++++++------- extra/time/time.install | 16 ++++---- extra/wget/PKGBUILD | 40 ++++++++++++-------- extra/wget/wget-pod-fixes.patch | 81 +++++++++++++++++++++++++++++++++++++++++ 12 files changed, 228 insertions(+), 87 deletions(-) create mode 100644 extra/abook/vcard.patch create mode 100644 extra/wget/wget-pod-fixes.patch (limited to 'extra') diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD index c53e9ed18..c6606c6f4 100644 --- a/extra/abook/PKGBUILD +++ b/extra/abook/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191361 2013-07-24 01:43:47Z bisson $ +# $Id: PKGBUILD 195248 2013-09-29 04:45:52Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Daniel J Griffiths # Contributor: Thayer Williams # Contributor: damir pkgname=abook -pkgver=0.6.0pre2.20130724 +pkgver=0.6.0pre2.20130928 pkgrel=1 pkgdesc='Text-based addressbook designed for use with Mutt' url='http://abook.sourceforge.net/' @@ -13,8 +13,15 @@ arch=('i686' 'x86_64') license=('GPL2') makedepends=('git') depends=('readline') -source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68") -sha1sums=('SKIP') +source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68" + 'vcard.patch') +sha1sums=('SKIP' + 'ac71e84812c5d57cb8ddaf5b03b7c25cbdf4c3db') + +prepare() { + cd "${srcdir}/${pkgname}" + patch -p1 -i ../vcard.patch +} build() { cd "${srcdir}/${pkgname}" diff --git a/extra/abook/vcard.patch b/extra/abook/vcard.patch new file mode 100644 index 000000000..55630c1e5 --- /dev/null +++ b/extra/abook/vcard.patch @@ -0,0 +1,26 @@ +diff -Naur old/filter.c new/filter.c +--- old/filter.c 2013-08-22 20:49:06.229337260 -1000 ++++ new/filter.c 2013-08-22 20:49:13.552700987 -1000 +@@ -1673,7 +1673,7 @@ + // vCard(the country name) + item_fput(item, COUNTRY, xstrdup(strsep(&value, ";"))); + +- if(*value) xfree(value); ++ if(value) xfree(value); + } + + static void +@@ -2052,6 +2052,13 @@ + + free(name); + ++ if(db_fget(item, NICK)) ++ fprintf(out, "NICKNAME:%s\r\n", ++ safe_str(db_fget(item, NICK))); ++ if(db_fget(item, ANNIVERSARY)) ++ fprintf(out, "BIRTHDAY:%s\r\n", ++ safe_str(db_fget(item, ANNIVERSARY))); ++ + // see rfc6350 section 6.3.1 + if(db_fget(item, ADDRESS)) { + fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n", diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD index 4f07f5617..12f15f794 100644 --- a/extra/arj/PKGBUILD +++ b/extra/arj/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 149330 2012-02-06 20:41:57Z stephane $ +# $Id: PKGBUILD 195286 2013-09-29 21:24:32Z eric $ # Maintainer: # Contributor: Travis Willard # Contributor: Gergely Tamas pkgname=arj pkgver=3.10.22 -pkgrel=7 +pkgrel=8 pkgdesc="Free and portable clone of the ARJ archiver" url="http://arj.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') -options=('!makeflags') depends=('glibc') +options=('!makeflags') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 001_arches_align.patch 002_no_remove_static_const.patch @@ -23,7 +23,7 @@ md5sums=('f263bf3cf6d42a8b7e85b4fb514336d3' '56b3cf96ec485b0d824761457417fcc0' '4630a7254dfc6c8d8c7e696aa4a58f4a') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" # Add gentoo patches @@ -36,7 +36,11 @@ build() { aclocal autoconf rm -f config.{guess,sub} - cp /usr/share/automake-1.11/config.{guess,sub} . + cp /usr/share/automake-1.14/config.{guess,sub} . +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}/gnu" ./configure --prefix=/usr cd .. make prepare diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD index 05bf0989d..9bb7c92f7 100644 --- a/extra/cdparanoia/PKGBUILD +++ b/extra/cdparanoia/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 149332 2012-02-06 20:43:48Z stephane $ -# Maintainer: -# Contributor: Alexander Fehr +# $Id: PKGBUILD 195270 2013-09-29 18:03:20Z eric $ +# Maintainer: Eric Bélanger pkgname=cdparanoia pkgver=10.2 -pkgrel=4 +pkgrel=5 pkgdesc="Compact Disc Digital Audio extraction tool" arch=('i686' 'x86_64') url="http://www.xiph.org/paranoia/" license=('GPL') depends=('glibc') -options=('!makeflags') -source=("http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz" - 'gcc.patch') -md5sums=('b304bbe8ab63373924a744eac9ebc652' - '12da14958d2b84c6719fe69890436445') +options=('!makeflags' '!staticlibs') +source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz + gcc.patch) +sha1sums=('1901e20d3a370ca6afa4c76a9ef30d3f03044320' + '67faaf0e3eed2e3de6f66d8168604bc6c7295921') -build() { +prepare() { cd "${srcdir}/${pkgname}-III-${pkgver}" patch -p0 -i ${srcdir}/gcc.patch +} + +build() { + cd "${srcdir}/${pkgname}-III-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/extra/indent/PKGBUILD b/extra/indent/PKGBUILD index 86e1d39d5..35f85acd8 100644 --- a/extra/indent/PKGBUILD +++ b/extra/indent/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 152433 2012-03-06 21:03:48Z stephane $ -# Maintainer: Aaron Griffin -# Contributor: aurelien -# Contributor: Herb Rose (hrose56@yahoo.com) +# $Id: PKGBUILD 195284 2013-09-29 20:55:02Z eric $ +# Maintainer: pkgname=indent pkgver=2.2.11 -pkgrel=2 +pkgrel=3 pkgdesc="C language source code formatting program" arch=('i686' 'x86_64') -url="http://indent.isidore-it.eu/beautify.html" +url="https://www.gnu.org/software/indent/" +license=('GPL3') depends=('glibc') makedepends=('texi2html') -license=('GPL3') install=indent.install -source=(http://indent.isidore-it.eu/${pkgname}-${pkgver}.tar.gz +source=(http://ftp.de.debian.org/debian/pool/main/i/indent/${pkgname}_${pkgver}.orig.tar.gz indent-2.2.11-segfault.patch indent-2.2.11-LC_ALL.patch indent-2.2.11-decimal_format.patch) @@ -22,23 +20,26 @@ sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7' '91b210b666de59ca44524288a4c1ebd213570daa' '2b7d5a725fe307ce81565f920a0a66b319b50c91') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i ../indent-2.2.11-segfault.patch +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../indent-2.2.11-segfault.patch - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692 - patch -Np1 -i ../indent-2.2.11-LC_ALL.patch + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692 + patch -Np1 -i ../indent-2.2.11-LC_ALL.patch - # https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html - patch -Np1 -i ../indent-2.2.11-decimal_format.patch + # https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html + patch -Np1 -i ../indent-2.2.11-decimal_format.patch - sed -i 's/-number/-number-sections/' doc/Makefile.in - ./configure --prefix=/usr - make + sed -i 's/-number/-number-sections/' doc/Makefile.in +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" docdir=/usr/share/doc/indent install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" docdir=/usr/share/doc/indent install } diff --git a/extra/mtdev/PKGBUILD b/extra/mtdev/PKGBUILD index 50bf1642f..e129df50e 100644 --- a/extra/mtdev/PKGBUILD +++ b/extra/mtdev/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168434 2012-10-11 16:11:43Z andyrtr $ +# $Id: PKGBUILD 195256 2013-09-29 09:02:35Z andyrtr $ # Maintainer: AndyRTR # Contributor: SpepS pkgname=mtdev -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="A stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom:MIT') depends=('glibc') options=('!libtool') source=("$url$pkgname-$pkgver.tar.bz2") -md5sums=('8a236569ad3dd79eaeed45f1935359be') +md5sums=('73a915d6075b31db4f08ab8c6d314695') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 1d1fd930e..1017ca936 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195141 2013-09-25 15:41:45Z andyrtr $ +# $Id: PKGBUILD 195252 2013-09-29 08:56:18Z andyrtr $ # Maintainer: Andreas Radke # Contributorr: Peter Lewis @@ -11,8 +11,8 @@ _dcpkgver=2.2.6 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.4.1 -pkgrel=3 +pkgver=0.4.2 +pkgrel=1 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64') url="http://pigeonhole.dovecot.org/" @@ -22,7 +22,7 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg') source=("http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-$pkgname-$pkgver.tar.gz"{,.sig} "dovecot.conf") options=('!libtool') -sha256sums=('361cf61c1b6c8a42d841d694736dac99c6bb5b5166e050a95c185119399c696e' +sha256sums=('0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13' 'SKIP' 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858') diff --git a/extra/python-cairo/PKGBUILD b/extra/python-cairo/PKGBUILD index 0285fa0be..a33052c38 100644 --- a/extra/python-cairo/PKGBUILD +++ b/extra/python-cairo/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 169010 2012-10-17 10:20:01Z allan $ +# $Id: PKGBUILD 195288 2013-09-29 21:45:06Z eric $ # Maintainer: Angel Velasquez # Maintainer: Jan de Groot pkgname=python-cairo pkgver=1.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for the cairo graphics library" arch=('i686' 'x86_64') +url="http://www.cairographics.org/pycairo" license=('LGPL3') depends=('python' 'cairo') -makedepends=('pkg-config') options=('!libtool') source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2) -url="http://www.cairographics.org/pycairo" md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5') build() { diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD index 3bd8b4197..bfb999c58 100644 --- a/extra/time/PKGBUILD +++ b/extra/time/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 147242 2012-01-25 01:42:55Z stephane $ -# Maintainer: Stéphane Gaudreault +# $Id: PKGBUILD 195266 2013-09-29 16:39:25Z dreisner $ +# Maintainer: Dave Reisner +# Contributor: Stéphane Gaudreault # Contributor: Daniel J Griffiths # Contributor: damir pkgname=time pkgver=1.7 -pkgrel=6 +pkgrel=7 pkgdesc="Utility for monitoring a program's use of system resources" arch=('i686' 'x86_64') url="http://www.gnu.org/directory/time.html" @@ -19,22 +20,29 @@ sha1sums=('dde0c28c7426960736933f3e763320680356cc6a' 'fff80e05dd41f0a59bb1f49d1c6e581d5e8e92e5' 'b2a909e1d92f7af1bc99a4524ad84d467ed79a06') +prepare() { + cd "$pkgname-$pkgver" -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # cf https://bugzilla.redhat.com/show_bug.cgi?id=527276 - patch -Np1 -i ../time-1.7-Recompute-CPU-usage-at-microsecond-level.patch + # cf https://bugzilla.redhat.com/show_bug.cgi?id=527276 + patch -Np1 < "$srcdir"/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch + + # cf https://bugzilla.redhat.com/show_bug.cgi?id=702826 + patch -Np1 < "$srcdir"/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch - # cf https://bugzilla.redhat.com/show_bug.cgi?id=702826 - patch -Np1 -i ../time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch + # rebuild the ancient autoconf setup to fix a variety of build issues + # surrounding missing/incorrect includes. + autoreconf -fisv +} + +build() { + cd "$pkgname-$pkgver" - ./configure --prefix=/usr --infodir=/usr/share/info - make + ./configure --prefix=/usr --infodir=/usr/share/info + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" - make exec_prefix="${pkgdir}/usr" infodir="${pkgdir}/usr/share/info" install + make exec_prefix="$pkgdir/usr" infodir="$pkgdir/usr/share/info" install } diff --git a/extra/time/time.install b/extra/time/time.install index 011597c00..ceaf8e6fb 100644 --- a/extra/time/time.install +++ b/extra/time/time.install @@ -1,20 +1,22 @@ +#!/bin/bash + infodir=/usr/share/info filelist=(time.info.gz) post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info "$infodir/$file" "$infodir/dir" 2>/dev/null done } post_upgrade() { - post_install $1 + post_install "$1" } pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info --delete "$infodir/$file" "$infodir/dir" 2>/dev/null done } diff --git a/extra/wget/PKGBUILD b/extra/wget/PKGBUILD index 9b1244031..ef7eb62b1 100644 --- a/extra/wget/PKGBUILD +++ b/extra/wget/PKGBUILD @@ -1,36 +1,46 @@ -# $Id: PKGBUILD 169712 2012-10-27 01:52:51Z stephane $ -# Maintainer: Allan McRae -# Contributor: Judd Vinet +# $Id: PKGBUILD 195268 2013-09-29 17:27:18Z eric $ +# Maintainer: Eric Bélanger pkgname=wget pkgver=1.14 -pkgrel=2 +pkgrel=3 pkgdesc="A network utility to retrieve files from the Web" arch=('i686' 'x86_64') url="http://www.gnu.org/software/wget/wget.html" license=('GPL3') -depends=('openssl' 'libidn' 'pcre' 'util-linux') +depends=('openssl' 'libidn' 'util-linux') +checkdepends=('perl-http-daemon' 'perl-io-socket-ssl') optdepends=('ca-certificates: HTTPS downloads') backup=('etc/wgetrc') install=wget.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('316f6f59292c9098ad81fd54f658c579' - '3e121933d69f32fa58776bff76bcebd0') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} + wget-pod-fixes.patch) +sha1sums=('cfa0906e6f72c1c902c29b52d140c22ecdcd617e' + 'SKIP' + 'aae4be72657c7a8e9dbedb7109cd2d8562a325d2') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/wget-pod-fixes.patch" + cat >> doc/sample.wgetrc <> "$pkgdir/etc/wgetrc" < + No problems occurred. + +-@item 1 ++@item C<1> + Generic error code. + +-@item 2 ++@item C<2> + Parse error---for instance, when parsing command-line options, the + @samp{.wgetrc} or @samp{.netrc}... + +-@item 3 ++@item C<3> + File I/O error. + +-@item 4 ++@item C<4> + Network failure. + +-@item 5 ++@item C<5> + SSL verification failure. + +-@item 6 ++@item C<6> + Username/password authentication failure. + +-@item 7 ++@item C<7> + Protocol errors. + +-@item 8 ++@item C<8> + Server issued an error response. + @end table + +@@ -3094,7 +3094,7 @@ + Change setting of passive @sc{ftp}, equivalent to the + @samp{--passive-ftp} option. + +-@itemx password = @var{string} ++@item password = @var{string} + Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. + This command can be overridden using the @samp{ftp_password} and + @samp{http_password} command for @sc{ftp} and @sc{http} respectively. +@@ -3605,7 +3605,7 @@ + may be specified from within Wget itself. + + @table @samp +-@itemx --no-proxy ++@item --no-proxy + @itemx proxy = on/off + This option and the corresponding command may be used to suppress the + use of proxy, even if the appropriate environment variables are set. -- cgit v1.2.3-54-g00ecf