diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-19 12:40:04 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-19 12:40:04 +0200 |
| commit | d186e96728bff4cc4873c59d48d01fe6eefe6131 (patch) | |
| tree | 1eefcef8058414b07b2750f52d9746f5323472ff | |
| parent | 84c217e2d9acc64713978324761816e2468b5292 (diff) | |
| parent | 1fedf1f5d5351aefd88268cba7353c79adac9b8a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/collectd/PKGBUILD
community/drivel/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/gnomesu/PKGBUILD
community/gnuchess/PKGBUILD
community/gphpedit/PKGBUILD
community/gsql/PKGBUILD
community/libmatchbox/PKGBUILD
community/lockfile-progs/PKGBUILD
community/opencc/PKGBUILD
community/roxterm/PKGBUILD
community/uriparser/PKGBUILD
community/xcircuit/PKGBUILD
core/bison/PKGBUILD
core/curl/PKGBUILD
core/expat/PKGBUILD
core/gcc/PKGBUILD
core/gpm/PKGBUILD
core/m4/PKGBUILD
core/systemd/PKGBUILD
core/tar/PKGBUILD
extra/alsa-lib/PKGBUILD
extra/alsa-utils/PKGBUILD
extra/bitlbee/PKGBUILD
extra/chkrootkit/PKGBUILD
extra/fakechroot/PKGBUILD
extra/farstream/PKGBUILD
extra/freeglut/PKGBUILD
extra/gob2/PKGBUILD
extra/libcdio-paranoia/PKGBUILD
extra/liblqr/PKGBUILD
extra/libnl1/PKGBUILD
extra/libpst/PKGBUILD
extra/libwpd/PKGBUILD
extra/xorg-server/PKGBUILD
210 files changed, 1818 insertions, 1612 deletions
diff --git a/extra/at/PKGBUILD b/community/at/PKGBUILD index 881b5485b..a1bb86500 100644 --- a/extra/at/PKGBUILD +++ b/community/at/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168299 2012-10-08 05:32:58Z eric $ +# $Id: PKGBUILD 88443 2013-04-17 18:45:36Z eric $ # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Todd Musall <tmusall@comcast.net> diff --git a/extra/at/atd b/community/at/atd index d10a46a3b..d10a46a3b 100644 --- a/extra/at/atd +++ b/community/at/atd diff --git a/extra/at/atd.service b/community/at/atd.service index ba359878c..ba359878c 100644 --- a/extra/at/atd.service +++ b/community/at/atd.service diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD index c79d02162..c2bba4804 100755 --- a/community/cairo-dock-plugins/PKGBUILD +++ b/community/cairo-dock-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87793 2013-04-06 17:02:52Z alucryd $ +# $Id: PKGBUILD 88459 2013-04-18 09:05:42Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Tofe <chris.chapuis@gmail.com> # Contributor: zhuqin <zhuqin83@gmail.com> @@ -6,8 +6,8 @@ # Contributor: snoopy33 <snoopy33@no-log.org> pkgname=cairo-dock-plugins -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Plugins for Cairo-Dock" url="https://launchpad.net/cairo-dock" license=('GPL') @@ -34,7 +34,7 @@ optdepends=('alsa-lib: AlsaMixer, Sound Effects applets' 'webkitgtk3: Weblets applet') options=('!libtool') source=("http://launchpad.net/cairo-dock-plug-ins/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") -sha256sums=('e407e1c0d54ae37815726d0f2a66f12ec8263499df99198646bcecccfc688b5c') +sha256sums=('11b4433e40bbb1507757b23e167c521d620827576c2f30bb1a9642e0bff57e01') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/community/cairo-dock-plugins/alsa-mixer-applet.patch b/community/cairo-dock-plugins/alsa-mixer-applet.patch deleted file mode 100755 index b70b89f0c..000000000 --- a/community/cairo-dock-plugins/alsa-mixer-applet.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/alsaMixer/src/applet-struct.h 2013-03-23 16:55:27.000000000 +0100 -+++ b/alsaMixer/src/applet-struct.h 2013-03-28 18:56:15.981944400 +0100 -@@ -19,6 +19,7 @@ - - #ifndef __CD_APPLET_STRUCT__ - #define __CD_APPLET_STRUCT__ -+#include <sys/types.h> - - #include <sys/types.h> - #include <alsa/asoundlib.h> diff --git a/community/cairo-dock-plugins/applet-host-ias.patch b/community/cairo-dock-plugins/applet-host-ias.patch deleted file mode 100755 index a5316704f..000000000 --- a/community/cairo-dock-plugins/applet-host-ias.patch +++ /dev/null @@ -1,17 +0,0 @@ -=== modified file 'Status-Notifier/src/applet-host-ias.c' ---- old/Status-Notifier/src/applet-host-ias.c 2012-03-18 02:41:47 +0000 -+++ new/Status-Notifier/src/applet-host-ias.c 2012-05-27 12:50:54 +0000 -@@ -238,10 +238,12 @@ - cIconThemePath, - #if (INDICATOR_OLD_NAMES == 0) - cAccessbleDesc && *cAccessbleDesc != '\0' ? cAccessbleDesc : -+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1) - #if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1) - cTitle && *cTitle != '\0' ? cTitle : - #endif - #endif -+ #endif - cLabel - ); - - diff --git a/community/cairo-dock/PKGBUILD b/community/cairo-dock/PKGBUILD index db73fc55b..74f5063b9 100755 --- a/community/cairo-dock/PKGBUILD +++ b/community/cairo-dock/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87791 2013-04-06 16:56:43Z alucryd $ +# $Id: PKGBUILD 88485 2013-04-18 13:57:25Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Tofe <chris.chapuis@gmail.com> # Contributor: erm67 <erm67@yahoo.it> pkgname=cairo-dock -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=2 pkgdesc="Light eye-candy fully themable animated dock" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake') optdepends=('cairo-dock-plugins: Plugins for Cairo-Dock') options=('!libtool') source=("http://launchpad.net/${pkgname}-core/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz" 'gldit-rpath.patch') -sha256sums=('69d57dab16e70bb0683ba91f1dfd19a9ee0de0b1642ca6480fef9dacbb9c2fd2' +sha256sums=('441e407f92138dc604c796b0455777b765e298ecb8f3120104f521d0e0b34543' '5a5fbc67aaa210387ef4410701747fe741942c99c4bd84ae771b96a3bdd1c4cc') prepare() { diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index b1660d650..bdda0434f 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80035 2012-11-15 15:53:42Z spupykin $ +# $Id: PKGBUILD 88266 2013-04-15 11:13:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -8,18 +8,18 @@ pkgname=cgit pkgver=0.9.1 _gitver=1.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64' 'mips64el') url="http://hjemli.net/git/cgit" license=('GPL') depends=('openssl') -makedepends=('git' 'zlib' 'curl' 'asciidoc') +makedepends=('zlib' 'curl' 'asciidoc') install=cgit.install source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz" "git-${_gitver}.tar.gz::https://github.com/git/git/archive/v${_gitver}.tar.gz" "apache.example.conf") -md5sums=('ed1a1ccccdcbf55ddd6a9de29bca6edf' +md5sums=('272ee8fec2d81ac1e65117578e64df1e' 'c63cc7ca8a4bbf97c8802f354511223e' 'bd5696bea0654bfcf98f249b1a36737d') diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 3021b8c20..6694c80bc 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86850 2013-03-22 21:27:24Z faidoc $ +# $Id: PKGBUILD 88411 2013-04-17 07:47:53Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com # Based on gnome-control-center: # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Jan de Groot <jgc@archlinux.org> pkgname=cinnamon-control-center -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ install=cinnamon-control-center.install license=('GPL') options=('!libtool' '!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") -sha256sums=('09af52ae7417b611b91ca9fdafbde08c68356f2b66241780b513ad2249a831c1') +sha256sums=('44a4484238c2b9e9060d062028438df589fc29c9e3da45edad068198a990c8be') build() { cd $pkgname-$pkgver diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index d181ae43e..ec2720150 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86998 2013-03-25 19:16:35Z bpiotrowski $ +# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd -pkgver=5.2.1 +pkgver=5.3.0 pkgrel=1 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' @@ -42,42 +42,38 @@ source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'libperl.patch' 'service' 'rc.d') -sha1sums=('2c51c21d339c221bd9f94b1ee2b44b1e388d6b39' +sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539' '245c098d121a4a05594553583310953b3a2f6461' 'b56907f532b9174e1b6995aadb518228d7464d3b' '0f441718d5519cb043b1130e5a1d0379078adbcc') backup=('etc/collectd.conf') options=('!libtool') -install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - # Not designed to build with newer dependencies. - find . -name Makefile.in -or -name configure.in | xargs sed -i 's/-Werror/-Wno-error/' - patch -p1 -i ../libperl.patch autoconf + sed 's/-Werror//g' -i src/Makefile.in +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-static=no \ --with-python=/usr/bin/python2 - make all } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - rmdir "${pkgdir}/var/run" # FS#30201 install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl - mv "${pkgdir}"/usr/man/man3 "${pkgdir}"/usr/share/man # perl man magic ignores datarootdir } diff --git a/community/collectd/install b/community/collectd/install deleted file mode 100644 index 54cc0e1b3..000000000 --- a/community/collectd/install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - cat <<EOF -==> Customize your /etc/collectd.conf (you really want to). -==> Then start and stop the daemon using: /etc/rc.d/collectd -==> To see some result of collected data, use the Perl script: -==> /usr/share/collectd/collectd2html.pl -EOF -} diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index 2b7de42d5..d67f341e3 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86574 2013-03-20 02:34:19Z eric $ +# $Id: PKGBUILD 88356 2013-04-16 16:20:52Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen -pkgver=0.5.3 -pkgrel=3 +pkgver=0.6 +pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64' 'mips64el') url="http://converseen.sourceforge.net/" @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8064020c56a531bb190967369c907cec') +md5sums=('fbb618d313980ed5ad754ba9ca06a05f') build() { cd "${srcdir}" diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD index 7b3b3cf66..c799039c3 100644 --- a/community/dillo/PKGBUILD +++ b/community/dillo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63530 2012-02-05 11:53:50Z ibiru $ +# $Id: PKGBUILD 88466 2013-04-18 12:14:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=dillo -pkgver=3.0.2 -pkgrel=2 +pkgver=3.0.3 +pkgrel=1 pkgdesc="A small, fast graphical web browser built on FLTK" arch=(i686 x86_64 'mips64el') url="http://www.dillo.org" @@ -13,7 +13,7 @@ depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' 'libxi' 'libxinerama') backup=(etc/dillo/{dillorc,dpidrc}) source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('81b82112cefcc7d54fe2972a21f42930') +md5sums=('726cd0b7a18c5e25f4d80ebeffe7607e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/drivel/PKGBUILD b/community/drivel/PKGBUILD index 16057a69d..3c12768c5 100644 --- a/community/drivel/PKGBUILD +++ b/community/drivel/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 65140 2012-02-20 05:01:22Z spupykin $ +# $Id: PKGBUILD 88291 2013-04-16 00:57:51Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # old Maintainer: Andrei "Garoth" Thorp <my-username at gmail dot com> # Contributor: Alexandr Nevskiy <kepkin@gmail.com> pkgname=drivel pkgver=3.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="GTK client for working with online journals (blogs)." -url="http://www.dropline.net/drivel/index.php" +url="http://drivel.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') license=("GPL") -depends=('curl' 'gtksourceview2' 'gtkspell' 'libgnomeui>=2.0.0' 'libsoup') -makedepends=('perlxml' 'pkgconfig' 'intltool>=0.21' 'gnome-doc-utils>=0.3.2') +depends=('curl' 'gnome-vfs' 'gtksourceview2' 'gtkspell' 'libsoup' 'desktop-file-utils') +makedepends=('intltool>=0.21' 'gnome-doc-utils>=0.3.2') install=drivel.install source=(http://downloads.sourceforge.net/drivel/$pkgname-$pkgver.tar.gz) md5sums=('295a583d6ed652ab591070245283fb5b') build() { cd $srcdir/$pkgname-$pkgver - LDFLAGS=-lm ./configure --prefix=/usr --sysconfdir=/etc + sed -i 's/ -Werror//' configure + LDFLAGS=-lm ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-desktop-update --disable-schemas-install \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas make } diff --git a/community/drivel/drivel.install b/community/drivel/drivel.install index 47f683f79..cbb2491ce 100644 --- a/community/drivel/drivel.install +++ b/community/drivel/drivel.install @@ -1,13 +1,22 @@ +pkgname=drivel + post_install() { - [ -e /usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache -q -t -f usr/share/icons + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q + update-mime-database usr/share/mime } post_upgrade() { post_install $1 } +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + post_remove() { - [ -e /usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache -q -t -f usr/share/icons + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q + update-mime-database usr/share/mime } diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD index ddb73dc00..f77145cca 100644 --- a/community/enet/PKGBUILD +++ b/community/enet/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 81243 2012-12-14 12:11:24Z svenstaro $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 88352 2013-04-16 15:17:10Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Bj?indeijer <bjorn@lindeijer.nl> pkgname=enet -pkgver=1.3.6 +pkgver=1.3.7 pkgrel=1 pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.' arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +13,11 @@ license=('custom') depends=('glibc') options=('!libtool') source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('215faae73d7e1f0d6dc48676884d07c7') +sha1sums=('5611926d47ce0699c8176898496603192d5744e4') build() { cd "${pkgname}-${pkgver}" - CFLAGS+="-fPIC" ./configure --prefix=/usr + ./configure --prefix=/usr make } diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index da141c863..f702f9ace 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88116 2013-04-12 03:06:47Z fyan $ +# $Id: PKGBUILD 88241 2013-04-15 00:59:54Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> @@ -13,7 +13,7 @@ pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" pkgver=1.10.1390.102 _patchver=${pkgver}.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/mozc/" license=('custom') @@ -26,6 +26,7 @@ source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2 http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2 http://fcitx.googlecode.com/files/fcitx-mozc-${_patchver}.patch + http://fcitx.googlecode.com/files/fcitx-mozc-icon.tar.gz mozc_1.10.1390.102_remove_warn_as_error.patch ) @@ -99,20 +100,21 @@ package() { install -D -m 644 unix/fcitx/mozc.conf "${pkgdir}/usr/share/fcitx/inputmethod/mozc.conf" install -d "${pkgdir}/usr/share/fcitx/mozc/icon" - install -m 644 data/images/product_icon_32bpp-128.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png" - install -m 644 data/images/unix/ui-alpha_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png" - install -m 644 data/images/unix/ui-alpha_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png" - install -m 644 data/images/unix/ui-direct.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png" - install -m 644 data/images/unix/ui-hiragana.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png" - install -m 644 data/images/unix/ui-katakana_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png" - install -m 644 data/images/unix/ui-katakana_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png" - install -m 644 data/images/unix/ui-dictionary.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png" - install -m 644 data/images/unix/ui-properties.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png" - install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-alpha_full.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-alpha_half.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-direct.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-hiragana.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-katakana_full.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-katakana_half.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-dictionary.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-properties.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-tool.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" } md5sums=('ff1611354703cbaa76cd562007ba57e9' '63310f8bad30f528ba10a6574b807952' 'bb9fa83c00dece4de5f92ca1773e2bc5' 'a72001a9067a4c2c4e0e836d0f92ece4' '1d94b16b5379f0ccd9f4e372c59b8190' + '80fe2ef127b70649df22d133822ac8a7' '36689e236c97e570c1a8c98f947755bb') diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index 625d9a428..6ca866d24 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87046 2013-03-26 11:49:39Z foutrelis $ +# $Id: PKGBUILD 88243 2013-04-15 01:48:05Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> @@ -6,21 +6,26 @@ pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') pkgver=4.2.7 -pkgrel=5 +pkgrel=6 groups=('fcitx-im') arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \ - 'iso-codes' 'gobject-introspection' 'libxkbfile') + 'iso-codes' 'gobject-introspection' 'libxkbfile' 'git') source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz - https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch) + https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch + https://github.com/fcitx/fcitx/commit/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch + https://github.com/fcitx/fcitx/commit/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch +) build() { #source /etc/profile.d/qt4.sh cd "$srcdir/$pkgbase-$pkgver" patch -Np1 -i "$srcdir/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch" + patch -Np1 -i "$srcdir/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch" + git apply -v -p1 "$srcdir/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch" cd "$srcdir" mkdir -p build @@ -122,4 +127,6 @@ package_fcitx-qt4() { } md5sums=('6e291717c24615b9dc9bfaa2949af3a7' - 'ce299aa5b596cc52dc9e66b47795e627') + 'ce299aa5b596cc52dc9e66b47795e627' + '6f420547bc8af9627db2e5290f758433' + '51e53377e1b83661f2896e25d1a46242') diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD index 1a287da02..17e87ce17 100644 --- a/community/flickcurl/PKGBUILD +++ b/community/flickcurl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 59867 2011-12-01 13:14:32Z spupykin $ +# $Id: PKGBUILD 88309 2013-04-16 13:27:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=flickcurl -pkgver=1.21 -pkgrel=3 +pkgver=1.24 +pkgrel=1 pkgdesc="C library for the Flickr API" arch=(i686 x86_64 'mips64el') url="http://librdf.org/flickcurl/" license=('GPL') depends=('raptor' 'curl') source=(http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz) -md5sums=('d4d364231505dc22a6af42be7bc85edf') +md5sums=('7cf6a627465471d76a5f4dc31099d9cf') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index 1a0dfc363..04e4c51ed 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80103 2012-11-16 06:59:27Z spupykin $ +# $Id: PKGBUILD 88311 2013-04-16 13:27:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ben <ben@benmazer.net> pkgname=fox -pkgver=1.6.47 +pkgver=1.6.49 pkgrel=1 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('mesa') optdepends=('perl') options=('!libtool') source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) -md5sums=('9bd233adff5af3fc2d1139c8a22f556c') +md5sums=('e120647d26a27ed37cd5fed8b75c8a3d') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/gnomesu/PKGBUILD b/community/gnomesu/PKGBUILD deleted file mode 100644 index bf26c6a3f..000000000 --- a/community/gnomesu/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 65528 2012-02-21 08:44:37Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Eric Belanger <belanger@astro.umontreal.ca> -# Contributor: Kritoke <kritoke@nospam.gmail.com> - -pkgname=gnomesu -pkgver=0.3.1 -pkgrel=7 -pkgdesc="A program that allows a user to su to root in a Gnome environment." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gtkfiles.org/app.php/GnomeSu" -license=("GPL") -depends=('libgnomeui' 'libzvt') -makedepends=('pkgconfig') -conflicts=('libgnomesu') -source=(http://downloads.sourceforge.net/sourceforge/xsu/$pkgname-$pkgver.tar.gz) -md5sums=('8ebcf248b4f8430c96d80379ec2acdd8') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i 's/1.4/1.10/' configure - sed -i 's/gsu/gnomesu/' xsu.desktop.in - sed -i 's/gnome-warning/dialog-warning/' xsu.desktop.in - sed -i 's|gnome-warning|/usr/share/icons/gnome/16x16/status/dialog-warning|' src/xsu.c - ./configure --prefix=/usr --mandir=/usr/share --build=$CHOST - make CFLAGS+=-Wl,-export-dynamic - make DESTDIR=$pkgdir install - install -D -m644 xsu.desktop $pkgdir/usr/share/applications/gnomesu.desktop - rm -r $pkgdir/usr/share/gnome - mv $pkgdir/usr/doc $pkgdir/usr/share/doc -} diff --git a/community/gnuchess/PKGBUILD b/community/gnuchess/PKGBUILD index ee192edc3..cbc34b8a9 100644 --- a/community/gnuchess/PKGBUILD +++ b/community/gnuchess/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 76871 2012-10-01 14:52:29Z bisson $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 88493 2013-04-18 15:55:51Z jsteel $ +# Maintainer: Jonathan Steel <mail@jsteel.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuchess -pkgver=6.0.2 -pkgrel=1.1 +pkgver=6.0.3 +pkgrel=1 pkgdesc="Lets most modern computers play a full game of chess" url="http://www.gnu.org/software/chess/chess.html" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('glibc' 'ncurses' 'readline') -source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('566a145479c47f2f9d7d9b7b8119e1b0' - '044487606aa14ecb29ab9613f83918d9') +optdepends=('xboard: for a GUI') +source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz) +md5sums=('28625afb8f48b86211ee1d217c308064') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr + make } package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install + cd "$srcdir"/$pkgname-$pkgver + + make prefix="$pkgdir"/usr install } diff --git a/community/gocr/PKGBUILD b/community/gocr/PKGBUILD index 4b712698a..11d1f2588 100644 --- a/community/gocr/PKGBUILD +++ b/community/gocr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65536 2012-02-21 08:47:11Z spupykin $ +# $Id: PKGBUILD 88468 2013-04-18 12:15:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=gocr -pkgver=0.49 -pkgrel=2 +pkgver=0.50 +pkgrel=1 pkgdesc="Open-source character recognition (OCR)" arch=("i686" "x86_64" 'mips64el') url="http://jocr.sourceforge.net/index.html" @@ -12,7 +12,7 @@ license=('GPL') depends=('glibc' 'netpbm') optdepends=('tk: to use the tk frontend') source=(http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-${pkgver}.tar.gz) -md5sums=('4e527bc4bdd97c2be15fdd818857507f') +md5sums=('553ea40c2b3a1a0b03a30675d0e0aba1') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gphpedit/PKGBUILD b/community/gphpedit/PKGBUILD index 81d1cfd2e..8fdf88e6b 100644 --- a/community/gphpedit/PKGBUILD +++ b/community/gphpedit/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 65586 2012-02-21 09:11:19Z spupykin $ +# $Id: PKGBUILD 88295 2013-04-16 02:34:03Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gphpedit pkgver=0.9.98RC1 -pkgrel=3 +pkgrel=4 pkgdesc="a scintilla/gnome based editor specialized on php-files" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('libgnomeui>=2.18.1-2' 'libgtkhtml>=2.11.0' 'desktop-file-utils' 'libwebkit') +depends=('gconf' 'webkitgtk2' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('intltool') url="http://www.gphpedit.org/" options=('!makeflags') @@ -21,12 +21,11 @@ md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525' build() { cd ${srcdir}/*$pkgname* - patch -Np1 -i ${srcdir}/gphpedit-0.9.98RC1-gmodule.patch - ./autogen.sh - LDFLAGS=`pkg-config --libs gtk+-2.0` ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + LDFLAGS=`pkg-config --libs gmodule-2.0` ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var make +} + +package() { + cd ${srcdir}/*$pkgname* make DESTDIR=$pkgdir install - # extend MimeType declaration - echo "MimeType=application/x-php;text-x-php-text/x-php-source;" >> \ - $pkgdir/usr/share/applications/gphpedit.desktop } diff --git a/community/gphpedit/gphpedit.install b/community/gphpedit/gphpedit.install index 39bc96919..8e46769be 100644 --- a/community/gphpedit/gphpedit.install +++ b/community/gphpedit/gphpedit.install @@ -1,5 +1,6 @@ post_install() { update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/community/gprolog/PKGBUILD b/community/gprolog/PKGBUILD index 99a1f32dd..8c7eb438e 100644 --- a/community/gprolog/PKGBUILD +++ b/community/gprolog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80909 2012-12-06 10:51:57Z spupykin $ +# $Id: PKGBUILD 88313 2013-04-16 13:27:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributer: Jason Chu <jchu@xentac.net> pkgname=gprolog -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc="GNU Prolog" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.gprolog.org/" depends=() license=('GPL') source=(ftp://ftp.gnu.org/gnu/gprolog/gprolog-$pkgver.tar.gz) -md5sums=('e9266515435dffbcabf5af8fcd2f2204') +md5sums=('c6d62f93a0274492a2029c267ca8edee') build() { cd "$srcdir/gprolog-$pkgver/src" diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD index 6a9d647fe..92166ac5a 100644 --- a/community/gsql/PKGBUILD +++ b/community/gsql/PKGBUILD @@ -1,32 +1,36 @@ -# $Id: PKGBUILD 87004 2013-03-25 19:16:44Z bpiotrowski $ +# $Id: PKGBUILD 88439 2013-04-17 16:49:53Z bgyorgy $ # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=gsql pkgver=0.2.2 -pkgrel=5 +pkgrel=6 pkgdesc="Integrated database development tool for GNOME" url="http://gsql.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf' - 'desktop-file-utils' 'libnotify') -makedepends=('libmariadbclient' 'postgresql-libs' 'libssh') -optdepends=('libmariadbclient' 'postgresql-libs' 'libssh') +depends=('gtk2>=2.12' 'gtksourceview2' 'libglade' 'gconf' + 'desktop-file-utils' 'libnotify' 'hicolor-icon-theme') +makedepends=('vte' 'libmariadbclient' 'postgresql-libs' 'libssh') +optdepends=('libmariadbclient: MySQL engine' + 'libssh: SSH tunneling plugin' + 'postgresql-libs: PostgreSQL engine' + 'vte: Terminal session plugin') install=gsql.install -options=(!libtool) +options=(!libtool !emptydirs) source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) md5sums=('8f3322a75390584729e84a8570e08bea') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's/notify_notification_new (subj, message, NULL, NULL);/notify_notification_new (subj, message, NULL);/' libgsql/notify.c - ./configure --prefix=/usr --sysconfdir=/etc + LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-static --without-gnome make } package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install install -d "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index d7f96b934..c4361a3da 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 84727 2013-02-23 17:46:16Z seblu $ +# $Id: PKGBUILD 88370 2013-04-16 20:03:40Z seblu $ # Maintainer: Sébastien Luttringer pkgname=ipset -pkgver=6.17 +pkgver=6.18 pkgrel=1 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool') source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.systemd" "$pkgname.service") -md5sums=('9d439e279e02076f29fe7c9c059a5cae' +md5sums=('776de6afe32ae386e6827a51c025464f' '7daa4f163eef9db216cb4c428e0342a3' 'b032241b96b5802975fe4321cc511c6b') diff --git a/community/libexosip2/PKGBUILD b/community/libexosip2/PKGBUILD index 3b9916ac0..c56473b94 100644 --- a/community/libexosip2/PKGBUILD +++ b/community/libexosip2/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 61348 2011-12-28 15:42:18Z spupykin $ +# $Id: PKGBUILD 88347 2013-04-16 14:01:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=libexosip2 +epoch=1 pkgver=3.6.0 pkgrel=1 pkgdesc="A library that hides the complexity of using SIP for multimedia session establishement" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/exosip/" license=('GPL') -depends=('libosip2>=3.6.0' 'openssl') +depends=('libosip2>=4.0.0' 'openssl') options=(!libtool) source=(http://download.savannah.nongnu.org/releases/exosip/libeXosip2-${pkgver/_/-}.tar.gz) md5sums=('6fef4c110f1305048a8b307f440933d9') diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index d5ef393d6..44cb112af 100644 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87048 2013-03-26 11:49:42Z foutrelis $ +# $Id: PKGBUILD 88481 2013-04-18 13:13:14Z lcarlier $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=libfbclient -pkgver=2.5.2.26539 -pkgrel=3 +pkgver=2.5.2.26540 +pkgrel=1 pkgdesc="Client library for Firebird." arch=('i686' 'x86_64') url="http://www.firebirdsql.org/" @@ -13,7 +13,7 @@ depends=('gcc-libs' 'icu') options=('!makeflags') source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2 LICENSE) -md5sums=('adf2d2f9d48a53dc6c490ba1e44631fd' +md5sums=('21154d2004e025c8a3666625b0357bb5' '0d61798861e159c85dbdf0f30fe2f2ce') build() { diff --git a/community/libgit2/PKGBUILD b/community/libgit2/PKGBUILD index af2115029..07d9ad5bb 100644 --- a/community/libgit2/PKGBUILD +++ b/community/libgit2/PKGBUILD @@ -1,27 +1,33 @@ -# $Id$ +# $Id: PKGBUILD 88415 2013-04-17 09:17:05Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: Hilton Medeiros <medeiros.hilton@gmail.com> # Contributor: Dave Reisner <d@falconindy.com> pkgname=libgit2 -pkgver=0.17.0 -pkgrel=2 +pkgver=0.18.0 +pkgrel=1 pkgdesc="A linkable library for Git" arch=('i686' 'x86_64' 'mips64el') url="http://libgit2.github.com/" -depends=('zlib') +depends=(zlib openssl) makedepends=(cmake python) license=('GPL2') source=("src-$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/tarball/v$pkgver") -md5sums=('5a09dd1118d1354375407119d19e0f2c') +md5sums=('50409ddb0c34713677b33ef617e92c94') build() { - cd "$srcdir"/$pkgname-* - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr + cd $pkgname-* + export LANG=en_US.UTF-8 + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DTHREADSAFE=ON make } +check() { + cd $pkgname-* + make test +} + package() { - cd "$srcdir"/$pkgname-* + cd $pkgname-* make DESTDIR="$pkgdir" install } diff --git a/community/libmaa/PKGBUILD b/community/libmaa/PKGBUILD index ea5a4e14e..1537dc611 100644 --- a/community/libmaa/PKGBUILD +++ b/community/libmaa/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 1528 2009-08-25 09:47:25Z spupykin $ +# $Id: PKGBUILD 88315 2013-04-16 13:28:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libmaa -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="Provides many low-level data structures which are helpful for writing compilers" url="http://sourceforge.net/projects/dict/" @@ -12,7 +12,7 @@ depends=('glibc') makedepends=('flex') options=('!libtool') source=("http://downloads.sourceforge.net/dict/${pkgname}-${pkgver}.tar.gz") -md5sums=('04fcb72e8767c0795059bf397f5a0355') +md5sums=('01dab2cde2e0a322653e45bfa63537ee') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD index 7b9fe7ea7..2bb4f119a 100644 --- a/community/libmatchbox/PKGBUILD +++ b/community/libmatchbox/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 63648 2012-02-05 12:03:24Z ibiru $ +# $Id: PKGBUILD 88317 2013-04-16 13:28:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> pkgname=libmatchbox -pkgver=1.9 -pkgrel=5.1 +pkgver=1.10 +pkgrel=1 pkgdesc="Base library for Matchbox WM" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext') options=('!libtool') url="http://matchbox-project.org/" -source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 - libpng15.patch) -md5sums=('9f73e7515cc4679171a5db180dc1343b' - '09f782c76fe313efd0e87fabb276e2fe') +source=(http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$pkgver/libmatchbox-$pkgver.tar.gz) +md5sums=('042c5874631dfb95151aa793dc1434b8') build() { cd "$srcdir/$pkgname-$pkgver" - sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c - patch -Rp1 <$srcdir/libpng15.patch +# sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c +# patch -Rp1 <$srcdir/libpng15.patch LDFLAGS="-lX11" ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index b8b421b6c..68532b3a0 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88045 2013-04-10 16:08:55Z spupykin $ +# $Id: PKGBUILD 88319 2013-04-16 13:28:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,8 +6,8 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.25 -pkgrel=2 +pkgver=0.9.26 +pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libmicrohttpd/" @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('4f3b8ccd50e7133283f2aec5cc21620f') +md5sums=('bdac9b62fa3080890f9ab44cf29749fc') build() { cd ${pkgname}-${pkgver} diff --git a/community/libmilter/PKGBUILD b/community/libmilter/PKGBUILD index 3d842fb77..6256f409f 100644 --- a/community/libmilter/PKGBUILD +++ b/community/libmilter/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 60205 2011-12-07 15:22:36Z spupykin $ +# $Id: PKGBUILD 88321 2013-04-16 13:29:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mutantmonkey <mutantmonkey@gmail.com> pkgname=libmilter -pkgver=8.14.5 +pkgver=8.14.6 pkgrel=1 pkgdesc="libmilter" arch=(i686 x86_64) url="http://www.postfix.org/MILTER_README.html" license=('custom:Sendmail open source license') source="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${pkgver}.tar.gz" -md5sums=('02ccfc331cc81ed00ec8bb5ecfc69018') +md5sums=('9eeed3d1baecbf4e17d829d2ec005553') build(){ cd "${srcdir}/sendmail-${pkgver}" diff --git a/community/libosip2/PKGBUILD b/community/libosip2/PKGBUILD index ee400283b..8e845335a 100644 --- a/community/libosip2/PKGBUILD +++ b/community/libosip2/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 61350 2011-12-28 15:43:02Z spupykin $ +# $Id: PKGBUILD 88345 2013-04-16 13:58:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Hybner <dta081@gmail.com> pkgname=libosip2 +epoch=1 pkgver=3.6.0 pkgrel=1 pkgdesc="oSIP is an implementation of SIP" @@ -39,6 +40,10 @@ diff -wbBur libosip2-3.1.0/src/osip2/port_sema.c libosip2-3.1.0.my/src/osip2/por EOF ./configure --prefix=/usr --disable-semaphore --enable-sysv - make + make +} + +package() { + cd $srcdir/libosip2-${pkgver/_/-}/ make DESTDIR=$pkgdir install } diff --git a/community/libtaginfo/PKGBUILD b/community/libtaginfo/PKGBUILD index ec7897ccb..841fba7b0 100644 --- a/community/libtaginfo/PKGBUILD +++ b/community/libtaginfo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 85877 2013-03-08 05:59:57Z fyan $ +# $Id: PKGBUILD 88454 2013-04-18 04:14:11Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=libtaginfo -pkgver=0.1.3 +pkgver=0.1.6 pkgrel=1 pkgdesc="Library for reading media metadata" arch=('i686' 'x86_64' 'mips64el') @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('8bbeea26697c05d346d1607401c8f1db') +md5sums=('781361a667767e8553735682d63670ca') diff --git a/community/lightdm-kde-greeter/PKGBUILD b/community/lightdm-kde-greeter/PKGBUILD index 3f05903f7..2922226ef 100755 --- a/community/lightdm-kde-greeter/PKGBUILD +++ b/community/lightdm-kde-greeter/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 86258 2013-03-14 11:40:16Z alucryd $ +# $Id: PKGBUILD 88435 2013-04-17 15:31:11Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Mladen Pejakovic <pejakm@gmail.com> # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to> pkgname=lightdm-kde-greeter -pkgver=0.3.1 -pkgrel=2 +pkgver=0.3.2.1 +pkgrel=1 pkgdesc="KDE greeter for LightDM" arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/projects/playground/base/lightdm" @@ -17,17 +17,17 @@ backup=('etc/lightdm/lightdm-kde-greeter.conf' 'etc/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf') source=("ftp://ftp.kde.org/pub/kde/unstable/${pkgname%-*}/src/${pkgname%-*}-${pkgver}.tar.bz2" 'lightdm-kde-greeter.conf') -sha256sums=('855cffaccc6500e25016e104cd593189cad9aa88ee34f237b01964fce1bcfcf9' +sha256sums=('65b2a1bab2c88bf55a07e62cbe0eb8ac3660638636c5825e5925b28d03f12188' 'a8fe10ef68d553781b91b1377106f95915c3ca14d835bd66910e08f922ef64c8') build() { cd "${srcdir}"/lightdm-${pkgver} -# Build if [[ -d build ]]; then rm -rf build fi mkdir build && cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } @@ -35,7 +35,6 @@ build() { package() { cd "${srcdir}"/lightdm-${pkgver}/build -# Install make DESTDIR="${pkgdir}" install install -dm 755 "${pkgdir}"/etc/lightdm install -m 644 ../../lightdm-kde-greeter.conf "${pkgdir}"/etc/lightdm/lightdm-kde-greeter.conf diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 2e6c5a49a..cf3540412 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87736 2013-04-05 17:29:45Z alucryd $ +# $Id: PKGBUILD 88301 2013-04-16 08:19:06Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm -pkgname=('lightdm' 'liblightdm-qt4') -pkgver=1.4.1 +pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') +pkgver=1.6.0 pkgrel=1 epoch=1 pkgdesc="A lightweight display manager" @@ -12,9 +12,9 @@ arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/lightdm" license=('GPL3' 'LGPL3') groups=('lightdm') -makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4') +makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4' 'qt5-base' 'yelp-tools') options=('!emptydirs' '!libtool') -source=("https://launchpad.net/lightdm/1.4/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz" +source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz" 'lightdm.service' 'lightdm.tmpfiles' 'lightdm.pam' @@ -23,7 +23,7 @@ source=("https://launchpad.net/lightdm/1.4/${pkgver}/+download/${pkgbase}-${pkgv 'lightdm-default-config.patch' 'lightdm-lock-screen-before-switch.patch' 'xsession') -sha256sums=('f9ca1c03c3330b6265d03048f1ebafda596c436f279b5382bda656ab3a619439' +sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419' '2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125' 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' @@ -38,6 +38,7 @@ prepare() { patch -Np1 -i ../lightdm-default-config.patch patch -Np1 -i ../lightdm-lock-screen-before-switch.patch + sed -i 's/MOC5 --qt=qt5/MOC5/' configure } build() { @@ -95,6 +96,23 @@ depends=('lightdm' 'qt4') make DESTDIR="${pkgdir}" -C liblightdm-gobject install make DESTDIR="${pkgdir}" -C liblightdm-qt install make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall + find "${pkgdir}" -type d -name *qt5* -exec rm -rf {} + + find "${pkgdir}" -type f -name *qt5* -exec rm {} + + find "${pkgdir}" -type l -name *qt5* -exec rm {} + +} + +package_liblightdm-qt5() { +pkgdesc=('LightDM Qt client library') +depends=('lightdm' 'qt5-base') + + cd "${srcdir}"/${pkgbase}-${pkgver} + + make DESTDIR="${pkgdir}" -C liblightdm-gobject install + make DESTDIR="${pkgdir}" -C liblightdm-qt install + make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall + find "${pkgdir}" -type d -name *qt[!5]* -exec rm -rf {} + + find "${pkgdir}" -type f -name *qt[!5]* -exec rm {} + + find "${pkgdir}" -type l -name *qt[!5]* -exec rm {} + } # vim: ts=2 sw=2 et: diff --git a/community/lockfile-progs/PKGBUILD b/community/lockfile-progs/PKGBUILD index d96fffe07..b307e95b2 100644 --- a/community/lockfile-progs/PKGBUILD +++ b/community/lockfile-progs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66210 2012-02-23 03:23:57Z spupykin $ +# $Id: PKGBUILD 88325 2013-04-16 13:30:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=lockfile-progs -pkgver=0.1.15 -pkgrel=2.1 +pkgver=0.1.17 +pkgrel=1 pkgdesc="programs for locking and unlocking files and mailboxes" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,15 +12,15 @@ url="http://packages.debian.org/unstable/misc/lockfile-progs" depends=('glibc') makedepends=('gcc' 'make' 'liblockfile') source=(http://ftp.debian.org/debian/pool/main/l/lockfile-progs/${pkgname}_${pkgver}.tar.gz) -md5sums=('abfcda83a1868073673f4d78066b8f8a') +md5sums=('64424a766fbc8cf6d613fcc14a096e14') build() { - cd $srcdir/sid + cd $srcdir/lockfile-progs-$pkgver make CFLAGS="-g -Wall -O2" } package() { - cd $srcdir/sid + cd $srcdir/lockfile-progs-$pkgver mkdir -p $pkgdir/usr/bin install -s bin/* $pkgdir/usr/bin mkdir -p $pkgdir/usr/share/man/man1 diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index afa9019e0..45b77f672 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87422 2013-03-31 19:18:27Z stephane $ +# $Id: PKGBUILD 88479 2013-04-18 12:55:25Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,8 +6,8 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.4.1 -pkgrel=2 +pkgver=2.4.2 +pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' @@ -64,8 +64,8 @@ package() { mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true rm -r ${pkgdir}/usr/lib64 || true } -md5sums=('2123758b166144947860b2af490996c1' +md5sums=('8c65fa1d678763dbc855b0129d1eea96' '4839fe1d638187ca3226e8267b947318' '96ab4517b48974ce0e566d9746a75a4f' 'a9529e2a6e392ffecef7a9178394c814' - 'c980ebfe46df6dc87f4b3380af69a6cc') + 'c97f3fd59bbbdd9f0f6916322d95feb4') diff --git a/community/mongodb/removeWerror.patch b/community/mongodb/removeWerror.patch index c5220cc1e..dd96084da 100644 --- a/community/mongodb/removeWerror.patch +++ b/community/mongodb/removeWerror.patch @@ -9,3 +9,13 @@ if not has_option('clang'): env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's +--- a/src/third_party/v8/SConscript 2013-04-17 03:21:23.000000000 +0800 ++++ b/src/third_party/v8/SConscript 2013-04-18 17:41:29.878618892 +0800 +@@ -47,7 +47,6 @@ + 'gcc': { + 'all': { + 'CCFLAGS': ['-Wall', +- '-Werror', + '-W', + '-Wno-unused-parameter', + '-Woverloaded-virtual', diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD index dfb8236e7..4bc67a275 100644 --- a/community/netcf/PKGBUILD +++ b/community/netcf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88091 2013-04-11 09:41:03Z spupykin $ +# $Id: PKGBUILD 88327 2013-04-16 13:30:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> pkgname=netcf -pkgver=0.2.2 -pkgrel=4 +pkgver=0.2.3 +pkgrel=1 pkgdesc="A library for configuring network interfaces" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -13,7 +13,7 @@ depends=('augeas>=0.7.4' 'netctl' 'libxslt' 'libxml2' 'libnl') makedepends=('gcc') options=(!libtool) source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz") -md5sums=('fbcd47101797b8fcd9519e22002cd200') +md5sums=('bee292470b06201b59af0fad473a1b65') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD index 7d3af5c40..eb18ee629 100644 --- a/community/ngspice/PKGBUILD +++ b/community/ngspice/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 86760 2013-03-21 22:59:23Z kkeen $ +# $Id: PKGBUILD 88376 2013-04-16 21:34:14Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: Jason Taylor <jftaylor21@gmail.com> +# Contributor: Luis Henrique <lmello.009@gmail.com> pkgname=ngspice pkgver=25 -pkgrel=1 +pkgrel=2 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.' url='http://ngspice.sourceforge.net' license=('BSD') arch=('i686' 'x86_64' 'mips64el') depends=('libxaw' 'libedit' 'gcc-libs') -source=("http://downloads.sourceforge.net/$pkgname/$pkgver/ngspice-$pkgver.tar.gz") -sha1sums=('745c3c32385b7d5c808836e393fe7699f8568860') +source=("http://downloads.sourceforge.net/project/$pkgname/ng-spice-rework/$pkgver/$pkgname-$pkgver.tar.gz" + "http://downloads.sourceforge.net/project/$pkgname/ng-spice-rework/$pkgver/$pkgname-doc-$pkgver.tar.gz") +sha1sums=('745c3c32385b7d5c808836e393fe7699f8568860' + 'db7a1de7553b4e0d454e6c99b4371677eaf130aa') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ + --with-readline=yes \ --enable-xspice \ - --with-editline=yes \ + --enable-cider \ --enable-openmp make } @@ -29,4 +33,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="$pkgdir" install install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -D -m644 "$srcdir/$pkgname-doc-$pkgver/manual.pdf" "$pkgdir/usr/share/doc/$pkgname/manual.pdf" } diff --git a/community/opencc/PKGBUILD b/community/opencc/PKGBUILD index 5b764b1d6..ff1cf4e6a 100644 --- a/community/opencc/PKGBUILD +++ b/community/opencc/PKGBUILD @@ -1,25 +1,41 @@ -# $Id: PKGBUILD 85687 2013-03-05 05:00:24Z fyan $ +# $Id: PKGBUILD 88293 2013-04-16 02:22:14Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> -pkgname=opencc -pkgver=0.4.0 -pkgrel=1 -pkgdesc="Library for Open Chinese Convert" -arch=('i686' 'x86_64' 'mips64el') +pkgbase=opencc +pkgname=(opencc opencc-doc) +pkgver=0.4.2 +pkgrel=2 url="http://code.google.com/p/opencc/" +arch=('i686' 'x86_64' 'mips64el') license=('Apache') -depends=('glibc') -makedepends=('cmake') -source=("http://opencc.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +makedepends=('cmake' 'doxygen') +source=("http://opencc.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz") build() { - cd "$srcdir/${pkgname}-${pkgver}" - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + cd "$srcdir/${pkgbase}-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCUMENTATION:BOOL=ON make } -package() { - cd "$srcdir/${pkgname}-${pkgver}" +package_opencc() { + pkgdesc="Library for Open Chinese Convert" + depends=('glibc') + + cd "$srcdir/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install + + # Remove docs - install in splitted package + rm -r "$pkgdir/usr/share/opencc/doc" } -md5sums=('00a2de2314cd28fc8631c229fb3aa894') + +package_opencc-doc() { + pkgdesc="Documentation for Library for Open Chinese Convert" + + cd "$srcdir/${pkgbase}-${pkgver}/doc" + make DESTDIR="${pkgdir}" install + + # Remove manpages - already installed in main package + rm -r "$pkgdir/usr/share/man" +} + +md5sums=('d5c001098e824dae0e3debb1b864304b') diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index 583bda8a4..fd44dc76f 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87425 2013-03-31 19:18:31Z stephane $ +# $Id: PKGBUILD 88354 2013-04-16 15:17:44Z svenstaro $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio -pkgver=1.1.8 +pkgver=1.1.9 pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) @@ -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=('2d816e0ff48f12dfc0491d39a4918456') +md5sums=('19ac43e2bf00e5b6b7f2dbc778ce9648') build() { cd "$srcdir"/$_pkgname* diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD new file mode 100644 index 000000000..77d165f5e --- /dev/null +++ b/community/opensmtpd/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 88392 2013-04-17 00:49:59Z seblu $ +# Maintainer: Sébastien Luttringer + +pkgname=opensmtpd +pkgver=5.3.1p1 +pkgrel=1 +pkgdesc='Free implementation of the server-side SMTP protocol' +arch=('i686' 'x86_64') +url='http://www.opensmtpd.org/' +license=('custom') +depends=('libevent') +provides=('smtp-server' 'smtp-forwarder') +conflicts=('smtp-server' 'smtp-forwarder') +backup=('etc/smtpd.conf' 'etc/aliases') +install=opensmtpd.install +source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz" + 'smtpd.service' + 'smtpd.socket') +md5sums=('0ee036a473f19fe27012cda0068cd287' + 'a278f272d97a9fe5a8aac784a7c98d67' + 'c2c01e9ca78df3f65efe40a7c0e17ee0') + +build() { + cd $pkgname-$pkgver + ./bootstrap + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --libexecdir=/usr/bin \ + --with-maildir=/var/spool/mail \ + --with-privsep-path=/var/empty \ + --with-sock-dir=/run \ + --with-privsep-user=mail \ + --with-filter-user=mail \ + --with-queue-user=mail \ + --with-pam + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$pkgdir" + # working directory + install -dm711 var/spool/smtpd + # license + install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service + install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket + # remove duplicate hardlink into a subfolder + rm -r usr/bin/opensmtpd + # empty aliases file + install -Dm644 /dev/null "$pkgdir/etc/aliases" + install -Dm644 /dev/null "$pkgdir/etc/virtual" + install -Dm644 /dev/null "$pkgdir/etc/secrets" + # fake sendmail binary (used to be smtp-forwarder) + # use hardlink as upstream does... + cd "$pkgdir/usr/bin" + ln smtpctl "$pkgdir/usr/bin/sendmail" + # symlink binary from usr/bin to usr/sbin (waiting /usr merge) + install -dm755 "$pkgdir/usr/sbin" + for _p in *; do + ln -s "../bin/$_p" "$pkgdir/usr/sbin/$_p" + done +} + +# vim:set ts=2 sw=2 et: diff --git a/community/opensmtpd/opensmtpd.install b/community/opensmtpd/opensmtpd.install new file mode 100644 index 000000000..0e3d8c0e1 --- /dev/null +++ b/community/opensmtpd/opensmtpd.install @@ -0,0 +1,14 @@ +# arg 1: the new package version +# arg 2: the old package version + +# arg 1: the new package version +post_install() { + makemap -t aliases /etc/aliases +} + +# arg 1: the old package version +post_remove() { + rm -f /etc/aliases.db +} + +# vim:set ts=2 sw=2 et: diff --git a/community/opensmtpd/smtpd.service b/community/opensmtpd/smtpd.service new file mode 100644 index 000000000..0ad21825c --- /dev/null +++ b/community/opensmtpd/smtpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=OpenSMTPD +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/smtpd + +[Install] +WantedBy=multi-user.target diff --git a/community/opensmtpd/smtpd.socket b/community/opensmtpd/smtpd.socket new file mode 100644 index 000000000..5d1d105cb --- /dev/null +++ b/community/opensmtpd/smtpd.socket @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSMTPD Socket + +[Socket] +ListenStream=/run/smtpd.sock + +[Install] +WantedBy=sockets.target diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD index 60a457f29..09bb1b52b 100644 --- a/community/openssh-askpass/PKGBUILD +++ b/community/openssh-askpass/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Massimiliano Torromeo <Massimiliano.Torromeo AT gmail DOT com> pkgname=openssh-askpass -pkgver=1.3.6 -pkgrel=2 +pkgver=2.0.0 +pkgrel=1 pkgdesc='A plasma-like passphrase dialog for ssh' arch=('i686' 'x86_64' 'mips64el') url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1' @@ -32,5 +32,5 @@ package() { install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" } -md5sums=('795519396f070038857cd35710e2ff85' +md5sums=('99b31e5bc2c12f91cc88869661ad92be' '961738244318f3723ba99cdcaac91a21') diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 282ac73cb..3c4679f2e 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86878 2013-03-23 23:10:37Z td123 $ +# $Id: PKGBUILD 88487 2013-04-18 14:09:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=3.9.5.rc3 -pkgrel=1 +pkgver=4.0.0.rc6 +pkgrel=2 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64' 'mips64el') url="http://www.modrails.com" @@ -14,7 +14,7 @@ makedepends=('apache') install=passenger.install options=('!emptydirs') source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) -md5sums=('60a1e0033fd2f0928607af559e2184f7') +md5sums=('2cc01a611431f4f980b65b87dbbd9e5a') build(){ cd $srcdir/passenger-release-$pkgver @@ -32,5 +32,5 @@ package() { cp -R * $pkgdir/usr/lib/passenger/ mkdir -p $pkgdir/usr/lib/httpd/modules - ln -sf /usr/lib/passenger/ext/apache2/mod_passenger.so $pkgdir/usr/lib/httpd/modules/mod_passenger.so + ln -sf /usr/lib/passenger/libout/apache2/mod_passenger.so $pkgdir/usr/lib/httpd/modules/mod_passenger.so } diff --git a/community/pax-utils/PKGBUILD b/community/pax-utils/PKGBUILD index c8755a098..5b1e447da 100644 --- a/community/pax-utils/PKGBUILD +++ b/community/pax-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79825 2012-11-13 13:54:15Z tredaelli $ +# $Id: PKGBUILD 88483 2013-04-18 13:24:39Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: sh0 <mee@sh0.org> # Contributor: Maxwel <msg.maxwel@gmail.com> pkgname=pax-utils -pkgver=0.5 +pkgver=0.7 pkgrel=1 pkgdesc='ELF related utils for ELF 32/64 binaries that can check files for security relevant properties' url='http://hardened.gentoo.org/pax-utils.xml' @@ -13,7 +13,7 @@ license=('GPL') depends=('bash' 'libcap') checkdepends=('python') source=("http://distfiles.gentoo.org/distfiles/${pkgname}-${pkgver}.tar.xz") -sha256sums=('1ba4f5e8680449c18841db2397aca320527fb06628b4ad9212e42f5e01de833b') +sha256sums=('1ac4cee9a9ca97a723505eb29a25e50adeccffba3f0f0ef4f035cf082caf3b84') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD index dfedd37cb..49097474e 100644 --- a/community/perl-dbd-odbc/PKGBUILD +++ b/community/perl-dbd-odbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82878 2013-01-25 09:55:32Z spupykin $ +# $Id: PKGBUILD 88252 2013-04-15 10:48:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-odbc -pkgver=1.41 +pkgver=1.43 pkgrel=1 pkgdesc="ODBC Driver for DBI" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('perl-dbi' 'perl' 'unixodbc') options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz") -md5sums=('94bce7246d69df1ea5b2f8a702f35554') +md5sums=('35e37488170b5111f826226c4d466961') build() { cd DBD-ODBC-${pkgver} diff --git a/community/perl-dbd-sqlite2/PKGBUILD b/community/perl-dbd-sqlite2/PKGBUILD index 3bd4df7bc..67ca8b084 100644 --- a/community/perl-dbd-sqlite2/PKGBUILD +++ b/community/perl-dbd-sqlite2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 71771 2012-06-02 10:30:10Z bluewind $ +# $Id: PKGBUILD 88254 2013-04-15 10:48:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-dbd-sqlite2 -pkgver=0.33 -pkgrel=9 +pkgver=0.36 +pkgrel=1 pkgdesc="Perl/CPAN Module DBD::SQLite2" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/DBD-SQLite2" license=("GPL" "PerlArtistic") depends=("perl-dbi") -source=("http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite2-${pkgver}.tar.gz") -md5sums=('babd83fd5eb9ba7560ad4bab4c76c0eb') +source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/DBD-SQLite2-$pkgver.tar.gz") +md5sums=('221b30e630c72613d1fb5663db048a71') build() { cd DBD-SQLite2-${pkgver} diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD index d85c095d3..5c5482b10 100644 --- a/community/perl-dbd-sybase/PKGBUILD +++ b/community/perl-dbd-sybase/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71773 2012-06-02 10:30:14Z bluewind $ +# $Id: PKGBUILD 88257 2013-04-15 10:48:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-dbd-sybase -pkgver=1.14 -pkgrel=2 +pkgver=1.15 +pkgrel=1 pkgdesc="Sybase Driver for DBI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DBD-Sybase/" @@ -11,7 +11,7 @@ license=('GPL' 'PerlArtistic') depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds') options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-${pkgver}.tar.gz") -md5sums=('db6662d710b3adffe37bd8aec8060eda') +md5sums=('d76f09f9a25896fd879ef89a98748708') build() { cd $srcdir/DBD-Sybase-${pkgver} diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index bc02dca18..c307bfc87 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87459 2013-04-01 05:10:16Z fyan $ +# $Id: PKGBUILD 88464 2013-04-18 10:48:26Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq pkgver=0.1d _pkgver=0.1-d -pkgrel=1 +pkgrel=2 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/xiehuc/pidgin-lwqq" @@ -19,18 +19,13 @@ source=("https://github.com/xiehuc/$pkgname/archive/${_pkgver}.tar.gz") build() { cd "${srcdir}/$pkgname-${_pkgver}" - - rm -rf build - mkdir build - cd build - - cmake -DCMAKE_INSTALL_PREFIX=/usr .. + cmake -DCMAKE_INSTALL_PREFIX=/usr . make } package() { - cd "$srcdir/$pkgname-${_pkgver}/build" + cd "$srcdir/$pkgname-${_pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('b638e5132bbacdc84d951f7b0f66d2fd') +md5sums=('5ec83a5a3328dac2ded431bcd7c5c034') diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index d406f0846..8c93df3e5 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83582 2013-02-03 13:24:28Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 88368 2013-04-16 19:57:49Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd -pkgver=1.9.2 -pkgrel=2 +pkgver=1.9.3 +pkgrel=1 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' license=('custom') @@ -14,8 +14,8 @@ arch=('i686' 'x86_64' 'mips64el') backup=('etc/radvd.conf') source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" "$pkgname.service") -sha1sums=('5bc39b7bec0d73ffa443634c340e75b54867766c' - '9cb6b2eaaf445fe8d17dfc50fde15709d4de7d1d') +sha1sums=('14b025bdcec77ea7278cd8ee2a32af3f81d26f4d' + 'f1e97885117b5ee2a533916624fa4297ce66e418') build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --with-pidfile=/run/radvd.pid \ diff --git a/community/radvd/radvd.service b/community/radvd/radvd.service index f6f5ad67e..92685d73b 100644 --- a/community/radvd/radvd.service +++ b/community/radvd/radvd.service @@ -1,5 +1,6 @@ [Unit] Description=IPv6 Router Advertisement Daemon +After=network.target [Service] ExecStart=/usr/sbin/radvd --nodaemon --logmethod=stderr diff --git a/community/ratpoison/PKGBUILD b/community/ratpoison/PKGBUILD index b14b1b78e..b98d4f66f 100644 --- a/community/ratpoison/PKGBUILD +++ b/community/ratpoison/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 83180 2013-01-27 16:26:22Z pierre $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 88374 2013-04-16 20:26:08Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: juergen <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=ratpoison -pkgver=1.4.5 -pkgrel=5 +pkgver=1.4.6 +pkgrel=1 pkgdesc="A simple keystroke-driven window manager" arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +15,7 @@ url="http://www.nongnu.org/ratpoison/" install="${pkgname}.install" source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz" "${pkgname}.desktop") -md5sums=('330a08dbed6be88cab54f6947e9f0b60' +md5sums=('5fbaab737cf7fcc8e5eb2d619aaa0eab' '29c3cb9be59758e39d8471391231a74a') build() { @@ -29,20 +30,20 @@ package() { make DESTDIR="${pkgdir}" install # fix permissions - chmod a+x ${pkgdir}/usr/share/ratpoison/{allwindows.sh,clickframe.pl,rpshowall.sh,rpws,split.sh} + chmod a+x "${pkgdir}/usr/share/ratpoison/"{allwindows.sh,clickframe.pl,rpshowall.sh,rpws,split.sh} # Not useful outside the source tree. Kill it - rm ${pkgdir}/usr/share/ratpoison/genrpbindings + rm "${pkgdir}/usr/share/ratpoison/genrpbindings" cd contrib ./genrpbindings - install -dm755 ${pkgdir}/usr/share/ratpoison/bindings + install -dm755 "${pkgdir}/usr/share/ratpoison/bindings" install -m644 {Ratpoison.pm,ratpoison-cmd.el,ratpoison.rb,ratpoison.lisp,ratpoison.py} \ - ${pkgdir}/usr/share/ratpoison/bindings/ + "${pkgdir}/usr/share/ratpoison/bindings/" - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/etc/X11/sessions/${pkgname}.desktop + install -Dm644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/etc/X11/sessions/${pkgname}.desktop" - install -Dm644 ${pkgdir}/usr/share/ratpoison/ratpoison.el \ - ${pkgdir}/usr/share/emacs/site-lisp/ratpoison.el + install -Dm644 "${pkgdir}/usr/share/ratpoison/ratpoison.el" \ + "${pkgdir}/usr/share/emacs/site-lisp/ratpoison.el" } diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index ae9ddc776..9025408c6 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85408 2013-03-01 10:39:48Z andrea $ +# $Id: PKGBUILD 88329 2013-04-16 13:30:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.18.1 -pkgrel=3 +pkgver=1.18.2 +pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64' 'mips64el') url="http://www.lesbonscomptes.com/recoll/" @@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('f0e4ba8fc988d67a92e15f6283a485a4') +md5sums=('fee17c0edbe9199ae7662f6ec46eda07') build() { cd "$srcdir/$pkgname-$pkgver" @@ -47,7 +47,7 @@ build() { sed -i '1,1i#include <unistd.h>' utils/rclionice.cpp - ./configure \ + QMAKE=qmake-qt4 ./configure \ --prefix=/usr \ --mandir=/usr/share/man make diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 29f85909d..aa558a490 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 72814 2012-06-22 18:59:49Z ttopper $ +# $Id: PKGBUILD 88305 2013-04-16 12:29:33Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm -pkgver=2.6.5 +pkgver=2.7.1 pkgrel=1 -pkgdesc="Tabbed, VTE-based terminal emulator" +pkgdesc='Tabbed, VTE-based terminal emulator' arch=('i686' 'x86_64' 'mips64el') -url="http://roxterm.sourceforge.net/" +url='http://roxterm.sourceforge.net/' license=('GPL3') -depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm') +depends=('dbus-glib' 'vte3' 'hicolor-icon-theme') makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg') install=roxterm.install source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2") -sha1sums=('1c0062abe7c133cf606f2f12013bad5a991b33a8') -md5sums=('c95d9a74f342573bce71a19b50d46832') +md5sums=('97b33c75fbded13d99ecdc1452ec6d0b') +sha1sums=('3fb4012d5b5283cb740962cd295cdfd5c6c0044d') build() { cd "${srcdir}/roxterm-${pkgver}" - python2 mscript.py configure --prefix="/usr" + python2 mscript.py configure --prefix='/usr' python2 mscript.py build } diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 60a01ecbc..7107202c1 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87797 2013-04-06 18:59:06Z giovanni $ +# $Id: PKGBUILD 88284 2013-04-15 17:29:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.7.1 -pkgrel=3 +pkgver=0.7.2 +pkgrel=1 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64') url="http://code.google.com/p/sigil/" @@ -13,7 +13,7 @@ depends=('qt5-webkit' 'boost-libs') makedepends=('qt5-tools' 'qt5-svg' 'cmake' 'gendesk' 'boost') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip") -md5sums=('e6c281b6702a8f9d79cc85703dc8d3ea') +md5sums=('540745983db57a2150cc2f4057455b19') build() { cd "${srcdir}" diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 53e40af15..9e63cf082 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 87868 2013-04-08 10:05:32Z spupykin $ +# $Id: PKGBUILD 88474 2013-04-18 12:16:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=squid -pkgver=3.3.2 -pkgrel=2 +pkgver=3.3.3 +pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686' 'mips64el') url='http://www.squid-cache.org' @@ -24,7 +24,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('fedbad5be528bcf3e632538b11e0cc19' +md5sums=('20f63ab34eae93b36969c9c7519f6462' 'e90895ce22c0b618c89a46a9a181fe6c' '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' diff --git a/community/t1utils/PKGBUILD b/community/t1utils/PKGBUILD index 2dd3f9a20..3426c0c6e 100644 --- a/community/t1utils/PKGBUILD +++ b/community/t1utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65395 2012-02-21 03:23:56Z spupykin $ +# $Id: PKGBUILD 88333 2013-04-16 13:31:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Simo Leone <neotuli@gmail.com> pkgname=t1utils -pkgver=1.36 -pkgrel=2 +pkgver=1.37 +pkgrel=1 pkgdesc="A collection of simple Type 1 font manipulation programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.lcdf.org/~eddietwo/type/#t1utils" @@ -12,13 +12,17 @@ license=("custom") depends=('glibc') source=("http://www.lcdf.org/~eddietwo/type/$pkgname-$pkgver.tar.gz" LICENSE) -md5sums=('f580e78a38807bce0242b63b5da3a572' +md5sums=('dcff07df0b334c06d1808530956a634e' '5a1334c824d21f0314c831f9fd19a587') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD index a2b1bf057..f5b6c0477 100644 --- a/community/unifdef/PKGBUILD +++ b/community/unifdef/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 83684 2013-02-04 11:06:31Z spupykin $ +# $Id: PKGBUILD 88335 2013-04-16 13:31:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=unifdef -pkgver=2.6 -pkgrel=3 +pkgver=2.7 +pkgrel=1 pkgdesc="Remove #ifdef'ed lines" arch=(i686 x86_64 'mips64el') url="http://dotat.at/prog/unifdef/" license=('GPL') depends=() source=("http://dotat.at/prog/unifdef/unifdef-$pkgver.tar.gz") -md5sums=('18b832baea2c7b6b00bd7d4f3db38f62') +md5sums=('72357e9faa877fe21f5d621d2024a242') build() { cd "$srcdir/$pkgname-$pkgver" make clean make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 install -m 0755 unifdef $pkgdir/usr/bin/ install -m 0644 unifdef.1 $pkgdir/usr/share/man/man1/ diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD index a1433e81b..d482a3e4b 100644 --- a/community/uriparser/PKGBUILD +++ b/community/uriparser/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 65355 2012-02-21 02:18:49Z spupykin $ +# $Id: PKGBUILD 88337 2013-04-16 13:32:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> pkgname=uriparser -pkgver=0.7.5 -pkgrel=2 +pkgver=0.7.7 +pkgrel=1 pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode" url="http://sourceforge.net/projects/uriparser/" -depends=(glibc) -makedepends=(doxygen) +depends=() +makedepends=(doxygen graphviz) arch=('i686' 'x86_64' 'mips64el') license=("custom") source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2) -md5sums=('4f4349085fe5de33bcae8d0f26649593') +md5sums=('2da950ef006be5a842dcc383cbbeaa78') build() { cd ${srcdir}/$pkgname-$pkgver [ -f Makefile ] || ./configure --prefix=/usr --disable-test - ln -s ${srcdir}/$pkgname-$pkgver/doc/Doxyfile.in ${srcdir}/$pkgname-$pkgver/doc/Doxyfile sed -i 's|{css,gif,html,png}|{css,html,png}|' doc/Makefile make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver make DESTDIR=$pkgdir install install -D -m644 "${srcdir}/$pkgname-$pkgver/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD index 50acdd99b..f02066c16 100644 --- a/community/virtviewer/PKGBUILD +++ b/community/virtviewer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76592 2012-09-24 09:59:33Z spupykin $ +# $Id: PKGBUILD 88339 2013-04-16 13:32:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <archaur at jonw dot org> pkgname=virtviewer -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS." depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt') @@ -12,11 +12,15 @@ url="http://virt-manager.et.redhat.com" arch=('i686' 'x86_64' 'mips64el') license=('GPL') source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz") -md5sums=('43c269da571e65b12421b6fc9f871e98') +md5sums=('a5516d33a29df5d135611c4667c03f77') build() { cd $srcdir/virt-viewer-$pkgver ./configure --prefix=/usr make +} + +package() { + cd $srcdir/virt-viewer-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/wdm/PKGBUILD b/community/wdm/PKGBUILD index d1f70cf68..99f741fd0 100644 --- a/community/wdm/PKGBUILD +++ b/community/wdm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65381 2012-02-21 02:29:21Z spupykin $ +# $Id: PKGBUILD 88268 2013-04-15 11:14:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: eric <eric@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> @@ -20,6 +20,10 @@ build() { --sysconfdir=/etc/wdm --with-wdmdir=/etc/wdm --mandir=/usr/share/man \ --with-fakehome=/var/empty make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install # used /etc/pam.d/xscreensaver as an example # diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index c0f56bf36..0bae3a41b 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -2,16 +2,17 @@ # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=weston -pkgver=1.0.6 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64') url='http://wayland.freedesktop.org' license=('MIT') options=(!libtool) -depends=('libxkbcommon' 'wayland' 'mesa' 'cairo' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'xkeyboard-config') +depends=('libxkbcommon' 'libunwind' 'wayland' 'mesa' 'cairo' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' + 'pango' 'xkeyboard-config') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('d39d487317ededb9d66365bc1402ee0bc5e20dd0') +sha1sums=('0929afa86d795e0e970936623d86bdd950d48e8d') build() { cd $pkgname-$pkgver @@ -28,8 +29,11 @@ package() { # license install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" # embed more clients - for _c in clickdot cliptest dnd editor eventdemo flower gears image \ - keyboard resizor simple-egl simple-shm smoke view; do + for _c in calibrator clickdot cliptest dnd editor eventdemo flower gears image \ + resizor simple-egl simple-shm simple-touch smoke transformed view; do install -Dm755 "clients/$_c" "$pkgdir/usr/bin/weston-$_c" done + for _c in info keyboard screensaver screenshooter tablet-shell terminal; do + install -Dm755 "clients/weston-$_c" "$pkgdir/usr/bin/weston-$_c" + done } diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index 733de3d22..50b9ce992 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81613 2012-12-25 00:34:18Z foutrelis $ +# $Id: PKGBUILD 88341 2013-04-16 13:32:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Giovanni Scafora <linuxmania@gmail.com> # Contributor: simo <simo@archlinux.org> pkgname=xcircuit -pkgver=3.7.26 -pkgrel=3.1 +pkgver=3.7.48 +pkgrel=1 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64' 'mips64el') url="http://opencircuitdesign.com/xcircuit" @@ -13,12 +13,16 @@ license=('GPL2') depends=('tk' 'libxpm' 'zlib') makedepends=('chrpath') source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz) -md5sums=('6026f65a4bc327e5769157ffd1387342') +md5sums=('efe537f908b12d30ef1aeebf77222fbf') build() { cd $srcdir/$pkgname-$pkgver - ./configure prefix=/usr --build=$CHOST --with-tcl=/usr/lib --with-tk=/usr/lib --mandir=/usr/share/man + ./configure --prefix=/usr --build=$CHOST --with-tcl=/usr/lib --with-tk=/usr/lib --mandir=/usr/share/man make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install mkdir -p $pkgdir/usr/share/man/man1 mv $pkgdir/usr/lib/xcircuit-3.7/man/* $pkgdir/usr/share/man/man1/ diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index ba33064bd..99406a5bc 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 80569 2012-11-25 17:22:16Z spupykin $ +# $Id: PKGBUILD 88423 2013-04-17 12:42:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=xlockmore -pkgver=5.41 +pkgver=5.42 pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64 'mips64el') license=('BSD') depends=(freetype2 gtk2 libxpm lesstif pam libxmu glu) +optdepends=('fortune-mod') makedepends=(mesa) url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 LICENSE) -md5sums=('a9af1cc72f0fd096ba4bba9097f9291c' +md5sums=('de1dc31f686178703659fbb46d638518' 'a64afab4283f53972a6702c2e59850d7') build() { @@ -23,6 +24,11 @@ build() { --enable-appdefaultdir=/usr/share/X11/app-defaults \ --enable-pam --with-gtk2 --without-esound --without-ftgl make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make xapploaddir=$pkgdir/usr/share/X11/app-defaults \ mandir=$pkgdir/usr/man/man1 \ prefix=$pkgdir/usr install diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD index 298bc0a9a..81f912cbd 100644 --- a/community/xnee/PKGBUILD +++ b/community/xnee/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 82003 2013-01-05 15:43:50Z jlichtblau $ +# $Id: PKGBUILD 88303 2013-04-16 10:25:07Z bgyorgy $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=xnee pkgver=3.15 -pkgrel=1 +pkgrel=2 pkgdesc="A program to record, distribute, and replay X (X11) protocol data" arch=('i686' 'x86_64' 'mips64el') url="http://www.sandklef.com/xnee/" license=('GPL3') -depends=('gtk2' 'libgnomeui' 'libxtst') +depends=('gtk2' 'libxtst') makedepends=('texinfo') +optdepends=('xosd: feedback support') options=('!libtool' '!emptydirs') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('56e0b1cca36ebf95b6f7c82c7028ab8a9b5003728ca1044016031b489bc3e8cd') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz + gnee.desktop) +sha256sums=('56e0b1cca36ebf95b6f7c82c7028ab8a9b5003728ca1044016031b489bc3e8cd' + 'de42d419a46083e39a9b6d60c045c1cd68deb793cc5166a86df81dff608387c1') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --disable-gnome-applet + ./configure --prefix=/usr --enable-gui --enable-lib --disable-static --disable-static-programs make } @@ -26,4 +29,5 @@ package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install + install -Dm644 ${srcdir}/gnee.desktop ${pkgdir}/usr/share/applications/gnee.desktop } diff --git a/community/xnee/gnee.desktop b/community/xnee/gnee.desktop new file mode 100644 index 000000000..c96850599 --- /dev/null +++ b/community/xnee/gnee.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Gnee +GenericName=X11 Recorder +Comment=For replay action under X11 environment +Exec=gnee +Icon=/usr/share/pixmaps/xnee.png +Terminal=false +Type=Application +Categories=Utility; diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog index b93cdf5b5..b10864c83 100644 --- a/community/xnee/xnee.changelog +++ b/community/xnee/xnee.changelog @@ -1,3 +1,8 @@ +2013-04-16 Balló György <ballogyor+arch at gmail dot com> + * fix dependencies + * enable GUI and library + * add .desktop file + 2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * xnee 3.15-1 diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index 8d21f88d8..a678f7548 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173327 2012-12-19 01:16:33Z allan $ +# $Id: PKGBUILD 183046 2013-04-17 02:02:01Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison -pkgver=2.7 -pkgrel=1.1 +pkgver=2.7.1 +pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('234cdfac99257cf99ac4a03c898f37b9' - '853204af1f9a5602d84989b4852e317e') +md5sums=('7be02eb973eccf388f1ae750fc09eed0' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch b/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch deleted file mode 100644 index aaedc27c6..000000000 --- a/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch +++ /dev/null @@ -1,39 +0,0 @@ -From da3fc1ee91de656a30f3a12de394bcba55119872 Mon Sep 17 00:00:00 2001 -From: Linus Nielsen Feltzing <linus@haxx.se> -Date: Sun, 10 Feb 2013 22:57:58 +0100 -Subject: [PATCH] Fix NULL pointer reference when closing an unused multi - handle. - ---- - lib/multi.c | 8 +++++--- - tests/data/Makefile.am | 1 + - tests/data/test1508 | 31 +++++++++++++++++++++++++++++ - tests/libtest/Makefile.inc | 6 +++++- - tests/libtest/lib1508.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 91 insertions(+), 4 deletions(-) - create mode 100644 tests/data/test1508 - create mode 100644 tests/libtest/lib1508.c - -diff --git a/lib/multi.c b/lib/multi.c -index fa0afb9..706df23 100644 ---- a/lib/multi.c -+++ b/lib/multi.c -@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle) - /* Close all the connections in the connection cache */ - close_all_connections(multi); - -- multi->closure_handle->dns.hostcache = multi->hostcache; -- Curl_hostcache_clean(multi->closure_handle); -+ if(multi->closure_handle) { -+ multi->closure_handle->dns.hostcache = multi->hostcache; -+ Curl_hostcache_clean(multi->closure_handle); - -- Curl_close(multi->closure_handle); -+ Curl_close(multi->closure_handle); -+ } - multi->closure_handle = NULL; - - Curl_hash_destroy(multi->sockhash); --- -1.8.1.3 - diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 87f4208bd..a8089f496 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177958 2013-02-12 13:57:28Z dreisner $ +# $Id: PKGBUILD 182802 2013-04-15 12:46:55Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.29.0 -pkgrel=2 +pkgver=7.30.0 +pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" @@ -15,30 +15,14 @@ license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch curlbuild.h) -md5sums=('4f57d3b4a3963038bd5e04dbff385390' - '6283fbb36933cf8720acc34c43169f1d' - '5bfd1899e8b19cfdd78774f6337f8b47' +md5sums=('60bb6ff558415b73ba2f00163fd307c5' + 'SKIP' '751bd433ede935c8fae727377625a8ae') -ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') -case $ptrsize in - 8) _curlbuild=curlbuild-64.h ;; - 4) _curlbuild=curlbuild-32.h ;; - *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" - exit 1 - ;; -esac - build() { cd "$pkgname-$pkgver" - # We have the same CFLAGS as Arch, this should be fixed upstream. - sed -i 's/xc_bad_var_cflags=yes/xc_bad_var_cflags=no/' configure - - patch -Np1 <"$srcdir/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch" - ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -61,6 +45,15 @@ package() { make DESTDIR="$pkgdir" install + local ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') + case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; + esac + # license install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD index 276116661..bd0571dfa 100644 --- a/core/expat/PKGBUILD +++ b/core/expat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156201 2012-04-16 03:41:12Z allan $ +# $Id: PKGBUILD 183047 2013-04-17 02:02:02Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=expat pkgver=2.1.0 -pkgrel=1.1 +pkgrel=2 pkgdesc="An XML parser library" arch=('i686' 'x86_64' 'mips64el') url="http://expat.sourceforge.net/" @@ -16,7 +16,7 @@ md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr #--mandir=/usr/share/man make } diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index ea2135b2a..4e3f60f67 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181166 2013-04-02 06:48:56Z allan $ +# $Id: PKGBUILD 182769 2013-04-15 01:13:43Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -10,19 +10,19 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi pkgver=4.8.0 -pkgrel=1 -#_snapshot=4.7-20120721 +pkgrel=2 +_snapshot=4.8-20130411 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen') [[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada') -checkdepends=('dejagnu') +checkdepends=('dejagnu' 'inetutils') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 -md5sums=('e6040024eb9e761c3bea348d1fa5abb0') +source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2) + #ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 +md5sums=('cb529205469260f0d56adc01088c4850') if [ -n "${_snapshot}" ]; then _basedir=gcc-${_snapshot} @@ -30,7 +30,7 @@ else _basedir=gcc-${pkgver} fi -build() { +prepare() { cd ${srcdir}/${_basedir} # Do not run fixincludes @@ -42,14 +42,20 @@ build() { echo ${pkgver} > gcc/BASE-VER + # hack! - some configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + + mkdir ${srcdir}/gcc-build +} + +build() { + cd ${srcdir}/gcc-build + # using -pipe causes spurious test-suite failures # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 CFLAGS=${CFLAGS/-pipe/} CXXFLAGS=${CXXFLAGS/-pipe/} - cd ${srcdir} - mkdir gcc-build && cd gcc-build - # Use our CFLAGS, CXXFLAGS and LDFLAGS for the binaries built. export BOOT_CFLAGS="$CFLAGS" export CFLAGS_FOR_BUILD="$CFLAGS" @@ -157,20 +163,17 @@ package_gcc() mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py # unfortunately it is much, much easier to install the lot and clean-up the mess... - # -f makes rm return 0 if the archive doesn't exist rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} rm -f $pkgdir/usr/lib/*.so* - rm -f $pkgdir/usr/lib/lib{atomic,ffi,gfortran,go{,begin},iberty,objc}.a + rm -f $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a rm -f $pkgdir/usr/lib/libgfortran.spec - rm -fr $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/ffi{,target}.h + rm -rf $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a - rm -fr $pkgdir/usr/lib/go - rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libffi,libgomp,libquadmath,libitm}.info + rm -rf $pkgdir/usr/lib/go + rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm -f $pkgdir/usr/share/man/man3/ffi* # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index 5d8cc3348..9e0f895ea 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,22 +1,19 @@ -# $Id: PKGBUILD 170033 2012-10-31 05:23:26Z eric $ +# $Id: PKGBUILD 182863 2013-04-15 21:02:26Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpm pkgver=1.20.7 -pkgrel=1.1 +pkgrel=2 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64' 'mips64el') url="http://www.nico.schottelius.org/software/gpm/" license=('GPL') depends=('ncurses' 'bash') -backup=('etc/conf.d/gpm') options=('!makeflags') install=gpm.install source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \ - gpm gpm.conf.d gpm.sh gpm.service) + gpm.sh gpm.service) sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369' - '19e1feb1493373512a77801699df012d186336ea' - '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' '88fe5ff10916c68a87abc8418a56eb0073f69fa9' '20b92360f0ad38a2032fcae37bdbd01b31e43f77') @@ -30,8 +27,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm" - install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm" install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh" install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service" diff --git a/core/gpm/gpm b/core/gpm/gpm deleted file mode 100755 index 7b5213dd7..000000000 --- a/core/gpm/gpm +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -GPM_ARGS= -[ -f /etc/conf.d/gpm ] && . /etc/conf.d/gpm - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/sbin/gpm) -case "$1" in - start) - stat_busy "Starting GPM Daemon" - [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS} - PID=$(pidof -o %PPID /usr/sbin/gpm) - if [ -z "$PID" ]; then - stat_fail - else - add_daemon gpm - stat_done - fi - ;; - stop) - stat_busy "Stopping GPM Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gpm - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/gpm/gpm.conf.d b/core/gpm/gpm.conf.d deleted file mode 100644 index ab43bb7eb..000000000 --- a/core/gpm/gpm.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to gpm -# -GPM_ARGS="-m /dev/input/mice -t imps2" diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD index 6d6721b47..3a94e7e06 100644 --- a/core/isl/PKGBUILD +++ b/core/isl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182142 2013-04-08 05:56:24Z allan $ +# $Id: PKGBUILD 182768 2013-04-15 01:13:42Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=isl -pkgver=0.11.1 -pkgrel=2 +pkgver=0.11.2 +pkgrel=1 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64' 'mips64el') url="http://www.kotnet.org/~skimo/isl/" @@ -11,7 +11,7 @@ depends=('gmp') license=('MIT') options=('!libtool') source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('bce1586384d8635a76d2f017fb067cd2') +md5sums=('c40daa17d2995d1c98a0c1aca607541f') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,7 +29,7 @@ package() { make -j1 DESTDIR="$pkgdir/" install install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ - mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.1.1-gdb.py + mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.1.2-gdb.py install -Dm644 LICENSE $pkgdir/usr/share/licenses/isl/LICENSE } diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index e76d9c5d3..a90ed343b 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179909 2013-03-11 19:50:37Z stephane $ +# $Id: PKGBUILD 183174 2013-04-18 12:38:02Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 -pkgver=1.11.1 +pkgver=1.11.2 pkgrel=1 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si krb5-kpropd.service krb5-kpropd@.service krb5-kpropd.socket) -sha1sums=('e2e759c35e775d8f03b75c26ffcaa4f2514147f5' +sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250' '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' diff --git a/core/krb5/krb5-kadmind b/core/krb5/krb5-kadmind new file mode 100644 index 000000000..04df0dcff --- /dev/null +++ b/core/krb5/krb5-kadmind @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kadmind` +case "$1" in + start) + stat_busy "Starting Kerberos Admin Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kadmind + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kadmind + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Admin Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kadmind + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/core/krb5/krb5-kadmind.service b/core/krb5/krb5-kadmind.service new file mode 100644 index 000000000..f3836c898 --- /dev/null +++ b/core/krb5/krb5-kadmind.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 administration server + +[Service] +ExecStart=/usr/sbin/kadmind -nofork + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/krb5-kdc b/core/krb5/krb5-kdc new file mode 100644 index 000000000..05a03411e --- /dev/null +++ b/core/krb5/krb5-kdc @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/krb5kdc` +case "$1" in + start) + stat_busy "Starting Kerberos Authentication" + if [ -z "$PID" ]; then + /usr/sbin/krb5kdc + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kdc + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Authentication" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kdc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/core/krb5/krb5-kdc.service b/core/krb5/krb5-kdc.service new file mode 100644 index 000000000..6ec93bb72 --- /dev/null +++ b/core/krb5/krb5-kdc.service @@ -0,0 +1,9 @@ +[Unit] +Description=Kerberos 5 KDC + +[Service] +ExecStart=/usr/sbin/krb5kdc -n +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/krb5-kpropd b/core/krb5/krb5-kpropd new file mode 100644 index 000000000..a0077d68e --- /dev/null +++ b/core/krb5/krb5-kpropd @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kpropd` +case "$1" in + start) + stat_busy "Starting Kerberos Database Propagation Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kpropd -S + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon kpropd + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Database Propagation Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kpropd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/core/krb5/krb5-kpropd.service b/core/krb5/krb5-kpropd.service new file mode 100644 index 000000000..a7c5b579d --- /dev/null +++ b/core/krb5/krb5-kpropd.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 propagation server + +[Service] +ExecStart=/usr/sbin/kpropd -S + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/krb5-kpropd.socket b/core/krb5/krb5-kpropd.socket new file mode 100644 index 000000000..4389290c0 --- /dev/null +++ b/core/krb5/krb5-kpropd.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Kerberos 5 propagation server + +[Socket] +ListenStream=754 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/core/krb5/krb5-kpropd@.service b/core/krb5/krb5-kpropd@.service new file mode 100644 index 000000000..46f7e3639 --- /dev/null +++ b/core/krb5/krb5-kpropd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 propagation server +Conflicts=krb5-kpropd.service + +[Service] +ExecStart=/usr/sbin/kpropd +StandardInput=socket +StandardError=syslog diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD index 860958c53..d4a9da421 100644 --- a/core/m4/PKGBUILD +++ b/core/m4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142068 2011-11-04 23:36:00Z allan $ +# $Id: PKGBUILD 183048 2013-04-17 02:02:03Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=m4 pkgver=1.4.16 -pkgrel=2.2 +pkgrel=3 pkgdesc="The GNU macro processor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/m4" @@ -16,14 +16,21 @@ source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig} m4-1.4.16-readlink-einval.patch gnulib-no-gets.patch) md5sums=('7548ec061a1ba993790159764f522d0e' - 'eebe5c94e74e7551e2e30c5844f1b653' - 'cea138fa9b568d06e46269611cec8dd0' - '9593407bef0afdca88c76a2959d6596f') + 'SKIP' + 'cea138fa9b568d06e46269611cec8dd0') -build() { +prepare() { cd ${srcdir}/$pkgname-$pkgver + + # glibc-2.16 compatibility + sed -i -e '/gets is a/d' lib/stdio.in.h + + # patch testsuite failure with newer kernels patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch - patch -p1 -i "$srcdir/gnulib-no-gets.patch" +} + +build() { + cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr make } diff --git a/core/m4/m4.install b/core/m4/m4.install index be4138170..523d39bd6 100644 --- a/core/m4/m4.install +++ b/core/m4/m4.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(m4.info m4.info-1 m4.info-2) +filelist=('m4.info' 'm4.info-1' 'm4.info-2') post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/core/perl/CVE-2012-6329.patch b/core/perl/CVE-2012-6329.patch new file mode 100644 index 000000000..5f59e03c1 --- /dev/null +++ b/core/perl/CVE-2012-6329.patch @@ -0,0 +1,79 @@ +commit 1735f6f53ca19f99c6e9e39496c486af323ba6a8 +Author: Brian Carlson <brian.carlson@cpanel.net> +Date: Wed Nov 28 08:54:33 2012 -0500 + + Fix misparsing of maketext strings. + + Case 61251: This commit fixes a misparse of maketext strings that could + lead to arbitrary code execution. Basically, maketext was compiling + bracket notation into functions, but neglected to escape backslashes + inside the content or die on fully-qualified method names when + generating the code. This change escapes all such backslashes and dies + when a method name with a colon or apostrophe is specified. +--- + AUTHORS | 1 + + dist/Locale-Maketext/lib/Locale/Maketext.pm | 24 ++++++++---------------- + 2 files changed, 9 insertions(+), 16 deletions(-) + +diff --git a/AUTHORS b/AUTHORS +index 70734b0..009dea0 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -154,6 +154,7 @@ Breno G. de Oliveira <garu@cpan.org> + Brent Dax <brentdax@cpan.org> + Brooks D Boyd + Brian Callaghan <callagh@itginc.com> ++Brian Carlson <brian.carlson@cpanel.net> + Brian Clarke <clarke@appliedmeta.com> + brian d foy <brian.d.foy@gmail.com> + Brian Fraser <fraserbn@gmail.com> +diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm +index 4822027..63e5fba 100644 +--- a/dist/Locale-Maketext/lib/Locale/Maketext.pm ++++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm +@@ -625,21 +625,9 @@ sub _compile { + # 0-length method name means to just interpolate: + push @code, ' ('; + } +- elsif($m =~ /^\w+(?:\:\:\w+)*$/s +- and $m !~ m/(?:^|\:)\d/s +- # exclude starting a (sub)package or symbol with a digit ++ elsif($m =~ /^\w+$/s ++ # exclude anything fancy, especially fully-qualified module names + ) { +- # Yes, it even supports the demented (and undocumented?) +- # $obj->Foo::bar(...) syntax. +- $target->_die_pointing( +- $string_to_compile, q{Can't use "SUPER::" in a bracket-group method}, +- 2 + length($c[-1]) +- ) +- if $m =~ m/^SUPER::/s; +- # Because for SUPER:: to work, we'd have to compile this into +- # the right package, and that seems just not worth the bother, +- # unless someone convinces me otherwise. +- + push @code, ' $_[0]->' . $m . '('; + } + else { +@@ -693,7 +681,9 @@ sub _compile { + elsif(substr($1,0,1) ne '~') { + # it's stuff not containing "~" or "[" or "]" + # i.e., a literal blob +- $c[-1] .= $1; ++ my $text = $1; ++ $text =~ s/\\/\\\\/g; ++ $c[-1] .= $text; + + } + elsif($1 eq '~~') { # "~~" +@@ -731,7 +721,9 @@ sub _compile { + else { + # It's a "~X" where X is not a special character. + # Consider it a literal ~ and X. +- $c[-1] .= $1; ++ my $text = $1; ++ $text =~ s/\\/\\\\/g; ++ $c[-1] .= $text; + } + } + } diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 6c5229c31..ed8bdce52 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180140 2013-03-18 08:31:17Z bluewind $ +# $Id: PKGBUILD 182787 2013-04-15 10:15:37Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> @@ -7,7 +7,7 @@ pkgname=perl pkgver=5.16.3 -pkgrel=1 +pkgrel=2 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64 'mips64el') license=('GPL' 'PerlArtistic') @@ -18,6 +18,7 @@ source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 cgi-cr-escaping.diff perlbin.sh perlbin.csh + CVE-2012-6329.patch provides.pl) install=perl.install options=('makeflags' '!purge') @@ -25,6 +26,7 @@ md5sums=('025102de0e4a597cf541e57da80c6aa3' '0486659c9eefe682364a3e364d814296' '5ed2542fdb9a60682f215bd33701e61a' '1f0cbbee783e8a6d32f01be5118e0d5e' + '5dc374e095d896fb30618e414aeb9017' '999c3eea6464860704abbb055a0f0896') # workaround to let the integrity check find the correct provides array if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then @@ -35,6 +37,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} patch -i "$srcdir/cgi-cr-escaping.diff" -p1 + patch -i "$srcdir/CVE-2012-6329.patch" -p1 if [ "${CARCH}" != "i686" ]; then arch_opts="-Dcccdlflags='-fPIC'" diff --git a/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch b/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch new file mode 100644 index 000000000..c245ce1e2 --- /dev/null +++ b/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch @@ -0,0 +1,167 @@ +From d3b6d0c21ea5a0d15ec6dbd8b8d179138b7463bc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Sat, 13 Apr 2013 20:22:53 -0400 +Subject: [PATCH] fileio: in envfiles, do not skip lines following empty lines + +https://bugs.freedesktop.org/show_bug.cgi?id=63477 +--- + src/binfmt/binfmt.c | 2 +- + src/journal/catalog.c | 2 +- + src/modules-load/modules-load.c | 2 +- + src/shared/conf-parser.c | 2 +- + src/shared/install.c | 2 +- + src/shared/util.h | 2 +- + src/sysctl/sysctl.c | 2 +- + src/test/test-unit-file.c | 31 +++++++++++++++++++++++++++++++ + 8 files changed, 38 insertions(+), 7 deletions(-) + +diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c +index 9ca1e60..5a42b3d 100644 +--- a/src/binfmt/binfmt.c ++++ b/src/binfmt/binfmt.c +@@ -110,7 +110,7 @@ static int apply_file(const char *path, bool ignore_enoent) { + p = strstrip(l); + if (!*p) + continue; +- if (strchr(COMMENTS, *p)) ++ if (strchr(COMMENTS "\n", *p)) + continue; + + k = apply_rule(p); +diff --git a/src/journal/catalog.c b/src/journal/catalog.c +index ebf0622..7681af6 100644 +--- a/src/journal/catalog.c ++++ b/src/journal/catalog.c +@@ -180,7 +180,7 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) { + continue; + } + +- if (strchr(COMMENTS, line[0])) ++ if (strchr(COMMENTS "\n", line[0])) + continue; + + if (empty_line && +diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c +index 9ee2603..b3f7af0 100644 +--- a/src/modules-load/modules-load.c ++++ b/src/modules-load/modules-load.c +@@ -206,7 +206,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent + l = strstrip(line); + if (!*l) + continue; +- if (strchr(COMMENTS, *l)) ++ if (strchr(COMMENTS "\n", *l)) + continue; + + k = load_module(ctx, l); +diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c +index fbacf98..fea2e56 100644 +--- a/src/shared/conf-parser.c ++++ b/src/shared/conf-parser.c +@@ -174,7 +174,7 @@ static int parse_line( + if (!*l) + return 0; + +- if (strchr(COMMENTS, *l)) ++ if (strchr(COMMENTS "\n", *l)) + return 0; + + if (startswith(l, ".include ")) { +diff --git a/src/shared/install.c b/src/shared/install.c +index f9d223e..71e0433 100644 +--- a/src/shared/install.c ++++ b/src/shared/install.c +@@ -1699,7 +1699,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) { + if (!*l) + continue; + +- if (strchr(COMMENTS, *l)) ++ if (strchr(COMMENTS "\n", *l)) + continue; + + if (first_word(l, "enable")) { +diff --git a/src/shared/util.h b/src/shared/util.h +index 99ec0a3..ad97536 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -52,7 +52,7 @@ union dirent_storage { + #define WHITESPACE " \t\n\r" + #define NEWLINE "\n\r" + #define QUOTES "\"\'" +-#define COMMENTS "#;\n" ++#define COMMENTS "#;" + + #define FORMAT_BYTES_MAX 8 + +diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c +index e0ba78a..db18dd9 100644 +--- a/src/sysctl/sysctl.c ++++ b/src/sysctl/sysctl.c +@@ -149,7 +149,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno + if (!*p) + continue; + +- if (strchr(COMMENTS, *p)) ++ if (strchr(COMMENTS "\n", *p)) + continue; + + value = strchr(p, '='); +diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c +index 3cf8463..1bf11e6 100644 +--- a/src/test/test-unit-file.c ++++ b/src/test/test-unit-file.c +@@ -199,6 +199,17 @@ static void test_config_parse_exec(void) { + "#--nouser-config \\\n" \ + "normal=line" + ++#define env_file_4 \ ++ "# Generated\n" \ ++ "\n" \ ++ "HWMON_MODULES=\"coretemp f71882fg\"\n" \ ++ "\n" \ ++ "# For compatibility reasons\n" \ ++ "\n" \ ++ "MODULE_0=coretemp\n" \ ++ "MODULE_1=f71882fg" ++ ++ + static void test_load_env_file_1(void) { + char _cleanup_strv_free_ **data = NULL; + int r; +@@ -251,6 +262,25 @@ static void test_load_env_file_3(void) { + unlink(name); + } + ++static void test_load_env_file_4(void) { ++ char _cleanup_strv_free_ **data = NULL; ++ int r; ++ ++ char name[] = "/tmp/test-load-env-file.XXXXXX"; ++ int _cleanup_close_ fd = mkstemp(name); ++ assert(fd >= 0); ++ assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4)); ++ ++ r = load_env_file(name, NULL, &data); ++ assert(r == 0); ++ assert(streq(data[0], "HWMON_MODULES=coretemp f71882fg")); ++ assert(streq(data[1], "MODULE_0=coretemp")); ++ assert(streq(data[2], "MODULE_1=f71882fg")); ++ assert(data[3] == NULL); ++ unlink(name); ++} ++ ++ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wnonnull" + +@@ -327,6 +357,7 @@ int main(int argc, char *argv[]) { + test_load_env_file_1(); + test_load_env_file_2(); + test_load_env_file_3(); ++ test_load_env_file_4(); + test_install_printf(); + + return 0; +-- +1.8.2.1 + diff --git a/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch b/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch new file mode 100644 index 000000000..19edce5f4 --- /dev/null +++ b/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch @@ -0,0 +1,35 @@ +From d378991747d67fff1d4dc39e7fb2bc8f49f1b561 Mon Sep 17 00:00:00 2001 +From: Mirco Tischler <mt-ml@gmx.de> +Date: Sat, 13 Apr 2013 01:03:49 +0200 +Subject: [PATCH] journal: fix broken tags _SOURCE_REALTIME_TIMESTAMP and + _MACHINE_ID + +--- + src/journal/journald-server.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index 53e3830..be84323 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -538,7 +538,7 @@ static void dispatch_message_real( + char pid[sizeof("_PID=") + DECIMAL_STR_MAX(ucred->pid)], + uid[sizeof("_UID=") + DECIMAL_STR_MAX(ucred->uid)], + gid[sizeof("_GID=") + DECIMAL_STR_MAX(ucred->gid)], +- source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=" + DECIMAL_STR_MAX(usec_t))], ++ source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)], + boot_id[sizeof("_BOOT_ID=") + 32] = "_BOOT_ID=", + machine_id[sizeof("_MACHINE_ID=") + 32] = "_MACHINE_ID="; + +@@ -699,7 +699,7 @@ static void dispatch_message_real( + + r = sd_id128_get_machine(&id); + if (r >= 0) { +- sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID") - 1); ++ sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID=") - 1); + IOVEC_SET_STRING(iovec[n++], machine_id); + } + +-- +1.8.2.1 + diff --git a/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch b/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch new file mode 100644 index 000000000..9cac29b77 --- /dev/null +++ b/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch @@ -0,0 +1,48 @@ +From 50fb97935d689a520251b2d543599be14bdfd0ed Mon Sep 17 00:00:00 2001 +From: Fedora systemd team <systemd-maint@redhat.com> +Date: Wed, 10 Apr 2013 09:49:24 +0200 +Subject: [PATCH] logind: avoid creating stale session state files + +There were old session state files accumulating in /run/systemd/session. +They confused e.g. "reboot", which thought there were still users logged +in. The files got created like this: + +session_stop(Session *s) -> + ... + unlink(s->state_file); + ... + seat_set_active(s->seat, NULL) -> + session_save(...); /* re-creates the state file we just + unlinked */ + +Fix it simply by clearing the s->started flag earlier to prevent +any further writes of the state file (session_save() checks the flag). +--- + src/login/logind-session.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/login/logind-session.c b/src/login/logind-session.c +index 508336d..e2f41d3 100644 +--- a/src/login/logind-session.c ++++ b/src/login/logind-session.c +@@ -710,6 +710,8 @@ int session_stop(Session *s) { + if (s->started) + session_send_signal(s, false); + ++ s->started = false; ++ + if (s->seat) { + if (s->seat->active == s) + seat_set_active(s->seat, NULL); +@@ -721,8 +723,6 @@ int session_stop(Session *s) { + user_send_changed(s->user, "Sessions\0"); + user_save(s->user); + +- s->started = false; +- + return r; + } + +-- +1.8.2.1 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index de4f4f2b2..9c2989261 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=201 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -16,11 +16,17 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' + '0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch' + '0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch' + '0001-logind-avoid-creating-stale-session-state-files.patch' 'use-split-usr-path.patch') md5sums=('3e758392ff0e9206b3f7ee252b4a654b' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' + 'd575a29ca735944aa45126ab9d3087a5' + '8170482f10bb0420770a64dce23975bc' + 'b1355aae98071e83fca27549a0ac3def' '76bf83fe34c5b40533abc5dc940576a6') prepare() { @@ -28,6 +34,10 @@ prepare() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" + + patch -Np1 <"$srcdir/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch" + patch -Np1 <"$srcdir/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch" + patch -Np1 <"$srcdir/0001-logind-avoid-creating-stale-session-state-files.patch" } build() { @@ -86,6 +96,10 @@ package_systemd() { install -dm755 "$pkgdir/bin" ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" + # fix .so links in manpage stubs + find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ + -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} + + # 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/tar/PKGBUILD b/core/tar/PKGBUILD index 17ae0414c..240c5e292 100644 --- a/core/tar/PKGBUILD +++ b/core/tar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142080 2011-11-04 23:36:17Z allan $ +# $Id: PKGBUILD 183049 2013-04-17 02:02:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=tar pkgver=1.26 -pkgrel=2.1 +pkgrel=3 pkgdesc="Utility used to store, backup, and transport files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/tar/tar.html" @@ -21,11 +21,16 @@ md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1' 'e97e7343f4e23724b4c48bca2f033e38' '4408365a66887d65f4c8d1f416fb9d9f') -build() { +prepare() { cd ${srcdir}/$pkgname-$pkgver - patch -p1 -i "$srcdir/gnulib-no-gets.patch" - ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin + # fix build failure with glibc-2.16 + sed -i -e '/gets is a/d' gnu/stdio.in.h +} + +build() { + cd ${srcdir}/$pkgname-$pkgver + ./configure --prefix=/usr --libexecdir=/usr/lib/tar make } @@ -37,5 +42,10 @@ check() { package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install + + # probably needed for compatibility + install -dm755 ${pkgdir}/bin + ln -s ../usr/bin/tar ${pkgdir}/bin/tar + install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1 } diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index b23aea1fe..a552605ac 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173212 2012-12-13 09:39:25Z heftig $ +# $Id: PKGBUILD 182980 2013-04-16 15:48:01Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.30 +pkgver=0.6.31 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch) -md5sums=('8955b53b0ac9036b3f6a91202ff954f1' +md5sums=('d594f1da95c6a83c0463695ca31815b2' '1d5cf127e5aac407fe7c37b2f4fd503c') build() { diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index 4f3bd8bb0..204ceef99 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166377 2012-09-07 09:11:49Z tpowa $ +# $Id: PKGBUILD 182774 2013-04-15 06:32:19Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib -pkgver=1.0.26 -pkgrel=1.1 +pkgver=1.0.27 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -24,4 +24,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('2dfa35d28471d721e592b616beedf965') +md5sums=('f090c7dbd0fe57d786d82e411eac2d08') diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index 288344d5d..af7ad9d40 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166379 2012-09-07 09:13:20Z tpowa $ +# $Id: PKGBUILD 183071 2013-04-17 07:11:00Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.26 -pkgrel=1.1 +pkgver=1.0.27 +pkgrel=4 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -13,11 +13,19 @@ depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 - alsa - alsa.conf.d - 90alsa) + 90alsa + alsa-restore-1.0.27.service.patch + alsactl-fix-buffer-overflow-1.0.27.patch + arecord-1.0.27.patch) backup=(etc/conf.d/alsa) +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch + patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch + patch -Np1 -i ${srcdir}/arecord-1.0.27.patch +} + build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-alsaconf \ @@ -29,14 +37,13 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -D -m755 ../alsa ${pkgdir}/etc/rc.d/alsa - install -D -m644 ../alsa.conf.d ${pkgdir}/etc/conf.d/alsa install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('4dcf1017fafc91603af96705c073eca9' - '2ba1a1cbf653bf1a69f8a720fd6549da' - '4c8ae9f976c7df5e271a4cb91ccc7767' - '529216f6a46e61a546640e08ea7a0879') +md5sums=('cbfb21a24f63fb052b3392195639ce48' + '529216f6a46e61a546640e08ea7a0879' + '0a27f7b80351d6baa274c32d859bf037' + 'cd577445636542f9f60b420e4ffe3f0f' + 'cecb38f03bd245d0584bfd63370e9a05') diff --git a/extra/alsa-utils/alsa-restore-1.0.27.service.patch b/extra/alsa-utils/alsa-restore-1.0.27.service.patch new file mode 100644 index 000000000..b3a9d48fd --- /dev/null +++ b/extra/alsa-utils/alsa-restore-1.0.27.service.patch @@ -0,0 +1,10 @@ +--- alsa-utils-1.0.27/alsactl/alsa-restore.service.in.old 2013-04-15 14:37:57.326541394 +0200 ++++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in 2013-04-15 14:38:10.179673494 +0200 +@@ -12,6 +12,6 @@ + Conflicts=shutdown.target + + [Service] +-Type=oneshop ++Type=oneshot + ExecStart=-@sbindir@/alsactl restore + StandardOutput=syslog diff --git a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch new file mode 100644 index 000000000..d4b526614 --- /dev/null +++ b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch @@ -0,0 +1,25 @@ +From: Jaroslav Kysela <perex@perex.cz> +Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200) +Subject: alsactl: Fix the string size for the lock file contents +X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b + +alsactl: Fix the string size for the lock file contents + +The string length is 10 characters + LF + '\0' = 12 characters. + +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- + +diff --git a/alsactl/lock.c b/alsactl/lock.c +index d34d013..fce208b 100644 +--- a/alsactl/lock.c ++++ b/alsactl/lock.c +@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout) + int fd = -1, err = 0; + struct flock lck; + struct stat st; +- char lcktxt[11]; ++ char lcktxt[12]; + char *nfile; + + if (!do_lock) diff --git a/extra/alsa-utils/arecord-1.0.27.patch b/extra/alsa-utils/arecord-1.0.27.patch new file mode 100644 index 000000000..f9edb2d21 --- /dev/null +++ b/extra/alsa-utils/arecord-1.0.27.patch @@ -0,0 +1,24 @@ +From: Jaroslav Kysela <perex@perex.cz> +Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200) +Subject: arecord: add a missing break to the capture loop +X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977 + +arecord: add a missing break to the capture loop + +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- + +diff --git a/aplay/aplay.c b/aplay/aplay.c +index 5bdc39c..000d25b 100644 +--- a/aplay/aplay.c ++++ b/aplay/aplay.c +@@ -3021,6 +3021,9 @@ static void capture(char *orig_name) + fd = -1; + } + ++ if (in_aborting) ++ break; ++ + /* repeat the loop when format is raw without timelimit or + * requested counts of data are recorded + */ diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index aa9812f84..41cc52485 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172058 2012-11-27 12:16:31Z jgc $ +# $Id: PKGBUILD 183103 2013-04-17 15:00:29Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=apr-util -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('9c1db8606e520f201c451ec9a0b095f6') +md5sums=('89c1348aa79e898d7c34a6206311c9c2') build() { cd "${srcdir}/apr-util-${pkgver}" diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 5cf70124a..8d3a91031 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174921 2013-01-09 00:32:15Z dreisner $ +# $Id: PKGBUILD 183180 2013-04-18 13:14:56Z dreisner $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -9,22 +9,20 @@ pkgname=bitlbee pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('openssl' 'glib2') +depends=('gnutls' 'glib2') makedepends=('asciidoc' 'libotr3') optdepends=('libotr3: for OTR encryption support' 'xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' - 'rc.d' 'bitlbee.tmpfiles') sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' - '02423c500ac64f673ba26a3395c7c7036c17343e' '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' @@ -40,7 +38,7 @@ build() { --pidfile=/run/bitlbee/bitlbee.pid \ --ipcsocket=/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/usr/lib/systemd/system \ - --ssl=openssl \ + --ssl=gnutls \ --strip=0 \ --otr=plugin @@ -56,6 +54,5 @@ package() { install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee" - install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee" install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" } diff --git a/extra/bitlbee/rc.d b/extra/bitlbee/rc.d deleted file mode 100644 index ade85221a..000000000 --- a/extra/bitlbee/rc.d +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -pidfile=/run/bitlbee/bitlbee.pid -if [[ -r $pidfile ]]; then - read -r PID < "$pidfile" - if [[ ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case $1 in - start) - stat_busy "Starting bitlbee daemon" - if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then - stat_fail - exit 1 - else - add_daemon bitlbee - stat_done - fi - ;; - stop) - stat_busy "Stopping bitlbee daemon" - if [[ -z $PID ]] || ! kill $PID &>/dev/null; then - stat_fail - exit 1 - else - rm -f "$pidfile" - rm_daemon bitlbee - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - -# vim: set ft=sh et ts=2 sw=2: diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD index 8906fd484..b6fa0a72c 100644 --- a/extra/cairo-perl/PKGBUILD +++ b/extra/cairo-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160461 2012-06-02 10:25:40Z bluewind $ +# $Id: PKGBUILD 183105 2013-04-17 15:04:54Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cairo-perl -pkgver=1.082 -pkgrel=2 +pkgver=1.103 +pkgrel=1 pkgdesc="Perl wrappers for cairo" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -11,14 +11,11 @@ url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') depends=('cairo' 'perl') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz - testsuite.patch) -md5sums=('cfd61e519ff20023979c255d4040fe06' - '6a3ceac304a5a53f8fdd5652d98f6855') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz) +md5sums=('c693e5535ed60283c068d92120412f98') build() { cd "${srcdir}/Cairo-${pkgver}" - patch -Np1 -i "${srcdir}/testsuite.patch" perl Makefile.PL INSTALLDIRS=vendor make } diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD index 6014fbee3..a537d3991 100644 --- a/extra/check/PKGBUILD +++ b/extra/check/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171322 2012-11-17 08:55:42Z heftig $ +# $Id: PKGBUILD 183188 2013-04-18 16:03:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jeremy Cowgar <jeremy@cowgar.com> pkgname=check -pkgver=0.9.9 +pkgver=0.9.10 pkgrel=1 pkgdesc="A unit testing framework for C" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('LGPL') options=('!libtool') install=$pkgname.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('f3702f2fcfc19ce3f62dca66c241a168') +md5sums=('6d10a8efb9a683467b92b3bce97aeb30') build() { cd $pkgname-$pkgver diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD deleted file mode 100644 index 3e0a2bd04..000000000 --- a/extra/chkrootkit/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 143673 2011-11-28 09:58:36Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=chkrootkit -pkgver=0.49 -pkgrel=3.1 -pkgdesc="Locally checks for signs of a rootkit" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.chkrootkit.org" -depends=('sh' 'net-tools') -license=('BSD') -source=(http://www.reznor.com/tools/chkrootkit.tar.gz chkrootkit.cron \ - fix-tools-path.patch backslashes.patch kallsyms.patch) -md5sums=('304d840d52840689e0ab0af56d6d3a18' - 'f4b6494270f708bf016e087104681739' - '3e5f2d5e2f4fa7a0d780baec9039c07f' - '758f892dcf73e8a2a4694662fba366d4' - 'd087f3aad8a9e97fea496ef83e4f1d48') -sha1sums=('cec1a3c482b95b20d3a946b07fffb23290abc4a6' - '6dda90abf779b6f5c3bacd638e1231f34635575d' - '7fcad8117a064f0a6910134e8bb3a55de110650f' - 'e22546f445c145cf05dbc1a10f7b196fcd1c8202' - 'dc5b402ee69a7a5ae622ecfd733682516df54e88') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|/var/adm|/var/log|' check_wtmpx.c chklastlog.c chkutmp.c chkwtmp.c - patch -p0 -i "${srcdir}/fix-tools-path.patch" - patch -p1 -i "${srcdir}/backslashes.patch" - patch -p1 -i "${srcdir}/kallsyms.patch" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit \ - chkutmp chkwtmp ifpromisc strings-static ; do - install -D -m755 $i "${pkgdir}/usr/sbin/$i" - done - install -D -m744 "${srcdir}/chkrootkit.cron" "${pkgdir}/etc/cron.weekly/chkrootkit" - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/chkrootkit/backslashes.patch b/extra/chkrootkit/backslashes.patch deleted file mode 100644 index 6ac981441..000000000 --- a/extra/chkrootkit/backslashes.patch +++ /dev/null @@ -1,22 +0,0 @@ -Author: James R. Van Zandt <jrv@debian.org> -Description: Two of the chkrootkit messages have unnecessary backslashes (#498063) ---- a/chkrootkit -+++ b/chkrootkit -@@ -672,7 +672,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h - if [ "`find ${LIBS} -name libproc.a 2> /dev/null`" != "" -a \ - "$SYSTEM" != "FreeBSD" ] - then -- echo "Possible t0rn v8 \(or variation\) rootkit installed" -+ echo "Possible t0rn v8 (or variation) rootkit installed" - else - if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi - fi -@@ -726,7 +726,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h - - if [ -d ${ROOTDIR}dev/ptyxx -o -r "${ROOTDIR}usr/lib/.ark?" -o \ - -d ${ROOTDIR}usr/doc/"... " ]; then -- echo "Possible Ambient's rootkit \(ark\) installed" -+ echo "Possible Ambient's rootkit (ark) installed" - else - if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi - fi diff --git a/extra/chkrootkit/chkrootkit.cron b/extra/chkrootkit/chkrootkit.cron deleted file mode 100644 index 0fc84ded8..000000000 --- a/extra/chkrootkit/chkrootkit.cron +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/sbin/chkrootkit -q diff --git a/extra/chkrootkit/fix-tools-path.patch b/extra/chkrootkit/fix-tools-path.patch deleted file mode 100644 index d45f07901..000000000 --- a/extra/chkrootkit/fix-tools-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- chkrootkit -+++ chkrootkit -@@ -17,6 +17,8 @@ unalias netstat > /dev/null 2>&1 - unalias ps > /dev/null 2>&1 - unalias dirname > /dev/null 2>&1 - -+cd /usr/sbin -+ - # Workaround for recent GNU coreutils - _POSIX2_VERSION=199209 - export _POSIX2_VERSION diff --git a/extra/chkrootkit/kallsyms.patch b/extra/chkrootkit/kallsyms.patch deleted file mode 100644 index 4e3694aad..000000000 --- a/extra/chkrootkit/kallsyms.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/chkrootkit -+++ b/chkrootkit -@@ -308,7 +316,7 @@ lkm () - fi - - if [ "${EXPERT}" = "t" ]; then -- [ -r /proc/ksyms ] && ${egrep} -i "adore|sebek" < /proc/ksyms 2>/dev/null -+ [ -r /proc/kallsyms ] && ${egrep} -i "adore|sebek" < /proc/kallsyms 2>/dev/null - [ -d /proc/knark ] && ${ls} -la /proc/knark 2> /dev/null - PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |${awk} -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 3; else if ($0 < 2.015) print 1; else print 2 }'` - [ "$PV" = "" ] && PV=2 -@@ -318,14 +326,14 @@ lkm () - fi - - ### adore LKM -- [ -r /proc/ksyms ] && \ -- if `${egrep} -i adore < /proc/ksyms >/dev/null 2>&1`; then -+ [ -r /proc/kallsyms ] && \ -+ if `${egrep} -i adore < /proc/kallsyms >/dev/null 2>&1`; then - echo "Warning: Adore LKM installed" - fi - - ### sebek LKM (Adore based) -- [ -r /proc/ksyms ] && \ -- if `${egrep} -i sebek < /proc/ksyms >/dev/null 2>&1`; then -+ [ -r /proc/kallsyms ] && \ -+ if `${egrep} -i sebek < /proc/kallsyms >/dev/null 2>&1`; then - echo "Warning: Sebek LKM installed" - fi - diff --git a/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch new file mode 100644 index 000000000..05223cdb2 --- /dev/null +++ b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch @@ -0,0 +1,26 @@ +From 71aaad9f663efda7032e27c201a7025ff6332a2d Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Thu, 18 Apr 2013 09:47:49 +0100 +Subject: [PATCH] Fix wrong size in memset() call. + +Thanks to Dave Reisner. +--- + src/ipset.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ipset.c b/src/ipset.c +index a34ed96..f175fa4 100644 +--- a/src/ipset.c ++++ b/src/ipset.c +@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr, + return -1; + } + +- memset(buffer, 0, sizeof(buffer)); ++ memset(buffer, 0, BUFF_SZ); + + nlh = (struct nlmsghdr *)buffer; + nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr)); +-- +1.8.2.1 + diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 4c4798ab2..68e1007dd 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173229 2012-12-14 17:31:42Z dreisner $ +# $Id: PKGBUILD 183176 2013-04-18 12:45:45Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq -pkgver=2.65 +pkgver=2.66 pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" @@ -12,17 +12,20 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('glibc' 'dbus-core') install=$pkgname.install -backup=('etc/dnsmasq.conf' - 'etc/conf.d/dnsmasq') -source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" - 'dnsmasq.confd' - 'rc.dnsmasq' +backup=('etc/dnsmasq.conf') +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" + '0001-Fix-wrong-size-in-memset-call.patch' 'dnsmasq.service') -md5sums=('a91534a5d6f053d5c80f67ef502afa34' - '66479e99123faeab83ebaed709ef95b5' - '819fbdf6440d710616e6df5f8ca9cdba' +md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20' + '05ccefefde68ebdebce5e40d2b3c78be' '7ac45726cabef4145db40d758cc7fedf') +prepare() { + cd "$pkgname-$pkgver" + + patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch" +} + build() { cd "$pkgname-$pkgver" @@ -30,7 +33,7 @@ build() { # compile time opts report properly on startup. yuck. sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h - make + make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS" } package() { @@ -38,9 +41,6 @@ package() { make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install - install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq - install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq" - install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service diff --git a/extra/dnsmasq/dnsmasq.confd b/extra/dnsmasq/dnsmasq.confd deleted file mode 100644 index 933b92850..000000000 --- a/extra/dnsmasq/dnsmasq.confd +++ /dev/null @@ -1,9 +0,0 @@ -# -# runtime config for dnsmasq -# - -# if unset, dnsmasq will run as nobody. -DNSMASQ_USER=dnsmasq - -# other runtime options. treated as an array. -DNSMASQ_OPTS=() diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq deleted file mode 100755 index 4030c2896..000000000 --- a/extra/dnsmasq/rc.dnsmasq +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dnsmasq - -checkconfig() { - local testout - - if ! testout=$(/usr/bin/dnsmasq --test 2>&1); then - echo "$testout" - return 1 - fi - - return 0 -} - -pidfile=/run/dnsmasq.pid -if [[ -r $pidfile ]]; then - read -r PID < "$pidfile" - if [[ ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case $1 in - start) - stat_busy "Starting DNS/DHCP daemon" - if [[ -z $PID ]] && checkconfig && - /usr/bin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \ - "--pid-file=$pidfile" \ - "${DNSMASQ_OPTS[@]}"; then - add_daemon dnsmasq - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping DNS/DHCP daemon" - if [[ $PID ]] && kill "$PID" &> /dev/null; then - # dnsmasq doesn't clean up after itself - rm -f "$pidfile" - rm_daemon dnsmasq - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - checkconfig) - # diagnostics will be printed, with zero/non-zero exit - /usr/bin/dnsmasq --test - ;; - *) - echo "usage: $0 <start|stop|restart|checkconfig>" -esac - diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index ea4f499fb..fdb45581b 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181377 2013-04-04 01:09:57Z eric $ +# $Id: PKGBUILD 182782 2013-04-15 06:46:47Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=enlightenment -pkgver=1.0.12 +pkgver=1.0.13 _themever=1.0.1 pkgrel=1.1 pkgdesc="A fast, flexible, and very extensible Window Manager" @@ -10,11 +10,11 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" license=('BSD' 'custom') depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \ - 'libxdamage' 'libxrandr' 'libpulse' 'audiofile') + 'libxrandr' 'libpulse') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \ http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz) -sha1sums=('d0d9533f645cd5e72392517df2b50748eaa58411' +sha1sums=('bcb74385fb6d0732f735f27264ae02b539d136c9' 'ae34e2df1294198795736bf953bf695aba93b710') build() { diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD index 203525ccb..f6bb0d394 100644 --- a/extra/fakechroot/PKGBUILD +++ b/extra/fakechroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144961 2011-12-12 08:42:45Z allan $ +# $Id: PKGBUILD 182910 2013-04-16 04:51:02Z allan $ # Maintainer : Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=fakechroot pkgver=2.16 -pkgrel=1.1 +pkgrel=2 pkgdesc="Gives a fake chroot environment" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fakechroot/fakechroot/wiki" @@ -14,6 +14,14 @@ install=fakechroot.install source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz) md5sums=('3ea5efb76664e787450e0cfcefc1b807') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # https://github.com/fakechroot/fakechroot/issues/10 + sed -i "s#usr/sbin/chroot#usr/bin/chroot#" test/testtree.sh test/t/chroot.t +} + build() { cd ${srcdir}/${pkgname}-${pkgver} # Somehow not all files use the chroot found by configure. diff --git a/extra/fakechroot/fakechroot.install b/extra/fakechroot/fakechroot.install index 2b5eb2100..61c5b73e5 100644 --- a/extra/fakechroot/fakechroot.install +++ b/extra/fakechroot/fakechroot.install @@ -3,9 +3,6 @@ post_install() { } post_upgrade() { - if [ "$(vercmp $2 2.9-2)" -lt 0 ]; then - sed -i -e '/\/usr\/lib\/libfakechroot/d' etc/ld.so.conf - fi sbin/ldconfig -r . } diff --git a/extra/farstream/PKGBUILD b/extra/farstream/PKGBUILD index 4b6ea6351..4b57a7256 100644 --- a/extra/farstream/PKGBUILD +++ b/extra/farstream/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 170993 2012-11-14 14:37:18Z ibiru $ +# $Id: PKGBUILD 183166 2013-04-18 07:35:04Z eric $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=farstream -pkgver=0.2.2 -pkgrel=1.1 +pkgver=0.2.3 +pkgrel=1 pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework" arch=(i686 x86_64 'mips64el') url="http://www.freedesktop.org/wiki/Software/Farstream" -license=('LGPL2.1') +license=('LGPL') depends=('gst-plugins-base-libs' 'libnice') makedepends=('gobject-introspection') optdepends=('gst-plugins-good' 'gst-plugins-bad') conflicts=('farsight2') replaces=('farsight2') options=(!libtool) -source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('01c20c1ed014ad4e18e55f1f6caf7877') +source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('a8971167068b69a6933d3eaaeb9ab448' + 'SKIP') build() { - cd $pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr \ --with-package-name='Parabola GNU/Linux-libre farstream package' \ --with-package-origin='https://parabolagnulinux.org/' \ diff --git a/extra/freeglut/PKGBUILD b/extra/freeglut/PKGBUILD index af46210a7..ad99ff035 100644 --- a/extra/freeglut/PKGBUILD +++ b/extra/freeglut/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168622 2012-10-13 15:13:40Z andyrtr $ +# $Id: PKGBUILD 182877 2013-04-15 22:13:33Z heftig $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=freeglut -pkgver=2.8.0 -pkgrel=2.1 +pkgver=2.8.1 +pkgrel=1 pkgdesc="Provides functionality for small OpenGL programs" arch=('i686' 'x86_64' 'mips64el') url="http://freeglut.sourceforge.net/" @@ -16,8 +16,8 @@ provides=('glut') conflicts=('glut') options=('!libtool') source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz) -md5sums=('5db8651af306bc403fbfd36934a20e1d') -sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1') +md5sums=('918ffbddcffbac83c218bc52355b6d5a') +sha1sums=('7330b622481e2226c0c9f6d2e72febe96b03f9c4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD index c9dd7b476..f1d5e11d2 100644 --- a/extra/geoip/PKGBUILD +++ b/extra/geoip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158109 2012-05-03 01:01:32Z foutrelis $ +# $Id: PKGBUILD 183169 2013-04-18 10:54:20Z juergen $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Manolis Tzanidakis <manolis@archlinux.org> pkgname=geoip -pkgver=1.4.8 -pkgrel=2 +pkgver=1.5.0 +pkgrel=1 pkgdesc="Non-DNS IP-to-country resolver C library & utils" arch=('i686' 'x86_64' 'mips64el') url="http://www.maxmind.com/app/c" @@ -13,7 +13,7 @@ depends=('zlib' 'geoip-database') backup=('etc/geoip/GeoIP.conf') options=('!libtool' '!emptydirs') source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz) -sha256sums=('cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4') +sha256sums=('d1dbd4f27bcf0e760329f0f9c67a5fc81b4c56efbe0666159934c2bcd38caea2') build() { cd "$srcdir/GeoIP-$pkgver" diff --git a/extra/gob2/PKGBUILD b/extra/gob2/PKGBUILD index 71d07567f..a00431b14 100644 --- a/extra/gob2/PKGBUILD +++ b/extra/gob2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 145709 2011-12-28 14:25:19Z jgc $ +# $Id: PKGBUILD 183109 2013-04-17 15:27:46Z jgc $ # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=gob2 -pkgver=2.0.18 -pkgrel=1.1 +pkgver=2.0.19 +pkgrel=1 pkgdesc="GTK Object Builder (GOB) is a simple preprocessor for easily creating GTK objects" arch=(i686 x86_64 'mips64el') license=('GPL') depends=('glib2') url="http://www.5z.com/jirka/gob.html" source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz) -md5sums=('cd08248762962aec88100ddaaff4f9e0') +md5sums=('d7f2e7b96c33458d69b6381e28e4ac69') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index c7182bfb9..604b8ad6f 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176065 2013-01-27 09:20:55Z giovanni $ +# $Id: PKGBUILD 182988 2013-04-16 16:24:02Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> pkgname=help2man -pkgver=1.41.1 +pkgver=1.41.2 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('perl-locale-gettext') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('4485615cd699a78eb42444324546942a') +md5sums=('48cb7fa1d9cca2ebea1844694668c8a8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 839db9b80..66681ff2d 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173164 2012-12-11 22:33:51Z eric $ +# $Id: PKGBUILD 183196 2013-04-18 19:51:15Z eric $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=ibus -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool') options=('!libtool') install=ibus.install source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('31d732c17d0a103565fa29995c5610e8be8b2dca') +sha1sums=('a7e1695731b4c954fa8897d091e6dda64e08b28c') build() { cd ${pkgname}-${pkgver} diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index d304aa9e8..64ad7fd10 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,15 +3,15 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56') +md5sums=('94ce02c42c1e4d1411357fb3c1014f67') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk @@ -28,9 +28,8 @@ build() { --with-browser-tests \ --with-firefox=/usr/bin/firefox \ --with-chromium=/usr/bin/chromium \ - --with-epiphany=/usr/bin/epiphany \ - --with-gtk=2 - make + --with-epiphany=/usr/bin/epiphany + make } check() { @@ -44,7 +43,7 @@ check() { package_icedtea-web-java7() { pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" - depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') + depends=('jre7-openjdk' 'desktop-file-utils') provides=('java-web-start=7') replaces=('icedtea-web') install=${pkgname}.install diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD index 649a47d70..accf2d8f1 100644 --- a/extra/json-glib/PKGBUILD +++ b/extra/json-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169945 2012-10-30 22:46:18Z heftig $ +# $Id: PKGBUILD 183001 2013-04-16 19:33:50Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=json-glib -pkgver=0.15.2 +pkgver=0.16.0 pkgrel=1 pkgdesc="JSON library built on GLib" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ license=('GPL') depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.15/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('e4a3fd2f399e4c148aad608e6ed0a94095f2ddde9dd12f5aa2f072ecae5c1d37') build(){ cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD index b0a300d7d..39c211128 100644 --- a/extra/lensfun/PKGBUILD +++ b/extra/lensfun/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162692 2012-06-28 10:33:24Z tpowa $ +# $Id: PKGBUILD 182923 2013-04-16 07:16:05Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lensfun -pkgver=0.2.6 +pkgver=0.2.7 pkgrel=1 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('glibc' 'glib2') makedepends=('python2' 'libpng' 'doxygen') source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" if [ "$CARCH" = "mips64el" ]; then confflags="--vectorization=" @@ -20,7 +20,11 @@ build() { confflags="" fi sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure - ./configure \ +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ --prefix=/usr \ --libdir=/usr/lib ${confflags} make all @@ -30,4 +34,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make INSTALL_PREFIX="$pkgdir" install } -md5sums=('740e4749db04da0a597630dd6339b966') +md5sums=('6061cc2d00a42d3e62512878426fc841') diff --git a/extra/libcdio-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD index c31a7dca8..b57d888fe 100644 --- a/extra/libcdio-paranoia/PKGBUILD +++ b/extra/libcdio-paranoia/PKGBUILD @@ -3,35 +3,25 @@ # Contributor: damir <damir@archlinux.org> pkgname=libcdio-paranoia -pkgver=10.2+0.90 -pkgrel=1.1 +pkgver=10.2+0.90+1 +pkgrel=1 pkgdesc="CD paranoia libraries from libcdio" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') url="http://www.gnu.org/software/libcdio/" depends=('libcdio') options=('!libtool') -source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig} - header-fix.patch) -md5sums=('432e9f1c5ceb645c4bca9db3f9297437' - '39766404d473ecda66c2f3a932d1c57c' - '1ebb33a1cfe00181de31138ef001e01b') +source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('e79e196864dd3b1ca87a01345abbda07' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i ../header-fix.patch - sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac - aclocal - autoconf - automake --add-missing + cd "${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-cpp-progs --disable-static --disable-example-progs make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make -j1 DESTDIR="${pkgdir}" install - - #sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \ - # $pkgdir/usr/include/cdio/cdio_config.h } diff --git a/extra/libcdio-paranoia/header-fix.patch b/extra/libcdio-paranoia/header-fix.patch deleted file mode 100644 index 15cf0e0e2..000000000 --- a/extra/libcdio-paranoia/header-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- include/cdio/paranoia/Makefile.am.orig 2013-01-08 10:40:32.237218755 +0000 -+++ include/cdio/paranoia/Makefile.am 2013-01-08 10:41:22.269997804 +0000 -@@ -3,8 +3,8 @@ - ######################################################## - # - --libcdioincludedir=$(includedir)/cdio --dist_libcdioinclude_HEADERS = cdda.h paranoia.h -+cdio_paranoia_includedir=$(includedir)/cdio/paranoia -+dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h - - EXTRA_DIST = version.h.in - BUILT_SOURCES = version.h diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 1add053ce..3a6a38d8c 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181892 2013-04-05 08:54:36Z svenstaro $ +# $Id: PKGBUILD 183096 2013-04-17 14:16:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw pkgver=4.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,8 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_LCMS2=ON make } diff --git a/extra/liblqr/PKGBUILD b/extra/liblqr/PKGBUILD index b511f5e57..798a2c6e2 100644 --- a/extra/liblqr/PKGBUILD +++ b/extra/liblqr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150613 2012-02-18 22:56:34Z pierre $ +# $Id: PKGBUILD 182915 2013-04-16 05:57:47Z eric $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=liblqr -pkgver=0.4.1 -pkgrel=3.1 +pkgver=0.4.2 +pkgrel=1 pkgdesc="A seam-carving C/C++ library called Liquid Rescale" arch=('i686' 'x86_64' 'mips64el') url="http://liblqr.wikidot.com/" @@ -12,7 +12,7 @@ depends=('glib2') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=("http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2") -md5sums=('0e24ed3c9fcdcb111062640764d7b87a') +md5sums=('915643d993da97e10665d48c0bf8f3d0') build() { cd "$srcdir/$pkgname-1-$pkgver" diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index d9078cb82..05e91dd5b 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179313 2013-03-05 11:12:56Z tpowa $ +# $Id: PKGBUILD 182921 2013-04-16 07:10:02Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libmp3splt -pkgver=0.8.1a +pkgver=0.8.2 pkgrel=1 pkgdesc="Library for splitting mp3 and ogg files without decoding" arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,14 @@ makedepends=('libtool' 'git') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz") -build() { +prepare() { cd $srcdir/$pkgname-$pkgver libtoolize --copy --force ./autogen.sh +} + +build() { + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make } @@ -25,4 +29,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('5889dad7fc9443cd61987309622aa382') +md5sums=('562b39b6788f8128b7185b83f14ca516') diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD index 74e1a1fb6..50f62378d 100644 --- a/extra/libmygpo-qt/PKGBUILD +++ b/extra/libmygpo-qt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171967 2012-11-25 14:53:14Z andrea $ +# $Id: PKGBUILD 182786 2013-04-15 10:09:42Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libmygpo-qt -pkgver=1.0.6 -pkgrel=2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="A C++/Qt client library for gpodder.net" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.gpodder.org/wiki/Libmygpo-qt" @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('qjson') makedepends=('cmake' 'doxygen') source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz") -md5sums=('dd07ccc88eac954a3860aeda96aab7b1') +md5sums=('447e60c8c695b4280a0e20c71abacf49') build() { mkdir build diff --git a/extra/libnl1/PKGBUILD b/extra/libnl1/PKGBUILD index cc6685765..57a4c8f5c 100644 --- a/extra/libnl1/PKGBUILD +++ b/extra/libnl1/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 150908 2012-02-23 13:56:22Z heftig $ +# $Id: PKGBUILD 182913 2013-04-16 05:29:35Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libnl1 -pkgver=1.1 -pkgrel=1.2 +pkgver=1.1.3 +pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets (Legacy version)" arch=('i686' 'x86_64' 'mips64el') url="http://www.infradead.org/~tgr/libnl/" license=('GPL') depends=('glibc') -source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz" - 'fix-compilation.patch') -md5sums=('ae970ccd9144e132b68664f98e7ceeb1' - 'e1f5e82c8aa1b3ad025c7b588178de1e') +options=('!staticlibs') +source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz") +md5sums=('4e4fa2197f4412b20c2952325d674b12') build() { - cd ${srcdir}/libnl-${pkgver} - patch -Np1 -i ${srcdir}/fix-compilation.patch + cd libnl-${pkgver} ./configure --prefix=/usr make } package() { - cd ${srcdir}/libnl-${pkgver} - make DESTDIR=${pkgdir} install + cd libnl-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/libnl1/fix-compilation.patch b/extra/libnl1/fix-compilation.patch deleted file mode 100644 index 891562a39..000000000 --- a/extra/libnl1/fix-compilation.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/include/netlink-local.h 2009-06-26 11:15:33.186011844 +0200 -@@ -26,6 +26,7 @@ - #include <sys/socket.h> - #include <inttypes.h> - #include <assert.h> -+#include <limits.h> - - #include <arpa/inet.h> - #include <netdb.h> diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD index b82443e8b..f4b69312f 100644 --- a/extra/libofx/PKGBUILD +++ b/extra/libofx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165144 2012-08-11 18:49:23Z eric $ +# $Id: PKGBUILD 183162 2013-04-18 06:30:55Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgbase=libofx pkgname=('libofx' 'libofx-doc') -pkgver=0.9.5 +pkgver=0.9.8 pkgrel=1 pkgdesc="API for the OFX banking standard" arch=('i686' 'x86_64' 'mips64el') @@ -11,13 +11,11 @@ url="http://libofx.sourceforge.net" license=('GPL') depends=('opensp' 'curl' 'libxml++') checkdepends=('gnupg') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libofx-gcc47.patch) -sha1sums=('7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73' - '6c327e24543cb8ba901bfb204343a85c68264654') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('e0159d77c4458eb937871373db85c9f392e86554') build() { cd "$srcdir/$pkgbase-$pkgver" - patch -p1 -i "$srcdir/libofx-gcc47.patch" ./configure --prefix=/usr make } diff --git a/extra/libofx/libofx-gcc47.patch b/extra/libofx/libofx-gcc47.patch deleted file mode 100644 index 899fe09e0..000000000 --- a/extra/libofx/libofx-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff ---- libofx-0.9.4.orig/ofxconnect/ofxpartner.cpp 2011-03-30 22:30:50.000000000 +0000 -+++ libofx-0.9.4/ofxconnect/ofxpartner.cpp 2012-04-17 06:08:38.711940892 +0000 -@@ -37,6 +37,7 @@ - #include <vector> - #include <algorithm> - #include <string.h> -+#include <unistd.h> - - using std::string; - using std::vector; diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD index 718869420..92283fb24 100644 --- a/extra/libplist/PKGBUILD +++ b/extra/libplist/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 156914 2012-04-23 09:08:57Z ibiru $ +# $Id: PKGBUILD 183073 2013-04-17 10:22:07Z tomegun $ +# Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libplist -pkgver=1.8 -pkgrel=2 +pkgver=1.10 +pkgrel=1 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML" url="http://libimobiledevice.org/" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +13,6 @@ license=('GPL2' 'LGPL2.1') depends=('glib2' 'libxml2' 'python2') makedepends=('cmake' 'swig') source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) -sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec') build() { mkdir build @@ -28,3 +28,4 @@ package() { cd build make DESTDIR="$pkgdir" install } +md5sums=('fe642d0c8602d70c408994555c330dd1') diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD index c1027932f..f11ef2bd8 100644 --- a/extra/libpst/PKGBUILD +++ b/extra/libpst/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 181123 2013-03-31 19:16:47Z stephane $ +# $Id: PKGBUILD 183115 2013-04-17 16:05:23Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libpst pkgname=('libpst' 'libpst-docs') -pkgver=0.6.54 -pkgrel=4 +pkgver=0.6.58 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.five-ten-sg.com/libpst/" license=('GPL') -makedepends=('python2' 'boost') +makedepends=('python2' 'boost' 'libgsf') source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz) -sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84') +sha1sums=('c398d58b8b5106725f1659c900305c6385c0773e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -21,7 +21,7 @@ build() { package_libpst() { pkgdesc="Outlook .pst file converter" - depends=('gcc-libs') + depends=('gcc-libs' 'libgsf') optdepends=('boost-libs: for libpst python interface') options=('!libtool' '!docs') @@ -31,7 +31,7 @@ package_libpst() { package_libpst-docs() { pkgdesc="Documentation for Outlook .pst file converter" - options=('!libtool') + options=('!libtool' 'docs') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install-htmlDATA diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD index 46394ed83..26476cc91 100644 --- a/extra/libtasn1/PKGBUILD +++ b/extra/libtasn1/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173800 2012-12-24 00:28:32Z andyrtr $ +# $Id: PKGBUILD 183190 2013-04-18 16:15:55Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=libtasn1 -pkgver=3.2 +pkgver=3.3 pkgrel=1 pkgdesc="The ASN.1 library used in GNUTLS" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('glibc' 'texinfo') options=('!libtool') install=libtasn1.install source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('1b07629163025b9693aae9b8957842b2' - '67bdae9b78ac7bbfa2ab24c7d46bd577') +md5sums=('2bdd687f487c50a0382b99553866a6e0' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD index bfaa468b1..785d92ef6 100644 --- a/extra/libwpd/PKGBUILD +++ b/extra/libwpd/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 156639 2012-04-22 00:00:22Z andyrtr $ +# $Id: PKGBUILD 183192 2013-04-18 16:39:00Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libwpd -pkgver=0.9.4 -pkgrel=1.1 +pkgver=0.9.6 +pkgrel=1 pkgdesc="Library for importing WordPerfect (tm) documents" arch=('i686' 'x86_64' 'mips64el') url="http://libwpd.sourceforge.net/" license=('LGPL') -depends=('gcc-libs') -makedepends=('libgsf>=1.14.20') +depends=('gcc-libs' 'zlib') +makedepends=('libgsf>=1.14.26') options=('!libtool' '!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d30d1726c3b113db70daaae423dd4448') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz) +md5sums=('63f476b892bf783072854b98d2fc4fa2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/pcr/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index 3d8ee9a5b..cd31148ff 100644 --- a/pcr/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 183011 2013-04-16 22:29:29Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,12 +6,12 @@ pkgname=mediastreamer pkgver=2.8.2 -pkgrel=4.1 +pkgrel=5 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/" license=('GPL') -depends=('ortp' 'speex' 'ffmpeg=1:1.2' 'v4l-utils' 'libxv' 'libpulse') +depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') makedepends=('intltool') options=('!libtool') source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} @@ -20,14 +20,18 @@ md5sums=('e51ea9d5fce1396b374d10473dfbadec' '805da7def98f367e621363fa0c951fe8' '553d5d47ea4a8c8dfeabdc0281849d5f') -build() { - cd "${srcdir}"/$pkgname-$pkgver +prepare() { + cd $pkgname-$pkgver patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch +} + +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "${srcdir}"/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/pcr/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch index 3304e9f56..3304e9f56 100644 --- a/pcr/mediastreamer/mediastreamer-ffmpeg.patch +++ b/extra/mediastreamer/mediastreamer-ffmpeg.patch diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD index e6037d242..ad5376595 100644 --- a/extra/mp3splt/PKGBUILD +++ b/extra/mp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179311 2013-03-05 11:12:31Z tpowa $ +# $Id: PKGBUILD 182919 2013-04-16 07:09:21Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=mp3splt -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Commandline tool for splitting mp3 and ogg files without decoding" @@ -22,4 +22,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('c0c66be0058cbc26ed52cfd2b50659fd') +md5sums=('cd8eb9f866dddb934357b7cdefb5a370') diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD index 1c3adfd90..a2c8d0df7 100644 --- a/extra/neverball/PKGBUILD +++ b/extra/neverball/PKGBUILD @@ -1,35 +1,36 @@ -# $Id: PKGBUILD 148860 2012-02-05 11:53:11Z ibiru $ +# $Id: PKGBUILD 183160 2013-04-18 02:16:47Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=neverball pkgver=1.5.4 -pkgrel=4 +pkgrel=5 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness" arch=('i686' 'x86_64' 'mips64el') url="http://neverball.org/" license=('GPL') -depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs') +depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs' \ + 'hicolor-icon-theme' 'xdg-utils') makedepends=('mesa') +install=neverball.install source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch) sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7' 'f71982b7187d569c57b30c4c40fedd6c0e72baca') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i ../neverball-1.5.4-underlink.patch +} - if [ "${CARCH}" = "i686" ] ;then - make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" - else - make ENABLE_NLS=1 DATADIR=/usr/share/neverball - fi +build() { + cd ${pkgname}-${pkgver} + make DATADIR=/usr/share/neverball LOCALEDIR=/usr/share/locale \ + CPPFLAGS="$CPPFLAGS -DNDEBUG" CFLAGS="$CFLAGS" } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball} + install -d "${pkgdir}"/usr/share/{neverball,locale,applications,doc/neverball} install -d "${pkgdir}"/usr/share/man/man{1,6} install -m755 neverball neverputt mapc "${pkgdir}/usr/bin" @@ -37,11 +38,13 @@ package(){ cp -r data/* "${pkgdir}/usr/share/neverball/" install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" - install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1" install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6" - ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" - ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" - find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \; + for i in 16 24 32 48 64 128 256; do + install -D -m644 dist/neverball_$i.png "${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverball.png" + install -D -m644 dist/neverputt_$i.png "${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverputt.png" + done + + chmod -R u=rwX,go=rX "${pkgdir}/usr/share/neverball" } diff --git a/extra/neverball/neverball.install b/extra/neverball/neverball.install new file mode 100644 index 000000000..1c0de2e4f --- /dev/null +++ b/extra/neverball/neverball.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD index 183dbf253..920638e82 100644 --- a/extra/perl-ev/PKGBUILD +++ b/extra/perl-ev/PKGBUILD @@ -1,9 +1,8 @@ -# Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 160527 2012-06-02 10:27:33Z bluewind $ +# $Id: PKGBUILD 182901 2013-04-16 04:01:09Z eric $ pkgname=perl-ev -pkgver=4.11 -pkgrel=2 +pkgver=4.15 +pkgrel=1 pkgdesc='perl interface to libev, a high performance full-featured event loop' arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) @@ -11,36 +10,24 @@ options=(!emptydirs) depends=(perl-common-sense) url=https://metacpan.org/release/EV source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/EV-$pkgver.tar.gz") -md5sums=(405c6d74f9dff12918b12560c1a57877) -sha512sums=(6aca3eeb617a313de7947b760558c12ed85af4fa8efd5bb4fd8bc2f271b4556312989aebf77cda4e212fd3b1351c268624aeaf2b1cf700507ff46c0c9dcc9db8) -_dir="$srcdir/EV-$pkgver" +md5sums=('546d10fb5901f2af937e53b41a92b2bb') -build() -( - cd "$_dir" +build() { + cd EV-$pkgver export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps unset PERL5LIB PERL_MM_OPT - /usr/bin/perl Makefile.PL + perl Makefile.PL make -) +} -check() -( - cd "$_dir" +check() { + cd EV-$pkgver export PERL_MM_USE_DEFAULT=1 unset PERL5LIB make test -) +} -package() -( - cd "$_dir" +package() { + cd EV-$pkgver make install INSTALLDIRS=vendor DESTDIR="$pkgdir" - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -) - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: +} diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index 1ed93e03f..4abb00e0e 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 160535 2012-06-02 10:27:46Z bluewind $ +# $Id: PKGBUILD 182897 2013-04-16 03:24:08Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis # Contributor: Firmicus <francois.archlinux.org> pkgname=perl-html-parser _realname=HTML-Parser -pkgver=3.69 -pkgrel=2 +pkgver=3.70 +pkgrel=1 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-html-tagset' 'perl>=5.12.1') -options=(!emptydirs) +depends=('perl-html-tagset' 'perl') +checkdepends=('perl-test-pod') +options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('d22cc6468ce670a56034be907e4e7c54') +md5sums=('efe7699f5ece3a230d730a3682359c08') build() { cd "${srcdir}/${_realname}-${pkgver}" @@ -32,4 +33,3 @@ package() { cd "${srcdir}/${_realname}-${pkgver}" make install DESTDIR="${pkgdir}" } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD index 10f344716..ac9570fc9 100644 --- a/extra/perl-libintl-perl/PKGBUILD +++ b/extra/perl-libintl-perl/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 160537 2012-06-02 10:27:49Z bluewind $ +# $Id: PKGBUILD 182899 2013-04-16 03:42:32Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=perl-libintl-perl _realname=libintl-perl -pkgver=1.20 -pkgrel=4 +pkgver=1.23 +pkgrel=1 pkgdesc="Perl Module: Localization support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://search.cpan.org/dist/${_realname}/" depends=('gettext' 'perl') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz) -md5sums=('cb36f58a7d2e15974f25b35381548b1b') +md5sums=('2e79dc842af1c9efc14fbe6664dc89bf') build() { cd "${srcdir}/${_realname}-$pkgver" diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 3ba2bccbb..0b4acc826 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175939 2013-01-25 05:33:39Z eric $ +# $Id: PKGBUILD 182872 2013-04-15 21:25:04Z eric $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin <kevin@archlinux.org> pkgname=perl-yaml-syck _realname=YAML-Syck -pkgver=1.22 +pkgver=1.25 pkgrel=1 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) -md5sums=('361db9a4dcaf8fa279ca813e146ce7d7') +md5sums=('847f315cbd074b42c44f360383ac13e9') build() { cd "${srcdir}/${_realname}-$pkgver" diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD index 2c074bd60..516b4cc6b 100644 --- a/extra/pyalpm/PKGBUILD +++ b/extra/pyalpm/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer : Rémy Oudompheng <remy@archlinux.org> pkgname=pyalpm -pkgver=0.6 +pkgver=0.6.1 pkgrel=1 pkgdesc="Libalpm bindings for Python 3" arch=('i686' 'x86_64' 'mips64el') @@ -9,10 +9,14 @@ url="http://projects.archlinux.org/users/remy/pyalpm.git/" license=('GPL') depends=('python>=3.2' 'pacman>=4.1') source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") -md5sums=('614fa9f8a5c7cef0828b4f6306ef92f2') +md5sums=('7310508a3b009705b77dd1d93b3012d9') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # workaround Python packaging issue (FS#34658) + export CFLAGS="$CFLAGS -Wno-format" + python setup.py build } diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index 5d76be07a..06dfbcde1 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 179941 2013-03-13 02:09:45Z jgc $ +# $Id: PKGBUILD 182931 2013-04-16 08:33:21Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') -pkgver=1.7.0 -pkgrel=2 +pkgver=1.7.1 +pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.numpy.org/" makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) -md5sums=('4fa54e40b6a243416f0248123b6ec332') +md5sums=('0ab72b3b83528a7ae79c6df9042d61c6') build() { cd "${srcdir}" @@ -62,6 +62,7 @@ package_python-numpy() { conflicts=('python3-numpy') _pyver=3.3 + _pyinc=3.3m export ATLAS=None export LDFLAGS="$LDFLAGS -shared" @@ -72,6 +73,6 @@ package_python-numpy() { install -m755 -d "${pkgdir}/usr/share/licenses/python-numpy" install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-numpy/" - install -m755 -d "${pkgdir}/usr/include/python${_pyver}" - ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy" + install -m755 -d "${pkgdir}/usr/include/python${_pyinc}" + ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyinc}/numpy" } diff --git a/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch deleted file mode 100644 index 072afbc0e..000000000 --- a/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c -index 00c71f9..0afdc17 100644 ---- a/numpy/core/src/multiarray/scalarapi.c -+++ b/numpy/core/src/multiarray/scalarapi.c -@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - itemsize = (((itemsize - 1) >> 2) + 1) << 2; - } - } -+#if PY_VERSION_HEX >= 0x03030000 -+ if (type_num == NPY_UNICODE) { -+ PyObject *u, *args; -+ char *buffer; -+ if (swap) { -+ buffer = malloc(itemsize); -+ if (buffer == NULL) { -+ PyErr_NoMemory(); -+ return NULL; -+ } -+ memcpy(buffer, data, itemsize); -+ byte_swap_vector(buffer, itemsize >> 2, 4); -+ } else { -+ buffer = data; -+ } -+ u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer, -+ itemsize >> 2); -+ if (swap) { -+ free(buffer); -+ } -+ if (u == NULL) { -+ return NULL; -+ } -+ args = Py_BuildValue("(O)", u); -+ if (args == NULL) { -+ Py_DECREF(u); -+ return NULL; -+ } -+ obj = type->tp_new(type, args, NULL); -+ Py_DECREF(u); -+ Py_DECREF(args); -+ return obj; -+ } -+#endif - if (type->tp_itemsize != 0) { - /* String type */ - obj = type->tp_alloc(type, itemsize); -@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - memcpy(destptr, data, itemsize); - return obj; - } -+#if PY_VERSION_HEX < 0x03030000 - else if (type_num == PyArray_UNICODE) { - /* tp_alloc inherited from Python PyBaseObject_Type */ - PyUnicodeObject *uni = (PyUnicodeObject*)obj; -@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - #endif - return obj; - } -+#endif // PY_VERSION_HEX < 0x03030000 - else { - PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj; - vobj->base = NULL; -diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src -index e547071..12745d7 100644 ---- a/numpy/core/src/multiarray/scalartypes.c.src -+++ b/numpy/core/src/multiarray/scalartypes.c.src -@@ -2592,7 +2592,11 @@ finish: - *((npy_@name@ *)dest) = *((npy_@name@ *)src); - #elif @default@ == 1 /* unicode and strings */ - if (itemsize == 0) { /* unicode */ -+#if PY_VERSION_HEX >= 0x03030000 -+ itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj); -+#else - itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE); -+#endif - } - memcpy(dest, src, itemsize); - /* @default@ == 2 won't get here */ -diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c -index c4147ef..119056c 100644 ---- a/numpy/core/src/multiarray/methods.c -+++ b/numpy/core/src/multiarray/methods.c -@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args) - if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) { - int swap=!PyArray_ISNOTSWAPPED(self); - self->data = datastr; -- if (!_IsAligned(self) || swap) { -+ if (!_IsAligned(self) || swap || (len <= 1000)) { - intp num = PyArray_NBYTES(self); - self->data = PyDataMem_NEW(num); - if (self->data == NULL) { --- -1.7.12.3 diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 0e7e09ec3..f915357f2 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179325 2013-03-05 14:58:22Z tpowa $ +# $Id: PKGBUILD 182925 2013-04-16 07:40:13Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=1.4.0 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') @@ -17,13 +17,18 @@ source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 replaces=('qemu-kvm') options=(!strip) -build() +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld # fix building with tex version 5.0 # https://bugs.launchpad.net/qemu/+bug/1130533 patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch +} + +build () +{ + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ @@ -52,6 +57,6 @@ package() { done } -md5sums=('78f13b774814b6b7ebcaf4f9b9204318' +md5sums=('eb2d696956324722b5ecfa46e41f9a75' 'b431782f310bfc6af4ef21a8068f866b' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD index 47d9f24f2..bd6e705e5 100644 --- a/extra/qpdf/PKGBUILD +++ b/extra/qpdf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175524 2013-01-18 19:34:24Z andyrtr $ +# $Id: PKGBUILD 182840 2013-04-15 16:29:09Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Miguel Revilla <yo at miguelrevilla.com> # Contributor: David Sotelo <dvsotelo at gmail.com> # Contributor: Nuno Araujo <nuno.araujo@russo79.com> pkgname=qpdf -pkgver=4.0.1 +pkgver=4.1.0 pkgrel=1 pkgdesc="QPDF: A Content-Preserving PDF Transformation System" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('pcre' 'perl') makedepends=('make') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('093baece867a0a7e07774bd4008156b3') +md5sums=('eedd61acc53744446d181429651a9baf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD index 0193e9812..7f3df04c8 100644 --- a/extra/qsynth/PKGBUILD +++ b/extra/qsynth/PKGBUILD @@ -1,22 +1,19 @@ -# $Id: PKGBUILD 178984 2013-03-01 10:24:07Z andrea $ +# $Id: PKGBUILD 183182 2013-04-18 15:40:20Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=qsynth -pkgver=0.3.6 -pkgrel=3 +pkgver=0.3.7 +pkgrel=1 pkgdesc="Qt GUI for FluidSynth" arch=('i686' 'x86_64' 'mips64el') url="http://qsynth.sourceforge.net/" license=('GPL') depends=('fluidsynth' 'qt4') -options=('!makeflags') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('3cba3c87463be75ac188ebc3c3023d12') +md5sums=('a101a50a7ecfb7319482a5022df1d58b') build() { - . /etc/profile.d/qt4.sh - cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr @@ -25,7 +22,8 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD index cc8afee2a..f8c9c8f52 100644 --- a/extra/razor/PKGBUILD +++ b/extra/razor/PKGBUILD @@ -1,41 +1,39 @@ -# $Id: PKGBUILD 160573 2012-06-02 10:28:53Z bluewind $ +# $Id: PKGBUILD 183164 2013-04-18 06:55:29Z eric $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=razor -pkgver=2.84 -pkgrel=7 +pkgver=2.85 +pkgrel=1 pkgdesc="A distributed, collaborative, spam detection and filtering network" arch=('i686' 'x86_64' 'mips64el') url="http://razor.sourceforge.net" license=('PerlArtistic') depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl') options=('!emptydirs') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2") -md5sums=('8b9a11a6ce020383c32c45d1530d77c2') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2" + razor-2.85-cosmetic-pv-fix.patch) +md5sums=('014d08db40187cb1316482191566b012' + '850645e088b21845f4b6653623d59515') -build() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} - - # skip install_razor_agents (we'll do the linking later) - # /bin/sed -i "s|install :: all pure_install doc_install install_razor_agents|install :: all pure_install doc_install|g" Makefile +prepare() { + cd ${pkgname}-agents-${pkgver} + patch -p1 -i "$srcdir/razor-2.85-cosmetic-pv-fix.patch" +} +build() { + cd ${pkgname}-agents-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} + cd ${pkgname}-agents-${pkgver} make test } package() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} + cd ${pkgname}-agents-${pkgver} make DESTDIR="${pkgdir}" install - - # cd ${pkgdir}/usr/bin - # for i in razor-check razor-report razor-revoke razor-admin; do - # /bin/ln -sf razor-client $i; - # done } diff --git a/extra/razor/razor-2.85-cosmetic-pv-fix.patch b/extra/razor/razor-2.85-cosmetic-pv-fix.patch new file mode 100644 index 000000000..c391d48fb --- /dev/null +++ b/extra/razor/razor-2.85-cosmetic-pv-fix.patch @@ -0,0 +1,22 @@ +--- a/lib/Razor2/Client/Version.pm 2007-05-10 22:32:10.000000000 +0200 ++++ b/lib/Razor2/Client/Version.pm 2010-03-25 11:11:36.911409707 +0100 +@@ -14,7 +14,7 @@ + + $PROTOCOL = 3; + +-$VERSION = '2.84'; ++$VERSION = '2.85'; + + 1; + +--- a/META.yml 2007-05-23 20:29:34.000000000 +0200 ++++ b/META.yml 2010-03-25 11:11:43.691408628 +0100 +@@ -1,7 +1,7 @@ + # http://module-build.sourceforge.net/META-spec.html + #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# + name: razor-agents +-version: 2.84 ++version: 2.85 + version_from: lib/Razor2/Client/Version.pm + installdirs: site + requires: diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index 9f4e85cd6..223544f00 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178993 2013-03-01 10:25:02Z andrea $ +# $Id: PKGBUILD 182809 2013-04-15 13:34:39Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=13.02 +pkgver=13.04 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64' 'mips64el') @@ -23,14 +23,22 @@ optdepends=('lilypond: notation display' [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('c1e2f80b599a942896e9ebd63896032f') +md5sums=('bcc9be7bf8c3945e0eefdb95dc037f0b') build() { cd "$srcdir/$pkgname-$pkgver" # lrdf + raptor2 compatibility - export lrdf_CFLAGS="$(pkg-config --cflags raptor2)" - LRELEASE=/usr/lib/qt4/bin/lrelease LUPDATE=/usr/lib/qt4/bin/lupdate ./configure --prefix=/usr + lrdf_CFLAGS="$(pkg-config --cflags raptor2)" + + # qt4 compatibility (qt->qt5) + LRELEASE=/usr/lib/qt4/bin/lrelease + LUPDATE=/usr/lib/qt4/bin/lupdate + + export lrdf_CFLAGS LRELEASE LUPDATE + + ./configure --prefix=/usr + make } diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD index 1b2a0e39d..64e4aeb46 100644 --- a/extra/sharutils/PKGBUILD +++ b/extra/sharutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181164 2013-04-02 02:28:47Z bisson $ +# $Id: PKGBUILD 182986 2013-04-16 16:21:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sharutils -pkgver=4.13.4 +pkgver=4.13.5 pkgrel=1 pkgdesc='Makes so-called shell archives out of many files' url='http://www.gnu.org/software/sharutils/' @@ -12,7 +12,7 @@ license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('perl' 'gettext' 'texinfo') source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('9becdd47dd03a6e139f29c9a2ab311a541409553') +sha1sums=('8c2e352860994332fa03f2a6c92d789097fb2e52') install=install diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index 7a8e1502c..fd9e78d72 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 182124 2013-04-08 00:32:17Z eric $ +# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm _pkgname=ktp-accounts-kcm -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64' 'mips64el') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'boost') optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support' 'telepathy-haze: all protocols supported by libpurple') groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('8951573b54d5d940687c3c2b7b77fb441b0fddd9') +sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc') build() { mkdir build diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index f05c8b861..dc8ab8ad2 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182126 2013-04-08 00:43:14Z eric $ +# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-approver _pkgname=ktp-approver -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('340cd26c37297540c0f70e75adbb43bcab0889c7') +sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e') build() { mkdir build diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index 8947bb6ca..6acf90197 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182128 2013-04-08 00:45:51Z eric $ +# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('392ee2e0146e445950ecad1b0cae27ece77b7a3e') +sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a') build() { mkdir build diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index c6c601506..540a69f78 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 182129 2013-04-08 00:46:52Z eric $ +# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-common-internals _pkgname=ktp-common-internals -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Common components for KDE-Telepathy" arch=('i686' 'x86_64' 'mips64el') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control') -makedepends=('cmake' 'automoc4') +depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control') +makedepends=('cmake' 'automoc4' 'boost' 'doxygen') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('93ef0f8498c44b86dc25539f0b4f55354dc566ec') +sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709') build() { mkdir build diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index bae5f452d..a47e7f087 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 182131 2013-04-08 00:47:59Z eric $ +# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-contact-list _pkgname=ktp-contact-list -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64' 'mips64el') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') depends=('telepathy-kde-common-internals' 'kdebase-runtime') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('2cb4bf8f7b5df1660027eab606d513b9cccebad5') +sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de') build() { mkdir build diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index 0f62878a2..391ed90b7 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182133 2013-04-08 00:48:26Z eric $ +# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-runner _pkgname=ktp-contact-runner -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="KRunner plugin for KDE Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('576642c35f2d03b7859e15a004590ed6cc321ebd') +sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821') build() { mkdir build diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD index d4d7dd3ac..1d228d835 100644 --- a/extra/telepathy-kde-desktop-applets/PKGBUILD +++ b/extra/telepathy-kde-desktop-applets/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182019 2013-04-05 09:11:00Z andrea $ +# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-desktop-applets _pkgname=ktp-desktop-applets -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="The KDE-Telepathy Plasma desktop applets" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('890ea9e21b56d794c079e6437ef8a3d356eeb4af') +sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07') build() { mkdir build diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 4e240e467..431f0701d 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182135 2013-04-08 00:49:01Z eric $ +# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler _pkgname=ktp-filetransfer-handler -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6c061a13f483fd14d3ef184d1008e4f8002e46a8') +sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214') build() { mkdir build diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 7b9f3f293..02605f9dc 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182137 2013-04-08 00:49:44Z eric $ +# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module _pkgname=ktp-kded-integration-module -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('eb1fc514199587b018036bc307d385766fc40094') +sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930') build() { mkdir build diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 775bf6534..888539576 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182139 2013-04-08 00:50:17Z eric $ +# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file _pkgname=ktp-send-file -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('bc3b7832c88a866b396d5358c20c3a1f3a0048d2') +sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00') build() { mkdir build diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index ebe0e20a5..bce31e164 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182141 2013-04-08 00:51:21Z eric $ +# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-text-ui _pkgname=ktp-text-ui -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('87a519f132cc338b7f1f47aa8997e89f9f566bfd') +sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b') build() { mkdir build diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 8d35420c9..dbe4ca569 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180543 2013-03-23 00:31:47Z tomegun $ +# $Id: PKGBUILD 182997 2013-04-16 18:42:01Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.0.6 +pkgver=1.1.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64' 'mips64el') @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('936a2590aea69fa3c0cf234d54b9137c') +md5sums=('d2dc9398a83692cafc16eba6e45f85d8') diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD index ade9eedff..2ce3dc6ab 100644 --- a/extra/xf86-video-vmware/PKGBUILD +++ b/extra/xf86-video-vmware/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182671 2013-04-12 14:13:36Z andyrtr $ +# $Id: PKGBUILD 183093 2013-04-17 14:08:02Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vmware -pkgver=13.0.0 -pkgrel=3 +pkgver=13.0.1 +pkgrel=1 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -13,13 +13,11 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) -sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6' - '9322d467d2111be4049e8649b1d2729a2a2ab35cc9769cfee5be63f18e176938') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git-fixes.patch ./configure --prefix=/usr --enable-vmwarectrl-client make } diff --git a/extra/xf86-video-vmware/git-fixes.patch b/extra/xf86-video-vmware/git-fixes.patch deleted file mode 100644 index f1cde34aa..000000000 --- a/extra/xf86-video-vmware/git-fixes.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001 -From: Zack Rusin <zackr@vmware.com> -Date: Thu, 14 Feb 2013 22:33:01 +0000 -Subject: Kill mibstore - -It was a noop for at least 5 years and it has been removed. - -Signed-off-by: Zack Rusin <zackr@vmware.com> ---- -diff --git a/saa/saa_priv.h b/saa/saa_priv.h -index 6652054..5d81453 100644 ---- a/saa/saa_priv.h -+++ b/saa/saa_priv.h -@@ -48,7 +48,6 @@ - #include "pixmapstr.h" - #include "windowstr.h" - #include "servermd.h" --#include "mibstore.h" - #include "colormapst.h" - #include "gcstruct.h" - #include "input.h" -diff --git a/src/vmware.c b/src/vmware.c -index 41201f1..6b74e14 100644 ---- a/src/vmware.c -+++ b/src/vmware.c -@@ -23,7 +23,6 @@ char rcsId_vmware[] = - #include "xf86Pci.h" /* pci */ - - #include "mipointer.h" /* sw cursor */ --#include "mibstore.h" /* backing store */ - #include "micmap.h" /* mi color map */ - #include "vgaHW.h" /* VGA hardware */ - #include "fb.h" -@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) - * If backing store is to be supported (as is usually the case), - * initialise it. - */ -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index 9959ffb..7863ba2 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL) - (ms->only_hw_presents) ? "enabled" : "disabled"); - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); --- -cgit v0.9.0.2-2-gbebe -From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001 -From: Loïc Yhuel <loic.yhuel@gmail.com> -Date: Thu, 11 Apr 2013 09:29:10 +0000 -Subject: vmwgfx: Use myGlyphs to fix crashes - -Tested-by: Christian Hesse <mail@eworm.de> -Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> -Signed-off-by: Loïc Yhuel <loic.yhuel@gmail.com> -Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> ---- -diff --git a/saa/saa_render.c b/saa/saa_render.c -index c69f2c9..c6ce68c 100644 ---- a/saa/saa_render.c -+++ b/saa/saa_render.c -@@ -406,6 +406,8 @@ saa_render_setup(ScreenPtr pScreen) - saa_wrap(sscreen, ps, Trapezoids, saa_trapezoids); - saa_wrap(sscreen, ps, Triangles, saa_triangles); - saa_wrap(sscreen, ps, Composite, saa_composite); -+ saa_wrap(sscreen, ps, Glyphs, miGlyphs); -+ saa_wrap(sscreen, ps, UnrealizeGlyph, miUnrealizeGlyph); - } - } - -@@ -419,6 +421,8 @@ saa_render_takedown(ScreenPtr pScreen) - saa_unwrap(sscreen, ps, Trapezoids); - saa_unwrap(sscreen, ps, Triangles); - saa_unwrap(sscreen, ps, Composite); -+ saa_unwrap(sscreen, ps, Glyphs); -+ saa_unwrap(sscreen, ps, UnrealizeGlyph); - } - } - #endif --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 409ee567c..398e39971 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180178 2013-03-18 16:08:50Z andyrtr $ +# $Id: PKGBUILD 183085 2013-04-17 12:51:32Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.14.0 -pkgrel=2 +pkgver=1.14.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -24,7 +24,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 10-quirks.conf loongson.patch git-fixes.patch) -sha256sums=('1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630' +sha256sums=('a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 296bea51a..c5b27882b 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $ +# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -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}.7 +pkgver=${_basekernel}.8 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'f83582104813c022e6739e12664dbb0c' + 'cc93810441658cdf40a4bc051f8f4774' '6294513cfa9830d48ad1915ff7053a98' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 1e8ed6868..69d8bc984 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.7-1-LIBRE-PAE +KERNEL_VERSION=3.8.8-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-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 45759cd92..e34f4919e 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $ +# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -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}.7 +pkgver=${_basekernel}.8 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'f83582104813c022e6739e12664dbb0c' + 'cc93810441658cdf40a4bc051f8f4774' '2708b6f03f827e2c94ecbd050df4286d' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index f9430058d..c385956af 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.7-1-LIBRE-XEN +KERNEL_VERSION=3.8.8-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/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 5b102846c..f3135dc8b 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgbase=icedove-l10n -_pkgver=17.0.4 -pkgver=17.0.4.1 +_pkgver=17.0.5 +pkgver=17.0.5.1 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) @@ -11,7 +11,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -pkgrel=2 +pkgrel=1 pkgdesc="Language packs for Debian Icedove." arch=('any') url="http://packages.debian.org/experimental/icedove" @@ -64,58 +64,58 @@ done md5sums=('d5b2567a8cc8f64591f313a6efdaaffc' 'f3719964e893c1002b7a923e8f95f923' - '206f1ef0917d6c072edef7e5d77a9ec6' - 'dfcdea2b4ae57a3fa98a60fd1d90beff' - '25271fbc262c9379b7b9c04798d9a57e' - 'cef8ef756ae9bd611d8c92435ce3d550' - 'aee21b8e9835361d7fad9cabc26176ec' - '9cc55cfc826cfebdb52d471d4683e2ad' - 'efb76f4fc5b66e6936a3a64ebb6a11b9' - '365ca3b65ec2ca0f6aba405172f909fc' - '02e296fa634c03dc1b8d71dd7c2e445f' - 'e300d530881628b012e4071c5b1ac1e7' - '5bd79ebfb86e8939d480b49abd484370' - '09acd6af201f415d169b8019c0bb3929' - '9205fbc01cee7caf8578cd845596542a' - '7fd2672aa378a5c6b3d4d33eb71dff9d' - '8babeccaefc144d7798fb22446a72395' - '834b93522fb7875bc6fc3551d90a9b75' - 'd690f9d0e0f3317ab500e711692c5684' - 'bfe0b4a94a02e0ca8da411b58c17a5a1' - '4156b699bb0dbbf073893cbef96db478' - '1f8527f158f5bcacfde1e9b259769c14' - 'c7fb6f52652ffeb7b7c09f27c73ee32b' - '6b57787b83b27a80c175b197d9a0fd8f' - '9a30b1017efa98e4c392a367341e7d5b' - '6e5d20da97211e9f72cc537327783f4d' - '0d0cd95f0e1765c1f56a39609533efa3' - '34773b8acd0e23d99918969a3a86159e' - 'bc1b94e53e3f6d5e716ceb7d4979e278' - 'bf577e83fc52e94164426d7a9dcc10b0' - '4328456c0a54334e020b643c37328eec' - '7232b4d0faf2f10f7fd6c7e05ef84d7a' - '11ada83816bcdea125dff74022acd715' - '0d6100971791dbac333cb24f8fa81c7b' - '685315fce2d77b64f58133d5d405200f' - 'e5f15fc603190c6bb0a0cdfe6bf5e863' - 'f2d4a099467f09b49f1bed06812d60d6' - '88b0177d8342a6aae79c1cba74e6c041' - 'e19d3f90b9d41f9e7749875a1e2c037b' - '8e956438b49d548431728758206a101e' - '6597b2bbf2c9bf8af88d4b707400df24' - '794a9831d1f3c43156ec3f85f155f1e2' - '9b8e8f1fcc2bf891c1273b9470f95af5' - '7b423d358869c35dde53015f800e0dbd' - 'a8258e8427d4961a509dc980f9a56986' - 'f7be2a19d5046c5ec537b3248d0107b0' - '2d892a7f25a10d4607b76e2ce65743e5' - '6f2391fdfc198177f65c407ac3d10ce2' - '7e53185c09b5672f08573e3e96150ad1' - 'fa4528be1f856b9f612af643ff2d1675' - '983b51b70b7e57a8bf3b956adc309f88' - 'efc16a35ab9cff05473ff3e5f2cbf7ee' - 'f9456837c567d422ac2e69fd72598089' - '9dcbf6fc85bfc768d784cb3bd764c103' - '302d409e53f598e830d8b180f108586e' - '5e21d7621b87a639c41c5fc6245203df' - '317e9a8bc1ca22a1f89d6898cca19500') + 'ef463b3772f804beb4108e15917485fd' + '6125a2e91119afe4cd4fb78909bc2168' + '990067ee981db3bf9873e4bd9b2b1eba' + 'e32d496230cba49a435775359d4485ce' + 'd212d8bc244184e816cf36a9b654e7e6' + '4a83b506d1b81dfffa0b33bc0f12b24f' + '6349985a77b2db81a43cb22291bfd972' + 'dd4a259bfa4ce6816c55e9d7ff7f1172' + 'dc3ec06ccb5e98cfa332fca40af77470' + 'e81e63d8fac6c61cbbe72b1c8b0ce05c' + 'f0850f83f396c33a4e69abd00bda0e55' + 'ffc5de6b5409cf7cdd411ae853e0ba05' + '169780df5d160a04221dd80c92dd131a' + '8d1eacb770748156dbe02e493c41a5a6' + 'a3a0d856da6af722a6444567b684eb14' + '798415f06ce916eb6c84ea4cf97e1253' + 'c8eefe6a65295d354beb59e8f1b3116e' + '3ec1490226e064bc1145072ecdf031b4' + 'a3ff2959c9375084683b0741797103f9' + '99ea64506470bf7938e169bfe5f569b3' + '8170d58dcbb1b84820ef0ace6dc23965' + '24ba56f81446d551101d1848ed660682' + '53b9b22f7ad5916c8dfccd8b758828dc' + '0bdcd2f628dff58a4544e93a88344b76' + '87d516fbb68ae06d5ee7439a8a4d3d96' + 'c3cfa07d55fec1eb558e11c63ebd2a97' + '9845802371f603cb70df77a63088c16d' + '552e297a315a1b6f308604da4b492c53' + 'dc6755c33351b95f9e883c8e64fab7b6' + 'f3a67c52f5c5ca8cd5484250617f1aff' + '48fc583c7e67e87113fb73243da46313' + '4450b7753336f279296260e444cb0ba2' + '3a639521e20e5fb936f6d1b7679becd9' + '241a29846743f4dbcd5704e470193f30' + '71d71192e076a889da26129efd5f2f3d' + 'efc91beb8c199d459e1f24164066d75e' + 'ed717c1b94618faa8304796f1ff0acd7' + '8fc0aea02c1373f0ac0b7fa7eac2fa0c' + '808c60d4af8ee7b6bbbd82a5079c293e' + '6f0e4c6fe66e6d0e98f2fc444b59d629' + 'bc5e9972f5a092f4f28f577f7ade7ad7' + '2f852610ddc1550200965d4be6320879' + '6ad80cd433ef69c3577bfea9fd26cedc' + '0dd02b5317c9656c64543067956940bf' + '9e0d2f288130f048358135a89732ca85' + '936dbda4758d9a65f8c27603a2dee3bd' + '820d70ce31ca9731c162ab942b0daea1' + 'd737350d9edb73c15096e867fbdd8f3c' + 'b1896502d411dd6037f141d3561461d4' + '491a3a386c4963f162e050c370ffa140' + 'aa9f4e83501e624e4054f3ff61b71db3' + '257ee623933cfda550a8643a1a0b1d1c' + 'c3a8fa4fc511d914892e08fa17fab8a9' + '44be6381519c6c5ea785a4f5a5122a64' + '6693c752bf6272caed2e204556fc69b8') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index a6825ea97..b16e32620 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Experimental _debname=icedove -_debver=17.0.4 +_debver=17.0.5 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -26,17 +26,17 @@ install=${_pkgname}.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig - channel-prefs.js + replace-urls.txt vendor.js makefile.patch branding.patch ${_pkgname}.desktop Icedove-branding.patch) options=(!emptydirs) -md5sums=('26ce85189f3b55cc2c97c57e18c1e2de' - 'fafa558c1940a48c3f29de61dc27d737' +md5sums=('0c68298c17757257da79b6bb39e3fd10' + 'eb2a5e1877d87a16e10388f533c081a6' '5cf95ea94f69cdd36604890cfbf7b954' - '476ec205162340fb0679f522c9d31c3b' + 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' 'c4ed43e85945e180a89cce03e45ec62c' '126b1446212396c33220936c01d9592d' @@ -72,6 +72,17 @@ prepare() { patch -Np1 -i "${srcdir}/branding.patch" # fixing branding patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version + # Replace common URLs + sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do + if [[ -n $moz_url ]]; then + printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" + grep -Erl "${moz_url}" \ + --exclude='*.'{patch,orig,rej} \ + --exclude-dir={.pc,test,tests,testing} \ + | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" + fi + done + cp "${srcdir}/mozconfig" .mozconfig # configure script misdetects the preprocessor without an optimization level @@ -82,7 +93,7 @@ prepare() { build() { cd "${srcdir}/${DEBIAN_BUILD}" - export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" + export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}" export PYTHON="/usr/bin/python2" make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" @@ -95,9 +106,6 @@ package() { install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js" - # Recommend free addons - install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref/channel-prefs.js" - for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png" done @@ -110,6 +118,7 @@ package() { ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${_pkgname}/dictionaries" ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${_pkgname}/hyphenation" ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins" + # We don't want the development stuff rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl} } diff --git a/libre/icedove-libre/channel-prefs.js b/libre/icedove-libre/channel-prefs.js deleted file mode 100644 index 13b1ba388..000000000 --- a/libre/icedove-libre/channel-prefs.js +++ /dev/null @@ -1,9 +0,0 @@ -//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js" -pref("app.update.channel", "default"); - -//Recommend free addons -pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt new file mode 100644 index 000000000..fc13e32fb --- /dev/null +++ b/libre/icedove-libre/replace-urls.txt @@ -0,0 +1,25 @@ +# These are replaced in order, so if one is a subset of another, the smaller one should be last +# These are whitespace-separated EREs, comments are lines starting with '#' + +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell- +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/ +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html" +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html + +https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html + +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/ + +https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php +#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php +#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php + +"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html" + +# hack: these aren't URLs, per se +(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index d6dc1c328..6c04db17b 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.8.7 +_kernver=3.8.8 _kernrel=1 pkgname=('linux-libre-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 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 1963f2536..d7902119f 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.73 +_kernver=3.0.74 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=11 +pkgrel=12 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 df302a20d..f4341cb83 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182731 2013-04-13 15:31:06Z tpowa $ +# $Id: PKGBUILD 183082 2013-04-17 12:40:54Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -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=73 +_sublevel=74 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.72 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.73 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ 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' - '846a503d4bacfaca417fbea67aceabc2' + 'a0984b44eba8de48e20357c9c146baf6' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '5d433e634f9744824a5a3122d734e6f6') + '624eacedd2a576161512ffefc1797bc1') 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/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index c3aff92ae..b8118b60d 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.73-1-LIBRE-LTS +KERNEL_VERSION=3.0.74-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 2b8af7675..be6d04b4d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $ +# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -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=7 +_sublevel=8 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,7 +31,7 @@ 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' - 'f83582104813c022e6739e12664dbb0c' + 'cc93810441658cdf40a4bc051f8f4774' '9b425f069f920cdd6798b3adab79d3af' '9316ebdb21ea9948ae5c83795a3dcf61' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '5629a56818c1875bcc77a51c69347d98') + 'fead20edc727fbb89789194eaebb6daa') 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/linux-libre.install b/libre/linux-libre/linux-libre.install index 46f383749..c6fa71c97 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.7-1-LIBRE +KERNEL_VERSION=3.8.8-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/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index bdc8b63c0..0634f6f6c 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182068 2013-04-06 09:25:55Z tpowa $ +# $Id: PKGBUILD 183118 2013-04-17 16:51:39Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=41 +pkgrel=42 epoch=1 _extramodules=extramodules-3.8-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar lirc_atiusb-kfifo.patch kernel-2.6.39.patch linux-3.8.patch - lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd + lirc.logrotate lirc.service lircm.service irexec.service lirc.tmpfiles) @@ -82,13 +82,10 @@ package_lirc-utils-libre() { replaces=('lirc-utils') conflicts=('lirc-utils') provides=("lirc-utils=$pkgver") - backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') install=lirc-utils.install cd "${srcdir}/lirc-${pkgver}" make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" - cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service @@ -99,12 +96,6 @@ package_lirc-utils-libre() { # install the logrotate config install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" - # install conf.d file - install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf" - - # install conf.d file - install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf" - install -d "${pkgdir}/etc/lirc" # remove built modules @@ -116,12 +107,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '1f8b104a2365d9f93404b143f499059b' '087a7d102e1c96bf1179f38db2b0b237' '9ee196bd03ea44af5a752fb0cc6ca96a' - '8d0e238dc0eda95e340fe570605da492' - '85f7fdac55e5256967241864049bf5e9' '3deb02604b37811d41816e9b4385fcc3' - '5b1f8c9cd788a39a6283f93302ce5c6e' - 'f0c0ac930326168035f0c8e24357ae55' - '69d099e6deedfa3c1ee2b6e82d9b8bfb' 'dab8a73bcc5fd5479d8750493d8d97dc' 'c2e20fe68b034df752dba2773db16ebe' '07131d117fcfe9dcd50c453c3a5e9531' diff --git a/libre/lirc-libre/irexec.conf b/libre/lirc-libre/irexec.conf deleted file mode 100644 index f911c7515..000000000 --- a/libre/lirc-libre/irexec.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters for irexec daemon (path to lircrc) -# - -IREXEC_OPTS=""
\ No newline at end of file diff --git a/libre/lirc-libre/irexecd b/libre/lirc-libre/irexecd deleted file mode 100644 index a64b033a5..000000000 --- a/libre/lirc-libre/irexecd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/irexec.conf - -PID=`pidof -o %PPID /usr/bin/irexec` -case "$1" in - start) - stat_busy "Starting IREXEC Daemon" - [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon irexecd - stat_done - fi - ;; - stop) - stat_busy "Stopping IREXEC Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irexecd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/libre/lirc-libre/lircd b/libre/lirc-libre/lircd deleted file mode 100644 index e9739b36e..000000000 --- a/libre/lirc-libre/lircd +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/lircd.conf - -PID=$(pidof -o %PPID /usr/sbin/lircd) -LIRCD_SYMLINKFILE=/dev/lircd -LIRCD_SOCKET=/var/run/lirc/lircd -case "$1" in - start) - stat_busy "Starting LIRC Daemon" - [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null - rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE - if [ $? -ne 0 ]; then - stat_fail - exit 0 - fi - [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS" - [ -z "$PID" ] && - if [ -n "$LIRC_DEVICE" ] ; then - eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE - else - /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE - fi - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lircd - stat_done - fi - ;; - stop) - stat_busy "Stopping LIRC Daemon" - rm -f $LIRCD_SYMLINKFILE - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lircd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 start|stop|restart" -esac -exit 0 diff --git a/libre/lirc-libre/lircd.conf b/libre/lirc-libre/lircd.conf deleted file mode 100644 index 760dab065..000000000 --- a/libre/lirc-libre/lircd.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Parameters for lirc daemon -# - -LIRC_DEVICE="/dev/lirc0" -LIRC_DRIVER="" -LIRC_EXTRAOPTS="" -LIRC_CONFIGFILE="" diff --git a/libre/lirc-libre/lircmd b/libre/lirc-libre/lircmd deleted file mode 100644 index 220c47c9c..000000000 --- a/libre/lirc-libre/lircmd +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/lircmd` -case "$1" in - start) - stat_busy "Starting lircmd Daemon" - [ -z "$PID" ] && /usr/sbin/lircmd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lircmd - stat_done - fi - ;; - stop) - stat_busy "Stopping lircmd Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lircmd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index a9464f1fd..172e318c5 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.12 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index d6d50f425..59816a051 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 _extramodules=extramodules-3.8-LIBRE -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD index dd132dd35..6794b3aca 100644 --- a/pcr/babeld/PKGBUILD +++ b/pcr/babeld/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer (AUR): Yann Lopez <arch at lonewulf dot net> # Maintainer (Parabola): fauno <fauno@parabola.nu> pkgname=babeld -pkgver=1.3.4 -pkgrel=2 +pkgver=1.3.5 +pkgrel=1 pkgdesc="Loop-free distance-vector routing protocol" arch=(i686 x86_64 mips64el) url="http://www.pps.jussieu.fr/~jch/software/babel/" @@ -10,8 +10,6 @@ license=('custom') depends=(glibc) source=(http://www.pps.jussieu.fr/~jch/software/files/$pkgname-$pkgver.tar.gz{,.asc}) install=babeld.install -md5sums=('37be1cbcc23cd00ee47efc9157c58795' - 'e2dfae49b497ba70c0c1014feae80f3a') build() { cd "$srcdir/$pkgname-$pkgver" @@ -30,3 +28,5 @@ package() { install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE } +md5sums=('55f3df2429f4cf7816fce312591ba488' + 'SKIP') diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD index c7db21793..0a02eba94 100644 --- a/pcr/gnuhealth/PKGBUILD +++ b/pcr/gnuhealth/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=gnuhealth -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="A free Health and Hospital Information System" arch=(any) @@ -10,7 +10,7 @@ url="http://health.gnu.org/" license=('GPL3') depends=('trytond') source=("http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz") -md5sums=('2273870ccd77a24ac21b398d095a29b5') +md5sums=('d3837242011df1d39ce7a0f1d6e6a46a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 5698ac14f..88f951d03 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -17,6 +17,9 @@ source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any # citeproc-hs-pre-0.3.7.patch) conflicts=('haskell-pandoc') optdepends=('texlive-most: for pdf creation') +md5sums=('74acd042fcd85bee9edb093cc3fe5c2e' + 'SKIP' + 'ee9d5924632ac07b5049be834a1ed054') # PKGBUILD functions build() { @@ -87,6 +90,3 @@ package() { install -d ${pkgdir}/usr/share cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/ } -md5sums=('74acd042fcd85bee9edb093cc3fe5c2e' - 'SKIP' - '0d5b6d7adf6fdcea52dcbb7b62368b19') diff --git a/pcr/python2-pycha/PKGBUILD b/pcr/python2-pycha/PKGBUILD new file mode 100644 index 000000000..4c9cf4ea4 --- /dev/null +++ b/pcr/python2-pycha/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jakub Klinkovský <kuba.klinkovsky@gmail.com> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> +pkgname=python2-pycha +pkgver=279 +pkgrel=1 +pkgdesc="Pycha is a very simple Python package for drawing charts using the great Cairo library." +arch=('any') +url="http://bitbucket.org/lgs/pycha/" +license=('LGPL') +depends=('pycairo') +makedepends=('mercurial' 'python2-distribute') + +_hgroot="https://bitbucket.org/lgs/pycha" +_hgrepo="pycha" + +build() { + cd "$srcdir" + msg "Connecting to Mercurial server...." + + if [[ -d "$_hgrepo" ]]; then + cd "$_hgrepo" + hg pull -u + msg "The local files are updated." + else + hg clone "$_hgroot" "$_hgrepo" + fi + + msg "Mercurial checkout done or server timeout" +} + +package() { + cd "$srcdir/$_hgrepo" + msg "Starting build..." + python2 setup.py install --root=$pkgdir +} diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD index 497a50920..fcaae5c7a 100644 --- a/pcr/python2-relatorio/PKGBUILD +++ b/pcr/python2-relatorio/PKGBUILD @@ -1,21 +1,35 @@ -# Contributor: Florian Walch <florian.walch@gmx.at> -# Maintainer: Thomas Bahn <Thomas-Bahn@gmx.net> +# Maintainer: Jakub Klinkovský <kuba.klinkovsky@gmail.com> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=python2-relatorio -pkgver=0.5.6 -pkgrel=2 -pkgdesc="A templating library able to output odt and pdf files" -arch=('i686' 'x86_64' 'mips64el') +pkgver=183 +pkgrel=1 +pkgdesc="Relatorio is an OpenHex and B2CK project to easily create reports in a variety of formats (openoffice text, PDF, XHTML) from python objects." +arch=('any') url="http://relatorio.openhex.org" license=('GPL') -depends=('python2-genshi>=0.5' 'python2-lxml>=1.3.6') -makedepends=('python2-distribute') -source=("http://pypi.python.org/packages/source/r/relatorio/relatorio-$pkgver.tar.gz") +depends=('python2-genshi' 'python2-lxml' 'python2-yaml' 'python2-pycha') +makedepends=('mercurial' 'python2-distribute') + +_hgroot="http://hg.openhex.org/hgwebdir.cgi/relatorio" +_hgrepo="relatorio" build() { - cd $srcdir/relatorio-$pkgver - chmod 644 relatorio.egg-info/* - python2 setup.py install --root=$pkgdir -} + cd "$srcdir" + msg "Connecting to Mercurial server...." + if [[ -d "$_hgrepo" ]]; then + cd "$_hgrepo" + hg pull -u + msg "The local files are updated." + else + hg clone "$_hgroot" "$_hgrepo" + fi -md5sums=('944fb60fadaff451ab6ee8818de516ad') + msg "Mercurial checkout done or server timeout" +} + +package() { + cd "$srcdir/$_hgrepo" + msg "Starting build..." + python2 setup.py install --root=$pkgdir +} diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD index b270df368..a34a8890f 100644 --- a/pcr/trytond/PKGBUILD +++ b/pcr/trytond/PKGBUILD @@ -3,12 +3,12 @@ pkgname=trytond pkgver=2.6.3 _pkgdir=2.6 -pkgrel=1 +pkgrel=2 pkgdesc="A three-tiers high-level general purpose application platform (server application)" arch=('any') url="http://www.tryton.org/" license=('GPL3') -depends=('python2>=2.4' 'python-lxml' 'python2-egenix-mx-base' 'python2-relatorio>=0.2.0' 'python2-genshi>=0.5' 'python2-polib') +depends=('python2>=2.7' 'python-lxml' 'python2-egenix-mx-base' 'python2-relatorio>=183' 'python2-genshi>=0.6' 'python2-polib') optdepends=('python-psycopg2: support for PostgreSQL database' 'python-pywebdav: support for WebDAV feature' 'pydot: support for displaying workflow graphs' @@ -23,7 +23,7 @@ md5sums=('0dd81769fc18fe2d20e83de4f17cb10d' '768e68c01cb5913e36ea89c67fc98038' 'b1535a8528dfd8f655624bf6faea6985') -build() { +package() { cd $srcdir/$pkgname-$pkgver python2 setup.py install --root=$pkgdir install -D -m644 etc/trytond.conf $pkgdir/etc/trytond.conf |