diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-04 10:30:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-04 10:30:49 +0100 |
commit | ad63cdb5324392490de7e1f70ad3256ebf32603d (patch) | |
tree | cd8e31855114a730c3901f80e341c2f4486ba473 /community | |
parent | 8288f4022c5673fa36117598c7e7a3f6c2dfb1e2 (diff) | |
parent | f0fa42126da9e3eec6b98388b35c67929fa20dae (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/radvd/PKGBUILD
extra/samba/PKGBUILD
extra/tftp-hpa/PKGBUILD
libre/linux-libre/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib/wine/PKGBUILD
testing/gcc/PKGBUILD
testing/sudo/PKGBUILD
Diffstat (limited to 'community')
-rw-r--r-- | community/kadu/PKGBUILD | 8 | ||||
-rw-r--r-- | community/nodejs/PKGBUILD | 6 | ||||
-rw-r--r-- | community/radvd/PKGBUILD | 48 | ||||
-rw-r--r-- | community/radvd/radvd.conf | 3 | ||||
-rw-r--r-- | community/radvd/radvd.rc | 34 | ||||
-rw-r--r-- | community/radvd/radvd.service | 8 | ||||
-rw-r--r-- | community/rekonq/PKGBUILD | 13 | ||||
-rw-r--r-- | community/rekonq/fix-build.patch | 11 | ||||
-rw-r--r-- | community/roxterm/PKGBUILD | 10 |
9 files changed, 106 insertions, 35 deletions
diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index 3cf71a0b3..b01650f9f 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63896 2012-02-06 16:45:24Z tdziedzic $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 66946 2012-03-02 16:54:51Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski # Contributor: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.11.0 +pkgver=0.11.1 pkgrel=1 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('480377508522fe088dd78452d06c5972') +md5sums=('30c239876fd0fd4eadb874c3cb2ebe10') build() { cd "$srcdir" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index d3332ebf4..7cd403639 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64710 2012-02-18 00:19:36Z tdziedzic $ +# $Id: PKGBUILD 66966 2012-03-02 23:22:53Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -7,7 +7,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.6.11 +pkgver=0.6.12 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('2f554353e831b8a22e6a85c676374374') +md5sums=('a12766ae4003c9712927d1fa134ed9f6') build() { cd node-v${pkgver} diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index afe2ca3ec..a8aaa6d61 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,38 +1,48 @@ -# $Id: PKGBUILD 66535 2012-02-25 23:57:00Z lfleischer $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# $Id: PKGBUILD 66970 2012-03-03 00:47:31Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd -pkgver=1.8.2 -pkgrel=2 -pkgdesc='IPv6 Router Advertisement / Router Solicitation daemon' +pkgver=1.8.5 +pkgrel=1 +pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' license=('custom') depends=('glibc') arch=('i686' 'x86_64' 'mips64el') -install=radvd.install -source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" 'radvd.rc.d') -md5sums=('ac8a862d2b232d25ea2622274a2da8a4' - '65a585f5850a1ac2a0c2c2a7096ec92a') +backup=('etc/radvd.conf' 'etc/conf.d/radvd') +source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" + "$pkgname.rc" + "$pkgname.conf" + "$pkgname.service") +sha1sums=('344c145bd29938b7eefb0210cf92bf18df3e191d' + '7b187db1f0ba2897cc07ea14233c079593b69ef0' + 'd7755ac7e752452e5ac92d2bfd970db00525902d' + 'd95dc4d650a086641d62bf42806669e0a407d1df') build() { cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ + ./configure --prefix=/usr --sysconfdir=/etc --with-pidfile=/run/radvd.pid \ --mandir=/usr/share/man - make } package() { cd ${pkgname}-${pkgver} + make DESTDIR="$pkgdir" install - make DESTDIR=$pkgdir install + # install default config + install -D -m 644 radvd.conf.example "$pkgdir/etc/radvd.conf" - install -Dm644 radvd.conf.example \ - $pkgdir/usr/share/doc/radvd/radvd.conf.example - install -Dm644 COPYRIGHT \ - $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT - install -Dm755 $srcdir/radvd.rc.d $pkgdir/etc/rc.d/radvd + # install license + install -D -m 644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" + + # install initscripts & systemd files + install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -D -m 644 ../$pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + install -D -m 644 ../$pkgname.service \ + "$pkgdir/lib/systemd/system/$pkgname.service" } + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/radvd/radvd.conf b/community/radvd/radvd.conf new file mode 100644 index 000000000..26cd410d1 --- /dev/null +++ b/community/radvd/radvd.conf @@ -0,0 +1,3 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +DAEMON_OPTS='--logmethod syslog' diff --git a/community/radvd/radvd.rc b/community/radvd/radvd.rc new file mode 100644 index 000000000..b5dc6e27b --- /dev/null +++ b/community/radvd/radvd.rc @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/${0##*/} + +NAME='IPv6 Router Advertisement Daemon' +DAEMON=/usr/sbin/radvd +PID=$(pidof -o %PPID $DAEMON) + +case "$1" in + start) + stat_busy "Starting $NAME daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0 + stat_fail + ;; + stop) + stat_busy "Stopping $NAME daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0 + stat_fail + ;; + restart) + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; +esac + +exit 1 + +# vim:set ts=2 sw=2 ft=sh noet: diff --git a/community/radvd/radvd.service b/community/radvd/radvd.service new file mode 100644 index 000000000..47a5f7f67 --- /dev/null +++ b/community/radvd/radvd.service @@ -0,0 +1,8 @@ +[Unit] +Description=IPv6 Router Advertisement Daemon + +[Service] +ExecStart=/usr/sbin/radvd --nodaemon --logmethod stderr + +[Install] +WantedBy=multi-user.target diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index f72b5a364..c6ed1f53d 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60395 2011-12-13 10:24:06Z plewis $ +# $Id: PKGBUILD 66942 2012-03-02 15:35:36Z andrea $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq -pkgver=0.8.1 +pkgver=0.9.0 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,15 @@ license=('GPL') depends=('kdebase-keditbookmarks') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('907c3bd299ee95806d337b749c74531441e0d205055998678337266ccc6c9b7f') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'fix-build.patch') +sha256sums=('2dc4f9b041bba89937c3278f53cbcc61964d3e2e2279dd44000c19902459b6cc' + '3ef9f0e6dc37f479c7cc38d84f6a6366a499f371610df01bcdaff9f4b71d246e') build(){ + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fix-build.patch + cd ${srcdir} mkdir build cd build diff --git a/community/rekonq/fix-build.patch b/community/rekonq/fix-build.patch new file mode 100644 index 000000000..1a401ce2c --- /dev/null +++ b/community/rekonq/fix-build.patch @@ -0,0 +1,11 @@ +--- rekonq-0.9.0/doc/nl/index.docbook~ 2012-03-02 15:31:21.730372412 +0000 ++++ rekonq-0.9.0/doc/nl/index.docbook 2012-03-02 15:31:48.780152894 +0000 +@@ -82,7 +82,7 @@ + ></surname + > </personname> + </author> +-&ged.vertaald;&Freek.de.Kruijf; ++&Freek.de.Kruijf; + </authorgroup> + <legalnotice + >&FDLNotice;</legalnotice> diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 66bbc18d0..632fb473b 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62568 2012-01-21 14:00:13Z ttopper $ +# $Id: PKGBUILD 66956 2012-03-02 19:09:35Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm -pkgver=2.4.2 -pkgrel=2 +pkgver=2.5.2 +pkgrel=1 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64' 'mips64el') url="http://roxterm.sourceforge.net/" @@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm') makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg') install=roxterm.install source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2") -sha1sums=('663f5ffedebde550317cff4b3e61d2772881cd2f') -md5sums=('7c3bb1471f814a8bfdfcf169ad18e425') +sha1sums=('32d18b8a12f1711dc7bb5ae52300dc9eb6869e09') +md5sums=('d879ba09c4d72546fca2e2e5f18eac07') build() { |