diff options
94 files changed, 1066 insertions, 447 deletions
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index a5d28a5ca..3f8ac903d 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82585 2013-01-21 05:37:10Z bisson $ +# $Id: PKGBUILD 86998 2013-03-25 19:16:35Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd -pkgver=5.2.0 -pkgrel=2 +pkgver=5.2.1 +pkgrel=1 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins' 'libesmtp: notify_email plugin' 'libgcrypt: encryption and authentication for network plugin' 'libmemcached: memcachec plugin' - 'libmysqlclient: mysql plugin' + 'libmariadbclient: mysql plugin' 'iproute2: netlink plugin' 'net-snmp: snmp plugin' 'libnotify: notify_desktop plugin' @@ -32,7 +32,7 @@ optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins' 'yajl: curl_json plugin') makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached' - 'libmysqlclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping' + 'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping' 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors' 'libvirt' 'libxml2' 'xmms' 'yajl') @@ -42,7 +42,7 @@ source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'libperl.patch' 'service' 'rc.d') -sha1sums=('b56832913cbdc06ee370f89a57ed3c25ed16a88b' +sha1sums=('2c51c21d339c221bd9f94b1ee2b44b1e388d6b39' '245c098d121a4a05594553583310953b3a2f6461' 'b56907f532b9174e1b6995aadb518228d7464d3b' '0f441718d5519cb043b1130e5a1d0379078adbcc') @@ -76,5 +76,5 @@ package() { 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 magick ignores datarootdir + mv "${pkgdir}"/usr/man/man3 "${pkgdir}"/usr/share/man # perl man magic ignores datarootdir } diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index 8e5bd8bf8..daf1572a0 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85298 2013-02-28 15:36:02Z spupykin $ +# $Id: PKGBUILD 86999 2013-03-25 19:16:37Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam pkgver=3.10.2 -pkgrel=3 +pkgrel=4 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64') url="http://dspam.nuclearelephant.com/" @@ -13,8 +13,8 @@ backup=('etc/dspam/dspam.conf' 'srv/http/dspam/cgi-bin/subadmins') license=("GPL") depends=(readline libcap ncurses zlib openssl) -makedepends=('libmysqlclient' 'postgresql-libs' 'db' 'sqlite' 'libldap') -optdepends=('libmysqlclient: MySQL support' +makedepends=('libmariadbclient' 'postgresql-libs' 'db' 'sqlite' 'libldap') +optdepends=('libmariadbclient: MariaDB support' 'postgresql-libs: PostgreSQL support' 'db: BerkeleyDB support' 'sqlite: SQLite support' diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 836892a3b..46372974a 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 84836 2013-02-25 10:38:11Z spupykin $ +# $Id: PKGBUILD 87000 2013-03-25 19:16:38Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" license=('GPL') -depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmysqlclient') +depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmariadbclient') makedepends=('libpcap' 'unixodbc' 'python2') optdepends=('libpcap' 'unixodbc' 'python2') options=('!libtool' '!makeflags') diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD index c9b4a13e2..5a8d6fb89 100644 --- a/community/fssos-nsvs/PKGBUILD +++ b/community/fssos-nsvs/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 83140 2013-01-27 16:14:12Z pierre $ +# $Id: PKGBUILD 87001 2013-03-25 19:16:40Z bpiotrowski $ # Maintainer: Dale Blount <dale@archlinux.org> pkgname=fssos-nsvs pkgver=0.5 -pkgrel=9 +pkgrel=10 pkgdesc="NSVS for FSSOS" arch=('i686' 'x86_64') url="http://fssos.sourceforge.net/" license=('GPL') -depends=('bash' 'mysql') +depends=('bash' 'mariadb') backup=('etc/nsvsd.conf') options=('!libtool' '!makeflags') install=$pkgname.install diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD index a876ba89c..d7a6154d4 100644 --- a/community/gammu/PKGBUILD +++ b/community/gammu/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 73714 2012-07-14 13:31:58Z schiv $ +# $Id: PKGBUILD 87002 2013-03-25 19:16:41Z bpiotrowski $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=gammu pkgver=1.32.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU All Mobile Management Utilities" arch=('i686' 'x86_64') url="http://wammu.eu/" license=('GPL') -depends=('bluez' 'curl' 'libmysqlclient' +depends=('bluez' 'curl' 'libmariadbclient' 'postgresql-libs' 'python2' 'libusb') -makedepends=('cmake' 'doxygen' 'mysql') +makedepends=('cmake' 'doxygen' 'mariadb') optdepends=('dialog: support for the gammu-config script') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('8ea16c6b3cc48097a8e62311fe0e25b9') @@ -23,7 +23,8 @@ build() { # bash completion dir change sed -e 's,DESTINATION "/etc/bash_completion.d",DESTINATION "/usr/share/bash-completion/completions",' -i contrib/CMakeLists.txt - cmake . -DCMAKE_INSTALL_PREFIX="/usr" + cmake . -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib make } diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index 4093e87b1..1ecdf3f4c 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 82847 2013-01-25 01:53:13Z svenstaro $ +# $Id: PKGBUILD 87003 2013-03-25 19:16:43Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gdal -pkgver=1.9.1 +pkgver=1.9.2 pkgrel=1 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64') url="http://www.gdal.org/" license=('custom') -depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmysqlclient' 'postgresql-libs') -makedepends=('perl' 'swig') +depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs') +makedepends=('perl' 'swig' 'chrpath') optdepends=('postgresql: postgresql database support' - 'mysql: mysql database support' + 'mariadb: mariab database support' 'perl: perl binding support' 'swig: perl binding support') options=('!libtool') changelog=$pkgname.changelog source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz gdal-1.5.1-python-install.patch) -md5sums=('c5cf09b92dac1f5775db056e165b34f5' +md5sums=('3f39db89f4710269b3a8bf94178e07aa' '81afc1c26d29cee84aadb6924fe33861') build() { @@ -29,8 +29,8 @@ build() { # bug 23654 export LDFLAGS="$LDFLAGS -Wl,--as-needed" - cd ${srcdir}/$pkgname-$pkgver - patch -Np0 -i ${srcdir}/gdal-1.5.1-python-install.patch + cd "${srcdir}/$pkgname-$pkgver" + patch -Np0 -i "${srcdir}/gdal-1.5.1-python-install.patch" # python2 fixes sed -i 's_python python1.5_python2 python python1.5_' configure @@ -45,19 +45,24 @@ build() { # workaround for bug #13646 sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile - install -d ${pkgdir}/usr/lib/python2.7/site-packages/ make } package () { - cd ${srcdir}/$pkgname-$pkgver - - make DESTDIR=${pkgdir} install + cd "${srcdir}/$pkgname-$pkgver" + install -d "${pkgdir}/usr/lib/python2.7/site-packages/" + make DESTDIR="${pkgdir}" install # install license - install -D -m644 LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" #FS15477 clean up junks - rm -f ${pkgdir}/usr/bin/*.dox + rm -f "${pkgdir}"/usr/bin/*.dox + + # Remove RPATH + chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so + chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OGR/OGR.so + chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/GDAL.so + chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/Const/Const.so } diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index f778b0e78..b5fda8ae9 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83252 2013-01-28 16:49:38Z stephane $ +# $Id: PKGBUILD 87025 2013-03-25 19:19:10Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,7 +6,7 @@ pkgname=glom pkgver=1.22.0 -pkgrel=3 +pkgrel=4 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64') url="http://www.glom.org/" diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index b874f8a2e..ab0dd64e4 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83899 2013-02-06 13:13:38Z arodseth $ +# $Id: PKGBUILD 86967 2013-03-25 13:19:54Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -10,7 +10,7 @@ pkgname=go pkgver=1.0.3 -pkgrel=6 +pkgrel=7 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') @@ -18,8 +18,8 @@ url='http://golang.org/' license=('custom') depends=('perl' 'gawk') makedepends=('inetutils') -options=('!strip' '!emptydirs') -install=go.install +options=('!strip') +install="$pkgname.install" backup=('usr/lib/go/bin') source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" "$pkgname.sh") @@ -34,6 +34,7 @@ build() { elif [ "$CARCH" == 'i686' ]; then export GOARCH=386 else + # A friendly gesture to Arch Linux ARM export GOARCH=arm fi export GOROOT_FINAL=/usr/lib/go @@ -59,6 +60,7 @@ check() { elif [ "$CARCH" == 'i686' ]; then export GOARCH=386 else + # A friendly gesture to Arch Linux ARM export GOARCH=arm fi @@ -90,7 +92,7 @@ package() { install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f done - mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}} + mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site}} cp -r doc misc -t $pkgdir/usr/share/go ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD index be3937b83..6b2ade1d1 100644 --- a/community/gsql/PKGBUILD +++ b/community/gsql/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 63614 2012-02-05 12:00:35Z ibiru $ +# $Id: PKGBUILD 87004 2013-03-25 19:16:44Z bpiotrowski $ # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=gsql pkgver=0.2.2 -pkgrel=4 +pkgrel=5 pkgdesc="Integrated database development tool for GNOME" url="http://gsql.org/" license=('GPL') arch=('i686' 'x86_64') depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf' 'desktop-file-utils' 'libnotify') -makedepends=('libmysqlclient' 'postgresql-libs' 'libssh') -optdepends=('libmysqlclient' 'postgresql-libs' 'libssh') +makedepends=('libmariadbclient' 'postgresql-libs' 'libssh') +optdepends=('libmariadbclient' 'postgresql-libs' 'libssh') install=gsql.install options=(!libtool) source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD index a1a397598..c9f2b8b40 100644 --- a/community/gtranslator/PKGBUILD +++ b/community/gtranslator/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82444 2013-01-18 06:43:16Z jlichtblau $ +# $Id: PKGBUILD 87027 2013-03-25 19:19:12Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator pkgver=2.91.6 -pkgrel=1 +pkgrel=2 pkgdesc="An enhanced gettext po file editor for the GNOME" arch=('i686' 'x86_64') url="http://projects.gnome.org/gtranslator/" diff --git a/community/jad/PKGBUILD b/community/jad/PKGBUILD new file mode 100644 index 000000000..30c8ea509 --- /dev/null +++ b/community/jad/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 86961 2013-03-25 11:13:01Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: astaroth <astaroth_@web.de> + +pkgname=jad +pkgver=1.5.8e +pkgrel=4 +pkgdesc='Java decompiler' +license=('custom') +arch=('x86_64' 'i686') +url='http://www.varaneckas.com/jad' +source=("http://www.varaneckas.com/$pkgname/${pkgname}${pkgver//./}.linux.static.zip" + 'jad.html::http://www.varaneckas.com/jad') +sha256sums=('2878e19fc1fdd725b516f538a57b02aaec1b2d1e4b106d550230381ffa9c0c81' + '4acee94ff29fe01ea2a9c4c0b47f22fb5a93fc667ee2dd8b6740f7f36bcbcdf2') + +build() { + cd "$srcdir" + + grep '<code>' jad.html -A18 | sed 's:<code>::' | sed 's:</code>::' > LICENSE +} + +package() { + cd "$srcdir" + + install -Dm755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 Readme.txt "$pkgdir/usr/share/doc/$pkgname/README" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/krecipes/PKGBUILD b/community/krecipes/PKGBUILD index 3328af055..4eb8fb140 100644 --- a/community/krecipes/PKGBUILD +++ b/community/krecipes/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 87005 2013-03-25 19:16:45Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: shamrok <szamrok@gmail.com> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> @@ -7,14 +7,14 @@ pkgname=krecipes pkgver=2.0beta2 _pkgver=2.0-beta2 -pkgrel=2 +pkgrel=3 pkgdesc="A tool designed to make organizing your personal recipes collection fast and easy" arch=('i686' 'x86_64') url="http://extragear.kde.org/apps/krecipes/" license=('GPL') depends=('kdebase-runtime' 'qimageblitz' 'hicolor-icon-theme') makedepends=('cmake' 'automoc4' 'docbook-xsl') -optdepends=('mysql' 'postgresql') +optdepends=('matriadb' 'postgresql') install=${pkgname}.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.gz) md5sums=('4c01ccad7ad1409cb35c824a61250fe2') diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD index 4dc9e4d5d..df191ccd3 100644 --- a/community/libdbi-drivers/PKGBUILD +++ b/community/libdbi-drivers/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64177 2012-02-09 17:50:10Z ttopper $ +# $Id: PKGBUILD 87006 2013-03-25 19:16:46Z bpiotrowski $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Olivier Médoc <o_medoc@yahoo.fr> # Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil.Arch@gmail.com> @@ -6,16 +6,16 @@ pkgname=libdbi-drivers pkgver=0.8.3_1 _pkgver=0.8.3-1 -pkgrel=3 +pkgrel=2 pkgdesc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)" url="http://libdbi-drivers.sourceforge.net/" license=('GPL') arch=('i686' 'x86_64') depends=('libdbi') -makedepends=('postgresql-libs' 'libmysqlclient' 'sqlite2' 'sqlite3') +makedepends=('postgresql-libs' 'libmariadbclient' 'sqlite2' 'sqlite') optdepends=("postgresql-libs: To work with postgresql using libdbdpgsql " "sqlite3: To work with sqlite3 using libdbdsqlite3" - "libmysqlclient: To work with mysql using libdbdmysql" + "libmariadbclient: To work with mysql using libdbdmysql" "sqlite2: To work with sqlite2 using libdbdsqlite") options=(!libtool) install=libdbi-drivers.install diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD index 2d421f932..43b5ee8cf 100644 --- a/community/libgdamm/PKGBUILD +++ b/community/libgdamm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59045 2011-11-20 22:55:36Z heftig $ +# $Id: PKGBUILD 87026 2013-03-25 19:19:10Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Jan de Groot <jan@jgc.homeip.net> pkgbase=libgdamm pkgname=(libgdamm libgdamm-docs) pkgver=4.99.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs') url="http://www.gtkmm.org/" diff --git a/community/libzdb/PKGBUILD b/community/libzdb/PKGBUILD index c44dd0733..6bbc52e6e 100644 --- a/community/libzdb/PKGBUILD +++ b/community/libzdb/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 82597 2013-01-21 11:20:45Z spupykin $ +# $Id: PKGBUILD 87007 2013-03-25 19:16:47Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libzdb pkgver=2.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="Zild Database Library" arch=('i686' 'x86_64') url="http://www.tildeslash.com/libzdb/" license=('GPL') -depends=('postgresql-libs' 'sqlite' 'libmysqlclient') +depends=('postgresql-libs' 'sqlite' 'libmariadbclient') options=('!libtool') source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz) md5sums=('155e89d96df4ec22e984442137f75289') diff --git a/community/luasql/PKGBUILD b/community/luasql/PKGBUILD index 3ccee6241..1969e2304 100644 --- a/community/luasql/PKGBUILD +++ b/community/luasql/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81397 2012-12-19 13:39:14Z seblu $ +# $Id: PKGBUILD 87008 2013-03-25 19:16:48Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sébastien Luttringer <seblu@archlinux.org> # Contributor: Anders Bergh <anders1@gmail.com> @@ -6,11 +6,11 @@ pkgbase=luasql pkgname=('lua-sql-mysql' 'lua-sql-postgres' 'lua-sql-sqlite') pkgver=2.2.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.keplerproject.org/luasql/' license=('MIT') -makedepends=('lua' 'libmysqlclient' 'postgresql-libs' 'sqlite') +makedepends=('lua' 'libmariadbclient' 'postgresql-libs' 'sqlite') source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz" 'lua52.patch') md5sums=('59d72db444c6369c936d4f03694db6b7' @@ -30,7 +30,7 @@ build() { package_lua-sql-mysql() { pkgdesc='MySQL module for Lua' - depends=('lua' 'libmysqlclient') + depends=('lua' 'libmariadbclient') conflicts=('luasql-mysql') replaces=('luasql-mysql') diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index 7c8a519ea..699837545 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85450 2013-03-01 18:26:17Z svenstaro $ +# $Id: PKGBUILD 86935 2013-03-25 04:07:12Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> # Contributor: Malte Rabenseifner <malte@zearan.de> pkgname=murmur pkgver=1.2.3 -pkgrel=11 +pkgrel=12 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64') url="http://mumble.sourceforge.net" diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install index 562ec4171..8d2f96b7c 100644 --- a/community/murmur/murmur.install +++ b/community/murmur/murmur.install @@ -1,10 +1,10 @@ post_install() { - systemd-tmpfiles --create usr/lib/tmpfiles.d/murmur.conf + systemd-tmpfiles --create murmur.conf getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null - chown -R murmur:murmur /var/lib/murmur + chown -R murmur:murmur /var/lib/murmur chown -R murmur:murmur /var/log/murmur echo "You might have to reload dbus before launching murmur:" diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index cb16bb31f..201a434ae 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 83893 2013-02-06 12:11:01Z spupykin $ +# $Id: PKGBUILD 87009 2013-03-25 19:16:48Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc pkgver=5.2.4 -pkgrel=1 -pkgdesc="ODBC driver/connector for MySQL" +pkgrel=2 +pkgdesc="ODBC driver/connector for mariadb" arch=(i686 x86_64) url="http://dev.mysql.com/downloads/connector/odbc/" -depends=('unixodbc' 'libmysqlclient') +depends=('unixodbc' 'libmariadbclient') makedepends=('cmake') license=('GPL') options=('libtool') diff --git a/community/mysql++/PKGBUILD b/community/mysql++/PKGBUILD index 9e461cb03..da526a29e 100644 --- a/community/mysql++/PKGBUILD +++ b/community/mysql++/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 66225 2012-02-23 05:01:23Z spupykin $ +# $Id: PKGBUILD 87010 2013-03-25 19:16:50Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Markus Härer <markus.haerer@gmx.net> pkgname=mysql++ pkgver=3.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="A C++ wraper for MySQLs C API" arch=("i686" "x86_64") url="http://tangentsoft.net/mysql++/" license=("LGPL" "custom") -depends=("libmysqlclient") +depends=("libmariadbclient") options=('docs') source=("http://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz" "mysql++-fix-cstring.patch" diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index cbf283cb0..a9fd7c5cc 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84826 2013-02-24 23:03:43Z jconder $ +# $Id: PKGBUILD 87011 2013-03-25 19:16:52Z bpiotrowski $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.26.0 -pkgrel=7 +pkgrel=8 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ url="http://www.mythtv.org/" license=('GPL') depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883' 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' - 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' + 'mariadb-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber' 'x264') makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm') diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD index 8a54b20ff..597b62b92 100644 --- a/community/ndisc6/PKGBUILD +++ b/community/ndisc6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82792 2013-01-24 13:20:12Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 86933 2013-03-25 01:19:53Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Chris Brannon <chris@the-brannons.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=ndisc6 pkgver=1.0.2 -pkgrel=5 +pkgrel=6 pkgdesc='Collection of IPv6 networking utilities' arch=('i686' 'x86_64') url='http://www.remlab.net/ndisc6/' diff --git a/community/ndisc6/ndisc6.install b/community/ndisc6/ndisc6.install index 7d917ca19..fb1d5c926 100644 --- a/community/ndisc6/ndisc6.install +++ b/community/ndisc6/ndisc6.install @@ -2,7 +2,7 @@ # arg 1: the new package version post_install() { - systemd-tmpfiles --create usr/lib/tmpfiles.d/ndisc6.conf + systemd-tmpfiles --create ndisc6.conf } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index e302a49f9..ee7846e36 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84932 2013-02-26 10:19:32Z spupykin $ +# $Id: PKGBUILD 86987 2013-03-25 17:04:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.8.0 +pkgver=2.8.1 pkgrel=1 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) @@ -18,7 +18,7 @@ source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.g opendkim.conf opendkim.rc opendkim.service) -md5sums=('53bd811c6577235bd008f632e7f63dae' +md5sums=('6c9810e343414f49ad7fee313f02a0a7' '3e2bb1058ac0662f01e675aa6ac7ee8f' '093f5c098a45cc68753f97e45a5b374c' 'bc1b73856bc1941faaa4842e00437cb5') diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 47b01740e..82c0b08d2 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 78612 2012-10-22 09:08:59Z spupykin $ +# $Id: PKGBUILD 87012 2013-03-25 19:16:53Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips pkgver=1.8.1 -pkgrel=3 +pkgrel=5 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') -makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmysqlclient' +makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmariadbclient' 'lynx' 'libxslt') optdepends=('postgresql-libs' 'unixodbc' 'libldap' - 'libmysqlclient' + 'libmariadbclient' 'libsasl' 'python2' 'pcre') @@ -26,9 +26,9 @@ options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz opensips.init opensips.service) -md5sums=('ec3d0f13bf8198a74aed91e5c38ec445' +md5sums=('4a7cc708a5fba6ab3d1a3aa0aaa85d77' '685fbe00826df1285b410d4610dcbb0c' - '0d80ef75b5c10324e6db790b7741c2eb') + '7b786d758fe3174af34e2ced44b549e7') build() { @@ -42,6 +42,14 @@ build() make \ include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ + TLS=1 LIBDIR=lib +} + +package() { + cd $srcdir/$pkgname-$pkgver-tls/ + + make \ + include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ TLS=1 DESTDIR=$pkgdir/usr LIBDIR=lib install # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards) diff --git a/community/opensips/opensips.service b/community/opensips/opensips.service index 042ff7c9a..81f6fd93e 100644 --- a/community/opensips/opensips.service +++ b/community/opensips/opensips.service @@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking PIDFile=/var/run/opensips.pid -ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid +ExecStart=/usr/sbin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid [Install] WantedBy=multi-user.target diff --git a/community/pam_mysql/PKGBUILD b/community/pam_mysql/PKGBUILD index 42cefbd84..077df93d3 100644 --- a/community/pam_mysql/PKGBUILD +++ b/community/pam_mysql/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 70353 2012-05-04 23:55:09Z allan $ +# $Id: PKGBUILD 87013 2013-03-25 19:16:54Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arjan Timmerman<arjan@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=pam_mysql pkgver=0.7RC1 -pkgrel=6 +pkgrel=7 pkgdesc="A PAM module to authenticate users against mysql." arch=(i686 x86_64) license=('GPL') url="http://pam-mysql.sourceforge.net" -depends=('pam' 'mysql' 'openssl') +depends=('pam' 'mariadb' 'openssl') source=(http://sourceforge.net/projects/pam-mysql/files/pam-mysql/${pkgver}/${pkgname}-${pkgver}.tar.gz) md5sums=('6177183d7e98dc12f2e444c9fbd4f13c') options=(!libtool) diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD index 06aac06e4..b8170e811 100644 --- a/community/pdns/PKGBUILD +++ b/community/pdns/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 83427 2013-01-31 22:12:34Z arodseth $ +# $Id: PKGBUILD 87014 2013-03-25 19:16:55Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kevin Mihelich <kevin@archlinuxarm.org> pkgname=pdns pkgver=3.2 -pkgrel=3 +pkgrel=4 pkgdesc='Modern, advanced and high performance authoritative-only nameserver' arch=('x86_64' 'i686') url='http://www.powerdns.com/' license=('GPL') -depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite' 'libldap' 'lua51' 'boost-libs') +depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua51' 'boost-libs') makedepends=('boost') provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 892b78d9b..1a938b8c3 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 85883 2013-03-08 08:57:02Z mtorromeo $ +# $Id: PKGBUILD 87015 2013-03-25 19:16:57Z bpiotrowski $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server pkgver=5.5.30_rel30.1 -pkgrel=1 +pkgrel=2 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64') -depends=('mysql-clients' 'libaio' 'systemd-tools') +depends=('mariadb-clients' 'libaio' 'systemd-tools') conflicts=('mysql') provides=('mysql') optdepends=('perl-dbi' 'perl-dbd-mysql') diff --git a/community/proftpd/PKGBUILD b/community/proftpd/PKGBUILD index 9c2e1fcf8..14f3af690 100644 --- a/community/proftpd/PKGBUILD +++ b/community/proftpd/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 85857 2013-03-07 20:00:38Z bpiotrowski $ +# $Id: PKGBUILD 87017 2013-03-25 19:16:59Z bpiotrowski $ # Maintainer: # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=proftpd pkgver=1.3.4c -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64') url="http://www.proftpd.org/" license=('GPL') -depends=('libmysqlclient' 'postgresql-libs') +depends=('libmariadbclient' 'postgresql-libs') backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') install=${pkgname}.install source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc} diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index c72a317be..bad79de24 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82839 2013-01-24 23:13:20Z arodseth $ +# $Id: PKGBUILD 86969 2013-03-25 14:30:39Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jelle van der Waa <jelle@vdwaa.nl> pkgbase=python-pymongo pkgname=('python-pymongo' 'python2-pymongo') -pkgver=2.4.2 +pkgver=2.5 pkgrel=1 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686') @@ -13,23 +13,26 @@ license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' makedepends=('python-distribute' 'python2-distribute') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('6862c85844f1766c261a39022ec7a6b631988cb5528a31f8d20e78181398aa5f') +sha256sums=('79aff1c77ec6be6158a4d1a11002400ee0eb8f74dc6f4f67527f59bfac78c222') build() { - cd $srcdir - cp -a pymongo-$pkgver pymongo2-$pkgver + cd "$srcdir" + + cp -a "pymongo-$pkgver" "pymongo2-$pkgver" } package_python2-pymongo() { depends=('python2') - cd $srcdir/pymongo2-$pkgver - python2 setup.py install --root=$pkgdir --optimize=1 + + cd "$srcdir/pymongo2-$pkgver" + python2 setup.py install --root="$pkgdir" --optimize=1 } package_python-pymongo() { depends=('python') - cd $srcdir/pymongo-$pkgver - python setup.py install --root=$pkgdir --optimize=1 + + cd "$srcdir/pymongo-$pkgver" + python setup.py install --root="$pkgdir" --optimize=1 } # vim:set ts=2 sw=2 et: diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 227da46c3..67cc88043 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 85389 2013-03-01 10:37:51Z andrea $ +# $Id: PKGBUILD 87019 2013-03-25 19:17:01Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') url="http://www.qlandkarte.org/" license=('GPL') -depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'glu' 'postgresql-libs' +depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmariadbclient' 'glu' 'postgresql-libs' 'shared-mime-info' 'qtwebkit') makedepends=('cmake' 'garmindev' 'mesa') optdepends=('garmindev: to connect garmin devices') diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 3e9341b07..da0973619 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 86155 2013-03-12 13:29:27Z spupykin $ +# $Id: PKGBUILD 87020 2013-03-25 19:17:02Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog pkgver=7.2.6 -pkgrel=4 +pkgrel=6 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') license=('GPL3') depends=('zlib' 'libestr' 'libee' 'json-c') -makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') +makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls') optdepends=('postgresql-libs: PostgreSQL Database Support' - 'libmysqlclient: MySQL Database Support' + 'libmariadbclient: MySQL Database Support' 'net-snmp' 'gnutls') backup=('etc/rsyslog.conf' @@ -21,11 +21,13 @@ options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' - 'rsyslog.conf.d') + 'rsyslog.conf.d' + 'rsyslog.conf') md5sums=('2b2bfbc3f87fe85add651dc07a6f21ea' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' - '18565f38a4445136446a31a3c95ffc3e') + '18565f38a4445136446a31a3c95ffc3e' + 'd61dd424e660eb16401121eed20d98bc') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -47,6 +49,7 @@ package() { # Install Daemons and Configuration Files install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d install -D -m644 doc/${pkgname}-example.conf ${pkgdir}/usr/share/doc/$pkgname/${pkgname}.conf.example + install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} diff --git a/community/rsyslog/rsyslog.conf b/community/rsyslog/rsyslog.conf new file mode 100644 index 000000000..4416c26d5 --- /dev/null +++ b/community/rsyslog/rsyslog.conf @@ -0,0 +1,44 @@ +# Minimal config + +$ModLoad imuxsock # provides support for local system logging +$ModLoad imklog # provides kernel logging support +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +$FileOwner root +$FileGroup root +$FileCreateMode 0640 +$DirCreateMode 0755 +$Umask 0022 +$WorkDirectory /var/spool/rsyslog +$IncludeConfig /etc/rsyslog.d/*.conf + +auth,authpriv.* /var/log/auth.log +*.*;auth,authpriv.none -/var/log/syslog +#cron.* /var/log/cron.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +lpr.* -/var/log/lpr.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log + +mail.info -/var/log/mail.info +mail.warn -/var/log/mail.warn +mail.err /var/log/mail.err + +news.crit /var/log/news/news.crit +news.err /var/log/news/news.err +news.notice -/var/log/news/news.notice + +*.=debug;\ + auth,authpriv.none;\ + news.none;mail.none -/var/log/debug +*.=info;*.=notice;*.=warn;\ + auth,authpriv.none;\ + cron,daemon.none;\ + mail,news.none -/var/log/messages + +*.emerg :omusrmsg:* + +daemon.*;mail.*;\ + news.err;\ + *.=debug;*.=info;\ + *.=notice;*.=warn |/dev/xconsole diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index 4007381a3..6de3283cc 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86879 2013-03-23 23:10:42Z td123 $ +# $Id: PKGBUILD 86931 2013-03-24 23:46:23Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=ruby-cairo pkgver=1.12.2 -pkgrel=4 +pkgrel=5 pkgdesc='Ruby bindings for cairo' arch=('x86_64' 'i686') # http://cairographics.org/releases/ diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index 73db74527..3d092e90f 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85462 2013-03-01 21:26:53Z seblu $ +# $Id: PKGBUILD 86929 2013-03-24 23:26:26Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=rxvt-unicode -pkgver=9.17 +pkgver=9.18 pkgrel=1 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=( 'urxvtc.desktop' 'urxvt-tabbed.desktop' ) -md5sums=('1270432bdc7ce17dbb07d41a607081e0' +md5sums=('963ccc748fe5bca925e7b92c0404d68b' 'c2b828d37d06cbf4c32937a2959f2fc2' '10e80aebaef042fb63d2585440dc3637' '830abe6f31fb926a1bcd2650731be15e') diff --git a/community/stardict/PKGBUILD b/community/stardict/PKGBUILD index 542675e54..f5815f8e0 100644 --- a/community/stardict/PKGBUILD +++ b/community/stardict/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82064 2013-01-07 06:51:59Z fyan $ +# $Id: PKGBUILD 87021 2013-03-25 19:17:03Z bpiotrowski $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -8,11 +8,11 @@ pkgbase=stardict pkgname=(stardict stardict-lite) pkgver=3.0.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.stardict.org/' license=('GPL') -makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmysqlclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') +makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmariadbclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') options=('!libtool' '!emptydirs') source=("http://stardict-3.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2" 'gcc46.patch' diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 370c7b115..c1a887d76 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85415 2013-03-01 10:40:52Z andrea $ +# $Id: PKGBUILD 86989 2013-03-25 17:05:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=34.0.1 -pkgrel=2 +pkgver=35.0.0 +pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64') url="http://tea-editor.sourceforge.net/" @@ -16,7 +16,7 @@ depends=('qt4' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('4fcc661b7898d01f58b8734395f5bdda' +md5sums=('aabbbac2b5251e7c3eeb36d8f188d08a' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index cda2d1034..3a49d62bb 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 83573 2013-02-03 13:19:13Z seblu $ +# $Id: PKGBUILD 87022 2013-03-25 19:17:05Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# Maintainer: Sébastien Luttringer # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Sergej Pupykin <ps@lx-ltd.ru> pkgname=ulogd -pkgver=2.0.1 -pkgrel=4 +pkgver=2.0.2 +pkgrel=1 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' license=('GPL2') depends=('libmnl' 'libnfnetlink') backup=('etc/ulogd.conf') -makedepends=('libmysqlclient' +makedepends=('libmariadbclient' 'libnetfilter_acct' 'libnetfilter_conntrack' 'libnetfilter_log' @@ -27,7 +27,7 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" "$pkgname.logrotate" "$pkgname.conf" "$pkgname.service") -md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9' +md5sums=('660516de4b5b1e110c12dae414619e0f' 'dd32eeee0949adff4188544419acd17e' 'c21531312f95e790ed19aa267a17d35a' '42fc2c0568ff89ec00c2f0797280f296') diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index bb3906c98..607b987e6 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85423 2013-03-01 10:42:11Z andrea $ +# $Id: PKGBUILD 87023 2013-03-25 19:17:06Z bpiotrowski $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -12,12 +12,12 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=5 +pkgrel=6 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' license=('BSD') -depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mysql' 'hdf5' 'libgl') +depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mariadb' 'hdf5' 'libgl') makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk') optdepends=('python2: python bindings' 'java-runtime: java bindings' diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index 0d7e662b4..72df48bdf 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86733 2013-03-21 16:26:32Z spupykin $ +# $Id: PKGBUILD 87024 2013-03-25 19:17:07Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -9,13 +9,13 @@ _prefix=/usr pkgname=xbmc pkgver=12.1 -pkgrel=3 +pkgrel=4 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' - 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' + 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu' diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index e668cda48..a95f373b8 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146449 2012-01-11 15:21:04Z stephane $ +# $Id: PKGBUILD 180675 2013-03-25 19:13:43Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,13 +8,13 @@ #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl pkgver=2.1.23 -pkgrel=9 +pkgrel=10 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.19-checkpw.c.patch cyrus-sasl-2.1.22-crypt.patch @@ -190,7 +190,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient') + depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmariadbclient') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 2576210ef..2a7e08f66 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 179115 2013-03-03 18:48:13Z andrea $ +# $Id: PKGBUILD 180678 2013-03-25 19:15:27Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64') url='http://community.kde.org/KDE_PIM/Akonadi' license=('LGPL') -depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') +depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index ddb782380..9aedff0fd 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178124 2013-02-16 22:48:44Z ioni $ +# $Id: PKGBUILD 180679 2013-03-25 19:15:28Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,12 +6,12 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.7.0 -pkgrel=3 +pkgrel=4 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org/" license=('GPL2' 'LGPL2.1' 'FDL') -depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' +depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras' 'liblastfm' 'ffmpeg' 'libofa' 'qjson') makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt' 'mesa' 'clamz') diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index 8f08a31e6..b84a86c2c 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 170895 2012-11-12 22:30:17Z heftig $ +# $Id: PKGBUILD 180677 2013-03-25 19:13:50Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgbase=anjuta pkgname=('libanjuta' 'anjuta') pkgver=3.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 2521c5a91..665bd7fbb 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168631 2012-10-13 16:37:23Z thomas $ +# $Id: PKGBUILD 180680 2013-03-25 19:15:31Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,13 +8,13 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.23 -pkgrel=11 +pkgrel=12 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.19-checkpw.c.patch cyrus-sasl-2.1.22-crypt.patch @@ -194,7 +194,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmysqlclient') + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 6c621590f..8d3088f1e 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177806 2013-02-09 09:15:39Z andyrtr $ +# $Id: PKGBUILD 180681 2013-03-25 19:15:32Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -9,12 +9,12 @@ pkgname=dovecot pkgver=2.1.15 -pkgrel=1 +pkgrel=2 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') url="http://dovecot.org/" license=("LGPL") -depends=('krb5' 'openssl' 'sqlite>=3.7.5' 'libmysqlclient>=5.5.10' +depends=('krb5' 'openssl' 'sqlite>=3.7.5' 'libmariadbclient' 'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl') makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene') optdepends=('libldap: ldap plugin' diff --git a/extra/gnokii/PKGBUILD b/extra/gnokii/PKGBUILD index 8b4d0bfe0..19e1e1143 100644 --- a/extra/gnokii/PKGBUILD +++ b/extra/gnokii/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150512 2012-02-18 11:55:01Z pierre $ +# $Id: PKGBUILD 180682 2013-03-25 19:15:33Z bpiotrowski $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,15 +6,15 @@ pkgname=gnokii pkgver=0.6.31 -pkgrel=1 +pkgrel=3 pkgdesc="Tools and user space driver for use with mobile phones" arch=('i686' 'x86_64') url="http://www.gnokii.org/" license=('GPL') depends=('libusb-compat' 'libxpm' 'bluez' 'libical') -makedepends=('gtk2' 'libmysqlclient' 'postgresql-libs' 'intltool') +makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb') optdepends=('gtk2: xgnokii GUI' - 'libmysqlclient: smsd mysql backend' + 'libmariadbclient: smsd mysql backend' 'postgresql-libs: smsd postgresql backend') backup=('etc/gnokiirc') options=('!libtool' '!makeflags') diff --git a/extra/gummiboot/PKGBUILD b/extra/gummiboot/PKGBUILD deleted file mode 100644 index 99ca11299..000000000 --- a/extra/gummiboot/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 180605 2013-03-24 16:16:26Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Contributor: Mantas Mikulėnas <grawity@gmail.com> - -pkgname="gummiboot" -pkgver="29" -pkgrel="1" -pkgdesc="Simple text-mode UEFI Boot Manager" -url="http://freedesktop.org/wiki/Software/gummiboot" -arch=('x86_64' 'i686') -license=('LGPL2.1') -makedepends=('gnu-efi-libs' 'docbook-xsl') -depends=('util-linux') -conflicts=('gummiboot-efi') -provides=('gummiboot-efi') -replaces=('gummiboot-efi') -options=('!strip') -source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz" - 'loader.conf' - 'arch.conf') -install="gummiboot.install" - -build() { - cd "${srcdir}/${pkgname}-${pkgver}/" - - ./autogen.sh - ./configure --sysconfdir=/etc --libexecdir=/usr/lib --libdir=/usr/lib - - make -} - -package() { - ## Install gummiboot example configuration files (can go away with systemd's kernel-install) - install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf" - install -D -m0644 "${srcdir}/arch.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/arch.conf" - - cd "${srcdir}/${pkgname}-${pkgver}/" - make DESTDIR="${pkgdir}" install -} -md5sums=('7e133411b805ce6fb5dd3e3bd08b88a2' - '6ea803e5179d623716e3be0b636de658' - '82bda9612e3a361a74cf8de2a0134b15') diff --git a/extra/gummiboot/arch.conf b/extra/gummiboot/arch.conf deleted file mode 100644 index 6cf347026..000000000 --- a/extra/gummiboot/arch.conf +++ /dev/null @@ -1,7 +0,0 @@ -## This is just an exmaple config file. -## Please edit the paths and kernel parameters according to your system. - -title Arch Linux -linux /vmlinuz-linux -initrd /initramfs-linux.img -options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap diff --git a/extra/gummiboot/gummiboot.install b/extra/gummiboot/gummiboot.install deleted file mode 100644 index 770087361..000000000 --- a/extra/gummiboot/gummiboot.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - echo ":: Run '/usr/bin/gummiboot install' to enable gummiboot" -} - -post_upgrade() { - /usr/bin/gummiboot update -} - -pre_remove() { - /usr/bin/gummiboot remove -} diff --git a/extra/gummiboot/loader.conf b/extra/gummiboot/loader.conf deleted file mode 100644 index 75b67e0d5..000000000 --- a/extra/gummiboot/loader.conf +++ /dev/null @@ -1,2 +0,0 @@ -timeout 10 -default arch diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index 903af6fb2..7adb0bc35 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 156892 2012-04-23 09:08:29Z ibiru $ +# $Id: PKGBUILD 180676 2013-03-25 19:13:49Z bpiotrowski $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda -pkgver=5.0.3 +pkgver=5.1.1 pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64) license=('GPL') depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup' - 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' + 'libmariadbclient' 'postgresql-libs' 'python2' 'libgnome-keyring' 'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2' 'iso-codes' 'openssl' 'libgcrypt' 'libldap') -makedepends=('intltool' 'gobject-introspection' 'openjdk6' 'gtk-doc' 'vala') +makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala') options=('!libtool') url="http://www.gnome-db.org" install=libgda.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc') +sha256sums=('41a54e60d91758d1d239e5127c856ff0412a5709e92440e9107178af928ed5e1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index 22395da3c..daee6ab4a 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 173176 2012-12-12 00:31:57Z eric $ +# $Id: PKGBUILD 180683 2013-03-25 19:15:34Z bpiotrowski $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.32 -pkgrel=2 +pkgrel=4 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') url="http://www.lighttpd.net/" -depends=('pcre' 'bzip2' 'libldap' 'util-linux') -makedepends=('fcgi' 'libmysqlclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig') +depends=('pcre' 'bzip2' 'libldap' 'util-linux' 'systemd') +makedepends=('fcgi' 'libmariadbclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig') optdepends=('libxml2: mod_webdav' 'lua51: mod_cml/mod_magnet' - 'libmysqlclient: mod_mysql_vhost' + 'libmariadbclient: mod_mysql_vhost' 'sqlite: mod_webdav') backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') options=('!libtool' 'emptydirs') install='lighttpd.install' source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz" "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc" - 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') + 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1' '5456a90967df6774386010baa3fa67dba1c80c3b7058c70c80931d8dea5093e7' - '186f4bb2364f82d4076a2ba7d3e088ffb356550493d92dd9d5eb57cac2839c17' - '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77' + '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe' 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa' 'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871' '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696') @@ -57,7 +56,6 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/ diff --git a/extra/lighttpd/lighttpd.install b/extra/lighttpd/lighttpd.install index 6b471f633..817bd5746 100644 --- a/extra/lighttpd/lighttpd.install +++ b/extra/lighttpd/lighttpd.install @@ -1,6 +1,6 @@ post_install() { if [[ ! -d run/lighttpd ]]; then - usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/lighttpd.conf + usr/bin/systemd-tmpfiles --create lighttpd.conf fi } diff --git a/extra/lighttpd/lighttpd.logrotate.d b/extra/lighttpd/lighttpd.logrotate.d index 76f98785c..b424c692d 100644 --- a/extra/lighttpd/lighttpd.logrotate.d +++ b/extra/lighttpd/lighttpd.logrotate.d @@ -4,6 +4,6 @@ notifempty sharedscripts postrotate - /usr/bin/killall -HUP lighttpd-angel &>/dev/null || true + systemctl reload lighttpd.service || true endscript } diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d deleted file mode 100644 index c2c41b818..000000000 --- a/extra/lighttpd/lighttpd.rc.d +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - - -pid_file='/run/lighttpd/lighttpd-angel.pid' - -get_pid() { - if [ -r "${pid_file}" ]; then - cat "${pid_file}" - else - pgrep -f /usr/sbin/lighttpd-angel - fi -} - -test_config() { - stat_busy 'Checking configuration' - if [ $(id -u) -ne 0 ]; then - stat_append '(This script must be run as root)' - stat_die - fi - - if [ ! -r /etc/lighttpd/lighttpd.conf ]; then - stat_append '(/etc/lighttpd/lighttpd.conf not found)' - stat_die - fi - - /usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_append '(error in /etc/lighttpd/lighttpd.conf)' - stat_die - fi - - stat_done -} - -start() { - stat_busy 'Starting lighttpd' - - local PID=$(get_pid) - if [ -z "$PID" ]; then - nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 & - if [ $? -gt 0 ]; then - stat_die - else - echo $! > "${pid_file}" - add_daemon lighttpd - stat_done - fi - else - stat_die - fi -} - -stop() { - stat_busy 'Stopping lighttpd' - local PID=$(get_pid) - [ -n "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - [ -f "${pid_file}" ] && rm -f "${pid_file}" - rm_daemon lighttpd - stat_done - fi -} - -gracefull-stop() { - stat_busy 'Stopping lighttpd gracefully' - local PID=$(get_pid) - [ -n "$PID" ] && kill -INT $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - [ -f "${pid_file}" ] && rm -f "${pid_file}" - rm_daemon lighttpd - stat_done - fi -} - -reload() { - stat_busy 'Reloading lighttpd' - local PID=$(get_pid) - [ -n "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_die - else - stat_done - fi -} - - -case "$1" in - start) - test_config - start - ;; - stop) - test_config - stop - ;; - gracefull-stop) - test_config - stop - ;; - reload) - test_config - reload - ;; - restart) - test_config - stop - while [ -n "$(get_pid)" ]; do - sleep 1 - done - start - ;; - status) - stat_busy 'Checking lighttpd status' - ck_status lighttpd - ;; - *) - echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}" -esac - -exit 0 diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD index 5f5cfc45b..63b2e43e4 100644 --- a/extra/mysql-python/PKGBUILD +++ b/extra/mysql-python/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 177920 2013-02-10 18:57:08Z angvp $ +# $Id: PKGBUILD 180685 2013-03-25 19:15:36Z bpiotrowski $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=mysql-python pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="MySQL support for Python" arch=("i686" "x86_64") url="http://mysql-python.sourceforge.net/" license=('GPL2') -depends=('python2' 'libmysqlclient') -makedepends=('mysql' 'python2-distribute') +depends=('python2' 'libmariadbclient') +makedepends=('mariadb' 'python2-distribute') source=("http://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-${pkgver}.zip") md5sums=('ddf2386daf10a97af115ffad2ed4a9a0') diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 6e6557d1c..9ea78cd32 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178940 2013-03-01 05:59:24Z bpiotrowski $ +# $Id: PKGBUILD 180684 2013-03-25 19:15:35Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.30 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') license=('GPL') url="https://www.mysql.com/products/community/" @@ -66,6 +66,8 @@ build() { package_libmysqlclient(){ pkgdesc="MySQL client libraries" depends=('openssl') + conflicts=('libmariadbclient') + provides=("libmariadbclient=$pkgver") cd build for dir in include libmysql libmysqld libservices; do @@ -83,6 +85,8 @@ package_libmysqlclient(){ package_mysql-clients(){ pkgdesc="MySQL client tools" depends=('libmysqlclient') + conflicts=('mariadb-clients') + provides=("mariadb-clients=$pkgver") cd build make -C client DESTDIR="${pkgdir}" install @@ -102,6 +106,8 @@ package_mysql(){ backup=('etc/mysql/my.cnf') install=mysql.install depends=('mysql-clients' 'systemd-tools') + conflicts=('mariadb') + provides=("mariadb=$pkgver") options=('emptydirs') cd build diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index e2c2f9e4a..799766095 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 175923 2013-01-25 03:51:01Z eric $ +# $Id: PKGBUILD 180686 2013-03-25 19:15:37Z bpiotrowski $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql pkgver=4.022 -pkgrel=1 +pkgrel=3 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('libmysqlclient' 'perl-dbi') -makedepends=('mysql') +depends=('libmariadbclient' 'perl-dbi') +makedepends=('mariadb') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) md5sums=('20fb571245e3b9ac275b8329025c4bf6') diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 0b3bc8e9c..15848217b 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 178407 2013-02-21 10:10:12Z bisson $ +# $Id: PKGBUILD 180687 2013-03-25 19:15:38Z bpiotrowski $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix pkgver=2.10.0 -pkgrel=3 +pkgrel=4 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') arch=('i686' 'x86_64') depends=('pcre' 'libsasl' 'libldap' 'db' - 'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb') + 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb') backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" 'aliases.patch' diff --git a/extra/psi/archlinux.patch b/extra/psi/archlinux.patch deleted file mode 100644 index d9cbb454b..000000000 --- a/extra/psi/archlinux.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/systeminfo.cpp 2012-10-04 02:53:03.000000000 +0200 -+++ src/systeminfo.cpp 2012-10-04 07:18:45.111088591 +0200 -@@ -114,7 +114,7 @@ - { LinuxSlackware, OsAppendFile, "/etc/slackware-version", "Slackware Linux" }, - { LinuxPLD, OsUseFile, "/etc/pld-release", "PLD Linux" }, - { LinuxAurox, OsUseName, "/etc/aurox-release", "Aurox Linux" }, -- { LinuxArch, OsUseFile, "/etc/arch-release", "Arch Linux" }, -+ { LinuxArch, OsUseName, "/etc/arch-release", "Arch Linux" }, - { LinuxLFS, OsAppendFile, "/etc/lfs-release", "LFS Linux" }, - - // untested diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index 39c4c5767..cf8e4d40a 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168609 2012-10-13 11:48:48Z andyrtr $ +# $Id: PKGBUILD 180688 2013-03-25 19:15:40Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=qt3 pkgver=3.3.8b -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="The QT3 gui toolkit" arch=('i686' 'x86_64') @@ -11,11 +11,11 @@ url="http://www.trolltech.com/products/qt/index.html" license=('GPL') depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft' 'libxrandr' 'libmng') -makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite' 'mesa') -optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') +makedepends=('mariadb' 'postgresql' 'unixodbc' 'sqlite' 'mesa') +optdepends=('libmariadbclient' 'postgresql-libs' 'unixodbc') options=('!libtool') install=qt.install -source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz +source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 2efcd355f..5ba2885b6 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179054 2013-03-02 09:03:00Z andrea $ +# $Id: PKGBUILD 180689 2013-03-25 19:15:41Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.4 -pkgrel=13 +pkgrel=16 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -12,10 +12,10 @@ pkgdesc='A cross-platform application and UI framework' depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient' +makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient' 'mesa-libgl') optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' + 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' 'libfbclient: Firebird/iBase driver' 'libxinerama: Xinerama support' @@ -28,11 +28,13 @@ replaces=('qt<=4.8.4') conflicts=('qt') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" - 'qtconfig.desktop' 'qt4.profile' + 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' 'improve-cups-support.patch') md5sums=('89c5ecba180cae74c66260ac732dc5cb' - '20ca06ef59775d749b9451ce7437fa9a' - '4ed0bd79a310e2b5d34fc71760b99139' + 'a16638f4781e56e7887ff8212a322ecc' + '4f0152ba6d645e81218b23ba8beeb42d' + '283a00ff7f662dca481b70d6daa826e0' + '027683880235708d4bc270a7ef961183' 'c439c7731c25387352d8453ca7574971') build() { @@ -86,11 +88,9 @@ package() { # install missing icons and desktop files install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png" - install -Dm644 "${srcdir}"/qtconfig.desktop \ - "${pkgdir}/usr/share/applications/qtconfig4.desktop" - - # install the profile - install -D -m755 "${srcdir}"/qt4.profile "${pkgdir}"/etc/profile.d/qt4.sh + install -d "${pkgdir}"/usr/share/applications + install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}-qt4.desktop \ + "${pkgdir}/usr/share/applications/" # Useful symlinks for cmake and configure scripts install -d "${pkgdir}"/usr/bin diff --git a/extra/qt4/assistant-qt4.desktop b/extra/qt4/assistant-qt4.desktop new file mode 100644 index 000000000..d2904beb2 --- /dev/null +++ b/extra/qt4/assistant-qt4.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt4 Assistant +Comment=Shows Qt4 documentation and examples +Exec=assistant-qt4 +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; diff --git a/extra/qt4/designer-qt4.desktop b/extra/qt4/designer-qt4.desktop new file mode 100644 index 000000000..514146e78 --- /dev/null +++ b/extra/qt4/designer-qt4.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt4 Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt4 applications +Exec=designer-qt4 +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/extra/qt4/linguist-qt4.desktop b/extra/qt4/linguist-qt4.desktop new file mode 100644 index 000000000..61036b307 --- /dev/null +++ b/extra/qt4/linguist-qt4.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt4 Linguist +Comment=Add translations to Qt4 applications +Exec=linguist-qt4 +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/extra/qt4/qt4.profile b/extra/qt4/qt4.profile deleted file mode 100644 index 3129ddce5..000000000 --- a/extra/qt4/qt4.profile +++ /dev/null @@ -1 +0,0 @@ -export PATH=$PATH:/usr/lib/qt4/bin diff --git a/extra/qt4/qtconfig.desktop b/extra/qt4/qtconfig-qt4.desktop index 1573ef461..578963124 100644 --- a/extra/qt4/qtconfig.desktop +++ b/extra/qt4/qtconfig-qt4.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Qt4 Config Comment=Configure Qt4 behavior, styles, fonts -Exec=/usr/lib/qt4/bin/qtconfig +Exec=qtconfig-qt4 Icon=qt4logo Terminal=false Type=Application diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index bd1016efa..e9cf73b33 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179117 2013-03-03 18:53:03Z andrea $ +# $Id: PKGBUILD 180690 2013-03-25 19:15:43Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -16,14 +16,14 @@ pkgname=('qt5-base' 'qt5-webkit' 'qt5-xmlpatterns') pkgver=5.0.1 -pkgrel=6 +pkgrel=10 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' - 'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc' 'libfbclient' + 'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'libmng' 'openal' 'gtk2') groups=('qt' 'qt5') @@ -80,9 +80,9 @@ package_qt5-base() { pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image' - 'hicolor-icon-theme' 'xdg-utils') + 'hicolor-icon-theme' 'xdg-utils' 'icu') optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' + 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' 'libfbclient: Firebird/iBase driver') install='qt5-base.install' @@ -254,7 +254,7 @@ package_qt5-tools() { package_qt5-webkit() { pkgdesc='A cross-platform application and UI framework (QtWebKit)' - depends=('qt5-declarative' 'gstreamer0.10-base' 'icu' 'libxslt' 'libxcomposite') + depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite') cd ${_pkgfqn}/qtwebkit make INSTALL_ROOT="${pkgdir}" install diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index 6af79cbcd..145d9297c 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 177000 2013-02-03 16:40:55Z giovanni $ +# $Id: PKGBUILD 180692 2013-03-25 19:47:01Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> # Contributor: Ralf Barth <archlinux.org@haggy.org> pkgname=smartmontools -pkgver=6.0 -pkgrel=2 +pkgver=6.1 +pkgrel=1 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') @@ -16,7 +16,7 @@ backup=('etc/smartd.conf' 'etc/conf.d/smartd') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'smartd.conf') -md5sums=('5646a07f5f4bee8e2e649de8c6b7ae87' +md5sums=('83a3a681f8183ed858392d550ae1cca6' '28c1b80c41dac52d433961dcfb4f70e0') build() { diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD index 59c62223c..6078686b4 100644 --- a/extra/xdg-user-dirs-gtk/PKGBUILD +++ b/extra/xdg-user-dirs-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170124 2012-11-03 07:24:35Z eric $ +# $Id: PKGBUILD 180620 2013-03-25 01:38:50Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=xdg-user-dirs-gtk -pkgver=0.9 +pkgver=0.10 pkgrel=1 pkgdesc="Creates user dirs and asks to relocalize them" arch=(i686 x86_64) @@ -12,8 +12,8 @@ makedepends=('intltool') options=('!libtool' '!emptydirs') url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4b908252515eb95b27427ef7c6b0e096febde716c0c89e8f03a79d23882b79c8') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e') build() { cd $pkgname-$pkgver diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD index 8103a1ac1..a896613ee 100644 --- a/libre/lilo/PKGBUILD +++ b/libre/lilo/PKGBUILD @@ -5,8 +5,8 @@ pkgname=lilo pkgver=23.2 -pkgrel=3.1 -pkgdesc="A bootloader for Linux (Parabola rebranded)" +pkgrel=3.2 +pkgdesc="A bootloader for GNU/Linux, Parabola rebranded" arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/lilo/" license=('BSD') @@ -24,7 +24,7 @@ options=('!makeflags') source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz" 'lilo.conf') md5sums=('51b9b9db665d3b8724919e3d46054d12' - 'bab0a13b749690ce5e4f61bb1c10c065') + 'd06b3c4655577ed01fea79ec5743b4b0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/lilo/lilo.conf b/libre/lilo/lilo.conf index dea0dbe58..479390df5 100644 --- a/libre/lilo/lilo.conf +++ b/libre/lilo/lilo.conf @@ -6,19 +6,19 @@ boot=/dev/sda # This line often fixes L40 errors on bootup # disk=/dev/sda bios=0x80 -default=libre +default=parabola timeout=50 lba32 prompt image=/boot/vmlinuz-linux-libre - label=libre + label=parabola root=/dev/sda3 initrd=/boot/initramfs-linux-libre.img read-only image=/boot/vmlinuz-linux-libre - label=libre-fallback + label=parabola-fallback root=/dev/sda3 initrd=/boot/initramfs-linux-libre-fallback.img read-only diff --git a/libre/mime-types/PKGBUILD b/libre/mime-types/PKGBUILD new file mode 100644 index 000000000..2ac7928c1 --- /dev/null +++ b/libre/mime-types/PKGBUILD @@ -0,0 +1,23 @@ +# $Id$ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=mime-types +pkgver=8 +pkgrel=1.2 +pkgdesc='Provides /etc/mime.types, Parabola rebranded' +url='https://parabolagnulinux.org/' +license=('GPL2') +arch=('any') +backup=('etc/mime.types') +source=("http://mirrors.kernel.org/gentoo/distfiles/${pkgname}-${pkgver}.tar.bz2" + 'parabola.patch') +sha1sums=('01682b0ad3111a6cf65e6c9db0c18ddd7523c593' + '0d3b34c7b4a384be674192ecbfd8f22271906ae8') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../parabola.patch + install -Dm644 mime.types "${pkgdir}"/etc/mime.types +} diff --git a/libre/mime-types/parabola.patch b/libre/mime-types/parabola.patch new file mode 100644 index 000000000..bbf8406ca --- /dev/null +++ b/libre/mime-types/parabola.patch @@ -0,0 +1,7 @@ +diff -au0r old/mime.types new/mime.types +--- old/mime.types 2009-10-15 07:51:24.000000000 -0700 ++++ new/mime.types 2011-08-02 22:49:14.962241561 -0700 +@@ -2 +2,2 @@ +-# distributed as the app-misc/mime-types package. ++# distributed in Parabola as the mime-types package, which is based on ++# Gentoo's app-misc/mime-types package. diff --git a/libre/mkbootcd/PKGBUILD b/libre/mkbootcd/PKGBUILD new file mode 100644 index 000000000..4e54ea3b4 --- /dev/null +++ b/libre/mkbootcd/PKGBUILD @@ -0,0 +1,25 @@ ++# $Id$ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + +pkgname=mkbootcd +pkgver=2008.09 +pkgrel=2.1 +pkgdesc="Advanced, modular isolinux bootcd image creation utility, Parabola rebranded" +arch=('any') +license=('GPL') +url="https://parabolagnulinux.org/" +depends=('mkinitcpio' 'cdrkit' 'syslinux') +source=('boot.msg' 'mkbootcd' 'mkbootcd.conf' 'options.msg') +backup=('etc/mkbootcd.conf') +md5sums=('2b55189d64e5263c5a3925a7b949c1f8' + '521107289007f0c3f11ddbb6fdfcbd22' + '4794673fa413eb5459b40172be7ae541' + '75b69407f88f2838c66f4dda4d8455e3') + +package() { + cd $srcdir + install -D -m755 mkbootcd $pkgdir/usr/sbin/mkbootcd + install -D -m644 mkbootcd.conf $pkgdir/etc/mkbootcd.conf + install -D -m644 boot.msg $pkgdir/usr/share/mkbootcd/boot.msg + install -D -m644 options.msg $pkgdir/usr/share/mkbootcd/options.msg +} diff --git a/libre/mkbootcd/boot.msg b/libre/mkbootcd/boot.msg new file mode 100644 index 000000000..5e441e746 --- /dev/null +++ b/libre/mkbootcd/boot.msg @@ -0,0 +1,15 @@ + + +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre +ISOLINUX BOOT +created with 'mkbootcd' written by Tobias Powalowski <tpowa@archlinux.org> +rebranded for Parabola by André Silva <emulatorman@lavabit.com> + +Press ENTER or type 'parabola' to boot the CD. + +If you wish to change your defaults to boot into your existing system, +type 'vmlinuz initrd=initrd.img <any_other_boot_option>' +Use the F2 key for troubleshooting and options. +------------------------------------------------------------------------------ + diff --git a/libre/mkbootcd/mkbootcd b/libre/mkbootcd/mkbootcd new file mode 100755 index 000000000..012267be9 --- /dev/null +++ b/libre/mkbootcd/mkbootcd @@ -0,0 +1,144 @@ +#! /bin/sh +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# Settings +APPNAME=$(basename "${0}") +CONFIG="/etc/mkbootcd.conf" +GENIMG="" +BURN="0" +BLANK="0" +GRUB="0" +TARNAME="" +export TEMPDIR=$(mktemp /tmp/mkbootcd.XXXX) +usage () +{ + echo "${APPNAME}: usage" + echo " -g=IMAGE Generate a ISO image as IMAGE" + echo " -c=CONFIG Use CONFIG file. default: /etc/mkbootcd.conf" + echo " -B Burn the ISO image after creation" + echo " -b Blanking media first" + echo " -grub Use grub instead of isolinux" + echo " -t=TARNAME Generate a tar image instead of an iso image" + echo " -h This message." + exit 1 +} + +[ "$1" == "" ] && usage + +while [ $# -gt 0 ]; do + case $1 in + -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; + -g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;; + -B|--B) BURN="1" ;; + -b|--b) BLANK="1" ;; + -grub|--grub) GRUB="1" ;; + -t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;; + -h|--h|?) usage ;; + *) usage ;; + esac + shift +done + +if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then + echo "ERROR: No image name specified, please use the -g option" + exit 1 +fi + +if [ ! -f "${CONFIG}" ]; then + echo "config file '${CONFIG}' cannot be found, aborting..." + exit 1 +fi + +. "${CONFIG}" +# export for mkinitcpio +[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE +[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX +[ -n "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && export APPENDBOOTMESSAGE_SYSLINUX_LOWMEM +[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE + +if [ "$GRUB" = "1" ]; then + export RUNPROGRAM="${APPNAME}-grub" + export BOOTDIRNAME="boot" +else + export RUNPROGRAM="${APPNAME}" + export BOOTDIRNAME="isolinux" +fi +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) +[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX) +export USEKERNEL=${VERSION} +# begin script +[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR} +mkdir -p ${TEMPDIR}/${BOOTDIRNAME} +if [ "$GRUB" = "1" ]; then + mkdir ${TEMPDIR}/${BOOTDIRNAME}/grub + install -m755 /usr/share/grub/i386-pc/stage2_eltorito ${TEMPDIR}/${BOOTDIRNAME}/grub/stage2_eltorito +else + install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin +fi +# create isolinux.cfg +if [ "$GRUB" = "1" ]; then + echo ":: Creating menu.lst ..." + [ ! -e "${MENULST}" ] && echo "No menu.lst found" && exit 1 + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${MENULST} \ + > ${TEMPDIR}/${BOOTDIRNAME}/grub/menu.lst +else + echo ":: Creating isolinux.cfg ..." + if [ "${ISOLINUXCFG}" = "" ]; then + [ -e ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "kernel vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + else + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + fi + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && echo "No isolinux.cfg found" && exit 1 +fi +echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." +# generate initramdisk +echo ":: Creating initramdisk ..." + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/${BOOTDIRNAME}/initrd.img +echo ":: Using ${KERNEL} as image kernel ..." + install -m644 ${KERNEL} ${TEMPDIR}/${BOOTDIRNAME}/vmlinuz + install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg + install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 +# create image +if ! [ "${TARNAME}" = "" ]; then + echo ":: Creating tar image ..." + [ -e ${TARNAME} ] && rm ${TARNAME} + rm ${TEMPDIR}/parabola/pkg/*.pkg.tar.gz > /dev/null 2>&1 + tar cfv ${TARNAME} ${TEMPDIR} > /dev/null 2>&1 && echo ":: tar Image succesfull created at ${TARNAME}" +else + echo ":: Creating ISO image ..." + [ -e ${GENIMG} ] && rm ${GENIMG} + [ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Parabola GNU/Linux-libre" + if [ "$GRUB" = "1" ]; then + mkisofs -RlDJLV "${ISONAME}" -b boot/grub/stage2_eltorito -c boot/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 + else + mkisofs -RlDJLV "${ISONAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 + fi + [ $? -ne 0 ] && echo ":: ISO Image succesfull created at ${GENIMG}" + # burning/blanking image + if [ "$BLANK" = "1" ]; then + echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..." + cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull." + fi + if [ "$BURN" = "1" ]; then + echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..." + cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG} > /dev/null 2>&1 && echo ":: Successfull." + fi +fi +# clean /tmp +rm -r ${TEMPDIR} diff --git a/libre/mkbootcd/mkbootcd.conf b/libre/mkbootcd/mkbootcd.conf new file mode 100644 index 000000000..5b287a6ea --- /dev/null +++ b/libre/mkbootcd/mkbootcd.conf @@ -0,0 +1,39 @@ +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# config file of mkbootcd + +# DEFAULT kernel boot options like root=/dev/hda3 etc. +# add your root= option, if you boot from a disk device +# and don't want to add it by hand on each boot +KERNEL_BOOT_OPTIONS="" + +# mkinitcpio config file, defaulted to stock config file +MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" + +# kernel version, defaulted to build for runtime kernel +VERSION="$(uname -r)" + +# kernel image, defaulted to stock libre kernel +KERNEL="/boot/vmlinuz-linux-libre" + +# boot message files +BOOTMESSAGE="/usr/share/mkbootcd/boot.msg" +OPTIONSBOOTMESSAGE="/usr/share/mkbootcd/options.msg" + +# menu.lst or isolinux.cfg file to use +ISOLINUXCFG="" +MENULST="" + +# Prompt on CD boot, defaulted to yes, 1=yes 0=no +PROMPT="1" + +# Name of the ISO, if empty Parabola GNU/Linux-libre is used if not set by a HOOK later +ISONAME="" + +# Timeout in seconds on CD boot, defaulted to 0, because we prompt by default +TIMEOUT="0" + +# Setting cdrecord options +DEVICE="" +SPEED="" +BLANKMODE="" diff --git a/libre/mkbootcd/options.msg b/libre/mkbootcd/options.msg new file mode 100644 index 000000000..63f56e755 --- /dev/null +++ b/libre/mkbootcd/options.msg @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre options and troubleshooting: + +- If your system hangs during the boot process, any combinations of the + boot options noapic acpi=off pci=routeirq nosmp may be useful. +------------------------------------------------------------------------------ diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD new file mode 100644 index 000000000..123300201 --- /dev/null +++ b/libre/mkisolinux/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 12670 2008-09-17 21:19:05Z tpowa $ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + +pkgname=mkisolinux +pkgver=2013.03 +pkgrel=1.1 +pkgdesc="Advanced, modular isolinux bootcd image creation utility, Parabola rebranded" +arch=(any) +license=('GPL') +url="https://parabolagnulinux.org/" +depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils') +replaces=('mkbootcd') +backup=(etc/mkisolinux.conf) +source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg') +md5sums=('945d5f5d74f37718c8c9d518bfd5698d' + 'e28b82502ae44087852ea6bfac398d5c' + '456eba83dfba319f8132c89e7ba42ce5' + 'ae0007d6679b5a575b2a9e5ac3664baf') + +package() +{ + cd "$srcdir/" + install -D -m755 mkisolinux "$pkgdir/usr/sbin/mkisolinux" + install -D -m644 mkisolinux.conf "$pkgdir/etc/mkisolinux.conf" + install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg" + install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg" +} diff --git a/libre/mkisolinux/boot.msg b/libre/mkisolinux/boot.msg new file mode 100644 index 000000000..e4109ea39 --- /dev/null +++ b/libre/mkisolinux/boot.msg @@ -0,0 +1,15 @@ + + +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre +ISOLINUX BOOT +created with 'mkisolinux' written by Tobias Powalowski <tpowa@archlinux.org> +rebranded for Parabola by André Silva <emulatorman@lavabit.com> + +Press ENTER or type 'parabola' to boot the CD. + +If you wish to change your defaults to boot into your existing system, +type 'vmlinuz initrd=initrd.img <any_other_boot_option>' +Use the F2 key for troubleshooting and options. +------------------------------------------------------------------------------ + diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux new file mode 100755 index 000000000..0cb53e81e --- /dev/null +++ b/libre/mkisolinux/mkisolinux @@ -0,0 +1,117 @@ +#! /bin/sh +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# Settings +APPNAME=$(basename "${0}") +CONFIG="/etc/mkisolinux.conf" +GENIMG="" +BURN="0" +BLANK="0" +TARNAME="" +export TEMPDIR=$(mktemp -d /tmp/mkisolinux.XXXX) +usage () +{ + echo "${APPNAME}: usage" + echo " -g=IMAGE Generate a ISO image as IMAGE" + echo " -c=CONFIG Use CONFIG file. default: /etc/mkisolinux.conf" + echo " -B Burn the ISO image after creation" + echo " -b Blanking media first" + echo " -h This message." + exit 1 +} + +[ "$1" == "" ] && usage + +while [ $# -gt 0 ]; do + case $1 in + -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; + -g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;; + -B|--B) BURN="1" ;; + -b|--b) BLANK="1" ;; + -t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;; + -h|--h|?) usage ;; + *) usage ;; + esac + shift +done + +if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then + echo "ERROR: No image name specified, please use the -g option" + exit 1 +fi + +if [ ! -f "${CONFIG}" ]; then + echo "config file '${CONFIG}' cannot be found, aborting..." + exit 1 +fi + +. "${CONFIG}" +# export for mkinitcpio +[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE +[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE + +export RUNPROGRAM="${APPNAME}" +export BOOTDIRNAME="boot/syslinux" + +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) +[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX) +export USEKERNEL=${VERSION} + +# begin script +mkdir -p ${TEMPDIR}/${BOOTDIRNAME}/ +# prepare syslinux +install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin +for i in /usr/lib/syslinux/*.c32; do + install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) +done +install -m644 /lib/modules/$(uname -r)/modules.pcimap ${TEMPDIR}/${BOOTDIRNAME}/modules.pcimap +install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids +# create syslinux.cfg +echo ":: Creating syslinux.cfg ..." +if [ "${ISOLINUXCFG}" = "" ]; then + [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg +else + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg +fi +[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 + +echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." +# generate initramdisk +echo ":: Creating initramdisk ..." + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img +echo ":: Using ${KERNEL} as image kernel ..." + install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz + install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg + install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 +# create image +echo ":: Creating ISO image ..." + [ -e ${GENIMG} ] && rm ${GENIMG} + [ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Parabola GNU/Linux-libre" + mkisofs -RlDJLV "${ISONAME}" -b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 \ + && echo ":: ISO Image succesfull created at ${GENIMG}" + # burning/blanking image + if [ "$BLANK" = "1" ]; then + echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..." + cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull." + fi + if [ "$BURN" = "1" ]; then + echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..." + cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG} > /dev/null 2>&1 && echo ":: Successfull." + fi + +# clean /tmp +rm -r ${TEMPDIR} diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf new file mode 100644 index 000000000..83d36219d --- /dev/null +++ b/libre/mkisolinux/mkisolinux.conf @@ -0,0 +1,39 @@ +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# config file of mkisolinux + +# DEFAULT kernel boot options like root=/dev/hda3 etc. +# add your root= option, if you boot from a disk device +# and don't want to add it by hand on each boot +KERNEL_BOOT_OPTIONS="" + +# mkinitcpio config file, defaulted to stock config file +MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" + +# kernel version, defaulted to build for runtime kernel +VERSION="$(uname -r)" + +# kernel image, defaulted to stock libre kernel +KERNEL="/boot/vmlinuz-linux-libre" + +# boot message files +BOOTMESSAGE="/usr/share/mkisolinux/boot.msg" +OPTIONSBOOTMESSAGE="/usr/share/mkisolinux/options.msg" + +# syslinux.cfg file to use +SYSLINUXCFG="" + +# Prompt on boot, 1=yes 0=no +PROMPT="1" + +# Name of the ISO, if empty Parabola GNU/Linux-libre is used if not set by a HOOK later +ISONAME="" + +# Timeout, 30 seconds to fix usb keyboard issues +# 0 means wait for prompt +TIMEOUT="300" + +# Setting cdrecord options +DEVICE="" +SPEED="" +BLANKMODE="" diff --git a/libre/mkisolinux/options.msg b/libre/mkisolinux/options.msg new file mode 100644 index 000000000..16c6b2eda --- /dev/null +++ b/libre/mkisolinux/options.msg @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre options and troubleshooting: + +- If your system hangs during the boot process, any combinations of the + boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. +------------------------------------------------------------------------------ diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD new file mode 100644 index 000000000..cbdca0960 --- /dev/null +++ b/libre/mkpxelinux/PKGBUILD @@ -0,0 +1,27 @@ +# $Id$ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + +pkgname=mkpxelinux +pkgver=2013.03 +pkgrel=1.1 +pkgdesc="Advanced, modular network pxe boot image creation utility, Parabola rebranded" +arch=(any) +license=('GPL') +url="https://parabolagnulinux.org/" +depends=('mkinitcpio' 'tftp-hpa' 'syslinux') +backup=(etc/mkpxelinux.conf) +optdepends=('dhcp: for dhcp server usage') +source=('boot.msg' 'mkpxelinux' 'mkpxelinux.conf' 'options.msg') +md5sums=('7225e73bfe717f97bd7ab52f5ab157f6' + '58dfd6b96e7faeb75b7e5753e1751f31' + 'aad6a91bae077461c33c2db3844814f0' + 'ae0007d6679b5a575b2a9e5ac3664baf') + +package() +{ + cd "$srcdir/" + install -D -m755 mkpxelinux "$pkgdir/usr/sbin/mkpxelinux" + install -D -m644 mkpxelinux.conf "$pkgdir/etc/mkpxelinux.conf" + install -D -m644 boot.msg "$pkgdir/usr/share/mkpxelinux/boot.msg" + install -D -m644 options.msg "$pkgdir/usr/share/mkpxelinux/options.msg" +} diff --git a/libre/mkpxelinux/boot.msg b/libre/mkpxelinux/boot.msg new file mode 100644 index 000000000..6c1fcd476 --- /dev/null +++ b/libre/mkpxelinux/boot.msg @@ -0,0 +1,14 @@ + + +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre +PXELINUX BOOT +created with 'mkpxelinux' written by Tobias Powalowski <tpowa@archlinux.org> + +Press ENTER or type 'parabola' to boot image. + +If you wish to change your defaults to boot into your existing system, +type 'vmlinuz initrd=initrd.img <any_other_boot_option>' +Use the F2 key for troubleshooting and options. +------------------------------------------------------------------------------ + diff --git a/libre/mkpxelinux/mkpxelinux b/libre/mkpxelinux/mkpxelinux new file mode 100755 index 000000000..bd173376c --- /dev/null +++ b/libre/mkpxelinux/mkpxelinux @@ -0,0 +1,91 @@ +#! /bin/sh +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# Settings +APPNAME=$(basename "${0}") +CONFIG="/etc/mkpxelinux.conf" + +usage () +{ + echo "${APPNAME}: usage" + echo"" + echo " -d=INSTALLDIR Your INSTALLDIR overwrites config default" + echo " -c=CONFIG Use CONFIG file. default: /etc/mkpxelinux.conf" + echo " -h This message." + exit 1 +} + +[ "$1" == "" ] && usage && exit 1 + +while [ $# -gt 0 ]; do + case $1 in + -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; + -d=*|--d=*) CUSTOMINSTALLDIR="$(echo $1 | awk -F= '{print $2;}')" ;; + -h|--h|?) usage ;; + *) usage ;; + esac + shift +done + +if [ ! -f "${CONFIG}" ]; then + echo "config file '${CONFIG}' cannot be found, aborting..." + exit 1 +fi + +. "${CONFIG}" +# export for mkinitcpio +[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE +[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE + +! [ "${CUSTOMINSTALLDIR}" = "" ] && INSTALLDIR=${CUSTOMINSTALLDIR} + +if [ "${INSTALLDIR}" = "" ]; then + echo "ERROR: No INSTALLDIR name specified, please use the -d option" + exit 1 +fi + +if ! [ $UID -eq 0 ]; then + echo "ERROR: only works when run as root!" + exit 1 +fi + +! [ -e ${INSTALLDIR} ] && echo "No ${INSTALLDIR} found!" && exit 1 +export TEMPDIR=${NFSROOTDIR} +export INSTALLDIR=${INSTALLDIR} +export RUNPROGRAM="${APPNAME}" +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) +export USEKERNEL=${VERSION} +# begin script +# create default +echo ":: Creating pxelinux default config file ..." +mkdir -p ${INSTALLDIR}/pxelinux.cfg +if [ "${PXELINUX_DEFAULT}" = "" ]; then + [ -e ${INSTALLDIR}/pxelinux.cfg/default ] && rm ${INSTALLDIR}/pxelinux.cfg/default + echo "prompt ${PROMPT}" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "timeout ${TIMEOUT}" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "display boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "F1 boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "F2 options.msg" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "default parabola" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "label parabola" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "kernel vmlinuz" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${INSTALLDIR}/pxelinux.cfg/default +else + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${PXELINUX_DEFAULT} > ${INSTALLDIR}/pxelinux.cfg/default +fi +[ ! -s ${INSTALLDIR}/pxelinux.cfg/default ] && echo "No pxelinux default config found" && exit 1 +echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." +# generate initramdisk +echo ":: Creating initramdisk ..." + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${INSTALLDIR}/initrd.img +echo ":: Using ${KERNEL} as image kernel ..." + install -m644 ${KERNEL} ${INSTALLDIR}/vmlinuz +echo ":: Installing message files to ${INSTALLDIR} ..." + install -m644 ${BOOTMESSAGE} ${INSTALLDIR}/boot.msg + install -m644 ${OPTIONSBOOTMESSAGE} ${INSTALLDIR}/options.msg + [ ! -s ${INSTALLDIR}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 + [ ! -s ${INSTALLDIR}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 +echo ":: Installing PXELINUX to ${INSTALLDIR} ..." + install -m644 /usr/lib/syslinux/pxelinux.0 ${INSTALLDIR}/pxelinux.0 && echo "Installation completed." diff --git a/libre/mkpxelinux/mkpxelinux.conf b/libre/mkpxelinux/mkpxelinux.conf new file mode 100644 index 000000000..4b8e7b0a8 --- /dev/null +++ b/libre/mkpxelinux/mkpxelinux.conf @@ -0,0 +1,37 @@ +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# config file of mkpxelinux + +# DEFAULT kernel boot options like ip=:::::eth0:dhcp etc. +# add your root= option, if you boot from a disk device +# and don't want to add it by hand on each boot +KERNEL_BOOT_OPTIONS="" + +# mkinitcpio config file, defaulted to stock config file +MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" + +# kernel version, defaulted to build for runtime kernel +VERSION="$(uname -r)" + +# kernel image, defaulted to stock libre kernel +KERNEL="/boot/vmlinuz-linux-libre" + +# boot message files +BOOTMESSAGE="/usr/share/mkpxelinux/boot.msg" +OPTIONSBOOTMESSAGE="/usr/share/mkpxelinux/options.msg" + +#pxelinux default config file to use +PXELINUX_DEFAULT="" + +# Prompt on boot, 1=yes 0=no +PROMPT="1" + +# Timeout, 30 seconds to fix usb keyboard issues +# 0 means wait for prompt +TIMEOUT="300" + +# Installdir of tftp, default location +INSTALLDIR="/var/tftpboot" + +# Nfsrootdir, for hooks that might need it +NFSROOTDIR="" diff --git a/libre/mkpxelinux/options.msg b/libre/mkpxelinux/options.msg new file mode 100644 index 000000000..16c6b2eda --- /dev/null +++ b/libre/mkpxelinux/options.msg @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre options and troubleshooting: + +- If your system hangs during the boot process, any combinations of the + boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. +------------------------------------------------------------------------------ diff --git a/extra/psi/PKGBUILD b/libre/psi/PKGBUILD index d3bee3fee..16c9e2b78 100644 --- a/extra/psi/PKGBUILD +++ b/libre/psi/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 167954 2012-10-04 05:36:54Z pierre $ +# $Id$ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=psi pkgver=0.15 -pkgrel=1 -pkgdesc='Instant messaging application designed for the Jabber IM' +pkgrel=1.1 +pkgdesc='Instant messaging application designed for the Jabber IM, Parabola rebranded' url='http://psi-im.org/' license=('GPL') -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils') makedepends=('icu') install='psi.install' source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2" - 'archlinux.patch') + 'parabola.patch') md5sums=('aea15f17cf93e7cea52f305523f761be' - '2ed44ef84007b5b7f9a3f0a4f5f6a86d') + 'a641b77517c82c6e1f254d5595a25113') build() { cd ${srcdir}/psi-${pkgver} - patch -p0 -i ${srcdir}/archlinux.patch + patch -p0 -i ${srcdir}/parabola.patch ./configure --prefix=/usr --release --no-separate-debug-info make } diff --git a/libre/psi/parabola.patch b/libre/psi/parabola.patch new file mode 100644 index 000000000..cafe67fa1 --- /dev/null +++ b/libre/psi/parabola.patch @@ -0,0 +1,53 @@ +--- src/systeminfo.cpp 2012-10-03 21:53:03.000000000 -0300 ++++ src/systeminfo.cpp 2013-03-25 21:27:28.691880863 -0300 +@@ -75,23 +75,7 @@ + enum LinuxName { + LinuxNone = 0, + +- LinuxMandrake, +- LinuxDebian, +- LinuxRedHat, +- LinuxGentoo, +- LinuxExherbo, +- LinuxSlackware, +- LinuxSuSE, +- LinuxConectiva, +- LinuxCaldera, +- LinuxLFS, +- +- LinuxASP, // Russian Linux distros +- LinuxALT, +- +- LinuxPLD, // Polish Linux distros +- LinuxAurox, +- LinuxArch ++ LinuxParabola + }; + + enum OsFlags { +@@ -106,24 +90,7 @@ + QString file; + QString name; + } osInfo[] = { +- { LinuxMandrake, OsUseFile, "/etc/mandrake-release", "Mandrake Linux" }, +- { LinuxDebian, OsAppendFile, "/etc/debian_version", "Debian GNU/Linux" }, +- { LinuxGentoo, OsUseFile, "/etc/gentoo-release", "Gentoo Linux" }, +- { LinuxExherbo, OsUseName, "/etc/exherbo-release", "Exherbo Linux" }, +- { LinuxArch, OsUseName, "/etc/arch-release", "Arch Linux" }, +- { LinuxSlackware, OsAppendFile, "/etc/slackware-version", "Slackware Linux" }, +- { LinuxPLD, OsUseFile, "/etc/pld-release", "PLD Linux" }, +- { LinuxAurox, OsUseName, "/etc/aurox-release", "Aurox Linux" }, +- { LinuxArch, OsUseFile, "/etc/arch-release", "Arch Linux" }, +- { LinuxLFS, OsAppendFile, "/etc/lfs-release", "LFS Linux" }, +- +- // untested +- { LinuxSuSE, OsUseFile, "/etc/SuSE-release", "SuSE Linux" }, +- { LinuxConectiva, OsUseFile, "/etc/conectiva-release", "Conectiva Linux" }, +- { LinuxCaldera, OsUseFile, "/etc/.installed", "Caldera Linux" }, +- +- // many distros use the /etc/redhat-release for compatibility, so RedHat will be the last :) +- { LinuxRedHat, OsUseFile, "/etc/redhat-release", "RedHat Linux" }, ++ { LinuxParabola, OsUseName, "/etc/arch-release", "Parabola GNU/Linux-libre" }, + + { LinuxNone, OsUseName, "", "" } + }; diff --git a/extra/psi/psi.install b/libre/psi/psi.install index 464d2e625..464d2e625 100644 --- a/extra/psi/psi.install +++ b/libre/psi/psi.install |