From 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 10 Feb 2013 01:12:52 -0800 Subject: Sun Feb 10 01:12:35 PST 2013 --- community/setconf/PKGBUILD | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 community/setconf/PKGBUILD (limited to 'community/setconf') diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD deleted file mode 100644 index e6c5c6c84..000000000 --- a/community/setconf/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ -# Maintainer: Alexander Rødseth - -pkgname=setconf -pkgver=0.4 -pkgrel=1 -pkgdesc="Utility to easily change settings in Makefiles and configuration files" -arch=('x86_64' 'i686') -url="http://setconf.roboticoverlords.org/" -license=('GPL') -depends=('pcre' 'gc') -makedepends=('shedskin') -source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") -sha256sums=('dca9d6e829f3247da8cb78434dd18d96f3439fc83a32626ff83d4a5c16099d31') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - shedskin "$pkgname.py" - make CPPFLAGS="-march=native -fomit-frame-pointer" -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" - install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From ea60830c19f04f36803e26821bd9db1361489653 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 16 Mar 2013 00:04:27 -0700 Subject: Sat Mar 16 00:04:26 PDT 2013 --- community/acpid/PKGBUILD | 6 +- community/acpid/acpid.socket | 2 +- community/chmsee/PKGBUILD | 6 +- community/chmsee/chmsee | 2 - community/gendesk/PKGBUILD | 15 +- community/me-tv/PKGBUILD | 52 --- community/me-tv/me-tv.install | 18 - community/setconf/PKGBUILD | 35 ++ community/texmaker/PKGBUILD | 29 ++ community/texmaker/texmaker.install | 7 + core/bash/PKGBUILD | 14 +- core/mpfr/PKGBUILD | 21 +- core/mpfr/mpfr-3.1.1-p2.patch | 405 --------------------- ...dbus-fix-serialization-of-calendar-timers.patch | 62 ---- core/systemd/PKGBUILD | 28 +- core/texinfo/PKGBUILD | 8 +- kernels/linux-libre-pae/PKGBUILD | 8 +- .../change-default-console-loglevel.patch | 2 +- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-rt/PKGBUILD | 4 +- .../change-default-console-loglevel.patch | 2 +- kernels/linux-libre-rt/linux-libre-rt.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 8 +- .../change-default-console-loglevel.patch | 2 +- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/crosstool-ng/PKGBUILD | 8 +- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 12 +- .../change-default-console-loglevel.patch | 2 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 12 +- .../change-default-console-loglevel.patch | 2 +- libre/linux-libre/linux-libre.install | 2 +- pcr/grass/PKGBUILD | 138 +++++++ pcr/grass/grass-python2.patch | 327 +++++++++++++++++ pcr/grass/grass-tk86-fix.patch | 11 + pcr/grass/grass.conf | 1 + pcr/grass/grass.install | 26 ++ pcr/grass/grass.sh | 4 + pcr/libfreexl/PKGBUILD | 21 ++ pcr/libowfat/PKGBUILD | 2 +- pcr/libspatialite/PKGBUILD | 24 ++ pcr/opentracker/PKGBUILD | 67 ++++ pcr/opentracker/license.txt | 2 + pcr/opentracker/opentracker.install | 17 + pcr/opentracker/opentracker.rc.d | 37 ++ pcr/opentracker/opentracker.service | 11 + pcr/qgis/PKGBUILD | 65 ++++ pcr/qgis/qgis.desktop | 10 + pcr/spatialindex/LICENSE | 9 + pcr/spatialindex/PKGBUILD | 34 ++ social/opentracker/PKGBUILD | 67 ---- social/opentracker/license.txt | 2 - social/opentracker/opentracker.install | 17 - social/opentracker/opentracker.rc.d | 37 -- social/opentracker/opentracker.service | 11 - 57 files changed, 959 insertions(+), 771 deletions(-) delete mode 100644 community/me-tv/PKGBUILD delete mode 100644 community/me-tv/me-tv.install create mode 100644 community/setconf/PKGBUILD create mode 100644 community/texmaker/PKGBUILD create mode 100644 community/texmaker/texmaker.install delete mode 100644 core/mpfr/mpfr-3.1.1-p2.patch delete mode 100644 core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch create mode 100644 pcr/grass/PKGBUILD create mode 100644 pcr/grass/grass-python2.patch create mode 100644 pcr/grass/grass-tk86-fix.patch create mode 100644 pcr/grass/grass.conf create mode 100644 pcr/grass/grass.install create mode 100644 pcr/grass/grass.sh create mode 100644 pcr/libfreexl/PKGBUILD create mode 100644 pcr/libspatialite/PKGBUILD create mode 100644 pcr/opentracker/PKGBUILD create mode 100644 pcr/opentracker/license.txt create mode 100644 pcr/opentracker/opentracker.install create mode 100644 pcr/opentracker/opentracker.rc.d create mode 100644 pcr/opentracker/opentracker.service create mode 100644 pcr/qgis/PKGBUILD create mode 100644 pcr/qgis/qgis.desktop create mode 100644 pcr/spatialindex/LICENSE create mode 100644 pcr/spatialindex/PKGBUILD delete mode 100644 social/opentracker/PKGBUILD delete mode 100644 social/opentracker/license.txt delete mode 100644 social/opentracker/opentracker.install delete mode 100755 social/opentracker/opentracker.rc.d delete mode 100644 social/opentracker/opentracker.service (limited to 'community/setconf') diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index d31a614a8..617aba45f 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84713 2013-02-23 09:11:56Z seblu $ +# $Id: PKGBUILD 86363 2013-03-15 22:40:51Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: xduugu # Contributor: Manolis Tzanidakis @@ -6,7 +6,7 @@ pkgname=acpid pkgver=2.0.18 -pkgrel=1 +pkgrel=2 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') url='http://tedfelix.com/linux/acpid-netlink.html' @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta 'anything' 'handler.sh') md5sums=('7c4ff315ae960c54eea303c71c49f152' - 'ee6cb99e50e580c50331a73045412ae9' + 'd11700eb136e0489835ddaf977a7905b' '10290f69491206cd104654e5b900b661' '2d37b98d6e74bab815604b8b48c6cfd4' '47f44ff5f02685dce8bcdab8568f0c38') diff --git a/community/acpid/acpid.socket b/community/acpid/acpid.socket index 1e5365bf1..1b23f8735 100644 --- a/community/acpid/acpid.socket +++ b/community/acpid/acpid.socket @@ -2,7 +2,7 @@ Description=ACPID Listen Socket [Socket] -ListenStream=/run/acpid.socket +ListenStream=/var/run/acpid.socket [Install] WantedBy=sockets.target diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index 083591db7..9ec0de701 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83313 2013-01-29 13:27:03Z lcarlier $ +# $Id: PKGBUILD 86352 2013-03-15 14:34:33Z lcarlier $ # Maintainer : Laurent Carlier # Contributor: dionydonny # Contributor: Ermanno pkgname=chmsee pkgver=2.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" @@ -18,7 +18,7 @@ source=(https://chmsee.googlecode.com/files/${pkgname}-${pkgver}.tar.gz chmsee) install=chmsee.install md5sums=('a9a1e79094e5a2674caa3b1f1e34f5e7' - '242a9390bc943cc38237fa71137fb26c') + '1787edd1de8aa75bd9fa75a5ab319e85') build() { cd ${srcdir}/chmsee-*/src diff --git a/community/chmsee/chmsee b/community/chmsee/chmsee index 65a1e195b..cd022f561 100644 --- a/community/chmsee/chmsee +++ b/community/chmsee/chmsee @@ -1,4 +1,2 @@ #!/bin/sh -cd /usr/share/chmsee/ xulrunner /usr/share/chmsee/application.ini "$@" -cd - diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index 1559f9465..cbea9fbae 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 71021 2012-05-21 22:04:13Z arodseth $ -# Maintainer: Alexander Rødseth +# $Id: PKGBUILD 86359 2013-03-15 17:39:45Z arodseth $ +# Maintainer: Alexander Rødseth # Thanks to Moonprincessluna at DeviantArt for the default icon: # http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a pkgname=gendesk -pkgver=0.4.2 +pkgver=0.4.4 pkgrel=1 pkgdesc="Utility to generate .desktop files and download icons" arch=('x86_64' 'i686') url="http://roboticoverlords.org/gendesk/" license=('MIT') depends=('glibc') -makedepends=('go>=2:1-2') -conflicts=('go-hg') -source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.gz" +makedepends=('go') +source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" "http://roboticoverlords.org/images/default.png") -sha256sums=('10b2a294f5d57fcc2fd8612ca9cba7f0f82af03b1bd38d93a3ef757689d20a8a' +sha256sums=('23ca20823dc225ebc35baf53fa07558a1ddf314fe3f9cb9d2c5fc6523ca62334' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { cd "$srcdir/$pkgname-$pkgver" - msg2 "Compiling..." go build } @@ -31,6 +29,7 @@ package() { install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$pkgname" install -Dm644 "$srcdir/default.png" "$pkgdir/usr/share/pixmaps/default.png" + install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD deleted file mode 100644 index eb15b07a1..000000000 --- a/community/me-tv/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -#Maintainer: jakob gruber -#Contributor: gborzi -#Previous Contributor: Vinzenz Vietzke -#Previous Contributor: Heiko Baums -#Previous Contributor: Jeff Bailes - -pkgname=me-tv -pkgver=1.4.0.12 -pkgrel=1 -epoch=1 -pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" -arch=('i686' 'x86_64') -url="https://launchpad.net/me-tv" -license=('GPL') -depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base') -makedepends=('intltool' 'gnome-common') -install='me-tv.install' -source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver:0:5}/+download/${pkgname}-${pkgver}.tar.gz") -options=('!emptydirs') - -build() { - - cd "${srcdir}/${pkgname}-${pkgver}" - - ./autogen.sh - ./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr - - # Missing unistd.h includes :| https://bugs.launchpad.net/me-tv/+bug/1020690 - for file in common/common.cc server/thread.cc; do - sed -i '1 i\ - #include ' $file - done - - make - -} - -package() { - - cd "${srcdir}/${pkgname}-${pkgver}" - - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \ - --domain me-tv "${pkgdir}/usr/etc/gconf/schemas/${pkgname}.schemas" - - rm -rf "${pkgdir}/usr/etc/" - -} - -md5sums=('28c7fd5523fd6ea8f5de89b297eb1391') diff --git a/community/me-tv/me-tv.install b/community/me-tv/me-tv.install deleted file mode 100644 index ca1279c14..000000000 --- a/community/me-tv/me-tv.install +++ /dev/null @@ -1,18 +0,0 @@ -pkgname=me-tv - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 - echo "If you run into errors after upgrading, try deleting ~/.local/share/me-tv/" -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD new file mode 100644 index 000000000..6d0586f00 --- /dev/null +++ b/community/setconf/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 86348 2013-03-15 13:28:26Z arodseth $ +# Maintainer: Alexander Rødseth + +pkgname=setconf +pkgver=0.5.3 +pkgrel=1 +pkgdesc='Utility to easily change settings in configuration files or Makefiles' +arch=('x86_64' 'i686') +url='http://setconf.roboticoverlords.org/' +license=('GPL2') +depends=('pcre' 'gc') +# Comment out the makedepends if you're on a platform not supported by shedskin +makedepends=('shedskin') +source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz") +sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + [ -x /usr/bin/shedskin ] && shedskin "$pkgname.py" && make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + if [ -e "$pkgname" ]; then + install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + else + depends=('python') + install -Dm755 "$pkgname.py" "$pkgdir/usr/bin/$pkgname" + fi + install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD new file mode 100644 index 000000000..cf0ce245c --- /dev/null +++ b/community/texmaker/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 86310 2013-03-15 05:07:25Z cinelli $ +#Maintainer: Federico Cinelli + +pkgname=texmaker +pkgver=4.0 +pkgrel=1 +pkgdesc='Free cross-platform LaTeX editor' +arch=('i686' 'x86_64') +url="http://www.xm1math.net/texmaker/index.html" +license=('GPL') +depends=('poppler-qt' 'qtwebkit') +optdepends=('ghostscript: LaTeX to HTML conversion command' + 'ibus-qt: accented characters support' + 'poppler: PDF rendering support') +install="$pkgname.install" +source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('3599fd142d8d3596b7bd14724fc1888e') + +build() { + cd "$pkgname-$pkgver" + qmake PREFIX=/usr texmaker.pro + make +} +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -dm755 "$pkgdir/usr/share" + make INSTALL_PATH="$pkgdir" INSTALL_ROOT="$pkgdir" PREFIX="/usr" install +} diff --git a/community/texmaker/texmaker.install b/community/texmaker/texmaker.install new file mode 100644 index 000000000..9591f6c5d --- /dev/null +++ b/community/texmaker/texmaker.install @@ -0,0 +1,7 @@ +post_install() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 5c1fc7d4e..cf53e9650 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 176240 2013-01-28 00:29:18Z allan $ +# $Id: PKGBUILD 180066 2013-03-15 22:55:31Z allan $ # Maintainer: Allan McRae # Contributor: Aaron Griffin pkgname=bash _basever=4.2 -_patchlevel=042 #prepare for some patches +_patchlevel=045 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=3 +pkgrel=1 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64') license=('GPL') @@ -162,4 +162,10 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '7bc4942a66ca4024ee964db7ede07896' '7e97f02d9dd1436eed278f2732542ecf' '1cf7701017ebfc8e129de92c8f8b798c' - '4ef8b5af440bf7b939b7955ce68b4dc7') + '4ef8b5af440bf7b939b7955ce68b4dc7' + '9e61168fca692d8d1a733c389a63712e' + '665861582049ba270cc726b7a6e0324d' + 'b4b11d64b45ea9ec50dcc74c6c3861f6' + '233031ccf9cbb1265be30753e0fa41f4' + '1661bcc83c4715f54368877452ff2247' + '302c5516e469171b5187118024fca2a7') diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index e4e66c7dd..d47204c74 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 174749 2013-01-06 02:22:46Z allan $ +# $Id: PKGBUILD 180068 2013-03-15 22:55:34Z allan $ # Maintainer: Allan McRae # Contributor: damir pkgname=mpfr -_pkgver=3.1.1 -_patchlevel=p2 -pkgver=${_pkgver}.${_patchlevel} -pkgrel=2 +_pkgver=3.1.2 +#_patchlevel=p1 +#pkgver=${_pkgver}.${_patchlevel} +pkgver=${_pkgver} +pkgrel=1 pkgdesc="Multiple-precision floating-point library" arch=('i686' 'x86_64') url="http://www.mpfr.org/" @@ -14,15 +15,13 @@ 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=('91d51c41fcf2799e4ee7a7126fc95c17' - '91b187a2229211e543ba6fb82a079b2c' - 'eef835f97bc26ea20b0232bd913acdd8') +source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}) +md5sums=('e3d203d188b8fe60bb6578dd3152e05c' + '63d1a00bedd4fed3717115297f70d029') build() { cd "${srcdir}/${pkgname}-${_pkgver}" - patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch + #patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch ./configure --prefix=/usr --enable-thread-safe --enable-shared make } diff --git a/core/mpfr/mpfr-3.1.1-p2.patch b/core/mpfr/mpfr-3.1.1-p2.patch deleted file mode 100644 index 43dfcbfe3..000000000 --- a/core/mpfr/mpfr-3.1.1-p2.patch +++ /dev/null @@ -1,405 +0,0 @@ -diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES ---- mpfr-3.1.1-a/PATCHES 2012-08-30 09:28:51.000000000 +0000 -+++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:28:51.000000000 +0000 -@@ -0,0 +1 @@ -+get_decimal64 -diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION ---- mpfr-3.1.1-a/VERSION 2012-07-03 15:01:13.000000000 +0000 -+++ mpfr-3.1.1-b/VERSION 2012-08-30 09:28:51.000000000 +0000 -@@ -1 +1 @@ --3.1.1 -+3.1.1-p1 -diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c ---- mpfr-3.1.1-a/src/get_d64.c 2012-07-03 15:01:18.000000000 +0000 -+++ mpfr-3.1.1-b/src/get_d64.c 2012-08-30 09:28:51.000000000 +0000 -@@ -32,6 +32,10 @@ - - #ifdef MPFR_WANT_DECIMAL_FLOATS - -+#ifndef DEC64_MAX -+# define DEC64_MAX 9.999999999999999E384dd -+#endif -+ - #ifdef DPD_FORMAT - static int T[1000] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32, -@@ -142,26 +146,14 @@ - static _Decimal64 - get_decimal64_min (int negative) - { -- union ieee_double_extract x; -- -- x.s.sig = (negative) ? 1 : 0; -- x.s.exp = 0; -- x.s.manh = 0; -- x.s.manl = 1; -- return x.d; -+ return negative ? - 1E-398dd : 1E-398dd; - } - - /* construct the decimal64 largest finite number with given sign */ - static _Decimal64 - get_decimal64_max (int negative) - { -- union ieee_double_extract x; -- -- x.s.sig = (negative) ? 1 : 0; -- x.s.exp = 1919; -- x.s.manh = 1048575; /* 2^20-1 */ -- x.s.manl = ~0; -- return x.d; -+ return negative ? - DEC64_MAX : DEC64_MAX; - } - - /* one-to-one conversion: -@@ -334,7 +326,8 @@ - /* the largest decimal64 number is just below 10^(385) < 2^1279 */ - else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */ - { -- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) -+ if (rnd_mode == MPFR_RNDZ -+ || (rnd_mode == MPFR_RNDU && negative != 0) - || (rnd_mode == MPFR_RNDD && negative == 0)) - return get_decimal64_max (negative); - else -@@ -354,6 +347,15 @@ - which corresponds to s=[0.]1000...000 and e=-397 */ - if (e < -397) - { -+ if (rnd_mode == MPFR_RNDN && e == -398) -+ { -+ /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal), -+ src should round to +/- 1E-398 in MPFR_RNDN. */ -+ mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA); -+ return e == -398 && s[negative] <= '5' ? -+ get_decimal64_zero (negative) : -+ get_decimal64_min (negative); -+ } - if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN - || (rnd_mode == MPFR_RNDD && negative == 0) - || (rnd_mode == MPFR_RNDU && negative != 0)) -@@ -379,7 +381,8 @@ - which corresponds to s=[0.]9999...999 and e=385 */ - else if (e > 385) - { -- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) -+ if (rnd_mode == MPFR_RNDZ -+ || (rnd_mode == MPFR_RNDU && negative != 0) - || (rnd_mode == MPFR_RNDD && negative == 0)) - return get_decimal64_max (negative); - else -diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h ---- mpfr-3.1.1-a/src/mpfr.h 2012-07-03 15:01:19.000000000 +0000 -+++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.1.1" -+#define MPFR_VERSION_STRING "3.1.1-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c ---- mpfr-3.1.1-a/src/version.c 2012-07-03 15:01:18.000000000 +0000 -+++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:28:51.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.1"; -+ return "3.1.1-p1"; - } -diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c ---- mpfr-3.1.1-a/tests/tget_set_d64.c 2012-07-03 15:01:24.000000000 +0000 -+++ mpfr-3.1.1-b/tests/tget_set_d64.c 2012-08-30 09:28:51.000000000 +0000 -@@ -25,6 +25,10 @@ - #include /* for exit */ - #include "mpfr-test.h" - -+#ifndef DEC64_MAX -+# define DEC64_MAX 9.999999999999999E384dd -+#endif -+ - /* #define DEBUG */ - - static void -@@ -149,6 +153,15 @@ - mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ); - mpfr_set (y, x, MPFR_RNDZ); - d = mpfr_get_decimal64 (x, MPFR_RNDU); -+ ASSERT_ALWAYS (d == DEC64_MAX); -+ mpfr_set_ui (x, 0, MPFR_RNDZ); -+ mpfr_set_decimal64 (x, d, MPFR_RNDZ); -+ ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); -+ -+ mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ); -+ mpfr_set (y, x, MPFR_RNDZ); -+ d = mpfr_get_decimal64 (x, MPFR_RNDA); -+ ASSERT_ALWAYS (d == -DEC64_MAX); - mpfr_set_ui (x, 0, MPFR_RNDZ); - mpfr_set_decimal64 (x, d, MPFR_RNDZ); - ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); -@@ -225,6 +238,83 @@ - mpfr_clear (x); - } - -+static void -+check_overflow (void) -+{ -+ mpfr_t x; -+ int err = 0, neg, rnd; -+ -+ mpfr_init2 (x, 96); -+ for (neg = 0; neg < 2; neg++) -+ RND_LOOP (rnd) -+ { -+ _Decimal64 d, e; -+ mpfr_rnd_t r = (mpfr_rnd_t) rnd; -+ int sign = neg ? -1 : 1; -+ -+ e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX; -+ /* This tests the binary exponent e > 1279 case of get_d64.c */ -+ mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN); -+ d = mpfr_get_decimal64 (x, r); -+ if (d != e) -+ { -+ printf ("Error 1 in check_overflow for %s, %s\n", -+ neg ? "negative" : "positive", -+ mpfr_print_rnd_mode (r)); -+ err = 1; -+ } -+ /* This tests the decimal exponent e > 385 case of get_d64.c */ -+ mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN); -+ d = mpfr_get_decimal64 (x, r); -+ if (d != e) -+ { -+ printf ("Error 2 in check_overflow for %s, %s\n", -+ neg ? "negative" : "positive", -+ mpfr_print_rnd_mode (r)); -+ err = 1; -+ } -+ /* This tests the last else (-382 <= e <= 385) of get_d64.c */ -+ mpfr_set_decimal64 (x, e, MPFR_RNDA); -+ d = mpfr_get_decimal64 (x, r); -+ if (d != e) -+ { -+ printf ("Error 3 in check_overflow for %s, %s\n", -+ neg ? "negative" : "positive", -+ mpfr_print_rnd_mode (r)); -+ err = 1; -+ } -+ } -+ mpfr_clear (x); -+ if (err) -+ exit (1); -+} -+ -+static void -+check_tiny (void) -+{ -+ mpfr_t x; -+ _Decimal64 d; -+ -+ /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round -+ to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between -+ 0 and 1E-398 is not a representable binary number, so that there -+ are no tests for it. */ -+ mpfr_init2 (x, 128); -+ mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ); -+ d = mpfr_get_decimal64 (x, MPFR_RNDN); -+ MPFR_ASSERTN (d == 1.0E-398dd); -+ mpfr_neg (x, x, MPFR_RNDN); -+ d = mpfr_get_decimal64 (x, MPFR_RNDN); -+ MPFR_ASSERTN (d == -1.0E-398dd); -+ mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU); -+ d = mpfr_get_decimal64 (x, MPFR_RNDN); -+ MPFR_ASSERTN (d == 1.0E-398dd); -+ mpfr_neg (x, x, MPFR_RNDN); -+ d = mpfr_get_decimal64 (x, MPFR_RNDN); -+ MPFR_ASSERTN (d == -1.0E-398dd); -+ mpfr_clear (x); -+} -+ - int - main (void) - { -@@ -241,6 +331,8 @@ - check_inf_nan (); - check_random (); - check_native (); -+ check_overflow (); -+ check_tiny (); - - tests_end_mpfr (); - return 0; -diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES ---- mpfr-3.1.1-a/PATCHES 2012-08-30 09:35:12.000000000 +0000 -+++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:35:12.000000000 +0000 -@@ -0,0 +1 @@ -+strtofr-ternary-value -diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION ---- mpfr-3.1.1-a/VERSION 2012-08-30 09:28:51.000000000 +0000 -+++ mpfr-3.1.1-b/VERSION 2012-08-30 09:35:12.000000000 +0000 -@@ -1 +1 @@ --3.1.1-p1 -+3.1.1-p2 -diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h ---- mpfr-3.1.1-a/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 -+++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:35:12.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.1.1-p1" -+#define MPFR_VERSION_STRING "3.1.1-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c ---- mpfr-3.1.1-a/src/strtofr.c 2012-07-03 15:01:16.000000000 +0000 -+++ mpfr-3.1.1-b/src/strtofr.c 2012-08-30 09:35:12.000000000 +0000 -@@ -667,6 +667,20 @@ - /* (z, exp_z) = base^(exp_base-pstr_size) */ - z = result + 2*ysize + 1; - err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize); -+ /* Since we want y/z rounded toward zero, we must get an upper -+ bound of z. If err >= 0, the error on z is bounded by 2^err. */ -+ if (err >= 0) -+ { -+ mp_limb_t cy; -+ unsigned long h = err / GMP_NUMB_BITS; -+ unsigned long l = err - h * GMP_NUMB_BITS; -+ -+ if (h >= ysize) /* not enough precision in z */ -+ goto next_loop; -+ cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l); -+ if (cy != 0) /* the code below requires z on ysize limbs */ -+ goto next_loop; -+ } - exact = exact && (err == -1); - if (err == -2) - goto underflow; /* FIXME: Sure? */ -@@ -730,6 +744,7 @@ - MPFR_RNDN, rnd, MPFR_PREC(x))) - break; - -+ next_loop: - /* update the prec for next loop */ - MPFR_ZIV_NEXT (loop, prec); - } /* loop */ -diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c ---- mpfr-3.1.1-a/src/version.c 2012-08-30 09:28:51.000000000 +0000 -+++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:35:12.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.1-p1"; -+ return "3.1.1-p2"; - } -diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c ---- mpfr-3.1.1-a/tests/tstrtofr.c 2012-07-03 15:01:24.000000000 +0000 -+++ mpfr-3.1.1-b/tests/tstrtofr.c 2012-08-30 09:35:12.000000000 +0000 -@@ -1105,6 +1105,92 @@ - mpfr_clear (y); - } - -+/* From a bug reported by Joseph S. Myers -+ https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */ -+static void -+bug20120814 (void) -+{ -+ mpfr_exp_t emin = -30, e; -+ mpfr_t x, y; -+ int r; -+ char s[64], *p; -+ -+ mpfr_init2 (x, 2); -+ mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN); -+ mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD); -+ s[0] = s[1]; -+ s[1] = '.'; -+ for (p = s; *p != 0; p++) ; -+ *p = 'e'; -+ sprintf (p + 1, "%d", (int) e - 1); -+ -+ mpfr_init2 (y, 4); -+ r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN); -+ if (r <= 0 || ! mpfr_equal_p (x, y)) -+ { -+ printf ("Error in bug20120814\n"); -+ printf ("mpfr_strtofr failed on string \"%s\"\n", s); -+ printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin); -+ printf ("Got inex = %-6d and y = ", r); -+ mpfr_dump (y); -+ exit (1); -+ } -+ -+ mpfr_clear (x); -+ mpfr_clear (y); -+} -+ -+static void -+bug20120829 (void) -+{ -+ mpfr_t x1, x2, e; -+ int inex1, inex2, i, r; -+ char s[48] = "1e-1"; -+ -+ mpfr_init2 (e, 128); -+ mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0); -+ -+ inex1 = mpfr_set_si (e, -1, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); -+ -+ for (i = 1; i <= sizeof(s) - 5; i++) -+ { -+ s[3+i] = '0'; -+ s[4+i] = 0; -+ inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); -+ RND_LOOP(r) -+ { -+ mpfr_rnd_t rnd = (mpfr_rnd_t) r; -+ -+ inex1 = mpfr_exp10 (x1, e, rnd); -+ inex1 = SIGN (inex1); -+ inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd); -+ inex2 = SIGN (inex2); -+ /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do: -+ strtofr.c:...: MPFR assertion failed: cy == 0 -+ r8396 is OK. -+ On 64-bit machines, for i = 15, -+ r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0) -+ r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize -+ r8394 and r8396 are OK. -+ */ -+ if (! mpfr_equal_p (x1, x2) || inex1 != inex2) -+ { -+ printf ("Error in bug20120829 for i = %d, rnd = %s\n", -+ i, mpfr_print_rnd_mode (rnd)); -+ printf ("Expected inex = %d, x = ", inex1); -+ mpfr_dump (x1); -+ printf ("Got inex = %d, x = ", inex2); -+ mpfr_dump (x2); -+ exit (1); -+ } -+ } -+ } -+ -+ mpfr_clears (e, x1, x2, (mpfr_ptr) 0); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -1117,6 +1203,8 @@ - check_retval (); - bug20081028 (); - test20100310 (); -+ bug20120814 (); -+ bug20120829 (); - - tests_end_mpfr (); - return 0; diff --git a/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch b/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch deleted file mode 100644 index 0d9f1251d..000000000 --- a/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3761902e2e120849c283106fd4b78b6adec7367e Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Tue, 8 Jan 2013 20:00:01 +0100 -Subject: [PATCH] dbus: fix serialization of calendar timers - ---- - src/core/dbus-timer.c | 25 +++++++++++++++---------- - 1 file changed, 15 insertions(+), 10 deletions(-) - -diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c -index 11d18cb..b22fcb5 100644 ---- a/src/core/dbus-timer.c -+++ b/src/core/dbus-timer.c -@@ -69,22 +69,28 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi - return -ENOMEM; - - LIST_FOREACH(value, k, p->values) { -- char *buf; -+ _cleanup_free_ char *buf = NULL; - const char *t; - size_t l; - bool b; - - t = timer_base_to_string(k->base); -- assert(endswith(t, "Sec")); - -- /* s/Sec/USec/ */ -- l = strlen(t); -- buf = new(char, l+2); -- if (!buf) -- return -ENOMEM; -+ if (endswith(t, "Sec")) { -+ -+ /* s/Sec/USec/ */ -+ l = strlen(t); -+ buf = new(char, l+2); -+ if (!buf) -+ return -ENOMEM; - -- memcpy(buf, t, l-3); -- memcpy(buf+l-3, "USec", 5); -+ memcpy(buf, t, l-3); -+ memcpy(buf+l-3, "USec", 5); -+ } else { -+ buf = strdup(t); -+ if (!buf) -+ return -ENOMEM; -+ } - - b = dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) && - dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &buf) && -@@ -92,7 +98,6 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi - dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &k->next_elapse) && - dbus_message_iter_close_container(&sub, &sub2); - -- free(buf); - if (!b) - return -ENOMEM; - } --- -1.8.1 - diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 8bae20a2b..0ba718aa0 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=197 -pkgrel=4 +pkgver=198 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -13,13 +13,11 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - '0001-dbus-fix-serialization-of-calendar-timers.patch' 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' 'use-split-usr-path.patch') -md5sums=('56a860dceadfafe59f40141eb5223743' - '0341d680d5ab16bab3978bac96bf8797' +md5sums=('26a75e2a310f8c1c1ea9ec26ddb171c5' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' @@ -31,13 +29,8 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - # fix assertion failure when using calendar timers - # upstream 3761902e2e120849c283106fd4b78b6adec7367e - patch -Np1 <"$srcdir/0001-dbus-fix-serialization-of-calendar-timers.patch" - ./configure \ - PYTHON=python2 \ - PYTHON_CONFIG=python2-config \ + --enable-static \ --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ @@ -48,9 +41,6 @@ build() { --with-sysvinit-path= \ --with-sysvrcnd-path= - # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. - # https://pokersource.info/show_bug.cgi?id=50989 - make } @@ -69,8 +59,6 @@ package_systemd() { 'libmicrohttpd: systemd-journal-gatewayd' 'quota-tools: kernel-level quota management' 'python: systemd library bindings' - 'python2-cairo: systemd-analyze' - 'python2-gobject: systemd-analyze' 'systemd-sysvcompat: symlink package to provide sysvinit binaries') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf @@ -91,14 +79,6 @@ package_systemd() { install -dm755 "$pkgdir/bin" ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - # move bash-completion and symlink for *ctl's - install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ - "$pkgdir/usr/share/bash-completion/completions/systemctl" - for ctl in {login,journal,timedate,locale,hostname,systemd-coredump}ctl udevadm; do - ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl" - done - rm -rf "$pkgdir/etc/bash_completion.d" - # don't write units to /etc by default -- we'll enable this on post_install # as a sane default rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD index e4e64853d..0c022c9f7 100644 --- a/core/texinfo/PKGBUILD +++ b/core/texinfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178319 2013-02-20 06:23:03Z allan $ +# $Id: PKGBUILD 180067 2013-03-15 22:55:32Z allan $ # Maintainer: Allan McRae # Contributor: Tom Newsom pkgname=texinfo -pkgver=5.0 +pkgver=5.1 pkgrel=1 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ groups=('base' 'base-devel') depends=('ncurses' 'findutils' 'gzip' 'perl' 'sh') install=texinfo.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('ef2fad34c71ddc95b20c7d6a08c0d7a6' - 'a1e46e27d14467b05abe652bfc30684e') +md5sums=('52ee905a3b705020d2a1b6ec36d53ca6' + '65c8c95799ea5905e03cee5825d3553f') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 83427aeed..91da62eb7 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ +# $Id: PKGBUILD 180054 2013-03-15 08:10:52Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,11 +22,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '61b8b43e04065556b2b173d34111674d' + 'a762b6f22a64473a0b4d8dc5366b25d3' '5cc106ba38bab845ea62138fc0d1bbf1' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') + 'f3def2cefdcbb954c21d8505d23cc83c') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-PAE diff --git a/kernels/linux-libre-pae/change-default-console-loglevel.patch b/kernels/linux-libre-pae/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/kernels/linux-libre-pae/change-default-console-loglevel.patch +++ b/kernels/linux-libre-pae/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 88ec434c7..553af3431 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.2-1-LIBRE-PAE +KERNEL_VERSION=3.8.3-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 063c6fed6..3205c4d19 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -13,7 +13,7 @@ _releasever=11 _rtpatchver=rt30 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -pkgrel=1 +pkgrel=2 _lxopkgver=${_basekernel}.11 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -49,7 +49,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' '4909a0271af4e5f373136b382826717f' - '88d501404f172dac6fcb248978251560' + 'f3def2cefdcbb954c21d8505d23cc83c' 'c188074cdc350ac7cf4e9c8d14c0575e') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. diff --git a/kernels/linux-libre-rt/change-default-console-loglevel.patch b/kernels/linux-libre-rt/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/kernels/linux-libre-rt/change-default-console-loglevel.patch +++ b/kernels/linux-libre-rt/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index c066ccb92..9d9a9ad00 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.6.11-1-rt30-LIBRE-RT +KERNEL_VERSION=3.6.11-2-rt30-LIBRE-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index f2bb2f1a7..3fb5fdb37 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ +# $Id: PKGBUILD 180054 2013-03-15 08:10:52Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,11 +22,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '61b8b43e04065556b2b173d34111674d' + 'a762b6f22a64473a0b4d8dc5366b25d3' 'c13961a22d8c742fb31b59a1e27a0e7b' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') + 'f3def2cefdcbb954c21d8505d23cc83c') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-XEN diff --git a/kernels/linux-libre-xen/change-default-console-loglevel.patch b/kernels/linux-libre-xen/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/kernels/linux-libre-xen/change-default-console-loglevel.patch +++ b/kernels/linux-libre-xen/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 88803e55b..136ca7163 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.2-1-LIBRE-XEN +KERNEL_VERSION=3.8.3-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index 6cfb023cb..0f4741470 100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD @@ -3,17 +3,18 @@ # Contributor (Parabola): Márcio Silva pkgname=crosstool-ng -pkgver=1.16.0 +pkgver=1.18.0 pkgrel=1 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)" arch=('i686' 'x86_64') url="http://crosstool-ng.org/" license=(GPL2) -depends=('cvs' 'curl' 'gperf') +depends=('cvs' 'curl' 'gperf' 'wget') makedepends=('libtool') optdepends=('subversion: for retrieving eglibc sources') source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2) #libc_ports_short_name.patch) +md5sums=('3376d389c632baa77f0bce1db1a196a9') build() { cd $srcdir/$pkgname-$pkgver @@ -26,5 +27,6 @@ build() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install + + install -Dm644 ct-ng.comp ${pkgdir}/usr/share/bash-completion/completions/ct-ng } -md5sums=('900f5f72df3ab9b48b6d1efd1d6634b8') diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 95d0c374f..53b7a89ee 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.2 +_kernver=3.8.3 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=7 +pkgrel=8 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index c177a1ad6..3a0571c9d 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.68 +_kernver=3.0.69 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=6 +pkgrel=7 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index fc5cd17c9..fb78c51a3 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179286 2013-03-04 17:14:18Z tpowa $ +# $Id: PKGBUILD 180056 2013-03-15 09:48:23Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=68 +_sublevel=69 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.66 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.68 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,19 +32,19 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '571adcbf6f408967fe4df19c1c17b00b' + 'cf63ee4dfe973aa9f933ed552ac5c277' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' + 'f3def2cefdcbb954c21d8505d23cc83c' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '7870185804a1795293698f9a0b770720') + '31fc866c5f8a15f21222e5f236f5cd03') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/change-default-console-loglevel.patch b/libre/linux-libre-lts/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/libre/linux-libre-lts/change-default-console-loglevel.patch +++ b/libre/linux-libre-lts/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 283424020..f8eccd0c4 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.68-1-LIBRE-LTS +KERNEL_VERSION=3.0.69-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index a1d7989a1..9a9bd3ea3 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ +# $Id: PKGBUILD 180054 2013-03-15 08:10:52Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '61b8b43e04065556b2b173d34111674d' + 'a762b6f22a64473a0b4d8dc5366b25d3' '4d73ccd0f1825a4bd474d4fead6c0d42' 'e132184c6d02ef580a504967c067e1c5' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - 'e46425096ddbfb9566ef276ac4b3e623') + 'f3def2cefdcbb954c21d8505d23cc83c' + '72a7d05df8498c0e45632f083403605a') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/libre/linux-libre/change-default-console-loglevel.patch +++ b/libre/linux-libre/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index e8d4fb3d8..0a442abb8 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.2-1-LIBRE +KERNEL_VERSION=3.8.3-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/grass/PKGBUILD b/pcr/grass/PKGBUILD new file mode 100644 index 000000000..aa32f8ca8 --- /dev/null +++ b/pcr/grass/PKGBUILD @@ -0,0 +1,138 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: Emiliano Vavassori + +pkgname=grass +pkgver=6.4.2 +pkgrel=5 +pkgdesc='Geographic Information System (GIS) used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization.' +arch=('i686' 'x86_64') +url='http://grass.osgeo.org/' +license=('GPL') +depends=('cfitsio' 'fftw' 'gdal' 'glu' 'libjpeg' 'libpng' 'libtiff' 'libxmu' 'mesa' 'python2' 'postgresql' 'proj' 'tcl' 'tk' 'wxpython' 'xorg-server') +makedepends=('freetype2') +optdepends=('sqlite3: sqlite3 database interface' + 'mysql: mysql database interface' + 'r: R language interface' + 'blas: required for GMATH library' + 'lapack: required for GMATH library' + 'cairo: cairo support' + 'ffmpeg: ffmpeg support' + 'lesstif: motif support') +options=('!libtool' '!makeflags') +install='grass.install' +source=("http://grass.osgeo.org/grass64/source/${pkgname}-${pkgver}.tar.gz" + "grass.sh" + "grass.conf" + "grass-python2.patch" + "grass-tk86-fix.patch") +md5sums=('d3398d6b1e3a2ef19cfb6e39a5ae9919' + '23da2e9399b3c5504851dec37821abe1' + '6103480c2a1adc19a50b9e925e5e6d4c' + '8717c73e7d262b1cff44d35ce80c50bb' + 'b7cb69248a387f70dabd5ce20b8297dc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Replacing previous python2 fixes with a patch. + # Thanks to Gunther Schulz to have reported a possible bug in the patching. + patch -p1 -i "${srcdir}/grass-python2.patch" + + # Solves build issue reported here: + # http://trac.osgeo.org/grass/ticket/1843 + patch -p1 -i "${srcdir}/grass-tk86-fix.patch" + + # the following exports are probably not needed + export PYTHON=python2 + export DOXNAME=python2 + export GRASS_python=python2 + + # Enabling 64bit support - EGV + if [ "$CARCH" = "x86_64" ]; then + ENABLE64BIT="--enable-64bit" + else + ENABLE64BIT="--disable-64bit" + fi + + # see ${srcdir}/grass-6.4.0/REQUIREMENTS.html for options + # GLw is hard disabled, since no package in Archlinux can provide it - EGV + ./configure ${ENABLE64BIT} \ + --prefix=/opt \ + --enable-64bit \ + --enable-W11 \ + --with-jpeg \ + --with-tiff \ + --with-png \ + --with-tcltk \ + --with-opengl \ + --with-fftw \ + --with-postgres \ + --with-freetype \ + --with-freetype-includes=/usr/include/freetype2 \ + --without-glw \ + --with-nls \ + --with-gdal \ + --with-geos \ + --with-proj-includes=/usr/include \ + --with-proj-libs=/usr/lib \ + --with-proj-share=/usr/share/proj \ + --with-python=/usr/bin/python2-config \ + --with-wxwidgets=/usr/bin/wx-config + + # sqlite3 support + # --with-sqlite \ + + # mysql support + # --with-mysql \ + # --with-mysql-includes=/usr/include/mysql \ + + # blas support + # --with-blas \ + + # lapack support + # --with-lapack \ + + make + + # some more potential problems nvm, works without, but save for future use if problems arrise + #cd ${pkgdir}/opt/grass-${pkgver} + #sed -i 's/PYTHON = python/PYTHON = python2/' include/Make/Python.make + #sed -i 's/GRASS_PYTHON=python/GRASS_PYTHON=python2/' etc/Init.sh +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make \ + INST_DIR=${pkgdir}/opt/grass-${pkgver} \ + BINDIR=${pkgdir}/usr/bin \ + install + + # fix $GISBASE path + sed -i "s|GISBASE=${pkgdir}/opt/grass-${pkgver}|GISBASE=/opt/grass-${pkgver}|g" \ + ${pkgdir}/usr/bin/grass64 + + # install profile.d file + install -D ${srcdir}/grass.sh \ + ${pkgdir}/etc/profile.d/grass.sh + + # install some freedesktop.org compatibility + install -D -m644 gui/icons/grass.desktop \ + ${pkgdir}/usr/share/applications/grass.desktop + + sed -i -e 's/grass65/grass64/' -e 's_/usr/share/icons_/usr/share/pixmaps_' \ + ${pkgdir}/usr/share/applications/grass.desktop + + install -D -m644 gui/icons/grass-48x48.png \ + ${pkgdir}/usr/share/pixmaps/grass-48x48.png + + install -D -m644 ${srcdir}/grass.conf \ + ${pkgdir}/etc/ld.so.conf.d/grass.conf + + # install g.html2man which is needed for some extensions + # FS#25705 - [grass] g.html2man is not installed into package directory + # https://bugs.archlinux.org/task/25705 + # most likely upstream problem which will be fixed in a version later than 6.4.1 + cp -r ./tools/g.html2man ${pkgdir}/opt/${pkgname}-${pkgver}/tools +} diff --git a/pcr/grass/grass-python2.patch b/pcr/grass/grass-python2.patch new file mode 100644 index 000000000..ee35949b5 --- /dev/null +++ b/pcr/grass/grass-python2.patch @@ -0,0 +1,327 @@ +diff -ur grass-6.4.2/doc/python/example_ctypes.py grass-6.4.2-new/doc/python/example_ctypes.py +--- grass-6.4.2/doc/python/example_ctypes.py 2010-04-17 14:15:26.000000000 +0200 ++++ grass-6.4.2-new/doc/python/example_ctypes.py 2012-08-16 09:33:01.480497320 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + import os, sys, subprocess + from ctypes import * + grass = CDLL("libgrass_gis.so") +diff -ur grass-6.4.2/general/g.parser/test.py grass-6.4.2-new/general/g.parser/test.py +--- grass-6.4.2/general/g.parser/test.py 2009-07-23 23:08:41.000000000 +0200 ++++ grass-6.4.2-new/general/g.parser/test.py 2012-08-16 09:33:01.513831191 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # g.parser demo script for python programing + +diff -ur grass-6.4.2/gui/scripts/g.change.gui.py grass-6.4.2-new/gui/scripts/g.change.gui.py +--- grass-6.4.2/gui/scripts/g.change.gui.py 2009-05-30 07:36:32.000000000 +0200 ++++ grass-6.4.2-new/gui/scripts/g.change.gui.py 2012-08-16 09:33:04.353875090 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ############################################################################ + # +diff -ur grass-6.4.2/gui/scripts/g.extension.py grass-6.4.2-new/gui/scripts/g.extension.py +--- grass-6.4.2/gui/scripts/g.extension.py 2012-02-18 18:28:29.000000000 +0100 ++++ grass-6.4.2-new/gui/scripts/g.extension.py 2012-08-16 09:33:04.393875703 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ############################################################################ + # +diff -ur grass-6.4.2/gui/scripts/g.extension.rebuild.all.py grass-6.4.2-new/gui/scripts/g.extension.rebuild.all.py +--- grass-6.4.2/gui/scripts/g.extension.rebuild.all.py 2012-02-01 10:26:11.000000000 +0100 ++++ grass-6.4.2-new/gui/scripts/g.extension.rebuild.all.py 2012-08-16 09:33:04.320541242 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ############################################################################ + # +diff -ur grass-6.4.2/gui/scripts/v.type_wrapper.py grass-6.4.2-new/gui/scripts/v.type_wrapper.py +--- grass-6.4.2/gui/scripts/v.type_wrapper.py 2009-05-30 07:36:32.000000000 +0200 ++++ grass-6.4.2-new/gui/scripts/v.type_wrapper.py 2012-08-16 09:33:04.287207393 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: v.type_wrapper.py (v.type wrapper script) +diff -ur grass-6.4.2/gui/wxpython/gui_modules/menuform.py grass-6.4.2-new/gui/wxpython/gui_modules/menuform.py +--- grass-6.4.2/gui/wxpython/gui_modules/menuform.py 2012-01-04 10:55:50.000000000 +0100 ++++ grass-6.4.2-new/gui/wxpython/gui_modules/menuform.py 2012-08-16 09:33:03.000520822 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + """ + @brief Construct simple wx.Python GUI from a GRASS command interface + description. +diff -ur grass-6.4.2/gui/wxpython/scripts/d.rast3d.py grass-6.4.2-new/gui/wxpython/scripts/d.rast3d.py +--- grass-6.4.2/gui/wxpython/scripts/d.rast3d.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/d.rast3d.py 2012-08-16 09:33:04.083870925 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + ############################################################################ + # +diff -ur grass-6.4.2/gui/wxpython/scripts/p.cmd.py grass-6.4.2-new/gui/wxpython/scripts/p.cmd.py +--- grass-6.4.2/gui/wxpython/scripts/p.cmd.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/p.cmd.py 2012-08-16 09:33:03.870534267 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: p.cmd +diff -ur grass-6.4.2/gui/wxpython/scripts/p.db.py grass-6.4.2-new/gui/wxpython/scripts/p.db.py +--- grass-6.4.2/gui/wxpython/scripts/p.db.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/p.db.py 2012-08-16 09:33:04.047203667 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: p.db +diff -ur grass-6.4.2/gui/wxpython/scripts/p.mon.py grass-6.4.2-new/gui/wxpython/scripts/p.mon.py +--- grass-6.4.2/gui/wxpython/scripts/p.mon.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/p.mon.py 2012-08-16 09:33:03.940535364 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: p.mon +diff -ur grass-6.4.2/gui/wxpython/scripts/p.rast.py grass-6.4.2-new/gui/wxpython/scripts/p.rast.py +--- grass-6.4.2/gui/wxpython/scripts/p.rast.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/p.rast.py 2012-08-16 09:33:04.013869835 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: p.rast +diff -ur grass-6.4.2/gui/wxpython/scripts/p.vect.py grass-6.4.2-new/gui/wxpython/scripts/p.vect.py +--- grass-6.4.2/gui/wxpython/scripts/p.vect.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/p.vect.py 2012-08-16 09:33:03.980535999 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: p.vect +diff -ur grass-6.4.2/imagery/i.atcorr/create_iwave.py grass-6.4.2-new/imagery/i.atcorr/create_iwave.py +--- grass-6.4.2/imagery/i.atcorr/create_iwave.py 2010-12-22 12:09:24.000000000 +0100 ++++ grass-6.4.2-new/imagery/i.atcorr/create_iwave.py 2012-08-16 09:33:04.430542943 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + """ + Created on Sat Mar 27 11:35:32 2010 + +diff -ur grass-6.4.2/include/Make/Platform.make.in grass-6.4.2-new/include/Make/Platform.make.in +--- grass-6.4.2/include/Make/Platform.make.in 2010-11-08 08:23:48.000000000 +0100 ++++ grass-6.4.2-new/include/Make/Platform.make.in 2012-08-16 09:33:35.484354613 +0200 +@@ -217,7 +217,7 @@ + USE_CAIRO = @USE_CAIRO@ + + #Python +-PYTHON = python ++PYTHON = python2 + PYTHONINC = @PYTHONINC@ + PYTHONCFLAGS = @PYTHONCFLAGS@ + PYTHONLDFLAGS = @PYTHONLDFLAGS@ +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/ctypedescs.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/ctypedescs.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/ctypedescs.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/ctypedescs.py 2012-08-16 09:33:04.987218247 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ''' + ctypesgencore.ctypedescs contains classes to represent a C type. All of them +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/descriptions.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/descriptions.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/descriptions.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/descriptions.py 2012-08-16 09:33:04.883883291 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + ctypesgencore.descriptions contains classes to represent a description of a +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/expressions.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/expressions.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/expressions.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/expressions.py 2012-08-16 09:33:05.023885450 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ''' + The expressions module contains classes to represent an expression. The main +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/__init__.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/__init__.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/__init__.py 2012-08-16 09:33:04.920550527 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + Ctypesgencore is the module that contains the main body of ctypesgen - in fact, +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/messages.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/messages.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/messages.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/messages.py 2012-08-16 09:33:04.503877428 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + ctypesgencore.messages contains functions to display status, error, or warning +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/options.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/options.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/options.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/options.py 2012-08-16 09:33:04.707213885 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + All of the components of ctypegencore require an argument called "options". +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py 2012-08-16 09:33:05.393891162 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ''' + This file contains classes that represent C declarations. cparser produces +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cgrammar.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cgrammar.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cgrammar.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cgrammar.py 2012-08-16 09:33:05.433891816 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + '''This is a yacc grammar for C. + +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cparser.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cparser.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cparser.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cparser.py 2012-08-16 09:33:05.213888390 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ''' + Parse a C source file. +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py 2012-08-16 09:33:05.093886533 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ''' + ctypesgencore.parser.ctypesparser contains a class, CtypesParser, which is a +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py 2012-08-16 09:33:05.473892425 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + DataCollectingParser subclasses ctypesparser.CtypesParser and builds Description +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/__init__.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/__init__.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/__init__.py 2012-08-16 09:33:05.283889499 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + This package parses C header files and generates lists of functions, typedefs, +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/pplexer.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/pplexer.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/pplexer.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/pplexer.py 2012-08-16 09:33:05.180554533 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + '''Preprocess a C source file using gcc and convert the result into + a token stream +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/preprocessor.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/preprocessor.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/preprocessor.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/preprocessor.py 2012-08-16 09:33:05.250555640 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + '''Preprocess a C source file using gcc and convert the result into + a token stream +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/__init__.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/__init__.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/__init__.py 2012-08-16 09:33:04.640546189 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + This module is the backend to ctypesgen; it contains classes to +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/printer.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/printer.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/printer.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/printer.py 2012-08-16 09:33:04.537211279 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + import os, sys, time + from ctypesgencore.descriptions import * +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/dependencies.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/dependencies.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/dependencies.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/dependencies.py 2012-08-16 09:33:04.743881125 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + The dependencies module determines which descriptions depend on which other +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/__init__.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/__init__.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/__init__.py 2012-08-16 09:33:04.810548840 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + This module contains functions to operate on the DeclarationCollection produced +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/operations.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/operations.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/operations.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/operations.py 2012-08-16 09:33:04.847216053 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + The operations module contains various functions to process the +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/pipeline.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/pipeline.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/pipeline.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/pipeline.py 2012-08-16 09:33:04.777214964 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + import ctypes, re, os + from ctypesgencore.processor.operations import * +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgen.py grass-6.4.2-new/lib/python/ctypes/ctypesgen.py +--- grass-6.4.2/lib/python/ctypes/ctypesgen.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgen.py 2012-08-16 09:33:05.573893972 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + def find_names_in_modules(modules): + names = set() diff --git a/pcr/grass/grass-tk86-fix.patch b/pcr/grass/grass-tk86-fix.patch new file mode 100644 index 000000000..f0dbb7c2b --- /dev/null +++ b/pcr/grass/grass-tk86-fix.patch @@ -0,0 +1,11 @@ +--- grass-6.4.2/visualization/nviz/src/draw.c 2008-12-19 21:29:59.000000000 +0100 ++++ grass-6.4.2/visualization/nviz/src/draw_new.c 2013-01-21 22:22:09.819456565 +0100 +@@ -32,7 +32,7 @@ + void CancelFunc_Hook(void) + { + if (cancel_script != NULL) { +- TkCopyAndGlobalEval(cancel_interp, cancel_script); ++ Tcl_EvalEx(cancel_interp, cancel_script, -1, TCL_EVAL_GLOBAL); + } + } + diff --git a/pcr/grass/grass.conf b/pcr/grass/grass.conf new file mode 100644 index 000000000..bb4964d93 --- /dev/null +++ b/pcr/grass/grass.conf @@ -0,0 +1 @@ +/opt/grass/lib diff --git a/pcr/grass/grass.install b/pcr/grass/grass.install new file mode 100644 index 000000000..878ea0186 --- /dev/null +++ b/pcr/grass/grass.install @@ -0,0 +1,26 @@ +## arg 1: the new package version +post_install() { + pkgver=${1%-*} + + # Create symlink for version workaround. + ln -sf /opt/grass-${pkgver} /opt/grass + + echo 'Please relogin for required variables to be set from /etc/profile.d/grass.sh' +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + pkgver=${1%-*} + + # Updating symlink for new version + ln -sf /opt/grass-${pkgver} /opt/grass +} + +## arg 1: the old package version +pre_remove() { + # Removing cruft symlink + rm -f /opt/grass +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/grass/grass.sh b/pcr/grass/grass.sh new file mode 100644 index 000000000..e36980c16 --- /dev/null +++ b/pcr/grass/grass.sh @@ -0,0 +1,4 @@ +export GISBASE=/opt/grass +export PATH=$PATH:$GISBASE/bin:$GISBASE/scripts +export MANPATH=$MANPATH:$GISBASE/man +export GRASS_PYTHON=python2 diff --git a/pcr/libfreexl/PKGBUILD b/pcr/libfreexl/PKGBUILD new file mode 100644 index 000000000..69d94ce99 --- /dev/null +++ b/pcr/libfreexl/PKGBUILD @@ -0,0 +1,21 @@ +# Maintainer: Bruno Gola +pkgname=libfreexl +pkgver=1.0.0e +pkgrel=1 +pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet." +arch=('i686' 'x86_64') +url="https://www.gaia-gis.it/fossil/freexl/index" +license=('MPL') +source=("http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-$pkgver.tar.gz") + +build() { + cd "$srcdir/freexl-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/freexl-$pkgver" + make DESTDIR="$pkgdir/" install +} +md5sums=('9b494d42a079e63afbb9dc0915e8fb56') diff --git a/pcr/libowfat/PKGBUILD b/pcr/libowfat/PKGBUILD index e2602046d..a51638450 100644 --- a/pcr/libowfat/PKGBUILD +++ b/pcr/libowfat/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libowfat pkgver=0.29 -pkgrel=2 +pkgrel=3 pkgdesc='GPL reimplementation of libdjb' arch=(i686 x86_64 mips64el) url=http://www.fefe.de/libowfat/ diff --git a/pcr/libspatialite/PKGBUILD b/pcr/libspatialite/PKGBUILD new file mode 100644 index 000000000..24c775fd8 --- /dev/null +++ b/pcr/libspatialite/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Brian Galey +# Contributor: Pietro Zambelli +pkgname=libspatialite +pkgver=4.0.0 +pkgrel=1 +pkgdesc="SQLite extension to support spatial data types and operations" +arch=('i686' 'x86_64') +url="https://www.gaia-gis.it/fossil/libspatialite/index" +license=('MPL') +depends=('geos' 'proj' 'sqlite3' 'libfreexl') +options=('!libtool') +source=("http://www.gaia-gis.it/gaia-sins/$pkgname-$pkgver.tar.gz") +md5sums=('8040ce4e39913e7d284675c0f15d270d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/opentracker/PKGBUILD b/pcr/opentracker/PKGBUILD new file mode 100644 index 000000000..d2b9a3703 --- /dev/null +++ b/pcr/opentracker/PKGBUILD @@ -0,0 +1,67 @@ +# Contributor: Pierre Schmitz +# Maintainer: Jonas Heinrich + +pkgname=opentracker +pkgver=20130312 +pkgrel=1 +pkgdesc='An open and free bittorrent tracker (open mode)' +arch=('i686' 'x86_64' 'mips64el') +url='http://erdgeist.org/arts/software/opentracker/' +license=('custom:Beer' 'GPL') +makedepends=('libowfat' 'cvs') +depends=('bash' 'zlib') +backup=('etc/opentracker/config') +source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"{,.sig} +'opentracker.service' +'license.txt') +md5sums=('64956fd9bc7b453b4862b8ba15a27511' + '0217a2aeaee2b75017c13cdf86a245f2' + '3c638b71d5ecb65fb7964796975b2078' + '865211941e882c0aff5d36a22ac9efaa') + +_cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot' +_cvsmod='opentracker' + +mksource() { + pushd "${srcdir}" + msg 'Connecting to CVS server....' + if [ -d ${_cvsmod}/CVS ]; then + cd ${_cvsmod} + cvs -z3 update -d + else + cvs -z3 -d ${_cvsroot} co -f ${_cvsmod} + cd ${_cvsmod} + fi + + msg 'CVS checkout done or server timeout' + popd + + tar czf ${pkgname}-${pkgver}.tar.gz ${_cvsmod}/ +} + +build() { + cd "${srcdir}/${_cvsmod}" + msg 'Starting make...' + + sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ + -e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \ + -i opentracker.conf.sample + +# See Makefile for available features + make PREFIX=/usr \ + LIBOWFAT_HEADERS=/usr/includes \ + LIBOWFAT_LIBRARY=/usr/lib \ + FEATURES="-DWANT_SYSLOGS -DDEBUG_HTTPERROR" +} + +package(){ + cd "${srcdir}/${_cvsmod}" + + install -D -m 755 opentracker $pkgdir/usr/bin/opentracker + install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config + install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt + + # Create opentracker service + mkdir -p "$pkgdir/usr/lib/systemd/system/" + install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/" +} diff --git a/pcr/opentracker/license.txt b/pcr/opentracker/license.txt new file mode 100644 index 000000000..ff1bb40f5 --- /dev/null +++ b/pcr/opentracker/license.txt @@ -0,0 +1,2 @@ +This software was written by Dirk Engling +It is considered beerware. Prost. Skol. Cheers or whatever. diff --git a/pcr/opentracker/opentracker.install b/pcr/opentracker/opentracker.install new file mode 100644 index 000000000..59f6f6ebe --- /dev/null +++ b/pcr/opentracker/opentracker.install @@ -0,0 +1,17 @@ +post_install() { + cat </dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon opentracker + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/pcr/opentracker/opentracker.service b/pcr/opentracker/opentracker.service new file mode 100644 index 000000000..5f1b887ea --- /dev/null +++ b/pcr/opentracker/opentracker.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenTracker Daemon +After=network.target + +[Service] +User=nobody +ExecStart=/usr/bin/opentracker -f /etc/opentracker/config +ExecStop=/bin/kill -INT $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD new file mode 100644 index 000000000..7a305285c --- /dev/null +++ b/pcr/qgis/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer: Lantald < lantald at gmx.com +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: Gerardo Exequiel Pozzi +# Contributor: Eric Forgeot < http://esclinux.tk > + +pkgname=qgis +pkgver=1.8.0 +pkgrel=5 +pkgdesc='Quantum GIS is a Geographic Information System (GIS) that supports vector, raster & database formats' +url='http://qgis.org/' +license=('GPL') +arch=('i686' 'x86_64') +# update to http://www.qgis.org/wiki/Building_QGIS_from_Source#Overview +depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'pyqt' 'python2' 'python2-pyqt' 'giflib' 'cfitsio' 'qwt' 'gdal' 'flex' 'bison' 'libspatialite' 'spatialindex') +makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip') +optdepends=('postgis: postgis support and SPIT plugin' + 'fcgi: qgis mapserver' + 'python2-sip: python-support' + 'grass: grass plugin' + 'gsl: georeferencer') +options=('!makeflags') +source=("http://qgis.org/downloads/qgis-${pkgver}.tar.bz2" + 'qgis.desktop') + +md5sums=('1d60520f81d7763c026d0af887ac9a05' + '8ab66039f2aba519b92f52272ec3c13e') + +build() { + # Fix insecure RPATH is weird, but just works ;) + # echo "os.system(\"sed -i '/^LFLAGS/s|-Wl,-rpath,.\+ ||g' gui/Makefile core/Makefile\")" >> python/configure.py.in + #cd qgis-${pkgver} + + rm -rf build + mkdir build + cd build + + cmake ../qgis-${pkgver} \ + -DENABLE_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DGRASS_PREFIX=/opt/grass \ + -DQGIS_MANUAL_SUBDIR=share/man \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DPYTHON_SITE_PACKAGES_DIR=/usr/lib/python2.7/site-packages \ + -DPYTHON_INCLUDE_PATH=/usr/include/python2.7 \ + -DQT_QMAKE_EXECUTABLE=qmake4 + + make +} + +package() { + cd build + + make DESTDIR=${pkgdir} install + + # create a more user-friendly application name link + ln -s /usr/bin/qgis $pkgdir/usr/bin/quantum-gis + + # install some freedesktop.org compatibility + install -D -m644 ${srcdir}/qgis.desktop \ + ${pkgdir}/usr/share/applications/qgis.desktop +} diff --git a/pcr/qgis/qgis.desktop b/pcr/qgis/qgis.desktop new file mode 100644 index 000000000..c3db5ad08 --- /dev/null +++ b/pcr/qgis/qgis.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Quantum GIS +GenericName="GIS" +Comment="Geographic Information System (GIS) that supports vector, raster & database formats" +Exec=/usr/bin/qgis +Icon=/usr/share/qgis/images/icons/qgis-icon.png +Terminal=false +MultipleArgs=false +Type=Application +Categories=Application;Science diff --git a/pcr/spatialindex/LICENSE b/pcr/spatialindex/LICENSE new file mode 100644 index 000000000..888f4e789 --- /dev/null +++ b/pcr/spatialindex/LICENSE @@ -0,0 +1,9 @@ +Permission is hereby granted, free of charge, to any person obtaining acopy of this software and associated documentation files (the "Software"),to deal in the Software without restriction, including without limitationthe rights to use, copy, modify, merge, publish, distribute, sublicense,and/or sell copies of the Software, and to permit persons to whom theSoftware is furnished to do so, subject to the following conditions:The above copyright notice and this permission notice shall be included inall copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/pcr/spatialindex/PKGBUILD b/pcr/spatialindex/PKGBUILD new file mode 100644 index 000000000..ac2e1122e --- /dev/null +++ b/pcr/spatialindex/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Lantald +pkgname=spatialindex +pkgver=1.8.0 +pkgrel=1 +pkgdesc="An extensible framework that supports robust spatial indexing methods and sophisticated spatial queries." +arch=('i686' 'x86_64') +url="http://libspatialindex.github.com/" +license=('MIT') +depends=(gcc-libs) +provides=(spatialindex) +conflicts=(libspatialindex-git) +source=("http://download.osgeo.org/libspatialindex/$pkgname-src-$pkgver.tar.gz" + 'LICENSE') +md5sums=('aa78e2c641c472df257f49cd140669c4' + '6a9a7d8158edbf1529ca46aae5a76752') + +build() { + cd "$srcdir/$pkgname-src-$pkgver/" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-src-$pkgver/" + make -k check +} + +package() { + cd "$srcdir/$pkgname-src-$pkgver/" + make DESTDIR="$pkgdir/" install + install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD deleted file mode 100644 index 5ecf00b3a..000000000 --- a/social/opentracker/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# Contributor: Pierre Schmitz -# Maintainer: Jonas Heinrich - -pkgname=opentracker -pkgver=20130126 -pkgrel=1 -pkgdesc='An open and free bittorrent tracker (open mode)' -arch=('i686' 'x86_64' 'mips64el') -url='http://erdgeist.org/arts/software/opentracker/' -license=('custom:Beer' 'GPL') -makedepends=('libowfat' 'cvs') -depends=('bash' 'zlib') -backup=('etc/opentracker/config') -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"{,.sig} -'opentracker.service' -'license.txt') - -_cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot' -_cvsmod='opentracker' - -mksource() { - pushd "${srcdir}" - msg 'Connecting to CVS server....' - if [ -d ${_cvsmod}/CVS ]; then - cd ${_cvsmod} - cvs -z3 update -d - else - cvs -z3 -d ${_cvsroot} co -f ${_cvsmod} - cd ${_cvsmod} - fi - - msg 'CVS checkout done or server timeout' - popd - - tar czf ${pkgname}-${pkgver}.tar.gz ${_cvsmod}/ -} - -build() { - cd "${srcdir}/${_cvsmod}" - msg 'Starting make...' - - sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ - -e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \ - -i opentracker.conf.sample - -# See Makefile for available features - make PREFIX=/usr \ - LIBOWFAT_HEADERS=/usr/includes \ - LIBOWFAT_LIBRARY=/usr/lib \ - FEATURES="-DWANT_SYSLOGS -DDEBUG_HTTPERROR" -} - -package(){ - cd "${srcdir}/${_cvsmod}" - - install -D -m 755 opentracker $pkgdir/usr/bin/opentracker - install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config - install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt - - # Create opentracker service - mkdir -p "$pkgdir/usr/lib/systemd/system/" - install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/" -} -md5sums=('702a05fc2c205c6367a7e95334d8e152' - '3c80785c33c97dffe6f119417865a309' - '3c638b71d5ecb65fb7964796975b2078' - '865211941e882c0aff5d36a22ac9efaa') diff --git a/social/opentracker/license.txt b/social/opentracker/license.txt deleted file mode 100644 index ff1bb40f5..000000000 --- a/social/opentracker/license.txt +++ /dev/null @@ -1,2 +0,0 @@ -This software was written by Dirk Engling -It is considered beerware. Prost. Skol. Cheers or whatever. diff --git a/social/opentracker/opentracker.install b/social/opentracker/opentracker.install deleted file mode 100644 index 59f6f6ebe..000000000 --- a/social/opentracker/opentracker.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - cat </dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon opentracker - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/social/opentracker/opentracker.service b/social/opentracker/opentracker.service deleted file mode 100644 index 5f1b887ea..000000000 --- a/social/opentracker/opentracker.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenTracker Daemon -After=network.target - -[Service] -User=nobody -ExecStart=/usr/bin/opentracker -f /etc/opentracker/config -ExecStop=/bin/kill -INT $MAINPID - -[Install] -WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf From f752306383204cf6fd117b4839da87f4ea530390 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Thu, 11 Apr 2013 19:46:13 -0500 Subject: Add mips64el in archs --- community/aegisub/PKGBUILD | 2 +- community/aiccu/PKGBUILD | 2 +- community/avfs/PKGBUILD | 4 ++-- community/bmp-musepack/PKGBUILD | 4 ++-- community/cairo-dock/PKGBUILD | 2 +- community/emelfm2/PKGBUILD | 4 ++-- community/emerillon/PKGBUILD | 2 +- community/ffmpegsource/PKGBUILD | 2 +- community/fssos-nsvs/PKGBUILD | 2 +- community/guayadeque/PKGBUILD | 2 +- community/jad/PKGBUILD | 2 +- community/kbibtex/PKGBUILD | 2 +- community/kio-mtp/PKGBUILD | 2 +- community/monica/PKGBUILD | 4 ++-- community/python-basemap/PKGBUILD | 2 +- community/python2-pycdio/PKGBUILD | 2 +- community/setconf/PKGBUILD | 2 +- community/virtualgl/PKGBUILD | 2 +- extra/libvdpau/PKGBUILD | 2 +- 19 files changed, 23 insertions(+), 23 deletions(-) (limited to 'community/setconf') diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index 3d4671472..6acc2ade7 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -7,7 +7,7 @@ pkgname=aegisub pkgver=3.0.2 pkgrel=6 pkgdesc="A general-purpose subtitle editor with ASS/SSA support" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.aegisub.org" license=('GPL' 'BSD') depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9' 'hicolor-icon-theme') diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD index 118210c38..504dd2369 100644 --- a/community/aiccu/PKGBUILD +++ b/community/aiccu/PKGBUILD @@ -5,7 +5,7 @@ pkgname=aiccu pkgver=20070115 pkgrel=2 pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://www.sixxs.net/tools/aiccu/' license=('custom') depends=('gnutls' 'iproute2') diff --git a/community/avfs/PKGBUILD b/community/avfs/PKGBUILD index 962021782..ed004f224 100644 --- a/community/avfs/PKGBUILD +++ b/community/avfs/PKGBUILD @@ -4,9 +4,9 @@ pkgname=avfs pkgver=1.0.1 -pkgrel=1 +pkgrel=1.2 pkgdesc="A virtual filesystem that allows browsing of compressed files" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') url="http://avf.sourceforge.net/" depends=('fuse' 'xz' 'perl') diff --git a/community/bmp-musepack/PKGBUILD b/community/bmp-musepack/PKGBUILD index 5d339287e..b5637201c 100644 --- a/community/bmp-musepack/PKGBUILD +++ b/community/bmp-musepack/PKGBUILD @@ -4,9 +4,9 @@ pkgname=bmp-musepack pkgver=1.2 -pkgrel=4 +pkgrel=4.1 pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://musepack.net/" license=('BSD') depends=('bmp' 'libmpcdec' 'taglib') diff --git a/community/cairo-dock/PKGBUILD b/community/cairo-dock/PKGBUILD index 5c742b33d..db73fc55b 100755 --- a/community/cairo-dock/PKGBUILD +++ b/community/cairo-dock/PKGBUILD @@ -7,7 +7,7 @@ pkgname=cairo-dock pkgver=3.2.0 pkgrel=2 pkgdesc="Light eye-candy fully themable animated dock" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/cairo-dock-core" license=('GPL') depends=('curl' 'dbus-glib' 'gtk3' 'librsvg') diff --git a/community/emelfm2/PKGBUILD b/community/emelfm2/PKGBUILD index 59d86b3cb..23356156b 100644 --- a/community/emelfm2/PKGBUILD +++ b/community/emelfm2/PKGBUILD @@ -4,9 +4,9 @@ pkgname=emelfm2 pkgver=0.8.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="A file manager that implements the popular two-pane design" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://emelfm2.net/" depends=('gtk2') license=('GPL3') diff --git a/community/emerillon/PKGBUILD b/community/emerillon/PKGBUILD index fa2e49680..13445e38f 100644 --- a/community/emerillon/PKGBUILD +++ b/community/emerillon/PKGBUILD @@ -4,7 +4,7 @@ pkgname=emerillon pkgver=0.1.90 pkgrel=3 pkgdesc="Map viewer for OpenStreetMap" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://projects.gnome.org/emerillon/" license=('GPL') depends=('libchamplain' 'geoclue' 'libpeas' 'rest') diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD index eac86386e..b6350db93 100755 --- a/community/ffmpegsource/PKGBUILD +++ b/community/ffmpegsource/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ffmpegsource pkgver=743 pkgrel=2 pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/ffmpegsource/" license=('MIT') depends=('ffmpeg') diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD index 5a8d6fb89..22c2c43e3 100644 --- a/community/fssos-nsvs/PKGBUILD +++ b/community/fssos-nsvs/PKGBUILD @@ -5,7 +5,7 @@ pkgname=fssos-nsvs pkgver=0.5 pkgrel=10 pkgdesc="NSVS for FSSOS" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://fssos.sourceforge.net/" license=('GPL') depends=('bash' 'mariadb') diff --git a/community/guayadeque/PKGBUILD b/community/guayadeque/PKGBUILD index d720c56b2..7d0863cec 100755 --- a/community/guayadeque/PKGBUILD +++ b/community/guayadeque/PKGBUILD @@ -7,7 +7,7 @@ pkgname=guayadeque pkgver=0.3.5 pkgrel=5 pkgdesc="Lightweight music player" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://guayadeque.org/" license=('GPL3') depends=('curl' 'dbus' 'desktop-file-utils' 'flac' 'libgpod' 'taglib' 'wxgtk') diff --git a/community/jad/PKGBUILD b/community/jad/PKGBUILD index 30c8ea509..840929b94 100644 --- a/community/jad/PKGBUILD +++ b/community/jad/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.5.8e pkgrel=4 pkgdesc='Java decompiler' license=('custom') -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url='http://www.varaneckas.com/jad' source=("http://www.varaneckas.com/$pkgname/${pkgname}${pkgver//./}.linux.static.zip" 'jad.html::http://www.varaneckas.com/jad') diff --git a/community/kbibtex/PKGBUILD b/community/kbibtex/PKGBUILD index abcd8d8b8..9bac69f64 100644 --- a/community/kbibtex/PKGBUILD +++ b/community/kbibtex/PKGBUILD @@ -8,7 +8,7 @@ pkgver=0.4.1 _branch=0.4 pkgrel=2 pkgdesc="A BibTeX editor for KDE" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://home.gna.org/kbibtex/' license=('GPL') depends=('kdebase-runtime' 'kdegraphics-okular') diff --git a/community/kio-mtp/PKGBUILD b/community/kio-mtp/PKGBUILD index 010938ead..0706d1899 100644 --- a/community/kio-mtp/PKGBUILD +++ b/community/kio-mtp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=kio-mtp pkgver=0.75 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') pkgdesc="Provides KIO Access to MTP devices using the mtp:/// protocol" url='https://projects.kde.org/projects/playground/base/kio-mtp' license=('GPL') diff --git a/community/monica/PKGBUILD b/community/monica/PKGBUILD index 3c24c4e7d..30b21a1b8 100644 --- a/community/monica/PKGBUILD +++ b/community/monica/PKGBUILD @@ -4,9 +4,9 @@ pkgname=monica pkgver=3.7 -pkgrel=2 +pkgrel=2.1 pkgdesc="A monitor calibration tool" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.pcbypaul.com/software/monica.html" license=('BSD') depends=('fltk' 'xorg-xgamma') diff --git a/community/python-basemap/PKGBUILD b/community/python-basemap/PKGBUILD index 916c44b6e..f9345de0e 100644 --- a/community/python-basemap/PKGBUILD +++ b/community/python-basemap/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=python-basemap pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common') pkgver=1.0.6 pkgrel=2 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://matplotlib.org/basemap/" license=('custom') makedepends=('python2-numpy' 'python-numpy' 'geos' 'shapelib') diff --git a/community/python2-pycdio/PKGBUILD b/community/python2-pycdio/PKGBUILD index 54f608dbd..5911091ac 100644 --- a/community/python2-pycdio/PKGBUILD +++ b/community/python2-pycdio/PKGBUILD @@ -6,7 +6,7 @@ pkgname=python2-pycdio pkgver=0.19 pkgrel=2 pkgdesc="Python OO interface to libcdio (CD Input and Control library)" -arch=("i686" "x86_64") +arch=("i686" "x86_64" "mips64el") url="http://pypi.python.org/pypi/pycdio/" license=('GPL') depends=('python2' 'libcdio') diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index 6d0586f00..733c5453d 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -5,7 +5,7 @@ pkgname=setconf pkgver=0.5.3 pkgrel=1 pkgdesc='Utility to easily change settings in configuration files or Makefiles' -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url='http://setconf.roboticoverlords.org/' license=('GPL2') depends=('pcre' 'gc') diff --git a/community/virtualgl/PKGBUILD b/community/virtualgl/PKGBUILD index 87dcb047b..991c63681 100644 --- a/community/virtualgl/PKGBUILD +++ b/community/virtualgl/PKGBUILD @@ -6,7 +6,7 @@ pkgname=virtualgl pkgver=2.3.2 pkgrel=2 pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://virtualgl.org" license=('LGPL') depends=('libxv' 'glu' 'turbojpeg') diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD index 05c4ffb54..f62047d91 100644 --- a/extra/libvdpau/PKGBUILD +++ b/extra/libvdpau/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libvdpau pkgver=0.6 pkgrel=1 pkgdesc="Nvidia VDPAU library" -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) url='http://cgit.freedesktop.org/~aplattner/libvdpau' depends=('gcc-libs') conflicts=('nvidia-utils<190.42-2') -- cgit v1.2.3-54-g00ecf From 32b069e79cb891e99962cbac53e2950c11ea403f Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 May 2013 00:51:22 -0700 Subject: Fri May 3 00:51:21 PDT 2013 --- community/cinnamon/PKGBUILD | 13 +- community/cinnamon/idle-dim.patch | 35 ++++ community/f2fs-tools/PKGBUILD | 27 +++ community/go/PKGBUILD | 59 +++---- community/lmms/PKGBUILD | 8 +- community/mod_wsgi2/PKGBUILD | 9 +- community/mod_wsgi2/mod_wsgi2.install | 6 +- community/muffin/PKGBUILD | 14 +- community/muffin/fix-dnd.patch | 29 ++++ community/openimageio/PKGBUILD | 8 +- community/pekwm/PKGBUILD | 14 +- community/python-simplejson/PKGBUILD | 44 +++-- community/setconf/PKGBUILD | 9 +- community/sqlheavy/PKGBUILD | 40 +++++ community/stone-soup/PKGBUILD | 9 +- community/teeworlds/PKGBUILD | 15 +- community/yaml-cpp/PKGBUILD | 6 +- core/openldap/PKGBUILD | 50 ++++-- core/openldap/ntlm.patch | 230 -------------------------- core/openldap/openldap-nssov.patch | 30 ++++ core/openldap/openldap-ntlm.patch | 230 ++++++++++++++++++++++++++ core/zlib/PKGBUILD | 6 +- extra/ccrtp/PKGBUILD | 14 +- extra/libzrtpcpp/PKGBUILD | 18 +- extra/mercurial/PKGBUILD | 6 +- extra/soprano/PKGBUILD | 10 +- extra/ucommon/PKGBUILD | 14 +- libre-testing/libretools/PKGBUILD | 60 +++++++ libre-testing/libretools/libretools.install | 28 ++++ libre/linux-libre-lts/PKGBUILD | 18 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- pcr/babeld/PKGBUILD | 4 +- 32 files changed, 671 insertions(+), 394 deletions(-) create mode 100644 community/cinnamon/idle-dim.patch create mode 100644 community/f2fs-tools/PKGBUILD create mode 100644 community/muffin/fix-dnd.patch create mode 100755 community/sqlheavy/PKGBUILD delete mode 100644 core/openldap/ntlm.patch create mode 100644 core/openldap/openldap-nssov.patch create mode 100644 core/openldap/openldap-ntlm.patch create mode 100644 libre-testing/libretools/PKGBUILD create mode 100644 libre-testing/libretools/libretools.install (limited to 'community/setconf') diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 46ed9ffcf..5ff5db12a 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89648 2013-04-30 22:18:11Z faidoc $ +# $Id: PKGBUILD 89831 2013-05-02 18:23:50Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.7.8 -pkgrel=1 +pkgrel=2 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -29,13 +29,15 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "fix-control-center-check.patch" "gnome-3.8.patch" "switch-applications.patch" - "fallback-helpers.patch") + "fallback-helpers.patch" + "idle-dim.patch") sha256sums=('812042c6b7685e2054602a29ed190f8efc07f67f92be1bc496358307534cb969' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3' '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262' - 'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e') + 'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e' + 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100') build() { cd ${srcdir}/linuxmint-Cinnamon* @@ -62,6 +64,9 @@ build() { # Start media keys and mount helpers with the session patch -Np1 -i ../fallback-helpers.patch + # Fix brightness applet for GNOME 3.8 + patch -Np1 -i ../idle-dim.patch + ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/cinnamon \ diff --git a/community/cinnamon/idle-dim.patch b/community/cinnamon/idle-dim.patch new file mode 100644 index 000000000..17f5af616 --- /dev/null +++ b/community/cinnamon/idle-dim.patch @@ -0,0 +1,35 @@ +diff -Naur linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js +--- linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js 2013-04-30 18:01:56.000000000 +0200 ++++ linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js 2013-05-02 19:32:12.934254811 +0200 +@@ -9,8 +9,7 @@ + + /* constants */ + const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power"; +-const DimSettingsAc = "idle-dim-ac"; +-const DimSettingsBattery = "idle-dim-battery"; ++const DimSettings = "idle-dim"; + const PowerBusName = 'org.gnome.SettingsDaemon'; + const PowerObjectPath = '/org/gnome/SettingsDaemon/Power'; + +@@ -116,10 +115,8 @@ + + this._settingsMenu = new PopupMenu.PopupSubMenuMenuItem(_("Dimming settings")); + +- let dimSwitchAc = this._buildItem(_("Dim screen on AC power"), DimSettingsSchema, DimSettingsAc); +- this._settingsMenu.menu.addMenuItem(dimSwitchAc); +- let dimSwitchBattery = this._buildItem(_("Dim screen on battery"), DimSettingsSchema, DimSettingsBattery); +- this._settingsMenu.menu.addMenuItem(dimSwitchBattery); ++ let dimSwitch = this._buildItem(_("Dim screen"), DimSettingsSchema, DimSettings); ++ this._settingsMenu.menu.addMenuItem(dimSwitch); + + //initial update. + //We have to wait until dbus calls back to decide whether to display brightness controls. +@@ -145,7 +142,7 @@ + this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); + } + +- this.menu.addSettingsAction(_("Settings"), "screen"); ++ this.menu.addSettingsAction(_("Settings"), "screensaver"); + })); + } + catch (e) { diff --git a/community/f2fs-tools/PKGBUILD b/community/f2fs-tools/PKGBUILD new file mode 100644 index 000000000..a089b0e35 --- /dev/null +++ b/community/f2fs-tools/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Christian Hesse + +pkgname=f2fs-tools +pkgver=1.1.0 +pkgrel=2 +pkgdesc="Tools for Flash-Friendly File System (F2FS)" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/f2fs-tools/" +depends=('util-linux') +license=('GPL') +source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz') +sha256sums=('c8cfb6895a0b3775f0df00a776fd451558739289684dd43f1fd75f876fa62867') + +build() { + cd "${pkgname}-${pkgver}" + + autoreconf -fi + ./configure --prefix=/usr + make +} + +package() { + cd "${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install +} + diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index ab0dd64e4..f2c3a085f 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86967 2013-03-25 13:19:54Z arodseth $ +# $Id: PKGBUILD 89827 2013-05-02 17:23:12Z arodseth $ # Maintainer: Vesa Kaihlavirta # Maintainer: Alexander Rødseth # Contributor: Rémy Oudompheng @@ -7,10 +7,9 @@ # Contributor: Christian Himpel # Contributor: Mike Rosset # Contributor: Daniel YC Lin - pkgname=go -pkgver=1.0.3 -pkgrel=7 +pkgver=1.1rc1 +pkgrel=1 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') @@ -21,46 +20,48 @@ makedepends=('inetutils') options=('!strip') install="$pkgname.install" backup=('usr/lib/go/bin') -source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" - "$pkgname.sh") -sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df' +if [ "$CARCH" == 'x86_64' ]; then + source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" + "$pkgname.sh") + sha256sums=('fc76b716b031d8afba3f3e6bcaca410e8dbf5fb625db5def00fbaaaa960e108c' 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') +else + source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz" + "$pkgname.sh") + sha256sums=('b4eb8d9b55ae4a78c86213fa968755163ab3a8efa3f5c9f3a472b182b9d9a52e' + 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') +fi build() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname/src" - if [ "$CARCH" == 'x86_64' ]; then - export GOARCH=amd64 - elif [ "$CARCH" == 'i686' ]; then - export GOARCH=386 - else - # A friendly gesture to Arch Linux ARM - export GOARCH=arm - fi export GOROOT_FINAL=/usr/lib/go - export GOOS=linux - cd src + # Enable ARM crosscompilation for linux + export GOOS=linux + export GOARCH=arm bash make.bash - # Enable ARM crosscompilation for non-arm platforms - if [ "$CARCH" == 'x86_64' ]; then - export GOARCH=arm - elif [ "$CARCH" == 'i686' ]; then - export GOARCH=arm - fi - bash make.bash + # Crosscompilation for other platforms too (including linux i686 and x86_64) + for os in linux; do # also possible: darwin freebsd windows + for arch in amd64 386; do + export GOOS=$os + export GOARCH=$arch + bash make.bash + done + done } check() { cd "$srcdir/$pkgname" + # Only test for linux and the architecture we're on + export GOOS=linux if [ "$CARCH" == 'x86_64' ]; then export GOARCH=amd64 elif [ "$CARCH" == 'i686' ]; then export GOARCH=386 else - # A friendly gesture to Arch Linux ARM export GOARCH=arm fi @@ -86,8 +87,8 @@ package() { $pkgdir/usr/share/zsh/site-functions/_go for f in ftdetect/gofiletype.vim autoload/go/complete.vim indent/go.vim \ - ftplugin/go/fmt.vim ftplugin/go/godoc.vim ftplugin/go/import.vim \ - syntax/go.vim syntax/godoc.vim plugin/godoc.vim; + ftplugin/go/fmt.vim ftplugin/go/import.vim syntax/go.vim syntax/godoc.vim \ + plugin/godoc.vim; do install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f done @@ -136,7 +137,7 @@ package() { install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION # Clean up - rm -r "$pkgdir/usr/bin/linux_arm" + #rm -r "$pkgdir/usr/bin/linux_arm" } # vim:set ts=2 sw=2 et: diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index e58603521..728f8e500 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 85371 2013-03-01 10:35:13Z andrea $ +# $Id: PKGBUILD 89669 2013-05-02 08:58:00Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Shinlun Hsieh # Contributor: Mateusz Herych # Contributor: Storyteller pkgname=lmms -pkgver=0.4.13 -pkgrel=3 +pkgver=0.4.14 +pkgrel=1 pkgdesc='The Linux MultiMedia Studio.' arch=('i686' 'x86_64') url='http://lmms.sourceforge.net/' @@ -25,7 +25,7 @@ options=('!libtool' '!makeflags') install=lmms.install source=("http://downloads.sourceforge.net/sourceforge/lmms/${pkgname}-${pkgver}.tar.bz2" zynaddsubfx_unlink.patch) -md5sums=('80db0dc5263041d443f474220410991f' +md5sums=('a30e4fcc24c117a1fb4fd7bef891f7e8' 'd2ea78ac0cf2979505f140c6845617cf') build() { diff --git a/community/mod_wsgi2/PKGBUILD b/community/mod_wsgi2/PKGBUILD index b408192d8..3a27e99e2 100644 --- a/community/mod_wsgi2/PKGBUILD +++ b/community/mod_wsgi2/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 80683 2012-11-29 03:29:49Z arodseth $ +# $Id: PKGBUILD 89811 2013-05-02 13:55:03Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Andrea Scarpino # Contributor: Ryan Coyner pkgname=mod_wsgi2 pkgver=3.4 -pkgrel=2 +pkgrel=3 pkgdesc='Python2 WSGI adapter module for Apache' arch=('x86_64' 'i686') url='http://www.modwsgi.org/' license=('APACHE') depends=('apache' 'python2') conflicts=('mod_wsgi') -install=$pkgname.install +install="$pkgname.install" source=("http://modwsgi.googlecode.com/files/mod_wsgi-$pkgver.tar.gz") sha256sums=('ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8') build() { cd "$srcdir/mod_wsgi-$pkgver" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --with-apxs=/usr/sbin/apxs \ --with-python=/usr/bin/python2 make diff --git a/community/mod_wsgi2/mod_wsgi2.install b/community/mod_wsgi2/mod_wsgi2.install index d26d61631..a7f0290c2 100644 --- a/community/mod_wsgi2/mod_wsgi2.install +++ b/community/mod_wsgi2/mod_wsgi2.install @@ -1,9 +1,9 @@ post_install() { -/bin/cat << ENDOFMESSAGE + cat << ENDOFMESSAGE ==> ==> ==> To install mod_wsgi, add the following line in -==> /etc/httpd/conf/httpd.conf file : +==> /etc/httpd/conf/httpd.conf file: ==> ==> LoadModule wsgi_module modules/mod_wsgi.so ==> @@ -12,3 +12,5 @@ post_install() { ==> ENDOFMESSAGE } + +# vim:set ts=2 sw=2 et: diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index ccf3aa3a9..5c0d9cde1 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89374 2013-04-29 01:14:49Z bgyorgy $ +# $Id: PKGBUILD 89819 2013-05-02 15:47:37Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin pkgver=1.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -16,9 +16,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver" - "switch-applications.patch") + "switch-applications.patch" + "fix-dnd.patch") md5sums=('d64bfe853e6fda5ec11a06581743f774' - 'a5d5d76dc281277a8afc83d7affdcc7b') + 'a5d5d76dc281277a8afc83d7affdcc7b' + '6d787466831def299360419cc3b5e47b') build() { cd linuxmint-muffin-* @@ -26,6 +28,9 @@ build() { # Fix windows switcher keybinding with default settings in GNOME 3.8 patch -Np1 -i ../switch-applications.patch + # Fix unresponsive panel on DND + patch -RNp1 -i ../fix-dnd.patch + PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile make @@ -36,5 +41,4 @@ package() { make DESTDIR="$pkgdir/" install } - # vim:set ts=2 sw=2 et: diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch new file mode 100644 index 000000000..f30e22521 --- /dev/null +++ b/community/muffin/fix-dnd.patch @@ -0,0 +1,29 @@ +From fca9ce4a1218837aef1886f8d98c8e5a5d124843 Mon Sep 17 00:00:00 2001 +From: luyikei +Date: Wed, 16 Jan 2013 14:09:39 +0900 +Subject: [PATCH] Put the rest of redirect window types into the top window + group + +--- + src/compositor/meta-window-actor.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c +index 4113e72..66ba3c4 100644 +--- a/src/compositor/meta-window-actor.c ++++ b/src/compositor/meta-window-actor.c +@@ -1513,7 +1513,10 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) + + if (window->type == META_WINDOW_DROPDOWN_MENU || + window->type == META_WINDOW_POPUP_MENU || +- window->type == META_WINDOW_COMBO){ ++ window->type == META_WINDOW_COMBO || ++ window->type == META_WINDOW_NOTIFICATION || ++ window->type == META_WINDOW_DND || ++ window->type == META_WINDOW_OVERRIDE_OTHER){ + clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), + CLUTTER_ACTOR (self)); + } +-- +1.8.1.6 + diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index cf038c179..2505880c7 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88614 2013-04-20 16:45:07Z heftig $ +# $Id: PKGBUILD 89826 2013-05-02 16:18:15Z svenstaro $ # Contributor: SpepS # Maintainer: Sven-Hendrik Haase pkgname=openimageio -pkgver=1.1.9 -pkgrel=2 +pkgver=1.1.10 +pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) url="http://www.openimageio.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa') optdepends=('qt4: iv image viewer' 'python2: bindings support') source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('19ac43e2bf00e5b6b7f2dbc778ce9648') +md5sums=('e5c5cd77238f74c3a6a3610c211430f2') build() { cd "$srcdir"/$_pkgname* diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD index 91bdd5575..e3fe0f3b4 100644 --- a/community/pekwm/PKGBUILD +++ b/community/pekwm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81762 2012-12-28 23:22:15Z arodseth $ +# $Id: PKGBUILD 89805 2013-05-02 12:32:13Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Kevin Piche # Contributor: Eddie Lozon pkgname=pekwm pkgver=0.1.16 -pkgrel=2 +pkgrel=4 pkgdesc='Small, fast, functional, and flexible window manager' arch=('x86_64' 'i686') license=('GPL') @@ -27,16 +27,20 @@ backup=(etc/pekwm/autoproperties etc/pekwm/mouse_system etc/pekwm/start etc/pekwm/vars) -source=("http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2" +source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2" "${pkgname}_kdm.desktop") sha256sums=('899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96' '4c1817d328dad84407c9ba7219015eb3be0345be9e98fc03fa693b6b443a8dc6') -build() { +prepare() { cd "$srcdir" + gendesk +} + +build() { + cd "$srcdir/$pkgname-$pkgver" - cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/community/python-simplejson/PKGBUILD b/community/python-simplejson/PKGBUILD index 6fab1f149..7805c6889 100644 --- a/community/python-simplejson/PKGBUILD +++ b/community/python-simplejson/PKGBUILD @@ -1,39 +1,37 @@ -# $Id: PKGBUILD 82843 2013-01-25 00:09:28Z arodseth $ -# Maintainer: Jaroslav Lichtblau +# $Id: PKGBUILD 89809 2013-05-02 13:39:19Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Jaroslav Lichtblau # Contributor: Allan McRae # Contributor: David Moore pkgbase=python-simplejson -pkgname=(python-simplejson python2-simplejson) -pkgver=3.0.7 -pkgrel=2 -pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" +pkgname=("$pkgbase" 'python2-simplejson') +pkgver=3.2.0 +pkgrel=1 +pkgdesc='Simple, fast, extensible JSON encoder/decoder for Python' license=('MIT') -arch=('i686' 'x86_64') -url="http://undefined.org/python/#simplejson" +arch=('x86_64' 'i686') +url='http://undefined.org/python/#simplejson' makedepends=('python' 'python2-distribute') -changelog=python-simplejson.changelog -source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}) -md5sums=('fc9013eab6330514196a7f19c2cff386') - -build() { - true -} +source=("$pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}") +sha256sums=('507036d10039ccf437625437b2521c0f691c20c3911b2b7183d5a66c98d36432') package_python-simplejson() { depends=('python') - cd ${srcdir}/simplejson-simplejson-* - python setup.py install --root=${pkgdir} - install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + cd "$srcdir/simplejson-simplejson-"* + python setup.py install --root="$pkgdir" + install -Dm644 "$srcdir/simplejson-simplejson"-*/LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_python2-simplejson() { depends=('python2') - cd ${srcdir}/simplejson-simplejson-* - python2 setup.py install --root=${pkgdir} - install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + cd "$srcdir/simplejson-simplejson-"* + python2 setup.py install --root="$pkgdir" + install -Dm644 "$srcdir/simplejson-simplejson"-*/LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + +# vim:set ts=2 sw=2 et: diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index 6d0586f00..a2a9fbb34 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 86348 2013-03-15 13:28:26Z arodseth $ +# $Id: PKGBUILD 89807 2013-05-02 13:36:01Z arodseth $ # Maintainer: Alexander Rødseth pkgname=setconf pkgver=0.5.3 -pkgrel=1 +pkgrel=2 pkgdesc='Utility to easily change settings in configuration files or Makefiles' arch=('x86_64' 'i686') url='http://setconf.roboticoverlords.org/' license=('GPL2') depends=('pcre' 'gc') -# Comment out the makedepends if you're on a platform not supported by shedskin -makedepends=('shedskin') +if [ "$CARCH" == 'x86_64' ] || [ "$CARCH" == 'i686' ]; then + makedepends=('shedskin') +fi source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz") sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6') diff --git a/community/sqlheavy/PKGBUILD b/community/sqlheavy/PKGBUILD new file mode 100755 index 000000000..43f08fc60 --- /dev/null +++ b/community/sqlheavy/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 89815 2013-05-02 15:11:19Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor : sebikul + +pkgname=sqlheavy +pkgver=0.1.1 +pkgrel=6 +pkgdesc="GObject SQLite wrapper" +arch=('i686' 'x86_64') +url="https://code.google.com/p/sqlheavy/" +license=('LGPL') +conflicts=('sqlheavy-git') +depends=('gtk2' 'sqlite3') +makedepends=('gobject-introspection' 'vala') +options=('!libtool') +source=("https://sqlheavy.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +sha256sums=('e8689f5fd4e0baf98eada2b3811262bb99877c2e8586fd21ad2a7ad3acc59031') + +prepare() { + cd "${srcdir}"/${pkgname}-${pkgver} + + sed -i 's/libvala-0.16/libvala-0.20/' configure + sed -i '/examples/d + /utils/d' Makefile.in +} + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index da7225f71..1092cda59 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: Jakob Gruber pkgname=stone-soup -pkgver=0.11.2 -pkgrel=1 +pkgver=0.12.0 +pkgrel=2 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') url='http://crawl.develz.org/' -depends=('lua51' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'glu' 'freetype2' 'ttf-dejavu') +depends=('lua51' 'ncurses' 'sdl_image' 'sqlite' 'glu' 'freetype2' 'ttf-dejavu') makedepends=('bison' 'flex' 'gendesk' 'mesa') conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') license=('custom') @@ -64,5 +64,4 @@ package() { "${pkgdir}/usr/share/applications/${pkgname}.desktop" } - -md5sums=('84b5939d242fbaec4d9d8c64fa02156c') +md5sums=('38ed5bae81f6513cc898aa12efda2c38') diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD index 51ee46ff9..508577be5 100644 --- a/community/teeworlds/PKGBUILD +++ b/community/teeworlds/PKGBUILD @@ -5,19 +5,19 @@ # Maintainer: Sven-Hendrik Haase pkgname=teeworlds -pkgver=0.6.1 -pkgrel=3 +pkgver=0.6.2 +pkgrel=1 pkgdesc="A multiplayer 2D shooter" arch=('i686' 'x86_64') -url="http://teeworlds.com" +url="https://www.teeworlds.com" license=('custom') depends=('alsa-lib' 'glu' 'sdl' 'freetype2') -makedepends=('python2' 'bam' 'mesa') +makedepends=('python' 'bam' 'mesa') replaces=('teewars') -source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz +source=(https://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz teeworlds.desktop teeworlds.png) -md5sums=('00de7195ecd1f23596dc3237341af512' +md5sums=('649f6c05a7b117096b238c07062edc39' '3944aaf7a8c19a83510b2b39c4cddf5f' '44f39e398409232a0e0a431ed46d8cc8') @@ -25,9 +25,6 @@ build() { # Build teeworlds cd ${srcdir}/${pkgname}-*-source - # Use Python 2 - sed -i 's/python /python2 /' bam.lua - bam server_release client_release } diff --git a/community/yaml-cpp/PKGBUILD b/community/yaml-cpp/PKGBUILD index b7a741c64..c2fc7add7 100644 --- a/community/yaml-cpp/PKGBUILD +++ b/community/yaml-cpp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 82853 2013-01-25 03:41:30Z svenstaro $ +# $Id: PKGBUILD 89824 2013-05-02 16:13:14Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Markus Martin pkgname=yaml-cpp -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec" url="http://code.google.com/p/yaml-cpp/" @@ -10,7 +10,7 @@ arch=('i686' 'x86_64') license=('MIT') makedepends=('cmake' 'boost') source=(http://yaml-cpp.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('c6d96190434d5959d814c603f98512c6') +md5sums=('0fa47a5ed8fedefab766592785c85ee7') build() { cd $srcdir/$pkgname-$pkgver diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 529b3e63c..95fa405d5 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 182592 2013-04-10 20:23:35Z eric $ +# $Id: PKGBUILD 184147 2013-05-02 19:39:44Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.35 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') -makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') +makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath') options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd.service slapd.tmpfiles ntlm.patch) + slapd.service slapd.tmpfiles openldap-ntlm.patch openldap-nssov.patch) sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266' '9c7f3441e6a6ee13cdcfe8d965081c7a574c3393' 'f86a82e35ebe15026980467c9dee4007e686b795' - 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np1 -i "${srcdir}"/ntlm.patch + 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' + 'b2d11b4c522750ad9da3409333094fb599ac2c85') +prepare() { + cd ${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/openldap-ntlm.patch + patch -p0 -i "${srcdir}"/openldap-nssov.patch sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h - sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf + sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif} sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in +} +build() { + cd ${pkgbase}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ --sysconfdir=/etc --localstatedir=/var/lib/openldap \ --enable-ipv6 --enable-syslog --enable-local \ @@ -36,10 +40,14 @@ build() { --enable-spasswd --with-cyrus-sasl \ --enable-overlays=mod --enable-modules=yes make + + cd contrib/slapd-modules/nssov + make prefix=/usr libexecdir=/usr/lib sysconfdir=/etc/openldap + chrpath -d .libs/nssov.so } check() { - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make test } @@ -49,7 +57,7 @@ package_libldap() { backup=('etc/openldap/ldap.conf') options=('!libtool') - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} for dir in include libraries doc/man/man3 ; do pushd ${dir} make DESTDIR="${pkgdir}" install @@ -69,16 +77,24 @@ package_libldap() { package_openldap() { pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" depends=("libldap>=${pkgver}" 'libltdl') - backup=('etc/openldap/slapd.conf') + backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif') options=('!libtool' 'emptydirs') install=openldap.install - cd "${srcdir}"/${pkgbase}-${pkgver} - for dir in clients servers doc/man/man{1,5,8} ; do + cd ${pkgbase}-${pkgver} + for dir in clients servers doc/man/man{1,5,8}; do pushd ${dir} make DESTDIR="${pkgdir}" install popd done + + pushd contrib/slapd-modules/nssov + install -m755 .libs/nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap + ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so + ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so.0 + install -m444 ldapns.schema "${pkgdir}"/etc/openldap/schema + popd + rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 rm -r "${pkgdir}"/run @@ -87,8 +103,8 @@ package_openldap() { ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd - chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} - chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} + chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d diff --git a/core/openldap/ntlm.patch b/core/openldap/ntlm.patch deleted file mode 100644 index 6804b610d..000000000 --- a/core/openldap/ntlm.patch +++ /dev/null @@ -1,230 +0,0 @@ -Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is -actually called by evolution-data-server, checked at version 1.12.2. -Without this patch, the Exchange addressbook integration uses simple binds -with cleartext passwords. - -Russ checked with openldap-software for upstream's opinion on this patch -on 2007-12-21. Upstream had never received it as a patch submission and -given that it's apparently only for older Exchange servers that can't do -SASL and DIGEST-MD5, it's not very appealing. - -Bug#457374 filed against evolution-data-server asking if this support is -still required on 2007-12-21. - -Index: trunk/include/ldap.h -=================================================================== ---- trunk.orig/include/ldap.h -+++ trunk/include/ldap.h -@@ -2461,5 +2461,25 @@ - LDAPControl **ctrls, - LDAPDerefRes **drp )); - -+/* -+ * hacks for NTLM -+ */ -+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) -+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) -+LDAP_F( int ) -+ldap_ntlm_bind LDAP_P(( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp )); -+LDAP_F( int ) -+ldap_parse_ntlm_bind_result LDAP_P(( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge)); -+ - LDAP_END_DECL - #endif /* _LDAP_H */ -Index: trunk/libraries/libldap/ntlm.c -=================================================================== ---- /dev/null -+++ trunk/libraries/libldap/ntlm.c -@@ -0,0 +1,138 @@ -+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ -+/* -+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. -+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file -+ */ -+ -+/* Mostly copied from sasl.c */ -+ -+#include "portable.h" -+ -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include "ldap-int.h" -+ -+int -+ldap_ntlm_bind( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp ) -+{ -+ BerElement *ber; -+ int rc; -+ ber_int_t id; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( msgidp != NULL ); -+ -+ if( msgidp == NULL ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ /* create a message to send */ -+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ assert( LBER_VALID( ber ) ); -+ -+ LDAP_NEXT_MSGID( ld, id ); -+ rc = ber_printf( ber, "{it{istON}" /*}*/, -+ id, LDAP_REQ_BIND, -+ ld->ld_version, dn, tag, -+ cred ); -+ -+ /* Put Server Controls */ -+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { -+ ld->ld_errno = LDAP_ENCODING_ERROR; -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ /* send the message */ -+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); -+ -+ if(*msgidp < 0) -+ return ld->ld_errno; -+ -+ return LDAP_SUCCESS; -+} -+ -+int -+ldap_parse_ntlm_bind_result( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge) -+{ -+ ber_int_t errcode; -+ ber_tag_t tag; -+ BerElement *ber; -+ ber_len_t len; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( res != NULL ); -+ -+ if ( ld == NULL || res == NULL ) { -+ return LDAP_PARAM_ERROR; -+ } -+ -+ if( res->lm_msgtype != LDAP_RES_BIND ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ if ( ld->ld_error ) { -+ LDAP_FREE( ld->ld_error ); -+ ld->ld_error = NULL; -+ } -+ if ( ld->ld_matched ) { -+ LDAP_FREE( ld->ld_matched ); -+ ld->ld_matched = NULL; -+ } -+ -+ /* parse results */ -+ -+ ber = ber_dup( res->lm_ber ); -+ -+ if( ber == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ tag = ber_scanf( ber, "{ioa" /*}*/, -+ &errcode, challenge, &ld->ld_error ); -+ ber_free( ber, 0 ); -+ -+ if( tag == LBER_ERROR ) { -+ ld->ld_errno = LDAP_DECODING_ERROR; -+ return ld->ld_errno; -+ } -+ -+ ld->ld_errno = errcode; -+ -+ return( ld->ld_errno ); -+} -+ -Index: trunk/libraries/libldap/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap/Makefile.in -+++ trunk/libraries/libldap/Makefile.in -@@ -27,7 +27,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c ldif.c fetch.c - - OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ -@@ -40,7 +40,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo ldif.lo fetch.lo - - LDAP_INCDIR= ../../include -Index: trunk/libraries/libldap_r/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap_r/Makefile.in -+++ trunk/libraries/libldap_r/Makefile.in -@@ -29,7 +29,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c ldif.c fetch.c - SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ - thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ -@@ -47,7 +47,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo ldif.lo fetch.lo - - LDAP_INCDIR= ../../include diff --git a/core/openldap/openldap-nssov.patch b/core/openldap/openldap-nssov.patch new file mode 100644 index 000000000..5ec2c36f3 --- /dev/null +++ b/core/openldap/openldap-nssov.patch @@ -0,0 +1,30 @@ +--- contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h 2013-03-28 11:41:51.000000000 -0400 ++++ contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h 2012-07-08 04:34:12.000000000 -0400 +@@ -71,6 +71,16 @@ + 1.0 release of nss-pam-ldapd is made. */ + #define NSLCD_VERSION 1 + ++/* Get a NSLCD configuration option. There is one request parameter: ++ INT32 NSLCD_CONFIG_* ++ the result value is: ++ STRING value, interpretation depending on request */ ++#define NSLCD_ACTION_CONFIG_GET 20006 ++ ++/* return the message, if any, that is presented to the user when password ++ modification through PAM is prohibited */ ++#define NSLCD_CONFIG_PAM_PASSWORD_PROHIBIT_MESSAGE 852 ++ + /* Email alias (/etc/aliases) NSS requests. The result values for a + single entry are: + STRING alias name +@@ -249,8 +262,10 @@ + #define NSLCD_PAM_NEW_AUTHTOK_REQD 12 /* Password expired */ + #define NSLCD_PAM_ACCT_EXPIRED 13 /* Account expired */ + #define NSLCD_PAM_SESSION_ERR 14 /* Cannot make/remove session record */ ++#define NSLCD_PAM_AUTHTOK_ERR 20 /* Authentication token manipulation error */ + #define NSLCD_PAM_AUTHTOK_DISABLE_AGING 23 /* Password aging disabled */ + #define NSLCD_PAM_IGNORE 25 /* Ignore module */ + #define NSLCD_PAM_ABORT 26 /* Fatal error */ ++#define NSLCD_PAM_AUTHTOK_EXPIRED 27 /* authentication token has expired */ + + #endif /* not _NSLCD_H */ diff --git a/core/openldap/openldap-ntlm.patch b/core/openldap/openldap-ntlm.patch new file mode 100644 index 000000000..6804b610d --- /dev/null +++ b/core/openldap/openldap-ntlm.patch @@ -0,0 +1,230 @@ +Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is +actually called by evolution-data-server, checked at version 1.12.2. +Without this patch, the Exchange addressbook integration uses simple binds +with cleartext passwords. + +Russ checked with openldap-software for upstream's opinion on this patch +on 2007-12-21. Upstream had never received it as a patch submission and +given that it's apparently only for older Exchange servers that can't do +SASL and DIGEST-MD5, it's not very appealing. + +Bug#457374 filed against evolution-data-server asking if this support is +still required on 2007-12-21. + +Index: trunk/include/ldap.h +=================================================================== +--- trunk.orig/include/ldap.h ++++ trunk/include/ldap.h +@@ -2461,5 +2461,25 @@ + LDAPControl **ctrls, + LDAPDerefRes **drp )); + ++/* ++ * hacks for NTLM ++ */ ++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) ++#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) ++LDAP_F( int ) ++ldap_ntlm_bind LDAP_P(( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp )); ++LDAP_F( int ) ++ldap_parse_ntlm_bind_result LDAP_P(( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge)); ++ + LDAP_END_DECL + #endif /* _LDAP_H */ +Index: trunk/libraries/libldap/ntlm.c +=================================================================== +--- /dev/null ++++ trunk/libraries/libldap/ntlm.c +@@ -0,0 +1,138 @@ ++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ ++/* ++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. ++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file ++ */ ++ ++/* Mostly copied from sasl.c */ ++ ++#include "portable.h" ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include "ldap-int.h" ++ ++int ++ldap_ntlm_bind( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp ) ++{ ++ BerElement *ber; ++ int rc; ++ ber_int_t id; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( msgidp != NULL ); ++ ++ if( msgidp == NULL ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ /* create a message to send */ ++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ assert( LBER_VALID( ber ) ); ++ ++ LDAP_NEXT_MSGID( ld, id ); ++ rc = ber_printf( ber, "{it{istON}" /*}*/, ++ id, LDAP_REQ_BIND, ++ ld->ld_version, dn, tag, ++ cred ); ++ ++ /* Put Server Controls */ ++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { ++ ld->ld_errno = LDAP_ENCODING_ERROR; ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ /* send the message */ ++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); ++ ++ if(*msgidp < 0) ++ return ld->ld_errno; ++ ++ return LDAP_SUCCESS; ++} ++ ++int ++ldap_parse_ntlm_bind_result( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge) ++{ ++ ber_int_t errcode; ++ ber_tag_t tag; ++ BerElement *ber; ++ ber_len_t len; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( res != NULL ); ++ ++ if ( ld == NULL || res == NULL ) { ++ return LDAP_PARAM_ERROR; ++ } ++ ++ if( res->lm_msgtype != LDAP_RES_BIND ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ if ( ld->ld_error ) { ++ LDAP_FREE( ld->ld_error ); ++ ld->ld_error = NULL; ++ } ++ if ( ld->ld_matched ) { ++ LDAP_FREE( ld->ld_matched ); ++ ld->ld_matched = NULL; ++ } ++ ++ /* parse results */ ++ ++ ber = ber_dup( res->lm_ber ); ++ ++ if( ber == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ tag = ber_scanf( ber, "{ioa" /*}*/, ++ &errcode, challenge, &ld->ld_error ); ++ ber_free( ber, 0 ); ++ ++ if( tag == LBER_ERROR ) { ++ ld->ld_errno = LDAP_DECODING_ERROR; ++ return ld->ld_errno; ++ } ++ ++ ld->ld_errno = errcode; ++ ++ return( ld->ld_errno ); ++} ++ +Index: trunk/libraries/libldap/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap/Makefile.in ++++ trunk/libraries/libldap/Makefile.in +@@ -27,7 +27,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + tls2.c tls_o.c tls_g.c tls_m.c \ +- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ ++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ + assertion.c deref.c ldif.c fetch.c + + OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ +@@ -40,7 +40,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + tls2.lo tls_o.lo tls_g.lo tls_m.lo \ +- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ ++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ + assertion.lo deref.lo ldif.lo fetch.lo + + LDAP_INCDIR= ../../include +Index: trunk/libraries/libldap_r/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap_r/Makefile.in ++++ trunk/libraries/libldap_r/Makefile.in +@@ -29,7 +29,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + tls2.c tls_o.c tls_g.c tls_m.c \ +- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ ++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ + assertion.c deref.c ldif.c fetch.c + SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ + thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ +@@ -47,7 +47,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + tls2.lo tls_o.lo tls_g.lo tls_m.lo \ +- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ ++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ + assertion.lo deref.lo ldif.lo fetch.lo + + LDAP_INCDIR= ../../include diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD index e9a9866a7..821d2e5df 100644 --- a/core/zlib/PKGBUILD +++ b/core/zlib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158552 2012-05-04 22:14:53Z pierre $ +# $Id: PKGBUILD 184034 2013-05-02 08:15:23Z pierre $ # Maintainer: Pierre Schmitz pkgname=zlib -pkgver=1.2.7 +pkgver=1.2.8 pkgrel=1 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ license=('custom') url="http://www.zlib.net/" depends=('glibc') source=("http://zlib.net/current/zlib-${pkgver}.tar.gz") -md5sums=('60df6a37c56e7c1366cca812414f7b85') +md5sums=('44d667c142d7cda120332623eab69f40') build() { cd ${srcdir}/zlib-$pkgver diff --git a/extra/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD index 5901e29ed..099da0f85 100644 --- a/extra/ccrtp/PKGBUILD +++ b/extra/ccrtp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159161 2012-05-16 20:49:22Z andrea $ +# $Id: PKGBUILD 184148 2013-05-02 19:39:49Z eric $ # Maintainer: # Contributor: Sergej Pupykin # Contributor: Jeff Mickey @@ -6,8 +6,8 @@ # Contributor: Alexander Rødseth pkgname=ccrtp -pkgver=2.0.3 -pkgrel=2 +pkgver=2.0.5 +pkgrel=1 pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF" arch=('i686' 'x86_64') url="http://www.gnu.org/software/ccrtp/" @@ -16,17 +16,17 @@ depends=('ucommon' 'libgcrypt') options=('!libtool') install=$pkgname.install source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('0d57da1b8e212fb634b8951067fbc1e0' - '127fa3b293f7a7c3be1d2891c4544453') +md5sums=('7f462f6b31c68180a93f36b06944fef4' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING.addendum "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/extra/libzrtpcpp/PKGBUILD b/extra/libzrtpcpp/PKGBUILD index e004e6e6f..b9ad0f71f 100644 --- a/extra/libzrtpcpp/PKGBUILD +++ b/extra/libzrtpcpp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159301 2012-05-21 09:44:12Z andrea $ +# $Id: PKGBUILD 184149 2013-05-02 19:39:50Z eric $ # Maintainer: # Contributor: Sergej Pupykin # Contributor: Jeff Mickey # Contributor: Michel Brabants pkgname=libzrtpcpp -pkgver=2.1.2 +pkgver=2.3.2 pkgrel=1 pkgdesc="A C++ implementation of Phil Zimmermann's ZRTP specification" arch=('i686' 'x86_64') @@ -13,13 +13,15 @@ url='http://www.gnutelephony.org/index.php/GNU_ZRTP' license=('GPL3') depends=('ccrtp') makedepends=('cmake') -source=("https://github.com/downloads/wernerd/ZRTPCPP/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2f78cffbdb0f3e0ee92609fc01a1b6c5') +source=(http://ftp.gnu.org/gnu/ccrtp/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('b5f0a72252785862133e9cbc9cbbd3f8' + 'SKIP') -build() { - sed 's/lib64/lib/g' -i "${srcdir}"/${pkgname}-${pkgver}/CMakeLists.txt +prepare() { + sed 's/lib64/lib/g' -i ${pkgname}-${pkgver}/CMakeLists.txt +} - cd "${srcdir}" +build() { mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -29,6 +31,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 3e6a8fcc5..3f880502c 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182356 2013-04-08 21:42:10Z giovanni $ +# $Id: PKGBUILD 184144 2013-05-02 17:00:09Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=2.5.4 +pkgver=2.6 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('f3c64086519c32ba7e892b6215b0fcbc' +md5sums=('d012d8bb5f85369d3b6a630a80667170' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index b0bc51cbe..2b4a87884 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178996 2013-03-01 10:25:36Z andrea $ +# $Id: PKGBUILD 184138 2013-05-02 15:21:00Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=soprano -pkgver=2.9.0 -pkgrel=2 +pkgver=2.9.1 +pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64') url='http://soprano.sourceforge.net/' @@ -12,13 +12,11 @@ license=('GPL' 'LGPL') depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') makedepends=('cmake' 'java-environment' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('90134eaaf40b6663dd01cfaefdaba7fb') +md5sums=('c7beb1bda475f363fa0afb58edc541fe') build() { mkdir build cd build - . /etc/profile.d/jdk.sh - . /etc/profile.d/qt4.sh # we need the rpath cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index 918428a6e..86ecfffec 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166607 2012-09-13 00:51:08Z eric $ +# $Id: PKGBUILD 184150 2013-05-02 19:39:51Z eric $ # Maintainer: Sergej Pupykin pkgname=ucommon -pkgver=5.5.0 +pkgver=6.0.3 pkgrel=1 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" arch=('i686' 'x86_64') @@ -12,21 +12,21 @@ depends=('openssl') options=('!libtool') #source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) source=("http://www.gnutelephony.org/dist/tarballs/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('99d302b5217bb92b6fb9d91ead6fd028' - '0fcfd66e9746c3105cb5d222ad2cc91d') +md5sums=('c6025b339417e817b6d5ac21b5334823' + 'SKIP') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD new file mode 100644 index 000000000..88960ddba --- /dev/null +++ b/libre-testing/libretools/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Joshua Haase +# Contributor: fauno + +pkgbase=libretools +pkgname=(libretools libretools-mips64el) +pkgdesc="Programs for Parabola development" +url="https://projects.parabolagnulinux.org/packages/libretools.git/" +license=('GPL3+' 'GPL2') + +pkgver=20130503 +_libretools_commit=0db5eebebe64db0d8c3b29b629b066a3909aa61d +_devtools_commit=a1a79ff77bb19166bd5631953a71e3d3222e5f1c + +pkgrel=1 +arch=('any') + +_packages_url=https://projects.parabolagnulinux.org/packages +source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 + $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2) + +build() { + cd "$srcdir" + ln -sf devtools-par-$_devtools_commit devtools-par + cd "$srcdir/$pkgbase-$_libretools_commit" + make build-libretools build-libretools-mips64el build-doc +} + +package_libretools() { + backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) + install=libretools.install + groups=(base-devel) + + depends=( + arch-install-scripts # `archroot` uses `pacstrap` + git # `createworkdir` + openssh # `librerelease` + rsync # `librerelease` and `makechrootpkg.sh` + subversion # `diff-unfree` + tokyocabinet # `treepkg` + wget # `aur` and `pkgbuild-check-nonfree` + ) + optdepends=('namcap: to check package files') + makedepends=(emacs) # emacs --batch is used during the build to process text + + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-libretools install-doc DESTDIR="$pkgdir" +} + +package_libretools-mips64el() { + pkgdesc="Scripts for Parabola development (for mips64el architecture)" + backup=('etc/libretools.d/mips64el.conf') + depends=("$pkgbase=$pkgver") + + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-libretools-mips64el DESTDIR="$pkgdir" +} + +md5sums=('dabae9bb6040431e8e2b84871a027237' + 'c5cd04723119762701db766cb8f6e5ef') diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install new file mode 100644 index 000000000..ff6a238fe --- /dev/null +++ b/libre-testing/libretools/libretools.install @@ -0,0 +1,28 @@ +#!/bin/sh + +_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' + +# arg 1: the new package version +post_install() { + if grep -q 'libre::' etc/makepkg.conf; then + libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" + else + libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf" + printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf + fi +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + post_install +} + +pre_remove() { + if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then + libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" + sed -i '/libre::/d' + else + libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it" + fi +} diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index a4f2d18ee..8e41245c2 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183699 2013-04-27 07:33:10Z tpowa $ +# $Id: PKGBUILD 184141 2013-05-02 15:29:52Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,17 +7,17 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=75 +_sublevel=76 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.74 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.75 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -31,8 +31,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-symbol-waiting-3.0.patch' 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('5f64180fe7df4e574dac5911b78f5067' - '13ae458b95cc12f1fcf7e37e91206cbe' +md5sums=('f30a562307b6f71204370fcd33756466' + 'e405de6581d02d44c2c06a81a1d93f93' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '8e9b3e526d0d339004e141fddf2390dc') + '9f8275e1bd316b2b93fd21df3b26228f') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -58,7 +58,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 9f7b9706d..d4fbc8398 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.75-1-LIBRE-LTS +KERNEL_VERSION=3.0.76-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD index 6794b3aca..e125f83e9 100644 --- a/pcr/babeld/PKGBUILD +++ b/pcr/babeld/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer (AUR): Yann Lopez # Maintainer (Parabola): fauno pkgname=babeld -pkgver=1.3.5 +pkgver=1.3.6 pkgrel=1 pkgdesc="Loop-free distance-vector routing protocol" arch=(i686 x86_64 mips64el) @@ -28,5 +28,5 @@ package() { install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE } -md5sums=('55f3df2429f4cf7816fce312591ba488' +md5sums=('5dfccfeb2db5d8244c2fd2dc301e89a0' 'SKIP') -- cgit v1.2.3-54-g00ecf From 5f3b2100b811506bec6bcf63b24d1c605dfe8cb6 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 4 May 2013 00:41:51 -0700 Subject: Sat May 4 00:41:51 PDT 2013 --- community/cinnamon-control-center/PKGBUILD | 6 ++-- community/cinnamon/PKGBUILD | 8 ++--- community/desmume/PKGBUILD | 10 +++--- community/muffin/PKGBUILD | 18 +++++------ community/nemo/PKGBUILD | 6 ++-- community/setconf/PKGBUILD | 8 +++-- core/ed/PKGBUILD | 11 ++++--- core/nfs-utils/PKGBUILD | 20 +++++------- core/pciutils/PKGBUILD | 12 ++++---- extra/colord/PKGBUILD | 16 +++++----- extra/freetds/PKGBUILD | 8 ++--- extra/glibmm/PKGBUILD | 6 ++-- extra/gnome-nettool/PKGBUILD | 21 +++++++------ extra/gnome-nettool/printf.patch | 34 +++++++++++++++++++++ extra/gnome-session/PKGBUILD | 6 ++-- extra/gtkmm3/PKGBUILD | 6 ++-- extra/kdevelop-python/PKGBUILD | 6 ++-- extra/libgda/PKGBUILD | 6 ++-- extra/network-manager-applet/PKGBUILD | 21 ++++++++++--- .../fixed-signal-icons.tar.xz | Bin 0 -> 2044 bytes extra/perl-alien-sdl/PKGBUILD | 8 ++--- extra/smplayer/PKGBUILD | 13 ++++++-- kernels/linux-libre-pae/PKGBUILD | 12 ++++---- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-rt/PKGBUILD | 24 +++++++-------- kernels/linux-libre-rt/config.i686 | 4 ++- kernels/linux-libre-rt/config.x86_64 | 4 ++- kernels/linux-libre-rt/linux-libre-rt.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 12 ++++---- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/linux-libre-kmod-alx/PKGBUILD | 6 ++-- libre/linux-libre-lts-kmod-alx/PKGBUILD | 6 ++-- libre/linux-libre-lts/PKGBUILD | 6 ++-- libre/linux-libre/PKGBUILD | 18 +++++------ libre/linux-libre/linux-libre.install | 2 +- pcr/babeld/PKGBUILD | 4 +-- 36 files changed, 206 insertions(+), 148 deletions(-) create mode 100644 extra/gnome-nettool/printf.patch create mode 100644 extra/network-manager-applet/fixed-signal-icons.tar.xz (limited to 'community/setconf') diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 3e6a3f2de..fcde00b2b 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89381 2013-04-29 01:59:05Z bgyorgy $ +# $Id: PKGBUILD 89868 2013-05-03 19:53:33Z faidoc $ # Maintainer: Alexandre Filgueira # Jan de Groot pkgname=cinnamon-control-center -pkgver=1.7.4 +pkgver=1.7.5 pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" "gnomerrlabeler.patch" "idle-delay.patch") -sha256sums=('33425b57d13acf015ddbeba8e9139f7b3488d80f900bd2234f49db1c0944c96b' +sha256sums=('50192b279bd2d6c9a0cb686144d5cf8195e33fbe1e107baeca6da03a638e1f8d' '826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6' '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 5ff5db12a..f13d2c1e5 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 89831 2013-05-02 18:23:50Z bgyorgy $ +# $Id: PKGBUILD 89873 2013-05-03 22:01:21Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.7.8 -pkgrel=2 +pkgver=1.7.10 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -31,7 +31,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "switch-applications.patch" "fallback-helpers.patch" "idle-dim.patch") -sha256sums=('812042c6b7685e2054602a29ed190f8efc07f67f92be1bc496358307534cb969' +sha256sums=('32ac069773b7d1634136d4f8f01c2083708fa26a1a5bc21957c2144cd9244bf7' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3' diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD index 7905f5e16..7fbd8f70e 100644 --- a/community/desmume/PKGBUILD +++ b/community/desmume/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77627 2012-10-13 11:41:54Z allan $ +# $Id: PKGBUILD 89839 2013-05-03 06:49:03Z schuay $ # Maintainer: Jonathan Conder # Maintainer: Brad Fanella # Contributor: Arkham @@ -11,15 +11,15 @@ # Contributor: Asher256 pkgname=desmume -pkgver=0.9.8 -pkgrel=3 +pkgver=0.9.9 +pkgrel=1 pkgdesc="Nintendo DS emulator" arch=('i686' 'x86_64') url="http://desmume.org/" license=('GPL') depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap' 'soundtouch' 'alsa-lib' 'zziplib' 'glu') -makedepends=('intltool') +makedepends=('intltool' 'mesa') install=desmume.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir/" install } -md5sums=('fb7c984c924087888b9eaaad8cb1875e') +md5sums=('458b5f8b3dbb38a47e6d0518f97aa82a') diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 5c0d9cde1..53534603d 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89819 2013-05-02 15:47:37Z bgyorgy $ +# $Id: PKGBUILD 89864 2013-05-03 19:33:13Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=1.7.4 -pkgrel=2 +pkgver=1.7.5 +pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -15,15 +15,15 @@ depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver" +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" "switch-applications.patch" "fix-dnd.patch") -md5sums=('d64bfe853e6fda5ec11a06581743f774' - 'a5d5d76dc281277a8afc83d7affdcc7b' - '6d787466831def299360419cc3b5e47b') +sha256sums=('ef10c19353e5d2ff86d24c2fa40bd53ba3c7eeb03e9d3c8fbd3f4b56d16a2f07' + '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' + '745dd3ef7eb8a496c68f5a728253205a849ac63851c0c0930c42442aec5af939') build() { - cd linuxmint-muffin-* + cd ${pkgname}-${pkgver} # Fix windows switcher keybinding with default settings in GNOME 3.8 patch -Np1 -i ../switch-applications.patch @@ -37,7 +37,7 @@ build() { } package() { - cd linuxmint-muffin-* + cd ${pkgname}-${pkgver} make DESTDIR="$pkgdir/" install } diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 774a2a350..804efe07b 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89644 2013-04-30 21:20:15Z faidoc $ +# $Id: PKGBUILD 89860 2013-05-03 19:19:27Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo -pkgver=1.7.5 +pkgver=1.7.6 pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" "tracker-0.16.patch" "remove-desktop-background.patch") -sha256sums=('d7937ddeb6e9fe1da1283ff306fbb32e6554701d629b63232cbb0a5a9268c99d' +sha256sums=('670faa09fff6b2919231bbe6c580363c4cd0a7c87fc5324570083ed8955db9c8' '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626' '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5') diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index a2a9fbb34..f3e2edad2 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89807 2013-05-02 13:36:01Z arodseth $ +# $Id: PKGBUILD 89870 2013-05-03 20:55:10Z arodseth $ # Maintainer: Alexander Rødseth pkgname=setconf pkgver=0.5.3 -pkgrel=2 +pkgrel=3 pkgdesc='Utility to easily change settings in configuration files or Makefiles' arch=('x86_64' 'i686') url='http://setconf.roboticoverlords.org/' @@ -18,7 +18,9 @@ sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6') build() { cd "$srcdir/$pkgname-$pkgver" - [ -x /usr/bin/shedskin ] && shedskin "$pkgname.py" && make + if [ "$CARCH" == 'x86_64' ] || [ "$CARCH" == 'i686' ]; then + shedskin "$pkgname.py" && make + fi } package() { diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index 80a32233c..c3785934d 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 173766 2012-12-22 18:16:53Z dreisner $ +# $Id: PKGBUILD 184200 2013-05-03 13:44:53Z dreisner $ # Maintainer: Dave Reisner # Maintainer: Andreas Radke pkgname=ed -pkgver=1.7 -pkgrel=2 +pkgver=1.8 +pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnu.org/software/ed/ed.html" depends=('glibc' 'sh') options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz) +source=("ftp://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.gz"{,.sig}) install='ed.install' -md5sums=('0aa4e2428e325203d0d7c3e86c961b1c') +md5sums=('2268d2344b3c52d23730acb2e3c942fe' + 'SKIP') build() { cd "$pkgname-$pkgver" diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 079afece1..36bd7fd53 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175118 2013-01-14 07:37:11Z tpowa $ +# $Id: PKGBUILD 184188 2013-05-03 10:22:57Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: John Proctor # Contributor: dibblethewrecker @@ -6,8 +6,8 @@ # Contributor: Marco Lima pkgname=nfs-utils -pkgver=1.2.6 -pkgrel=4 +pkgver=1.2.7 +pkgrel=1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -16,9 +16,7 @@ backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs- depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') makedepends=('pkgconfig' 'autoconf' 'automake') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - nfs-common nfs-common.conf - nfs-server nfs-server.conf exports idmapd.conf @@ -37,10 +35,8 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn blkmapd.service nfs-utils.conf) install=nfs-utils.install -md5sums=('8be543ca270c2234ff18f8c8d35e0d37' - 'dd0d65fc6e8f422fa12520813098264b' +md5sums=('3b5ca797197765dc0c3a4122720c7716' 'f73f197a16b02c3e248488ec35c4cf43' - 'e619f18354ff958ed624d05d08853d8f' '9cef69bc686cc5dcac23fbb51450747d' 'ff585faf410a62c4333a027c50b56bae' 'eb4f4027fab6fc1201f1ca04f5954c76' @@ -59,13 +55,16 @@ md5sums=('8be543ca270c2234ff18f8c8d35e0d37' '8ffc2ebe932d29efe17d6f3f23d5b975' '8ac484023d786766d287ccbe878ae4ba') -build() { +prepare() { cd $srcdir/${pkgname}-${pkgver} patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch # arch specific patch patch -Np0 -i $srcdir/start-statd.patch +} +build() { + cd $srcdir/${pkgname}-${pkgver} ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ --without-tcp-wrappers --with-statedir=/var/lib/nfs \ --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ @@ -83,9 +82,6 @@ package() { # support python2 (FS#25120) sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} - # NFS & NFSv4 init scripts - install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common - install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server # Configuration install -D -m 644 ../exports "$pkgdir/"etc/exports install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 30462893c..3ff913b2e 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 162716 2012-06-28 20:04:34Z tpowa $ +# $Id: PKGBUILD 184187 2013-05-03 10:22:45Z tpowa $ # Maintainer: Tobias Powalowski pkgname=pciutils -pkgver=3.1.10 -pkgrel=1 +pkgver=3.2.0 +pkgrel=2 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64) license=('GPL2') groups=('base') url="http://mj.ucw.cz/sw/pciutils/" -depends=('glibc' 'hwids') +depends=('glibc' 'hwids' 'kmod') source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) -md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c') +md5sums=('3fccb0b28879adb57d8156115f8003c8') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all + make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man lib/libpci.a cp lib/libpci.a "${srcdir}/" make clean make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 8b78e733e..73843903a 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 183240 2013-04-19 01:14:07Z heftig $ +# $Id: PKGBUILD 184190 2013-05-03 11:21:48Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Ionut Biru pkgname=colord -pkgver=0.1.33 +pkgver=0.1.34 pkgrel=1 pkgdesc="System daemon for managing color devices" arch=(i686 x86_64) url="http://www.freedesktop.org/software/colord" license=(GPL2) depends=(lcms2 libgusb polkit shared-color-profiles sqlite udev dconf dbus) -makedepends=(intltool gobject-introspection vala docbook2x sane) +makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion) optdepends=('sane: UseSANE support [/etc/colord.conf]') options=('!libtool') install=colord.install backup=(etc/colord.conf) source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('41888fc853e033302c59539777b09317a7e1ab3d') +sha1sums=('e4168ca34c2ce228276299efaf12d2f9fb7ecb2e') build() { cd $pkgname-$pkgver @@ -24,9 +24,8 @@ build() { # put udev files in /usr/lib sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure - ./configure --prefix=/usr \ - --sysconfdir=/etc --libexecdir=/usr/lib/colord \ - --localstatedir=/var --disable-static \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --enable-vala --enable-sane --disable-volume-search make @@ -34,8 +33,7 @@ build() { package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install \ - bashcompletiondir=/usr/share/bash-completion/completions + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD index c91427f2c..10ddb2d89 100644 --- a/extra/freetds/PKGBUILD +++ b/extra/freetds/PKGBUILD @@ -13,16 +13,16 @@ options=('!libtool') backup=('etc/freetds/freetds.conf' 'etc/freetds/locales.conf' 'etc/freetds/pool.conf') -source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgver}.tar.gz") -md5sums=('b14db5823980a32f0643d1a84d3ec3ad') +source=("ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${pkgver}.tar.bz2") +md5sums=('e88e96800c89d62307812315b235eb18') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0 make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index 23388f7b8..cf87cfd3e 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183952 2013-04-29 21:53:23Z heftig $ +# $Id: PKGBUILD 184169 2013-05-03 03:02:45Z heftig $ # Maintainer: Jan de Groot # Contributor: Tom Newsom pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.36.1 +pkgver=2.36.2 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') url="http://www.gtkmm.org/" -sha256sums=('d1f7dec2fd75ea95034ec143fcf2ff77a02e92aacf3e0cc110f9c67e7fe23766') +sha256sums=('f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index bfe38c4cb..97913cd16 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 183390 2013-04-21 22:10:08Z heftig $ +# $Id: PKGBUILD 184172 2013-05-03 03:24:57Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Kritoke pkgname=gnome-nettool -pkgver=3.2.0 -pkgrel=3 +pkgver=3.8.0 +pkgrel=1 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64) -license=('GPL') -depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme') -makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools') +license=(GPL) +depends=(gtk3 libgtop dnsutils iputils dconf whois hicolor-icon-theme) +makedepends=(yelp-tools intltool nmap net-tools) optdepends=('nmap: Port scanning' 'net-tools: Network statistics') -groups=('gnome-extra') +groups=(gnome-extra) url="http://www.gnome.org" install=gnome-nettool.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + printf.patch) +sha256sums=('3a3480dcef181684f3e37d779cfd43f9b21920412aff78501de1695faf194a28' + '4b06c0748650996100f710a2d7c90afc8fb75bbdd1984f243f42318d0985229e') build() { cd $pkgname-$pkgver + patch -Np1 -i ../printf.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-compile make diff --git a/extra/gnome-nettool/printf.patch b/extra/gnome-nettool/printf.patch new file mode 100644 index 000000000..89868411a --- /dev/null +++ b/extra/gnome-nettool/printf.patch @@ -0,0 +1,34 @@ +diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c +--- gnome-nettool-3.8.0/src/info.c 2013-05-02 13:58:40.000000000 +0200 ++++ gnome-nettool-3.8.0-printf/src/info.c 2013-05-03 05:20:04.684921458 +0200 +@@ -232,13 +232,13 @@ + text_rx_bytes = util_legible_bytes (netload.bytes_in); + text_tx_bytes = util_legible_bytes (netload.bytes_out); + +- g_sprintf (rx_pkt, "%lld", netload.packets_in); +- g_sprintf (tx_pkt, "%lld", netload.packets_out); ++ g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in); ++ g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out); + +- g_sprintf (rx_error, "%lld", netload.errors_in); +- g_sprintf (tx_error, "%lld", netload.errors_out); ++ g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in); ++ g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out); + +- g_sprintf (collisions, "%lld", netload.collisions); ++ g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions); + + gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes); + gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt); +diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c +--- gnome-nettool-3.8.0/src/utils.c 2013-05-02 13:58:40.000000000 +0200 ++++ gnome-nettool-3.8.0-printf/src/utils.c 2013-05-03 05:21:45.704202804 +0200 +@@ -272,7 +272,7 @@ + unit = "KiB"; + } + +- result = g_strdup_printf ("%lld.%lld %s", short_rx / 10, ++ result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10, + short_rx % 10, unit); + return result; + } diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 04b381bc3..7ff833891 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 183397 2013-04-21 22:10:21Z heftig $ +# $Id: PKGBUILD 184166 2013-05-03 02:07:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-session pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) license=(GPL LGPL) depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop hicolor-icon-theme json-glib libgl libsm libxtst upower) -makedepends=(intltool mesa gtk-doc) +makedepends=(intltool mesa gtk-doc xtrans) options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index f0a9b4a3c..10880858a 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183317 2013-04-21 22:06:35Z heftig $ +# $Id: PKGBUILD 184170 2013-05-03 03:05:29Z heftig $ # Maintainer: Ionut Biru pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 arch=('i686' 'x86_64') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('dbddb143fe671ee321d19de2dbae00c0f67e78ce90447227b23062137b1828bd') +sha256sums=('d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD index 1a5551ab5..acbcf2f6e 100644 --- a/extra/kdevelop-python/PKGBUILD +++ b/extra/kdevelop-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172007 2012-11-26 13:00:02Z andrea $ +# $Id: PKGBUILD 184199 2013-05-03 13:03:50Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdevelop-python -pkgver=1.4.1 +pkgver=1.5.0 pkgrel=1 pkgdesc="Python language and documentation plugin for KDevelop" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('kdevelop') makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.bz2") -sha1sums=('b887811d9a79eee3323cf3ad1be093c5801d31d6') +sha1sums=('fb9af112910c5655ce52bf9cfef19bacbab4f62f') build() { mkdir build diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index d604f74e2..333aee8ee 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183427 2013-04-21 22:11:12Z heftig $ +# $Id: PKGBUILD 184204 2013-05-03 19:46:09Z heftig $ # Maintainer: tobias # Contributor: Tobias Kieslich pkgname=libgda pkgver=5.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64) license=('GPL') @@ -24,7 +24,7 @@ build() { sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py ./configure --prefix=/usr --sysconfdir=/etc \ --with-bdb=/usr --with-bdb-libdir-name=lib \ - --disable-static --enable-json + --disable-static --enable-json --enable-gda-gi make } diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 7ab3fe6a8..8e93cf29e 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183448 2013-04-21 22:11:51Z heftig $ +# $Id: PKGBUILD 184181 2013-05-03 08:14:17Z foutrelis $ # Maintainer: Jan de Groot # Contributor: Arjan Timmerman # Contributor: Wael Nasreddine @@ -7,19 +7,30 @@ pkgname=network-manager-applet pkgver=0.9.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME frontends to NetWorkmanager" arch=(i686 x86_64) license=(GPL) url="http://www.gnome.org/projects/NetworkManager/" depends=("networkmanager>=${pkgver::5}" libgnome-keyring gtk3 libnotify gnome-icon-theme mobile-broadband-provider-info iso-codes) -makedepends=(intltool gnome-bluetooth) +makedepends=(intltool gnome-bluetooth gobject-introspection) optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool' '!emptydirs') install=network-manager-applet.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz + fixed-signal-icons.tar.xz) +noextract=(fixed-signal-icons.tar.xz) +sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590' + '08ffd9d045c98119eb1991c036f41e51950e72eea5638549075239256c000e91') + +prepare() { + cd ${pkgname}-${pkgver} + + # Fix signal icons to work with libpng 1.6 + # https://bugzilla.gnome.org/show_bug.cgi?id=697286 + tar xf ${srcdir}/fixed-signal-icons.tar.xz +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/network-manager-applet/fixed-signal-icons.tar.xz b/extra/network-manager-applet/fixed-signal-icons.tar.xz new file mode 100644 index 000000000..1f85541dc Binary files /dev/null and b/extra/network-manager-applet/fixed-signal-icons.tar.xz differ diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD index 4b6bdedd3..712653e42 100644 --- a/extra/perl-alien-sdl/PKGBUILD +++ b/extra/perl-alien-sdl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165868 2012-09-01 20:47:49Z heftig $ +# $Id: PKGBUILD 184164 2013-05-03 01:57:18Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Sarah Hay @@ -8,7 +8,7 @@ pkgname=perl-alien-sdl _realname=Alien-SDL -pkgver=1.438 +pkgver=1.440 pkgrel=1 pkgdesc="Building, finding and using SDL binaries" arch=(i686 x86_64) @@ -17,9 +17,9 @@ url="http://search.cpan.org/dist/Alien-SDL/" depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny) makedepends=(perl-file-which perl-text-patch) options=(!emptydirs) -_author=JTPALMER +_author=FROGGS source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/$_realname-$pkgver.tar.gz) -md5sums=('1936ba9e300677151124b62883cedf20') +md5sums=('ad665d058d186e673114024ba10dfa09') package() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD index 39521015b..6aaf6b25b 100644 --- a/extra/smplayer/PKGBUILD +++ b/extra/smplayer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181042 2013-03-30 15:19:33Z foutrelis $ +# $Id: PKGBUILD 184186 2013-05-03 10:19:10Z foutrelis $ # Maintainer : Ionut Biru # Contributor: Allan McRae # Contributor: Alessio 'mOLOk' Bolognino @@ -6,16 +6,25 @@ pkgname=smplayer pkgver=0.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64') url="http://smplayer.sourceforge.net/" license=('GPL') depends=('qt4' 'mplayer') +makedepends=('optipng') install=smplayer.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('4691b569c4209d7e5a2c1386d9319881') +prepare() { + cd "$pkgname-$pkgver" + + # Fix invalid PNG icons to work with libpng 1.6 + # http://sourceforge.net/p/smplayer/bugs/571/ + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "$pkgname-$pkgver" sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 292be2408..a1e90b3b6 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -6,23 +6,23 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.10 +pkgver=${_basekernel}.11 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'fd9713a31ee671a9dec8ad0e65996c84' +md5sums=('5c7787be882c343e41fb49136ff60aec' + 'c0ccd5624a61eaae1a00a349e90b5a26' '6294513cfa9830d48ad1915ff7053a98' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' @@ -35,7 +35,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index a4f59e9b3..76fa87eb8 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.10-1-LIBRE-PAE +KERNEL_VERSION=3.8.11-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index fed3ad748..77ebe521f 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -9,19 +9,19 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_releasever=4 -_rtpatchver=rt2 +_releasever=10 +_rtpatchver=rt6 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu1/patch-${_basekernel}-gnu1-${_pkgver}-gnu1.xz" "http://www.kernel.org/pub/linux/kernel/projects/rt/${_basekernel}/patch-${_pkgver}-${_rtpatchver}.patch.xz" # the main kernel config files 'config.i686' 'config.x86_64' @@ -32,17 +32,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'be610dd93dbe033cfe04018b27557c3e' - '22014502fe176ae6dfa33d26f20dbc92' - '4c8f8e66f934b14b48298fd23583ee5f' - '80388869acf87c930fd6bf956682f35c' +md5sums=('5c7787be882c343e41fb49136ff60aec' + '1a05d0c781ac02fed58ad405a8b8355a' + '23d715c891ecfb436cb2a4c4ea5286af' + '5ed195b8c44e1e00c1885077566e1f81' + 'f97a0be3b9252e788a0cf67e93cb5c6f' '82496e68851d1960543a07ba51cdb44a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'a245684c46c8bc2348ebb259c18e40a6') + 'c1a8440ffdae7c352d77bc4002cb6d3d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -56,7 +56,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${_pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${_pkgver}-gnu1" fi # add realtime patch diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index 7fec50cc4..d6e6d82c9 100644 --- a/kernels/linux-libre-rt/config.i686 +++ b/kernels/linux-libre-rt/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.4 Kernel Configuration +# Linux/i386 3.8.10 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5468,6 +5468,8 @@ CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64 index 8d48b274f..d4cef655e 100644 --- a/kernels/linux-libre-rt/config.x86_64 +++ b/kernels/linux-libre-rt/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.8.4 Kernel Configuration +# Linux/x86_64 3.8.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -5238,6 +5238,8 @@ CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 449e2c823..4b78a3997 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.8.4-1-rt2-LIBRE-RT +KERNEL_VERSION=3.8.10-1-rt6-LIBRE-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 19e0233a8..2d2ba5338 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -6,23 +6,23 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.10 +pkgver=${_basekernel}.11 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'fd9713a31ee671a9dec8ad0e65996c84' +md5sums=('5c7787be882c343e41fb49136ff60aec' + 'c0ccd5624a61eaae1a00a349e90b5a26' '2708b6f03f827e2c94ecbd050df4286d' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' @@ -35,7 +35,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 905244477..dbbd5e8fd 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.10-1-LIBRE-XEN +KERNEL_VERSION=3.8.11-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index efe1c3371..75bcfdc6a 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.10 +_kernver=3.8.11 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=15 +pkgrel=16 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -22,7 +22,7 @@ source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_versi md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') -build() { +package() { # current extramodules version _extraver=extramodules-3.8-LIBRE diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index ec552b834..c8c40e338 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.75 +_kernver=3.0.76 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=13 +pkgrel=14 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -22,7 +22,7 @@ source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_versi md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') -build() { +package() { # current extramodules version _extraver=extramodules-3.0-LIBRE-LTS diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 8e41245c2..bb72f209f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,7 +10,7 @@ _basekernel=3.0 _sublevel=76 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.75 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.76 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,7 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' 'module-symbol-waiting-3.0.patch' 'module-init-wait-3.0.patch' - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' 'e405de6581d02d44c2c06a81a1d93f93' 'fe0e9b4415b82f306fc1b63eb9a742a4' @@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '9f8275e1bd316b2b93fd21df3b26228f') + '5b330cc23071e1250b7e0a1613a25952') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 67bbcdc5d..2be94b22d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,17 +10,17 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=10 +_sublevel=11 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -29,9 +29,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'fd9713a31ee671a9dec8ad0e65996c84' + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") +md5sums=('5c7787be882c343e41fb49136ff60aec' + 'c0ccd5624a61eaae1a00a349e90b5a26' '9b425f069f920cdd6798b3adab79d3af' '9316ebdb21ea9948ae5c83795a3dcf61' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '259774469ac9b2b1f41cf2f978743055') + '8c00187e43a678a1db821974a1c0a39c') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -53,7 +53,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index fd8297ddf..e34d8347f 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.10-1-LIBRE +KERNEL_VERSION=3.8.11-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD index e125f83e9..e1e3eb0c4 100644 --- a/pcr/babeld/PKGBUILD +++ b/pcr/babeld/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer (AUR): Yann Lopez # Maintainer (Parabola): fauno pkgname=babeld -pkgver=1.3.6 +pkgver=1.4.0 pkgrel=1 pkgdesc="Loop-free distance-vector routing protocol" arch=(i686 x86_64 mips64el) @@ -28,5 +28,5 @@ package() { install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE } -md5sums=('5dfccfeb2db5d8244c2fd2dc301e89a0' +md5sums=('4ad44bca59f594a629306ac5c9b89d57' 'SKIP') -- cgit v1.2.3-54-g00ecf