diff options
68 files changed, 1757 insertions, 380 deletions
diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD index 4e238db97..6cc2a8038 100644 --- a/community-testing/shotwell/PKGBUILD +++ b/community-testing/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57683 2011-11-01 08:40:42Z spupykin $ +# $Id: PKGBUILD 58125 2011-11-06 18:16:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.11.5 -pkgrel=2 +pkgver=0.11.6 +pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" @@ -18,7 +18,7 @@ install=shotwell.install source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2" "http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2" "fix-with-libraw-0.4.patch") -md5sums=('d437c73127b1cb29a8f9c014effc6aa0' +md5sums=('bbbf2843eb98b6f0ef1dfcfb934e15cf' 'bf35262cc611de447147d01cbac33767' '488787b6d2cbc7348bc88348b78b6005') diff --git a/community-testing/texmaker/PKGBUILD b/community-testing/texmaker/PKGBUILD index 7db874e08..b01ca8ca1 100644 --- a/community-testing/texmaker/PKGBUILD +++ b/community-testing/texmaker/PKGBUILD @@ -6,7 +6,7 @@ pkgname=texmaker pkgver=3.1 -pkgrel=2 +pkgrel=3 pkgdesc='Free cross-platform latex editor' arch=('i686' 'x86_64') url="http://www.xm1math.net/texmaker/index.html" diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 4f53862a7..0caf35d71 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57853 2011-11-03 15:52:53Z giovanni $ +# $Id: PKGBUILD 58055 2011-11-06 09:27:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.24 -pkgrel=2 +pkgver=0.8.25 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('9ab82f7d4d072cc6858ef92f29d6029a' +md5sums=('b7b141db18912925be08ff79fd2ead3f' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index 1a977d7bd..a75ffb68e 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=62844 +pkgver=64772 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64') @@ -40,13 +40,13 @@ build() { sed -i 's|efreet/Efreet.h|efreet-0/Efreet.h|' winlist-ng/src/e_mod_main.h || return 1 for i in alarm calendar comp-scale cpu diskio deskshow \ - empris engage eooorg everything-aspell everything-mpris \ - everything-places everything-shotgun \ - everything-wallpaper everything-websearch \ + empris engage eooorg e-tiling everything-aspell everything-mpris \ + everything-pidgin everything-places everything-shotgun \ + everything-tracker everything-wallpaper everything-websearch \ execwatch flame forecasts iiirk itask language mail mem \ - moon mpdule net news notification penguins photo places quickaccess \ + moon mpdule net news penguins photo places quickaccess \ rain screenshot slideshow snow taskbar tclock tiling uptime \ - weather winlist-ng winselector wlan; do + weather winlist-ng winselector wlan xkbswitch; do cd $i ./autogen.sh --prefix=/usr @@ -59,13 +59,13 @@ package() { cd $srcdir/$_svnmod-build for i in alarm calendar comp-scale cpu diskio deskshow \ - empris engage eooorg everything-aspell everything-mpris \ - everything-places everything-shotgun \ - everything-wallpaper everything-websearch \ + empris engage eooorg e-tiling everything-aspell everything-mpris \ + everything-pidgin everything-places everything-shotgun \ + everything-tracker everything-wallpaper everything-websearch \ execwatch flame forecasts iiirk itask language mail mem \ - moon mpdule net news notification penguins photo places quickaccess \ + moon mpdule net news penguins photo places quickaccess \ rain screenshot slideshow snow taskbar tclock tiling uptime \ - weather winlist-ng winselector wlan; do + weather winlist-ng winselector wlan xkbswitch; do cd $i make DESTDIR=$pkgdir install diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index 47bd88946..9dca2de4f 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54908 2011-08-27 14:51:01Z rvanharen $ +# $Id: PKGBUILD 58075 2011-11-06 10:13:58Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=62822 +pkgver=64801 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index 5fa4c1f32..7c8118bc1 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54905 2011-08-27 14:49:26Z rvanharen $ +# $Id: PKGBUILD 58073 2011-11-06 10:12:55Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e_dbus-svn -pkgver=61974 +pkgver=64761 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index 1f970b620..c86eacb82 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54894 2011-08-27 14:45:17Z rvanharen $ +# $Id: PKGBUILD 58089 2011-11-06 13:31:05Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=62785 +pkgver=64802 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64') diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index ad2b036e2..369425178 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54900 2011-08-27 14:47:46Z rvanharen $ +# $Id: PKGBUILD 58090 2011-11-06 13:31:38Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=62791 +pkgver=64793 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index 8c7f85846..7da79c631 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54890 2011-08-27 14:43:26Z rvanharen $ +# $Id: PKGBUILD 58091 2011-11-06 13:32:00Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet-svn -pkgver=62590 +pkgver=64494 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index 38abf7c37..6b0e871aa 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: bluebugs pkgname=eeze-svn -pkgver=62160 +pkgver=63230 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index 921a470cc..fa3d8cb5b 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54902 2011-08-27 14:48:35Z rvanharen $ +# $Id: PKGBUILD 58071 2011-11-06 10:11:44Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=efreet-svn -pkgver=62616 +pkgver=64137 pkgrel=1 pkgdesc="freedesktop.org specifications for e17" arch=('i686' 'x86_64') diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 9a78eb3c0..938434454 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54889 2011-08-27 14:42:42Z rvanharen $ +# $Id: PKGBUILD 58057 2011-11-06 10:03:11Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=62813 +pkgver=64778 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64') diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index 6b77a578a..fe53120c5 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=62830 +pkgver=64794 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64') diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index 2b3046f8f..081fcf857 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54898 2011-08-27 14:46:48Z rvanharen $ +# $Id: PKGBUILD 58067 2011-11-06 10:07:33Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo-svn -pkgver=62382 +pkgver=64802 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64') diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index f62152dc8..8f5405bac 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54892 2011-08-27 14:44:08Z rvanharen $ +# $Id: PKGBUILD 58061 2011-11-06 10:05:15Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=62798 +pkgver=64779 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index cfdf2ea1f..c88386caa 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57868 2011-11-03 22:36:48Z lcarlier $ +# $Id: PKGBUILD 58131 2011-11-06 19:03:02Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.23.1 -pkgrel=3 +pkgrel=4 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index bc618282e..1fb966840 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56505 2011-10-07 13:41:51Z spupykin $ +# $Id: PKGBUILD 58115 2011-11-06 17:48:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.5.0.4 +pkgver=1.5.0.6 pkgrel=1 pkgdesc="image procession framework" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema options=('docs' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz" opencv-buildfix.patch) -md5sums=('8a1fe1207fb09fa2d515ccd484be521c' +md5sums=('01ddab64ed2d127c2ee35602a3e141f5' 'f135182ced743c296e08ddd560fa6be9') build() { diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD index 6d589aba8..598c427f0 100644 --- a/community/i3lock/PKGBUILD +++ b/community/i3lock/PKGBUILD @@ -1,17 +1,17 @@ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3lock -pkgver=2.1 +pkgver=2.2 pkgrel=1 pkgdesc="An improved screenlocker based upon XCB and PAM" arch=('i686' 'x86_64') -url="http://i3.zekjur.net/i3lock/" +url="http://i3wm.org/i3lock/" license=('MIT') groups=("i3") depends=('xcb-util' 'pam') options=('docs') -source=(http://i3.zekjur.net/i3lock/$pkgname-$pkgver.tar.gz) -md5sums=('6a86f0032eb0c09e557afae998cbe000') +source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2") +md5sums=('6179a1611e333c8baf54093b57d50687') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD index 18c8221a8..87a39c562 100644 --- a/community/kmymoney/PKGBUILD +++ b/community/kmymoney/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57452 2011-10-27 21:53:29Z lcarlier $ +# $Id: PKGBUILD 58094 2011-11-06 14:12:09Z lcarlier $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Vamp898 <vamp898@web.de> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Todd Maynard <arch@toddmaynard.com> pkgname=kmymoney -pkgver=4.6.0 +pkgver=4.6.1 pkgrel=1 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ install=$pkgname.install changelog=$pkgname.changelog options=('!makeflags') source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2) -sha256sums=('8f034a92682cc61dfa76c2593893524d00658c49360b17ddc67671e32ec7edf8') +sha256sums=('5fcab9c4f1b5868aabb816a87c61cb025e69a191f6cb218cce3f29f0c1c1b77a') build() { cd ${srcdir} diff --git a/community/libalkimia/PKGBUILD b/community/libalkimia/PKGBUILD index 18a86ae47..2f14f4bf6 100644 --- a/community/libalkimia/PKGBUILD +++ b/community/libalkimia/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57450 2011-10-27 21:27:30Z lcarlier $ +# $Id: PKGBUILD 58105 2011-11-06 17:14:04Z lcarlier $ # Contributor: gumper <gumper1034@gmail.com> pkgname=libalkimia pkgver=4.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC." depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index 26409e5a0..d8cccccfa 100755 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48689 2011-06-04 20:28:04Z lcarlier $ +# $Id: PKGBUILD 58129 2011-11-06 19:02:46Z lcarlier $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=libfbclient -pkgver=2.5.0.26074 -pkgrel=3 +pkgver=2.5.1.26351 +pkgrel=1 pkgdesc="Client library for Firebird." arch=('i686' 'x86_64') url="http://www.firebirdsql.org/" @@ -12,7 +12,7 @@ license=('custom') depends=('gcc-libs' 'icu') source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2 LICENSE) -md5sums=('780f162ee71f087fc277adf09f966529' +md5sums=('1772fba4f09c8fc84d989282405f90fd' '0d61798861e159c85dbdf0f30fe2f2ce') build() { diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index cb6b513d3..36ad9a5fe 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56030 2011-09-29 09:40:54Z spupykin $ +# $Id: PKGBUILD 58117 2011-11-06 17:51:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.15 +pkgver=0.9.16 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('fb726a48095cc6b25c245dbc27ea76b0') +md5sums=('e1240c6ae383b5be89431932f181898a') build() { cd ${pkgname}-${pkgver} diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 12462f625..8149a3a9b 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57938 2011-11-04 18:07:05Z bpiotrowski $ +# $Id: PKGBUILD 58107 2011-11-06 17:20:02Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=5 +pkgrel=6 pkgdesc="Lightweight Display Manager (part of LXDE)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lxdm/" @@ -41,7 +41,8 @@ package() { install -m644 ${srcdir}/lxdm-pam.patch ${pkgdir}/etc/pam.d/lxdm install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm - + install -d ${pkgdir}/var/{lib,run}/lxdm + # fix the greeter location sed -i -e "s/local\/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf } diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index d45cbd58d..726a37137 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,24 +3,22 @@ pkgname=root pkgver=5.30.03 -pkgrel=1 +pkgrel=3 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') url='http://root.cern.ch' license=('LGPL2.1') depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' - 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran') + 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme') makedepends=('fftw') install='root.install' source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'root.sh' 'rootd' - 'root.desktop' 'root.xml') -md5sums=('d2c39bf7640bdd26d4645c52c504cc24' +md5sums=('da46aac87047acc41a67b24c05fc465f' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' - 'ac61b17395d75a2705fefa2ef841a6bf' 'e2cf69b204192b5889ceb5b4dedc66f7') build() { @@ -78,10 +76,20 @@ package() { ${pkgdir}/etc/profile.d/root.sh install -D ${srcdir}/rootd \ ${pkgdir}/etc/rc.d/rootd - install -D -m644 ${srcdir}/root.desktop \ - ${pkgdir}/usr/share/applications/root.desktop install -D -m644 ${srcdir}/root.xml \ ${pkgdir}/usr/share/mime/packages/root.xml + install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \ + ${pkgdir}/usr/share/applications/root-system-bin.desktop + # replace @prefix@ with /usr for the desktop + sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop + + install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \ + ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png + + # use a file that pacman can track instead of adding directly to ld.so.conf + install -d ${pkgdir}/etc/ld.so.conf.d + echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf + rm -rf ${pkgdir}/etc/root/daemons } diff --git a/community/root/root.install b/community/root/root.install index 457af7314..afabb7aea 100644 --- a/community/root/root.install +++ b/community/root/root.install @@ -1,17 +1,25 @@ post_install() { - if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then - echo "/usr/lib/root" >> etc/ld.so.conf - sbin/ldconfig -r . - fi - update-desktop-database >/dev/null update-mime-database /usr/share/mime >/dev/null + + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } pre_remove() { - cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot - mv /tmp/.pacroot etc/ld.so.conf - chmod 644 etc/ld.so.conf - sbin/ldconfig -r . + # leave for pre 5.30.03-3 + if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then + cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot + mv /tmp/.pacroot etc/ld.so.conf + chmod 644 etc/ld.so.conf + sbin/ldconfig -r . + fi +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD index 86646aa3b..9364ecbca 100644 --- a/community/swi-prolog/PKGBUILD +++ b/community/swi-prolog/PKGBUILD @@ -4,7 +4,7 @@ pkgname=swi-prolog pkgver=5.10.5 -pkgrel=1 +pkgrel=2 pkgdesc='Prolog environment' arch=('i686' 'x86_64') url='http://www.swi-prolog.org/' diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD index 0235cbcef..4990e0a51 100644 --- a/community/sxiv/PKGBUILD +++ b/community/sxiv/PKGBUILD @@ -1,22 +1,23 @@ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=sxiv -pkgver=0.9 +pkgver=1.0 pkgrel=1 pkgdesc='simple x image viewer' arch=('i686' 'x86_64') license=('GPL2') -install=('sxiv.install') +install=sxiv.install url='https://github.com/muennich/sxiv' -depends=('libx11' 'xproto' 'imlib2') +depends=('libx11' 'xproto' 'imlib2' 'desktop-file-utils') source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz" 'sxiv.desktop' - 'config.h') -md5sums=('865f1e542669ad6d7932fcd4664fb481' + 'config.h') +md5sums=('c887e0af1e4d5a101b285a46d288c419' '1dda85ff6bed4de337f8fb303075ed11' - '05c3801bf32c2861c3c7b37073664db3') + '78c71ef924095d7d6fb75222047de0bd') build() { cd "sxiv-${pkgver}" diff --git a/community/sxiv/config.h b/community/sxiv/config.h index dd9efe89f..777cb805a 100644 --- a/community/sxiv/config.h +++ b/community/sxiv/config.h @@ -1,119 +1,158 @@ +#ifdef _FEATURE_CONFIG + +/* auto-orientate jpeg files according to their exif tags? + * (requires libexif [-lexif] to be installed) + */ +#define EXIF_SUPPORT 0 +/* load all frames from gif files and support gif animations? + * (requires giflib [-lgif] to be installed) + */ +#define GIF_SUPPORT 0 + +#endif #ifdef _WINDOW_CONFIG -/* default window dimensions (overwritten via -g option): */ -enum { WIN_WIDTH = 800, WIN_HEIGHT = 600 }; +/* default window dimensions (overwritten via -g option): */ +enum { + WIN_WIDTH = 800, + WIN_HEIGHT = 600 +}; -/* default color for window background: * - * (see X(7) "COLOR NAMES" section for valid values) */ +/* default color for window background: */ static const char * const BG_COLOR = "#777777"; -/* default color for thumbnail selection: */ +/* default color for thumbnail selection: */ static const char * const SEL_COLOR = "#DDDDDD"; +/* (see X(7) section "COLOR NAMES" for valid values) */ #endif #ifdef _IMAGE_CONFIG -/* how should images be scaled when they are loaded?: * - * (also controllable via -d/-s/-Z/-z options) * - * SCALE_DOWN: 100%, but fit large images into window, * - * SCALE_FIT: fit all images into window, * - * SCALE_ZOOM: use current zoom level, 100% at startup */ +/* how should images be scaled when they are loaded? + * (also controllable via -d/-s/-Z/-z options) + * SCALE_DOWN: 100%, but fit large images into window, + * SCALE_FIT: fit all images into window, + * SCALE_ZOOM: use current zoom level, 100% at startup + */ static const scalemode_t SCALE_MODE = SCALE_DOWN; -/* levels (percent) to use when zooming via '-' and '+': */ +/* levels (in percent) to use when zooming via '-' and '+': + * (first/last value is used as min/max zoom level) + */ static const float zoom_levels[] = { 12.5, 25.0, 50.0, 75.0, 100.0, 150.0, 200.0, 400.0, 800.0 }; +/* default slideshow delay (in sec, overwritten via -S option): */ +enum { SLIDESHOW_DELAY = 5 }; + +/* default settings for multi-frame gif images: */ +enum { + GIF_DELAY = 100, /* delay time (in ms) */ + GIF_AUTOPLAY = 1, /* autoplay when loaded [0/1] */ + GIF_LOOP = 0 /* endless loop [0/1] */ +}; + #endif #ifdef _THUMBS_CONFIG -/* default dimension of thumbnails (width == height): */ +/* default dimension of thumbnails (width == height): */ enum { THUMB_SIZE = 60 }; #endif #ifdef _MAPPINGS_CONFIG -/* keyboard mappings for image and thumbnail mode: */ +/* keyboard mappings for image and thumbnail mode: */ static const keymap_t keys[] = { - /* ctrl key function argument */ - { False, XK_q, quit, (arg_t) None }, - { False, XK_r, reload, (arg_t) None }, - { False, XK_f, toggle_fullscreen, (arg_t) None }, - { False, XK_a, toggle_antialias, (arg_t) None }, - { False, XK_A, toggle_alpha, (arg_t) None }, - { False, XK_Return, switch_mode, (arg_t) None }, - - { False, XK_g, first, (arg_t) None }, - { False, XK_G, last, (arg_t) None }, - { False, XK_n, navigate, (arg_t) +1 }, - { False, XK_space, navigate, (arg_t) +1 }, - { False, XK_p, navigate, (arg_t) -1 }, - { False, XK_BackSpace, navigate, (arg_t) -1 }, - { False, XK_bracketright, navigate, (arg_t) +10 }, - { False, XK_bracketleft, navigate, (arg_t) -10 }, - - { False, XK_D, remove_image, (arg_t) None }, - - { False, XK_h, move, (arg_t) DIR_LEFT }, - { False, XK_Left, move, (arg_t) DIR_LEFT }, - { False, XK_j, move, (arg_t) DIR_DOWN }, - { False, XK_Down, move, (arg_t) DIR_DOWN }, - { False, XK_k, move, (arg_t) DIR_UP }, - { False, XK_Up, move, (arg_t) DIR_UP }, - { False, XK_l, move, (arg_t) DIR_RIGHT }, - { False, XK_Right, move, (arg_t) DIR_RIGHT }, - - { True, XK_h, pan_screen, (arg_t) DIR_LEFT }, - { True, XK_Left, pan_screen, (arg_t) DIR_LEFT }, - { True, XK_j, pan_screen, (arg_t) DIR_DOWN }, - { True, XK_Down, pan_screen, (arg_t) DIR_DOWN }, - { True, XK_k, pan_screen, (arg_t) DIR_UP }, - { True, XK_Up, pan_screen, (arg_t) DIR_UP }, - { True, XK_l, pan_screen, (arg_t) DIR_RIGHT }, - { True, XK_Right, pan_screen, (arg_t) DIR_RIGHT }, - - { False, XK_H, pan_edge, (arg_t) DIR_LEFT }, - { False, XK_J, pan_edge, (arg_t) DIR_DOWN }, - { False, XK_K, pan_edge, (arg_t) DIR_UP }, - { False, XK_L, pan_edge, (arg_t) DIR_RIGHT }, - - { False, XK_plus, zoom, (arg_t) +1 }, - { False, XK_equal, zoom, (arg_t) +1 }, - { False, XK_KP_Add, zoom, (arg_t) +1 }, - { False, XK_minus, zoom, (arg_t) -1 }, - { False, XK_KP_Subtract, zoom, (arg_t) -1 }, - { False, XK_0, zoom, (arg_t) None }, - { False, XK_KP_0, zoom, (arg_t) None }, - { False, XK_w, fit_to_win, (arg_t) None }, - { False, XK_W, fit_to_img, (arg_t) None }, - - { False, XK_less, rotate, (arg_t) DIR_LEFT }, - { False, XK_greater, rotate, (arg_t) DIR_RIGHT }, - - /* open the current image with given program: */ - { True, XK_g, open_with, (arg_t) "gimp" }, - - /* run shell command line on the current file, - * '#' is replaced by filename: */ - { True, XK_less, run_command, (arg_t) "mogrify -rotate -90 #" }, - { True, XK_greater, run_command, (arg_t) "mogrify -rotate +90 #" }, - { True, XK_comma, run_command, (arg_t) "jpegtran -rotate 270 -copy all -outfile # #" }, - { True, XK_period, run_command, (arg_t) "jpegtran -rotate 90 -copy all -outfile # #" }, + /* ctrl key function argument */ + { false, XK_q, it_quit, (arg_t) None }, + { false, XK_Return, it_switch_mode, (arg_t) None }, + { false, XK_f, it_toggle_fullscreen, (arg_t) None }, + + { false, XK_r, it_reload_image, (arg_t) None }, + { false, XK_D, it_remove_image, (arg_t) None }, + + { false, XK_n, i_navigate, (arg_t) +1 }, + { false, XK_space, i_navigate, (arg_t) +1 }, + { false, XK_p, i_navigate, (arg_t) -1 }, + { false, XK_BackSpace, i_navigate, (arg_t) -1 }, + { false, XK_bracketright, i_navigate, (arg_t) +10 }, + { false, XK_bracketleft, i_navigate, (arg_t) -10 }, + { false, XK_g, it_first, (arg_t) None }, + { false, XK_G, it_n_or_last, (arg_t) None }, + + { true, XK_n, i_navigate_frame, (arg_t) +1 }, + { true, XK_p, i_navigate_frame, (arg_t) -1 }, + { true, XK_space, i_toggle_animation, (arg_t) None }, + + { false, XK_h, it_scroll_move, (arg_t) DIR_LEFT }, + { false, XK_Left, it_scroll_move, (arg_t) DIR_LEFT }, + { false, XK_j, it_scroll_move, (arg_t) DIR_DOWN }, + { false, XK_Down, it_scroll_move, (arg_t) DIR_DOWN }, + { false, XK_k, it_scroll_move, (arg_t) DIR_UP }, + { false, XK_Up, it_scroll_move, (arg_t) DIR_UP }, + { false, XK_l, it_scroll_move, (arg_t) DIR_RIGHT }, + { false, XK_Right, it_scroll_move, (arg_t) DIR_RIGHT }, + + { true, XK_h, it_scroll_screen, (arg_t) DIR_LEFT }, + { true, XK_Left, it_scroll_screen, (arg_t) DIR_LEFT }, + { true, XK_j, it_scroll_screen, (arg_t) DIR_DOWN }, + { true, XK_Down, it_scroll_screen, (arg_t) DIR_DOWN }, + { true, XK_k, it_scroll_screen, (arg_t) DIR_UP }, + { true, XK_Up, it_scroll_screen, (arg_t) DIR_UP }, + { true, XK_l, it_scroll_screen, (arg_t) DIR_RIGHT }, + { true, XK_Right, it_scroll_screen, (arg_t) DIR_RIGHT }, + + { false, XK_H, i_scroll_to_edge, (arg_t) DIR_LEFT }, + { false, XK_J, i_scroll_to_edge, (arg_t) DIR_DOWN }, + { false, XK_K, i_scroll_to_edge, (arg_t) DIR_UP }, + { false, XK_L, i_scroll_to_edge, (arg_t) DIR_RIGHT }, + + { false, XK_plus, i_zoom, (arg_t) +1 }, + { false, XK_KP_Add, i_zoom, (arg_t) +1 }, + { false, XK_minus, i_zoom, (arg_t) -1 }, + { false, XK_KP_Subtract, i_zoom, (arg_t) -1 }, + { false, XK_equal, i_set_zoom, (arg_t) 100 }, + { false, XK_w, i_fit_to_win, (arg_t) None }, + { false, XK_W, i_fit_to_img, (arg_t) None }, + + { false, XK_less, i_rotate, (arg_t) DIR_LEFT }, + { false, XK_greater, i_rotate, (arg_t) DIR_RIGHT }, + + { false, XK_s, i_toggle_slideshow, (arg_t) None }, + { true, XK_plus, i_adjust_slideshow, (arg_t) +1 }, + { true, XK_minus, i_adjust_slideshow, (arg_t) -1 }, + { true, XK_equal, i_reset_slideshow, (arg_t) None }, + + { false, XK_a, i_toggle_antialias, (arg_t) None }, + { false, XK_A, it_toggle_alpha, (arg_t) None }, + + /* open current image with given program: */ + { true, XK_g, it_open_with, (arg_t) "gimp" }, + + /* run shell command line on current file ("$SXIV_IMG"): */ + { true, XK_less, it_shell_cmd, (arg_t) \ + "mogrify -rotate -90 \"$SXIV_IMG\"" }, + { true, XK_greater, it_shell_cmd, (arg_t) \ + "mogrify -rotate +90 \"$SXIV_IMG\"" }, + { true, XK_comma, it_shell_cmd, (arg_t) \ + "jpegtran -rotate 270 -copy all -outfile \"$SXIV_IMG\" \"$SXIV_IMG\"" }, + { true, XK_period, it_shell_cmd, (arg_t) \ + "jpegtran -rotate 90 -copy all -outfile \"$SXIV_IMG\" \"$SXIV_IMG\"" }, }; -/* mouse button mappings for image mode: */ +/* mouse button mappings for image mode: */ static const button_t buttons[] = { - /* ctrl shift button function argument */ - { False, False, Button1, navigate, (arg_t) +1 }, - { False, False, Button3, navigate, (arg_t) -1 }, - { False, False, Button2, drag, (arg_t) None }, - { False, False, Button4, move, (arg_t) DIR_UP }, - { False, False, Button5, move, (arg_t) DIR_DOWN }, - { False, True, Button4, move, (arg_t) DIR_LEFT }, - { False, True, Button5, move, (arg_t) DIR_RIGHT }, - { True, False, Button4, zoom, (arg_t) +1 }, - { True, False, Button5, zoom, (arg_t) -1 }, + /* ctrl shift button function argument */ + { false, false, Button1, i_navigate, (arg_t) +1 }, + { false, false, Button3, i_navigate, (arg_t) -1 }, + { false, false, Button2, i_drag, (arg_t) None }, + { false, false, Button4, it_scroll_move, (arg_t) DIR_UP }, + { false, false, Button5, it_scroll_move, (arg_t) DIR_DOWN }, + { false, true, Button4, it_scroll_move, (arg_t) DIR_LEFT }, + { false, true, Button5, it_scroll_move, (arg_t) DIR_RIGHT }, + { true, false, Button4, i_zoom, (arg_t) +1 }, + { true, false, Button5, i_zoom, (arg_t) -1 }, }; #endif diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install index 410e17b44..c50e26c78 100644 --- a/community/sxiv/sxiv.install +++ b/community/sxiv/sxiv.install @@ -1,4 +1,6 @@ post_install () { + update-desktop-database -q + echo "* Look into config.h to customize sxiv to your needs." echo " Use 'makepkg --skipinteg' to rebuild the package after changing config.h." echo "* Create the directory ~/.sxiv/ to enable thumbnail caching." diff --git a/community/xylib/PKGBUILD b/community/xylib/PKGBUILD index d9e22e4da..ca6ba4e32 100644 --- a/community/xylib/PKGBUILD +++ b/community/xylib/PKGBUILD @@ -2,7 +2,7 @@ pkgname=xylib pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc='xylib is a portable C++ library for reading files that contain x-y data from powder diffraction, spectroscopy or other experimental methods.' arch=('i686' 'x86_64') url='http://www.unipress.waw.pl/fityk/xylib/' diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index ad0588a51..e01894138 100644 --- a/core/dnsutils/PKGBUILD +++ b/core/dnsutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137098 2011-09-06 08:10:05Z bisson $ +# $Id: PKGBUILD 142197 2011-11-06 05:47:32Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: mario <mario_vazq@hotmail.com> @@ -8,14 +8,14 @@ pkgname=dnsutils # Use a period and not a hyphen before the patch level for proper versioning. pkgver=9.8.1 _pkgver=9.8.1 -pkgrel=1 +pkgrel=2 pkgdesc='DNS utilities: dig host nslookup' url='http://www.isc.org/software/bind/' license=('custom:ISC') arch=('i686' 'x86_64') -depends=('openssl' 'idnkit') options=('!makeflags') +depends=('openssl' 'krb5' 'idnkit') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'remove-bind.patch') sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c' @@ -52,5 +52,4 @@ package() { cd bin make DESTDIR="${pkgdir}" install - } diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD index 9daf035ad..6062d4952 100644 --- a/core/expat/PKGBUILD +++ b/core/expat/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 102953 2010-12-13 13:44:48Z stephane $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 142209 2011-11-06 08:56:53Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=expat pkgver=2.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="An XML parser library" arch=('i686' 'x86_64') -url="http://expat.sourceforge.net" +url="http://expat.sourceforge.net/" license=('custom') depends=('glibc') options=('!libtool') @@ -19,15 +19,20 @@ md5sums=('ee8b492592568805593f81f8cdf2a04c' 'f3eeb796f28945899216b815e5901996') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i $srcdir/CVE-2009-3560.patch patch -Np1 -i $srcdir/CVE-2009-3720.patch ./configure --prefix=/usr --mandir=/usr/share/man make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 8715f7d04..8da7cbee6 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 137571 2011-09-09 20:06:23Z ronald $ +# $Id: PKGBUILD 142199 2011-11-06 05:47:47Z bisson $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables pkgver=1.4.12.1 -pkgrel=1 -pkgdesc="A Linux kernel packet control tool" +pkgrel=2 +pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') -url="http://www.netfilter.org/projects/iptables/index.html" +url='http://www.netfilter.org/projects/iptables/index.html' depends=('glibc' 'bash') makedepends=('linux-api-headers') options=('!libtool') -source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2 +source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2" iptables ip6tables empty.rules @@ -35,6 +35,7 @@ sha1sums=('86022c3b5129ad7105f5087ec1349e99cc5a9728' '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e') + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -43,7 +44,7 @@ build() { sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in # FS#25358: libxt_statistic.so undefined symbol: lround - export LDFLAGS="-lm" + export LDFLAGS='-lm' ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ @@ -64,6 +65,6 @@ package() { install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables - mkdir -p "${pkgdir}/var/lib/iptables" - install -m644 empty-{filter,mangle,nat,raw,security}.rules ${pkgdir}/var/lib/iptables/ + mkdir -p "${pkgdir}"/var/lib/iptables + install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables } diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 38cf23966..065797f99 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141000 2011-10-21 02:57:57Z stephane $ +# $Id: PKGBUILD 142223 2011-11-06 13:03:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 -pkgver=1.9.1 -pkgrel=5 +pkgver=1.9.2 +pkgrel=1 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -17,15 +17,13 @@ backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar krb5-kadmind krb5-kdc - krb5-1.9.1-config-script.patch - krb5-1.9.1-canonicalize-fallback.patch - krb5-1.9.1-2011-006.patch) -sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' + krb5-kpropd + krb5-1.9.1-config-script.patch) +sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' - '7342410760cf44bfa01bb99bb4c49e12496cb46f' - '238c268fa6cb42fc7324ab54db9abda5cd77f833' - '0b0016b0e341dcf720f67925b0d451b328e02583') + '7f402078fa65bb9ff1beb6cbbbb017450df78560' + '7342410760cf44bfa01bb99bb4c49e12496cb46f') options=('!emptydirs') build() { @@ -43,16 +41,9 @@ build() { # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch - # FS#25515 - patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch - # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 - # KDC denial of service vulnerabilities - # http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-006.txt - patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-006.patch - export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" export CPPFLAGS+=" -I/usr/include/et" ./configure --prefix=/usr \ @@ -81,8 +72,9 @@ package() { install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf install -dm 755 "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kpropd "${pkgdir}"/etc/rc.d install -dm 755 "${pkgdir}"/usr/share/aclocal install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal diff --git a/core/krb5/krb5-kpropd b/core/krb5/krb5-kpropd new file mode 100644 index 000000000..a0077d68e --- /dev/null +++ b/core/krb5/krb5-kpropd @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kpropd` +case "$1" in + start) + stat_busy "Starting Kerberos Database Propagation Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kpropd -S + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon kpropd + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Database Propagation Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kpropd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD index 6afa61fee..5e5bba5e8 100644 --- a/core/libcap/PKGBUILD +++ b/core/libcap/PKGBUILD @@ -1,17 +1,18 @@ -#$Id: PKGBUILD 132720 2011-07-25 12:05:15Z allan $ +#$Id: PKGBUILD 142211 2011-11-06 08:56:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libcap pkgver=2.22 -pkgrel=1 +pkgrel=2 pkgdesc="POSIX 1003.1e capabilities" arch=('i686' 'x86_64') url="http://sites.google.com/site/fullycapable/" license=('GPL2') depends=('glibc' 'attr') -source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz) -md5sums=('b4896816b626bea445f0b3849bdd4077') +source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz{,.asc}) +md5sums=('b4896816b626bea445f0b3849bdd4077' + '9d0983e25e5a251d098507f9561d2b27') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch b/core/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch new file mode 100644 index 000000000..1fce472b7 --- /dev/null +++ b/core/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch @@ -0,0 +1,344 @@ +From bc937fc4ff6715e9bee939041fa02be0755d7d58 Mon Sep 17 00:00:00 2001 +From: Guy Harris <guy@alum.mit.edu> +Date: Sat, 13 Nov 2010 17:42:47 -0800 +Subject: [PATCH] Add support for libnl 2.x, adapted from a newer version of the iw command. + +--- + config.h.in | 3 ++ + configure | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + configure.in | 40 ++++++++++++++++++---- + pcap-linux.c | 58 ++++++++++++++++++++++++------- + 4 files changed, 184 insertions(+), 25 deletions(-) + +diff --git a/config.h.in b/config.h.in +index f988e8f..3b9ce3c 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -52,6 +52,9 @@ + /* if libnl exists */ + #undef HAVE_LIBNL + ++/* if libnl exists and is version 2.x */ ++#undef HAVE_LIBNL_2_x ++ + /* Define to 1 if you have the <limits.h> header file. */ + #undef HAVE_LIMITS_H + +diff --git a/configure b/configure +index c99c1ab..7338dee 100755 +--- a/configure ++++ b/configure +@@ -7340,7 +7340,93 @@ fi + + + if test x$with_libnl != xno ; then +- { echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5 ++ # ++ # Try libnl 2.x first. ++ # ++ { echo "$as_me:$LINENO: checking for nl_socket_alloc in -lnl" >&5 ++echo $ECHO_N "checking for nl_socket_alloc in -lnl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_nl_nl_socket_alloc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lnl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char nl_socket_alloc (); ++int ++main () ++{ ++return nl_socket_alloc (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ac_cv_lib_nl_nl_socket_alloc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_nl_nl_socket_alloc=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_socket_alloc" >&5 ++echo "${ECHO_T}$ac_cv_lib_nl_nl_socket_alloc" >&6; } ++if test $ac_cv_lib_nl_nl_socket_alloc = yes; then ++ ++ # ++ # Yes, we have libnl 2.x. ++ # ++ LIBS="-lnl-genl -lnl $LIBS" ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBNL 1 ++_ACEOF ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBNL_2_x 1 ++_ACEOF ++ ++ ++else ++ ++ # ++ # No, we don't; do we have libnl 1.x? ++ # ++ { echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5 + echo $ECHO_N "checking for nl_handle_alloc in -lnl... $ECHO_C" >&6; } + if test "${ac_cv_lib_nl_nl_handle_alloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7402,18 +7488,30 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_handle_alloc" >&5 + echo "${ECHO_T}$ac_cv_lib_nl_nl_handle_alloc" >&6; } + if test $ac_cv_lib_nl_nl_handle_alloc = yes; then +- LIBS="-lnl $LIBS" ++ ++ # ++ # Yes. ++ # ++ LIBS="-lnl $LIBS" + + cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBNL 1 + _ACEOF + ++ + else +- if test x$with_libnl = xyes ; then +- { { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5 ++ ++ # ++ # No, we don't have libnl at all. ++ # ++ if test x$with_libnl = xyes ; then ++ { { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5 + echo "$as_me: error: libnl support requested but libnl not found" >&2;} + { (exit 1); exit 1; }; } +- fi ++ fi ++ ++fi ++ + + fi + +diff --git a/configure.in b/configure.in +index 16eadf9..ef801ed 100644 +--- a/configure.in ++++ b/configure.in +@@ -445,13 +445,39 @@ linux) + with_libnl=$withval,,) + + if test x$with_libnl != xno ; then +- AC_CHECK_LIB(nl, nl_handle_alloc, +- LIBS="-lnl $LIBS" +- AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]), +- if test x$with_libnl = xyes ; then +- AC_MSG_ERROR([libnl support requested but libnl not found]) +- fi +- ) ++ # ++ # Try libnl 2.x first. ++ # ++ AC_CHECK_LIB(nl, nl_socket_alloc, ++ [ ++ # ++ # Yes, we have libnl 2.x. ++ # ++ LIBS="-lnl-genl -lnl $LIBS" ++ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) ++ AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x]) ++ ], ++ [ ++ # ++ # No, we don't; do we have libnl 1.x? ++ # ++ AC_CHECK_LIB(nl, nl_handle_alloc, ++ [ ++ # ++ # Yes. ++ # ++ LIBS="-lnl $LIBS" ++ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) ++ ], ++ [ ++ # ++ # No, we don't have libnl at all. ++ # ++ if test x$with_libnl = xyes ; then ++ AC_MSG_ERROR([libnl support requested but libnl not found]) ++ fi ++ ]) ++ ]) + fi + + AC_LBL_TPACKET_STATS +diff --git a/pcap-linux.c b/pcap-linux.c +index f8b3f10..deabbc4 100644 +--- a/pcap-linux.c ++++ b/pcap-linux.c +@@ -527,8 +527,37 @@ get_mac80211_phydev(pcap_t *handle, const char *device, char *phydev_path, + return 1; + } + ++#ifndef HAVE_LIBNL_2_x ++/* libnl 2.x compatibility code */ ++ ++#define nl_sock nl_handle ++ ++static inline struct nl_handle * ++nl_socket_alloc(void) ++{ ++ return nl_handle_alloc(); ++} ++ ++static inline void ++nl_socket_free(struct nl_handle *h) ++{ ++ nl_handle_destroy(h); ++} ++ ++static inline int ++__genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache) ++{ ++ struct nl_cache *tmp = genl_ctrl_alloc_cache(h); ++ if (!tmp) ++ return -ENOMEM; ++ *cache = tmp; ++ return 0; ++} ++#define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache ++#endif /* !HAVE_LIBNL_2_x */ ++ + struct nl80211_state { +- struct nl_handle *nl_handle; ++ struct nl_sock *nl_sock; + struct nl_cache *nl_cache; + struct genl_family *nl80211; + }; +@@ -536,23 +565,26 @@ struct nl80211_state { + static int + nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device) + { +- state->nl_handle = nl_handle_alloc(); +- if (!state->nl_handle) { ++ int err; ++ ++ state->nl_sock = nl_socket_alloc(); ++ if (!state->nl_sock) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: failed to allocate netlink handle", device); + return PCAP_ERROR; + } + +- if (genl_connect(state->nl_handle)) { ++ if (genl_connect(state->nl_sock)) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: failed to connect to generic netlink", device); + goto out_handle_destroy; + } + +- state->nl_cache = genl_ctrl_alloc_cache(state->nl_handle); +- if (!state->nl_cache) { ++ err = genl_ctrl_alloc_cache(state->nl_sock, &state->nl_cache); ++ if (err < 0) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, +- "%s: failed to allocate generic netlink cache", device); ++ "%s: failed to allocate generic netlink cache: %s", ++ device, strerror(-err)); + goto out_handle_destroy; + } + +@@ -568,7 +600,7 @@ nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device) + out_cache_free: + nl_cache_free(state->nl_cache); + out_handle_destroy: +- nl_handle_destroy(state->nl_handle); ++ nl_socket_free(state->nl_sock); + return PCAP_ERROR; + } + +@@ -577,7 +609,7 @@ nl80211_cleanup(struct nl80211_state *state) + { + genl_family_put(state->nl80211); + nl_cache_free(state->nl_cache); +- nl_handle_destroy(state->nl_handle); ++ nl_socket_free(state->nl_sock); + } + + static int +@@ -605,7 +637,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + NLA_PUT_STRING(msg, NL80211_ATTR_IFNAME, mondevice); + NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_MONITOR); + +- err = nl_send_auto_complete(state->nl_handle, msg); ++ err = nl_send_auto_complete(state->nl_sock, msg); + if (err < 0) { + if (err == -ENFILE) { + /* +@@ -626,7 +658,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + return PCAP_ERROR; + } + } +- err = nl_wait_for_ack(state->nl_handle); ++ err = nl_wait_for_ack(state->nl_sock); + if (err < 0) { + if (err == -ENFILE) { + /* +@@ -685,7 +717,7 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + 0, NL80211_CMD_DEL_INTERFACE, 0); + NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex); + +- err = nl_send_auto_complete(state->nl_handle, msg); ++ err = nl_send_auto_complete(state->nl_sock, msg); + if (err < 0) { + if (err == -ENFILE) { + /* +@@ -706,7 +738,7 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + return PCAP_ERROR; + } + } +- err = nl_wait_for_ack(state->nl_handle); ++ err = nl_wait_for_ack(state->nl_sock); + if (err < 0) { + if (err == -ENFILE) { + /* +-- +1.7.3.5 + diff --git a/core/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch b/core/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch new file mode 100644 index 000000000..219494200 --- /dev/null +++ b/core/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch @@ -0,0 +1,159 @@ +From 9545ff8e2670db02652f9cf781aafdd6bac58ac4 Mon Sep 17 00:00:00 2001 +From: Guy Harris <guy@alum.mit.edu> +Date: Sun, 14 Nov 2010 13:48:19 -0800 +Subject: [PATCH] Libnl 2.x returns its own error codes, not errnos; handle that. + +While we're at it, don't special-case ENFILE for "delete monitor device" +operations; that's not like "add monitor device", where we want to drive +on if a device with that name already exists. +--- + pcap-linux.c | 76 ++++++++++++++++++++++++++-------------------------------- + 1 files changed, 34 insertions(+), 42 deletions(-) + +diff --git a/pcap-linux.c b/pcap-linux.c +index deabbc4..5d291e9 100644 +--- a/pcap-linux.c ++++ b/pcap-linux.c +@@ -527,7 +527,9 @@ get_mac80211_phydev(pcap_t *handle, const char *device, char *phydev_path, + return 1; + } + +-#ifndef HAVE_LIBNL_2_x ++#ifdef HAVE_LIBNL_2_x ++#define get_nl_errmsg nl_geterror ++#else + /* libnl 2.x compatibility code */ + + #define nl_sock nl_handle +@@ -544,6 +546,8 @@ nl_socket_free(struct nl_handle *h) + nl_handle_destroy(h); + } + ++#define get_nl_errmsg strerror ++ + static inline int + __genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache) + { +@@ -584,7 +588,7 @@ nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device) + if (err < 0) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: failed to allocate generic netlink cache: %s", +- device, strerror(-err)); ++ device, get_nl_errmsg(-err)); + goto out_handle_destroy; + } + +@@ -639,10 +643,17 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + + err = nl_send_auto_complete(state->nl_sock, msg); + if (err < 0) { ++#ifdef HAVE_LIBNL_2_x ++ if (err == -NLE_FAILURE) { ++#else + if (err == -ENFILE) { ++#endif + /* + * Device not available; our caller should just +- * keep trying. ++ * keep trying. (libnl 2.x maps ENFILE to ++ * NLE_FAILURE; it can also map other errors ++ * to that, but there's not much we can do ++ * about that.) + */ + nlmsg_free(msg); + return 0; +@@ -653,17 +664,24 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + */ + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: nl_send_auto_complete failed adding %s interface: %s", +- device, mondevice, strerror(-err)); ++ device, mondevice, get_nl_errmsg(-err)); + nlmsg_free(msg); + return PCAP_ERROR; + } + } + err = nl_wait_for_ack(state->nl_sock); + if (err < 0) { ++#ifdef HAVE_LIBNL_2_x ++ if (err == -NLE_FAILURE) { ++#else + if (err == -ENFILE) { ++#endif + /* + * Device not available; our caller should just +- * keep trying. ++ * keep trying. (libnl 2.x maps ENFILE to ++ * NLE_FAILURE; it can also map other errors ++ * to that, but there's not much we can do ++ * about that.) + */ + nlmsg_free(msg); + return 0; +@@ -674,7 +692,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + */ + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: nl_wait_for_ack failed adding %s interface: %s", +- device, mondevice, strerror(-err)); ++ device, mondevice, get_nl_errmsg(-err)); + nlmsg_free(msg); + return PCAP_ERROR; + } +@@ -719,45 +737,19 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + + err = nl_send_auto_complete(state->nl_sock, msg); + if (err < 0) { +- if (err == -ENFILE) { +- /* +- * Device not available; our caller should just +- * keep trying. +- */ +- nlmsg_free(msg); +- return 0; +- } else { +- /* +- * Real failure, not just "that device is not +- * available. +- */ +- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, +- "%s: nl_send_auto_complete failed deleting %s interface: %s", +- device, mondevice, strerror(-err)); +- nlmsg_free(msg); +- return PCAP_ERROR; +- } ++ snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, ++ "%s: nl_send_auto_complete failed deleting %s interface: %s", ++ device, mondevice, get_nl_errmsg(-err)); ++ nlmsg_free(msg); ++ return PCAP_ERROR; + } + err = nl_wait_for_ack(state->nl_sock); + if (err < 0) { +- if (err == -ENFILE) { +- /* +- * Device not available; our caller should just +- * keep trying. +- */ +- nlmsg_free(msg); +- return 0; +- } else { +- /* +- * Real failure, not just "that device is not +- * available. +- */ +- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, +- "%s: nl_wait_for_ack failed adding %s interface: %s", +- device, mondevice, strerror(-err)); +- nlmsg_free(msg); +- return PCAP_ERROR; +- } ++ snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, ++ "%s: nl_wait_for_ack failed adding %s interface: %s", ++ device, mondevice, get_nl_errmsg(-err)); ++ nlmsg_free(msg); ++ return PCAP_ERROR; + } + + /* +-- +1.7.3.5 + diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD index 845ff13bf..023faea55 100644 --- a/core/libpcap/PKGBUILD +++ b/core/libpcap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103439 2010-12-19 15:40:24Z andyrtr $ +# $Id: PKGBUILD 142215 2011-11-06 10:21:27Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libpcap pkgver=1.1.1 -pkgrel=2 +pkgrel=4 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64') url="http://www.tcpdump.org/" @@ -11,10 +11,15 @@ license=('BSD') depends=('glibc' 'libnl' 'sh') makedepends=('flex') source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz) + #Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch + #Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch) sha256sums=('508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85') - + #'194aa268a3397be3ba406b7102dbdbc14fc16c6e4b535d0a0fab6b04d414563a' + #'f1f31c3e2b064f4c9d0e643e8ed1874a65ec17f770362f8ffa3b3f9ee9dc71bb') build() { cd ${srcdir}/${pkgname}-${pkgver} + #patch -p1 -i "${srcdir}"/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch + #patch -p1 -i "${srcdir}"/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch ./configure --prefix=/usr --enable-ipv6 make } diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD index 086d93d54..bbc315315 100644 --- a/core/libpipeline/PKGBUILD +++ b/core/libpipeline/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 119506 2011-04-11 19:53:04Z andyrtr $ +# $Id: PKGBUILD 142205 2011-11-06 08:47:46Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libpipeline pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" arch=('i686' 'x86_64') url="http://libpipeline.nongnu.org/" license=('GPL') -groups=('base') depends=('glibc') options=('!libtool') source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz) diff --git a/core/nano/PKGBUILD b/core/nano/PKGBUILD index ab760c2df..29daecb1a 100644 --- a/core/nano/PKGBUILD +++ b/core/nano/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101599 2010-11-29 19:19:03Z andyrtr $ +# $Id: PKGBUILD 142207 2011-11-06 08:47:48Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Judd <judd@archlinux.org> pkgname=nano pkgver=2.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="Pico editor clone with enhancements" arch=('i686' 'x86_64') license=('GPL') diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD index 7701e4c8f..e8559f15a 100644 --- a/core/wpa_actiond/PKGBUILD +++ b/core/wpa_actiond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 112297 2011-03-04 15:33:07Z stephane $ +# $Id: PKGBUILD 142219 2011-11-06 10:21:32Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_actiond pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events" arch=('i686' 'x86_64') url="http://projects.archlinux.org/wpa_actiond.git/" diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index c2a1ac2d5..493dbf5f3 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 112948 2011-03-07 23:26:54Z heftig $ +# $Id: PKGBUILD 142217 2011-11-06 10:21:29Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant pkgver=0.7.3 -pkgrel=3 +pkgrel=4 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index 7f55fc500..d2e265a3e 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137328 2011-09-07 08:13:58Z jgc $ +# $Id: PKGBUILD 142226 2011-11-06 17:01:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.4.26 +pkgver=2.4.28 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('glib2' 'zlib') makedepends=('gtk-sharp-2' 'pkgconfig') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('bad2c9ceb36a685a8f31eccf047be9d761da781c777c7657b093f9ff0bba401f') +sha256sums=('8487faf949ca60c7fb814338e6457d4b4260fcba361158667e1f3fe3e7cce13e') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 6687c5add..d1e325a31 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140515 2011-10-16 08:18:29Z foutrelis $ +# $Id: PKGBUILD 142234 2011-11-06 21:12:47Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.3.1 +pkgver=6.7.3.4 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg- makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('67e20cf171fa50e76c30bf6e703d37419164ce70' +sha1sums=('317dbb760c0ff8a22f031c3864d3c13f03b93a4c' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -20,7 +20,7 @@ build() { sed '/AC_PATH_XTRA/d' -i configure.ac autoreconf - patch -Np0 -i ../perlmagick.rpath.patch + patch -p0 -i ../perlmagick.rpath.patch LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \ ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ @@ -32,6 +32,11 @@ build() { make } +check() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make check +} + package_imagemagick() { pkgdesc="An image viewing/manipulation program" optdepends=('ghostscript: for Ghostscript support' diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 69669c721..79bec1b56 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,78 +1,61 @@ -# $Id: PKGBUILD 117473 2011-04-03 17:50:26Z andrea $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 142201 2011-11-06 05:54:25Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> pkgname=ntp -pkgver=4.2.6.p3 -_realver=4.2.6p3 -pkgrel=3 -pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync" -arch=(i686 x86_64) +pkgver=4.2.6.p4 +_realver=4.2.6p4 +pkgrel=2 +pkgdesc='Network Time Protocol reference implementation' +url='http://www.ntp.org/' license=('custom') -url="http://www.ntp.org/" +arch=('i686' 'x86_64') depends=('openssl' 'readline' 'libcap') makedepends=('perl-html-parser') -backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf') -options=('!emptydirs') -changelog=changelog -source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz - ntp-4.2.4-html2man.patch - ntp.conf - ntp-client.conf - ntpd - ntpdate) -md5sums=('59876a9009b098ff59767ee45a88ebd2' '1b04e888717bb31479a6087632981723' - '398a7f270f6ae083f47f86eb8b557a75' '58997d6cf4846d80e35a01b855376a33' - 'bf20804e75656609e808ca21b53ea4aa' '99b49d763e5866f4f81c48d922c80b93') +backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') +source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" + 'ntpd' + 'ntpdate' + 'ntp.conf' + 'ntpd.conf') +sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' + '97b41b8bc34f259f4e525ab2e58707c9724e72e2' + '63572457586379aa6bf75b6e899e71d651e643f4' + '6d2d234afb1db2dcb940747a62f70217246a3d13' + '6cfcb7bbd34499b30e31dffca2f3e1a036010271') + +install=install build() { - cd "$srcdir/$pkgname-$_realver" - # fix man page generation - patch -Np1 -i ../ntp-4.2.4-html2man.patch - # configure - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - # 4.2.6p3: aclocal too old, regenerate - rm -f aclocal.m4 - libtoolize --copy --force - ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-linux-caps - # build - make -} + cd "${srcdir}/${pkgname}-${_realver}" -package() { - cd "$srcdir/$pkgname-$_realver" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-linux-caps \ - # install - make DESTDIR="$pkgdir" install + make +} - # install conf files - install -d "$pkgdir/usr/share/ntp" - install -D -m644 conf/* "${pkgdir}/usr/share/ntp" +package() { + cd "${srcdir}/${pkgname}-$_realver" - # install launch scripts - install -d "$pkgdir/etc/rc.d" - install -D -m755 ${srcdir}/{ntpd,ntpdate} "$pkgdir/etc/rc.d" + make DESTDIR="${pkgdir}" install - # install man pages - cd html - ../scripts/html2man - sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] - install -d "$pkgdir"/usr/share/man/man{5,8} - install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" - install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" - mv "$pkgdir/usr/share/man/man8/ntpd.8" "$pkgdir/usr/share/man/man8/ntp-ntpd.8" - cd .. + install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd + install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate + install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf + install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf - # install sample configs - install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf" - install -D -m644 "$srcdir/ntp-client.conf" \ - "$pkgdir/etc/conf.d/ntp-client.conf" + cd html + ../scripts/html2man + install -d "${pkgdir}"/usr/share/man + mv man/man* "${pkgdir}"/usr/share/man + mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd + cd .. - # create /var/lib/ntp - install -d "$pkgdir/var/lib/ntp" - touch "$pkgdir/var/lib/ntp/.placeholder" + rmdir "${pkgdir}"/usr/{lib,sbin} + install -d "${pkgdir}/var/lib/ntp" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 "$srcdir/$pkgname-$_realver/COPYRIGHT" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + touch "${pkgdir}"/var/lib/ntp/.placeholder } diff --git a/extra/ntp/install b/extra/ntp/install new file mode 100644 index 000000000..ad9a39d54 --- /dev/null +++ b/extra/ntp/install @@ -0,0 +1,10 @@ +post_upgrade() { + if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then + cat <<EOF + +==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf +==> If you made changes to the former, please update the latter. + +EOF + fi +} diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf index 7f888e4b1..5f31fea83 100644 --- a/extra/ntp/ntp.conf +++ b/extra/ntp/ntp.conf @@ -1,52 +1,22 @@ -# NOTES: -# - you should only have to update the server line below -# - if you start getting lines like 'restrict' and 'fudge' -# and you didnt add them, AND you run dhcpcd on your -# network interfaces, be sure to add '-Y -N' to the -# dhcpcd_ethX variables in /etc/conf.d/net - -# Name of the servers ntpd should sync with -# Please respect the access policy as stated by the responsible person. -#server ntp.example.tld iburst - -server pool.ntp.org - -## -# A list of available servers can be found here: -# http://www.pool.ntp.org/ -# http://www.pool.ntp.org/#use -# A good way to get servers for your machine is: -# netselect -s 3 pool.ntp.org -## - -#server ntplocal.example.com prefer -#server timeserver.example.org - -# Warning: Using default NTP settings will leave your NTP -# server accessible to all hosts on the Internet. +# With the default settings below, ntpd will only synchronize your clock. +# +# For details, see: +# - the ntp.conf man page +# - http://support.ntp.org/bin/view/Support/GettingStarted +# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon -# A default deny all (including localhost) policy -# To use this define restrictions for all servers and clients -#restrict default ignore -#restrict -6 default ignore +# Select three geolocalized NTP public servers; see http://www.pool.ntp.org/ +server 0.pool.ntp.org +server 1.pool.ntp.org +server 2.pool.ntp.org -# A more open policy, allow access but deny changing the configuration +# Only allow read-only access from localhost restrict default nomodify nopeer -#restrict -6 default nomodify nopeer - -# Allow localhost restrict 127.0.0.1 -#restrict -6 ::1 - - -# To allow machines within your network to synchronize -# their clocks with your server, but ensure they are -# not allowed to configure the server or used as peers -# to synchronize against, uncomment this line. -# -#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap - -# you should not need to modify the following paths -driftfile /var/lib/ntp/ntp.drift +# Location of drift and log files +driftfile /var/lib/ntp/ntp.drift +logfile /var/log/ntp.log +# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing +# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/extra/ntp/ntpd b/extra/ntp/ntpd index 825efc189..a3e886e1f 100755 --- a/extra/ntp/ntpd +++ b/extra/ntp/ntpd @@ -2,7 +2,7 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ntp-client.conf +. /etc/conf.d/ntpd.conf PIDFILE="/var/run/ntpd/ntpd.pid" PID=$(cat $PIDFILE 2> /dev/null) diff --git a/extra/ntp/ntpd.conf b/extra/ntp/ntpd.conf new file mode 100644 index 000000000..e728db579 --- /dev/null +++ b/extra/ntp/ntpd.conf @@ -0,0 +1,5 @@ +# client options for "ntpd -q" - ntpdate equivalent +NTP_CLIENT_OPTION="-g" + +# arguments passed to ntpd when started +NTPD_ARGS="-g" diff --git a/extra/ntp/ntpdate b/extra/ntp/ntpdate index 99508f4fd..4f7c8375b 100755 --- a/extra/ntp/ntpdate +++ b/extra/ntp/ntpdate @@ -2,7 +2,7 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ntp-client.conf +. /etc/conf.d/ntpd.conf case "$1" in start) diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index b420652a8..595d82b13 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141172 2011-10-25 11:07:35Z bisson $ +# $Id: PKGBUILD 142240 2011-11-07 04:19:17Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix -pkgver=2.8.6 +pkgver=2.8.7 pkgrel=1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' @@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ 'aliases.patch' \ 'rc.d') -sha1sums=('32613ad01cad10ae04aad626f9a69ac9126b3d28' +sha1sums=('81c87aceff4d9af67a304354bab9c99ac98fc8a0' '5fc3de6c7df1e5851a0a379e825148868808318b' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') diff --git a/extra/talloc/PKGBUILD b/extra/talloc/PKGBUILD index 678ee5af4..573d162dd 100644 --- a/extra/talloc/PKGBUILD +++ b/extra/talloc/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 116938 2011-03-26 14:56:31Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 142221 2011-11-06 11:39:12Z andrea $ +# Maintainer: +# Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=talloc -pkgver=2.0.5 +pkgver=2.0.7 pkgrel=1 pkgdesc="A hierarchical pool based memory allocator with destructors" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL3') url="http://talloc.samba.org/" -source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz) -makedepends=('python2') depends=('glibc') +makedepends=('python2' 'docbook-xsl') optdepends=('python2: for python bindings') +source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('dbfb3146f4cc47054e13b8a2988299f9') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's#python#python2#g' buildtools/bin/waf ./configure --prefix=/usr \ - --sysconfdir=/etc/samba \ - --localstatedir=/var \ - --enable-talloc-compat1 + --sysconfdir=/etc/samba \ + --localstatedir=/var \ + --enable-talloc-compat1 make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=$pkgdir/ install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('6e3fdfbc43dde8ccba27b6af894b8fb2') diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index 7f02de61a..2a983d1a3 100644 --- a/extra/wxpython/PKGBUILD +++ b/extra/wxpython/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 134638 2011-08-07 02:39:42Z eric $ +# $Id: PKGBUILD 142236 2011-11-07 00:38:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxpython pkgver=2.8.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="A wxWidgets GUI toolkit for Python" arch=('i686' 'x86_64') license=('custom:wxWindows') url="http://www.wxpython.org" depends=('wxgtk' 'python2') makedepends=('mesa') -source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) -md5sums=('8c06c5941477beee213b4f2fa78be620') -sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxpython-cairo.patch) +sha1sums=('05688dc03d61631750f5904273122bb40a2115f5' + '420700b0a216b853352ffafd054f406a82a30bb3') build() { cd "${srcdir}/wxPython-src-${pkgver}" @@ -22,6 +22,7 @@ build() { --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys cd "${srcdir}/wxPython-src-${pkgver}/wxPython" + patch -p2 -i "${srcdir}/wxpython-cairo.patch" python2 setup.py WXPORT=gtk2 UNICODE=1 build } diff --git a/extra/wxpython/wxpython-cairo.patch b/extra/wxpython/wxpython-cairo.patch new file mode 100644 index 000000000..f3fc6fba0 --- /dev/null +++ b/extra/wxpython/wxpython-cairo.patch @@ -0,0 +1,51 @@ +--- wxPython/trunk/wx/lib/wxcairo.py 2011/08/25 18:50:02 68894 ++++ wxPython/trunk/wx/lib/wxcairo.py 2011/09/22 00:30:25 69181 +@@ -401,6 +401,48 @@ + ctypes.py_object)), + ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] + ++ # This structure is known good with pycairo 1.10.0. The keep adding stuff ++ # to the middle of the structure instead of only adding to the end! ++ elif cairo.version_info < (1,11): ++ _fields_ = [ ++ ('Context_Type', ctypes.py_object), ++ ('Context_FromContext', ctypes.PYFUNCTYPE(ctypes.py_object, ++ ctypes.c_void_p, ++ ctypes.py_object, ++ ctypes.py_object)), ++ ('FontFace_Type', ctypes.py_object), ++ ('ToyFontFace_Type', ctypes.py_object), #** new in 1.8.4 ++ ('FontFace_FromFontFace', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('FontOptions_Type', ctypes.py_object), ++ ('FontOptions_FromFontOptions', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Matrix_Type', ctypes.py_object), ++ ('Matrix_FromMatrix', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Path_Type', ctypes.py_object), ++ ('Path_FromPath', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Pattern_Type', ctypes.py_object), ++ ('SolidPattern_Type', ctypes.py_object), ++ ('SurfacePattern_Type', ctypes.py_object), ++ ('Gradient_Type', ctypes.py_object), ++ ('LinearGradient_Type', ctypes.py_object), ++ ('RadialGradient_Type', ctypes.py_object), ++ ('Pattern_FromPattern', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p, ++ ctypes.py_object)), #** changed in 1.8.4 ++ ('ScaledFont_Type', ctypes.py_object), ++ ('ScaledFont_FromScaledFont', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Surface_Type', ctypes.py_object), ++ ('ImageSurface_Type', ctypes.py_object), ++ ('PDFSurface_Type', ctypes.py_object), ++ ('PSSurface_Type', ctypes.py_object), ++ ('SVGSurface_Type', ctypes.py_object), ++ ('Win32Surface_Type', ctypes.py_object), ++ ('Win32PrintingSurface_Type', ctypes.py_object), ++ ('XCBSurface_Type', ctypes.py_object), ++ ('XlibSurface_Type', ctypes.py_object), ++ ('Surface_FromSurface', ctypes.PYFUNCTYPE(ctypes.py_object, ++ ctypes.c_void_p, ++ ctypes.py_object)), ++ ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] ++ + + def _loadPycairoAPI(): + global pycairoAPI diff --git a/libre/gnustep-base-libre/PKGBUILD b/libre/gnustep-base-libre/PKGBUILD new file mode 100644 index 000000000..9017c71b4 --- /dev/null +++ b/libre/gnustep-base-libre/PKGBUILD @@ -0,0 +1,39 @@ +# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> +# $Id: PKGBUILD 56058 2011-09-29 17:45:33Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Sebastian Sareyko <public@nooms.de> + +_pkgname=gnustep-base +pkgname=gnustep-base-libre +pkgver=1.23.0 +pkgrel=1 +pkgdesc="The GNUstep base package with exceptions enabled" +arch=('i686' 'x86_64') +url="http://www.gnustep.org/" +license=("GPL" "LGPL") +depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make-libre gnutls) +makedepends=(gcc-objc) +conflicts=('gnustep-base-svn' 'gnustep-base') +provides=('gnustep-base') +groups=('gnustep-core') +options=('!emptydirs' '!makeflags') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$_pkgname-$pkgver.tar.gz) +md5sums=('c898a1b6cdc98e83639f319876bdbba6') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + source /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep \ + --with-ffi-include=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ + # fix file ownership + sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble + sed -i 's|.*gnutls_transport_set_lowat.*||' Source/GSSocketStream.m + make VERBOSE=1 +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install + chown -R root.root "$pkgdir/" +} diff --git a/libre/gnustep-make-libre/PKGBUILD b/libre/gnustep-make-libre/PKGBUILD new file mode 100644 index 000000000..dedf944a3 --- /dev/null +++ b/libre/gnustep-make-libre/PKGBUILD @@ -0,0 +1,31 @@ +# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> +# $Id: PKGBUILD 56053 2011-09-29 17:24:54Z spupykin $ +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Sebastian Sareyko <public@nooms.de> + +_pkgname=gnustep-make +pkgname=gnustep-make-libre +pkgver=2.6.1 +pkgrel=1 +pkgdesc="The GNUstep make package with exceptions enabled" +arch=('any') +url="http://www.gnustep.org/" +license=('GPL') +depends=('glibc') +conflicts=('gnustep-make-svn' 'gnustep-make') +provides=('gnustep-make') +groups=('gnustep-core') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/${_pkgname}-$pkgver.tar.gz) +md5sums=('071b3a807ca3ec93cda75ac210adc263') + +build() { + cd $srcdir/${_pkgname}-$pkgver + # The option is not needed, but makes clear why we rebuild this. + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep \ + --enable-native-objc-exceptions + make + make DESTDIR=$pkgdir install + install -D -m755 \ + $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \ + $pkgdir/etc/profile.d/GNUstep.sh +} diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD index 0d597d96f..a02607b28 100644 --- a/libre/unarchiver/PKGBUILD +++ b/libre/unarchiver/PKGBUILD @@ -6,7 +6,7 @@ pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686') url="http://wakaba.c3.cx/s/apps/unarchiver.html" license=('LGPL2.1') -depends=('gnustep-base>=1.23.0-1.1' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') +depends=('gnustep-base-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') conflicts=('gnustep-base>=1.24') makedepends=('gcc-objc') source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip) diff --git a/multilib/lib32-gmp/538dfce27f41.patch b/multilib/lib32-gmp/538dfce27f41.patch new file mode 100644 index 000000000..2e0a1af50 --- /dev/null +++ b/multilib/lib32-gmp/538dfce27f41.patch @@ -0,0 +1,38 @@ + +# HG changeset patch +# User Torbjorn Granlund <tege@gmplib.org> +# Date 1310730221 -7200 +# Node ID 538dfce27f410b910d5e2f011119269e224d16a3 +# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366 +(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right. + +diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c +--- a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200 ++++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200 +@@ -7,7 +7,7 @@ + SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST + GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE. + +-Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc. ++Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. + +@@ -28,7 +28,6 @@ + #include "gmp-impl.h" + + +- + mp_size_t + mpn_dcpi1_bdiv_q_n_itch (mp_size_t n) + { +@@ -130,7 +129,7 @@ + qn = nn - qn; + while (qn > dn) + { +- mpn_sub_1 (np + dn, np + dn, qn, cy); ++ mpn_sub_1 (np + dn, np + dn, qn - dn, cy); + cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp); + qp += dn; + np += dn; + diff --git a/multilib/lib32-gmp/PKGBUILD b/multilib/lib32-gmp/PKGBUILD new file mode 100644 index 000000000..e936bf098 --- /dev/null +++ b/multilib/lib32-gmp/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 135478 2011-08-14 09:26:08Z allan $ +# Maintainer: Florian Pritz <flo@xssn.at> +# Contributor: josephgbr <rafael.f.f1 at gmail dot com> + +_pkgbasename=gmp +pkgname=lib32-$_pkgbasename +pkgver=5.0.2 +pkgrel=4 +pkgdesc="A free library for arbitrary precision arithmetic (32-bit)" +arch=('i686' 'x86_64') +url="http://gmplib.org/" +depends=('lib32-gcc-libs' $_pkgbasename) +makedepends=(gcc-multilib) +license=('LGPL3') +options=(!libtool) +source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2 + 538dfce27f41.patch) +md5sums=('0bbaedc82fb30315b06b1588b9077cd3' + 'a769be9c41618ca9c35d83375e7097d0') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + patch -Np1 -i $srcdir/538dfce27f41.patch + + export ABI=32 + ./configure \ + --prefix=/usr --infodir=/usr/share/info \ + --enable-cxx --libdir=/usr/lib32 + + #Put gmp.h in the same folder as gmpxx.h + sed -i 's/$(exec_prefix)\/include/$\(includedir\)/' Makefile + + make +} + +check() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{include,share,bin} +} diff --git a/multilib/lib32-nettle/PKGBUILD b/multilib/lib32-nettle/PKGBUILD new file mode 100644 index 000000000..6b226d319 --- /dev/null +++ b/multilib/lib32-nettle/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 58144 2011-11-06 22:21:54Z bluewind $ +# Maintainer: Florian Pritz <flo@xssn.at> +# Contributor: Andreas Radke <andyrtr@archlinux.org> +# Contributor: bender02 at gmx dot com + +_pkgbasename=nettle +pkgname=lib32-$_pkgbasename +pkgver=2.4 +pkgrel=1 +pkgdesc="A low-level cryptographic library (32-bit)" +arch=('i686' 'x86_64') +url="http://www.lysator.liu.se/~nisse/nettle/" +license=('GPL2') +depends=('lib32-gmp' $_pkgbasename) +makedepends=(gcc-multilib) +source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$_pkgbasename-$pkgver.tar.gz) +md5sums=(''450be8c4886d46c09f49f568ad6fa013'') + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --prefix=/usr --libdir=/usr/lib32 \ + --enable-shared \ + --disable-static # <-- seems not working now + make +} + +check() { + cd "$srcdir/$_pkgbasename-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir/" install + + find $pkgdir + + # remove static libs + rm -f ${pkgdir}/usr/lib32/{libhogweed,libnettle}.a + + rm -rf "${pkgdir}"/usr/{include,share,bin} +} diff --git a/multilib/lib32-talloc/PKGBUILD b/multilib/lib32-talloc/PKGBUILD index 16eabebd2..495fb37d1 100644 --- a/multilib/lib32-talloc/PKGBUILD +++ b/multilib/lib32-talloc/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 56759 2011-10-11 21:04:58Z lcarlier $ +# $Id: PKGBUILD 58088 2011-11-06 13:20:57Z lcarlier $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> _pkgbasename=talloc pkgname=lib32-$_pkgbasename -pkgver=2.0.5 +pkgver=2.0.7 pkgrel=1 pkgdesc="A hierarchical pool based memory allocator with destructors (32-bit)" -arch=(x86_64) +arch=('x86_64') license=('GPL3') url="http://talloc.samba.org/" source=(http://samba.org/ftp/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz) depends=('lib32-glibc' $_pkgbasename) -makedepends=(gcc-multilib python2) -md5sums=('6e3fdfbc43dde8ccba27b6af894b8fb2') +makedepends=('gcc-multilib' 'python2') +md5sums=('dbfb3146f4cc47054e13b8a2988299f9') build() { export CC="gcc -m32" diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD index a507e3e60..21c6b26d0 100644 --- a/multilib/lib32-udev/PKGBUILD +++ b/multilib/lib32-udev/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=('lib32-udev') -pkgver=173 +pkgver=174 pkgrel=1 arch=('x86_64') pkgdesc="The userspace dev tools (udev) (32-bit)" @@ -12,9 +12,10 @@ url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') options=(!makeflags !libtool) depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev') -makedepends=('gcc-multilib' 'gperf' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) -md5sums=('91a88a359b60bbd074b024883cc0dbde') +makedepends=('gcc-multilib' 'gperf') +#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) +source=(http://people.freedesktop.org/~kay/udev-$pkgver.tar.bz2) +md5sums=('3b84706046a33d7a7e00491a1136804d') build() { export CC="gcc -m32" @@ -22,7 +23,7 @@ build() { cd $srcdir/udev-$pkgver - ./configure --libdir=/usr/lib32 + ./configure --libdir=/usr/lib32 --disable-introspection make } diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD new file mode 100644 index 000000000..42755ee8e --- /dev/null +++ b/testing/mpfr/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 142238 2011-11-07 03:27:16Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=mpfr +_pkgver=3.1.0 +_patchlevel=p3 +pkgver=${_pkgver}.${_patchlevel} +pkgrel=1 +pkgdesc="Multiple-precision floating-point library" +arch=('i686' 'x86_64') +url="http://www.mpfr.org/" +license=('LGPL') +depends=('gmp>=5.0') +options=('!libtool') +install=mpfr.install +source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc} + mpfr-${_pkgver}.${_patchlevel}.patch) +md5sums=('6e495841bb026481567006cec0f821c3' + '293374ee4b01527f8f7889fdfa9016f8' + 'd65858ccddbea968d6580124320fb6a0') + +build() { + cd "${srcdir}/${pkgname}-${_pkgver}" + patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch + ./configure --prefix=/usr --enable-thread-safe --enable-shared + make +} + +check() { + cd "${srcdir}/${pkgname}-${_pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${_pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/mpfr/mpfr-3.1.0.p3.patch b/testing/mpfr/mpfr-3.1.0.p3.patch new file mode 100644 index 000000000..16d944047 --- /dev/null +++ b/testing/mpfr/mpfr-3.1.0.p3.patch @@ -0,0 +1,393 @@ +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 +@@ -0,0 +1 @@ ++mpfr_unlikely +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 +@@ -1 +1 @@ +-3.1.0 ++3.1.0-p1 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 +@@ -988,10 +988,11 @@ + ******************************************************/ + + /* Theses macros help the compiler to determine if a test is +- * likely or unlikely. */ ++ likely or unlikely. The !! is necessary in case x is larger ++ than a long. */ + #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) + # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) +-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) ++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) + #else + # define MPFR_LIKELY(x) (x) + # define MPFR_UNLIKELY(x) (x) +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0" ++#define MPFR_VERSION_STRING "3.1.0-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0"; ++ return "3.1.0-p1"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-14 10:43:32.000000000 +0000 +@@ -0,0 +1 @@ ++lib-search-path +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-14 10:43:32.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p1 ++3.1.0-p2 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p1" ++#define MPFR_VERSION_STRING "3.1.0-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-14 10:43:32.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p1"; ++ return "3.1.0-p2"; + } +diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am +--- mpfr-3.1.0-a/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 +@@ -65,8 +65,24 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs +diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in +--- mpfr-3.1.0-a/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 +@@ -1124,11 +1124,27 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs + all: all-am + + .SUFFIXES: +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-11-03 15:15:11.000000000 +0000 +@@ -0,0 +1 @@ ++vasprintf +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-11-03 15:15:11.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p2 ++3.1.0-p3 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p2" ++#define MPFR_VERSION_STRING "3.1.0-p3" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c +--- mpfr-3.1.0-a/src/vasprintf.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/vasprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -1178,7 +1178,7 @@ + mpfr_exp_t exp; + char * str; + const int spec_g = (spec.spec == 'g' || spec.spec == 'G'); +- const int keep_trailing_zeros = spec_g && spec.alt; ++ const int keep_trailing_zeros = !spec_g || spec.alt; + + /* WARNING: an empty precision field is forbidden (it means precision = 6 + and it should have been changed to 6 before the function call) */ +@@ -1356,7 +1356,7 @@ + else + /* 1 <= |p| */ + { +- size_t nsd; /* Number of significant digits */ ++ size_t str_len; + + /* Determine the position of the most significant decimal digit. */ + exp = floor_log10 (p); +@@ -1365,12 +1365,10 @@ + /* P is too large to print all its integral part digits */ + return -1; + +- np->ip_size = exp + 1; +- +- nsd = spec.prec + np->ip_size; + if (dec_info == NULL) +- { +- str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode); ++ { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */ ++ str = ++ mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode); + register_string (np->sl, str); + } + else +@@ -1379,81 +1377,60 @@ + str = dec_info->str; + } + np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */ ++ str_len = strlen (str); ++ ++ /* integral part */ ++ if (exp > str_len) ++ /* mpfr_get_str gives no trailing zero when p is rounded up to the next ++ power of 10 (p integer, so no fractional part) */ ++ { ++ np->ip_trailing_zeros = exp - str_len; ++ np->ip_size = str_len; ++ } ++ else ++ np->ip_size = exp; + + if (spec.group) + /* thousands separator in integral part */ + np->thousands_sep = MPFR_THOUSANDS_SEPARATOR; + +- if (nsd == 0 || (spec_g && !spec.alt)) +- /* compute how much non-zero digits in integral and fractional +- parts */ ++ /* fractional part */ ++ str += np->ip_size; ++ str_len -= np->ip_size; ++ if (!keep_trailing_zeros) ++ /* remove trailing zeros, if any */ + { +- size_t str_len; +- str_len = strlen (str); /* note: the sign has been skipped */ +- +- if (exp > str_len) +- /* mpfr_get_str doesn't give the trailing zeros when p is a +- multiple of 10 (p integer, so no fractional part) */ +- { +- np->ip_trailing_zeros = exp - str_len; +- np->ip_size = str_len; +- if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; +- } +- else +- /* str may contain some digits which are in fractional part */ ++ char *ptr = str + str_len - 1; /* pointer to the last digit of ++ str */ ++ while ((*ptr == '0') && (str_len != 0)) + { +- char *ptr; +- +- ptr = str + str_len - 1; /* points to the end of str */ +- str_len -= np->ip_size; /* number of digits in fractional +- part */ +- +- if (!keep_trailing_zeros) +- /* remove trailing zeros, if any */ +- { +- while ((*ptr == '0') && (str_len != 0)) +- { +- --ptr; +- --str_len; +- } +- } +- +- if (str_len > INT_MAX) +- /* too many digits in fractional part */ +- return -1; +- +- if (str_len != 0) +- /* some digits in fractional part */ +- { +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = str_len; +- } ++ --ptr; ++ --str_len; + } + } +- else +- /* spec.prec digits in fractional part */ ++ ++ if (str_len > 0) ++ /* some nonzero digits in fractional part */ + { +- if (np->ip_size == exp - 1) +- /* the absolute value of the number has been rounded up to a power +- of ten. +- Insert an additional zero in integral part and put the rest of +- them in fractional part. */ +- np->ip_trailing_zeros = 1; ++ if (str_len > INT_MAX) ++ /* too many digits in fractional part */ ++ return -1; + +- if (spec.prec != 0) +- { +- MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp); +- MPFR_ASSERTD (np->ip_size + spec.prec == nsd); ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_ptr = str; ++ np->fp_size = str_len; ++ } + +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = spec.prec; +- } +- else if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; ++ if (keep_trailing_zeros && str_len < spec.prec) ++ /* add missing trailing zeros */ ++ { ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_trailing_zeros = spec.prec - np->fp_size; + } ++ ++ if (spec.alt) ++ /* add decimal point even if no digits follow it */ ++ np->point = MPFR_DECIMAL_POINT; + } + + return 0; +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-11-03 15:15:11.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p2"; ++ return "3.1.0-p3"; + } +diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c +--- mpfr-3.1.0-a/tests/tsprintf.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/tsprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -475,6 +475,18 @@ + check_sprintf ("-1.", "%- #0.1RG", x); + + /* precision zero */ ++ mpfr_set_d (x, 9.5, MPFR_RNDN); ++ check_sprintf ("9", "%.0RDf", x); ++ check_sprintf ("10", "%.0RUf", x); ++ ++ mpfr_set_d (x, 19.5, MPFR_RNDN); ++ check_sprintf ("19", "%.0RDf", x); ++ check_sprintf ("20", "%.0RUf", x); ++ ++ mpfr_set_d (x, 99.5, MPFR_RNDN); ++ check_sprintf ("99", "%.0RDf", x); ++ check_sprintf ("100", "%.0RUf", x); ++ + mpfr_set_d (x, -9.5, MPFR_RNDN); + check_sprintf ("-10", "%.0RDf", x); + check_sprintf ("-10", "%.0RYf", x); +@@ -1078,6 +1090,23 @@ + mpfr_clear (x); + } + ++static void ++bug20111102 (void) ++{ ++ mpfr_t t; ++ char s[100]; ++ ++ mpfr_init2 (t, 84); ++ mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN); ++ mpfr_sprintf (s, "%.20RNg", t); ++ if (strcmp (s, "1000") != 0) ++ { ++ printf ("Error in bug20111102, expected 1000, got %s\n", s); ++ exit (1); ++ } ++ mpfr_clear (t); ++} ++ + /* In particular, the following test makes sure that the rounding + * for %Ra and %Rb is not done on the MPFR number itself (as it + * would overflow). Note: it has been reported on comp.std.c that +@@ -1161,6 +1190,7 @@ + locale = setlocale (LC_ALL, "C"); + #endif + ++ bug20111102 (); + native_types (); + hexadecimal (); + binary (); diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install new file mode 100644 index 000000000..d6dd0475b --- /dev/null +++ b/testing/mpfr/mpfr.install @@ -0,0 +1,20 @@ +info_dir=usr/share/info +info_files=(mpfr.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/~mtjm/thinkfan/PKGBUILD b/~mtjm/thinkfan/PKGBUILD new file mode 100644 index 000000000..9bb9a4793 --- /dev/null +++ b/~mtjm/thinkfan/PKGBUILD @@ -0,0 +1,36 @@ +# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> +# From https://aur.archlinux.org/packages.php?ID=24359 +# Maintainer: nblock <nblock [/at\] archlinux DOT us> +# Contributor: Frederik Alkærsig (FALKER) <havnelisten AT gmail.com> + +pkgname=thinkfan +pkgver=0.7.3 +pkgrel=1 +pkgdesc="A minimalist fan control program. Supports the sysfs hwmon interface and thinkpad_acpi" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL3') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz "thinkfan") +url="http://thinkfan.sourceforge.net/" +#backup=('etc/thinkfan.conf') +md5sums=('d1b0d7a05b37cce412ee227cf759a9f6' + '16fc3a83a1468e3ccaeba67e14ab2177') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + make + install -D -m755 ${pkgname} ${pkgdir}/usr/sbin/${pkgname} + install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname} + + # A better way would be to check it at install time. +# if ! [[ -f /proc/acpi/ibm/fan ]]; then +# echo "thinkpad_acpi procfs entries don't seem to exist." \ +# "You'll need to use the generic sysfs hwmon interface. Will use sysfs conf." + install -D -m644 thinkfan.conf.sysfs ${pkgdir}/etc/thinkfan.conf.sysfs +# else +# echo "This seems to be a Thinkpad. You should use the IBM" \ +# "interface. Will use thinkfan conf." + [ "${CARCH}" = "mips64el" ] || install -D -m644 thinkfan.conf.thinkpad ${pkgdir}/etc/thinkfan.conf.thinkpad +# fi +} + +# vim:set ts=2 sw=2 noet: diff --git a/~mtjm/thinkfan/thinkfan b/~mtjm/thinkfan/thinkfan new file mode 100644 index 000000000..d37c81424 --- /dev/null +++ b/~mtjm/thinkfan/thinkfan @@ -0,0 +1,54 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +test -f /usr/sbin/thinkfan || exit 0 + +case "$1" in + start) + stat_busy "Starting thinkfan" + /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon thinkfan + stat_done + fi + ;; + stop) + stat_busy "Stopping thinkfan" + PID=$(</var/run/thinkfan.pid) + kill $PID + rm -f /var/run/thinkfan.pid + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon thinkfan + stat_done + fi + ;; + restart) + stat_busy "Restarting thinkfan" + + PID=$(</var/run/thinkfan.pid) + kill $PID + rm -f /var/run/thinkfan.pid + if [ $? -gt 0 ]; then + stat_fail + rm_daemon thinkfan + else + /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + rm_daemon thinkfan + else + stat_done + fi + fi + ;; + *) + echo "Usage: $0 {stop|start|restart}" + ;; +esac +exit 0 |