From 0671250710c3e7312a4693ac45ebbaacf471d1dc Mon Sep 17 00:00:00 2001 From: root Date: Wed, 13 Feb 2013 00:04:32 -0800 Subject: Wed Feb 13 00:04:27 PST 2013 --- libre/linux-libre-lts-kmod-alx/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 61b978fdc..0840667de 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva -_kernver=3.0.62 +_kernver=3.0.63 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') -_version=v3.8-rc5 -_pkgver=3.8-rc5-1-u -pkgver=3.8rc5.1 +_version=v3.8-rc7 +_pkgver=3.8-rc7-1-u +pkgver=3.8rc7.1 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) -md5sums=('6ad873fbc6664aa4c15160e3ad7cb4c1') +md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') build() { -- cgit v1.2.3-54-g00ecf From 4a4f6be8604aa35bdc81ae29d86b07dc8aea0c5c Mon Sep 17 00:00:00 2001 From: root Date: Sat, 16 Feb 2013 00:07:09 -0800 Subject: Sat Feb 16 00:07:08 PST 2013 --- community/cclive/PKGBUILD | 8 +- community/duplicity/PKGBUILD | 17 ++-- community/duplicity/u1-ascii-error.patch | 13 --- community/fcgiwrap/PKGBUILD | 22 ++---- community/fcgiwrap/fcgiwrap.conf.d | 13 --- community/fcgiwrap/fcgiwrap.rc.d | 74 ----------------- community/jhead/PKGBUILD | 20 ++--- community/ngircd/PKGBUILD | 6 +- community/pv/PKGBUILD | 6 +- community/surf/PKGBUILD | 8 +- community/surf/config.h | 82 ++++++++++++++----- community/tomoyo-tools/PKGBUILD | 6 +- community/wyrd/PKGBUILD | 16 ++-- extra/qca-gnupg/PKGBUILD | 4 +- extra/qca-ossl/PKGBUILD | 3 +- extra/qca/PKGBUILD | 11 ++- extra/qca/gcc47.patch | 17 ++++ extra/telepathy-qt/PKGBUILD | 9 +-- extra/wayland/PKGBUILD | 9 ++- kernels/linux-libre-pae/PKGBUILD | 6 +- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 6 +- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 10 +-- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 10 +-- libre/linux-libre/linux-libre.install | 2 +- libre/parabola-keyring/PKGBUILD | 4 +- pcr/libowfat/PKGBUILD | 30 +++++++ pcr/libowfat/libowfat.install | 39 +++++++++ pcr/libpurple-minimal/PKGBUILD | 46 +++++++++++ pcr/miniupnpd/PKGBUILD | 49 ++++++++++++ pcr/miniupnpd/miniupnpd.init | 51 ++++++++++++ pcr/miniupnpd/miniupnpd.systemd | 12 +++ pcr/monkeysphere/PKGBUILD | 22 ++++++ pcr/monkeysphere/monkeysphere.install | 43 ++++++++++ pcr/netatalk/PKGBUILD | 43 ++++++++++ pcr/netatalk/netatalk.changelog | 101 ++++++++++++++++++++++++ pcr/netatalk/netatalk.install | 20 +++++ pcr/olsrd/PKGBUILD | 31 ++++++++ pcr/olsrd/olsrd.install | 21 +++++ pcr/olsrd/rc.d.olsrd | 36 +++++++++ pcr/openswan/PKGBUILD | 46 +++++++++++ pcr/openswan/compile.patch | 11 +++ pcr/openswan/openswan.rc.d | 43 ++++++++++ pcr/poco/PKGBUILD | 44 +++++++++++ pcr/ruby-headers/PKGBUILD | 31 ++++++++ pcr/seeks/PKGBUILD | 65 +++++++++++++++ pcr/seeks/conf.patch | 20 +++++ pcr/seeks/docbook2man.patch | 24 ++++++ pcr/seeks/img_websearch.patch | 13 +++ pcr/seeks/install | 18 +++++ pcr/seeks/logfile.patch | 29 +++++++ pcr/seeks/seeks | 68 ++++++++++++++++ pcr/seeks/seeks.conf.d | 11 +++ pcr/seeks/seeks.install | 12 +++ pcr/seeks/seeks.logrotate | 6 ++ pcr/seeks/seeks.rc.d | 57 +++++++++++++ pcr/seeks/seeksdaemon | 41 ++++++++++ pcr/sipwitch/PKGBUILD | 32 ++++++++ pcr/sobby/PKGBUILD | 24 ++++++ pcr/spectrum/PKGBUILD | 81 +++++++++++++++++++ pcr/spectrum/gcc47.patch | 97 +++++++++++++++++++++++ pcr/spectrum/logrotate.spectrum | 10 +++ pcr/spectrum/spectrum.install | 45 +++++++++++ pcr/spectrum/spectrum.tmpfiles | 1 + pcr/spectrum/spectrum@.service | 14 ++++ pcr/squirm/PKGBUILD | 32 ++++++++ pcr/strongswan/PKGBUILD | 45 +++++++++++ pcr/strongswan/strongswan.rc | 43 ++++++++++ pcr/tokyotyrant/PKGBUILD | 33 ++++++++ pcr/tokyotyrant/tokyotyrant.conf | 21 +++++ pcr/tokyotyrant/tokyotyrant.rc | 41 ++++++++++ 75 files changed, 1778 insertions(+), 220 deletions(-) delete mode 100644 community/duplicity/u1-ascii-error.patch delete mode 100644 community/fcgiwrap/fcgiwrap.conf.d delete mode 100644 community/fcgiwrap/fcgiwrap.rc.d create mode 100644 extra/qca/gcc47.patch create mode 100644 pcr/libowfat/PKGBUILD create mode 100644 pcr/libowfat/libowfat.install create mode 100644 pcr/libpurple-minimal/PKGBUILD create mode 100644 pcr/miniupnpd/PKGBUILD create mode 100644 pcr/miniupnpd/miniupnpd.init create mode 100644 pcr/miniupnpd/miniupnpd.systemd create mode 100644 pcr/monkeysphere/PKGBUILD create mode 100644 pcr/monkeysphere/monkeysphere.install create mode 100644 pcr/netatalk/PKGBUILD create mode 100644 pcr/netatalk/netatalk.changelog create mode 100644 pcr/netatalk/netatalk.install create mode 100644 pcr/olsrd/PKGBUILD create mode 100755 pcr/olsrd/olsrd.install create mode 100755 pcr/olsrd/rc.d.olsrd create mode 100644 pcr/openswan/PKGBUILD create mode 100644 pcr/openswan/compile.patch create mode 100755 pcr/openswan/openswan.rc.d create mode 100644 pcr/poco/PKGBUILD create mode 100644 pcr/ruby-headers/PKGBUILD create mode 100644 pcr/seeks/PKGBUILD create mode 100644 pcr/seeks/conf.patch create mode 100644 pcr/seeks/docbook2man.patch create mode 100644 pcr/seeks/img_websearch.patch create mode 100644 pcr/seeks/install create mode 100644 pcr/seeks/logfile.patch create mode 100755 pcr/seeks/seeks create mode 100644 pcr/seeks/seeks.conf.d create mode 100644 pcr/seeks/seeks.install create mode 100644 pcr/seeks/seeks.logrotate create mode 100644 pcr/seeks/seeks.rc.d create mode 100644 pcr/seeks/seeksdaemon create mode 100644 pcr/sipwitch/PKGBUILD create mode 100644 pcr/sobby/PKGBUILD create mode 100644 pcr/spectrum/PKGBUILD create mode 100644 pcr/spectrum/gcc47.patch create mode 100644 pcr/spectrum/logrotate.spectrum create mode 100644 pcr/spectrum/spectrum.install create mode 100644 pcr/spectrum/spectrum.tmpfiles create mode 100644 pcr/spectrum/spectrum@.service create mode 100644 pcr/squirm/PKGBUILD create mode 100644 pcr/strongswan/PKGBUILD create mode 100644 pcr/strongswan/strongswan.rc create mode 100644 pcr/tokyotyrant/PKGBUILD create mode 100644 pcr/tokyotyrant/tokyotyrant.conf create mode 100644 pcr/tokyotyrant/tokyotyrant.rc (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index e74af9746..c8fbe5f3b 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83242 2013-01-28 16:49:28Z stephane $ +# $Id: PKGBUILD 84279 2013-02-15 14:08:16Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive -pkgver=0.7.11 -pkgrel=2 +pkgver=0.7.12 +pkgrel=1 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64') url='http://cclive.sourceforge.net/' @@ -13,7 +13,7 @@ license=('GPL3') depends=('boost-libs' 'pcre' 'curl' 'libquvi') makedepends=('boost') source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz") -md5sums=('b96cf74e846e3047e0b1db917070c6d0') +md5sums=('f35a6fb3a9a08d59da7170c1330a24ce') build() { cd $pkgname-$pkgver diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 654d1a743..dd8e8f3ed 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,27 +1,22 @@ -# $Id: PKGBUILD 79464 2012-11-05 20:16:41Z bgyorgy $ +# $Id: PKGBUILD 84281 2013-02-15 14:20:17Z lfleischer $ # Maintainer: Kaiting Chen # Contributor: Aaron Schaefer pkgname=duplicity -pkgver=0.6.20 -pkgrel=2 +pkgver=0.6.21 +pkgrel=1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64') url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} - u1-ascii-error.patch) -md5sums=('83a56c4c17fc50961c961943867deae4' - '2bd2d4a3a331ab728473f46963dc87da' - '7e19cc49547848ce847297b1880f5a8e') +source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('4ade1de475e0af64211bb6933b593057' + '3521d679ba7dff46653313aa3b3e6855') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # Fix ascii error in U1 backend - patch -Np0 -i "${srcdir}/u1-ascii-error.patch" - # python2 fix for file in $(find . -name '*.py' -print); do sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file diff --git a/community/duplicity/u1-ascii-error.patch b/community/duplicity/u1-ascii-error.patch deleted file mode 100644 index 0812653b9..000000000 --- a/community/duplicity/u1-ascii-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'duplicity/backends/u1backend.py' ---- duplicity/backends/u1backend.py 2012-10-27 12:16:19 +0000 -+++ duplicity/backends/u1backend.py 2012-11-03 21:39:23 +0000 -@@ -207,7 +207,7 @@ - "Content-Type": content_type} - resp, content = self.client.request(remote_full, - method="PUT", -- body=str(data), -+ body=bytearray(data), - headers=headers) - - def get(self, filename, local_path): - diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD index e5a83ca0a..80f5babe0 100644 --- a/community/fcgiwrap/PKGBUILD +++ b/community/fcgiwrap/PKGBUILD @@ -1,29 +1,23 @@ -# $Id: PKGBUILD 79378 2012-11-03 21:00:27Z lfleischer $ +# $Id: PKGBUILD 84283 2013-02-15 14:33:33Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Aaron Bull Schaefer # Contributor: Ron Huang pkgname=fcgiwrap -pkgver=1.0.3 -_gitrev='b9f03e6' -pkgrel=4 +pkgver=1.1.0 +pkgrel=1 pkgdesc='A simple server for running CGI applications over FastCGI.' arch=('i686' 'x86_64') url='http://nginx.localdomain.pl/wiki/FcgiWrap' license=('MIT') depends=('fcgi' 'systemd') -backup=('etc/conf.d/fcgiwrap') -source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${_gitrev}.tar.gz" - 'fcgiwrap.conf.d' - 'fcgiwrap.rc.d' +source=("https://github.com/gnosek/fcgiwrap/archive/${pkgver}.tar.gz" 'LICENSE') -md5sums=('96d5f5a82b96f6eb7b4117fbab5e1e58' - '9fbb5b0e861ffea74e655143a4c1a8f9' - '71ea12f43aebca39f73ff2e0b684f361' +md5sums=('d14f56bda6758a6e02aa7b3fb125cbce' '5aee62c27b4308f25ab32f05da387366') build() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" autoreconf --install ./configure --prefix=/usr --mandir=/share/man @@ -31,10 +25,8 @@ build() { } package() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm0644 ../fcgiwrap.conf.d "${pkgdir}/etc/conf.d/${pkgname}" - install -Dm0755 ../fcgiwrap.rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/fcgiwrap/fcgiwrap.conf.d b/community/fcgiwrap/fcgiwrap.conf.d deleted file mode 100644 index 906f597a0..000000000 --- a/community/fcgiwrap/fcgiwrap.conf.d +++ /dev/null @@ -1,13 +0,0 @@ -# -# parameters for fcgiwrap daemon -# - -SPAWNER='/usr/bin/spawn-fcgi' - -FCGI_ADDRESS='127.0.0.1' -FCGI_PORT='9001' -FCGI_USER='http' -FCGI_GROUP='http' -FCGI_EXTRA_OPTIONS='' - -SPAWNER_ARGS="-a $FCGI_ADDRESS -p $FCGI_PORT -u $FCGI_USER -g $FCGI_GROUP $FCGI_EXTRA_OPTIONS -- /usr/sbin/fcgiwrap" diff --git a/community/fcgiwrap/fcgiwrap.rc.d b/community/fcgiwrap/fcgiwrap.rc.d deleted file mode 100644 index 42787d149..000000000 --- a/community/fcgiwrap/fcgiwrap.rc.d +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON=fcgiwrap - -# source application-specific settings -[ -f /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON - -# set defaults if settings are missing -[ -z "$SPAWNER" ] && SPAWNER='/usr/bin/spawn-fcgi' -[ -z "$SPAWNER_ARGS" ] && SPAWNER_ARGS='-a 127.0.0.1 -p 9001 -u http -g http -- /usr/sbin/fcgiwrap' - -get_pid() { - pidof -o %PPID $DAEMON -} - -case "$1" in - start) - stat_busy "Starting $DAEMON daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/$DAEMON.pid ] && rm -f /var/run/$DAEMON.pid - # RUN - $SPAWNER $SPAWNER_ARGS &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$DAEMON.pid - add_daemon $DAEMON - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $DAEMON daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$DAEMON.pid &> /dev/null - rm_daemon $DAEMON - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $DAEMON status"; - ck_status $DAEMON - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/community/jhead/PKGBUILD b/community/jhead/PKGBUILD index 3b217dd63..4a2f0ccf3 100644 --- a/community/jhead/PKGBUILD +++ b/community/jhead/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 73309 2012-07-06 06:23:17Z andrea $ -# Maintainer: François Charette +# $Id: PKGBUILD 84285 2013-02-15 14:37:36Z lfleischer $ +# Maintainer: Lukas Fleischer +# Contributor: François Charette # Contributor: Giovanni Scafora pkgname=jhead -pkgver=2.96 +pkgver=2.97 pkgrel=1 -pkgdesc="EXIF JPEG info parser and thumbnail remover" +pkgdesc='EXIF JPEG info parser and thumbnail remover' url="http://www.sentex.net/~mwandel/jhead/" arch=('i686' 'x86_64') license=('custom') depends=('glibc') optdepends=('libjpeg: to up-right images according to rotation tag') -source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=("http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz" LICENSE) -md5sums=('562b45d4d82f64196debed8c520c1cab' +md5sums=('23b037d0c54211973a3951e41a97c924' '1f0db611d2642a981719f45252762a45') build() { @@ -23,7 +24,8 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -D -m755 jhead "${pkgdir}/usr/bin/jhead" - install -D -m644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1" - install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + install -Dm755 jhead "${pkgdir}/usr/bin/jhead" + install -Dm644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1" + install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD index b5d95bdb5..e536d7f63 100644 --- a/community/ngircd/PKGBUILD +++ b/community/ngircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81560 2012-12-24 04:07:48Z kkeen $ +# $Id: PKGBUILD 84301 2013-02-15 22:17:20Z kkeen $ # Maintainer: Kyle Keen # Contributor: Mateusz Herych # Contributor: Alexander Rødseth pkgname=ngircd -pkgver=20 +pkgver=20.2 pkgrel=1 pkgdesc="Next Generation IRC Daemon" arch=('x86_64' 'i686') @@ -15,7 +15,7 @@ depends=('openssl' 'libident') source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz" ngircd.sh ngircd.service) -sha256sums=('948b6ee9217bf0833958390513ba1ca2b2e8ddef809c226b889e7591f680c3d8' +sha256sums=('306c0ef0d2ceac0836a84ecf871a6bc4dd16c25683aa87c0f172b6e68b93357d' 'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5' '13ffad9647ef42d1a9c8f01f6208bef9dfe9e0f86dce9a01f72711d813d720a0') diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD index 4c048021c..d0420c243 100644 --- a/community/pv/PKGBUILD +++ b/community/pv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80922 2012-12-06 22:11:43Z lfleischer $ +# $Id: PKGBUILD 84287 2013-02-15 14:40:03Z lfleischer $ # Maintainer: Kaiting Chen # Contributor: Aaron Schaefer pkgname=pv -pkgver=1.4.0 +pkgver=1.4.6 pkgrel=1 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url='http://www.ivarch.com/programs/pv.shtml' license=('custom:Artistic 2.0') depends=('glibc') source=("http://www.ivarch.com/programs/sources/$pkgname-$pkgver.tar.bz2") -md5sums=('2403d1bc130b0f481344bd2b2470b17d') +md5sums=('d55ff76f5caa83efc23aa527dbb0b191') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/surf/PKGBUILD b/community/surf/PKGBUILD index ee52c3029..df36f7829 100644 --- a/community/surf/PKGBUILD +++ b/community/surf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74178 2012-07-22 18:33:06Z lfleischer $ +# $Id: PKGBUILD 84289 2013-02-15 14:50:43Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Pierre Chapuis # Contributor: Ray Kohler @@ -6,7 +6,7 @@ # Contributor: Raphael Proust pkgname=surf -pkgver=0.5 +pkgver=0.6 pkgrel=1 pkgdesc='A simple web browser based on WebKit/GTK+.' arch=('i686' 'x86_64') @@ -21,8 +21,8 @@ makedepends=('pkgconfig') install='surf.install' source=("http://dl.suckless.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'config.h') -md5sums=('dc735a380d01203861b987b5f4c3c59c' - 'd11435f6a67af46a0d19d18a95a1620b') +md5sums=('aeeed723b562a30cc6a2b3ea18f6d99a' + '15c2c911658e2e6085e4c4fa7a7b01c1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/surf/config.h b/community/surf/config.h index 8f8561a71..a221c86e3 100644 --- a/community/surf/config.h +++ b/community/surf/config.h @@ -1,49 +1,95 @@ /* modifier 0 means no modifier */ -static char *useragent = "Surf/"VERSION" (X11; U; Unix; en-US) AppleWebKit/531.2+ Compatible (Safari)"; -static char *progress = "#0066FF"; -static char *progress_untrust = "#FF6600"; +static char *useragent = "Mozilla/5.0 (X11; U; Unix; en-US) " + "AppleWebKit/537.15 (KHTML, like Gecko) Chrome/24.0.1295.0 " + "Safari/537.15 Surf/"VERSION; +static char *progress = "#0000FF"; +static char *progress_untrust = "#FF0000"; static char *progress_trust = "#00FF00"; -static char *stylefile = ".surf/style.css"; -static char *scriptfile = ".surf/script.js"; -static char *cookiefile = ".surf/cookies.txt"; +static char *progress_proxy = "#FFFF00"; +static char *progress_proxy_trust = "#66FF00"; +static char *progress_proxy_untrust = "#FF6600"; +static char *stylefile = "~/.surf/style.css"; +static char *scriptfile = "~/.surf/script.js"; +static char *cookiefile = "~/.surf/cookies.txt"; static time_t sessiontime = 3600; static char *cafile = "/etc/ssl/certs/ca-certificates.crt"; static char *strictssl = FALSE; /* Refuse untrusted SSL connections */ -#define HIDE_BACKGROUND FALSE -#define SPATIAL_BROWSING TRUE - -#define SETPROP(p, q) { .v = (char *[]){ "/bin/sh", "-c", \ - "prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \ - "xprop -id $2 -f $1 8s -set $1 \"$prop\"", \ - p, q, winid, NULL } } -#define DOWNLOAD(d) { \ +static int indicator_thickness = 2; + +/* Webkit default features */ +static Bool enablespatialbrowsing = TRUE; +static Bool enableplugins = TRUE; +static Bool enablescripts = TRUE; +static Bool enableinspector = TRUE; +static Bool loadimages = TRUE; +static Bool hidebackground = FALSE; + +#define SETPROP(p, q) { \ + .v = (char *[]){ "/bin/sh", "-c", \ + "prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \ + "xprop -id $2 -f $1 8s -set $1 \"$prop\"", \ + p, q, winid, NULL \ + } \ +} + +/* DOWNLOAD(URI, referer) */ +#define DOWNLOAD(d, r) { \ .v = (char *[]){ "/bin/sh", "-c", \ - "xterm -e \"wget '$0' \ ---load-cookies ~/.surf/cookies.txt \ ---user-agent '$1' ; sleep 5\"", d, useragent, NULL } } + "st -e /bin/sh -c \"curl -J -O --user-agent '$1'" \ + " --referer '$2'" \ + " -b ~/.surf/cookies.txt -c ~/.surf/cookies.txt '$0';" \ + " sleep 5;\"", \ + d, useragent, r, NULL \ + } \ +} + #define MODKEY GDK_CONTROL_MASK + +/* hotkeys */ +/* + * If you use anything else but MODKEY and GDK_SHIFT_MASK, don't forget to + * edit the CLEANMASK() macro. + */ static Key keys[] = { /* modifier keyval function arg Focus */ { MODKEY|GDK_SHIFT_MASK,GDK_r, reload, { .b = TRUE } }, { MODKEY, GDK_r, reload, { .b = FALSE } }, { MODKEY|GDK_SHIFT_MASK,GDK_p, print, { 0 } }, + { MODKEY, GDK_p, clipboard, { .b = TRUE } }, { MODKEY, GDK_y, clipboard, { .b = FALSE } }, + { MODKEY|GDK_SHIFT_MASK,GDK_j, zoom, { .i = -1 } }, { MODKEY|GDK_SHIFT_MASK,GDK_k, zoom, { .i = +1 } }, - { MODKEY|GDK_SHIFT_MASK,GDK_i, zoom, { .i = 0 } }, + { MODKEY|GDK_SHIFT_MASK,GDK_q, zoom, { .i = 0 } }, + { MODKEY, GDK_minus, zoom, { .i = -1 } }, + { MODKEY, GDK_plus, zoom, { .i = +1 } }, + { MODKEY, GDK_l, navigate, { .i = +1 } }, { MODKEY, GDK_h, navigate, { .i = -1 } }, + { MODKEY, GDK_j, scroll_v, { .i = +1 } }, { MODKEY, GDK_k, scroll_v, { .i = -1 } }, { MODKEY, GDK_b, scroll_v, { .i = -10000 } }, { MODKEY, GDK_space, scroll_v, { .i = +10000 } }, { MODKEY, GDK_i, scroll_h, { .i = +1 } }, { MODKEY, GDK_u, scroll_h, { .i = -1 } }, + + { 0, GDK_F11, fullscreen, { 0 } }, { 0, GDK_Escape, stop, { 0 } }, { MODKEY, GDK_o, source, { 0 } }, + { MODKEY|GDK_SHIFT_MASK,GDK_o, inspector, { 0 } }, + { MODKEY, GDK_g, spawn, SETPROP("_SURF_URI", "_SURF_GO") }, { MODKEY, GDK_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, + { MODKEY, GDK_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, + { MODKEY, GDK_n, find, { .b = TRUE } }, { MODKEY|GDK_SHIFT_MASK,GDK_n, find, { .b = FALSE } }, + + { MODKEY|GDK_SHIFT_MASK,GDK_c, toggle, { .v = "enable-caret-browsing" } }, + { MODKEY|GDK_SHIFT_MASK,GDK_i, toggle, { .v = "auto-load-images" } }, + { MODKEY|GDK_SHIFT_MASK,GDK_s, toggle, { .v = "enable-scripts" } }, + { MODKEY|GDK_SHIFT_MASK,GDK_v, toggle, { .v = "enable-plugins" } }, }; + diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index 86d8a19a1..f5acfbdbf 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74852 2012-08-07 13:20:49Z spupykin $ +# $Id: PKGBUILD 84271 2013-02-15 10:11:37Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jamie Nguyen pkgname=tomoyo-tools _basever=2.5.0 -_timestamp=20120805 +_timestamp=20130214 _file=53357 pkgver=${_basever}.${_timestamp} pkgrel=1 @@ -17,7 +17,7 @@ depends=('ncurses') conflicts=('ccs-tools') install=tomoyo-tools.install source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('cccc7cb7f9492dc53063065f7ccf7b21') +md5sums=('ffff6b531ed9ac32b01722a9cd749a2f') build() { cd "${srcdir}/${pkgname}" diff --git a/community/wyrd/PKGBUILD b/community/wyrd/PKGBUILD index 81973859a..b5944718a 100644 --- a/community/wyrd/PKGBUILD +++ b/community/wyrd/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Daniel J Griffiths pkgname=wyrd -pkgver=1.4.5 -pkgrel=3 +pkgver=1.4.6 +pkgrel=1 pkgdesc='A text-based front-end to Remind.' arch=('i686' 'x86_64') url='http://pessimization.com/software/wyrd/' @@ -12,16 +12,16 @@ license=('GPL') depends=('remind' 'ncurses') makedepends=('ocaml') source=("http://pessimization.com/software/wyrd/${pkgname}-${pkgver}.tar.gz") -md5sums=('3f39fa83a54d2d890823094aba9ca3cc') +md5sums=('2fc561482fdac4daac0cb6735d934ebe') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --enable-utf8 - make + ./configure --prefix=/usr --sysconfdir=/etc --enable-utf8 + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/qca-gnupg/PKGBUILD b/extra/qca-gnupg/PKGBUILD index d34d87dbd..0908a4514 100644 --- a/extra/qca-gnupg/PKGBUILD +++ b/extra/qca-gnupg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149479 2012-02-08 09:59:34Z pierre $ +# $Id: PKGBUILD 178075 2013-02-15 12:03:06Z pierre $ # Maintainer: # Contributor: Pierre Schmitz pkgname=qca-gnupg pkgver=2.0.0 _pkgver=2.0.0-beta3 -pkgrel=3 +pkgrel=4 pkgdesc="Qt Cryptographic Architecture" arch=('i686' 'x86_64') url="http://delta.affinix.com/qca/" diff --git a/extra/qca-ossl/PKGBUILD b/extra/qca-ossl/PKGBUILD index 50e434b35..772cac844 100644 --- a/extra/qca-ossl/PKGBUILD +++ b/extra/qca-ossl/PKGBUILD @@ -4,12 +4,13 @@ pkgname=qca-ossl pkgver=2.0.0 _pkgver=2.0.0-beta3 -pkgrel=4 +pkgrel=5 pkgdesc="Qt Cryptographic Architecture" arch=('i686' 'x86_64') url="http://delta.affinix.com/qca/" license=('LGPL') depends=('qca') +makedepends=('icu') source=("http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${_pkgver}.tar.bz2" 'no-whirlpool.patch') md5sums=('bdc62c01321385c7da8d27b3902910ce' diff --git a/extra/qca/PKGBUILD b/extra/qca/PKGBUILD index a3d71907e..735683c39 100644 --- a/extra/qca/PKGBUILD +++ b/extra/qca/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 149477 2012-02-08 09:57:45Z pierre $ +# $Id: PKGBUILD 178073 2013-02-15 11:56:00Z pierre $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=qca pkgver=2.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Qt Cryptographic Architecture" arch=('i686' 'x86_64') url="http://delta.affinix.com/qca/" license=('LGPL') depends=('qt' 'ca-certificates') -source=("http://delta.affinix.com/download/qca/2.0/${pkgname}-${pkgver}.tar.bz2") -md5sums=('fc15bd4da22b8096c51fcfe52d2fa309') +source=("http://delta.affinix.com/download/qca/2.0/${pkgname}-${pkgver}.tar.bz2" + 'gcc47.patch') +md5sums=('fc15bd4da22b8096c51fcfe52d2fa309' + 'dffc7367152d8888c1447253a0387a2a') build() { cd $srcdir/${pkgname}-${pkgver} + patch -p0 -i ${srcdir}/gcc47.patch ./configure \ --prefix=/usr \ --disable-tests \ diff --git a/extra/qca/gcc47.patch b/extra/qca/gcc47.patch new file mode 100644 index 000000000..5297ecb9b --- /dev/null +++ b/extra/qca/gcc47.patch @@ -0,0 +1,17 @@ +--- ./src/botantools/botan/botan/secmem.h.orig 2012-01-07 20:09:35.427999593 +0100 ++++ ./src/botantools/botan/botan/secmem.h 2012-01-07 20:09:52.540001422 +0100 +@@ -214,11 +214,11 @@ + + SecureVector(u32bit n = 0) { MemoryRegion::init(true, n); } + SecureVector(const T in[], u32bit n) +- { MemoryRegion::init(true); set(in, n); } ++ { MemoryRegion::init(true); this->set(in, n); } + SecureVector(const MemoryRegion& in) +- { MemoryRegion::init(true); set(in); } ++ { MemoryRegion::init(true); this->set(in); } + SecureVector(const MemoryRegion& in1, const MemoryRegion& in2) +- { MemoryRegion::init(true); set(in1); append(in2); } ++ { MemoryRegion::init(true); this->set(in1); append(in2); } + }; + + /************************************************* diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index 31106382e..d48c5b9f8 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 175068 2013-01-12 13:26:14Z andrea $ +# $Id: PKGBUILD 178069 2013-02-15 10:07:33Z andrea $ # Maintainer: Ionut Biru # Maintainer: Andrea Scarpino pkgname=telepathy-qt pkgver=0.9.3 -pkgrel=3 +pkgrel=4 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org/wiki/" license=('LGPL') options=('!libtool') -depends=('qt' 'telepathy-farstream' 'farstream-0.1') +depends=('qt' 'telepathy-farstream' 'gstreamer0.10-base') makedepends=('libxslt' 'python2' 'cmake' 'doxygen') conflicts=('telepathy-qt4') replaces=('telepathy-qt4') @@ -20,7 +20,6 @@ md5sums=('94ac93aedf5f6fff49837bc8368e5a37' 'e1b851b08b159fca39596ff8395ca53a') build() { - cd "$srcdir" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -32,6 +31,6 @@ build() { } package() { - cd "$srcdir"/build + cd build make DESTDIR="$pkgdir" install } diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 24e354e17..3342dd822 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 177964 2013-02-12 16:53:44Z tomegun $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 178061 2013-02-15 01:24:43Z tomegun $ +# Maintainer: Tom Gundersen +# Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb pkgname=wayland -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64') @@ -13,7 +14,6 @@ depends=('libffi' 'expat') makedepends=('doxygen') options=(!libtool) source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('2f65654a54366cacd39a69bc5a41fea21b357e34') build() { cd $pkgname-$pkgver @@ -28,3 +28,4 @@ package() { } # vim:set ts=2 sw=2 et: +md5sums=('e2e9ebfbaf9b013471c620b99938d764') diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 970585286..51fbe93e6 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ +# $Id: PKGBUILD 178064 2013-02-15 02:39:55Z foutrelis $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.8 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -23,7 +23,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'fat-3.6.x.patch') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '6645c512b49498f17183298ab1ae98f2' + '587477b655e1bccc41d2035feb0167c5' '48a1026f5d36a915b8ef68f8138a7c18' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 007925fdd..c06a70578 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.7.7-1-LIBRE-PAE +KERNEL_VERSION=3.7.8-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index fa4b38b9c..6e95d3802 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ +# $Id: PKGBUILD 178064 2013-02-15 02:39:55Z foutrelis $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.8 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -23,7 +23,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'fat-3.6.x.patch') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '6645c512b49498f17183298ab1ae98f2' + '587477b655e1bccc41d2035feb0167c5' '36aadecfb87577e90931025f46cd9d53' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index b72fbbaf9..da9db83a8 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.7.7-1-LIBRE-XEN +KERNEL_VERSION=3.7.8-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index caaad4901..12727f5c0 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.7.7 +_kernver=3.7.8 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=1 +pkgrel=2 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 0840667de..04fef8c02 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.63 +_kernver=3.0.64 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=1 +pkgrel=2 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index f17cf91f5..1f871f9d3 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ +# $Id: PKGBUILD 178066 2013-02-15 02:56:13Z foutrelis $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=63 +_sublevel=64 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.62 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.63 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '5e4e976cce788a37cd17ea469dea7e6e' + 'c2368deec03209ead2ba9b5f43a51964' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '00c97c232129ecd16c739b0da0de87ce') + '1c5c1d0c50bfbe42c850abe14049901c') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index df16319ea..b4b867d9a 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.63-1-LIBRE-LTS +KERNEL_VERSION=3.0.64-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 0f7f9fa06..4910c7867 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ +# $Id: PKGBUILD 178064 2013-02-15 02:39:55Z foutrelis $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -_sublevel=7 +_sublevel=8 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'fat-3.6.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '6645c512b49498f17183298ab1ae98f2' + '587477b655e1bccc41d2035feb0167c5' '53c782740eb3ddf875ad98c31c1bf213' '71a6f703cb0bee098a76ea42d5836d06' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -41,7 +41,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' - '7e1f0776614380b36038a2baa1b0f54b') + '461b01b9aa79e5cdd48ed3981cd80445') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 10833c845..0c061c63b 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.7.7-1-LIBRE +KERNEL_VERSION=3.7.8-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 287e6c311..d5a1e561d 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -15,5 +15,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('695ef52f9cdd167f8f406ebfbe08754f' - '7f5b50ad7e68f8cf2e3a7f9a4b3b1277') +md5sums=('ad747cf1f710e5962aa6b0931fcb580f' + 'c1030ca1c960d2ee6cfe11d798a7b471') diff --git a/pcr/libowfat/PKGBUILD b/pcr/libowfat/PKGBUILD new file mode 100644 index 000000000..e2602046d --- /dev/null +++ b/pcr/libowfat/PKGBUILD @@ -0,0 +1,30 @@ +# Contributors: +# Alexander Ulrich +# Mildred +# henning mueller + +pkgname=libowfat +pkgver=0.29 +pkgrel=2 +pkgdesc='GPL reimplementation of libdjb' +arch=(i686 x86_64 mips64el) +url=http://www.fefe.de/libowfat/ +depends=() +license=(GPL) +install=libowfat.install +source=(http://dl.fefe.de/$pkgname-$pkgver.tar.bz2) +md5sums=(6bbee9a86506419657d87123b7a6f2c1) + +build() { + cd $srcdir/$pkgname-$pkgver + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr/ LIBDIR=$pkgdir/usr/lib MAN3DIR=$pkgdir/usr/share/man/man3 install + + cd $pkgdir/usr/share/man/man3 + mv buffer.3 buffer-libowfat.3 +} +md5sums=('1187c6acf11429e7adb9ebe180f644bb') diff --git a/pcr/libowfat/libowfat.install b/pcr/libowfat/libowfat.install new file mode 100644 index 000000000..a08aef10c --- /dev/null +++ b/pcr/libowfat/libowfat.install @@ -0,0 +1,39 @@ +# This is a default template for a post-install scriptlet. You can +# remove any functions you don't need (and this header). + +# arg 1: the new package version +pre_install() { + /bin/true +} + +# arg 1: the new package version +post_install() { + echo "The manpage buffer(3) was moved to buffer-libowfat(3) because + it conflicts with package openssl" +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + /bin/true +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + /bin/true +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +# arg 1: the old package version +post_remove() { + /bin/true +} + +op=$1 +shift +$op $* diff --git a/pcr/libpurple-minimal/PKGBUILD b/pcr/libpurple-minimal/PKGBUILD new file mode 100644 index 000000000..5526879d1 --- /dev/null +++ b/pcr/libpurple-minimal/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Magicking +# Contributors: wzff BluePeppers n0nsense +pkgname=libpurple-minimal +pkgver=2.10.0 +pkgrel=3 +pkgdesc="minimal build of the pidgin IM library (no gstreamer, perl and X11 dependencies)" +arch=('i686' 'x86_64' 'mips64el') +url="http://developer.pidgin.im/wiki/WhatIsLibpurple" +license=('GPL') +depends=('glib2' 'gnutls' 'libxml2' 'libidn' 'nss' 'avahi') +makedepends=('make' 'intltool') +conflicts=('libpurple') +provides=("libpurple=${pkgver}") +source="http://downloads.sourceforge.net/pidgin/pidgin-${pkgver}.tar.gz" +md5sums=('b92f83f6f075d9cd814d3ccff9fd6cac') + +build(){ + cd $srcdir/pidgin-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-perl \ + --disable-gtkui \ + --disable-consoleui \ + --disable-sm \ + --disable-gestures \ + --disable-screensaver \ + --disable-startup-notification \ + --disable-schemas-install \ + --disable-tcl \ + --disable-tk \ + --disable-nls \ + --without-x \ + --disable-vv \ + --disable-gstreamer \ + --disable-meanwhile \ + --disable-dbus \ + --disable-doxygen \ + --with-system-ssl-certs=/etc/ssl/certs + make -C libpurple +} + +package() { + cd $srcdir/pidgin-${pkgver} + make -C libpurple DESTDIR=$pkgdir install +} + diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD new file mode 100644 index 000000000..30108d4d5 --- /dev/null +++ b/pcr/miniupnpd/PKGBUILD @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: None +pkgname=miniupnpd +pkgver=1.7.20121005 +pkgrel=4 +pkgdesc="Lightweight UPnP IGD daemon" +arch=('i686' 'x86_64' 'mips64el') +url="http://miniupnp.free.fr" +license=('BSD') +backup=(etc/miniupnpd/miniupnpd.conf) +depends=('libnfnetlink') +source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" miniupnpd.init miniupnpd.systemd) +sha1sums=('4579c4711a8455bf455f3757ac9ce0dc40088901' + 'c84031d7af122c5bede8609bcfa80bc31f2a5e61' + '9cf48feb98dadee8a566b2dc7811a95020ad3895') + +_ipt_arch_ver=$(pacman -Ss iptables | awk '/\/iptables/ { print $2 }') +depends+=("iptables=$_ipt_arch_ver") + +build() { + ipt_upstream_ver=iptables-${_ipt_arch_ver%%-*} + if [ ! -d $ipt_upstream_ver ]; then + curl -O "http://www.iptables.org/projects/iptables/files/${ipt_upstream_ver}.tar.bz2" + bsdtar -jxvf $ipt_upstream_ver.tar.bz2 + fi + + cd "$srcdir/$ipt_upstream_ver" + ./configure --enable-static + make + + cd "$srcdir/$pkgname-$pkgver" + make -f Makefile.linux config.h + IPTABLESPATH="$srcdir/$ipt_upstream_ver" make -f Makefile.linux +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + mkdir -p "$pkgdir/usr/share/man/man8" + make PREFIX="$pkgdir/" -f Makefile.linux install + rm -r "${pkgdir}/etc/init.d" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm755 "${srcdir}/miniupnpd.init" "${pkgdir}/etc/rc.d/miniupnpd" + install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service" + sed -i 's:/sbin/iptables:/usr/sbin/iptables: + s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh + sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/ + s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf" +} + diff --git a/pcr/miniupnpd/miniupnpd.init b/pcr/miniupnpd/miniupnpd.init new file mode 100644 index 000000000..e09ac3ade --- /dev/null +++ b/pcr/miniupnpd/miniupnpd.init @@ -0,0 +1,51 @@ +#!/bin/sh + +MINIUPNPD=/usr/sbin/miniupnpd +ARGS='-f /etc/miniupnpd/miniupnpd.conf' +PIDFILE='/var/run/miniupnpd.pid' +IPTABLES_CREATE=/etc/miniupnpd/iptables_init.sh +IPTABLES_REMOVE=/etc/miniupnpd/iptables_removeall.sh + +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting MiniUPNPd" + + if ! pidof -o %PPID $MINIUPNPD &> /dev/null; then + rm -f "$PIDFILE" + fi + + $IPTABLES_CREATE > /dev/null 2>&1 + + PID="$(cat "$PIDFILE" 2> /dev/null)" + + if [ -z "$PID" ] && $MINIUPNPD $ARGS; then + add_daemon miniupnpd + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping MiniUPNPd" + PID="$(cat "$PIDFILE" 2> /dev/null)" + if [ -n "$PID" ] && kill "$PID" &> /dev/null; then + rm -f "$PIDFILE" + rm_daemon miniupnpd + stat_done + else + stat_fail + fi + ;; + restart) + "$0" stop + sleep 1 + "$0" start + ;; + *) + echo "Usage: /etc/rc.d/miniupnpd {start|stop|restart}" + exit 2 + ;; +esac +exit 0 diff --git a/pcr/miniupnpd/miniupnpd.systemd b/pcr/miniupnpd/miniupnpd.systemd new file mode 100644 index 000000000..4c5aa77cc --- /dev/null +++ b/pcr/miniupnpd/miniupnpd.systemd @@ -0,0 +1,12 @@ +[Unit] +Description=Lightweight UPnP IGD daemon + +[Service] +ExecStartPre=/etc/miniupnpd/iptables_init.sh +ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d +ExecStopPost=/etc/miniupnpd/iptables_removeall.sh +PIDFile=/var/run/miniupnpd.pid +StandardOutput=null + +[Install] +WantedBy=network.target diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD new file mode 100644 index 000000000..d274631eb --- /dev/null +++ b/pcr/monkeysphere/PKGBUILD @@ -0,0 +1,22 @@ +# Contributor: fauno +# Based on monkeysphere-git from +# Contributor: Olivier Mehani +# $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $ +pkgname=monkeysphere +pkgver=0.35 +pkgrel=4 +pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication" +arch=('any') +url="http://web.monkeysphere.info/" +license=('GPL3') +depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1') +source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz) +install=monkeysphere.install +md5sums=('481ac14c9fdef0ccd1944c593bd4f517') + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install + mkdir -p $pkgdir/var/lib/monkeysphere +} diff --git a/pcr/monkeysphere/monkeysphere.install b/pcr/monkeysphere/monkeysphere.install new file mode 100644 index 000000000..2013f9f41 --- /dev/null +++ b/pcr/monkeysphere/monkeysphere.install @@ -0,0 +1,43 @@ +#!/bin/sh +# $Id: monkeysphere.install 264 2010-11-10 00:57:53Z shtrom $ +# vim:set ts=2 sw=2 et: + +# arg 1: the new package version +pre_install() { + /bin/true +} + +# arg 1: the new package version +post_install() { + echo ">>> Creating monkeysphere user and group and setting permissions..." + getent group monkeysphere >/dev/null || usr/sbin/groupadd monkeysphere + getent passwd monkeysphere >/dev/null || usr/sbin/useradd -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere + +# Should be root:root for sshd to work + chown root:root /var/lib/monkeysphere +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + /bin/true +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { +# Should be root:root for sshd to work + chown root:root /var/lib/monkeysphere +} + +# arg 1: the old package version +pre_remove() { + usr/sbin/userdel monkeysphere &>/dev/null + (getent group monkeysphere >/dev/null && usr/sbin/groupdel monkeysphere &>/dev/null) || /bin/true +} + +# arg 1: the old package version +post_remove() { + /bin/true +} + diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD new file mode 100644 index 000000000..e3d5b265e --- /dev/null +++ b/pcr/netatalk/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: SJ_UnderWater +# Based on netatalk package : +# Maintainer: Dominik Dingel +# Contributor: William Udovich +# Contributor: Farhan Yousaf + +pkgname=netatalk +pkgver=3.0.2 +pkgrel=1 +pkgdesc='A kernel-level implementation of AFP services' +arch=('i686' 'x86_64' 'mips64el') +url='http://netatalk.sourceforge.net' +license=('GPL') +depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent') +replaces=('netatalk-git' 'netatalk2') +backup=('etc/afp.conf' + 'etc/extmap.conf') +options=('!libtool') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +md5sums=('b5f1c2c4b3a5e64f5bca219415aa1c75') + +build() { + cd $pkgname-$pkgver + msg2 'Fixing...' + sed -i -e 's:AC_CONFIG_SUBDIRS:#AC_CONFIG_SUBDIRS:' -e 's/x"linux/x"generic/' macros/netatalk.m4 + sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in} + sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in} + cp /usr/share/automake*/missing . + autoreconf -i >/dev/null + msg2 'Configuring...' + CFLAGS="-Wno-unused-result" ./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc --with-init-style=systemd \ + --with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-libevent=no + sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile + msg2 'Making...' + make >/dev/null +} +package() { + cd $pkgname-$pkgver + msg2 'Building...' + make DESTDIR="$pkgdir" install >/dev/null +} diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog new file mode 100644 index 000000000..b1ada018b --- /dev/null +++ b/pcr/netatalk/netatalk.changelog @@ -0,0 +1,101 @@ +2012-10-08 SJ_UnderWater + + * 3.0.1-3 : + moved systemd from /etc + better rc.d install test + +2012-10-05 SJ_UnderWater + + * 3.0.1-2 : + removed rc.d references + +2012-10-04 SJ_UnderWater + + * 3.0.1-1 : + new version + moved to systemd + moved state to /var/db + +2012-07-14 SJ_UnderWater + + * 3.0-3 : + moved localstate dir + to /etc for historical + reasons + +2012-07-12 SJ_UnderWater + + * 3.0-2 : + disable bundled libevent + +2012-07-11 SJ_UnderWater + + * 3.0-1 : + updated to new release + DDP moved to new pkg + +2012-06-12 SJ_UnderWater + + * 2.2.3-4 : + added kill timing + +2012-06-04 SJ_UnderWater + + * 2.2.3-3 : + removed conflicting files + +2012-06-02 SJ_UnderWater + + * 2.2.3-2 : + Missing UAM links + +2012-05-29 SJ_UnderWater + + * 2.2.3-1 : + updated package version + allowing headers and m4 + +2012-05-01 SJ_UnderWater + + * 2.2.2-6 : + moved to .rc files + refactored PKGBUILD + install rc.d files + +2012-04-25 SJ_UnderWater + + * 2.2.2-5 : + init rebuild + fix dep check + fix get_pid + function relocation + +2012-04-21 SJ_UnderWater + + * 2.2.2-4 : + moved to package() + added backup + split backup + moved depends + +2012-04-08 SJ_UnderWater + + * 2.2.2-3 : + fixed extra dependencies + FHS compliance + NAMCAP checking + moved cups to optdepends + +2012-04-07 SJ_UnderWater + + * 2.2.2-2 : + added Install + changed "conflicts" with "replace" + cleaned up PKGBUILD + + * 2.2.2-1 : + added ChangeLog. + moved to split package format + bidirectional dependency-checking + moved to release package format + PKGBUILD compliance diff --git a/pcr/netatalk/netatalk.install b/pcr/netatalk/netatalk.install new file mode 100644 index 000000000..629586531 --- /dev/null +++ b/pcr/netatalk/netatalk.install @@ -0,0 +1,20 @@ +post_install() { + post_upgrade +} +post_upgrade() { + if [ -f /etc/rc.conf ] && [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then + echo '>>> Detected old netatalk daemon entries in'; + echo '>>> /etc/rc.conf, please replace these with'; + echo '>>> "netatalk" before restarting!'; + else echo '>>> Add "netatalk" to your DAEMONS list';fi + echo '>>>'; + if [ -f /etc/avahi/services/adisk.service ] || + [ -f /etc/avahi/services/afpd.service ];then + echo '>>> Detected old netatalk service files in'; + echo '>>> /etc/avahi/services, please delete these'; + echo '>>> before restarting!';fi + if [ -f /opt/netatalk/afp_signature.conf ] || + [ -f /opt/netatalk/afp_voluuid.conf ]; then + echo '>>> Found *.conf in /opt/netatalk, please'; + echo '>>> migrate these to /etc/netatalk before restarting';fi +} diff --git a/pcr/olsrd/PKGBUILD b/pcr/olsrd/PKGBUILD new file mode 100644 index 000000000..668e39cea --- /dev/null +++ b/pcr/olsrd/PKGBUILD @@ -0,0 +1,31 @@ +# Contributor: William Rea +# Maintainer: Claudio Pisa +pkgname=olsrd +pkgver=0.6.1 +pkgrel=2 +pkgdesc="OLSR routing daemon (RFC 3626)" +arch=(i686 x86_64 ppc mips64el) +url="http://www.olsr.org" +license=('BSD') +depends=('glibc') +makedepends=('bison') +backup=etc/olsrd.conf +install=olsrd.install +source=(http://www.olsr.org/releases/0.6/${pkgname}-${pkgver}.tar.bz2 rc.d.olsrd) +md5sums=('a75fc9b6252df5b5f49f13418fafeff1' 'bc3e393e0179ffff0a6d6c9d6a5c4b60') + +build() { + cd $srcdir/$pkgname-$pkgver + + CFLAGS+=" -fPIC " \ + make OS=linux build_all +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install_all + + install -D -m755 $srcdir/rc.d.olsrd $pkgdir/etc/rc.d/olsrd + install -D -m644 license.txt $pkgdir/usr/share/licenses/olsrd/LICENSE +} + diff --git a/pcr/olsrd/olsrd.install b/pcr/olsrd/olsrd.install new file mode 100755 index 000000000..f49372538 --- /dev/null +++ b/pcr/olsrd/olsrd.install @@ -0,0 +1,21 @@ +post_install() { +echo "--------------------------------------------------------------------" +echo " Remember to edit /etc/olsrd.conf to match your network settings." +echo "--------------------------------------------------------------------" +/bin/true +} + +post_upgrade() { +/bin/true +} + +pre_remove() { +/etc/rc.d/olsrd stop +/bin/true +} + +op=$1 +shift + +$op "$@" + diff --git a/pcr/olsrd/rc.d.olsrd b/pcr/olsrd/rc.d.olsrd new file mode 100755 index 000000000..d257e22ef --- /dev/null +++ b/pcr/olsrd/rc.d.olsrd @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/olsrd` +case "$1" in + start) + stat_busy "Starting OLSR Daemon" + [ -z "$PID" ] && /usr/sbin/olsrd -d 0 &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon olsrd + stat_done + fi + ;; + stop) + stat_busy "Stopping OLSR Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon olsrd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD new file mode 100644 index 000000000..bae970025 --- /dev/null +++ b/pcr/openswan/PKGBUILD @@ -0,0 +1,46 @@ +# Contributor: Jan Fader +pkgname=openswan +pkgver=2.6.36 +pkgrel=2 +pkgdesc="Open Source implementation of IPsec for the Linux operating system" +url="http://www.openswan.org" +license=('GPL' 'custom') +arch=('i686' 'x86_64' 'mips64el') +depends=('iproute' 'gmp' 'perl') +backup=(etc/ipsec.conf \ + etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear}) +source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz + openswan.rc.d + compile.patch) + +build() { + # Create /etc/rc.d for init script, and license directory + mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan} + + cd $srcdir/openswan-$pkgver + patch -p1 -i $srcdir/compile.patch + + # Change install paths to Arch defaults + sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc + + make USE_XAUTH=true USE_OBJDIR=true programs +} + +package(){ + cd $srcdir/openswan-$pkgver + make DESTDIR=$pkgdir install + + # Change permissions in /var + chmod 755 $pkgdir/var/run/pluto + + # Copy License + cp LICENSE $pkgdir/usr/share/licenses/openswan + + # Install init script + install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan + # fix manpages + mv $pkgdir/usr/man $pkgdir/usr/share/ +} +md5sums=('b3a1733493520bb18729633b62ef8247' + '543d84162761b9cc9ec319e938c4dd2a' + '5540437bb334873da646e21ac9caa963') diff --git a/pcr/openswan/compile.patch b/pcr/openswan/compile.patch new file mode 100644 index 000000000..8ddff67f2 --- /dev/null +++ b/pcr/openswan/compile.patch @@ -0,0 +1,11 @@ +--- openswan-2.6.23/Makefile 2009-09-09 02:42:54.000000000 +0200 ++++ Makefile 2009-12-30 10:13:53.000000000 +0100 +@@ -12,6 +12,8 @@ + # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + # for more details. + # ++CFLAGS=-fno-strict-aliasing ++CXXFLAGS=-fno-strict-aliasing + + + OPENSWANSRCDIR?=$(shell pwd) diff --git a/pcr/openswan/openswan.rc.d b/pcr/openswan/openswan.rc.d new file mode 100755 index 000000000..30bd0d56e --- /dev/null +++ b/pcr/openswan/openswan.rc.d @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting Openswan IPsec" + /etc/rc.d/ipsec --start + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon openswan + fi + ;; + stop) + stat_busy "Stopping Openswan IPsec" + /etc/rc.d/ipsec --stop + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + rm_daemon openswan + fi + ;; + restart) + stat_busy "Restarting Openswan IPsec" + /etc/rc.d/ipsec --restart + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon openswan + fi + ;; + status) + /etc/rc.d/ipsec --status + ;; + *) + echo "usage: $0 {start|stop|restart|status}" +esac + diff --git a/pcr/poco/PKGBUILD b/pcr/poco/PKGBUILD new file mode 100644 index 000000000..dad4788d1 --- /dev/null +++ b/pcr/poco/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Rodrigo Grumiche Silva +# Contributor: nozog +# Contributor: davidhjelm +# Contributor: Ray Kohler +# Contributor: Nathan Owe < ndowens04 at gmail dot com> + +pkgname=poco +pkgver=1.4.2p1 +pkgrel=2 +pkgdesc="C++ class libraries for network-centric, portable applications, +complete edition" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.pocoproject.org/" +license=('custom:boost') +depends=('unixodbc' 'libmysqlclient' 'openssl') +makedepends=('gcc' 'make' 'unixodbc' 'libmysqlclient' 'openssl' 'chrpath') +options=() +source=(http://downloads.sourceforge.net/poco/$pkgname-$pkgver-all.tar.bz2) + +build() { + cd $srcdir/$pkgname-$pkgver-all + ./configure --prefix=/usr --no-samples --no-tests + make +} + + +package() { + cd $srcdir/$pkgname-$pkgver-all + + make DESTDIR=$pkgdir install + + install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + #removing rpath information from binaries + chrpath -d $pkgdir/usr/bin/cpspc + chrpath -d $pkgdir/usr/bin/cpspcd + chrpath -d $pkgdir/usr/bin/f2cpspd + chrpath -d $pkgdir/usr/bin/f2cpsp + + #removing debugging libraries + rm $pkgdir/usr/lib/libPoco*d.so* +} + +md5sums=('752e5f5545377be24ee7c7b6b479fbbe') diff --git a/pcr/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD new file mode 100644 index 000000000..855c7ff38 --- /dev/null +++ b/pcr/ruby-headers/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: fauno +# Contributor: Hilton Medeiros + +pkgname=ruby-headers +_pkgname=ruby +pkgver=1.9.3_p385 +_pkgver=1.9.3-p385 +pkgrel=1 +pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug." +arch=('any') +url="http://www.ruby-lang.org/en/" +license=('GPL2' 'custom:Ruby') +depends=("ruby=$pkgver") +source=("http://ftp.ruby-lang.org/pub/ruby/1.9/$_pkgname-$_pkgver.tar.bz2") + +build() { + /bin/true +} + +package() { + cd "$srcdir/$_pkgname-$_pkgver" + + # Just to make sure, since currently we have /usr/include/ruby-1.9.1 for ruby 1.9.2 + _hdrdir=`ruby -e "require 'rbconfig'; puts Config::CONFIG['rubyhdrdir']"` + + install -d "$pkgdir$_hdrdir/$_pkgname-$_pkgver" + install -m644 *.{h,inc} "$pkgdir$_hdrdir/$_pkgname-$_pkgver" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +md5sums=('5ec9aff670f4912b0f6f0e11e855ef6c') diff --git a/pcr/seeks/PKGBUILD b/pcr/seeks/PKGBUILD new file mode 100644 index 000000000..32abb13f8 --- /dev/null +++ b/pcr/seeks/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer: Kete < kete at ninthfloor dot org > + +pkgname=seeks +pkgver=0.4.1 +pkgrel=6 +pkgdesc="A social decentralized internet overlay for collaborative searches" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.seeks-project.info/site/" +license=('AGPL3' 'LGPL' 'BSD') +backup=('etc/logrotate.d/seeks' + 'etc/conf.d/seeks' + 'etc/seeks/config') +depends=('curl' 'libevent>=2.0' 'libxml2' 'opencv' 'protobuf' 'icu' 'tokyotyrant') +makedepends=('pkg-config' 'docbook-xml' 'docbook2x') +source=("http://downloads.sourceforge.net/project/${pkgname}/hippy/${pkgname}-${pkgver}.tar.gz" +'seeks.conf.d' + 'seeks.rc.d' + 'img_websearch.patch' + 'conf.patch' + 'seeks.logrotate') +install=seeks.install + +build() { + cd "$srcdir/$pkgname-$pkgver" + # replace by + patch -p1 -i "$srcdir/img_websearch.patch" + + # linking issue with --as-needed linker flag, Cli not building with RC2 + LDFLAGS="-Wl,--no-as-needed" \ + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-httpserv-plugin \ + --enable-extended-host-patterns + #--disable-cli \ + + sed -i s/,--as-needed,/,/ config.status + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check-local +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + # Patch config file to make seeks log in /var/log instead of ./ (needed for rc.d) + patch -p1 -i "$srcdir/conf.patch" + make DESTDIR="$pkgdir/" install + + install -D -m644 Licenses "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 ../seeks.conf.d "${pkgdir}/etc/conf.d/seeks" + install -D -m755 ../seeks.rc.d "${pkgdir}/etc/rc.d/seeks" + install -D -m600 ../seeks.logrotate "${pkgdir}/etc/logrotate.d/seeks" + install -d -m755 "${pkgdir}/var/log/seeks" + install -d -m755 "${pkgdir}/var/lib/seeks" +} + +# vim:set ts=2 sw=2 et: +md5sums=('2545192be5fa2e70d850f7395d039a0f' + 'ed29089d43873600726d570e63a5043d' + '72a00a931363edd2ed11c0072bfd5b10' + '2554e9f9f733d83203d0926e599e66db' + '71a99dafa726539b9de9055468e2f56c' + '5fbdf9c327999605b0f124132f27a27d') diff --git a/pcr/seeks/conf.patch b/pcr/seeks/conf.patch new file mode 100644 index 000000000..93e12c311 --- /dev/null +++ b/pcr/seeks/conf.patch @@ -0,0 +1,20 @@ +--- a/src/config 2011-11-13 15:21:14.000000000 +0100 ++++ b/src/config 2011-11-13 15:46:15.856186336 +0100 +@@ -148,7 +148,7 @@ + # + # No trailing "/", please. + # +-confdir . ++confdir /etc/seeks + # + # + # 2.2. templdir +@@ -193,7 +193,7 @@ + # + # No trailing "/", please. + # +-logdir . ++logdir /var/log/seeks + # + # + # 2.4. logfile diff --git a/pcr/seeks/docbook2man.patch b/pcr/seeks/docbook2man.patch new file mode 100644 index 000000000..c5de2e063 --- /dev/null +++ b/pcr/seeks/docbook2man.patch @@ -0,0 +1,24 @@ +--- seeks/configure 2011-07-30 15:16:27.000000000 +0200 ++++ seeks/configure.patch 2011-07-30 16:04:34.000000000 +0200 +@@ -16726,10 +16726,10 @@ PCRE_CFLAGS=`$PCRE_CONFIG --cflags` + + + #========================================================================== +-# Finding docbook2x-man ++# Finding docbook2man + #========================================================================== +-# Extract the first word of "docbook2x-man", so it can be a program name with args. +-set dummy docbook2x-man; ac_word=$2 ++# Extract the first word of "docbook2man", so it can be a program name with args. ++set dummy docbook2man; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_prog_docbook+:} false; then : +--- seeks/doc/Makefile.am 2011-07-30 16:51:14.000000000 +0200 ++++ seeks/doc/Makefile.am.patch 2011-07-30 16:55:58.000000000 +0200 +@@ -8,4 +8,4 @@ endif + + EXTRA_DIST=seeks.1.docbook + seeks.1: +- docbook2x-man ${srcdir}/seeks.1.docbook ++ docbook2man ${srcdir}/seeks.1.docbook diff --git a/pcr/seeks/img_websearch.patch b/pcr/seeks/img_websearch.patch new file mode 100644 index 000000000..94362e2fc --- /dev/null +++ b/pcr/seeks/img_websearch.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/img_websearch/ocvsurf.cpp b/src/plugins/img_websearch/ocvsurf.cpp +index 5caa9dd..c3cccb4 100644 +--- a/src/plugins/img_websearch/ocvsurf.cpp ++++ b/src/plugins/img_websearch/ocvsurf.cpp +@@ -29,7 +29,7 @@ + #include "miscutil.h" + #include "errlog.h" + +-#include ++#include + + #include + #include diff --git a/pcr/seeks/install b/pcr/seeks/install new file mode 100644 index 000000000..35f383a3c --- /dev/null +++ b/pcr/seeks/install @@ -0,0 +1,18 @@ +post_install() { + getent group seeks >/dev/null || groupadd -r seeks + getent passwd seeks >/dev/null || useradd -r -c "Seeks daemon" -g seeks -M -d /var/run/seeks -s /bin/false seeks + passwd -l seeks &>/dev/null + touch var/log/seeks.log + chown seeks:log var/log/seeks.log + mkdir -p var/lib/seeks + touch var/lib/seeks/seeks.db + chown -R seeks:seeks var/lib/seeks +} + +pre_remove() { + getent passwd seeks &>/dev/null && userdel seeks >/dev/null + getent group seeks &>/dev/null && groupdel seeks >/dev/null + return 0 +} + + diff --git a/pcr/seeks/logfile.patch b/pcr/seeks/logfile.patch new file mode 100644 index 000000000..9f4ab9b02 --- /dev/null +++ b/pcr/seeks/logfile.patch @@ -0,0 +1,29 @@ +--- config 2011-10-21 10:42:20.000000000 +0200 ++++ config.patch 2011-11-17 18:48:48.914516206 +0100 +@@ -193,7 +193,7 @@ + # + # No trailing "/", please. + # +-logdir . ++logdir /var/log/ + # + # + # 2.4. logfile +@@ -239,7 +239,7 @@ + # Any log files must be writable by whatever user Seeks is + # being run as. + # +-logfile logfile ++logfile seeks.log + # + # + # 2.5. plugindir +@@ -377,7 +377,7 @@ + # Unset. This means the db is located in $HOME/.seeks/seeks_user.db + # as default location. + # +-# user-db-file /path/to/file.db ++user-db-file /var/lib/seeks/seeks.db + # + # 2.10. user-db-address + # ===================== diff --git a/pcr/seeks/seeks b/pcr/seeks/seeks new file mode 100755 index 000000000..01f34a432 --- /dev/null +++ b/pcr/seeks/seeks @@ -0,0 +1,68 @@ +#!/bin/bash + +daemon_name="seeks" + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name $SEEKS_ARGS 2> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/pcr/seeks/seeks.conf.d b/pcr/seeks/seeks.conf.d new file mode 100644 index 000000000..c28382aca --- /dev/null +++ b/pcr/seeks/seeks.conf.d @@ -0,0 +1,11 @@ +# +# Arguments to be passed to the Seeks daemon +# + +# User +SEEKS_USER="seeks" +# Config file (default if empty) +SEEKS_CONFIG="" +# Args +SEEKS_ARGS="" + diff --git a/pcr/seeks/seeks.install b/pcr/seeks/seeks.install new file mode 100644 index 000000000..bf9849e78 --- /dev/null +++ b/pcr/seeks/seeks.install @@ -0,0 +1,12 @@ +post_install() { + getent group seeks >/dev/null || groupadd -r seeks + getent passwd seeks >/dev/null || useradd -r -c "Seeks daemon" -g seeks -M -d /var/lib/seeks -s /bin/false seeks + passwd -l seeks &>/dev/null + chown seeks:seeks var/log/seeks var/lib/seeks +} + +pre_remove() { + getent passwd seeks &>/dev/null && userdel seeks >/dev/null + getent group seeks &>/dev/null && groupdel seeks >/dev/null + return 0 +} diff --git a/pcr/seeks/seeks.logrotate b/pcr/seeks/seeks.logrotate new file mode 100644 index 000000000..98b411884 --- /dev/null +++ b/pcr/seeks/seeks.logrotate @@ -0,0 +1,6 @@ +/var/log/seeks/logfile { + missingok + notifempty + size 30k + create +} diff --git a/pcr/seeks/seeks.rc.d b/pcr/seeks/seeks.rc.d new file mode 100644 index 000000000..67de9251a --- /dev/null +++ b/pcr/seeks/seeks.rc.d @@ -0,0 +1,57 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/seeks + +PIDFILE="/var/run/seeks.pid" + +if [[ -f $PIDFILE ]]; then + read -r PID < "$PIDFILE" + + # prevent stale pidfiles from hanging around + if [[ ! -d /proc/$PID ]]; then + echo 'pid not found. deleteing stale pidfile' + unset PID + rm -f "$PIDFILE" + fi +fi + +case "$1" in + start) + stat_busy "Starting Seeks" + if [[ $PID ]]; then + stat_fail + exit 1 + fi + if /usr/bin/seeks --daemon --pidfile "$PIDFILE" --user $SEEKS_USER $SEEKS_ARGS $SEEKS_CONFIG 2>&1 > /dev/null; then + add_daemon seeks + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping Seeks" + if [[ ! $PID ]]; then + stat_fail + exit 1 + fi + if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then + rm_daemon seeks + stat_done + else + stat_fail + exit 1 + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac + diff --git a/pcr/seeks/seeksdaemon b/pcr/seeks/seeksdaemon new file mode 100644 index 000000000..551197d28 --- /dev/null +++ b/pcr/seeks/seeksdaemon @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/seeks + +PID=`pidof -o %PPID /usr/bin/seeks` + +case "$1" in + start) + stat_busy "Starting seeks daemon" + [ -z "$PID" ] && /usr/bin/seeks $SEEKS_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon seeks + stat_done + fi + ;; + + stop) + stat_busy "Stopping seeks daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon seeks + stat_done + fi + ;; + restart) + $0 stop + while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + +esac +exit 0 + diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD new file mode 100644 index 000000000..22852780c --- /dev/null +++ b/pcr/sipwitch/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Dan Serban +# Contributors: David Zaragoza, Andrea Scarpino +# Maintainer (Parabola): André Silva + +pkgname=sipwitch +pkgver=1.2.4 +pkgrel=2 +pkgdesc="A call and registration server for the SIP protocol" +arch=(i686 x86_64 mips64el) +url=http://www.gnutelephony.org/index.php/GNU_SIP_Witch +license=(GPL) +depends=(libexosip2 ucommon) +makedepends=(lynx) +options=('!libtool') +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('6119cecb062ba4d0af18b427b01c41e2') + +build() +{ + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() +{ + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + mkdir -p "${pkgdir}"/etc/rc.d + touch "${pkgdir}"/etc/rc.d/"${pkgname}" +} + diff --git a/pcr/sobby/PKGBUILD b/pcr/sobby/PKGBUILD new file mode 100644 index 000000000..892d88cee --- /dev/null +++ b/pcr/sobby/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Thomas Jost +pkgname=sobby +pkgver=0.4.8 +pkgrel=2 +pkgdesc="Standalone obby server" +url="http://gobby.0x539.de/trac/" +license="GPL" +depends=('obby=0.4.8' 'libxml++') +makedepends=('pkgconfig' 'net6>=1.3.12') +arch=('i686' 'x86_64' 'mips64el') +source=(http://releases.0x539.de/sobby/sobby-$pkgver.tar.gz{,.sig}) + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} +md5sums=('1f7cf8c09cdeddbf2152843b28f73ce1' + '96822427ab95289ebb1520e6353c5d3c') diff --git a/pcr/spectrum/PKGBUILD b/pcr/spectrum/PKGBUILD new file mode 100644 index 000000000..250840fb7 --- /dev/null +++ b/pcr/spectrum/PKGBUILD @@ -0,0 +1,81 @@ +# Maintainer: Clément Démoulins +# Contributor: Sonny Piers +# Contributor: Tim Besard +# Contributor: miniature + +pkgname=spectrum +pkgver=1.4.8 +pkgrel=4 +pkgdesc="XMPP libpurple transport/gateway." +arch=('i686' 'x86_64' 'mips64el') +url="http://spectrum.im" +license=('GPL') +depends=('gloox' 'libpurple-minimal' 'poco' 'python2' libev) +replaces=('spectrum-git') +makedepends=('cmake' 'gettext') +optdepends=('mysql: MySQL database backend support' + 'postgresql-libs: PostgreSQL database backend support' + 'sqlite3: SQLite database backend support' + 'libevent: support for libevent' + 'imagemagick: support for avatars synchronization with legacy networks' + + # Protocols plugins + 'mbpurple-svn: microblogging services support like Twitter or identi.ca/StatusNet' + 'msn-pecan: a different implementation of the MSN protocol for libpurple' + 'pidgin-facebookchat: Facebook support, with more features than Facebook XMPP server' + 'pidgin-sipe: SIPE protocol support' +) +backup=('etc/conf.d/spectrum') +install='spectrum.install' + +source=('https://github.com/downloads/hanzz/libtransport/spectrum-1.4.8.tar.gz' + 'logrotate.spectrum' + 'gcc47.patch' + 'spectrum@.service' + 'spectrum.tmpfiles') +md5sums=('edd88e1e70f86fe9aa4b43d787529a47' + '4f9cbfe3878fe5f4137d1bb5acc9e850' + '7a3de7e91d581b6c9119965ac34b9510' + '8abfd4926fec074847c4d28465af22bb' + '21dc715b3b2fb90c5349a12966277bc6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + msg "Starting make..." + + sed -i -e 's/${PYTHON_EXECUTABLE}/python2/g' CMakeLists.txt + patch -p1 < ../gcc47.patch + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr . + make + + cd spectrumctl + python2 setup.py build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Various needed folders -- correct permissions are set in spectrum.install + install -d "${pkgdir}/etc/spectrum" + install -d "${pkgdir}/var/log/spectrum" + install -d "${pkgdir}/var/lib/spectrum" + + # Install binaries and Python control script + make DESTDIR="${pkgdir}" install + + cd spectrumctl + python2 setup.py install --root="${pkgdir}" + + # Install initscript and logrotate config + install -Dm755 "${srcdir}/${pkgname}-${pkgver}/initscripts/archlinux/spectrum-rc.d" "${pkgdir}/etc/rc.d/spectrum" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/initscripts/archlinux/spectrum-conf.d" "${pkgdir}/etc/conf.d/spectrum" + install -Dm644 "${srcdir}/logrotate.spectrum" "${pkgdir}/etc/logrotate.d/spectrum" + + # Install systemd related files + install -Dm644 "${srcdir}/spectrum@.service" "${pkgdir}/usr/lib/systemd/system/spectrum@.service" + install -Dm644 "${srcdir}/spectrum.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/spectrum.conf" + + # Patch to use python2 + sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/spectrumctl" +} diff --git a/pcr/spectrum/gcc47.patch b/pcr/spectrum/gcc47.patch new file mode 100644 index 000000000..82cc58677 --- /dev/null +++ b/pcr/spectrum/gcc47.patch @@ -0,0 +1,97 @@ +diff -rupN spectrum-1.4.8/src/configinterface.cpp spectrum-1.4.8_gcc47/src/configinterface.cpp +--- spectrum-1.4.8/src/configinterface.cpp 2011-06-11 15:17:44.000000000 +0200 ++++ spectrum-1.4.8_gcc47/src/configinterface.cpp 2012-04-14 18:27:14.000000000 +0200 +@@ -18,6 +18,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + */ + ++#include + #include "configinterface.h" + #include "sys/un.h" + #include "sys/socket.h" +diff -rupN spectrum-1.4.8/src/spectrum_util.cpp spectrum-1.4.8_gcc47/src/spectrum_util.cpp +--- spectrum-1.4.8/src/spectrum_util.cpp 2011-06-11 15:17:44.000000000 +0200 ++++ spectrum-1.4.8_gcc47/src/spectrum_util.cpp 2012-04-14 18:26:33.000000000 +0200 +@@ -28,6 +28,7 @@ + #include "protocols/abstractprotocol.h" + #include "transport.h" + #include ++#include + #ifdef BSD + #include + #include +diff -rupN spectrum-1.4.8/src/utf8/checked.h spectrum-1.4.8_gcc47/src/utf8/checked.h +--- spectrum-1.4.8/src/utf8/checked.h 2010-10-08 09:15:22.000000000 +0200 ++++ spectrum-1.4.8_gcc47/src/utf8/checked.h 2012-04-14 18:26:31.000000000 +0200 +@@ -65,6 +65,35 @@ namespace utf8 + + /// The library API - functions intended to be called by the users + ++ template ++ octet_iterator append(uint32_t cp, octet_iterator result) ++ { ++ if (!internal::is_code_point_valid(cp)) ++ throw invalid_code_point(cp); ++ ++ if (cp < 0x80) // one octet ++ *(result++) = static_cast(cp); ++ else if (cp < 0x800) { // two octets ++ *(result++) = static_cast((cp >> 6) | 0xc0); ++ *(result++) = static_cast((cp & 0x3f) | 0x80); ++ } ++ else if (cp < 0x10000) { // three octets ++ *(result++) = static_cast((cp >> 12) | 0xe0); ++ *(result++) = static_cast(((cp >> 6) & 0x3f) | 0x80); ++ *(result++) = static_cast((cp & 0x3f) | 0x80); ++ } ++ else if (cp <= internal::CODE_POINT_MAX) { // four octets ++ *(result++) = static_cast((cp >> 18) | 0xf0); ++ *(result++) = static_cast(((cp >> 12)& 0x3f) | 0x80); ++ *(result++) = static_cast(((cp >> 6) & 0x3f) | 0x80); ++ *(result++) = static_cast((cp & 0x3f) | 0x80); ++ } ++ else ++ throw invalid_code_point(cp); ++ ++ return result; ++ } ++ + template + output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement) + { +@@ -104,35 +133,6 @@ namespace utf8 + } + + template +- octet_iterator append(uint32_t cp, octet_iterator result) +- { +- if (!internal::is_code_point_valid(cp)) +- throw invalid_code_point(cp); +- +- if (cp < 0x80) // one octet +- *(result++) = static_cast(cp); +- else if (cp < 0x800) { // two octets +- *(result++) = static_cast((cp >> 6) | 0xc0); +- *(result++) = static_cast((cp & 0x3f) | 0x80); +- } +- else if (cp < 0x10000) { // three octets +- *(result++) = static_cast((cp >> 12) | 0xe0); +- *(result++) = static_cast(((cp >> 6) & 0x3f) | 0x80); +- *(result++) = static_cast((cp & 0x3f) | 0x80); +- } +- else if (cp <= internal::CODE_POINT_MAX) { // four octets +- *(result++) = static_cast((cp >> 18) | 0xf0); +- *(result++) = static_cast(((cp >> 12)& 0x3f) | 0x80); +- *(result++) = static_cast(((cp >> 6) & 0x3f) | 0x80); +- *(result++) = static_cast((cp & 0x3f) | 0x80); +- } +- else +- throw invalid_code_point(cp); +- +- return result; +- } +- +- template + uint32_t next(octet_iterator& it, octet_iterator end) + { + uint32_t cp = 0; diff --git a/pcr/spectrum/logrotate.spectrum b/pcr/spectrum/logrotate.spectrum new file mode 100644 index 000000000..ae52ff156 --- /dev/null +++ b/pcr/spectrum/logrotate.spectrum @@ -0,0 +1,10 @@ +/var/log/spectrum/*.log { + notifempty + missingok + sharedscripts + postrotate + for P in /var/run/spectrum/*.pid; do + /bin/kill -HUP `cat "$P" 2>/dev/null` 2>/dev/null || true + done + endscript +} diff --git a/pcr/spectrum/spectrum.install b/pcr/spectrum/spectrum.install new file mode 100644 index 000000000..d3e0449fc --- /dev/null +++ b/pcr/spectrum/spectrum.install @@ -0,0 +1,45 @@ +# arg 1: the new package version +post_install() { + if [ -z "`grep '^spectrum:' /etc/group`" ]; then + groupadd -g 417 spectrum + fi + if [ -z "`grep '^spectrum:' /etc/passwd`" ]; then + useradd -u 417 -d /etc/spectrum -g spectrum -s /bin/false spectrum + fi + + chown spectrum:spectrum var/lib/spectrum + chown spectrum:spectrum var/log/spectrum + +cat << EOF + +==> Documentation: http://spectrum.im/ + +==> You must now customize the configuration file located in /etc/spectrum/. Copy and reconfigure for each seperate protocol. + +EOF + +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +post_remove() { + userdel spectrum + + paths=(/etc/spectrum /var/lib/spectrum /var/log/spectrum) + + first=true + for path in ${paths[@]}; do + if [ -d $path ]; then + if $first; then + first=false + echo "==> Leftover Paths:" + fi + echo "==> $path" + fi + done +} diff --git a/pcr/spectrum/spectrum.tmpfiles b/pcr/spectrum/spectrum.tmpfiles new file mode 100644 index 000000000..cabe97bc5 --- /dev/null +++ b/pcr/spectrum/spectrum.tmpfiles @@ -0,0 +1 @@ +d /run/spectrum 0750 spectrum spectrum - diff --git a/pcr/spectrum/spectrum@.service b/pcr/spectrum/spectrum@.service new file mode 100644 index 000000000..8e1338543 --- /dev/null +++ b/pcr/spectrum/spectrum@.service @@ -0,0 +1,14 @@ +[Unit] +Description=Spectrum XMPP transport for %i +After=network.service prosody.service ejabberd.service + +[Service] +Type=forking +PIDFile=/run/spectrum/%i.pid +ExecStart=/usr/bin/spectrumctl --su=spectrum -c /etc/spectrum/%i.cfg start +ExecStop=/usr/binspectrumctl --su=spectrum -c /etc/spectrum/%i.cfg stop +ExecReload=/usr/binspectrumctl --su=spectrum -c /etc/spectrum/%i.cfg reload + +[Install] +WantedBy=multi-user.target + diff --git a/pcr/squirm/PKGBUILD b/pcr/squirm/PKGBUILD new file mode 100644 index 000000000..a1249c39d --- /dev/null +++ b/pcr/squirm/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Spider.007 +# Contributor: Spider.007 +pkgname=squirm +pkgver=1.26 +pkgrel=2 +pkgdesc="Fast & configurable proxy redirector" +url="http://squirm.foote.com.au/" +source=("$url/$pkgname-$pkgver.tgz") +md5sums=('54ac1d208620ec1e4419f97315d38848') +license=('GPL2') +arch=('i686' 'x86_64' 'mips64el') + +build() { + cd $srcdir/$pkgname-$pkgver + + make PREFIX=/usr +} + +package() { + cd $srcdir/$pkgname-$pkgver + +# make install uses a weird prefix + install -d $pkgdir/etc/squirm $pkgdir/var/log/squirm + install -Dm755 squirm $pkgdir/usr/bin/squirm + install -m644 squirm.conf.dist $pkgdir/etc/squirm/squirm.conf + install -m644 squirm.patterns.dist $pkgdir/etc/squirm/squirm.patterns + +# use absolute path files + sed -e "s,logs,/var/log/squirm,g" \ + -e "s,pattern ,& /etc/squirm/,g" \ + -i $pkgdir/etc/squirm/squirm.conf +} diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD new file mode 100644 index 000000000..ed603e5c2 --- /dev/null +++ b/pcr/strongswan/PKGBUILD @@ -0,0 +1,45 @@ +# Contributor: nikicat +# Contributor: danilo +# Contributor: Jason Begley +# Contributor: Ray Kohler +# Contributor: Daniel Riedemann +# Contributor: 458italia +# Maintainer: dkorzhevin + +pkgname=strongswan +pkgver=5.0.1 +pkgrel=2 +pkgdesc="open source IPsec implementation" +url='http://www.strongswan.org' +license=("GPL") +arch=('i686' 'x86_64' 'mips64el') +depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite3') +conflicts=('openswan') +options=(!libtool) +backup=(etc/ipsec.conf etc/strongswan.conf) +source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2 strongswan.rc::https://gist.github.com/raw/3106703/96d2ce9683f1e33ef14c679880ddc298e9673508/strongswan.rc) +md5sums=('58fdeb49f133139a58f4d8adafc69a16' + 'cf815adef48a1ffee34517380c731277') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} || return 1 + + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-ipsecdir=/usr/lib/strongswan \ + --enable-sqlite \ + --enable-openssl --enable-curl \ + --enable-sql --enable-attr-sql \ + --enable-farp --enable-dhcp \ + --enable-eap-sim --enable-eap-sim-file --enable-eap-simaka-pseudonym \ + --enable-eap-simaka-reauth --enable-eap-identity --enable-eap-md5 \ + --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \ + --enable-eap-mschapv2 --enable-eap-radius --enable-xauth-eap \ + --enable-ha \ + --disable-mysql --disable-ldap || return 1 + + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + + install -d ${pkgdir}/etc/rc.d || return 1 + ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec || return 1 + install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan || return 1 +} diff --git a/pcr/strongswan/strongswan.rc b/pcr/strongswan/strongswan.rc new file mode 100644 index 000000000..58c99c092 --- /dev/null +++ b/pcr/strongswan/strongswan.rc @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting strongSwan IPsec" + /usr/sbin/ipsec start + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon strongswan + fi + ;; + stop) + stat_busy "Stopping strongSwan IPsec" + /usr/sbin/ipsec stop + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + rm_daemon strongswan + fi + ;; + restart) + stat_busy "Restarting strongSwan IPsec" + /usr/sbin/ipsec restart + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon strongswan + fi + ;; + status) + /usr/sbin/ipsec status + ;; + *) + echo "usage: $0 {start|stop|restart|status}" +esac + diff --git a/pcr/tokyotyrant/PKGBUILD b/pcr/tokyotyrant/PKGBUILD new file mode 100644 index 000000000..ea5c94e30 --- /dev/null +++ b/pcr/tokyotyrant/PKGBUILD @@ -0,0 +1,33 @@ +# # Maintainer: Angel Velasquez +# Contributor: Paul Sadauskas + +pkgname=tokyotyrant +pkgver=1.1.41 +pkgrel=3 +pkgdesc="Network interface to TokyoCabinet" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.fallabs.com" +license=('LGPL') +makedepends=('gcc>=3.1' 'make' 'pkgconfig') +depends=('zlib' 'bzip2' 'tokyocabinet>=1.4.27') +source=("http://fallabs.com/$pkgname/$pkgname-$pkgver.tar.gz" + "tokyotyrant.rc" + "tokyotyrant.conf") + +md5sums=('a47e58897bd1cbbac173d5a66cc32ae3' + '3ed9229c9cfb8e1b3055b814d5038799' + '2558846ece69d1f265ee1ba5728c39cd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install + install -m 644 -D ${srcdir}/tokyotyrant.conf $pkgdir/etc/conf.d/ttserver + install -m 755 -D ${srcdir}/tokyotyrant.rc $pkgdir/etc/rc.d/ttserver +} + diff --git a/pcr/tokyotyrant/tokyotyrant.conf b/pcr/tokyotyrant/tokyotyrant.conf new file mode 100644 index 000000000..77c299a81 --- /dev/null +++ b/pcr/tokyotyrant/tokyotyrant.conf @@ -0,0 +1,21 @@ +# /etc/conf.d/ttserver: config file for /etc/init.d/ttserver + +# TCP port TokyoTyrant server should listen on +TYRANT_PORT="1978" + +# Location of the TokyoTyrant server database +# Also put addional options here, eg, #bnum +# See 'ttserver' man page +TYRANT_DB="/var/lib/tokyotyrant/tokyotyrant.tch" + +# Location of the TokyoTyrant server log file +TYRANT_LOG_FILE="/var/log/ttserver.log" + +# Location of the TokyoTyrant server PID file +TYRANT_PID_FILE="/var/run/ttserver.pid" + +# Pass extra options to TokyoTyrant server +# Example: TYRANT_EXTRA_OPTS="-ld" - enables logging of debug messages +# See the 'ttserver' man page for more +TYRANT_EXTRA_OPTS="" + diff --git a/pcr/tokyotyrant/tokyotyrant.rc b/pcr/tokyotyrant/tokyotyrant.rc new file mode 100644 index 000000000..eaecb0af0 --- /dev/null +++ b/pcr/tokyotyrant/tokyotyrant.rc @@ -0,0 +1,41 @@ +#!/bin/bash + +# source config +[ -f /etc/conf.d/ttserver ] && . /etc/conf.d/ttserver + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting TokyoTyrant Server" + /usr/bin/ttserver ${TYRANT_EXTRA_OPTS} -dmn -pid ${TYRANT_PID_FILE} -log ${TYRANT_LOG_FILE} -port ${TYRANT_PORT} ${TYRANT_DB} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ttserver + stat_done + fi + ;; + stop) + stat_busy "Stopping TokyoTyrant Server" + if [ -f $TYRANT_PID_FILE ]; then + pid=`cat "$TYRANT_PID_FILE"` + kill -TERM "$pid" + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ttserver + stat_done + fi + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 -- cgit v1.2.3-54-g00ecf From ba105c9a82cf668f973a140c1792a3c02589980d Mon Sep 17 00:00:00 2001 From: root Date: Tue, 19 Feb 2013 00:07:59 -0800 Subject: Tue Feb 19 00:07:54 PST 2013 --- community/cegui/PKGBUILD | 8 +- community/ettercap/PKGBUILD | 12 +- community/flightgear/PKGBUILD | 10 +- community/simgear/PKGBUILD | 8 +- community/springlobby/PKGBUILD | 8 +- extra/gdm/PKGBUILD | 15 +- extra/gdm/git-fixes.patch | 9067 +++++++++++++++++++++++ extra/gdm/maintain-FamilyLocal-cookie.patch | 124 + extra/gtkhtml4/PKGBUILD | 6 +- extra/kwebkitpart/PKGBUILD | 6 +- extra/libgnome/PKGBUILD | 8 +- extra/libgnome/libgnome.install | 2 +- extra/libpwquality/PKGBUILD | 7 +- extra/maxima/PKGBUILD | 6 +- extra/poppler/PKGBUILD | 7 +- extra/sbcl/PKGBUILD | 6 +- kernels/linux-libre-pae/PKGBUILD | 6 +- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-rt/PKGBUILD | 4 +- kernels/linux-libre-rt/linux-libre-rt.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 6 +- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 10 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 10 +- libre/linux-libre/linux-libre.install | 2 +- pcr/ahcpd/PKGBUILD | 27 + pcr/babeld/PKGBUILD | 32 + pcr/babeld/babeld.install | 18 + pcr/batctl/PKGBUILD | 25 + pcr/dropbear/PKGBUILD | 46 + pcr/dropbear/dropbear-conf.d | 15 + pcr/dropbear/dropbear-rc.d | 88 + pcr/ffingerd/PKGBUILD | 27 + pcr/ffingerd/finger.xinetd | 8 + pcr/inadyn-opendns/PKGBUILD | 32 + pcr/inadyn-opendns/inadyn-opendns.install | 17 + pcr/inadyn-opendns/inadyn.rc-script | 38 + pcr/inspircd/PKGBUILD | 68 + pcr/inspircd/inspircd.install | 15 + pcr/inspircd/inspircd.rcd | 54 + pcr/inspircd/inspircd.service | 17 + 44 files changed, 9803 insertions(+), 78 deletions(-) create mode 100644 extra/gdm/git-fixes.patch create mode 100644 extra/gdm/maintain-FamilyLocal-cookie.patch create mode 100644 pcr/ahcpd/PKGBUILD create mode 100644 pcr/babeld/PKGBUILD create mode 100644 pcr/babeld/babeld.install create mode 100644 pcr/batctl/PKGBUILD create mode 100644 pcr/dropbear/PKGBUILD create mode 100644 pcr/dropbear/dropbear-conf.d create mode 100644 pcr/dropbear/dropbear-rc.d create mode 100644 pcr/ffingerd/PKGBUILD create mode 100644 pcr/ffingerd/finger.xinetd create mode 100644 pcr/inadyn-opendns/PKGBUILD create mode 100644 pcr/inadyn-opendns/inadyn-opendns.install create mode 100644 pcr/inadyn-opendns/inadyn.rc-script create mode 100644 pcr/inspircd/PKGBUILD create mode 100644 pcr/inspircd/inspircd.install create mode 100644 pcr/inspircd/inspircd.rcd create mode 100644 pcr/inspircd/inspircd.service (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 584eec445..e4b0f40bd 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83243 2013-01-28 16:49:29Z stephane $ +# $Id: PKGBUILD 84404 2013-02-18 16:22:44Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Juergen Hoetzel # Contributor: William Rea , @@ -6,8 +6,8 @@ pkgbase=cegui pkgname=('cegui' 'cegui-docs') -pkgver=0.7.7 -pkgrel=5 +pkgver=0.7.9 +pkgrel=1 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" @@ -21,7 +21,7 @@ optdepends=("python2: python bindings" #"irrlicht: irrlicht module") maybe again at some point options=(!libtool) source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) -md5sums=('8b83577f86eaa1581765dd155c7c8f24') +md5sums=('a8b682daf82e383edc169c2e6eb2b321') build() { cd "$srcdir/CEGUI-${pkgver}" diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD index 95eb1b9dc..f9c048453 100644 --- a/community/ettercap/PKGBUILD +++ b/community/ettercap/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 84194 2013-02-13 14:30:40Z jelle $ +# $Id: PKGBUILD 84410 2013-02-18 19:27:41Z jelle $ # Maintainer: # Contributor: Tom Newsom pkgbase=ettercap pkgname=('ettercap' 'ettercap-gtk') pkgver=0.7.5.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://ettercap.github.com/ettercap/" license=('GPL') makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2') options=('!libtool' '!makeflags' '!emptydirs') source=("http://sourceforge.net/projects/ettercap/files/ettercap/0.7.5-Assimilation/$pkgname-$pkgver.tar.gz") - -md5sums=('784b5cf2493246e95943179b21f70645' - 'f9281fe1735ceba59753bfe442715bb6') +md5sums=('784b5cf2493246e95943179b21f70645') build() { cd "${srcdir}" @@ -45,11 +43,11 @@ package_ettercap() { package_ettercap-gtk() { pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK frontend" - depends=('libpcap' 'pcre' 'libltdl' 'libnet' 'openssl' 'gtk2') + depends+=('gtk2') backup=('etc/ettercap/etter.conf') conflicts=('ettercap') + provides=('ettercap') cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build -#install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk make DESTDIR="${pkgdir}" install } diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index 7005c0ff2..0b4dfe25e 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 77631 2012-10-13 11:42:12Z allan $ +# $Id: PKGBUILD 84414 2013-02-18 20:13:35Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea # Contributor: Hans Janssen pkgname=flightgear -pkgver=2.8.0 -pkgrel=2 +pkgver=2.10.0 +pkgrel=1 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') -makedepends=('boost' 'cmake') +makedepends=('boost' 'cmake' 'mesa') license=("GPL") url="http://www.flightgear.org" options=('!makeflags') #source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") #source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2") source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2") -md5sums=('9499194146f414323efef8cb3451b750') +md5sums=('ae7fc8d1e446c5d1fe2aa82ee41dcac5') build() { cd $srcdir/flightgear-$pkgver diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index c20bdf932..1e2c8dfc2 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 75603 2012-08-27 13:35:08Z spupykin $ +# $Id: PKGBUILD 84416 2013-02-18 20:14:11Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea # Contributor: Hans Janssen pkgname=simgear -pkgver=2.8.0 +pkgver=2.10.0 pkgrel=1 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." arch=(i686 x86_64) depends=('glut' 'freealut' 'plib' 'openscenegraph') -makedepends=('boost' 'cmake') +makedepends=('boost' 'cmake' 'mesa') license=("GPL") #url="http://www.simgear.org" url="https://gitorious.org/fg" options=('!makeflags') #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver") source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2") -md5sums=('0a8c77439ba7879b354a8fbcb7901ce3') +md5sums=('0ec974d3778f777d5c99c89db671fcc7') build() { cd $srcdir/simgear-$pkgver diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index 196dce300..9832227fa 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83278 2013-01-28 16:50:15Z stephane $ +# $Id: PKGBUILD 84408 2013-02-18 18:31:08Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: DuGi pkgname=springlobby -pkgver=0.159 -pkgrel=2 +pkgver=0.168 +pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64') url="http://springlobby.info/" @@ -14,7 +14,7 @@ optdepends=('sdl' 'sdl_sound' 'sdl_mixer') makedepends=('boost' 'asio' 'cmake') install=springlobby.install source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9a8e89c32dd49a51332e446e47dc1be1') +md5sums=('e8ab284a3ec1036b126676ed866dc4a3') build() { cd $srcdir/${pkgname}-$pkgver diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 4ca035881..dcf685850 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171020 2012-11-15 06:19:11Z heftig $ +# $Id: PKGBUILD 178235 2013-02-18 16:38:26Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) # Maintainer: Jan de Groot pkgname=gdm pkgver=3.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Display Manager" arch=(i686 x86_64) license=(GPL) @@ -20,14 +20,21 @@ optdepends=('gnome-shell: new login interface' 'fprintd: fingerprint authentication') install=gdm.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - fix_external_program_directories.patch) + fix_external_program_directories.patch + git-fixes.patch + maintain-FamilyLocal-cookie.patch) sha256sums=('fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9' - 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2') + 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2' + '1f21838553e4b0eec12465019f11ae3166b502566b3dbefbf0cb6573d77f8031' + '59e9c1fb86e39672b61a30dd75b16f6bea6293d23356422624f445966ddeb1ed') build() { cd "$pkgname-$pkgver" patch -Np1 -i "$srcdir/fix_external_program_directories.patch" + patch -Np1 -i "$srcdir/git-fixes.patch" + patch -Np1 -i "$srcdir/maintain-FamilyLocal-cookie.patch" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/gdm/git-fixes.patch b/extra/gdm/git-fixes.patch new file mode 100644 index 000000000..bf1772657 --- /dev/null +++ b/extra/gdm/git-fixes.patch @@ -0,0 +1,9067 @@ +diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c +index cff8b70..02bd414 100644 +--- a/daemon/gdm-display-access-file.c ++++ b/daemon/gdm-display-access-file.c +@@ -438,13 +438,8 @@ _get_auth_info_for_display (GdmDisplayAccessFile *file, + gdm_display_is_local (display, &is_local, NULL); + + if (is_local) { +- char localhost[HOST_NAME_MAX + 1] = ""; +- *family = FamilyLocal; +- if (gethostname (localhost, HOST_NAME_MAX) == 0) { +- *address = g_strdup (localhost); +- } else { +- *address = g_strdup ("localhost"); +- } ++ *family = FamilyWild; ++ *address = g_strdup ("localhost"); + } else { + *family = FamilyWild; + gdm_display_get_remote_hostname (display, address, NULL); +diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c +index 8f5f0c6..1475671 100644 +--- a/daemon/gdm-simple-slave.c ++++ b/daemon/gdm-simple-slave.c +@@ -485,8 +485,12 @@ on_session_conversation_started (GdmSession *session, + char *username; + int delay; + ++ g_debug ("GdmSimpleSlave: session conversation started for service %s", service_name); ++ ++ if (g_strcmp0 (service_name, "gdm-autologin") != 0) { ++ return; ++ } + +- g_debug ("GdmSimpleSlave: session conversation started"); + enabled = FALSE; + gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); + if (! enabled) { +@@ -1567,6 +1571,14 @@ gdm_simple_slave_stop (GdmSlave *slave) + self->priv->greeter_environment = NULL; + } + ++ if (self->priv->start_session_id > 0) { ++ g_source_remove (self->priv->start_session_id); ++ self->priv->start_session_id = 0; ++ } ++ ++ g_clear_pointer (&self->priv->start_session_service_name, ++ (GDestroyNotify) g_free); ++ + if (self->priv->session_is_running) { + char *username; + +diff --git a/docs/C/index.docbook b/docs/C/index.docbook +index ca6c6ee..a7f1d75 100644 +--- a/docs/C/index.docbook ++++ b/docs/C/index.docbook +@@ -532,14 +532,16 @@ + + + The session output is piped through the GDM daemon to the +- ~/.xsession-errors file. The file is overwritten +- on each login, so logging out and logging back into the same user via +- GDM will cause any messages from the previous session to be lost. ++ ~/$XDG_CACHE_HOME/gdm/session.log ++ file which usually expands to ~/.cache/gdm/session.log. ++ The file is overwritten on each login, so logging out and logging back ++ into the same user via GDM will cause any messages from the previous ++ session to be lost. + + + + Note that if GDM can not create this file for some reason, then a +- fallback file will be created named ~/.xsession-errors.XXXXXXXX ++ fallback file will be created named ~/$XDG_CACHE_HOME/gdm/session.log.XXXXXXXX + where the XXXXXXXX are some random characters. + + +diff --git a/docs/es/es.po b/docs/es/es.po +index 5c93fb2..1fe8a6e 100644 +--- a/docs/es/es.po ++++ b/docs/es/es.po +@@ -9,16 +9,16 @@ msgid "" + msgstr "" + "Project-Id-Version: gdm-help.master\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2012-09-06 16:12+0000\n" +-"PO-Revision-Date: 2012-09-06 18:03+0200\n" ++"POT-Creation-Date: 2012-12-01 00:31+0000\n" ++"PO-Revision-Date: 2012-12-02 20:13+0100\n" + "Last-Translator: Daniel Mustieles \n" +-"Language-Team: Español \n" ++"Language-Team: Español; Castellano \n" + "Language: \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: KBabel 1.11.4\n" +-"Plural-Forms: nplurals=2; plural=(n!=1);\n" ++"X-Generator: Gtranslator 2.91.5\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" + + #. Put one translator per line, in the form NAME , YEAR1, YEAR2 + msgctxt "_" +@@ -900,34 +900,48 @@ msgstr "" + "valor de la pantalla, <display>.log." + + #: C/index.docbook:533(sect2/para) +-msgid "" +-"The session output is piped through the GDM daemon to the ~/." +-"xsession-errors file. The file is overwritten on each login, so " +-"logging out and logging back into the same user via GDM will cause any " +-"messages from the previous session to be lost." ++#| msgid "" ++#| "The session output is piped through the GDM daemon to the ~/." ++#| "xsession-errors file. The file is overwritten on each login, " ++#| "so logging out and logging back into the same user via GDM will cause any " ++#| "messages from the previous session to be lost." ++msgid "" ++"The session output is piped through the GDM daemon to the ~/" ++"$XDG_CACHE_HOME/gdm/session.log file " ++"which usually expands to ~/.cache/gdm/session.log. The " ++"file is overwritten on each login, so logging out and logging back into the " ++"same user via GDM will cause any messages from the previous session to be " ++"lost." + msgstr "" + "La salida de la sesión se redirecciona a través del demonio de GDM al " +-"archivo ~/.xsession-errors. El archivo se sobreescribe " +-"con cada inicio de sesión, de tal forma que iniciar de nuevo sesión con el " +-"mismo usuario a través de GDM hará que cualquier mensaje de la sesión " +-"anterior se pierda." +- +-#: C/index.docbook:540(sect2/para) ++"archivo ~/$XDG_CACHE_HOME/gdm/session." ++"log que generalmente se expande a ~/.cache/gdm/session." ++"log. El archivo se sobreescribe con cada inicio de sesión, de tal " ++"forma que iniciar de nuevo sesión con el mismo usuario a través de GDM hará " ++"que cualquier mensaje de la sesión anterior se pierda." ++ ++#: C/index.docbook:542(sect2/para) ++#| msgid "" ++#| "Note that if GDM can not create this file for some reason, then a " ++#| "fallback file will be created named ~/.xsession-errors." ++#| "XXXXXXXX where the XXXXXXXX are some " ++#| "random characters." + msgid "" + "Note that if GDM can not create this file for some reason, then a fallback " +-"file will be created named ~/.xsession-errors.XXXXXXXX " +-"where the XXXXXXXX are some random characters." ++"file will be created named ~/$XDG_CACHE_HOME/gdm/session.log.XXXXXXXX where the " ++"XXXXXXXX are some random characters." + msgstr "" +-"Note que si GDM no puede crear este archivo por alguna razón, entonces se " +-"creará un archivo de apoyo llamado ~/.xsession-errors.XXXXXXXX donde XXXXXX son algunos caracteres " +-"aleatorios." ++"Tenga en cuneta que si GDM no puede crear este archivo por alguna razón, " ++"entonces se creará un archivo alternativo llamado ~/" ++"$XDG_CACHE_HOME/gdm/session.log.XXXXXXXX donde el " ++"archivo XXXXXXXX son algunos caracteres aleatorios." + +-#: C/index.docbook:548(sect2/title) ++#: C/index.docbook:550(sect2/title) + msgid "Fast User Switching" + msgstr "Cambio rápido de usuarios" + +-#: C/index.docbook:550(sect2/para) ++#: C/index.docbook:552(sect2/para) + msgid "" + "GDM allows multiple users to be logged in at the same time. After one user " + "is logged in, additional users can log in via the User Switcher on the GNOME " +@@ -945,7 +959,7 @@ msgstr "" + "predeterminada del panel. Se puede añadir usando el menú contextual del " + "panel." + +-#: C/index.docbook:559(sect2/para) ++#: C/index.docbook:561(sect2/para) + msgid "" + "Note this feature is available on systems that support Virtual Terminals. " + "This feature will not function if Virtual Terminals is not available." +@@ -954,15 +968,15 @@ msgstr "" + "Terminales virtuales. Esta característica no funcionará si los Terminales " + "virtuales no están disponibles." + +-#: C/index.docbook:570(sect1/title) ++#: C/index.docbook:572(sect1/title) + msgid "Security" + msgstr "Seguridad" + +-#: C/index.docbook:573(sect2/title) ++#: C/index.docbook:575(sect2/title) + msgid "The GDM User And Group" + msgstr "El usuario y grupo GDM" + +-#: C/index.docbook:575(sect2/para) ++#: C/index.docbook:577(sect2/para) + msgid "" + "For security reasons a dedicated user and group id are recommended for " + "proper operation. This user and group are normally \"gdm\" on most systems, " +@@ -977,7 +991,7 @@ msgstr "" + "forma que programas que interactúan con el usuario se ejecutan en una " + "«sandbox». Este usuario y grupo deberían tener privilegios limitados." + +-#: C/index.docbook:584(sect2/para) ++#: C/index.docbook:586(sect2/para) + msgid "" + "The only special privilege the \"gdm\" user requires is the ability to read " + "and write Xauth files to the <var>/run/gdm " +@@ -989,7 +1003,7 @@ msgstr "" + "gdm. La carpeta <var>/run/gdm debería " + "tener un propietario root:gdm y permisos 1777." + +-#: C/index.docbook:592(sect2/para) ++#: C/index.docbook:594(sect2/para) + msgid "" + "You should not, under any circumstances, configure the GDM user/group to a " + "user which a user could easily gain access to, such as the user " +@@ -1012,7 +1026,7 @@ msgstr "" + "debería configurarse para no tener contraseña ni permitir que usuarios que " + "no sean root inicien sesión en la cuenta." + +-#: C/index.docbook:605(sect2/para) ++#: C/index.docbook:607(sect2/para) + msgid "" + "The GDM greeter configuration is stored in GConf. To allow the GDM user to " + "be able to write configuration, it is necessary for the \"gdm\" user to have " +@@ -1030,11 +1044,11 @@ msgstr "" + "pueden estar desactivadas si no se puede escribir información de estado en " + "la configuración de GConf." + +-#: C/index.docbook:617(sect2/title) ++#: C/index.docbook:619(sect2/title) + msgid "PAM" + msgstr "PAM" + +-#: C/index.docbook:619(sect2/para) ++#: C/index.docbook:621(sect2/para) + msgid "" + "GDM uses PAM for login authentication. PAM stands for Pluggable " + "Authentication Module, and is used by most programs that request " +@@ -1048,7 +1062,7 @@ msgstr "" + "diferentes comportamientos de autenticación para distintos programas (tales " + "como SSH, IGU de inicio de sesión, salvapantallas, etc.)." + +-#: C/index.docbook:627(sect2/para) ++#: C/index.docbook:629(sect2/para) + msgid "" + "PAM is complicated and highly configurable, and this documentation does not " + "intend to explain this in detail. Instead, it is intended to give an " +@@ -1066,7 +1080,7 @@ msgstr "" + "de PAM para entender cómo configurar PAM y entender términos usados en esta " + "sección." + +-#: C/index.docbook:637(sect2/para) ++#: C/index.docbook:639(sect2/para) + msgid "" + "PAM configuration has different, but similar, interfaces on different " + "Operating Systems, so check the pam." +@@ -1082,7 +1096,7 @@ msgstr "" + "leer la documentación de PAM y tenga cuidado con las implicaciones de " + "seguridad de cualquier cambio que intente hacer a su configuración." + +-#: C/index.docbook:647(sect2/para) ++#: C/index.docbook:649(sect2/para) + msgid "" + "Note that, by default, GDM uses the \"gdm\" PAM service name for normal " + "login and the \"gdm-autologin\" PAM service name for automatic login. These " +@@ -1100,7 +1114,7 @@ msgstr "" + "característica de inicio de sesión automático puede no funcionar si el " + "servicio gdm-autologin no está definido." + +-#: C/index.docbook:657(sect2/para) ++#: C/index.docbook:659(sect2/para) + msgid "" + "The PostLogin script is run before pam_open_session is " + "called, and the PreSession script is called after. This " +@@ -1113,7 +1127,7 @@ msgstr "" + "al proceso de inicio de sesión antes o después de que PAM inicialice la " + "sesión." + +-#: C/index.docbook:665(sect2/para) ++#: C/index.docbook:667(sect2/para) + msgid "" + "If you wish to make GDM work with other types of authentication mechanisms " + "(such as a fingerprint or SmartCard reader), then you should implement this " +@@ -1132,7 +1146,7 @@ msgstr "" + "list@gnome.org, así que puede referirse a los archivos de " + "la lista para obtener más información." + +-#: C/index.docbook:676(sect2/para) ++#: C/index.docbook:678(sect2/para) + msgid "" + "PAM does have some limitations regarding being able to work with multiple " + "types of authentication at the same time, like supporting the ability to " +@@ -1148,7 +1162,7 @@ msgstr "" + "esto funcione, y es mejor conocer cómo se soluciona comúnmente este problema " + "al establecer tal tipo de configuración." + +-#: C/index.docbook:685(sect2/para) ++#: C/index.docbook:687(sect2/para) + msgid "" + "If automatic login does not work on a system, check to see if the \"gdm-" + "autologin\" PAM stack is defined in the PAM configuration. For this to work, " +@@ -1165,7 +1179,7 @@ msgstr "" + "módulo PAM lo haga, una configuración PAM para activara «gdm-autologin» " + "podría ser la siguiente:" + +-#: C/index.docbook:695(sect2/screen) ++#: C/index.docbook:697(sect2/screen) + #, no-wrap + msgid "" + "\n" +@@ -1182,7 +1196,7 @@ msgstr "" + " gdm-autologin session sufficient pam_allow.so.1\n" + " gdm-autologin password sufficient pam_allow.so.1\n" + +-#: C/index.docbook:703(sect2/para) ++#: C/index.docbook:705(sect2/para) + msgid "" + "The above setup will cause no lastlog entry to be generated. If a lastlog " + "entry is desired, then use the following for the session:" +@@ -1190,7 +1204,7 @@ msgstr "" + "La configuración anterior hará que no se genere información de «lastlog». Si " + "quiere una entrada de «lastlog», use lo siguiente para la sesión:" + +-#: C/index.docbook:708(sect2/screen) ++#: C/index.docbook:710(sect2/screen) + #, no-wrap + msgid "" + "\n" +@@ -1199,7 +1213,7 @@ msgstr "" + "\n" + " gdm-autologin session required pam_unix_session.so.1\n" + +-#: C/index.docbook:712(sect2/para) ++#: C/index.docbook:714(sect2/para) + msgid "" + "If the computer is used by several people, which makes automatic login " + "unsuitable, you may want to allow some users to log in without entering " +@@ -1218,7 +1232,7 @@ msgstr "" + "funcione el archivo de configuración PAM para el servicio «gdm» debe incluir " + "una línea así:" + +-#: C/index.docbook:723(sect2/screen) ++#: C/index.docbook:725(sect2/screen) + #, no-wrap + msgid "" + "\n" +@@ -1227,11 +1241,11 @@ msgstr "" + "\n" + " gdm auth sufficient pam_succeed_if.so user ingroup nopasswdlogin\n" + +-#: C/index.docbook:730(sect2/title) ++#: C/index.docbook:732(sect2/title) + msgid "utmp and wtmp" + msgstr "utmp y wtmp" + +-#: C/index.docbook:732(sect2/para) ++#: C/index.docbook:734(sect2/para) + msgid "" + "GDM generates utmp and wtmp User Accounting Database entries upon session " + "login and logout. The utmp database contains user access and accounting " +@@ -1252,11 +1266,11 @@ msgstr "" + "\"help\" url=\"man:utmp\">utmp y wtmp para su sistema operativo." + +-#: C/index.docbook:747(sect2/title) ++#: C/index.docbook:749(sect2/title) + msgid "Xserver Authentication Scheme" + msgstr "Esquema de autenticación del servidor X" + +-#: C/index.docbook:749(sect2/para) ++#: C/index.docbook:751(sect2/para) + msgid "" + "Xserver authorization files are stored in a newly created subdirectory of " + "<var>/run/gdm at start up. These files are used " +@@ -1271,7 +1285,7 @@ msgstr "" + "sesión, de tal forma que los usuarios de una sesión no pueden fisgar sobre " + "otros." + +-#: C/index.docbook:757(sect2/para) ++#: C/index.docbook:759(sect2/para) + msgid "" + "GDM only supports the MIT-MAGIC-COOKIE-1 Xserver authentication scheme. " + "Normally little is gained from the other schemes, and no effort has been " +@@ -1297,11 +1311,11 @@ msgstr "" + "problemas de seguridad. En la mayoría de los casos se debería preferir SSH " + "sobre las características XDMCP de GDM." + +-#: C/index.docbook:774(sect2/title) ++#: C/index.docbook:776(sect2/title) + msgid "XDMCP Security" + msgstr "Seguridad XDMCP" + +-#: C/index.docbook:776(sect2/para) ++#: C/index.docbook:778(sect2/para) + msgid "" + "Even though your display is protected by cookies, XEvents and thus " + "keystrokes typed when entering passwords will still go over the wire in " +@@ -1311,7 +1325,7 @@ msgstr "" + "pulsaciones de teclas que se introducen al escribir las contraseñas aún irán " + "sobre el cable en texto claro. Es trivial capturarlas." + +-#: C/index.docbook:782(sect2/para) ++#: C/index.docbook:784(sect2/para) + msgid "" + "XDMCP is primarily useful for running thin clients such as in terminal labs. " + "Those thin clients will only ever need the network to access the server, and " +@@ -1330,11 +1344,11 @@ msgstr "" + "servidor. Este tipo de configuración nunca debería usar un concentrador no " + "gestionado u otra red que pueda ser vigilada (con un «sniffer»)." + +-#: C/index.docbook:795(sect2/title) ++#: C/index.docbook:797(sect2/title) + msgid "XDMCP Access Control" + msgstr "Control de acceso XDMCP" + +-#: C/index.docbook:797(sect2/para) ++#: C/index.docbook:799(sect2/para) + msgid "" + "XDMCP access control is done using TCP wrappers. It is possible to compile " + "GDM without TCP wrapper support, so this feature may not be supported on " +@@ -1344,7 +1358,7 @@ msgstr "" + "compilar GDM sin TCP wrappers ya que esta característica puede que no esté " + "soportada en algunos sistemas operativos." + +-#: C/index.docbook:803(sect2/para) ++#: C/index.docbook:805(sect2/para) + msgid "" + "You should use the daemon name gdm in the <" + "etc>/hosts.allow and <etc>/hosts.deny. Por ejemplo para denegar la entrada a equipos " + "de .evil.domain , añada" + +-#: C/index.docbook:810(sect2/screen) ++#: C/index.docbook:812(sect2/screen) + #, no-wrap + msgid "" + "\n" +@@ -1365,13 +1379,13 @@ msgstr "" + "\n" + "gdm: .dominio.maligno\n" + +-#: C/index.docbook:813(sect2/para) ++#: C/index.docbook:815(sect2/para) + msgid "" + "to <etc>/hosts.deny. You may also need to add" + msgstr "" + "a <etc>/hosts.deny. También necesitará añadir " + +-#: C/index.docbook:817(sect2/screen) ++#: C/index.docbook:819(sect2/screen) + #, no-wrap + msgid "" + "\n" +@@ -1380,7 +1394,7 @@ msgstr "" + "\n" + "gdm: .su.dominio\n" + +-#: C/index.docbook:820(sect2/para) ++#: C/index.docbook:822(sect2/para) + msgid "" + "to your <etc>/hosts.allow if you normally " + "disallow all services from all hosts. See the hosts.allow(5) para más " + "detalles." + +-#: C/index.docbook:829(sect2/title) ++#: C/index.docbook:831(sect2/title) + msgid "Firewall Security" + msgstr "Seguridad con cortafuegos" + +-#: C/index.docbook:831(sect2/para) ++#: C/index.docbook:833(sect2/para) + msgid "" + "Even though GDM tries to outsmart potential attackers trying to take " + "advantage of XDMCP, it is still advised that you block the XDMCP port " +@@ -1413,7 +1427,7 @@ msgstr "" + "Además cada conexión remota toma muchos recursos, así que es más fácil hacer " + "una denegación de servicios a un servidor XDMCP que a un servidor web." + +-#: C/index.docbook:842(sect2/para) ++#: C/index.docbook:844(sect2/para) + msgid "" + "It is also wise to block all of the Xserver ports. These are TCP ports 6000+ " + "(one for each display number) on your firewall. Note that GDM will use " +@@ -1424,7 +1438,7 @@ msgstr "" + "cortafuegos. Note que GDM usará los números de pantalla 20 y superiores para " + "los servidores flexibles bajo demanda." + +-#: C/index.docbook:849(sect2/para) ++#: C/index.docbook:851(sect2/para) + msgid "" + "X is not a very safe protocol when using it over the Internet, and XDMCP is " + "even less safe." +@@ -1432,11 +1446,11 @@ msgstr "" + "X no es un protocolo muy seguro para dejarlo en la red, y XDMCP es aún menos " + "seguro." + +-#: C/index.docbook:856(sect2/title) ++#: C/index.docbook:858(sect2/title) + msgid "PolicyKit" + msgstr "PolicyKit" + +-#: C/index.docbook:864(sect2/para) ++#: C/index.docbook:866(sect2/para) + msgid "" + "GDM may be configured to use PolicyKit to allow the system administrator to " + "control whether the login screen should provide the shutdown and restart " +@@ -1447,7 +1461,7 @@ msgstr "" + "proporcionar los botones de apagado y reinicio en la pantalla gráfica con " + "temas." + +-#: C/index.docbook:870(sect2/para) ++#: C/index.docbook:872(sect2/para) + msgid "" + "These buttons are controlled by the org.freedesktop.consolekit." + "system.stop-multiple-users and org.freedesktop." +@@ -1461,11 +1475,11 @@ msgstr "" + "puede ajustar la política para estas acciones usando la herramienta polkit-" + "gnome-authorization o el programa de línea de comandos polkit-auth." + +-#: C/index.docbook:882(sect2/title) ++#: C/index.docbook:884(sect2/title) + msgid "RBAC (Role Based Access Control)" + msgstr "RBAC (Control de acceso basado en rol)" + +-#: C/index.docbook:884(sect2/para) ++#: C/index.docbook:886(sect2/para) + msgid "" + "GDM may be configured to use RBAC instead of PolicyKit. In this case the " + "RBAC configuration is used to control whether the login screen should " +@@ -1476,7 +1490,7 @@ msgstr "" + "de sesión debería proporcionar los botones de apagado y reinicio en la " + "pantalla gráfica." + +-#: C/index.docbook:890(sect2/para) ++#: C/index.docbook:892(sect2/para) + msgid "" + "For example, on Oracle Solaris, the \"solaris.system.shutdown\" " + "authorization is used to control this. Simply modify the /etc/" +@@ -1486,11 +1500,11 @@ msgstr "" + "usa para controlar esto. Simplemente modifique el archivo /etc/" + "user_attr para que el usuario «gdm» tenga esta autorización." + +-#: C/index.docbook:903(sect1/title) ++#: C/index.docbook:905(sect1/title) + msgid "Support for ConsoleKit" + msgstr "Soporte para ConsoleKit" + +-#: C/index.docbook:914(sect1/para) ++#: C/index.docbook:916(sect1/para) + msgid "" + "GDM includes support for publishing user login information with the user and " + "login session accounting framework known as ConsoleKit. ConsoleKit is able " +@@ -1505,7 +1519,7 @@ msgstr "" + "reemplazo de los archivos utmp y utmpx que están disponibles en la mayoría " + "de los sistemas Unix." + +-#: C/index.docbook:922(sect1/para) ++#: C/index.docbook:924(sect1/para) + msgid "" + "When GDM is about to create a new login process for a user it will call a " + "privileged method of ConsoleKit in order to open a new session for this " +@@ -1530,7 +1544,7 @@ msgstr "" + "privilegiado está restringido por el uso de una norma de seguridad del " + "sistema de bus de mensajes D-Bus." + +-#: C/index.docbook:936(sect1/para) ++#: C/index.docbook:938(sect1/para) + msgid "" + "In case a user with an existing session has authenticated at GDM and " + "requests to resume that existing session, GDM calls a privileged method of " +@@ -1545,7 +1559,7 @@ msgstr "" + "indefinidos y son específicos de la sesión. Sin embargo la mayoría de las " + "sesiones desbloquearán un salvapantallas en respuesta." + +-#: C/index.docbook:945(sect1/para) ++#: C/index.docbook:947(sect1/para) + msgid "" + "When the user chooses to log out, or if GDM or the session quit unexpectedly " + "the user session will be unregistered from ConsoleKit." +@@ -1553,11 +1567,11 @@ msgstr "" + "Cuando el usuario elige salir, o si GDM o la sesión terminan de forma " + "inesperada, la sesión de usuario se desregistra de ConsoleKit." + +-#: C/index.docbook:954(sect1/title) ++#: C/index.docbook:956(sect1/title) + msgid "Configuration" + msgstr "Configuración" + +-#: C/index.docbook:956(sect1/para) ++#: C/index.docbook:958(sect1/para) + msgid "" + "GDM has a number of configuration interfaces. These include scripting " + "integration points, daemon configuration, greeter configuration, general " +@@ -1571,11 +1585,11 @@ msgstr "" + "gnome-settings-daemon y configuración de la sesión. Estos tipos de " + "integración se describen debajo en detalle." + +-#: C/index.docbook:965(sect2/title) ++#: C/index.docbook:967(sect2/title) + msgid "Scripting Integration Points" + msgstr "Puntos de integración de scripts" + +-#: C/index.docbook:967(sect2/para) ++#: C/index.docbook:969(sect2/para) + msgid "" + "The GDM script integration points can be found in the <etc>/" + "gdm/ directory:" +@@ -1583,7 +1597,7 @@ msgstr "" + "Los puntos de integración de scripts para GDM se pueden encontrar en la " + "carpeta <etc>/gdm/:" + +-#: C/index.docbook:972(sect2/screen) ++#: C/index.docbook:974(sect2/screen) + #, no-wrap + msgid "" + "\n" +@@ -1600,7 +1614,7 @@ msgstr "" + "PreSession/\n" + "PostSession/\n" + +-#: C/index.docbook:980(sect2/para) ++#: C/index.docbook:982(sect2/para) + msgid "" + "The Init, PostLogin, " + "PreSession, and PostSession " +@@ -1610,7 +1624,7 @@ msgstr "" + "PreSession y PostSession trabajan " + "como se describe debajo." + +-#: C/index.docbook:986(sect2/para) ++#: C/index.docbook:988(sect2/para) + msgid "" + "For each type of script, the default one which will be executed is called " + "\"Default\" and is stored in a directory associated with the script type. So " +@@ -1631,7 +1645,7 @@ msgstr "" + "para esa pantalla. Por ejemplo, si existe el script <" + "Init>/:0, se ejecutará para la PANTALLA «:0»." + +-#: C/index.docbook:998(sect2/para) ++#: C/index.docbook:1000(sect2/para) + msgid "" + "All of these scripts are run with root privilege and return 0 if run " + "successfully, and a non-zero return code if there was any failure that " +@@ -1645,7 +1659,7 @@ msgstr "" + "que los scripts hayan finalizado, de tal forma que si algún script se cuelga " + "hará que también se cuelgue el proceso de inicio de sesión." + +-#: C/index.docbook:1006(sect2/para) ++#: C/index.docbook:1008(sect2/para) + msgid "" + "When the Xserver for the login GUI has been successfully started, but before " + "the login GUI is actually displayed, GDM will run the InitPostLogin script. This is done before any session setup " +@@ -1675,7 +1689,7 @@ msgstr "" + "de que la sesión se inicie. Por ejemplo, puede configurar la carpeta $HOME " + "del usuario, si es necesario." + +-#: C/index.docbook:1023(sect2/para) ++#: C/index.docbook:1025(sect2/para) + msgid "" + "After the user session has been initialized, GDM will run the " + "PreSession script. This script is useful for doing any " +@@ -1689,7 +1703,7 @@ msgstr "" + "sesión se haya inicializado. Se puede usar para gestión de sesiones o " + "cuentes, por ejemplo." + +-#: C/index.docbook:1031(sect2/para) ++#: C/index.docbook:1033(sect2/para) + msgid "" + "When a user terminates their session, GDM will run the " + "PostSession script. Note that the Xserver will have " +@@ -1700,7 +1714,7 @@ msgstr "" + "momento en el que se ejecute este script, de forma que no debe accederse a " + "él." + +-#: C/index.docbook:1038(sect2/para) ++#: C/index.docbook:1040(sect2/para) + msgid "" + "Note that the PostSession script will be run even when " + "the display fails to respond due to an I/O error or similar. Thus, there is " +@@ -1711,7 +1725,7 @@ msgstr "" + "similar. Así que, no hay garantía de que funcionen las aplicaciones X " + "durante la ejecución del script." + +-#: C/index.docbook:1045(sect2/para) ++#: C/index.docbook:1047(sect2/para) + msgid "" + "All of the above scripts will set the $RUNNING_UNDER_GDM environment variable to yes. If the scripts " +@@ -1725,11 +1739,11 @@ msgstr "" + "identificar cuándo GDM llama a estos scripts, de tal forma que podrá " + "ejecutar código específico cuando se use GDM." + +-#: C/index.docbook:1055(sect2/title) ++#: C/index.docbook:1057(sect2/title) + msgid "Autostart Configuration" + msgstr "Configuración automática al inicio" + +-#: C/index.docbook:1057(sect2/para) ++#: C/index.docbook:1059(sect2/para) + msgid "" + "The <share>/gdm/autostart/LoginWindow directory " + "contains files in the format specified by the \"FreeDesktop.org Desktop " +@@ -1744,7 +1758,7 @@ msgstr "" + "automáticamente o sólo se lancen si un valor de configuración de GConf está " + "establecido, etc." + +-#: C/index.docbook:1066(sect2/para) ++#: C/index.docbook:1068(sect2/para) + msgid "" + "Any .desktop files in this directory will cause the " + "associated program to automatically start with the login GUI greeter. By " +@@ -1765,11 +1779,11 @@ msgstr "" + "valores de configuración especificados en la sección Configuración de la " + "accesibilidad están establecidos." + +-#: C/index.docbook:1080(sect2/title) ++#: C/index.docbook:1082(sect2/title) + msgid "Xsession Script" + msgstr "Script Xsession" + +-#: C/index.docbook:1082(sect2/para) ++#: C/index.docbook:1084(sect2/para) + msgid "" + "There is also an Xsession script located at " + "<etc>/gdm/Xsession which is called between the " +@@ -1788,11 +1802,11 @@ msgstr "" + "especificada por el archivo de sesión de escritorio que el usuario " + "seleccionó para iniciar." + +-#: C/index.docbook:1095(sect2/title) ++#: C/index.docbook:1097(sect2/title) + msgid "Daemon Configuration" + msgstr "Configuración del demonio" + +-#: C/index.docbook:1097(sect2/para) ++#: C/index.docbook:1099(sect2/para) + msgid "" + "The GDM daemon is configured using the <etc>/gdm/custom." + "conf file. Default values are stored in GConf in the " +@@ -1808,7 +1822,7 @@ msgstr "" + "conf ya que puede que el archivo de esquemas se sobreescriba " + "cuando el usuario actualiza su sistema con una nueva versión de GDM." + +-#: C/index.docbook:1107(sect2/para) ++#: C/index.docbook:1109(sect2/para) + msgid "" + "Note that older versions of GDM supported additional configuration options " + "which are no longer supported in the latest versions of GDM." +@@ -1816,7 +1830,7 @@ msgstr "" + "Note que las versiones antiguas de GDM soportaban opciones de configuración " + "adicional que ya no se soportan en las últimas versiones de GDM." + +-#: C/index.docbook:1112(sect2/para) ++#: C/index.docbook:1114(sect2/para) + msgid "" + "The <etc>/gdm/custom.conf file is in the " + "keyfile format. Keywords in brackets define group " +@@ -1830,7 +1844,7 @@ msgstr "" + "los datos después del signo igual representan su valor. Las líneas vacías o " + "las que comienzan por la marca almohadilla (#) se ignoran." + +-#: C/index.docbook:1120(sect2/para) ++#: C/index.docbook:1122(sect2/para) + msgid "" + "The file <etc>/gdm/custom.conf supports the " + "\"[daemon]\", \"[security]\", and \"[xdmcp]\" group sections. Within each " +@@ -1846,7 +1860,7 @@ msgstr "" + "especificar que el usuario de ese inicio de sesión temporizado sea «usted», " + "deberá modificar el archivo para que contenga las siguientes líneas:" + +-#: C/index.docbook:1130(sect2/screen) ++#: C/index.docbook:1132(sect2/screen) + #, no-wrap + msgid "" + "\n" +@@ -1859,26 +1873,26 @@ msgstr "" + "TimedLoginEnable=true\n" + "TimedLogin=usted\n" + +-#: C/index.docbook:1136(sect2/para) ++#: C/index.docbook:1138(sect2/para) + msgid "A full list of supported configuration keys follow:" + msgstr "" + "A continuación está la lista completa de las claves de configuración " + "soportadas:" + +-#: C/index.docbook:1141(sect3/title) ++#: C/index.docbook:1143(sect3/title) + msgid "[chooser]" + msgstr "[chooser]" + +-#: C/index.docbook:1145(varlistentry/term) ++#: C/index.docbook:1147(varlistentry/term) + msgid "Multicast" + msgstr "Multicast" + +-#: C/index.docbook:1147(listitem/synopsis) ++#: C/index.docbook:1149(listitem/synopsis) + #, no-wrap + msgid "Multicast=false" + msgstr "Multicast=false" + +-#: C/index.docbook:1148(listitem/para) ++#: C/index.docbook:1150(listitem/para) + msgid "" + "If true and IPv6 is enabled, the chooser will send a multicast query to the " + "local network and collect responses from the hosts who have joined multicast " +@@ -1888,33 +1902,33 @@ msgstr "" + "multicast a la red local y recogerá las respuestas de los servidores que se " + "hayan unido al grupo multicast." + +-#: C/index.docbook:1157(varlistentry/term) ++#: C/index.docbook:1159(varlistentry/term) + msgid "MulticastAddr" + msgstr "MulticastAddr" + +-#: C/index.docbook:1159(listitem/synopsis) ++#: C/index.docbook:1161(listitem/synopsis) + #, no-wrap + msgid "MulticastAddr=ff02::1" + msgstr "MulticastAddr=ff02::1" + +-#: C/index.docbook:1160(listitem/para) ++#: C/index.docbook:1162(listitem/para) + msgid "This is the Link-local multicast address." + msgstr "Esta es la dirección de enlace local multicast." + +-#: C/index.docbook:1169(sect3/title) ++#: C/index.docbook:1171(sect3/title) + msgid "[daemon]" + msgstr "[daemon]" + +-#: C/index.docbook:1172(varlistentry/term) ++#: C/index.docbook:1174(varlistentry/term) + msgid "TimedLoginEnable" + msgstr "TimedLoginEnable" + +-#: C/index.docbook:1174(listitem/synopsis) ++#: C/index.docbook:1176(listitem/synopsis) + #, no-wrap + msgid "TimedLoginEnable=false" + msgstr "TimedLoginEnable=false" + +-#: C/index.docbook:1175(listitem/para) ++#: C/index.docbook:1177(listitem/para) + msgid "" + "If the user given in TimedLogin should be logged in " + "after a number of seconds (set with TimedLoginDelay) of " +@@ -1945,16 +1959,16 @@ msgstr "" + "«Seguridad ->PAM» del manual para obtener más información, o para obtener " + "ayuda si esta característica parece no funcionar." + +-#: C/index.docbook:1197(varlistentry/term) ++#: C/index.docbook:1199(varlistentry/term) + msgid "TimedLogin" + msgstr "TimedLogin" + +-#: C/index.docbook:1199(listitem/synopsis) ++#: C/index.docbook:1201(listitem/synopsis) + #, no-wrap + msgid "TimedLogin=" + msgstr "TimedLogin=" + +-#: C/index.docbook:1200(listitem/para) ++#: C/index.docbook:1202(listitem/para) + msgid "" + "This is the user that should be logged in after a specified number of " + "seconds of inactivity." +@@ -1962,7 +1976,7 @@ msgstr "" + "Éste es el usuario que debería iniciar sesión después de un número de " + "segundos de inactividad especificado." + +-#: C/index.docbook:1204(listitem/para) C/index.docbook:1248(listitem/para) ++#: C/index.docbook:1206(listitem/para) C/index.docbook:1250(listitem/para) + msgid "" + "If the value ends with a vertical bar | (the pipe symbol), then GDM will " + "execute the program specified and use whatever value is returned on standard " +@@ -1979,16 +1993,16 @@ msgstr "" + "si el valor es «/usr/bin/getloginuser|», entonces el programa «/usr/bin/" + "getloginuser» se ejecutará para obtener la variable del usuario" + +-#: C/index.docbook:1218(varlistentry/term) ++#: C/index.docbook:1220(varlistentry/term) + msgid "TimedLoginDelay" + msgstr "TimedLoginDelay" + +-#: C/index.docbook:1220(listitem/synopsis) ++#: C/index.docbook:1222(listitem/synopsis) + #, no-wrap + msgid "TimedLoginDelay=30" + msgstr "TimedLoginDelay=30" + +-#: C/index.docbook:1221(listitem/para) ++#: C/index.docbook:1223(listitem/para) + msgid "" + "Delay in seconds before the TimedLogin user will be " + "logged in." +@@ -1996,16 +2010,16 @@ msgstr "" + "Retardo en segundos antes de que el usuario TimedLogin " + "entre en la sesión." + +-#: C/index.docbook:1229(varlistentry/term) ++#: C/index.docbook:1231(varlistentry/term) + msgid "AutomaticLoginEnable" + msgstr "AutomaticLoginEnable" + +-#: C/index.docbook:1231(listitem/synopsis) ++#: C/index.docbook:1233(listitem/synopsis) + #, no-wrap + msgid "AutomaticLoginEnable=false" + msgstr "AutomaticLoginEnable=false" + +-#: C/index.docbook:1232(listitem/para) ++#: C/index.docbook:1234(listitem/para) + msgid "" + "If true, the user given in AutomaticLogin should be " + "logged in immediately. This feature is like timed login with a delay of 0 " +@@ -2015,16 +2029,16 @@ msgstr "" + "filename> debería iniciar sesión inmediatamente. Esta característica es como " + "un inicio de sesión temporizado con retraso 0." + +-#: C/index.docbook:1241(varlistentry/term) ++#: C/index.docbook:1243(varlistentry/term) + msgid "AutomaticLogin" + msgstr "AutomaticLogin" + +-#: C/index.docbook:1243(listitem/synopsis) ++#: C/index.docbook:1245(listitem/synopsis) + #, no-wrap + msgid "AutomaticLogin=" + msgstr "AutomaticLogin=" + +-#: C/index.docbook:1244(listitem/para) ++#: C/index.docbook:1246(listitem/para) + msgid "" + "This is the user that should be logged in immediately if " + "AutomaticLoginEnable is true." +@@ -2032,16 +2046,16 @@ msgstr "" + "Este es el usuario que debería iniciar sesión inmediatamente si " + "AutomaticLoginEnable está activada (true)." + +-#: C/index.docbook:1262(varlistentry/term) ++#: C/index.docbook:1264(varlistentry/term) + msgid "User" + msgstr "User" + +-#: C/index.docbook:1264(listitem/synopsis) ++#: C/index.docbook:1266(listitem/synopsis) + #, no-wrap + msgid "User=gdm" + msgstr "User=gdm" + +-#: C/index.docbook:1265(listitem/para) ++#: C/index.docbook:1267(listitem/para) + msgid "" + "The username under which the greeter and other GUI programs are run. Refer " + "to the Group configuration key and to the \"Security-" +@@ -2052,16 +2066,16 @@ msgstr "" + "«Seguridad ->El usuario y grupo GDM» de este documento para obtener más " + "información." + +-#: C/index.docbook:1275(varlistentry/term) ++#: C/index.docbook:1277(varlistentry/term) + msgid "Group" + msgstr "Group" + +-#: C/index.docbook:1277(listitem/synopsis) ++#: C/index.docbook:1279(listitem/synopsis) + #, no-wrap + msgid "Group=gdm" + msgstr "Group=gdm" + +-#: C/index.docbook:1278(listitem/para) ++#: C/index.docbook:1280(listitem/para) + msgid "" + "The group name under which the greeter and other GUI programs are run. Refer " + "to the User configuration key and to the \"Security->" +@@ -2072,26 +2086,26 @@ msgstr "" + "sección «Seguridad ->Usuario y grupo GDM» de este documento para obtener " + "más información." + +-#: C/index.docbook:1290(sect3/title) ++#: C/index.docbook:1292(sect3/title) + msgid "Debug Options" + msgstr "Opciones de depuración" + +-#: C/index.docbook:1293(variablelist/title) ++#: C/index.docbook:1295(variablelist/title) + msgid "[debug]" + msgstr "[debug]" + +-#: C/index.docbook:1296(varlistentry/term) +-#: C/index.docbook:1427(varlistentry/term) ++#: C/index.docbook:1298(varlistentry/term) ++#: C/index.docbook:1429(varlistentry/term) + msgid "Enable" + msgstr "Enable" + +-#: C/index.docbook:1298(listitem/synopsis) +-#: C/index.docbook:1429(listitem/synopsis) ++#: C/index.docbook:1300(listitem/synopsis) ++#: C/index.docbook:1431(listitem/synopsis) + #, no-wrap + msgid "Enable=false" + msgstr "Enable=false" + +-#: C/index.docbook:1299(listitem/para) ++#: C/index.docbook:1301(listitem/para) + msgid "" + "To enable debugging, set the debug/Enable key to \"true\" in the " + "<etc>/gdm/custom.conf file and restart GDM. Then " +@@ -2105,24 +2119,24 @@ msgstr "" + "sistema (<var>/log/messages o <" + "var>/adm/messages dependiendo de su sistema operativo)." + +-#: C/index.docbook:1314(sect3/title) ++#: C/index.docbook:1316(sect3/title) + msgid "Greeter Options" + msgstr "Opciones de la interfaz" + +-#: C/index.docbook:1317(variablelist/title) ++#: C/index.docbook:1319(variablelist/title) + msgid "[greeter]" + msgstr "[greeter]" + +-#: C/index.docbook:1320(varlistentry/term) ++#: C/index.docbook:1322(varlistentry/term) + msgid "IncludeAll" + msgstr "IncludeAll" + +-#: C/index.docbook:1322(listitem/synopsis) ++#: C/index.docbook:1324(listitem/synopsis) + #, no-wrap + msgid "IncludeAll=true" + msgstr "IncludeAll=true" + +-#: C/index.docbook:1323(listitem/para) ++#: C/index.docbook:1325(listitem/para) + msgid "" + "If true, then the face browser will show all users on the local machine. If " + "false, the face browser will only show users who have recently logged in." +@@ -2131,7 +2145,7 @@ msgstr "" + "en el equipo local. Si es falso, el examinador de rostros sólo mostrará los " + "usuarios que han iniciado sesión recientemente." + +-#: C/index.docbook:1329(listitem/para) ++#: C/index.docbook:1331(listitem/para) + msgid "" + "When this key is true, GDM will call fgetpwent() to get a list of local " + "users on the system. Any users with a user id less than 500 (or 100 if " +@@ -2154,7 +2168,7 @@ msgstr "" + "() devuelve; /sbin/nologin o /bin/false se consideran «shell» no válidas " + "incluso si getusershell() las devuelve)." + +-#: C/index.docbook:1343(listitem/para) ++#: C/index.docbook:1345(listitem/para) + msgid "" + "If false, then GDM more simply only displays users that have previously " + "logged in on the system (local or NIS/LDAP users) by calling the ck-" +@@ -2164,16 +2178,16 @@ msgstr "" + "iniciado sesión en el sistema (localmente o usuarios NIS/LDAP) llamando a la " + "interfaz de ConsoleKit ck-history." + +-#: C/index.docbook:1352(varlistentry/term) ++#: C/index.docbook:1354(varlistentry/term) + msgid "Include" + msgstr "Include" + +-#: C/index.docbook:1354(listitem/synopsis) ++#: C/index.docbook:1356(listitem/synopsis) + #, no-wrap + msgid "Include=" + msgstr "Include=" + +-#: C/index.docbook:1355(listitem/para) ++#: C/index.docbook:1357(listitem/para) + msgid "" + "Set to a list of users to always include in the Face Browser. This value is " + "set to a list of users separated by commas. By default, the value is empty." +@@ -2182,16 +2196,16 @@ msgstr "" + "rostros. Este valor está establecido a una lista de usuarios separados por " + "comas. De forma predeterminada el valor está vacío." + +-#: C/index.docbook:1364(varlistentry/term) ++#: C/index.docbook:1366(varlistentry/term) + msgid "Exclude" + msgstr "Exclude" + +-#: C/index.docbook:1366(listitem/synopsis) ++#: C/index.docbook:1368(listitem/synopsis) + #, no-wrap + msgid "Exclude=bin,root,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,nobody4,noaccess,postgres,pvm,rpm,nfsnobody,pcap" + msgstr "Exclude=bin,root,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,nobody4,noaccess,postgres,pvm,rpm,nfsnobody,pcap" + +-#: C/index.docbook:1367(listitem/para) ++#: C/index.docbook:1369(listitem/para) + msgid "" + "Set to a list of users to always exclude in the Face Browser. This value is " + "set to a list of users separated by commas. Note that the setting in the " +@@ -2206,24 +2220,24 @@ msgstr "" + "a la lista, entonces debe establecer el valor al predeterminado con los " + "valores adicionales añadidos a la lista." + +-#: C/index.docbook:1381(sect3/title) ++#: C/index.docbook:1383(sect3/title) + msgid "Security Options" + msgstr "Opciones de seguridad" + +-#: C/index.docbook:1384(variablelist/title) ++#: C/index.docbook:1386(variablelist/title) + msgid "[security]" + msgstr "[security]" + +-#: C/index.docbook:1387(varlistentry/term) ++#: C/index.docbook:1389(varlistentry/term) + msgid "DisallowTCP" + msgstr "DisallowTCP" + +-#: C/index.docbook:1389(listitem/synopsis) ++#: C/index.docbook:1391(listitem/synopsis) + #, no-wrap + msgid "DisallowTCP=true" + msgstr "DisallowTCP=true" + +-#: C/index.docbook:1390(listitem/para) ++#: C/index.docbook:1392(listitem/para) + msgid "" + "If true, then always append -nolisten tcp to the " + "command line when starting attached Xservers, thus disallowing TCP " +@@ -2235,24 +2249,24 @@ msgstr "" + "deshabilitar las conexiones TCP. Esta configuración es más segura si no se " + "van a usar conexiones remotas." + +-#: C/index.docbook:1402(sect3/title) ++#: C/index.docbook:1404(sect3/title) + msgid "XDCMP Support" + msgstr "Soporte XDMCP" + +-#: C/index.docbook:1405(variablelist/title) ++#: C/index.docbook:1407(variablelist/title) + msgid "[xdmcp]" + msgstr "[xdmcp]" + +-#: C/index.docbook:1408(varlistentry/term) ++#: C/index.docbook:1410(varlistentry/term) + msgid "DisplaysPerHost" + msgstr "DisplaysPerHost" + +-#: C/index.docbook:1410(listitem/synopsis) ++#: C/index.docbook:1412(listitem/synopsis) + #, no-wrap + msgid "DisplaysPerHost=1" + msgstr "DisplaysPerHost=1" + +-#: C/index.docbook:1411(listitem/para) ++#: C/index.docbook:1413(listitem/para) + msgid "" + "To prevent attackers from filling up the pending queue, GDM will only allow " + "one connection for each remote computer. If you want to provide display " +@@ -2264,7 +2278,7 @@ msgstr "" + "servicios de pantalla a equipos con más de un monitor debería incrementar " + "este valor." + +-#: C/index.docbook:1418(listitem/para) ++#: C/index.docbook:1420(listitem/para) + msgid "" + "Note that the number of attached DISPLAYS allowed is not limited. Only " + "remote connections via XDMCP are limited by this configuration option." +@@ -2273,7 +2287,7 @@ msgstr "" + "conexiones remotas a través de XDMCP están limitadas por esta opción de la " + "configuración." + +-#: C/index.docbook:1430(listitem/para) ++#: C/index.docbook:1432(listitem/para) + msgid "" + "Setting this to true enables XDMCP support allowing remote displays/X " + "terminals to be managed by GDM." +@@ -2281,7 +2295,7 @@ msgstr "" + "Establecer esto a true activa el soporte XDMCP permitiento que las pantallas " + "X remotas o los terminales X se gestiones por medio de GDM." + +-#: C/index.docbook:1435(listitem/para) ++#: C/index.docbook:1437(listitem/para) + msgid "" + "gdm listens for requests on UDP port 177. See the Port " + "option for more information." +@@ -2289,7 +2303,7 @@ msgstr "" + "gdm escucha peticiones en el puerto UDP 177. Vea la " + "opción Puerto para más información." + +-#: C/index.docbook:1440(listitem/para) ++#: C/index.docbook:1442(listitem/para) + msgid "" + "If GDM is compiled to support it, access from remote displays can be " + "controlled using the TCP Wrappers library. The service name is " +@@ -2299,7 +2313,7 @@ msgstr "" + "se puede controlar usando la biblioteca TCPWrappers. El nombre del servicio " + "es gdm" + +-#: C/index.docbook:1448(para/screen) ++#: C/index.docbook:1450(para/screen) + #, no-wrap + msgid "" + "\n" +@@ -2308,7 +2322,7 @@ msgstr "" + "\n" + "gdm:.mi.dominio\n" + +-#: C/index.docbook:1446(listitem/para) ++#: C/index.docbook:1448(listitem/para) + msgid "" + "You should add <_:screen-1/> to your <etc>/hosts.allow, depending on your TCP Wrappers configuration. See the hosts.allow " + "para obtener más detalles." + +-#: C/index.docbook:1457(listitem/para) ++#: C/index.docbook:1459(listitem/para) + msgid "" + "Please note that XDMCP is not a particularly secure protocol and that it is " + "a good idea to block UDP port 177 on your firewall unless you really need it." +@@ -2328,16 +2342,16 @@ msgstr "" + "idea bloquear el puerto UDP 177 en su cortafuegos a no ser que realmente lo " + "necesite." + +-#: C/index.docbook:1466(varlistentry/term) ++#: C/index.docbook:1468(varlistentry/term) + msgid "HonorIndirect" + msgstr "HonorIndirect" + +-#: C/index.docbook:1468(listitem/synopsis) ++#: C/index.docbook:1470(listitem/synopsis) + #, no-wrap + msgid "HonorIndirect=true" + msgstr "HonorIndirect=true" + +-#: C/index.docbook:1469(listitem/para) ++#: C/index.docbook:1471(listitem/para) + msgid "" + "Enables XDMCP INDIRECT choosing (i.e. remote execution of " + "gdmchooser) for X-terminals which do not supply their " +@@ -2347,16 +2361,16 @@ msgstr "" + "gdmchooser) para terminales X que no suministran su " + "propio examinador de pantallas." + +-#: C/index.docbook:1478(varlistentry/term) ++#: C/index.docbook:1480(varlistentry/term) + msgid "MaxPending" + msgstr "MaxPending" + +-#: C/index.docbook:1480(listitem/synopsis) ++#: C/index.docbook:1482(listitem/synopsis) + #, no-wrap + msgid "MaxPending=4" + msgstr "MaxPending=4" + +-#: C/index.docbook:1481(listitem/para) ++#: C/index.docbook:1483(listitem/para) + msgid "" + "To avoid denial of service attacks, GDM has fixed size queue of pending " + "connections. Only MaxPending displays can start at the same time." +@@ -2365,7 +2379,7 @@ msgstr "" + "fijo de conexiones pendientes. Sólo pueden iniciarse a la vez MaxPending " + "pantallas." + +-#: C/index.docbook:1487(listitem/para) ++#: C/index.docbook:1489(listitem/para) + msgid "" + "Please note that this parameter does not limit the number of remote displays " + "which can be managed. It only limits the number of displays initiating a " +@@ -2375,16 +2389,16 @@ msgstr "" + "puedan gestionar. Sólo limita el número de pantallas iniciando una conexión " + "simultáneamente." + +-#: C/index.docbook:1496(varlistentry/term) ++#: C/index.docbook:1498(varlistentry/term) + msgid "MaxSessions" + msgstr "MaxSessions" + +-#: C/index.docbook:1498(listitem/synopsis) ++#: C/index.docbook:1500(listitem/synopsis) + #, no-wrap + msgid "MaxSessions=16" + msgstr "MaxSessions=16" + +-#: C/index.docbook:1499(listitem/para) ++#: C/index.docbook:1501(listitem/para) + msgid "" + "Determines the maximum number of remote display connections which will be " + "managed simultaneously. I.e. the total number of remote displays that can " +@@ -2394,16 +2408,16 @@ msgstr "" + "gestionadas simultáneamente. Ej: el número total de pantallas remotas que " + "puede usar su host." + +-#: C/index.docbook:1508(varlistentry/term) ++#: C/index.docbook:1510(varlistentry/term) + msgid "MaxWait" + msgstr "MaxWait" + +-#: C/index.docbook:1510(listitem/synopsis) ++#: C/index.docbook:1512(listitem/synopsis) + #, no-wrap + msgid "MaxWait=30" + msgstr "MaxWait=30" + +-#: C/index.docbook:1511(listitem/para) ++#: C/index.docbook:1513(listitem/para) + msgid "" + "When GDM is ready to manage a display an ACCEPT packet is sent to it " + "containing a unique session id which will be used in future XDMCP " +@@ -2413,7 +2427,7 @@ msgstr "" + "ACCEPT a ella conteniendo un id único de sesión que será usado en las " + "conversaciones XDMCP futuras." + +-#: C/index.docbook:1517(listitem/para) ++#: C/index.docbook:1519(listitem/para) + msgid "" + "GDM will then place the session id in the pending queue waiting for the " + "display to respond with a MANAGE request." +@@ -2421,7 +2435,7 @@ msgstr "" + "GDM entonces colocará el id de sesión en la cola de pendientes esperando a " + "que la pantalla responda con una petición MANAGE." + +-#: C/index.docbook:1522(listitem/para) ++#: C/index.docbook:1524(listitem/para) + msgid "" + "If no response is received within MaxWait seconds, GDM will declare the " + "display dead and erase it from the pending queue freeing up the slot for " +@@ -2431,16 +2445,16 @@ msgstr "" + "la pantalla muerta y la eliminará de la cola pendiente liberando el espacio " + "para otras pantallas." + +-#: C/index.docbook:1531(varlistentry/term) ++#: C/index.docbook:1533(varlistentry/term) + msgid "MaxWaitIndirect" + msgstr "MaxWaitIndirect" + +-#: C/index.docbook:1533(listitem/synopsis) ++#: C/index.docbook:1535(listitem/synopsis) + #, no-wrap + msgid "MaxWaitIndirect=30" + msgstr "MaxWaitIndirect=30" + +-#: C/index.docbook:1534(listitem/para) ++#: C/index.docbook:1536(listitem/para) + msgid "" + "The MaxWaitIndirect parameter determines the maximum number of seconds " + "between the time where a user chooses a host and the subsequent indirect " +@@ -2458,16 +2472,16 @@ msgstr "" + "más hosts intentando enviar solicitudes que MaxPendingIndirect." + +-#: C/index.docbook:1548(varlistentry/term) ++#: C/index.docbook:1550(varlistentry/term) + msgid "PingIntervalSeconds" + msgstr "PingIntervalSeconds" + +-#: C/index.docbook:1550(listitem/synopsis) ++#: C/index.docbook:1552(listitem/synopsis) + #, no-wrap + msgid "PingIntervalSeconds=60" + msgstr "PingIntervalSeconds=60" + +-#: C/index.docbook:1551(listitem/para) ++#: C/index.docbook:1553(listitem/para) + msgid "" + "If the Xserver does not respond in the specified number of seconds, then the " + "connection is stopped and the session ended. When this happens the slave " +@@ -2482,7 +2496,7 @@ msgstr "" + "el tiempo de expiración si se está actualizando desde la versión 2.20 de GDM " + "y anteriores, a una versión más moderna." + +-#: C/index.docbook:1560(listitem/para) ++#: C/index.docbook:1562(listitem/para) + msgid "" + "Note that GDM in the past used to have a PingInterval " + "configuration key which was also in minutes. For most purposes you'd want " +@@ -2498,16 +2512,16 @@ msgstr "" + "laboratorio), un retraso de más de 15 segundos realmente significaría que el " + "terminal se ha apagado o reiniciado y usted querría terminar la sesión." + +-#: C/index.docbook:1573(varlistentry/term) ++#: C/index.docbook:1575(varlistentry/term) + msgid "Port" + msgstr "Port" + +-#: C/index.docbook:1575(listitem/synopsis) ++#: C/index.docbook:1577(listitem/synopsis) + #, no-wrap + msgid "Port=177" + msgstr "Port=177" + +-#: C/index.docbook:1576(listitem/para) ++#: C/index.docbook:1578(listitem/para) + msgid "" + "The UDP port number gdm should listen to for XDMCP " + "requests. Do not change this unless you know what you are doing." +@@ -2515,16 +2529,16 @@ msgstr "" + "El número de puerto UDP en el que gdm debería escuchar " + "las peticiones XDMCP. No cambie esto a no ser que sepa lo que está haciendo." + +-#: C/index.docbook:1585(varlistentry/term) ++#: C/index.docbook:1587(varlistentry/term) + msgid "Willing" + msgstr "Willing" + +-#: C/index.docbook:1587(listitem/synopsis) ++#: C/index.docbook:1589(listitem/synopsis) + #, no-wrap + msgid "Willing=<etc>/gdm/Xwilling" + msgstr "Willing=<etc>/gdm/Xwilling" + +-#: C/index.docbook:1588(listitem/para) ++#: C/index.docbook:1590(listitem/para) + msgid "" + "When the machine sends a WILLING packet back after a QUERY it sends a string " + "that gives the current status of this server. The default message is the " +@@ -2544,11 +2558,11 @@ msgstr "" + "como mucho una vez cada 3 segundos para impedir una posible denegación de " + "servicio inundando la máquina de paquetes QUERY." + +-#: C/index.docbook:1607(sect2/title) ++#: C/index.docbook:1609(sect2/title) + msgid "Simple Greeter Configuration" + msgstr "Configuración de la interfaz simple" + +-#: C/index.docbook:1609(sect2/para) ++#: C/index.docbook:1611(sect2/para) + msgid "" + "The GDM default greeter is called the simple Greeter and is configured via " + "GConf. Default values are stored in GConf in the gdm-simple-" +@@ -2567,59 +2581,59 @@ msgstr "" + "gconf-editor. Las siguientes opciones de configuración " + "están soportadas:" + +-#: C/index.docbook:1620(variablelist/title) ++#: C/index.docbook:1622(variablelist/title) + msgid "Greeter Configuration Keys" + msgstr "Claves de configuración de la interfaz" + +-#: C/index.docbook:1623(varlistentry/term) ++#: C/index.docbook:1625(varlistentry/term) + msgid "/apps/gdm/simple-greeter/banner_message_enable" + msgstr "/apps/gdm/simple-greeter/banner_message_enable" + +-#: C/index.docbook:1625(listitem/synopsis) +-#: C/index.docbook:1646(listitem/synopsis) +-#: C/index.docbook:1657(listitem/synopsis) +-#: C/index.docbook:1722(listitem/synopsis) +-#: C/index.docbook:1787(listitem/synopsis) +-#: C/index.docbook:1798(listitem/synopsis) +-#: C/index.docbook:1809(listitem/synopsis) +-#: C/index.docbook:1820(listitem/synopsis) ++#: C/index.docbook:1627(listitem/synopsis) ++#: C/index.docbook:1648(listitem/synopsis) ++#: C/index.docbook:1659(listitem/synopsis) ++#: C/index.docbook:1724(listitem/synopsis) ++#: C/index.docbook:1789(listitem/synopsis) ++#: C/index.docbook:1800(listitem/synopsis) ++#: C/index.docbook:1811(listitem/synopsis) ++#: C/index.docbook:1822(listitem/synopsis) + #, no-wrap + msgid "false (boolean)" + msgstr "false (booleano)" + +-#: C/index.docbook:1626(listitem/para) ++#: C/index.docbook:1628(listitem/para) + msgid "Controls whether the banner message text is displayed." + msgstr "Controla si se muestra o no el mensaje de texto." + +-#: C/index.docbook:1633(varlistentry/term) ++#: C/index.docbook:1635(varlistentry/term) + msgid "/apps/gdm/simple-greeter/banner_message_text" + msgstr "/apps/gdm/simple-greeter/banner_message_text" + +-#: C/index.docbook:1635(listitem/synopsis) ++#: C/index.docbook:1637(listitem/synopsis) + #, no-wrap + msgid "NULL (string)" + msgstr "NULL (cadena)" + +-#: C/index.docbook:1636(listitem/para) ++#: C/index.docbook:1638(listitem/para) + msgid "Specifies the text banner message to show on the greeter window." + msgstr "" + "Especifica el mensaje de texto que mostrar en la ventana de la interfaz." + +-#: C/index.docbook:1644(varlistentry/term) ++#: C/index.docbook:1646(varlistentry/term) + msgid "/apps/gdm/simple-greeter/disable_restart_buttons" + msgstr "/apps/gdm/simple-greeter/disable_restart_buttons" + +-#: C/index.docbook:1647(listitem/para) ++#: C/index.docbook:1649(listitem/para) + msgid "Controls whether to show the restart buttons in the login window." + msgstr "" + "Controla si se deben mostrar los botones de reinicio en la ventana de " + "entrada." + +-#: C/index.docbook:1655(varlistentry/term) ++#: C/index.docbook:1657(varlistentry/term) + msgid "/apps/gdm/simple-greeter/disable_user_list" + msgstr "/apps/gdm/simple-greeter/disable_user_list" + +-#: C/index.docbook:1658(listitem/para) ++#: C/index.docbook:1660(listitem/para) + msgid "" + "If true, then the face browser with known users is not shown in the login " + "window." +@@ -2627,32 +2641,32 @@ msgstr "" + "Si está activada, entonces no se muestra el examinador de rostros con " + "usuarios conocidos en la ventana de inicio." + +-#: C/index.docbook:1666(varlistentry/term) ++#: C/index.docbook:1668(varlistentry/term) + msgid "/apps/gdm/simple-greeter/logo_icon_name" + msgstr "/apps/gdm/simple-greeter/logo_icon_name" + +-#: C/index.docbook:1668(listitem/synopsis) ++#: C/index.docbook:1670(listitem/synopsis) + #, no-wrap + msgid "computer (string)" + msgstr "computer (cadena)" + +-#: C/index.docbook:1669(listitem/para) ++#: C/index.docbook:1671(listitem/para) + msgid "Set to the themed icon name to use for the greeter logo." + msgstr "" + "Establecida al nombre del tema de iconos que usar para el logotipo de la " + "interfaz." + +-#: C/index.docbook:1676(varlistentry/term) ++#: C/index.docbook:1678(varlistentry/term) + msgid "/apps/gdm/simple-greeter/recent-languages" + msgstr "/apps/gdm/simple-greeter/recent-languages" + +-#: C/index.docbook:1678(listitem/synopsis) +-#: C/index.docbook:1700(listitem/synopsis) ++#: C/index.docbook:1680(listitem/synopsis) ++#: C/index.docbook:1702(listitem/synopsis) + #, no-wrap + msgid "[] (string list)" + msgstr "[] (lista de cadenas)" + +-#: C/index.docbook:1679(listitem/para) ++#: C/index.docbook:1681(listitem/para) + msgid "" + "Set to a list of languages to be shown by default in the login window. " + "Default value is \"[]\". With the default setting only the system default " +@@ -2665,7 +2679,7 @@ msgstr "" + "«Otros...» que mostrará un diálogo emergente con una lista completa de " + "idiomas disponibles entre los que el usuario puede seleccionar." + +-#: C/index.docbook:1687(listitem/para) ++#: C/index.docbook:1689(listitem/para) + msgid "" + "Users are not intended to change this setting by hand. Instead GDM keeps " + "track of any languages selected in this configuration key, and will show " +@@ -2678,11 +2692,11 @@ msgstr "" + "junto con la opción «Otros...». De esta forma los idiomas seleccionados son " + "más fáciles de seleccionar." + +-#: C/index.docbook:1698(varlistentry/term) ++#: C/index.docbook:1700(varlistentry/term) + msgid "/apps/gdm/simple-greeter/recent-layouts" + msgstr "/apps/gdm/simple-greeter/recent-layouts" + +-#: C/index.docbook:1701(listitem/para) ++#: C/index.docbook:1703(listitem/para) + msgid "" + "Set to a list of keyboard layouts to be shown by default in the login panel. " + "Default value is \"[]\". With the default setting only the system default " +@@ -2697,7 +2711,7 @@ msgstr "" + "una lista completa de distribuciones de teclado disponibles entre las que el " + "usuario puede seleccionar." + +-#: C/index.docbook:1709(listitem/para) ++#: C/index.docbook:1711(listitem/para) + msgid "" + "Users are not intended to change this setting by hand. Instead GDM keeps " + "track of any keyboard layouts selected in this configuration key, and will " +@@ -2711,21 +2725,21 @@ msgstr "" + "esta forma las distribuciones de teclado seleccionadas son más fáciles de " + "seleccionar." + +-#: C/index.docbook:1720(varlistentry/term) ++#: C/index.docbook:1722(varlistentry/term) + msgid "/apps/gdm/simple-greeter/wm_use_compiz" + msgstr "/apps/gdm/simple-greeter/wm_use_compiz" + +-#: C/index.docbook:1723(listitem/para) ++#: C/index.docbook:1725(listitem/para) + msgid "" + "Controls whether compiz is used as the window manager instead of metacity." + msgstr "" + "Controla si se usa compiz como gestor de ventanas en lugar de metacity." + +-#: C/index.docbook:1733(sect2/title) ++#: C/index.docbook:1735(sect2/title) + msgid "Accessibility Configuration" + msgstr "Configuración de la accesibilidad" + +-#: C/index.docbook:1735(sect2/para) ++#: C/index.docbook:1737(sect2/para) + msgid "" + "This section describes the accessibility configuration options available in " + "GDM." +@@ -2733,11 +2747,11 @@ msgstr "" + "Esta sección describe las opciones de configuración de accesibilidad " + "disponibles en GDM." + +-#: C/index.docbook:1741(sect3/title) ++#: C/index.docbook:1743(sect3/title) + msgid "GDM Accessibility Dialog And GConf Keys" + msgstr "Diálogo de accesibilidad y claves de GConf de GDM" + +-#: C/index.docbook:1743(sect3/para) ++#: C/index.docbook:1745(sect3/para) + msgid "" + "The GDM greeter panel at the login screen displays an accessibility icon. " + "Clicking on that icon opens the GDM Accessibility Dialog. In the GDM " +@@ -2750,7 +2764,7 @@ msgstr "" + "lista de casillas de verificación para que el usuario pueda activar o " + "desactivar las tecnologías de asistencia asociadas." + +-#: C/index.docbook:1750(sect3/para) ++#: C/index.docbook:1752(sect3/para) + msgid "" + "The checkboxes that correspond to the on-screen keyboard, screen magnifier " + "and screen reader assistive tools act on the three GConf keys that are " +@@ -2777,7 +2791,7 @@ msgstr "" + "estaban ejecutando en la última sesión de GDM se lanzarán automáticamente en " + "la siguiente sesión de inicio de GDM." + +-#: C/index.docbook:1764(sect3/para) ++#: C/index.docbook:1766(sect3/para) + msgid "" + "The other checkboxes in the GDM Accessibility Dialog do not have " + "corresponding GConf keys because no additional program is launched to " +@@ -2792,26 +2806,26 @@ msgstr "" + "accesibilidad proporcionadas por el servidor X que siempre se está " + "ejecutando durante la sesión GDM." + +-#: C/index.docbook:1774(sect3/title) ++#: C/index.docbook:1776(sect3/title) + msgid "Accessibility GConf Keys" + msgstr "Claves de accesibilidad de GConf" + +-#: C/index.docbook:1776(sect3/para) ++#: C/index.docbook:1778(sect3/para) + msgid "" + "GDM offers the following GConf keys to control its accessibility features:" + msgstr "" + "GDM ofrece las siguientes claves de GConf para controlar sus características " + "de accesibilidad:" + +-#: C/index.docbook:1782(variablelist/title) ++#: C/index.docbook:1784(variablelist/title) + msgid "GDM Configuration Keys" + msgstr "Claves de configuración de GDM" + +-#: C/index.docbook:1785(varlistentry/term) ++#: C/index.docbook:1787(varlistentry/term) + msgid "/desktop/gnome/interface/accessibility" + msgstr "/desktop/gnome/interface/accessibility" + +-#: C/index.docbook:1788(listitem/para) ++#: C/index.docbook:1790(listitem/para) + msgid "" + "Controls whether the Accessibility infrastructure will be started with the " + "GDM GUI. This is needed for many accessibility technology programs to work." +@@ -2819,11 +2833,11 @@ msgstr "" + "Controla si la infraestructura de accesibilidad se iniciará con la IGU de " + "GDM. Esto es necesario para que los programas de accesibilidad funcionen." + +-#: C/index.docbook:1796(varlistentry/term) ++#: C/index.docbook:1798(varlistentry/term) + msgid "/desktop/gnome/applications/at/screen_magnifier_enabled" + msgstr "/desktop/gnome/applications/at/screen_magnifier_enabled" + +-#: C/index.docbook:1799(listitem/para) ++#: C/index.docbook:1801(listitem/para) + msgid "" + "If set, then the assistive tools linked to this GConf key will be started " + "with the GDM GUI program. By default this is a screen magnifier application." +@@ -2832,11 +2846,11 @@ msgstr "" + "clave de GConf se iniciarán con la interfaz gráfica de GDM. De forma " + "predeterminada es una aplicación de magnificación de pantalla." + +-#: C/index.docbook:1807(varlistentry/term) ++#: C/index.docbook:1809(varlistentry/term) + msgid "/desktop/gnome/applications/at/screen_keyboard_enabled" + msgstr "/desktop/gnome/applications/at/screen_keyboard_enabled" + +-#: C/index.docbook:1810(listitem/para) ++#: C/index.docbook:1812(listitem/para) + msgid "" + "If set, then the assistive tools linked to this GConf key will be started " + "with the GDM GUI program. By default this is an on-screen keyboard " +@@ -2846,11 +2860,11 @@ msgstr "" + "clave de GConf se iniciarán con la interfaz gráfica de GDM. De forma " + "predeterminada es una aplicación de teclado en pantalla." + +-#: C/index.docbook:1818(varlistentry/term) ++#: C/index.docbook:1820(varlistentry/term) + msgid "/desktop/gnome/applications/at/screen_reader_enabled" + msgstr "/desktop/gnome/applications/at/screen_reader_enabled" + +-#: C/index.docbook:1821(listitem/para) ++#: C/index.docbook:1823(listitem/para) + msgid "" + "If set, then the assistive tools linked to this GConf key will be started " + "with the GDM GUI program. By default this is a screen reader application." +@@ -2859,11 +2873,11 @@ msgstr "" + "clave de GConf se iniciarán con la interfaz gráfica de GDM. De forma " + "predeterminada es una aplicación de lectura de pantalla." + +-#: C/index.docbook:1832(sect3/title) ++#: C/index.docbook:1834(sect3/title) + msgid "Linking GConf Keys to Accessbility Tools" + msgstr "Enlazar las claves de GConf con herramientas de accesibilidad" + +-#: C/index.docbook:1834(sect3/para) ++#: C/index.docbook:1836(sect3/para) + msgid "" + "For the screen_magnifier_enabled, the screen_keyboard_enabled, and the " + "screen_reader_enabled GConf keys, the assistive tool which gets launched " +@@ -2884,7 +2898,7 @@ msgstr "" + "esa clave de GConf en el valor AutostartCondition en el archivo de " + "escritorio. Por ejemplo, el valor podría ser uno de los siguientes:" + +-#: C/index.docbook:1846(sect3/screen) ++#: C/index.docbook:1848(sect3/screen) + #, no-wrap + msgid "" + "\n" +@@ -2897,7 +2911,7 @@ msgstr "" + "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_magnifier_enabled\n" + "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_reader_enabled\n" + +-#: C/index.docbook:1852(sect3/para) ++#: C/index.docbook:1854(sect3/para) + msgid "" + "When an accessibility key is true, then any program which is linked to that " + "key in a GDM autostart desktop file will be launched (unless the Hidden key " +@@ -2912,13 +2926,13 @@ msgstr "" + "herramientas de asistencia si existen archivos de escritorio múltiples con " + "esta condición AutostartCondition en la carpeta de inicio automático del GDM." + +-#: C/index.docbook:1862(sect3/title) ++#: C/index.docbook:1864(sect3/title) + msgid "Example Of Modifying Accessibility Tool Configuration" + msgstr "" + "Ejemplo de modificación de la configuración de la herramienta de " + "accesibilidad" + +-#: C/index.docbook:1864(sect3/para) ++#: C/index.docbook:1866(sect3/para) + msgid "" + "For example, if GNOME is distributed with GOK as the default on-screen " + "keyboard, then this could be replaced with a different program if desired. " +@@ -2933,7 +2947,7 @@ msgstr "" + "«mousetweaks» (ajustes finos del ratón) para soporte de pulsación al " + "posarse, entonces se necesita la siguiente configuración." + +-#: C/index.docbook:1872(sect3/para) ++#: C/index.docbook:1874(sect3/para) + msgid "" + "Create a desktop file for onboard and a second one for mousetweaks; for " + "example, onboard.desktop and mousetweaks.desktop. These files must be placed " +@@ -2946,12 +2960,12 @@ msgstr "" + "automático del GDM y estar en el formato explicado en la sección " + "«Configuración automática al inicio» de este documento." + +-#: C/index.docbook:1880(sect3/para) ++#: C/index.docbook:1882(sect3/para) + msgid "The following is an example onboard.desktop file:" + msgstr "" + "Lo siguiente es un ejemplo del archivo onboard.desktop:" + +-#: C/index.docbook:1884(sect3/screen) ++#: C/index.docbook:1886(sect3/screen) + #, no-wrap + msgid "" + "\n" +@@ -2980,14 +2994,14 @@ msgstr "" + "Categories=GNOME;GTK;Accessibility;\n" + "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled\n" + +-#: C/index.docbook:1898(sect3/para) ++#: C/index.docbook:1900(sect3/para) + msgid "" + "The following is an example mousetweaks.desktop file:" + msgstr "" + "Lo siguiente es un ejemplo del archivo mousetweaks.desktop:" + +-#: C/index.docbook:1903(sect3/screen) ++#: C/index.docbook:1905(sect3/screen) + #, no-wrap + msgid "" + "\n" +@@ -3016,7 +3030,7 @@ msgstr "" + "Categories=GNOME;GTK;Accessibility;\n" + "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled\n" + +-#: C/index.docbook:1917(sect3/para) ++#: C/index.docbook:1919(sect3/para) + msgid "" + "Note the line with the AutostartCondition that links both desktop files to " + "the GConf key for the on-screen keyboard." +@@ -3024,7 +3038,7 @@ msgstr "" + "Note la línea con AutostartCondition que enlaza tanto los archivos de " + "escritorio con las claves de GConf para el teclado en pantalla." + +-#: C/index.docbook:1922(sect3/para) ++#: C/index.docbook:1924(sect3/para) + msgid "" + "To disable GOK from starting, the desktop file for the GOK on-screen " + "keyboard must be removed or deactivated. Otherwise onboard and GOK would " +@@ -3039,7 +3053,7 @@ msgstr "" + "automático del GDM o añadiendo la clave de ajuste «Hidden=true» al archivo " + "gok.desktop." + +-#: C/index.docbook:1930(sect3/para) ++#: C/index.docbook:1932(sect3/para) + msgid "" + "After making these changes, GOK will no longer be started when the user " + "activates the on-screen keyboard in the GDM session; but onboard and " +@@ -3049,11 +3063,11 @@ msgstr "" + "usuario inicie el teclado en pantalla en la sesión de GDM; en su lugar se " + "lanzarán el teclado en pantalla «onboard» y los ajustes finos del ratón." + +-#: C/index.docbook:1939(sect2/title) ++#: C/index.docbook:1941(sect2/title) + msgid "General Session Settings" + msgstr "Ajustes generales de sesión" + +-#: C/index.docbook:1948(sect2/para) ++#: C/index.docbook:1950(sect2/para) + msgid "" + "The GDM Greeter uses some of the same framework that your desktop session " + "will use. And so, it is influenced by a number of the same GConf settings. " +@@ -3070,11 +3084,11 @@ msgstr "" + "política obligatoria del sistema. GDM instala su propia política obligatoria " + "para bloquear algunos ajustes por seguridad." + +-#: C/index.docbook:1959(sect2/title) ++#: C/index.docbook:1961(sect2/title) + msgid "GNOME Settings Daemon" + msgstr "Administrador de preferencias de GNOME" + +-#: C/index.docbook:1972(sect2/para) ++#: C/index.docbook:1974(sect2/para) + msgid "" + "GDM enables the following gnome-settings-daemon plugins: a11y-keyboard, " + "background, sound, xsettings." +@@ -3082,7 +3096,7 @@ msgstr "" + "GDM activa los siguientes complementos de gnome-settings-daemon: a11y-" + "keyboard, background, sound, xsettings." + +-#: C/index.docbook:1977(sect2/para) ++#: C/index.docbook:1979(sect2/para) + msgid "" + "These are responsible for things like the background image, font and theme " + "settings, sound events, etc." +@@ -3090,7 +3104,7 @@ msgstr "" + "Éstos son responsables de cosas como la imagen de fondo, los ajustes de " + "tipografía y tema, eventos de sonido, etc." + +-#: C/index.docbook:1982(sect2/para) ++#: C/index.docbook:1984(sect2/para) + msgid "" + "Plugins can also be disabled using GConf. For example, if you want to " + "disable the sound plugin then unset the following key: /apps/gdm/" +@@ -3101,11 +3115,11 @@ msgstr "" + "/apps/gdm/simple-greeter/settings-manager-plugins/sound/active." + +-#: C/index.docbook:1990(sect2/title) ++#: C/index.docbook:1992(sect2/title) + msgid "GDM Session Configuration" + msgstr "Configuración de sesión de GDM" + +-#: C/index.docbook:1992(sect2/para) ++#: C/index.docbook:1994(sect2/para) + msgid "" + "GDM sessions are specified using the FreeDesktop.org Desktop Entry " + "Specification, which can be referenced at the following URL: http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec." + +-#: C/index.docbook:1999(sect2/para) ++#: C/index.docbook:2001(sect2/para) + msgid "" + "By default, GDM will install desktop files in the <share>/" + "xsessions directory. GDM will search the following directories in " +@@ -3139,7 +3153,7 @@ msgstr "" + "etc>/dm/ a no ser que GDM se configure para usar una carpeta " + "diferente a través de la opción «--with-dmconfdir»." + +-#: C/index.docbook:2012(sect2/para) ++#: C/index.docbook:2014(sect2/para) + msgid "" + "A session can be disabled by editing the desktop file and adding a line as " + "follows: Hidden=true." +@@ -3147,7 +3161,7 @@ msgstr "" + "Se puede desactivar una sesión editando el archivo de escritorio y añadiendo " + "una como la siguiente Hidden=true." + +-#: C/index.docbook:2017(sect2/para) ++#: C/index.docbook:2019(sect2/para) + msgid "" + "GDM desktop files support a GDM-specific extension, a key named \"X-GDM-" + "BypassXsession\". If the key is not specified in a desktop file, the value " +@@ -3175,11 +3189,11 @@ msgstr "" + "en el sistema o en scripts de usuario que puedan impedir que un usuario " + "pueda iniciar una sesión." + +-#: C/index.docbook:2036(sect2/title) ++#: C/index.docbook:2038(sect2/title) + msgid "GDM User Session and Language Configuration" + msgstr "Sesión de usuario de GDM y configuración de idioma" + +-#: C/index.docbook:2037(sect2/para) ++#: C/index.docbook:2039(sect2/para) + msgid "" + "The user's default session and language choices are stored in the " + "~/.dmrc file. When a user logs in for the first time, " +@@ -3194,7 +3208,7 @@ msgstr "" + "valor diferente al iniciar sesión. GDM recordará estos cambios para inicios " + "posteriores." + +-#: C/index.docbook:2045(sect2/para) ++#: C/index.docbook:2047(sect2/para) + msgid "" + "The ~/.dmrc file is in the standard INI format. It has one section called [Desktop] " +@@ -3206,7 +3220,7 @@ msgstr "" + "que tiene dos claves: Session y Language." + +-#: C/index.docbook:2052(sect2/para) ++#: C/index.docbook:2054(sect2/para) + msgid "" + "The Session key specifies the basename of the session " + ".desktop file that the user wishes to normally use " +@@ -3223,7 +3237,7 @@ msgstr "" + "usa el predeterminado del sistema. El archivo normalmente tiene la siguiente " + "apariencia:" + +-#: C/index.docbook:2061(sect2/screen) ++#: C/index.docbook:2063(sect2/screen) + #, no-wrap + msgid "" + "\n" +@@ -3236,15 +3250,15 @@ msgstr "" + "Session=gnome\n" + "Language=es_ES.UTF-8\n" + +-#: C/index.docbook:2073(sect1/title) ++#: C/index.docbook:2075(sect1/title) + msgid "GDM Commands" + msgstr "Comandos de GDM" + +-#: C/index.docbook:2076(sect2/title) ++#: C/index.docbook:2078(sect2/title) + msgid "GDM Root User Commands" + msgstr "Comandos del administrador de GDM" + +-#: C/index.docbook:2078(sect2/para) ++#: C/index.docbook:2080(sect2/para) + msgid "" + "The GDM package provides the following commands in sbindir intended to be run by the root user:" +@@ -3252,14 +3266,14 @@ msgstr "" + "El paquete GDM proporciona los siguientes comandos en sbindir con la intención de que los use el usario root:" + +-#: C/index.docbook:2084(sect3/title) C/index.docbook:2099(variablelist/title) ++#: C/index.docbook:2086(sect3/title) C/index.docbook:2101(variablelist/title) + msgid "" + "gdm and gdm-binary Command Line Options" + msgstr "" + "Opciones de línea de comandos de gdm y gdm-" + "binary" + +-#: C/index.docbook:2087(sect3/para) ++#: C/index.docbook:2089(sect3/para) + msgid "" + "The gdm command is really just a script which runs the " + "gdm-binary, passing along any options. Before launching " +@@ -3279,43 +3293,43 @@ msgstr "" + "si cualquiera de LC_MESSAGES o LC_ALL está establecida. gdm-binary es el demonio actual de GDM." + +-#: C/index.docbook:2103(varlistentry/term) ++#: C/index.docbook:2105(varlistentry/term) + msgid "-?, --help" + msgstr "-?, --help" + +-#: C/index.docbook:2105(listitem/para) ++#: C/index.docbook:2107(listitem/para) + msgid "Gives a brief overview of the command line options." + msgstr "Da un breve resumen de las opciones de línea de comandos." + +-#: C/index.docbook:2112(varlistentry/term) ++#: C/index.docbook:2114(varlistentry/term) + msgid "--fatal-warnings" + msgstr "--fatal-warnings" + +-#: C/index.docbook:2114(listitem/para) ++#: C/index.docbook:2116(listitem/para) + msgid "Make all warnings cause GDM to exit." + msgstr "Causa que todas las advertencias hagan que GDM salga." + +-#: C/index.docbook:2121(varlistentry/term) ++#: C/index.docbook:2123(varlistentry/term) + msgid "--timed-exit" + msgstr "--timed-exit" + +-#: C/index.docbook:2123(listitem/para) ++#: C/index.docbook:2125(listitem/para) + msgid "Exit after 30 seconds. Useful for debugging." + msgstr "Sale después de 30 segundos. Útil para depuración." + +-#: C/index.docbook:2130(varlistentry/term) ++#: C/index.docbook:2132(varlistentry/term) + msgid "--version" + msgstr "--version" + +-#: C/index.docbook:2132(listitem/para) ++#: C/index.docbook:2134(listitem/para) + msgid "Print the version of the GDM daemon." + msgstr "Imprime la versión del demonio GDM." + +-#: C/index.docbook:2141(sect3/title) ++#: C/index.docbook:2143(sect3/title) + msgid "gdm-restart Command Line Options" + msgstr "Opciones de línea de comandos de gdm-restart" + +-#: C/index.docbook:2143(sect3/para) ++#: C/index.docbook:2145(sect3/para) + msgid "" + "gdm-restart stops and restarts GDM by sending the GDM " + "daemon a HUP signal. This command will immediately terminate all sessions " +@@ -3325,11 +3339,11 @@ msgstr "" + "GDM una señal HUP. Este comando inmediatamente terminará todas las sesiones " + "y echará fuera a los usuarios que hayan entrado con GDM." + +-#: C/index.docbook:2151(sect3/title) ++#: C/index.docbook:2153(sect3/title) + msgid "gdm-safe-restart Command Line Options" + msgstr "Opciones de línea de comandos de gdm-safe-restart" + +-#: C/index.docbook:2153(sect3/para) ++#: C/index.docbook:2155(sect3/para) + msgid "" + "gdm-safe-restart stops and restarts GDM by sending the " + "GDM daemon a USR1 signal. GDM will be restarted as soon as all users log out." +@@ -3338,22 +3352,22 @@ msgstr "" + "GDM una señal USR1. GDM re reiniciará tan pronto como todos los usuarios " + "salgan." + +-#: C/index.docbook:2161(sect3/title) ++#: C/index.docbook:2163(sect3/title) + msgid "gdm-stop Command Line Options" + msgstr "Opciones de línea de comandos de gdm-stop" + +-#: C/index.docbook:2163(sect3/para) ++#: C/index.docbook:2165(sect3/para) + msgid "" + "gdm-stop stops GDM by sending the GDM daemon a TERM " + "signal." + msgstr "" + "gdm-stop para GDM enviando al demonio GDM una señal TERM." + +-#: C/index.docbook:2174(sect1/title) ++#: C/index.docbook:2176(sect1/title) + msgid "Troubleshooting" + msgstr "Resolución de problemas" + +-#: C/index.docbook:2182(sect1/para) ++#: C/index.docbook:2184(sect1/para) + msgid "" + "This section discusses helpful tips for getting GDM working. In general, if " + "you have a problem using GDM, you can submit a bug or send an email to the " +@@ -3365,7 +3379,7 @@ msgstr "" + "a la lista de correo. En la sección de introducción del documento se " + "proporciona información sobre esto." + +-#: C/index.docbook:2189(sect1/para) ++#: C/index.docbook:2191(sect1/para) + msgid "" + "If GDM is failing to work properly, it is always a good idea to include " + "debug information. To enable debugging, set the debug/Enable key to \"true\" " +@@ -3393,11 +3407,11 @@ msgstr "" + "(consulte la página man de syslog)." + +-#: C/index.docbook:2205(sect2/title) ++#: C/index.docbook:2207(sect2/title) + msgid "GDM Will Not Start" + msgstr "GDM no se inicia" + +-#: C/index.docbook:2207(sect2/para) ++#: C/index.docbook:2209(sect2/para) + msgid "" + "There are a many problems that can cause GDM to fail to start, but this " + "section will discuss a few common problems and how to approach tracking down " +@@ -3411,7 +3425,7 @@ msgstr "" + "de error o un diálogo cuando intenta iniciarse, pero puede ser difícil " + "seguir un problema cuando GDM falla de forma silenciosa." + +-#: C/index.docbook:2216(sect2/para) ++#: C/index.docbook:2218(sect2/para) + msgid "" + "First make sure that the Xserver is configured properly. The GDM " + "configuration file contains a command in the [server-Standard] section that " +@@ -3434,7 +3448,7 @@ msgstr "" + "de comandos. Si es así, modifique el comando del servidor X en el archivo de " + "configuración de GDM para que sea correcto para su sistema." + +-#: C/index.docbook:2229(sect2/para) ++#: C/index.docbook:2231(sect2/para) + msgid "" + "Also make sure that the /tmp directory has reasonable " + "ownership and permissions, and that the machine's file system is not full. " +@@ -3444,11 +3458,11 @@ msgstr "" + "propiedad razonables, y que el sistema de archivos de la máquina no está " + "lleno. Estos problemas harán que GDM falle al iniciar." + +-#: C/index.docbook:2240(sect1/title) ++#: C/index.docbook:2242(sect1/title) + msgid "License" + msgstr "Licencia" + +-#: C/index.docbook:2241(sect1/para) ++#: C/index.docbook:2243(sect1/para) + msgid "" + "This program is free software; you can redistribute it and/or modify it " + "under the terms of the " +@@ -3462,7 +3476,7 @@ msgstr "" + "publica por la Free Software Foundation; ya sea la versión 2 de la Licencia, " + "o (a su elección) cualquier versión posterior." + +-#: C/index.docbook:2249(sect1/para) ++#: C/index.docbook:2251(sect1/para) + msgid "" + "This program is distributed in the hope that it will be useful, but WITHOUT " + "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +@@ -3474,7 +3488,7 @@ msgstr "" + "IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública " + "General GNU para más detalles." + +-#: C/index.docbook:2263(para/address) ++#: C/index.docbook:2265(para/address) + #, no-wrap + msgid "" + "\n" +@@ -3491,7 +3505,7 @@ msgstr "" + " USA\n" + " " + +-#: C/index.docbook:2255(sect1/para) ++#: C/index.docbook:2257(sect1/para) + msgid "" + "A copy of the GNU General Public License is included " + "as an appendix to the GNOME Users Guide. You may also " +diff --git a/gui/libgdm/gdm-user-switching.c b/gui/libgdm/gdm-user-switching.c +index 507dd27..c4342f2 100644 +--- a/gui/libgdm/gdm-user-switching.c ++++ b/gui/libgdm/gdm-user-switching.c +@@ -475,11 +475,13 @@ get_login_window_session_id_for_systemd (const char *seat_id, + ret = TRUE; + + out: +- for (i = 0; sessions[i]; i ++) { +- free (sessions[i]); +- } ++ if (sessions) { ++ for (i = 0; sessions[i]; i ++) { ++ free (sessions[i]); ++ } + +- free (sessions); ++ free (sessions); ++ } + + return ret; + } +diff --git a/po/fur.po b/po/fur.po +index bb89eac..8ec4a14 100644 +--- a/po/fur.po ++++ b/po/fur.po +@@ -6,116 +6,121 @@ + msgid "" + msgstr "" + "Project-Id-Version: gdm2\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-03-11 13:14+0100\n" +-"PO-Revision-Date: 2008-03-08 15:53+0100\n" +-"Last-Translator: Massimo Furlani \n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" ++"product=gdm&keywords=I18N+L10N&component=general\n" ++"POT-Creation-Date: 2013-01-04 07:24+0000\n" ++"PO-Revision-Date: 2013-01-10 00:33+0100\n" ++"Last-Translator: Fabio Tomat \n" + "Language-Team: FRIULIAN \n" ++"Language: \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "X-Poedit-Language: Friulian\n" + "X-Poedit-Country: ITALY\n" + +-#: ../common/gdm-common.c:395 ++#: ../common/gdm-common.c:492 + #, c-format + msgid "/dev/urandom is not a character device" + msgstr "/dev/urandom nol è un caratar device" + +-#: ../daemon/factory-slave-main.c:156 ../daemon/product-slave-main.c:156 +-#: ../daemon/simple-slave-main.c:158 ../daemon/xdmcp-chooser-slave-main.c:156 +-msgid "Display ID" +-msgstr "Mostre ID" +- +-#: ../daemon/factory-slave-main.c:156 ../daemon/product-slave-main.c:156 +-#: ../daemon/simple-slave-main.c:158 ../daemon/xdmcp-chooser-slave-main.c:156 +-msgid "id" +-msgstr "id" +- +-#: ../daemon/factory-slave-main.c:168 ../daemon/product-slave-main.c:168 +-#: ../daemon/simple-slave-main.c:170 ../daemon/xdmcp-chooser-slave-main.c:168 +-msgid "GNOME Display Manager Slave" +-msgstr "" +- +-#: ../daemon/gdm-display-access-file.c:246 ++#: ../daemon/gdm-display-access-file.c:300 + #, c-format + msgid "could not find user \"%s\" on system" + msgstr "Impussibil cjatâ l'utent \"%s\" tal sisteme" + +-#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:172 +-msgid "Unable to initialize login system" +-msgstr "" +- +-#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:204 +-msgid "Unable to authenticate user" +-msgstr "Impussibil autenticâ l'utent" ++#: ../daemon/gdm-display.c:1320 ../daemon/gdm-display.c:1354 ++#, fuzzy, c-format ++#| msgid "no user account available" ++msgid "No session available yet" ++msgstr "nol è pussibil doprâ nissun account user" + +-#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:233 +-msgid "Unable to authorize user" ++#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 ++#, fuzzy, c-format ++#| msgid "Unable to authorize user" ++msgid "Unable to look up UID of user %s" + msgstr "Impussibil autorizâ l'utent" + +-#: ../daemon/gdm-factory-slave.c:281 +-msgid "Unable to establish credentials" +-msgstr "" ++#: ../daemon/gdm-manager.c:291 ++#, fuzzy ++#| msgid "no user account available" ++msgid "no sessions available" ++msgstr "nol è pussibil doprâ nissun account user" + +-#: ../daemon/gdm-factory-slave.c:650 ../daemon/gdm-product-slave.c:394 +-#: ../daemon/gdm-simple-slave.c:951 +-msgid "" +-"Could not start the X server (your graphical environment) due to some " +-"internal error. Please contact your system administrator or check your " +-"syslog to diagnose. In the meantime this display will be disabled. Please " +-"restart GDM when the problem is corrected." +-msgstr "" ++#: ../daemon/gdm-manager.c:352 ++#, c-format ++msgid "No sessions for %s available for reauthentication" ++msgstr "Nissune session di ri-autenticazion disponibil par %s" ++ ++#: ../daemon/gdm-manager.c:406 ++#, fuzzy, c-format ++#| msgid "unable to log session" ++msgid "Unable to find session for user %s" ++msgstr "impussibil loggasi ta session" + +-#: ../daemon/gdm-server.c:244 ++#: ../daemon/gdm-manager.c:476 ++#, c-format ++msgid "Unable to find appropriate session for user %s" ++msgstr "Impussibil cjatâ la session juste par l'utent %s" ++ ++#: ../daemon/gdm-manager.c:671 ++#, fuzzy ++#| msgid "User %s doesn't exist" ++msgid "User doesn't own session" ++msgstr "L'utent %s nol esist" ++ ++#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 ++#, fuzzy ++#| msgid "no user account available" ++msgid "No session available" ++msgstr "nol è pussibil doprâ nissun account user" ++ ++#: ../daemon/gdm-server.c:273 + #, c-format + msgid "%s: failed to connect to parent display '%s'" +-msgstr "" ++msgstr "%s: Falît tal conetisi al visôr pari '%s'" + +-#: ../daemon/gdm-server.c:362 ++#: ../daemon/gdm-server.c:452 + #, c-format + msgid "Server was to be spawned by user %s but that user doesn't exist" + msgstr "" ++"Il server al veve di sedi inviât dal'utent %s ma chest utent a no'l esist" + +-#: ../daemon/gdm-server.c:373 ../daemon/gdm-welcome-session.c:406 ++#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 + #, c-format + msgid "Couldn't set groupid to %d" +-msgstr "" ++msgstr "Impussibil impostâ il grupid a %d" + +-#: ../daemon/gdm-server.c:379 ../daemon/gdm-welcome-session.c:412 ++#: ../daemon/gdm-server.c:469 + #, c-format + msgid "initgroups () failed for %s" +-msgstr "" ++msgstr "initgroups () falît par %s" + +-#: ../daemon/gdm-server.c:385 ../daemon/gdm-welcome-session.c:418 ++#: ../daemon/gdm-server.c:475 + #, c-format + msgid "Couldn't set userid to %d" +-msgstr "" ++msgstr "No puès impostâ il ID utent a %d" + +-#: ../daemon/gdm-server.c:393 ../daemon/gdm-welcome-session.c:426 +-msgid "Couldn't set groupid to 0" +-msgstr "" +- +-#: ../daemon/gdm-server.c:428 ++#: ../daemon/gdm-server.c:522 + #, c-format +-msgid "%s: Could not open logfile for display %s!" +-msgstr "" ++msgid "%s: Could not open log file for display %s!" ++msgstr "%s: no puès vierzi il file çoc par il visôr %s!" + +-#: ../daemon/gdm-server.c:439 ../daemon/gdm-server.c:445 +-#: ../daemon/gdm-server.c:451 ++#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539 ++#: ../daemon/gdm-server.c:545 + #, c-format + msgid "%s: Error setting %s to %s" +-msgstr "" ++msgstr "%s: Erôr configurant %s a %s" + +-#: ../daemon/gdm-server.c:466 ++#: ../daemon/gdm-server.c:565 + #, c-format + msgid "%s: Server priority couldn't be set to %d: %s" +-msgstr "" ++msgstr "%s: La prioritât dal server a no puès sedi impostade a %d: %s" + +-#: ../daemon/gdm-server.c:618 ++#: ../daemon/gdm-server.c:722 + #, c-format + msgid "%s: Empty server command for display %s" +-msgstr "" ++msgstr "%s: Al mancje il comant dal server par il visôr %s" + + #: ../daemon/gdm-session-auditor.c:90 + #, fuzzy +@@ -129,11 +134,11 @@ msgstr "Non utent:" + + #: ../daemon/gdm-session-auditor.c:95 + msgid "Hostname" +-msgstr "" ++msgstr "Non Host" + + #: ../daemon/gdm-session-auditor.c:96 + msgid "The hostname" +-msgstr "" ++msgstr "Il non dal Host" + + #: ../daemon/gdm-session-auditor.c:101 + #, fuzzy +@@ -142,921 +147,834 @@ msgstr "Mostre ID" + + #: ../daemon/gdm-session-auditor.c:102 + msgid "The display device" +-msgstr "" ++msgstr "L'argagn dal visôr" + +-#: ../daemon/gdm-session-direct.c:1446 ../daemon/gdm-session-direct.c:1464 +-#, c-format +-msgid "worker exited with status %d" +-msgstr "" ++#: ../daemon/gdm-session.c:1183 ++msgid "Could not create authentication helper process" ++msgstr "Impussibil creâ il procès di jutori par l'autenticazion" + +-#: ../daemon/gdm-session-worker.c:954 ++#: ../daemon/gdm-session-worker.c:1029 + #, c-format + msgid "error initiating conversation with authentication system - %s" +-msgstr "" ++msgstr "Erôr tal tacâ la conversazion cul sisteme di autenticazion: %s" + +-#: ../daemon/gdm-session-worker.c:955 ++#: ../daemon/gdm-session-worker.c:1030 + msgid "general failure" + msgstr "erôr gjenerâl" + +-#: ../daemon/gdm-session-worker.c:956 ++#: ../daemon/gdm-session-worker.c:1031 + msgid "out of memory" + msgstr "fûr da memorie" + +-#: ../daemon/gdm-session-worker.c:957 ++#: ../daemon/gdm-session-worker.c:1032 + msgid "application programmer error" +-msgstr "" ++msgstr "erôr dal programatôr" + +-#: ../daemon/gdm-session-worker.c:958 ++#: ../daemon/gdm-session-worker.c:1033 + msgid "unknown error" +-msgstr "" ++msgstr "Erôr no cognossût" + +-#: ../daemon/gdm-session-worker.c:965 ++#: ../daemon/gdm-session-worker.c:1040 + msgid "Username:" + msgstr "Non utent:" + +-#: ../daemon/gdm-session-worker.c:971 +-#, c-format +-msgid "error informing authentication system of preferred username prompt - %s" +-msgstr "" +- +-#: ../daemon/gdm-session-worker.c:985 +-#, c-format +-msgid "error informing authentication system of user's hostname - %s" +-msgstr "" +- +-#: ../daemon/gdm-session-worker.c:1000 +-#, c-format +-msgid "error informing authentication system of user's console - %s" +-msgstr "" +- +-#: ../daemon/gdm-session-worker.c:1163 ++#: ../daemon/gdm-session-worker.c:1046 + #, c-format +-msgid "no user account available" +-msgstr "nol è pussibil doprâ nissun account user" +- +-#: ../daemon/gdm-session-worker.c:1212 +-#, c-format +-msgid "user account not available on system" +-msgstr "" +- +-#: ../daemon/gdm-simple-slave.c:323 +-msgid "Unable establish credentials" +-msgstr "" +- +-#: ../daemon/gdm-welcome-session.c:388 +-#, c-format +-msgid "User %s doesn't exist" +-msgstr "L'utent %s nol esist" +- +-#: ../daemon/gdm-welcome-session.c:395 +-#, c-format +-msgid "Group %s doesn't exist" +-msgstr "Il grop %s nol esist" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:590 +-msgid "Could not create socket!" +-msgstr "" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:856 +-#, c-format +-msgid "Denied XDMCP query from host %s" +-msgstr "" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1013 +-#: ../daemon/gdm-xdmcp-display-factory.c:1234 +-msgid "Could not extract authlist from packet" +-msgstr "" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1026 +-#: ../daemon/gdm-xdmcp-display-factory.c:1249 +-msgid "Error in checksum" +-msgstr "Erôr tal checksum" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1500 +-msgid "Bad address" +-msgstr "Indiriz sbagliât" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1581 +-#, c-format +-msgid "%s: Could not read display address" +-msgstr "" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1589 +-#, c-format +-msgid "%s: Could not read display port number" +-msgstr "" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1598 +-#, c-format +-msgid "%s: Could not extract authlist from packet" +-msgstr "" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1618 +-#, c-format +-msgid "%s: Error in checksum" +-msgstr "%s: Erôr tal checksum" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2120 +-#, c-format +-msgid "%s: Got REQUEST from banned host %s" +-msgstr "" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2130 +-#: ../daemon/gdm-xdmcp-display-factory.c:2485 +-#: ../daemon/gdm-xdmcp-display-factory.c:2737 +-#, c-format +-msgid "%s: Could not read Display Number" +-msgstr "" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2137 +-#, c-format +-msgid "%s: Could not read Connection Type" ++msgid "error informing authentication system of preferred username prompt: %s" + msgstr "" ++"erôr tal informâ il sisteme di autenticazion cuâl ch'al è il prompt preferît " ++"dal'utent: %s" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2144 ++#: ../daemon/gdm-session-worker.c:1060 + #, c-format +-msgid "%s: Could not read Client Address" ++msgid "error informing authentication system of user's hostname: %s" + msgstr "" ++"erôr tal informâ il sisteme di autenticazion cuâl ch'al è il non dal host " ++"dal'utent: %s" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2152 ++#: ../daemon/gdm-session-worker.c:1077 + #, c-format +-msgid "%s: Could not read Authentication Names" ++msgid "error informing authentication system of user's console: %s" + msgstr "" ++"erôr tal informâ il sisteme di autenticazion cuale che jè la console " ++"dal'utent: %s" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2161 ++#: ../daemon/gdm-session-worker.c:1101 + #, c-format +-msgid "%s: Could not read Authentication Data" ++msgid "error informing authentication system of display string: %s" + msgstr "" ++"erôr tal informâ il sisteme di autenticazion cuale che jè la stringe dal " ++"visôr: %s" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2171 ++#: ../daemon/gdm-session-worker.c:1116 + #, c-format +-msgid "%s: Could not read Authorization List" ++msgid "error informing authentication system of display xauth credentials: %s" + msgstr "" ++"erôr tal informâ il sisteme di autenticazion cualis che son lis credenziâls " ++"xauth dal visôr: %s" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2190 ++#: ../daemon/gdm-session-worker.c:1454 ../daemon/gdm-session-worker.c:1471 + #, c-format +-msgid "%s: Could not read Manufacturer ID" +-msgstr "" ++msgid "no user account available" ++msgstr "nol è pussibil doprâ nissun account user" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2217 +-#, c-format +-msgid "%s: Failed checksum from %s" +-msgstr "" ++#: ../daemon/gdm-session-worker.c:1498 ++#, fuzzy ++#| msgid "Unable to authorize user" ++msgid "Unable to change to user" ++msgstr "Impussibil autorizâ l'utent" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2469 +-#, c-format +-msgid "%s: Got Manage from banned host %s" ++#: ../daemon/gdm-simple-slave.c:1426 ++msgid "" ++"Could not start the X server (your graphical environment) due to an internal " ++"error. Please contact your system administrator or check your syslog to " ++"diagnose. In the meantime this display will be disabled. Please restart GDM " ++"when the problem is corrected." + msgstr "" ++"Impussibil fâ partî il server X (l'ambient grafic) par cause di un erôr " ++"interni. Par plasê scrîf al to aministradôr di sisteme o controle il " ++"regjistri di sisteme (çoc di sisteme - syslog) par capî il probleme: pal " ++"moment il visôr al vignarà disabilitât. Une volte justât il probleme, " ++"reinvie GDM." + +-#: ../daemon/gdm-xdmcp-display-factory.c:2478 +-#: ../daemon/gdm-xdmcp-display-factory.c:2744 ++#: ../daemon/gdm-simple-slave.c:1467 + #, c-format +-msgid "%s: Could not read Session ID" +-msgstr "" ++msgid "Can only be called before user is logged in" ++msgstr "Al puès sedi clamât nome prime che l'utent al vedi fat l'acès." + +-#: ../daemon/gdm-xdmcp-display-factory.c:2492 ++#: ../daemon/gdm-simple-slave.c:1477 + #, c-format +-msgid "%s: Could not read Display Class" +-msgstr "" ++msgid "Caller not GDM" ++msgstr "Clamadôr no GDM" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2597 +-#: ../daemon/gdm-xdmcp-display-factory.c:2647 +-#: ../daemon/gdm-xdmcp-display-factory.c:2653 +-#, c-format +-msgid "%s: Could not read address" +-msgstr "" ++#: ../daemon/gdm-simple-slave.c:1530 ++msgid "User not logged in" ++msgstr "L'utent no'l à eseguît l'acès" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2727 ++#: ../daemon/gdm-xdmcp-chooser-slave.c:370 + #, c-format +-msgid "%s: Got KEEPALIVE from banned host %s" +-msgstr "" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2816 +-msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" +-msgstr "GdmXdmcpDisplayFactory: No si rive a lei l'header di XDMCP!" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2822 +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +-msgid "XMDCP: Incorrect XDMCP version!" +-msgstr "XMDCP: la version di XDMCP so je chê juste!" ++msgid "Currently, only one client can be connected at once" ++msgstr "Par cumò nome un client ae volte al puès sedi tacât" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2828 +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +-msgid "XMDCP: Unable to parse address" +-msgstr "" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:3226 +-#, c-format +-msgid "Could not get server hostname: %s!" +-msgstr "" ++#: ../daemon/gdm-xdmcp-display-factory.c:604 ++msgid "Could not create socket!" ++msgstr "No puès creâ socket!" + +-#: ../daemon/main.c:230 ../daemon/main.c:243 ++#: ../daemon/main.c:126 ../daemon/main.c:139 + #, c-format +-msgid "Cannot write PID file %s: possibly out of diskspace: %s" +-msgstr "" ++msgid "Cannot write PID file %s: possibly out of disk space: %s" ++msgstr "No puès scrivi il file PID %s: forsit al è finît il spazi su disc: %s" + +-#: ../daemon/main.c:263 ++#: ../daemon/main.c:166 + #, c-format + msgid "Logdir %s does not exist or isn't a directory." + msgstr "Logdir %s no esist opûr no je une directory." + +-#: ../daemon/main.c:276 ++#: ../daemon/main.c:183 + #, c-format + msgid "Authdir %s does not exist. Aborting." + msgstr "Authdir %s nol esist. O voi fûr." + +-#: ../daemon/main.c:280 ++#: ../daemon/main.c:187 + #, c-format + msgid "Authdir %s is not a directory. Aborting." + msgstr "Authdir %s no je une directory. O voi fûr." + +-#: ../daemon/main.c:354 ++#: ../daemon/main.c:261 + #, c-format + msgid "Authdir %s is not owned by user %d, group %d. Aborting." +-msgstr "" ++msgstr "Authdir %s a no jè di proprietât dal'utent %d, grup %d. O voi fûr." + +-#: ../daemon/main.c:361 ++#: ../daemon/main.c:268 + #, c-format + msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." +-msgstr "" ++msgstr "Authdir %s a ja permès sbagliâts %o. A varessin di sedi %o. O voi fûr." + +-#: ../daemon/main.c:398 ++#: ../daemon/main.c:305 + #, c-format + msgid "Can't find the GDM user '%s'. Aborting!" + msgstr "No rivi a cjatâ l'utent '%s' di GDM. O voi fûr!" + +-#: ../daemon/main.c:404 ++#: ../daemon/main.c:311 + msgid "The GDM user should not be root. Aborting!" + msgstr "L'user di GDM nol scugne jessi root. O voi fûr!" + +-#: ../daemon/main.c:410 ++#: ../daemon/main.c:317 + #, c-format + msgid "Can't find the GDM group '%s'. Aborting!" + msgstr "No rivi a cjatâ il grop '%s' di GDM. O voi fûr!" + +-#: ../daemon/main.c:416 ++#: ../daemon/main.c:323 + msgid "The GDM group should not be root. Aborting!" + msgstr "Il grop di GDM nol scugne jessi root. O voi fûr!" + +-#: ../daemon/main.c:510 +-msgid "Enable debugging code" +-msgstr "" +- +-#: ../daemon/main.c:511 ++#: ../daemon/main.c:434 + msgid "Make all warnings fatal" +-msgstr "" ++msgstr "Fâs diventâ dutis lis avertencis fatai." + +-#: ../daemon/main.c:512 +-msgid "Exit after a time - for debugging" +-msgstr "" ++#: ../daemon/main.c:435 ++msgid "Exit after a time (for debugging)" ++msgstr "Jes dopo un pôc (par il debug)" + +-#: ../daemon/main.c:513 ++#: ../daemon/main.c:436 + msgid "Print GDM version" + msgstr "Stampe la version di GDM" + +-#: ../daemon/main.c:528 ++#: ../daemon/main.c:449 + msgid "GNOME Display Manager" + msgstr "GNOME Display Manager" + + #. make sure the pid file doesn't get wiped +-#: ../daemon/main.c:589 +-msgid "Only root wants to run GDM" ++#: ../daemon/main.c:503 ++#, fuzzy ++#| msgid "Only root wants to run GDM" ++msgid "Only the root user can run GDM" + msgstr "Dome root al pos inviâ GDM" + +-#: ../daemon/session-worker-main.c:134 ++#. Translators: worker is a helper process that does the work ++#. of starting up a session ++#: ../daemon/session-worker-main.c:150 + msgid "GNOME Display Manager Session Worker" +-msgstr "" ++msgstr "Cjamadôr di session dal Gjestôr di visôr di GNOME" + +-#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +-msgid "Select System" +-msgstr "" ++#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 ++msgid "Display ID" ++msgstr "Mostre ID" + +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:214 +-msgid "XMCP: Could not create XDMCP buffer!" +-msgstr "" ++#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 ++msgid "ID" ++msgstr "ID" + +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +-msgid "XDMCP: Could not read XDMCP header!" +-msgstr "" ++#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 ++msgid "GNOME Display Manager Slave" ++msgstr "Sclâf dal gjestôr di visôr di GNOME" + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.c:808 +-msgid "Accessibility Preferences" +-msgstr "" ++#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1 ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566 ++msgid "Login Window" ++msgstr "Barcon di acès" + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:1 +-msgid "Enable features that make your computer easier to use:" +-msgstr "" ++#: ../data/applications/gnome-mag.desktop.in.h:1 ++msgid "GNOME Screen Magnifier" ++msgstr "Lint di ingrandiment dal visôr GNOME" + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:2 +-msgid "Assistive Technology Preferences" +-msgstr "" ++#: ../data/applications/gnome-mag.desktop.in.h:2 ++msgid "Magnify parts of the screen" ++msgstr "Ingrandìs zonis dal visôr" + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:3 +-msgid "_Hear text read aloud (Reader)" +-msgstr "" ++#: ../data/applications/gnome-shell.desktop.in.h:1 ++msgid "GNOME Shell" ++msgstr "GNOME Shell" + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:4 +-msgid "_Ignore duplicate keypresses (Bounce Keys)" +-msgstr "" ++#: ../data/applications/gnome-shell.desktop.in.h:2 ++msgid "Window management and compositing" ++msgstr "Ministre e cumbine i barcons" + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:5 +-msgid "_Make items larger (Magnifier)" +-msgstr "" ++#: ../data/applications/gok.desktop.in.h:1 ++msgid "GNOME On-Screen Keyboard" ++msgstr "Tastiere a visôr di GNOME" + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:6 +-msgid "_Only accept long held keypresses (Slow Keys)" +-msgstr "" ++#: ../data/applications/gok.desktop.in.h:2 ++msgid "Use an on-screen keyboard" ++msgstr "Dopre une tastiere a visôr" + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:7 +-msgid "_Press keyboard shortcuts one key at a time (Sticky Keys)" +-msgstr "" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:1 ++msgid "Whether or not to allow fingerprint readers for login" ++msgstr "Specifiche se permeti o no l'acès cun i letôrs di improntis digitai" + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:8 +-msgid "_See more contrast in colors (High Contrast)" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 ++msgid "" ++"The login screen can optionally allow users who have enrolled their " ++"fingerprints to log in using those prints." + msgstr "" ++"La schermade di acès a puès permeti, ai utents che a j an regjistrât lis " ++"improntis, di dopralis par eseguî l'acès." + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:9 +-msgid "_Type without the keyboard (On-screen Keyboard)" +-msgstr "" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:3 ++msgid "Whether or not to allow smartcard readers for login" ++msgstr "Specifiche se permeti o no l'acès cun i letôrs di smartcard" + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:10 +-msgid "_Use a larger font size (Large Print)" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 ++msgid "" ++"The login screen can optionally allow users who have smartcards to log in " ++"using those smartcards." + msgstr "" ++"La schermade di acès a puès permeti, ai utents che a j an une smartcard, di " ++"doprale par eseguî l'acès." + +-#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:11 +-#, fuzzy +-msgid "gtk-close" +-msgstr "gtk-cancel" +- +-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:220 +-msgid "Value" +-msgstr "" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:5 ++msgid "Path to small image at top of user list" ++msgstr "Percors di une piçule figure insomp a le liste dai utents" + +-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:221 +-msgid "percentage of time complete" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 ++msgid "" ++"The login screen can optionally show a small image at the top of its user " ++"list to provide site administrators and distributions a way to provide " ++"branding." + msgstr "" ++"La schermade di acès a puès permeti di viodi une piçule figure insomp a le " ++"liste dai utents par dâ ai ministradôrs e âs distribuzions un mût par aplicâ " ++"il lôr brand." + +-#: ../gui/simple-greeter/gdm-chooser-widget.c:1156 +-msgid "Inactive Text" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 ++msgid "" ++"The fallback login screen can optionally show a small image at the top of " ++"its user list to provide site administrators and distributions a way to " ++"provide branding." + msgstr "" ++"La schermade di login di rapeç a puès permeti di viodi une piçule figure " ++"insomp a le liste dai utents par dâ ai ministradôrs e âs distribuzions un " ++"mût par aplicâ il lôr brand." + +-#: ../gui/simple-greeter/gdm-chooser-widget.c:1157 +-msgid "The text to use in the label if the user hasn't picked an item yet" +-msgstr "" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:8 ++msgid "Avoid showing user list" ++msgstr "Evite di mostrâ la liste dai utents" + +-#: ../gui/simple-greeter/gdm-chooser-widget.c:1165 +-msgid "Active Text" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 ++msgid "" ++"The login screen normally shows a list of available users to log in as. This " ++"setting can be toggled to disable showing the user list." + msgstr "" ++"La schermade di acès di norme a mostre une liste dai utents disponibii par " ++"eseguî l'acès. Cheste impostazion a puès sedi cambiade par no mostrâ la " ++"liste dai utents." + +-#: ../gui/simple-greeter/gdm-chooser-widget.c:1166 +-msgid "The text to use in the label if the user has picked an item" +-msgstr "" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:10 ++msgid "Enable showing the banner message" ++msgstr "Abilite la vision de insegne" + +-#: ../gui/simple-greeter/gdm-clock-widget.c:66 +-msgid "%l:%M:%S %p" +-msgstr "%l:%M:%S %p" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:11 ++msgid "Set to true to show the banner message text." ++msgstr "Imposte a VÊR par viodi il test de insegne." + +-#: ../gui/simple-greeter/gdm-clock-widget.c:66 +-msgid "%l:%M %p" +-msgstr "%l:%M %p" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:12 ++msgid "Banner message text" ++msgstr "Test de insegne" + +-#. translators: replace %e with %d if, when the day of the +-#. * month as a decimal number is a single digit, it +-#. * should begin with a 0 in your locale (e.g. "May +-#. * 01" instead of "May 1"). +-#. +-#: ../gui/simple-greeter/gdm-clock-widget.c:72 +-msgid "%a %b %e" +-msgstr "%a %b %e" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:13 ++msgid "Text banner message to show in the login window." ++msgstr "Test de insegne di mostrâ in tal barcon di acès." + +-#. translators: reverse the order of these arguments +-#. * if the time should come before the +-#. * date on a clock in your locale. +-#. +-#: ../gui/simple-greeter/gdm-clock-widget.c:77 +-#, c-format +-msgid "%1$s, %2$s" +-msgstr "%1$s, %2$s" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:14 ++msgid "Disable showing the restart buttons" ++msgstr "Tapone il pipul di reinviament" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:174 +-msgid "You have the Caps Lock key on." ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:15 ++msgid "Set to true to disable showing the restart buttons in the login window." + msgstr "" ++"Imposte a VÊR par taponâ il pipul di reinviament in tal barcon di acès." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:278 +-msgid "Automatically logging in..." +-msgstr "" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 ++msgid "Number of allowed authentication failures" ++msgstr "Numar massim di faliments di autenticazion" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1121 +-msgid "Select language and click Log In" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 ++msgid "" ++"The number of times a user is allowed to attempt authentication, before " ++"giving up and going back to user selection." + msgstr "" ++"Il numar di voltis che un utent al puès cirî di autenticasi, prime di " ++"rindisi e tornâ ae selezion dal'utent." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1715 +-msgid "Login Window" +-msgstr "" ++#: ../gui/libgdm/gdm-user-switching.c:72 ++msgid "Unable to create transient display: " ++msgstr "Impussibil creâ il visôr transitori:" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:1 +-msgid "Authentication Dialog" +-msgstr "Dialogo di autenticazion" ++#: ../gui/libgdm/gdm-user-switching.c:183 ++#: ../gui/libgdm/gdm-user-switching.c:395 ++#, fuzzy ++#| msgid "unable to log session" ++msgid "Unable to activate session: " ++msgstr "impussibil loggasi ta session" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:2 +-msgid "Computer Name" +-msgstr "Nom dal computer" ++#: ../gui/libgdm/gdm-user-switching.c:344 ++#: ../gui/libgdm/gdm-user-switching.c:514 ++#, c-format ++msgid "Could not identify the current session." ++msgstr "Impussibil identificâ la session atuâl." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:3 +-msgid "Log In" +-msgstr "Log In" ++#: ../gui/libgdm/gdm-user-switching.c:351 ++#, fuzzy, c-format ++#| msgid "unable to log session" ++msgid "User unable to switch sessions." ++msgstr "impussibil loggasi ta session" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:4 +-msgid "Restart" +-msgstr "Torne a inviâ" ++#: ../gui/libgdm/gdm-user-switching.c:523 ++#, c-format ++msgid "Could not identify the current seat." ++msgstr "Impussibil identificâ la postazion atuâl." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:5 +-msgid "Shut Down" +-msgstr "Stude" ++#: ../gui/libgdm/gdm-user-switching.c:533 ++#, c-format ++msgid "" ++"The system is unable to determine whether to switch to an existing login " ++"screen or start up a new login screen." ++msgstr "" ++"Il sisteme nol rive a capî se passâ a une schermadi di acès esistent o creâ " ++"une gnove." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:6 +-msgid "Suspend" +-msgstr "Sospent" ++#: ../gui/libgdm/gdm-user-switching.c:541 ++#, c-format ++msgid "The system is unable to start up a new login screen." ++msgstr "Il sisteme a nol rive a fâ partî une gnove schermade di acès." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:7 +-msgid "Version" +-msgstr "Version" ++#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 ++msgid "Select System" ++msgstr "Selezione sisteme" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:8 ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 + #, fuzzy +-msgid "gtk-disconnect" +-msgstr "Disconet" ++#| msgid "XMDCP: Incorrect XDMCP version!" ++msgid "XDMCP: Could not create XDMCP buffer!" ++msgstr "XMDCP: la version di XDMCP so je chê juste!" ++ ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 ++msgid "XDMCP: Could not read XDMCP header!" ++msgstr "XDMCP: Impussibil lei l'intestazion XDMCP." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:9 +-msgid "page 5" +-msgstr "pagjine 5" ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 ++msgid "XMDCP: Incorrect XDMCP version!" ++msgstr "XMDCP: la version di XDMCP so je chê juste!" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:503 +-msgid "Panel" ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 ++msgid "XMDCP: Unable to parse address" + msgstr "" + +-#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:153 +-#, fuzzy +-msgid "Languages" +-msgstr "Manager" ++#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 ++msgid "Fingerprint Authentication" ++msgstr "Autenticazion cun impronte digitâl" + +-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:187 +-msgid "_Languages:" +-msgstr "" ++#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 ++msgid "Log into session with fingerprint" ++msgstr "Acedi al sisteme cun il letôr di improntis" + +-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:188 +-#: ../gui/simple-greeter/gdm-language-option-widget.c:212 +-msgid "_Language:" +-msgstr "" ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 ++#, fuzzy ++#| msgid "Authentication Dialog" ++msgid "Password Authentication" ++msgstr "Dialogo di autenticazion" + +-#: ../gui/simple-greeter/gdm-language-option-widget.c:180 +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:80 +-#: ../gui/user-switch-applet/applet.c:1139 +-msgid "Other..." +-msgstr "Altri..." ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 ++msgid "Log into session with username and password" ++msgstr "Acedi al sisteme cun non utent e password" + +-#: ../gui/simple-greeter/gdm-language-option-widget.c:181 +-msgid "Choose a language from the full list of available languages." +-msgstr "" ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 ++msgid "Log In" ++msgstr "Acès" + +-#: ../gui/simple-greeter/gdm-option-widget.c:476 +-msgid "Label Text" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 ++msgid "Slot ID" ++msgstr "ID dal slot" + +-#: ../gui/simple-greeter/gdm-option-widget.c:477 +-msgid "The text to use as a label" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 ++msgid "The slot the card is in" ++msgstr "Il slot dulà che a jè inseride la cjarte" + +-#: ../gui/simple-greeter/gdm-option-widget.c:484 +-msgid "Icon name" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 ++msgid "Slot Series" ++msgstr "Serie dal slot" + +-#: ../gui/simple-greeter/gdm-option-widget.c:485 +-msgid "The icon to use with the label" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 ++msgid "per-slot card identifier" ++msgstr "identificatôr de cjarte par slot" + +-#: ../gui/simple-greeter/gdm-option-widget.c:493 +-msgid "Default Item" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 ++#, fuzzy ++msgid "name" ++msgstr "Non utent:" + +-#: ../gui/simple-greeter/gdm-option-widget.c:494 +-msgid "The id of the default item" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 ++msgid "Module" ++msgstr "Modul" + +-#: ../gui/simple-greeter/gdm-recent-option-widget.c:298 +-msgid "Max Item Count" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 ++msgid "smartcard driver" ++msgstr "driver smartcard" + +-#: ../gui/simple-greeter/gdm-recent-option-widget.c:299 +-msgid "The maximum number of items to keep around in the list" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 ++#, fuzzy ++#| msgid "Authentication Dialog" ++msgid "Smartcard Authentication" ++msgstr "Dialogo di autenticazion" + +-#: ../gui/simple-greeter/gdm-remote-login-window.c:243 +-#, c-format +-msgid "Remote Login (Connecting to %s...)" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 ++msgid "Log into session with smartcard" ++msgstr "Acedi al sisteme cun la smartcard" + +-#: ../gui/simple-greeter/gdm-remote-login-window.c:257 +-#, c-format +-msgid "Remote Login (Connected to %s)" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 ++msgid "Module Path" ++msgstr "Percors dal modul" + +-#: ../gui/simple-greeter/gdm-remote-login-window.c:336 +-msgid "Remote Login" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 ++msgid "path to smartcard PKCS #11 driver" ++msgstr "percors dal driver de smartcard PKCS #11" + +-#: ../gui/simple-greeter/gdm-session-option-widget.c:162 +-msgid "_Sessions:" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 ++#, fuzzy ++msgid "received error or hang up from event source" ++msgstr "ricevût erôr o siaradure de sorgint dal'event" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 +-msgid "Banner message text" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 ++#, fuzzy, c-format ++msgid "NSS security system could not be initialized" ++msgstr "il sisteme di sigurece NSS nol puès sedi fat partî" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 +-msgid "Disable showing the accessibility button" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 ++#, c-format ++msgid "no suitable smartcard driver could be found" ++msgstr "nol è stât cjatât nissun driver util pe smartcard" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3 +-msgid "Disable showing the restart buttons" +-msgstr "" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 ++#, c-format ++msgid "smartcard driver '%s' could not be loaded" ++msgstr "il driver de smartcard '%s' a nol puès sedi cjamât" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 +-msgid "Enable accessibility keyboard plugin" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 ++#, c-format ++msgid "could not watch for incoming card events - %s" + msgstr "" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 +-msgid "Enable on-screen keyboard" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 ++#, c-format ++msgid "encountered unexpected error while waiting for smartcard events" + msgstr "" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 +-msgid "Enable screen magnifier" +-msgstr "" ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 ++#, fuzzy ++#| msgid "Authentication Dialog" ++msgid "Authentication" ++msgstr "Dialogo di autenticazion" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 +-msgid "Enable screen reader" +-msgstr "" ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 ++msgid "Log into session" ++msgstr "Acedi al sisteme" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 +-msgid "Enable showing the banner message" +-msgstr "" ++#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 ++msgid "Value" ++msgstr "Valôr" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 +-msgid "Icon name to use for greeter logo" +-msgstr "" ++#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 ++msgid "percentage of time complete" ++msgstr "Percentuâl di timp completade" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 +-msgid "" +-"Set to TRUE to disable showing the accessibility button in the login window." +-msgstr "" ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 ++msgid "Inactive Text" ++msgstr "Test inatîf" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 +-msgid "Set to TRUE to disable showing the restart buttons in the login window." ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 ++msgid "The text to use in the label if the user hasn't picked an item yet" + msgstr "" ++"Test di doprâ in te etichete se l'utent nol à ancjemò sielzût un element" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +-msgid "Set to True to enable the background settings manager plugin." +-msgstr "" ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 ++msgid "Active Text" ++msgstr "Test atîf" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 +-msgid "Set to True to enable the on-screen keyboard." +-msgstr "" ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 ++msgid "The text to use in the label if the user has picked an item" ++msgstr "Test di doprâ in te etichete se l'utent al à sielzût un element" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +-msgid "" +-"Set to True to enable the plugin to manage the accessibility keyboard " +-"settings." +-msgstr "" ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 ++msgid "List Visible" ++msgstr "Liste visibile" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +-msgid "Set to True to enable the screen magnifier." +-msgstr "" ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 ++msgid "Whether the chooser list is visible" ++msgstr "Indiche se la liste dal seletôr a jè visibile" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +-msgid "Set to True to enable the screen reader." +-msgstr "" ++#. translators: This is the time format to use when both ++#. * the date and time with seconds are being shown together. ++#. ++#: ../gui/simple-greeter/gdm-clock-widget.c:70 ++#, fuzzy ++#| msgid "%l:%M:%S %p" ++msgid "%a %b %e, %l:%M:%S %p" ++msgstr "%l:%M:%S %p" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +-msgid "Set to True to enable the xsettings settings manager plugin." +-msgstr "" ++#. translators: This is the time format to use when both ++#. * the date and time without seconds are being shown together. ++#. ++#: ../gui/simple-greeter/gdm-clock-widget.c:76 ++#, fuzzy ++#| msgid "%l:%M %p" ++msgid "%a %b %e, %l:%M %p" ++msgstr "%l:%M %p" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +-msgid "Set to the themed icon name to use for the greeter logo." +-msgstr "" ++#. translators: This is the time format to use when there is ++#. * no date, just weekday and time with seconds. ++#. ++#: ../gui/simple-greeter/gdm-clock-widget.c:83 ++#, fuzzy ++#| msgid "%l:%M:%S %p" ++msgid "%a %l:%M:%S %p" ++msgstr "%l:%M:%S %p" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +-msgid "Set to true to show the banner message text." +-msgstr "" ++#. translators: This is the time format to use when there is ++#. * no date, just weekday and time without seconds. ++#. ++#: ../gui/simple-greeter/gdm-clock-widget.c:92 ++#, fuzzy ++#| msgid "%l:%M %p" ++msgid "%a %l:%M %p" ++msgstr "%l:%M %p" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +-msgid "Text banner message to show on the login window." +-msgstr "" ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:314 ++msgid "Automatically logging in…" ++msgstr "Acès automatic..." + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +-msgid "True if the background settings manager plugin is enabled." +-msgstr "" ++#. need to wait for response from backend ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:930 ++msgid "Cancelling…" ++msgstr "Anulament..." + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +-msgid "True if the xsettings settings manager plugin is enabled." +-msgstr "" ++#. just wait for the user to select language and stuff ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 ++msgid "Select language and click Log In" ++msgstr "Selezione la lenghe e sclice Acêt" + +-#: ../gui/simple-greeter/gdm-user.c:239 +-msgid "Manager" +-msgstr "Manager" ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 ++msgctxt "customsession" ++msgid "Custom" ++msgstr "Personalizade" + +-#: ../gui/simple-greeter/gdm-user.c:240 +-msgid "The user manager object this user is controlled by." +-msgstr "" ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623 ++#, fuzzy ++#| msgid "unable to log session" ++msgid "Custom session" ++msgstr "impussibil loggasi ta session" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:81 +-msgid "Choose a different account" +-msgstr "Sielz un account diferent" ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 ++msgid "Computer Name" ++msgstr "Non dal computer" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:93 +-msgid "Guest" +-msgstr "Ospit" ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 ++msgid "Version" ++msgstr "Version" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:94 +-msgid "Login as a temporary guest" +-msgstr "" ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 ++msgid "Cancel" ++msgstr "Anule" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:106 +-msgid "Automatic Login" +-msgstr "" ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 ++msgid "Unlock" ++msgstr "Sbloche" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:107 +-msgid "Automatically login to the system after selecting options" +-msgstr "" ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 ++msgid "Login" ++msgstr "Acès" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:403 +-#, c-format +-msgid "Log in as %s" +-msgstr "" ++#: ../gui/simple-greeter/gdm-greeter-panel.c:953 ++msgid "Suspend" ++msgstr "Sospent" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:487 +-msgid "Currently logged in" +-msgstr "" ++#: ../gui/simple-greeter/gdm-greeter-panel.c:958 ++msgid "Restart" ++msgstr "Torne a inviâ" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:531 +-#, fuzzy +-msgid "_Users:" +-msgstr "Non utent:" ++#: ../gui/simple-greeter/gdm-greeter-panel.c:962 ++msgid "Shut Down" ++msgstr "Stude" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:532 +-#, fuzzy +-msgid "_User:" +-msgstr "Non utent:" ++#: ../gui/simple-greeter/gdm-greeter-panel.c:1011 ++msgid "Unknown time remaining" ++msgstr "Timp mancjant no cognossût" + +-#: ../gui/user-switch-applet/applet.c:121 +-msgid "Missing Required File" +-msgstr "" ++#: ../gui/simple-greeter/gdm-greeter-panel.c:1033 ++msgid "Panel" ++msgstr "Panel" + +-#: ../gui/user-switch-applet/applet.c:123 +-#, c-format +-msgid "" +-"The User Selector's interfaces file, `%s', could not be opened. It is likely " +-"that this application was not properly installed or configured." +-msgstr "" ++#: ../gui/simple-greeter/gdm-option-widget.c:505 ++msgid "Label Text" ++msgstr "Test etichete" + +-#: ../gui/user-switch-applet/applet.c:184 +-msgid "" +-"The User Switch Applet is free software; you can redistribute it and/or " +-"modify it under the terms of the GNU General Public License as published by " +-"the Free Software Foundation; either version 2 of the License, or (at your " +-"option) any later version." +-msgstr "" ++#: ../gui/simple-greeter/gdm-option-widget.c:506 ++msgid "The text to use as a label" ++msgstr "Il test di doprâ come etichete" + +-#: ../gui/user-switch-applet/applet.c:188 +-msgid "" +-"This program is distributed in the hope that it will be useful, but WITHOUT " +-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " +-"more details." +-msgstr "" ++#: ../gui/simple-greeter/gdm-option-widget.c:513 ++msgid "Icon name" ++msgstr "Non icone" + +-#: ../gui/user-switch-applet/applet.c:192 +-msgid "" +-"You should have received a copy of the GNU General Public License along with " +-"this program; if not, write to the Free Software Foundation, Inc., 51 " +-"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " +-msgstr "" ++#: ../gui/simple-greeter/gdm-option-widget.c:514 ++msgid "The icon to use with the label" ++msgstr "L'icone di doprâ cun l'etichete" + +-#: ../gui/user-switch-applet/applet.c:206 +-msgid "A menu to quickly switch between users." +-msgstr "" ++#: ../gui/simple-greeter/gdm-option-widget.c:522 ++msgid "Default Item" ++msgstr "Element predefinît" + +-#: ../gui/user-switch-applet/applet.c:210 +-msgid "translator-credits" +-msgstr "" ++#: ../gui/simple-greeter/gdm-option-widget.c:523 ++msgid "The ID of the default item" ++msgstr "Il ID dal element predefinît" + +-#: ../gui/user-switch-applet/applet.c:780 ++#: ../gui/simple-greeter/gdm-remote-login-window.c:188 + #, c-format +-msgid "Can't lock screen: %s" +-msgstr "" ++msgid "Remote Login (Connecting to %s…)" ++msgstr "Acès a distance (Conession a %s…)" + +-#: ../gui/user-switch-applet/applet.c:802 ++#: ../gui/simple-greeter/gdm-remote-login-window.c:202 + #, c-format +-msgid "Can't temporarily set screensaver to blank screen: %s" +-msgstr "" +- +-#: ../gui/user-switch-applet/applet.c:974 +-msgid "User Switch Applet" +-msgstr "" +- +-#: ../gui/user-switch-applet/applet.c:995 +-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 +-msgid "User Switcher" +-msgstr "" ++msgid "Remote Login (Connected to %s)" ++msgstr "Acès a distance (Conettût a %s…)" + +-#: ../gui/user-switch-applet/applet.c:1092 +-msgid "Unknown" +-msgstr "" ++#: ../gui/simple-greeter/gdm-remote-login-window.c:281 ++msgid "Remote Login" ++msgstr "Acès a distance" + +-#: ../gui/user-switch-applet/gdm-user-menu-item.c:336 ++#: ../gui/simple-greeter/gdm-session-option-widget.c:162 + #, fuzzy +-msgid "User" +-msgstr "Non utent:" +- +-#: ../gui/user-switch-applet/gdm-user-menu-item.c:337 +-msgid "The user this menu item represents." +-msgstr "" +- +-#: ../gui/user-switch-applet/gdm-user-menu-item.c:344 +-msgid "Icon Size" +-msgstr "" +- +-#: ../gui/user-switch-applet/gdm-user-menu-item.c:345 +-msgid "The size of the icon to use." +-msgstr "" +- +-#: ../gui/user-switch-applet/gdm-user-menu-item.c:351 +-msgid "Indicator Size" +-msgstr "" +- +-#: ../gui/user-switch-applet/gdm-user-menu-item.c:352 +-msgid "Size of check indicator" +-msgstr "" ++#| msgid "Version" ++msgid "Session" ++msgstr "Version" + +-#: ../gui/user-switch-applet/gdm-user-menu-item.c:357 +-msgid "Indicator Spacing" +-msgstr "" ++#: ../gui/simple-greeter/gdm-timer.c:147 ++msgid "Duration" ++msgstr "Durade" + +-#: ../gui/user-switch-applet/gdm-user-menu-item.c:358 +-msgid "Space between the username and the indicator" +-msgstr "" ++#: ../gui/simple-greeter/gdm-timer.c:148 ++msgid "Number of seconds until timer stops" ++msgstr "Numar di seconts prime che il timer al finissi" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:1 +-msgid "Multiple Logins Found" +-msgstr "" ++#: ../gui/simple-greeter/gdm-timer.c:155 ++msgid "Start time" ++msgstr "Moment di inviament" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:2 +-msgid "Appearance" +-msgstr "" ++#: ../gui/simple-greeter/gdm-timer.c:156 ++msgid "Time the timer was started" ++msgstr "Moment che il tilmer al è stât inviât" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:3 +-msgid "Continue" +-msgstr "" ++#: ../gui/simple-greeter/gdm-timer.c:163 ++msgid "Is it Running?" ++msgstr "Isal in esecuzion?" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:4 +-msgid "Create new logins in _nested windows" +-msgstr "" ++#: ../gui/simple-greeter/gdm-timer.c:164 ++msgid "Whether the timer is currently ticking" ++msgstr "Indiche se il timer cumò al stâ lant indenant " + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:5 +-msgid "Details" +-msgstr "" ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800 ++#, c-format ++msgid "Log in as %s" ++msgstr "Acès come %s" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:6 +-msgid "Multiple Logins Found - User Switcher" +-msgstr "" ++#. translators: This option prompts ++#. * the user to type in a username ++#. * manually instead of choosing from ++#. * a list. ++#. ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 ++#, fuzzy ++msgctxt "user" ++msgid "Other…" ++msgstr "Altri..." + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:7 +-msgid "Options" +-msgstr "" ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 ++msgid "Choose a different account" ++msgstr "Sielz un account diferent" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:8 +-msgid "Some preferences have been locked by the system adminstrator." +-msgstr "" ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559 ++msgid "Guest" ++msgstr "Ospit" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:9 +-msgid "" +-"The user you want to switch to is logged in multiple times on this computer. " +-"Which login do you want to switch to?" +-msgstr "" ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 ++msgid "Log in as a temporary guest" ++msgstr "Acêt come ospit provisori" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:10 +-msgid "Use the `people' icon for the menu title" +-msgstr "" ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 ++msgid "Automatic Login" ++msgstr "Acès automatic" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:11 +-msgid "Use the current user's name for the menu title" +-msgstr "" ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 ++msgid "Automatically log into the system after selecting options" ++msgstr "Acedi automaticamentri al sisteme dopo vê selezionât lis opzions" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:12 +-msgid "Use the word `Users' as the menu title" +-msgstr "" ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332 ++msgid "Currently logged in" ++msgstr "Acès bielza eseguît" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:13 +-msgid "User Switcher Error" +-msgstr "" ++#: ../utils/gdm-screenshot.c:43 ++msgid "Debugging output" ++msgstr "Debugging output" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:14 +-msgid "User Switcher Preferences" +-msgstr "" ++#: ../utils/gdm-screenshot.c:212 ++msgid "Screenshot taken" ++msgstr "Screenshot fat" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:15 +-msgid "Users" +-msgstr "" ++#. Option parsing ++#: ../utils/gdm-screenshot.c:279 ++msgid "Take a picture of the screen" ++msgstr "Fâs une figure dal visôr" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:16 +-msgid "" +-"When a new login must be created to switch users, create it in a window " +-"instead of on a new screen" +-msgstr "" ++#~ msgid "id" ++#~ msgstr "id" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:17 +-msgid "" +-"When changing to a different display, activate the screensaver for this " +-"display." +-msgstr "" ++#~ msgid "Unable to authenticate user" ++#~ msgstr "Impussibil autenticâ l'utent" + +-#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:18 +-msgid "_Lock the screen after switching users" +-msgstr "" ++#~ msgid "Group %s doesn't exist" ++#~ msgstr "Il grop %s nol esist" + +-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 +-msgid "A menu to quickly switch between users" +-msgstr "" ++#~ msgid "Error in checksum" ++#~ msgstr "Erôr tal checksum" + +-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 +-msgid "User Switcher Applet Factory" +-msgstr "" ++#~ msgid "Bad address" ++#~ msgstr "Indiriz sbagliât" + +-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 +-msgid "Edit Personal _Information" +-msgstr "" ++#~ msgid "%s: Error in checksum" ++#~ msgstr "%s: Erôr tal checksum" + +-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 +-msgid "_About" +-msgstr "" ++#~ msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" ++#~ msgstr "GdmXdmcpDisplayFactory: No si rive a lei l'header di XDMCP!" + +-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 +-msgid "_Edit Users and Groups" +-msgstr "" ++#, fuzzy ++#~ msgid "gtk-close" ++#~ msgstr "gtk-cancel" + +-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:4 +-msgid "_Help" +-msgstr "" ++#~ msgid "%a %b %e" ++#~ msgstr "%a %b %e" + +-#: ../utils/gdmflexiserver.c:59 +-msgid "Send the specified protocol command to GDM" +-msgstr "" ++#~ msgid "%1$s, %2$s" ++#~ msgstr "%1$s, %2$s" + +-#: ../utils/gdmflexiserver.c:59 +-msgid "COMMAND" +-msgstr "" ++#, fuzzy ++#~ msgid "gtk-disconnect" ++#~ msgstr "Disconet" + +-#: ../utils/gdmflexiserver.c:60 +-msgid "Xnest mode" +-msgstr "" ++#~ msgid "page 5" ++#~ msgstr "pagjine 5" + +-#: ../utils/gdmflexiserver.c:61 +-msgid "Do not lock current screen" +-msgstr "" ++#, fuzzy ++#~ msgid "Languages" ++#~ msgstr "Manager" + +-#: ../utils/gdmflexiserver.c:62 +-msgid "Debugging output" +-msgstr "" ++#~ msgid "Other..." ++#~ msgstr "Altri..." + +-#: ../utils/gdmflexiserver.c:63 +-msgid "Authenticate before running --command" +-msgstr "" ++#~ msgid "Manager" ++#~ msgstr "Manager" + +-#: ../utils/gdmflexiserver.c:64 +-msgid "Start new flexible session; do not show popup" +-msgstr "" ++#, fuzzy ++#~ msgid "_Users:" ++#~ msgstr "Non utent:" + +-#: ../utils/gdmflexiserver.c:648 +-msgid "Main Options" +-msgstr "" ++#, fuzzy ++#~ msgid "_User:" ++#~ msgstr "Non utent:" + +-#: ../utils/gdmflexiserver.c:691 +-msgid "Unable to start new display" +-msgstr "" ++#, fuzzy ++#~ msgid "User" ++#~ msgstr "Non utent:" + + #~ msgid "CONFIGFILE" + #~ msgstr "CONFIGFILE" + + #, fuzzy +-#~ msgid "Other" +-#~ msgstr "Altri..." +- +-#, fuzzy + #~ msgid "Display Style" + #~ msgstr "Mostre ID" + +-#~ msgid "unable to log session" +-#~ msgstr "impussibil loggasi ta session" +- + #~ msgid "Manager X Settings" + #~ msgstr "Manager dai setagjos di X" + +diff --git a/po/ml.po b/po/ml.po +index ecad3a6..57b262b 100644 +--- a/po/ml.po ++++ b/po/ml.po +@@ -9,18 +9,18 @@ + msgid "" + msgstr "" + "Project-Id-Version: gdm.master.ml\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +-"cgi?product=gdm&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2012-09-15 14:28+0000\n" +-"PO-Revision-Date: 2012-09-19 00:51+0000\n" +-"Last-Translator: Ani Peter \n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" ++"product=gdm&keywords=I18N+L10N&component=general\n" ++"POT-Creation-Date: 2012-10-02 17:33+0000\n" ++"PO-Revision-Date: 2012-11-27 12:11+0530\n" ++"Last-Translator: Ani Peter \n" + "Language-Team: Malayalam \n" + "Language: ml\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Lokalize 1.0\n" ++"X-Generator: Lokalize 1.5\n" + "X-DamnedLies-Scope: partial\n" + + #: ../common/gdm-common.c:492 +@@ -35,18 +35,15 @@ msgstr "സിസ്റ്റത്തില്‍ \"%s\" എന്ന ഉപയ + + #: ../daemon/gdm-display.c:1315 ../daemon/gdm-display.c:1349 + #, c-format +-#| msgid "no user account available" + msgid "No session available yet" + msgstr "സെഷന്‍ ലഭ്യമല്ല" + + #: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 + #, c-format +-#| msgid "Unable to authorize user" + msgid "Unable to look up UID of user %s" + msgstr "ഉപയോക്താവു് %s-ന്റെ യുഐഡി തെരയുവാന്‍ സാധ്യമല്ല" + + #: ../daemon/gdm-manager.c:291 +-#| msgid "no user account available" + msgid "no sessions available" + msgstr "സെഷനുകള്‍ ലഭ്യമല്ല" + +@@ -57,23 +54,19 @@ msgstr "വീണ്ടും ആധികാരികത ഉറപ്പാക + + #: ../daemon/gdm-manager.c:406 + #, c-format +-#| msgid "Unable to open session" + msgid "Unable to find session for user %s" + msgstr "%s ഉപയോക്താവിനുള്ള സെഷന്‍ കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല" + + #: ../daemon/gdm-manager.c:476 + #, c-format +-#| msgid "Unable to open session" + msgid "Unable to find appropriate session for user %s" + msgstr "ഉപയോക്താവു് %s-നു് ഉചിതമായ സെഷന്‍ കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല" + + #: ../daemon/gdm-manager.c:671 +-#| msgid "User %s doesn't exist" + msgid "User doesn't own session" + msgstr "ഉപയോക്താവിനു് സെഷന്‍ ലഭ്യമല്ല" + + #: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 +-#| msgid "no user account available" + msgid "No session available" + msgstr "സെഷനുകള്‍ ലഭ്യമല്ല" + +@@ -85,7 +78,8 @@ msgstr "%s: പേരന്റ് ഡിസ്പ്ളെ '%s'-മായി ക + #: ../daemon/gdm-server.c:452 + #, c-format + msgid "Server was to be spawned by user %s but that user doesn't exist" +-msgstr "സെര്‍വര്‍ തുടങ്ങേണ്ട ഉപയോക്താവു് %s ആയിരുന്നെങ്കിലും ആ ഉപയോക്താവു് നിലവിലില്ല" ++msgstr "" ++"സെര്‍വര്‍ തുടങ്ങേണ്ട ഉപയോക്താവു് %s ആയിരുന്നെങ്കിലും ആ ഉപയോക്താവു് നിലവിലില്ല" + + #: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 + #, c-format +@@ -147,7 +141,7 @@ msgstr "ഡിസ്പ്ലെ ഡിവൈസ്" + msgid "The display device" + msgstr "ഡിസ്പ്ലെ ഡിവൈസ്" + +-#: ../daemon/gdm-session.c:1177 ++#: ../daemon/gdm-session.c:1184 + msgid "Could not create authentication helper process" + msgstr "ആധികാരികതയ്ക്കുള്ള സഹായ പ്രക്രിയ തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല" + +@@ -210,37 +204,40 @@ msgstr "ഉപയോക്താവിനുള്ള അക്കൌണ്ട + msgid "Unable to change to user" + msgstr "ഉപയോക്താവായി മാറുവാന്‍ സാധ്യമല്ല" + +-#: ../daemon/gdm-simple-slave.c:1370 ++#: ../daemon/gdm-simple-slave.c:1381 + msgid "" + "Could not start the X server (your graphical environment) due to an internal " + "error. Please contact your system administrator or check your syslog to " + "diagnose. In the meantime this display will be disabled. Please restart GDM " + "when the problem is corrected." + msgstr "" +-"ഒരു ആന്തരിക പിശക് കാരണം X സര്‍വര്‍ (നിങ്ങളുടെ ഗ്രാഫിക്കല്‍ എന്‍വയോണ്‍മെന്റ്) ആരംഭിക്കുവാനായില്ല. " +-"നിങ്ങളുടെ syslog പരിശോധിക്കുന്നതിനായി ദയവായി സിസ്റ്റം അഡ്മിനിസ്ട്രേറ്ററിനെ സമീപിക്കുക. " +-"ഇപ്പോള്‍ ഈ ഡിസ്പ്ലെ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതായിരിക്കും. പ്രശ്നം പരിഹരിച്ച ശേഷം ജിഡിഎം വീണ്ടും " ++"ഒരു ആന്തരിക പിശക് കാരണം X സര്‍വര്‍ (നിങ്ങളുടെ ഗ്രാഫിക്കല്‍ എന്‍വയോണ്‍മെന്റ്) " ++"ആരംഭിക്കുവാനായില്ല. " ++"നിങ്ങളുടെ syslog പരിശോധിക്കുന്നതിനായി ദയവായി സിസ്റ്റം അഡ്മിനിസ്ട്രേറ്ററിനെ " ++"സമീപിക്കുക. " ++"ഇപ്പോള്‍ ഈ ഡിസ്പ്ലെ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതായിരിക്കും. പ്രശ്നം പരിഹരിച്ച " ++"ശേഷം ജിഡിഎം വീണ്ടും " + "ആരംഭിക്കുക." + +-#: ../daemon/gdm-simple-slave.c:1411 ++#: ../daemon/gdm-simple-slave.c:1422 + #, c-format + msgid "Can only be called before user is logged in" + msgstr "ഉപയോക്താവു് പ്രവേശിയ്ക്കുന്നതിനു് മുമ്പു് മാത്രമേ ലഭ്യമാകുള്ളൂ" + +-#: ../daemon/gdm-simple-slave.c:1421 ++#: ../daemon/gdm-simple-slave.c:1432 + #, c-format + msgid "Caller not GDM" + msgstr "കോളര്‍ ജിഡിഎം അല്ല" + +-#: ../daemon/gdm-simple-slave.c:1474 +-#| msgid "Currently logged in" ++#: ../daemon/gdm-simple-slave.c:1485 + msgid "User not logged in" + msgstr "ഉപയോക്താവു് പ്രവേശിച്ചിട്ടില്ല" + + #: ../daemon/gdm-xdmcp-chooser-slave.c:370 + #, c-format + msgid "Currently, only one client can be connected at once" +-msgstr "നിലവില്‍, ഒരു സമയത്തു് ഒരു ക്ലയന്റ് മാത്രമേ കണക്ട് ചെയ്യുവാന്‍ സാധ്യമാകൂ" ++msgstr "" ++"നിലവില്‍, ഒരു സമയത്തു് ഒരു ക്ലയന്റ് മാത്രമേ കണക്ട് ചെയ്യുവാന്‍ സാധ്യമാകൂ" + + #: ../daemon/gdm-xdmcp-display-factory.c:604 + msgid "Could not create socket!" +@@ -249,7 +246,8 @@ msgstr "സോക്കറ്റ് നിര്‍മ്മിക്കുവ + #: ../daemon/main.c:126 ../daemon/main.c:139 + #, c-format + msgid "Cannot write PID file %s: possibly out of disk space: %s" +-msgstr "%s PID ഫയല്‍ എഴുതുവാന്‍ സാധ്യമായില്ല: ഡിസ്ക്കില്‍ മതിയായ സ്ഥലം ഉണ്ടാവില്ല: %s" ++msgstr "" ++"%s PID ഫയല്‍ എഴുതുവാന്‍ സാധ്യമായില്ല: ഡിസ്ക്കില്‍ മതിയായ സ്ഥലം ഉണ്ടാവില്ല: %s" + + #: ../daemon/main.c:160 + #, c-format +@@ -269,7 +267,9 @@ msgstr "Authdir %s ഒരു ഡയറക്ടറി അല്ല. നിര് + #: ../daemon/main.c:254 + #, c-format + msgid "Authdir %s is not owned by user %d, group %d. Aborting." +-msgstr "Authdir %s-യുടെ ഉടമസ്ഥന്‍ ഉപയോക്താവ് %d-ഉം, ഗ്രൂപ്പ് %d-ഉം അല്ല. നിര്‍ത്തുന്നു." ++msgstr "" ++"Authdir %s-യുടെ ഉടമസ്ഥന്‍ ഉപയോക്താവ് %d-ഉം, ഗ്രൂപ്പ് %d-ഉം അല്ല. " ++"നിര്‍ത്തുന്നു." + + #: ../daemon/main.c:261 + #, c-format +@@ -362,30 +362,70 @@ msgstr "ഗ്നോം ഓണ്‍-സ്ക്രീന്‍ കീബോര + msgid "Use an on-screen keyboard" + msgstr "ഒരു ഓണ്‍-സ്ക്രീന്‍ കീബോര്‍ഡ് ഉപയോഗിക്കുക" + +-#: ../data/applications/orca-screen-reader.desktop.in.h:1 +-msgid "Orca Screen Reader" +-msgstr "ഓര്‍കാ സ്ക്രീന്‍ റീഡര്‍" +- +-#: ../data/applications/orca-screen-reader.desktop.in.h:2 +-msgid "Present on-screen information as speech or braille" +-msgstr "ഓണ്‍ സ്ക്രീന്‍ വിവരങ്ങള്‍ ഒരു സംഭാഷണം അല്ലെങ്കില്‍ ബ്രെയിലി ആയി ലഭ്യമാക്കുക" +- + #: ../data/org.gnome.login-screen.gschema.xml.in.h:1 + msgid "Whether or not to allow fingerprint readers for login" + msgstr "വിരളടയാളം പരിശോദിച്ചു് അകത്തുകയറാന്‍ അനുവദിയ്ക്കണോ വേണ്ടയോ എന്നു്" + ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 ++msgid "" ++"The login screen can optionally allow users who have enrolled their " ++"fingerprints to log in using those prints." ++msgstr "" ++"വിരളടയാളം ഉപയോഗിച്ചു് പ്രവേശിയ്ക്കുവാന്‍ അനുവാദമുള്ള ഉപയോക്താക്കളെ " ++"പ്രവേശന സ്ക്രീന്‍ അനുവദിയ്ക്കുന്നു." ++ + #: ../data/org.gnome.login-screen.gschema.xml.in.h:3 + msgid "Whether or not to allow smartcard readers for login" +-msgstr "സ്മാര്‍ട്ട്കാര്‍ഡ് ഉപയോഗിച്ചു് അകത്തുകയറാന്‍ അനുവദിയ്ക്കണോ വേണ്ടയോ എന്നു്" ++msgstr "" ++"സ്മാര്‍ട്ട്കാര്‍ഡ് ഉപയോഗിച്ചു് അകത്തുകയറാന്‍ അനുവദിയ്ക്കണോ വേണ്ടയോ എന്നു്" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 ++msgid "" ++"The login screen can optionally allow users who have smartcards to log in " ++"using those smartcards." ++msgstr "" ++"സ്മാര്‍ട്ട് കാര്‍ഡുള്ളവരെ അതുപയോഗിച്ചു് പ്രവേശിയ്ക്കുവാന്‍ പ്രവേശന സ്ക്രീന്‍ " ++"അനുവദിയ്ക്കുന്നു." + + #: ../data/org.gnome.login-screen.gschema.xml.in.h:5 + msgid "Path to small image at top of user list" +-msgstr "ഉപയോക്താക്കളുടെ പട്ടികയ്ക്കു് മുകളില്‍ കാണിയ്ക്കുന്ന ചെറിയ ചിത്രത്തിനുള്ള വഴി" ++msgstr "" ++"ഉപയോക്താക്കളുടെ പട്ടികയ്ക്കു് മുകളില്‍ കാണിയ്ക്കുന്ന ചെറിയ ചിത്രത്തിനുള്ള വഴി" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 ++msgid "" ++"The login screen can optionally show a small image at the top of its user " ++"list to provide site administrators and distributions a way to provide " ++"branding." ++msgstr "" ++"സൈറ്റ് അഡ്മിനിസ്ട്രേറ്ററുകളേയും വിതരണക്കാരെയും ബ്രാണ്ടിങ് നല്‍കുന്നതിനായി " ++"പ്രവേശന സ്ക്രീനില്‍ ഉപയോക്താക്കളുടെ പട്ടികയുടെ മുകളില്‍ ഒരു ചെറിയ ചിത്രം " ++"കാണിയ്ക്കാം." ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 ++msgid "" ++"The fallback login screen can optionally show a small image at the top of " ++"its user list to provide site administrators and distributions a way to " ++"provide branding." ++msgstr "" ++"സൈറ്റ് അഡ്മിനിസ്ട്രേറ്ററുകളേയും വിതരണക്കാരെയും ബ്രാണ്ടിങ് നല്‍കുന്നതിനായി " ++"ഫോള്‍ബാക്ക് പ്രവേശന സ്ക്രീനില്‍ ഉപയോക്താക്കളുടെ പട്ടികയുടെ മുകളില്‍ ഒരു ചെറിയ " ++"ചിത്രം " ++"കാണിയ്ക്കാം." + + #: ../data/org.gnome.login-screen.gschema.xml.in.h:8 + msgid "Avoid showing user list" + msgstr "ഉപയോക്താക്കളുടെ പട്ടിക കാണിയ്ക്കുന്നതൊഴിവാക്കുക" + ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 ++msgid "" ++"The login screen normally shows a list of available users to log in as. This " ++"setting can be toggled to disable showing the user list." ++msgstr "" ++"പ്രവേശന സ്ക്രീനില്‍ സാധാരണ പ്രവേശിയ്ക്കുവാന്‍ സാധ്യമായ ഉപയോക്താക്കളെ " ++"കാണിയ്ക്കുന്നു. " ++"ഈ പട്ടിക പ്രവര്‍ത്തന രഹിതമാക്കണമെങ്കില്‍ ഈ സജ്ജീകരണം ടൊഗ്ഗിള്‍ ചെയ്യാം." ++ + #: ../data/org.gnome.login-screen.gschema.xml.in.h:10 + msgid "Enable showing the banner message" + msgstr "ബാനര്‍ സന്ദേശം കാണിക്കുന്നതു് സജ്ജമാക്കുക" +@@ -404,27 +444,39 @@ msgstr "ലോഗിന്‍ ജാലകത്തില്‍ കാണിക + + #: ../data/org.gnome.login-screen.gschema.xml.in.h:14 + msgid "Disable showing the restart buttons" +-msgstr "വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുക" ++msgstr "" ++"വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുക" + + #: ../data/org.gnome.login-screen.gschema.xml.in.h:15 + msgid "Set to true to disable showing the restart buttons in the login window." + msgstr "" +-"ലോഗില്‍ ജാലകത്തില്‍ വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനു് " ++"ലോഗില്‍ ജാലകത്തില്‍ വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് " ++"പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനു് " + "true ആയി സജ്ജമാക്കുക." + ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 ++msgid "Number of allowed authentication failures" ++msgstr "എത്ര തവണ ആധികാരികത ഉറപ്പാക്കുവാന്‍ ശ്രമിയ്ക്കാം" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 ++msgid "" ++"The number of times a user is allowed to attempt authentication, before " ++"giving up and going back to user selection." ++msgstr "" ++"ഉപയോക്താവിനുള്ളതു് തെരഞ്ഞെടുക്കുന്നതിലേക്കു് പോകുന്നതിനു് മുമ്പായി, " ++"ആധികാരികത ഉറപ്പാക്കുവാന്‍ എത്ര തവണ ഉപയോക്താവു് ശ്രമിയ്ക്കുന്നു." ++ + #: ../gui/libgdm/gdm-user-switching.c:72 +-#| msgid "Unable to start new display" + msgid "Unable to create transient display: " + msgstr "ട്രാന്‍സിയന്റ് പ്രദര്‍ശനം തയ്യാറാക്കുവാന്‍ സാധ്യമായില്ല:" + + #: ../gui/libgdm/gdm-user-switching.c:183 + #: ../gui/libgdm/gdm-user-switching.c:395 +-#| msgid "Unable to open session" + msgid "Unable to activate session: " + msgstr "സെഷന്‍ സജീവമാക്കുവാന്‍ സാധ്യമല്ല:" + + #: ../gui/libgdm/gdm-user-switching.c:344 +-#: ../gui/libgdm/gdm-user-switching.c:483 ++#: ../gui/libgdm/gdm-user-switching.c:512 + #, c-format + msgid "Could not identify the current session." + msgstr "നിലവിലുള്ള സെഷന്‍ തിരിച്ചറിയുവാന്‍ സാധ്യമായില്ല." +@@ -434,21 +486,22 @@ msgstr "നിലവിലുള്ള സെഷന്‍ തിരിച്ച + msgid "User unable to switch sessions." + msgstr "സെഷനുകള്‍ തമ്മില്‍ മാറ്റുവാന്‍ ഉപയോക്താവിനു് സാധ്യമല്ല." + +-#: ../gui/libgdm/gdm-user-switching.c:492 ++#: ../gui/libgdm/gdm-user-switching.c:521 + #, c-format + msgid "Could not identify the current seat." + msgstr "നിലവിലുള്ള സീറ്റ് തിരിച്ചറിയുവാന്‍ സാധ്യമായില്ല." + +-#: ../gui/libgdm/gdm-user-switching.c:502 ++#: ../gui/libgdm/gdm-user-switching.c:531 + #, c-format + msgid "" + "The system is unable to determine whether to switch to an existing login " + "screen or start up a new login screen." + msgstr "" +-"നിലവിലുള്ളൊരു പ്രവേശന സ്ക്രീന്‍ അല്ലെങ്കില്‍ ഒരു പുതിയ പ്രവേശന സ്ക്രീന്‍ - ഏതിലേക്കു് മാറണമെന്നു് " ++"നിലവിലുള്ളൊരു പ്രവേശന സ്ക്രീന്‍ അല്ലെങ്കില്‍ ഒരു പുതിയ പ്രവേശന സ്ക്രീന്‍ - " ++"ഏതിലേക്കു് മാറണമെന്നു് " + "സിസ്റ്റത്തിനു് നിശ്ചയിയ്ക്കുവാന്‍ സാധ്യമല്ല." + +-#: ../gui/libgdm/gdm-user-switching.c:510 ++#: ../gui/libgdm/gdm-user-switching.c:539 + #, c-format + msgid "The system is unable to start up a new login screen." + msgstr "ഒരു പുതിയ പ്രവേശന സ്ക്രീന്‍ ആരംഭിയ്ക്കുവാന്‍ സിസ്റ്റത്തിനു് സാധ്യമല്ല." +@@ -567,7 +620,9 @@ msgstr "വരുന്ന കാര്‍ഡ് ഇവന്റുകള്‍ + #: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 + #, c-format + msgid "encountered unexpected error while waiting for smartcard events" +-msgstr "സ്മാര്‍ട്ട് കാര്‍ഡുകള്‍ക്കായി കാത്തിരിയ്ക്കുമ്പോള്‍ അപ്രതീക്ഷിതമായ പിശകുണ്ടായിരിയ്ക്കുന്നു" ++msgstr "" ++"സ്മാര്‍ട്ട് കാര്‍ഡുകള്‍ക്കായി കാത്തിരിയ്ക്കുമ്പോള്‍ അപ്രതീക്ഷിതമായ " ++"പിശകുണ്ടായിരിയ്ക്കുന്നു" + + #: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 + msgid "Authentication" +@@ -591,7 +646,8 @@ msgstr "സജീവമല്ലാത്ത വാചകം" + + #: ../gui/simple-greeter/gdm-chooser-widget.c:1466 + msgid "The text to use in the label if the user hasn't picked an item yet" +-msgstr "ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടില്ല എങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം" ++msgstr "" ++"ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടില്ല എങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം" + + #: ../gui/simple-greeter/gdm-chooser-widget.c:1474 + msgid "Active Text" +@@ -599,7 +655,8 @@ msgstr "സജീവമായ വാചകം" + + #: ../gui/simple-greeter/gdm-chooser-widget.c:1475 + msgid "The text to use in the label if the user has picked an item" +-msgstr "ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടുണ്ടെങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം" ++msgstr "" ++"ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടുണ്ടെങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം" + + #: ../gui/simple-greeter/gdm-chooser-widget.c:1484 + msgid "List Visible" +@@ -732,7 +789,8 @@ msgstr "മറ്റൊരു കമ്പ്യൂട്ടറില്‍ ന + #: ../gui/simple-greeter/gdm-remote-login-window.c:202 + #, c-format + msgid "Remote Login (Connected to %s)" +-msgstr "മറ്റൊരു കമ്പ്യൂട്ടറില്‍ നിന്നുള്ള പ്രവേശനം (%s ആയി ബന്ധപ്പെട്ടിരിക്കുന്നു)" ++msgstr "" ++"മറ്റൊരു കമ്പ്യൂട്ടറില്‍ നിന്നുള്ള പ്രവേശനം (%s ആയി ബന്ധപ്പെട്ടിരിക്കുന്നു)" + + #: ../gui/simple-greeter/gdm-remote-login-window.c:281 + msgid "Remote Login" +@@ -819,6 +877,12 @@ msgstr "സ്ക്രീന്‍ഷോട്ട് എടുത്തിര + msgid "Take a picture of the screen" + msgstr "ഇപ്പോള്‍ കാണുന്ന സ്ക്രീനിന്റെ ഒരു സ്ക്രീന്‍ഷോട്ട് എടുക്കുക." + ++#~ msgid "Orca Screen Reader" ++#~ msgstr "ഓര്‍കാ സ്ക്രീന്‍ റീഡര്‍" ++ ++#~ msgid "Present on-screen information as speech or braille" ++#~ msgstr "ഓണ്‍ സ്ക്രീന്‍ വിവരങ്ങള്‍ ഒരു സംഭാഷണം അല്ലെങ്കില്‍ ബ്രെയിലി ആയി ലഭ്യമാക്കുക" ++ + #~ msgid "Unable to initialize login system" + #~ msgstr "അകത്തുകയറാനുള്ള സംവിധാനം ആരംഭിക്കുവാന്‍ സാധ്യമായില്ല" + +diff --git a/po/nl.po b/po/nl.po +index 3ca6818..dd9b68f 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -16,15 +16,15 @@ + # Tino Meinen , 2004–2006, 2008. + # Vincent van Adrighem , 2004, 2006. + # Michiel Sikkes , 2006. +-# Wouter Bolsterlee , 2006–2011. ++# Wouter Bolsterlee , 2006–2012. + # Hannie Dumoleyn , 2010–2011. + msgid "" + msgstr "" + "Project-Id-Version: gdm\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2011-08-18 21:36+0200\n" ++"POT-Creation-Date: 2012-11-22 12:25+0100\n" + "PO-Revision-Date: 2011-08-18 17:27+0200\n" +-"Last-Translator: Hannie Dumoleyn \n" ++"Last-Translator: Wouter Bolsterlee \n" + "Language-Team: Dutch \n" + "Language: nl\n" + "MIME-Version: 1.0\n" +@@ -33,109 +33,96 @@ msgstr "" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + "X-Generator: Lokalize 1.2\n" + +-#: ../common/gdm-common.c:489 ++#: ../common/gdm-common.c:492 + #, c-format + msgid "/dev/urandom is not a character device" + msgstr "Het bestand /dev/urandom is geen tekenbestand" + +-# Beeldscherm? +-#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +-#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +-msgid "Display ID" +-msgstr "Scherm-ID" +- +-#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +-#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +-msgid "ID" +-msgstr "ID" +- +-#: ../daemon/factory-slave-main.c:188 ../daemon/product-slave-main.c:192 +-#: ../daemon/simple-slave-main.c:192 ../daemon/xdmcp-chooser-slave-main.c:194 +-msgid "GNOME Display Manager Slave" +-msgstr "GDM (Gnome aanmeldbeheer) Slave" +- + #: ../daemon/gdm-display-access-file.c:300 + #, c-format + msgid "could not find user \"%s\" on system" + msgstr "kan de gebruiker '%s' niet vinden op het systeem" + +-#: ../daemon/gdm-factory-slave.c:207 ../daemon/gdm-simple-slave.c:309 +-msgid "Unable to initialize login system" +-msgstr "kan aanmeldsysteem niet initialiseren" ++#: ../daemon/gdm-display.c:1320 ../daemon/gdm-display.c:1354 ++#, c-format ++msgid "No session available yet" ++msgstr "Nog geen sessie beschikbaar" + +-#: ../daemon/gdm-factory-slave.c:241 ../daemon/gdm-simple-slave.c:347 +-msgid "Unable to authenticate user" +-msgstr "Kan gebruiker niet authenticeren" ++#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 ++#, c-format ++msgid "Unable to look up UID of user %s" ++msgstr "Opzoeken UID van gebruiker ‘%s’ mislukt" + +-#: ../daemon/gdm-factory-slave.c:265 ../daemon/gdm-simple-slave.c:399 +-msgid "Unable to authorize user" +-msgstr "Kan gebruiker niet autoriseren" ++#: ../daemon/gdm-manager.c:291 ++msgid "no sessions available" ++msgstr "geen sessies beschikbaar" + +-#: ../daemon/gdm-factory-slave.c:289 ../daemon/gdm-simple-slave.c:537 +-msgid "Unable to establish credentials" +-msgstr "Kan aanmeldgegevens niet vaststellen" ++#: ../daemon/gdm-manager.c:352 ++#, c-format ++msgid "No sessions for %s available for reauthentication" ++msgstr "Er zijn geen sessies voor ‘%s’ beschikbaar voor opnieuw aanmelden" + +-#: ../daemon/gdm-factory-slave.c:314 ../daemon/gdm-simple-slave.c:575 +-msgid "Unable to open session" +-msgstr "Kan sessie niet openen" ++#: ../daemon/gdm-manager.c:406 ++#, c-format ++msgid "Unable to find session for user %s" ++msgstr "Kan geen sessie vinden voor gebruiker ‘%s’" + +-#: ../daemon/gdm-factory-slave.c:704 ../daemon/gdm-product-slave.c:511 +-#: ../daemon/gdm-simple-slave.c:1447 +-msgid "" +-"Could not start the X server (your graphical environment) due to an internal " +-"error. Please contact your system administrator or check your syslog to " +-"diagnose. In the meantime this display will be disabled. Please restart GDM " +-"when the problem is corrected." +-msgstr "" +-"Kan de X-server (grafische omgeving) niet starten vanwege een interne fout. " +-"Neem contact op met de systeembeheerder of bekijk het systeemlogboek om een " +-"diagnose te maken. Dit scherm wordt in de tussentijd uitgeschakeld. Herstart " +-"GDM wanneer het probleem is opgelost." ++#: ../daemon/gdm-manager.c:476 ++#, c-format ++msgid "Unable to find appropriate session for user %s" ++msgstr "Kan juiste sessie voor gebruiker ‘%s’ niet vinden" ++ ++#: ../daemon/gdm-manager.c:671 ++msgid "User doesn't own session" ++msgstr "Gebruiker is geen eigenaar van sessie" + +-#: ../daemon/gdm-server.c:250 ++#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 ++msgid "No session available" ++msgstr "Geen sessie beschikbaar" ++ ++#: ../daemon/gdm-server.c:272 + #, c-format + msgid "%s: failed to connect to parent display '%s'" + msgstr "%s: kan geen verbinding maken met moederscherm '%s'" + +-#: ../daemon/gdm-server.c:365 ++#: ../daemon/gdm-server.c:451 + #, c-format + msgid "Server was to be spawned by user %s but that user doesn't exist" + msgstr "" + "Server moest gestart worden als %s, maar die gebruiker bestaat helemaal niet" + +-#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +-#: ../daemon/gdm-welcome-session.c:603 ../daemon/gdm-welcome-session.c:623 ++#: ../daemon/gdm-server.c:462 ../daemon/gdm-server.c:482 + #, c-format + msgid "Couldn't set groupid to %d" + msgstr "Kan groeps-ID niet instellen op %d" + +-#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:609 ++#: ../daemon/gdm-server.c:468 + #, c-format + msgid "initgroups () failed for %s" + msgstr "initgroups() mislukt voor %s" + +-#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:615 ++#: ../daemon/gdm-server.c:474 + #, c-format + msgid "Couldn't set userid to %d" + msgstr "Kan gebruikers-ID niet instellen op %d" + +-#: ../daemon/gdm-server.c:435 ++#: ../daemon/gdm-server.c:521 + #, c-format + msgid "%s: Could not open log file for display %s!" + msgstr "%s: Kan het logboek voor scherm %s niet openen!" + +-#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +-#: ../daemon/gdm-server.c:458 ++#: ../daemon/gdm-server.c:532 ../daemon/gdm-server.c:538 ++#: ../daemon/gdm-server.c:544 + #, c-format + msgid "%s: Error setting %s to %s" + msgstr "%s: Fout bij instellen van %s naar %s" + +-#: ../daemon/gdm-server.c:478 ++#: ../daemon/gdm-server.c:564 + #, c-format + msgid "%s: Server priority couldn't be set to %d: %s" + msgstr "%s: Serverprioriteit kon niet worden ingesteld op %d: %s" + +-#: ../daemon/gdm-server.c:631 ++#: ../daemon/gdm-server.c:720 + #, c-format + msgid "%s: Empty server command for display %s" + msgstr "%s: Lege serveropdracht voor scherm %s" +@@ -168,683 +155,670 @@ msgstr "Beeldscherm" + msgid "The display device" + msgstr "Het beeldscherm" + +-#: ../daemon/gdm-session-worker.c:1070 ++#: ../daemon/gdm-session.c:1183 ++msgid "Could not create authentication helper process" ++msgstr "Aanmaken hulpproces voor authenticatie mislukt" ++ ++#: ../daemon/gdm-session-worker.c:1029 + #, c-format + msgid "error initiating conversation with authentication system - %s" + msgstr "fout bij initialisatie van communicatie met authenticatiesysteem: %s" + +-#: ../daemon/gdm-session-worker.c:1071 ++#: ../daemon/gdm-session-worker.c:1030 + msgid "general failure" + msgstr "algemene fout" + +-#: ../daemon/gdm-session-worker.c:1072 ++#: ../daemon/gdm-session-worker.c:1031 + msgid "out of memory" + msgstr "onvoldoende geheugen beschikbaar" + +-#: ../daemon/gdm-session-worker.c:1073 ++#: ../daemon/gdm-session-worker.c:1032 + msgid "application programmer error" + msgstr "programmafout" + +-#: ../daemon/gdm-session-worker.c:1074 ++#: ../daemon/gdm-session-worker.c:1033 + msgid "unknown error" + msgstr "onbekende fout" + +-#: ../daemon/gdm-session-worker.c:1081 ++#: ../daemon/gdm-session-worker.c:1040 + msgid "Username:" + msgstr "Gebruikersnaam:" + +-#: ../daemon/gdm-session-worker.c:1087 ++#: ../daemon/gdm-session-worker.c:1046 + #, c-format + msgid "error informing authentication system of preferred username prompt: %s" + msgstr "" + "fout bij doorgeven gewenste tekst bij het naamveld aan authenticatiesysteem: " + "%s" + +-#: ../daemon/gdm-session-worker.c:1101 ++#: ../daemon/gdm-session-worker.c:1060 + #, c-format + msgid "error informing authentication system of user's hostname: %s" + msgstr "fout bij doorgeven computernaam aan authenticatiesysteem: %s" + +-#: ../daemon/gdm-session-worker.c:1116 ++#: ../daemon/gdm-session-worker.c:1077 + #, c-format + msgid "error informing authentication system of user's console: %s" + msgstr "fout bij doorgeven van gebruikersconsole aan authenticatiesysteem: %s" + +-#: ../daemon/gdm-session-worker.c:1129 ++#: ../daemon/gdm-session-worker.c:1101 + #, c-format + msgid "error informing authentication system of display string: %s" + msgstr "fout bij doorgeven schermnaam aan authenticatiesysteem: %s" + +-#: ../daemon/gdm-session-worker.c:1144 ++#: ../daemon/gdm-session-worker.c:1116 + #, c-format + msgid "error informing authentication system of display xauth credentials: %s" + msgstr "fout bij doorgeven van xauth-gegevens aan authenticatiesysteem: %s" + +-#: ../daemon/gdm-session-worker.c:1464 ../daemon/gdm-session-worker.c:1481 ++#: ../daemon/gdm-session-worker.c:1454 ../daemon/gdm-session-worker.c:1471 + #, c-format + msgid "no user account available" + msgstr "geen gebruikersaccount beschikbaar" + +-#: ../daemon/gdm-session-worker.c:1508 ++#: ../daemon/gdm-session-worker.c:1498 + msgid "Unable to change to user" + msgstr "Kan gebruiker niet wisselen" + +-#: ../daemon/gdm-welcome-session.c:553 +-#, c-format +-msgid "User %s doesn't exist" +-msgstr "Gebruiker %s bestaat niet" +- +-#: ../daemon/gdm-welcome-session.c:560 +-#, c-format +-msgid "Group %s doesn't exist" +-msgstr "Groep %s bestaat niet" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:604 +-msgid "Could not create socket!" +-msgstr "Kan geen socket aanmaken!" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:873 +-#, c-format +-msgid "Denied XDMCP query from host %s" +-msgstr "XDMCP verzoek van host %s geweigerd" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1031 +-#: ../daemon/gdm-xdmcp-display-factory.c:1255 +-msgid "Could not extract authlist from packet" +-msgstr "Kan authlijst niet uit pakket halen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1044 +-#: ../daemon/gdm-xdmcp-display-factory.c:1270 +-msgid "Error in checksum" +-msgstr "Fout in checksum" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1523 +-msgid "Bad address" +-msgstr "Foutief adres" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1607 +-#, c-format +-msgid "%s: Could not read display address" +-msgstr "%s: Kan schermadres niet lezen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1615 +-#, c-format +-msgid "%s: Could not read display port number" +-msgstr "%s: Kan poortnummer van scherm niet lezen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1624 +-#, c-format +-msgid "%s: Could not extract authlist from packet" +-msgstr "%s: Kan geen authlijst uit pakket halen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1644 +-#, c-format +-msgid "%s: Error in checksum" +-msgstr "%s: Fout in checksum" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2200 +-#, c-format +-msgid "%s: Got REQUEST from banned host %s" +-msgstr "%s: REQUEST ontvangen van verboden host %s" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2210 +-#: ../daemon/gdm-xdmcp-display-factory.c:2568 +-#: ../daemon/gdm-xdmcp-display-factory.c:2822 +-#, c-format +-msgid "%s: Could not read Display Number" +-msgstr "%s: Kan het schermnummer niet lezen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2217 +-#, c-format +-msgid "%s: Could not read Connection Type" +-msgstr "%s: Kan het verbindingstype niet lezen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2224 +-#, c-format +-msgid "%s: Could not read Client Address" +-msgstr "%s: Kan clientadres niet lezen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2232 +-#, c-format +-msgid "%s: Could not read Authentication Names" +-msgstr "%s: Kan de identificatienamen niet lezen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2241 +-#, c-format +-msgid "%s: Could not read Authentication Data" +-msgstr "%s: Kan de identificatiedata niet lezen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2251 +-#, c-format +-msgid "%s: Could not read Authorization List" +-msgstr "%s: Kan de identificatielijst niet lezen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2270 +-#, c-format +-msgid "%s: Could not read Manufacturer ID" +-msgstr "%s: Kan Producent-ID niet lezen" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2297 +-#, c-format +-msgid "%s: Failed checksum from %s" +-msgstr "%s: Fout in checksum van %s" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2552 +-#, c-format +-msgid "%s: Got Manage from banned host %s" +-msgstr "%s: 'Manage' ontvangen van verboden host %s" ++#: ../daemon/gdm-simple-slave.c:1330 ++msgid "" ++"Could not start the X server (your graphical environment) due to an internal " ++"error. Please contact your system administrator or check your syslog to " ++"diagnose. In the meantime this display will be disabled. Please restart GDM " ++"when the problem is corrected." ++msgstr "" ++"Kan de X-server (grafische omgeving) niet starten vanwege een interne fout. " ++"Neem contact op met de systeembeheerder of bekijk het systeemlogboek om een " ++"diagnose te maken. Dit scherm wordt in de tussentijd uitgeschakeld. Herstart " ++"GDM wanneer het probleem is opgelost." + +-#: ../daemon/gdm-xdmcp-display-factory.c:2561 +-#: ../daemon/gdm-xdmcp-display-factory.c:2829 ++#: ../daemon/gdm-simple-slave.c:1371 + #, c-format +-msgid "%s: Could not read Session ID" +-msgstr "%s: Kan sessie-ID niet lezen" ++msgid "Can only be called before user is logged in" ++msgstr "Kan alleen aangeroepen worden voordat de gebruiker aangemeld is" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2575 ++#: ../daemon/gdm-simple-slave.c:1381 + #, c-format +-msgid "%s: Could not read Display Class" +-msgstr "%s: Kan schermklasse niet lezen" ++msgid "Caller not GDM" ++msgstr "Aanroep niet door GDM" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2681 +-#: ../daemon/gdm-xdmcp-display-factory.c:2731 +-#: ../daemon/gdm-xdmcp-display-factory.c:2737 +-#, c-format +-msgid "%s: Could not read address" +-msgstr "%s: Kan adres niet lezen" ++#: ../daemon/gdm-simple-slave.c:1434 ++msgid "User not logged in" ++msgstr "Gebruiker niet aangemeld" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2812 ++#: ../daemon/gdm-xdmcp-chooser-slave.c:368 + #, c-format +-msgid "%s: Got KEEPALIVE from banned host %s" +-msgstr "%s: KEEPALIVE ontvangen van verboden host %s" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2902 +-msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" +-msgstr "GdmXdmcpDisplayFactory: Kan XDMCP-header niet lezen!" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2908 +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 +-msgid "XMDCP: Incorrect XDMCP version!" +-msgstr "XDMCP: Versie van XDMCP niet goed!" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2914 +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 +-msgid "XMDCP: Unable to parse address" +-msgstr "XDMCP: Kan adres niet analyseren" ++msgid "Currently, only one client can be connected at once" ++msgstr "Momenteel kan slechts een gebruiker tegelijkertijd verbonden zijn" + +-#: ../daemon/gdm-xdmcp-display-factory.c:3363 +-#, c-format +-msgid "Could not get server hostname: %s!" +-msgstr "Kan de naam van de server niet vinden: %s!" ++#: ../daemon/gdm-xdmcp-display-factory.c:604 ++msgid "Could not create socket!" ++msgstr "Kan geen socket aanmaken!" + +-#: ../daemon/main.c:237 ../daemon/main.c:250 ++#: ../daemon/main.c:126 ../daemon/main.c:139 + #, c-format + msgid "Cannot write PID file %s: possibly out of disk space: %s" + msgstr "" + "Kan PID-bestand %s niet beschrijven. Mogelijkerwijs is er geen vrije " + "schijfruimte meer: %s" + +-#: ../daemon/main.c:271 +-#, c-format +-msgid "Logdir %s does not exist or isn't a directory." +-msgstr "Logmap %s bestaat niet of is geen map." +- +-#: ../daemon/main.c:287 +-#, c-format +-msgid "Authdir %s does not exist. Aborting." +-msgstr "Authdir %s bestaat niet. Gestopt." +- +-#: ../daemon/main.c:291 ++#: ../daemon/main.c:189 + #, c-format +-msgid "Authdir %s is not a directory. Aborting." +-msgstr "Authdir %s niet herkend. Gestopt." ++msgid "Failed to create ran once marker dir %s: %s" ++msgstr "Aanmaken map ‘%s’ (voor ‘ran once’-markering) mislukt: %s" + +-#: ../daemon/main.c:365 ++#: ../daemon/main.c:195 + #, c-format +-msgid "Authdir %s is not owned by user %d, group %d. Aborting." +-msgstr "Authdir %s is geen eigendom van gebruiker %d, groep %d. Gestopt." ++msgid "Failed to create AuthDir %s: %s" ++msgstr "Aanmaken AuthDir ‘%s’ mislukt: %s" + +-#: ../daemon/main.c:372 ++#: ../daemon/main.c:201 + #, c-format +-msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." +-msgstr "Authdir %s heeft verkeerde rechten %o. Moet %o zijn. Gestopt." ++msgid "Failed to create LogDir %s: %s" ++msgstr "Aanmaken LogDir ‘%s’ mislukt: %s" + +-#: ../daemon/main.c:409 ++#: ../daemon/main.c:236 + #, c-format + msgid "Can't find the GDM user '%s'. Aborting!" + msgstr "Kan de GDM-gebruiker ‘%s’ niet vinden. Gestopt!" + +-#: ../daemon/main.c:415 ++#: ../daemon/main.c:242 + msgid "The GDM user should not be root. Aborting!" + msgstr "De GDM-gebruiker mag geen root zijn. Gestopt!" + +-#: ../daemon/main.c:421 ++#: ../daemon/main.c:248 + #, c-format + msgid "Can't find the GDM group '%s'. Aborting!" + msgstr "Kan GDM-groep ‘%s’ niet vinden. Gestopt!" + +-#: ../daemon/main.c:427 ++#: ../daemon/main.c:254 + msgid "The GDM group should not be root. Aborting!" + msgstr "De GDM-groep mag geen root zijn. Gestopt!" + +-#: ../daemon/main.c:533 ++#: ../daemon/main.c:362 + msgid "Make all warnings fatal" + msgstr "Ook stoppen bij waarschuwingen" + +-#: ../daemon/main.c:534 ++#: ../daemon/main.c:363 + msgid "Exit after a time (for debugging)" + msgstr "Afsluiten na een tijdje (voor debuggen)" + +-#: ../daemon/main.c:535 ++#: ../daemon/main.c:364 + msgid "Print GDM version" + msgstr "GDM-versie weergeven" + +-#: ../daemon/main.c:548 ++#: ../daemon/main.c:377 + msgid "GNOME Display Manager" + msgstr "Gnome Aanmeldbeheer" + + # wil -> mag + #. make sure the pid file doesn't get wiped +-#: ../daemon/main.c:614 ++#: ../daemon/main.c:425 + msgid "Only the root user can run GDM" + msgstr "Alleen root mag GDM starten" + + #. Translators: worker is a helper process that does the work + #. of starting up a session +-#: ../daemon/session-worker-main.c:156 ++#: ../daemon/session-worker-main.c:150 + msgid "GNOME Display Manager Session Worker" + msgstr "GDM (Gnome aanmeldbeheer) Session worker" + +-# hostsysteem/hostcomputer/computer/systeem +-# het/een/. +-#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 +-msgid "Select System" +-msgstr "Selecteer computer" ++# Beeldscherm? ++#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 ++msgid "Display ID" ++msgstr "Scherm-ID" + +-# BUG: XMCP aan het begin moet zijn: XDMCP +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 +-msgid "XDMCP: Could not create XDMCP buffer!" +-msgstr "XDMCP: Kan geen XDMCP-buffer aanmaken!" ++#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 ++msgid "ID" ++msgstr "ID" + +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 +-msgid "XDMCP: Could not read XDMCP header!" +-msgstr "XDMCP: Kan XDMCP-header niet lezen!" ++#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 ++msgid "GNOME Display Manager Slave" ++msgstr "GDM (Gnome aanmeldbeheer) Slave" + +-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 +-msgid "Value" +-msgstr "Waarde" ++#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1 ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566 ++msgid "Login Window" ++msgstr "Aanmeldvenster" + +-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 +-msgid "percentage of time complete" +-msgstr "percentage voltooide tijd" ++#: ../data/applications/gnome-shell.desktop.in.h:1 ++msgid "GNOME Shell" ++msgstr "Gnome Shell" + +-#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 +-msgid "Inactive Text" +-msgstr "Inactieve tekst" ++#: ../data/applications/gnome-shell.desktop.in.h:2 ++msgid "Window management and compositing" ++msgstr "Vensterbeheer en compositing" + +-#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 +-msgid "The text to use in the label if the user hasn't picked an item yet" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:1 ++msgid "Whether or not to allow fingerprint readers for login" ++msgstr "Al dan niet vingerafdruklezers toestaan voor inloggen" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 ++msgid "" ++"The login screen can optionally allow users who have enrolled their " ++"fingerprints to log in using those prints." + msgstr "" +-"De te gebruiken tekst in het label als de gebruiker nog geen item heeft " +-"gekozen" ++"Het aanmeldvenster kan optioneel gebruikers laten inloggen middels " ++"vingerafdrukken." + +-#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 +-msgid "Active Text" +-msgstr "Actieve tekst" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:3 ++msgid "Whether or not to allow smartcard readers for login" ++msgstr "Al dan niet smartcard-lezers toestaan voor inloggen" + +-#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 +-msgid "The text to use in the label if the user has picked an item" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 ++msgid "" ++"The login screen can optionally allow users who have smartcards to log in " ++"using those smartcards." + msgstr "" +-"De te gebruiken tekst in het label als de gebruiker een item heeft gekozen" ++"Het aanmeldvenster kan optioneel gebruikers laten inloggen middels " ++"smartcards." + +-#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 +-msgid "List Visible" +-msgstr "Lijst zichtbaar" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:5 ++msgid "Path to small image at top of user list" ++msgstr "Pad naar een kleine afbeelding boven de lijst met gebruikers" + +-#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 +-msgid "Whether the chooser list is visible" +-msgstr "Of de kieslijst zichtbaar is" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 ++msgid "" ++"The login screen can optionally show a small image at the top of its user " ++"list to provide site administrators and distributions a way to provide " ++"branding." ++msgstr "" ++"Het aanmeldscherm kan optioneel een kleine afbeelding tonen boven de lijst " ++"met gebruikers. Dit maakt het voor beheerders en distributies mogelijk om " ++"‘branding’ toe te voegen." + +-# a=verkorte weekdag +-# b=verkorte maand +-# d=dag van de maand (01) +-# e=dag van de maand (1) +-# l=uur (1-12) +-# p=lokaal equivalent van AM/PM +-# H=uur (0-23) +-# M=minuut +-#. translators: This is the time format to use when both +-#. * the date and time with seconds are being shown together. +-#. +-#: ../gui/simple-greeter/gdm-clock-widget.c:70 +-msgid "%a %b %e, %l:%M:%S %p" +-msgstr "%a %e %b, %H:%M:%S" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 ++msgid "" ++"The fallback login screen can optionally show a small image at the top of " ++"its user list to provide site administrators and distributions a way to " ++"provide branding." ++msgstr "" ++"Het aanmeldscherm in terugvalmodus kan optioneel een kleine afbeelding tonen " ++"boven de lijst met gebruikers. Dit maakt het voor beheerders en distributies " ++"mogelijk om ‘branding’ toe te voegen." + +-# a=verkorte weekdag +-# b=verkorte maand +-# d=dag van de maand (01) +-# e=dag van de maand (1) +-# l=uur (1-12) +-# p=lokaal equivalent van AM/PM +-# H=uur (0-23) +-# M=minuut +-#. translators: This is the time format to use when both +-#. * the date and time without seconds are being shown together. +-#. +-#: ../gui/simple-greeter/gdm-clock-widget.c:76 +-msgid "%a %b %e, %l:%M %p" +-msgstr "%a %e %b, %H:%M" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:8 ++msgid "Avoid showing user list" ++msgstr "Tonen van lijst met gebruikers vermijden" + +-# a=verkorte weekdag +-# b=verkorte maand +-# d=dag van de maand (01) +-# e=dag van de maand (1) +-# l=uur (1-12) +-# p=lokaal equivalent van AM/PM +-# H=uur (0-23) +-# M=minuut +-#. translators: This is the time format to use when there is +-#. * no date, just weekday and time with seconds. +-#. +-#: ../gui/simple-greeter/gdm-clock-widget.c:83 +-msgid "%a %l:%M:%S %p" +-msgstr "%a %H:%M%S" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 ++msgid "" ++"The login screen normally shows a list of available users to log in as. This " ++"setting can be toggled to disable showing the user list." ++msgstr "" ++"Het aanmeldscherm toont normaal gesproken een lijst met beschikbare " ++"gebruikers. Deze instelling maakt het mogelijk deze lijst niet te tonen." + +-# a=verkorte weekdag +-# b=verkorte maand +-# d=dag van de maand (01) +-# e=dag van de maand (1) +-# l=uur (1-12) +-# p=lokaal equivalent van AM/PM +-# H=uur (0-23) +-# M=minuut +-#. translators: This is the time format to use when there is +-#. * no date, just weekday and time without seconds. +-#. +-#: ../gui/simple-greeter/gdm-clock-widget.c:92 +-msgid "%a %l:%M %p" +-msgstr "%a %H:%M" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:10 ++msgid "Enable showing the banner message" ++msgstr "Het welkomstbericht tonen" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:319 +-msgid "Automatically logging in…" +-msgstr "Automatische aanmelding…" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:11 ++msgid "Set to true to show the banner message text." ++msgstr "Inschakelen om het welkomstbericht te tonen." + +-#. need to wait for response from backend +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:935 +-msgid "Cancelling…" +-msgstr "Afbreken…" ++# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:12 ++msgid "Banner message text" ++msgstr "Welkomstbericht" + +-#. just wait for the user to select language and stuff +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1491 +-msgid "Select language and click Log In" +-msgstr "Selecteer de taal en klik op ‘Aanmelden’" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:13 ++msgid "Text banner message to show in the login window." ++msgstr "Tekst van het welkomstbericht in het aanmeldvenster." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1627 +-msgctxt "customsession" +-msgid "Custom" +-msgstr "Aangepast" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:14 ++msgid "Disable showing the restart buttons" ++msgstr "De herstartknoppen niet tonen" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1628 +-msgid "Custom session" +-msgstr "Aangepaste sessie" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:15 ++msgid "Set to true to disable showing the restart buttons in the login window." ++msgstr "" ++"Inschakelen om de herstartknoppen van het aanmeldvenster niet te tonen." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:2605 +-msgid "Login Window" +-msgstr "Aanmeldvenster" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 ++msgid "Number of allowed authentication failures" ++msgstr "Aantal toegestane mislukte inlogpogingen" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +-msgid "Cancel" +-msgstr "Afbreken" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 ++msgid "" ++"The number of times a user is allowed to attempt authentication, before " ++"giving up and going back to user selection." ++msgstr "" ++"Aantal keer dat een gebruiker kan proberen in te loggen voordat teruggegaan " ++"wordt naar het kiezen van een gebruiker." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +-msgid "Computer Name" +-msgstr "Computernaam" ++#: ../gui/libgdm/gdm-user-switching.c:72 ++msgid "Unable to create transient display: " ++msgstr "Aanmaken nieuw ‘transient display’ mislukt: " + +-#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +-msgid "Login" +-msgstr "Aanmelden" ++#: ../gui/libgdm/gdm-user-switching.c:183 ++#: ../gui/libgdm/gdm-user-switching.c:395 ++msgid "Unable to activate session: " ++msgstr "Activeren sessie mislukt: " + +-#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +-msgid "Unlock" +-msgstr "Ontgrendelen" ++# huh? ++#: ../gui/libgdm/gdm-user-switching.c:344 ++#: ../gui/libgdm/gdm-user-switching.c:512 ../utils/gdmflexiserver.c:446 ++#: ../utils/gdmflexiserver.c:613 ++#, c-format ++msgid "Could not identify the current session." ++msgstr "Kon de huidige sessie niet identificeren." + +-#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 +-msgid "Version" +-msgstr "Versie" ++#: ../gui/libgdm/gdm-user-switching.c:351 ../utils/gdmflexiserver.c:453 ++#, c-format ++msgid "User unable to switch sessions." ++msgstr "Gebruiker kan niet van sessie wisselen." + +-# pauzestand/pauzeren +-#: ../gui/simple-greeter/gdm-greeter-panel.c:907 +-msgid "Suspend" +-msgstr "Pauzeren" ++# huh? ++#: ../gui/libgdm/gdm-user-switching.c:521 ../utils/gdmflexiserver.c:622 ++#, c-format ++msgid "Could not identify the current seat." ++msgstr "Kon de huidige zitplaats niet identificeren." + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:912 +-msgid "Restart" +-msgstr "Herstarten" ++#: ../gui/libgdm/gdm-user-switching.c:531 ../utils/gdmflexiserver.c:632 ++#, c-format ++msgid "" ++"The system is unable to determine whether to switch to an existing login " ++"screen or start up a new login screen." ++msgstr "" ++"Het systeem kon niet bepalen of naar een bestaand aanmeldscherm geschakeld " ++"moest worden of dat er een nieuw aanmeldscherm gestart moet worden." + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:916 +-msgid "Shut Down" +-msgstr "Uitschakelen" ++#: ../gui/libgdm/gdm-user-switching.c:539 ../utils/gdmflexiserver.c:640 ++#, c-format ++msgid "The system is unable to start up a new login screen." ++msgstr "Het systeem kan geen nieuw aanmeldscherm tonen." + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +-msgid "Unknown time remaining" +-msgstr "Resterende tijd onbekend" ++# hostsysteem/hostcomputer/computer/systeem ++# het/een/. ++#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 ++msgid "Select System" ++msgstr "Selecteer computer" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +-msgid "Panel" +-msgstr "Paneel" ++# BUG: XMCP aan het begin moet zijn: XDMCP ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 ++msgid "XDMCP: Could not create XDMCP buffer!" ++msgstr "XDMCP: Kan geen XDMCP-buffer aanmaken!" + +-#: ../gui/simple-greeter/gdm-option-widget.c:505 +-msgid "Label Text" +-msgstr "Labeltekst" ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 ++msgid "XDMCP: Could not read XDMCP header!" ++msgstr "XDMCP: Kan XDMCP-header niet lezen!" + +-#: ../gui/simple-greeter/gdm-option-widget.c:506 +-msgid "The text to use as a label" +-msgstr "De te gebruiken tekst voor het label" ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 ++msgid "XDMCP: Incorrect XDMCP version!" ++msgstr "XDMCP: Onjuiste XDMCP-versie!" + +-#: ../gui/simple-greeter/gdm-option-widget.c:513 +-msgid "Icon name" +-msgstr "Pictogramnaam" ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 ++msgid "XDMCP: Unable to parse address" ++msgstr "XDMCP: Kan adres niet verwerken" + +-#: ../gui/simple-greeter/gdm-option-widget.c:514 +-msgid "The icon to use with the label" +-msgstr "Het te gebruiken pictogram voor het label" ++# aanmeldingscontrole ++#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 ++msgid "Fingerprint Authentication" ++msgstr "Vingerafdruk-authenticatie" + +-#: ../gui/simple-greeter/gdm-option-widget.c:522 +-msgid "Default Item" +-msgstr "Standaard-item" ++#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 ++msgid "Log into session with fingerprint" ++msgstr "Bij sessie aanmelden met vingerafdruk" + +-#: ../gui/simple-greeter/gdm-option-widget.c:523 +-msgid "The ID of the default item" +-msgstr "Het ID van het standaard-item" ++# aanmeldingscontrole ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 ++msgid "Password Authentication" ++msgstr "Wachtwoordauthenticatie" + +-#: ../gui/simple-greeter/gdm-recent-option-widget.c:310 +-msgid "Max Item Count" +-msgstr "Maximum aantal items" ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 ++msgid "Log into session with username and password" ++msgstr "Bij sessie aanmelden met gebruikersnaam en wachtwoord" + +-#: ../gui/simple-greeter/gdm-recent-option-widget.c:311 +-msgid "The maximum number of items to keep around in the list" +-msgstr "Het maximum aantal items in de lijst" ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 ++msgid "Log In" ++msgstr "Aanmelden" + +-#: ../gui/simple-greeter/gdm-remote-login-window.c:188 +-#, c-format +-msgid "Remote Login (Connecting to %s…)" +-msgstr "Aanmelding op afstand (Verbinden met %s...)" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 ++msgid "Slot ID" ++msgstr "Slot-ID" + +-#: ../gui/simple-greeter/gdm-remote-login-window.c:202 +-#, c-format +-msgid "Remote Login (Connected to %s)" +-msgstr "Aanmelding op afstand (Verbonden met %s)" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 ++msgid "The slot the card is in" ++msgstr "Het slot waar de kaart in zit" + +-#: ../gui/simple-greeter/gdm-remote-login-window.c:281 +-msgid "Remote Login" +-msgstr "Aanmelding op afstand" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 ++msgid "Slot Series" ++msgstr "Slot Series" + +-#: ../gui/simple-greeter/gdm-session-option-widget.c:162 +-msgid "Session" +-msgstr "Sessies" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 ++msgid "per-slot card identifier" ++msgstr "per-slot kaartidentifier" + +-# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 +-msgid "Banner message text" +-msgstr "Welkomstbericht" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 ++msgid "name" ++msgstr "naam" + +-# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 +-msgid "Banner message text when chooser is empty" +-msgstr "Welkomstbericht bij lege kieslijst" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 ++msgid "Module" ++msgstr "Module" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3 +-msgid "Disable showing the restart buttons" +-msgstr "De herstartknoppen niet tonen" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 ++msgid "smartcard driver" ++msgstr "smartcard-stuurprogramma" + +-# bekende/legale +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 +-msgid "Do not show known users in the login window" +-msgstr "Legale gebruikers niet tonen in het aanmeldvenster" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 ++msgid "Smartcard Authentication" ++msgstr "Smartcard-authenticatie" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 +-msgid "Enable accessibility keyboard plugin" +-msgstr "Toetsenbordtoegankelijkheidsplug-in activeren" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 ++msgid "Log into session with smartcard" ++msgstr "Bij sessie aanmelden met smartcard" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 +-msgid "Enable on-screen keyboard" +-msgstr "Schermtoetsenbord inschakelen" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 ++msgid "Module Path" ++msgstr "Modulepad" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 ++msgid "path to smartcard PKCS #11 driver" ++msgstr "pad naar stuurprogramma smartcard PKCS #11" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 +-msgid "Enable screen magnifier" +-msgstr "Vergrootglad inschakelen" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 ++msgid "received error or hang up from event source" ++msgstr "fout ontvangen van, of opgehangen door activiteitenbron" + +-# klaar voor gebruik/gereed +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 +-msgid "Enable screen reader" +-msgstr "Schermlezer inschakelen" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 ++#, c-format ++msgid "NSS security system could not be initialized" ++msgstr "NSS-beveiligingssysteem kon niet worden geïnitialiseerd" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 +-msgid "Enable showing the banner message" +-msgstr "Het welkomstbericht tonen" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 ++#, c-format ++msgid "no suitable smartcard driver could be found" ++msgstr "er is geen geschikt smartcard-stuurprogramma aangetroffen" + +-# welkomstlogo/aanmeldlogo +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 +-msgid "Icon name to use for greeter logo" +-msgstr "Pictogramnaam voor het aanmeldlogo" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 ++#, c-format ++msgid "smartcard driver '%s' could not be loaded" ++msgstr "smartcard-stuurprogramma ‘%s’ kon niet worden geladen" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 +-msgid "Recently selected languages" +-msgstr "Recent gebruikte talen" ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 ++#, c-format ++msgid "could not watch for incoming card events - %s" ++msgstr "kon inkomende kaartactiviteit niet nagaan - %s" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +-msgid "Set to a list of languages to be shown by default in the login window." +-msgstr "Instellen op een lijst van standaard weer te geven talen." ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 ++#, c-format ++msgid "encountered unexpected error while waiting for smartcard events" ++msgstr "onverwachte fout tegengekomen bij het wachten op smartcardactiviteiten" + +-# thema van pictogramnaam/naam van het themapictogram +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 +-msgid "Set to the themed icon name to use for the greeter logo." +-msgstr "" +-"Ingesteld op de naam van het themapictogram dat gebruikt wordt voor het " +-"aanmeldlogo." ++# aanmeldingscontrole ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 ++msgid "Authentication" ++msgstr "Authenticatie" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +-msgid "Set to true to disable showing known users in the login window." ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 ++msgid "Log into session" ++msgstr "Bij sessie aanmelden" ++ ++#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 ++msgid "Value" ++msgstr "Waarde" ++ ++#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 ++msgid "percentage of time complete" ++msgstr "percentage voltooide tijd" ++ ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 ++msgid "Inactive Text" ++msgstr "Inactieve tekst" ++ ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 ++msgid "The text to use in the label if the user hasn't picked an item yet" + msgstr "" +-"Inschakelen om de gebruikers van het systeem niet te tonen in het " +-"aanmeldvenster." ++"De te gebruiken tekst in het label als de gebruiker nog geen item heeft " ++"gekozen" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +-msgid "Set to true to disable showing the restart buttons in the login window." ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 ++msgid "Active Text" ++msgstr "Actieve tekst" ++ ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 ++msgid "The text to use in the label if the user has picked an item" + msgstr "" +-"Inschakelen om de herstartknoppen van het aanmeldvenster niet te tonen." ++"De te gebruiken tekst in het label als de gebruiker een item heeft gekozen" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +-msgid "Set to true to enable the XRandR settings manager plugin." +-msgstr "Inschakelen om de plug-in voor xrandr te gebruiken." ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 ++msgid "List Visible" ++msgstr "Lijst zichtbaar" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +-msgid "Set to true to enable the background settings manager plugin." +-msgstr "Inschakelen om achtergrondinstellingenbeheer te gebruiken." ++#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 ++msgid "Whether the chooser list is visible" ++msgstr "Of de kieslijst zichtbaar is" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +-msgid "Set to true to enable the media-keys settings manager plugin." +-msgstr "" +-"Inschakelen om de plug-in voor het beheer van de media-toetsen te gebruiken." ++# a=verkorte weekdag ++# b=verkorte maand ++# d=dag van de maand (01) ++# e=dag van de maand (1) ++# l=uur (1-12) ++# p=lokaal equivalent van AM/PM ++# H=uur (0-23) ++# M=minuut ++#. translators: This is the time format to use when both ++#. * the date and time with seconds are being shown together. ++#. ++#: ../gui/simple-greeter/gdm-clock-widget.c:70 ++msgid "%a %b %e, %l:%M:%S %p" ++msgstr "%a %e %b, %H:%M:%S" ++ ++# a=verkorte weekdag ++# b=verkorte maand ++# d=dag van de maand (01) ++# e=dag van de maand (1) ++# l=uur (1-12) ++# p=lokaal equivalent van AM/PM ++# H=uur (0-23) ++# M=minuut ++#. translators: This is the time format to use when both ++#. * the date and time without seconds are being shown together. ++#. ++#: ../gui/simple-greeter/gdm-clock-widget.c:76 ++msgid "%a %b %e, %l:%M %p" ++msgstr "%a %e %b, %H:%M" ++ ++# a=verkorte weekdag ++# b=verkorte maand ++# d=dag van de maand (01) ++# e=dag van de maand (1) ++# l=uur (1-12) ++# p=lokaal equivalent van AM/PM ++# H=uur (0-23) ++# M=minuut ++#. translators: This is the time format to use when there is ++#. * no date, just weekday and time with seconds. ++#. ++#: ../gui/simple-greeter/gdm-clock-widget.c:83 ++msgid "%a %l:%M:%S %p" ++msgstr "%a %H:%M%S" ++ ++# a=verkorte weekdag ++# b=verkorte maand ++# d=dag van de maand (01) ++# e=dag van de maand (1) ++# l=uur (1-12) ++# p=lokaal equivalent van AM/PM ++# H=uur (0-23) ++# M=minuut ++#. translators: This is the time format to use when there is ++#. * no date, just weekday and time without seconds. ++#. ++#: ../gui/simple-greeter/gdm-clock-widget.c:92 ++msgid "%a %l:%M %p" ++msgstr "%a %H:%M" ++ ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:314 ++msgid "Automatically logging in…" ++msgstr "Automatische aanmelding…" ++ ++#. need to wait for response from backend ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:930 ++msgid "Cancelling…" ++msgstr "Afbreken…" ++ ++#. just wait for the user to select language and stuff ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 ++msgid "Select language and click Log In" ++msgstr "Selecteer de taal en klik op ‘Aanmelden’" ++ ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 ++msgctxt "customsession" ++msgid "Custom" ++msgstr "Aangepast" ++ ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623 ++msgid "Custom session" ++msgstr "Aangepaste sessie" ++ ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 ++msgid "Computer Name" ++msgstr "Computernaam" ++ ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 ++msgid "Version" ++msgstr "Versie" ++ ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 ++msgid "Cancel" ++msgstr "Afbreken" ++ ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 ++msgid "Unlock" ++msgstr "Ontgrendelen" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +-msgid "Set to true to enable the on-screen keyboard." +-msgstr "Inschakelen om het schermtoetsenbord te gebruiken." ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 ++msgid "Login" ++msgstr "Aanmelden" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +-msgid "" +-"Set to true to enable the plugin to manage the accessibility keyboard " +-"settings." +-msgstr "Inschakelen om de toetsenbordtoegankelijkheidsplug-in te gebruiken." ++# pauzestand/pauzeren ++#: ../gui/simple-greeter/gdm-greeter-panel.c:955 ++msgid "Suspend" ++msgstr "Pauzeren" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +-msgid "Set to true to enable the screen magnifier." +-msgstr "Inschakelen om het vergrootglas te gebruiken." ++#: ../gui/simple-greeter/gdm-greeter-panel.c:960 ++msgid "Restart" ++msgstr "Herstarten" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +-msgid "Set to true to enable the screen reader." +-msgstr "Inschakelen om de schermlezer te gebruiken." ++#: ../gui/simple-greeter/gdm-greeter-panel.c:964 ++msgid "Shut Down" ++msgstr "Uitschakelen" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +-msgid "Set to true to enable the sound settings manager plugin." +-msgstr "" +-"Inschakelen om de plug-in voor het beheer van de geluidsinstellingen te " +-"gebruiken." ++#: ../gui/simple-greeter/gdm-greeter-panel.c:1013 ++msgid "Unknown time remaining" ++msgstr "Resterende tijd onbekend" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +-msgid "Set to true to enable the xsettings settings manager plugin." +-msgstr "" +-"Inschakelen om de plug-in voor het beheer van de xsettings-instellingen te " +-"gebruiken." ++#: ../gui/simple-greeter/gdm-greeter-panel.c:1035 ++msgid "Panel" ++msgstr "Paneel" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +-msgid "Set to true to show the banner message text." +-msgstr "Inschakelen om het welkomstbericht te tonen." ++#: ../gui/simple-greeter/gdm-option-widget.c:505 ++msgid "Label Text" ++msgstr "Labeltekst" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +-msgid "Set to true to use Compiz as the window manager." +-msgstr "Inschakelen om compiz voor het vensterbeheer te gebruiken." ++#: ../gui/simple-greeter/gdm-option-widget.c:506 ++msgid "The text to use as a label" ++msgstr "De te gebruiken tekst voor het label" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +-msgid "" +-"Text banner message to show in the login window when the user chooser is " +-"empty, instead of banner_message_text." +-msgstr "" +-"Tekst van het welkomstbericht in het aanmeldvenster wanneer de kieslijst " +-"leeg is, in plaats van banner_message_text." ++#: ../gui/simple-greeter/gdm-option-widget.c:513 ++msgid "Icon name" ++msgstr "Pictogramnaam" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +-msgid "Text banner message to show in the login window." +-msgstr "Tekst van het welkomstbericht in het aanmeldvenster." ++#: ../gui/simple-greeter/gdm-option-widget.c:514 ++msgid "The icon to use with the label" ++msgstr "Het te gebruiken pictogram voor het label" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +-msgid "True if the XRandR settings manager plugin is enabled." +-msgstr "Ingeschakeld als de xrandr-plug-in gebruikt wordt." ++#: ../gui/simple-greeter/gdm-option-widget.c:522 ++msgid "Default Item" ++msgstr "Standaard-item" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +-msgid "True if the background settings manager plugin is enabled." +-msgstr "" +-"Ingeschakeld als de plug-in voor achtergrondinstellingen gebruikt wordt." ++#: ../gui/simple-greeter/gdm-option-widget.c:523 ++msgid "The ID of the default item" ++msgstr "Het ID van het standaard-item" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +-msgid "True if the media-keys settings manager plugin is enabled." +-msgstr "" +-"Ingeschakeld als de plug-in voor het beheer van de media-toetsen gebruikt " +-"wordt." ++#: ../gui/simple-greeter/gdm-remote-login-window.c:188 ++#, c-format ++msgid "Remote Login (Connecting to %s…)" ++msgstr "Aanmelding op afstand (Verbinden met %s...)" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +-msgid "True if the sound settings manager plugin is enabled." +-msgstr "" +-"Ingeschakeld als de plug-in voor het beheer van de geluidsinstellingen " +-"gebruikt wordt." ++#: ../gui/simple-greeter/gdm-remote-login-window.c:202 ++#, c-format ++msgid "Remote Login (Connected to %s)" ++msgstr "Aanmelding op afstand (Verbonden met %s)" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +-msgid "True if the xsettings settings manager plugin is enabled." +-msgstr "" +-"Ingeschakeld als de plug-in voor xsettings-instellingen gebruikt wordt." ++#: ../gui/simple-greeter/gdm-remote-login-window.c:281 ++msgid "Remote Login" ++msgstr "Aanmelding op afstand" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +-msgid "Use Compiz as the window manager" +-msgstr "Compiz gebruiken voor het vensterbeheer" ++#: ../gui/simple-greeter/gdm-session-option-widget.c:162 ++msgid "Session" ++msgstr "Sessies" + + #: ../gui/simple-greeter/gdm-timer.c:147 + msgid "Duration" +@@ -873,8 +847,8 @@ msgstr "Is het actief?" + msgid "Whether the timer is currently ticking" + msgstr "Of de teller momenteel aan het aftellen is" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:802 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800 + #, c-format + msgid "Log in as %s" + msgstr "Aanmelden als %s" +@@ -884,201 +858,293 @@ msgstr "Aanmelden als %s" + #. * manually instead of choosing from + #. * a list. + #. +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 + msgctxt "user" + msgid "Other…" + msgstr "Anderen…" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 + msgid "Choose a different account" + msgstr "Kies een ander account" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559 + msgid "Guest" + msgstr "Gast" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 + msgid "Log in as a temporary guest" + msgstr "Aanmelden als tijdelijke gast" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 + msgid "Automatic Login" + msgstr "Automatische aanmelding" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 + msgid "Automatically log into the system after selecting options" + msgstr "Automatisch aanmelden na het selecteren van de opties" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1358 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332 + msgid "Currently logged in" + msgstr "Al aangemeld" + +-# aanmeldingscontrole +-#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 +-msgid "Password Authentication" +-msgstr "Wachtwoordauthenticatie" ++#: ../utils/gdmflexiserver.c:64 ++msgid "Only the VERSION command is supported" ++msgstr "Alleen VERSION wordt ondersteund" + +-#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 +-msgid "Log into session with username and password" +-msgstr "Bij sessie aanmelden met gebruikersnaam en wachtwoord" ++#: ../utils/gdmflexiserver.c:64 ++msgid "COMMAND" ++msgstr "OPDRACHT" + +-#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 +-#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 +-msgid "Log In" +-msgstr "Aanmelden" ++#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 ++#: ../utils/gdmflexiserver.c:68 ../utils/gdmflexiserver.c:69 ++msgid "Ignored — retained for compatibility" ++msgstr "Genegeerd - aanwezig om compatibiliteitsredenen" + +-# aanmeldingscontrole +-#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 +-msgid "Fingerprint Authentication" +-msgstr "Vingerafdruk-authenticatie" ++#: ../utils/gdmflexiserver.c:67 ../utils/gdm-screenshot.c:43 ++msgid "Debugging output" ++msgstr "Debug-uitvoer" + +-#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 +-msgid "Log into session with fingerprint" +-msgstr "Bij sessie aanmelden met vingerafdruk" ++#: ../utils/gdmflexiserver.c:71 ++msgid "Version of this application" ++msgstr "De versie van deze toepassing" + +-#: ../gui/simple-greeter/extensions/fingerprint/org.gnome.display-manager.extensions.fingerprint.gschema.xml.in.h:1 +-#: ../gui/simple-greeter/extensions/smartcard/org.gnome.display-manager.extensions.smartcard.gschema.xml.in.h:1 +-msgid "Activation of this plugin" +-msgstr "Activering van deze plug-in" ++#. Option parsing ++#: ../utils/gdmflexiserver.c:706 ++msgid "- New GDM login" ++msgstr "— Nieuwe GDM-login" + +-#: ../gui/simple-greeter/extensions/fingerprint/org.gnome.display-manager.extensions.fingerprint.gschema.xml.in.h:2 +-#: ../gui/simple-greeter/extensions/smartcard/org.gnome.display-manager.extensions.smartcard.gschema.xml.in.h:2 +-msgid "Whether this plugin would be activated or not" +-msgstr "Of deze plug-in wel of niet geactiveerd moet zijn" ++#: ../utils/gdmflexiserver.c:762 ++msgid "Unable to start new display" ++msgstr "Kan geen nieuw scherm starten" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 +-msgid "Smartcard Authentication" +-msgstr "Smartcard-authenticatie" ++#: ../utils/gdm-screenshot.c:212 ++msgid "Screenshot taken" ++msgstr "Schermafdruk gemaakt" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 +-msgid "Log into session with smartcard" +-msgstr "Bij sessie aanmelden met smartcard" ++#. Option parsing ++#: ../utils/gdm-screenshot.c:279 ++msgid "Take a picture of the screen" ++msgstr "Een schermafdruk maken" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 +-msgid "Module Path" +-msgstr "Modulepad" ++#~ msgid "Unable to initialize login system" ++#~ msgstr "kan aanmeldsysteem niet initialiseren" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 +-msgid "path to smartcard PKCS #11 driver" +-msgstr "pad naar stuurprogramma smartcard PKCS #11" ++#~ msgid "Unable to authenticate user" ++#~ msgstr "Kan gebruiker niet authenticeren" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 +-msgid "received error or hang up from event source" +-msgstr "fout ontvangen van, of opgehangen door activiteitenbron" ++#~ msgid "Unable to establish credentials" ++#~ msgstr "Kan aanmeldgegevens niet vaststellen" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 +-#, c-format +-msgid "NSS security system could not be initialized" +-msgstr "NSS-beveiligingssysteem kon niet worden geïnitialiseerd" ++#~ msgid "Group %s doesn't exist" ++#~ msgstr "Groep %s bestaat niet" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 +-#, c-format +-msgid "no suitable smartcard driver could be found" +-msgstr "er is geen geschikt smartcard-stuurprogramma aangetroffen" ++#~ msgid "Denied XDMCP query from host %s" ++#~ msgstr "XDMCP verzoek van host %s geweigerd" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 +-#, c-format +-msgid "smartcard driver '%s' could not be loaded" +-msgstr "smartcard-stuurprogramma ‘%s’ kon niet worden geladen" ++#~ msgid "Could not extract authlist from packet" ++#~ msgstr "Kan authlijst niet uit pakket halen" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 +-#, c-format +-msgid "could not watch for incoming card events - %s" +-msgstr "kon inkomende kaartactiviteit niet nagaan - %s" ++#~ msgid "Error in checksum" ++#~ msgstr "Fout in checksum" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 +-#, c-format +-msgid "encountered unexpected error while waiting for smartcard events" +-msgstr "onverwachte fout tegengekomen bij het wachten op smartcardactiviteiten" ++#~ msgid "Bad address" ++#~ msgstr "Foutief adres" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 +-msgid "Slot ID" +-msgstr "Slot-ID" ++#~ msgid "%s: Could not read display address" ++#~ msgstr "%s: Kan schermadres niet lezen" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 +-msgid "The slot the card is in" +-msgstr "Het slot waar de kaart in zit" ++#~ msgid "%s: Could not read display port number" ++#~ msgstr "%s: Kan poortnummer van scherm niet lezen" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 +-msgid "Slot Series" +-msgstr "Slot Series" ++#~ msgid "%s: Could not extract authlist from packet" ++#~ msgstr "%s: Kan geen authlijst uit pakket halen" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 +-msgid "per-slot card identifier" +-msgstr "per-slot kaartidentifier" ++#~ msgid "%s: Error in checksum" ++#~ msgstr "%s: Fout in checksum" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 +-msgid "name" +-msgstr "naam" ++#~ msgid "%s: Got REQUEST from banned host %s" ++#~ msgstr "%s: REQUEST ontvangen van verboden host %s" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 +-msgid "Module" +-msgstr "Module" ++#~ msgid "%s: Could not read Display Number" ++#~ msgstr "%s: Kan het schermnummer niet lezen" + +-#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 +-msgid "smartcard driver" +-msgstr "smartcard-stuurprogramma" ++#~ msgid "%s: Could not read Connection Type" ++#~ msgstr "%s: Kan het verbindingstype niet lezen" + +-# aanmeldingscontrole +-#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 +-msgid "Authentication" +-msgstr "Authenticatie" ++#~ msgid "%s: Could not read Client Address" ++#~ msgstr "%s: Kan clientadres niet lezen" + +-#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 +-msgid "Log into session" +-msgstr "Bij sessie aanmelden" ++#~ msgid "%s: Could not read Authentication Data" ++#~ msgstr "%s: Kan de identificatiedata niet lezen" + +-#: ../utils/gdmflexiserver.c:61 +-msgid "Only the VERSION command is supported" +-msgstr "Alleen VERSION wordt ondersteund" ++#~ msgid "%s: Could not read Authorization List" ++#~ msgstr "%s: Kan de identificatielijst niet lezen" + +-#: ../utils/gdmflexiserver.c:61 +-msgid "COMMAND" +-msgstr "OPDRACHT" ++#~ msgid "%s: Could not read Manufacturer ID" ++#~ msgstr "%s: Kan Producent-ID niet lezen" + +-#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 +-#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +-msgid "Ignored — retained for compatibility" +-msgstr "Genegeerd - aanwezig om compatibiliteitsredenen" ++#~ msgid "%s: Failed checksum from %s" ++#~ msgstr "%s: Fout in checksum van %s" + +-#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 +-msgid "Debugging output" +-msgstr "Debug-uitvoer" ++#~ msgid "%s: Got Manage from banned host %s" ++#~ msgstr "%s: 'Manage' ontvangen van verboden host %s" + +-#: ../utils/gdmflexiserver.c:68 +-msgid "Version of this application" +-msgstr "De versie van deze toepassing" ++#~ msgid "%s: Could not read Session ID" ++#~ msgstr "%s: Kan sessie-ID niet lezen" + +-# huh? +-#: ../utils/gdmflexiserver.c:674 +-#, c-format +-msgid "Could not identify the current session." +-msgstr "Kon de huidige sessie niet identificeren." ++#~ msgid "%s: Could not read Display Class" ++#~ msgstr "%s: Kan schermklasse niet lezen" + +-#: ../utils/gdmflexiserver.c:682 +-#, c-format +-msgid "User unable to switch sessions." +-msgstr "Gebruiker kan niet van sessie wisselen." ++#~ msgid "%s: Could not read address" ++#~ msgstr "%s: Kan adres niet lezen" + +-#. Option parsing +-#: ../utils/gdmflexiserver.c:716 +-msgid "- New GDM login" +-msgstr "— Nieuwe GDM-login" ++#~ msgid "%s: Got KEEPALIVE from banned host %s" ++#~ msgstr "%s: KEEPALIVE ontvangen van verboden host %s" + +-#: ../utils/gdmflexiserver.c:772 +-msgid "Unable to start new display" +-msgstr "Kan geen nieuw scherm starten" ++#~ msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" ++#~ msgstr "GdmXdmcpDisplayFactory: Kan XDMCP-header niet lezen!" + +-#: ../utils/gdm-screenshot.c:212 +-msgid "Screenshot taken" +-msgstr "Schermafdruk gemaakt" ++#~ msgid "Could not get server hostname: %s!" ++#~ msgstr "Kan de naam van de server niet vinden: %s!" + +-#. Option parsing +-#: ../utils/gdm-screenshot.c:279 +-msgid "Take a picture of the screen" +-msgstr "Een schermafdruk maken" ++#~ msgid "Logdir %s does not exist or isn't a directory." ++#~ msgstr "Logmap %s bestaat niet of is geen map." ++ ++#~ msgid "Authdir %s does not exist. Aborting." ++#~ msgstr "Authdir %s bestaat niet. Gestopt." ++ ++#~ msgid "Authdir %s is not a directory. Aborting." ++#~ msgstr "Authdir %s niet herkend. Gestopt." ++ ++#~ msgid "Authdir %s is not owned by user %d, group %d. Aborting." ++#~ msgstr "Authdir %s is geen eigendom van gebruiker %d, groep %d. Gestopt." ++ ++#~ msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." ++#~ msgstr "Authdir %s heeft verkeerde rechten %o. Moet %o zijn. Gestopt." ++ ++#~ msgid "Max Item Count" ++#~ msgstr "Maximum aantal items" ++ ++#~ msgid "The maximum number of items to keep around in the list" ++#~ msgstr "Het maximum aantal items in de lijst" ++ ++# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst ++#~ msgid "Banner message text when chooser is empty" ++#~ msgstr "Welkomstbericht bij lege kieslijst" ++ ++# bekende/legale ++#~ msgid "Do not show known users in the login window" ++#~ msgstr "Legale gebruikers niet tonen in het aanmeldvenster" ++ ++#~ msgid "Enable accessibility keyboard plugin" ++#~ msgstr "Toetsenbordtoegankelijkheidsplug-in activeren" ++ ++#~ msgid "Enable on-screen keyboard" ++#~ msgstr "Schermtoetsenbord inschakelen" ++ ++#~ msgid "Enable screen magnifier" ++#~ msgstr "Vergrootglad inschakelen" ++ ++# klaar voor gebruik/gereed ++#~ msgid "Enable screen reader" ++#~ msgstr "Schermlezer inschakelen" ++ ++# welkomstlogo/aanmeldlogo ++#~ msgid "Icon name to use for greeter logo" ++#~ msgstr "Pictogramnaam voor het aanmeldlogo" ++ ++#~ msgid "Recently selected languages" ++#~ msgstr "Recent gebruikte talen" ++ ++#~ msgid "" ++#~ "Set to a list of languages to be shown by default in the login window." ++#~ msgstr "Instellen op een lijst van standaard weer te geven talen." ++ ++# thema van pictogramnaam/naam van het themapictogram ++#~ msgid "Set to the themed icon name to use for the greeter logo." ++#~ msgstr "" ++#~ "Ingesteld op de naam van het themapictogram dat gebruikt wordt voor het " ++#~ "aanmeldlogo." ++ ++#~ msgid "Set to true to disable showing known users in the login window." ++#~ msgstr "" ++#~ "Inschakelen om de gebruikers van het systeem niet te tonen in het " ++#~ "aanmeldvenster." ++ ++#~ msgid "Set to true to enable the XRandR settings manager plugin." ++#~ msgstr "Inschakelen om de plug-in voor xrandr te gebruiken." ++ ++#~ msgid "Set to true to enable the background settings manager plugin." ++#~ msgstr "Inschakelen om achtergrondinstellingenbeheer te gebruiken." ++ ++#~ msgid "Set to true to enable the media-keys settings manager plugin." ++#~ msgstr "" ++#~ "Inschakelen om de plug-in voor het beheer van de media-toetsen te " ++#~ "gebruiken." ++ ++#~ msgid "Set to true to enable the on-screen keyboard." ++#~ msgstr "Inschakelen om het schermtoetsenbord te gebruiken." ++ ++#~ msgid "" ++#~ "Set to true to enable the plugin to manage the accessibility keyboard " ++#~ "settings." ++#~ msgstr "Inschakelen om de toetsenbordtoegankelijkheidsplug-in te gebruiken." ++ ++#~ msgid "Set to true to enable the screen magnifier." ++#~ msgstr "Inschakelen om het vergrootglas te gebruiken." ++ ++#~ msgid "Set to true to enable the screen reader." ++#~ msgstr "Inschakelen om de schermlezer te gebruiken." ++ ++#~ msgid "Set to true to enable the sound settings manager plugin." ++#~ msgstr "" ++#~ "Inschakelen om de plug-in voor het beheer van de geluidsinstellingen te " ++#~ "gebruiken." ++ ++#~ msgid "Set to true to enable the xsettings settings manager plugin." ++#~ msgstr "" ++#~ "Inschakelen om de plug-in voor het beheer van de xsettings-instellingen " ++#~ "te gebruiken." ++ ++#~ msgid "Set to true to use Compiz as the window manager." ++#~ msgstr "Inschakelen om compiz voor het vensterbeheer te gebruiken." ++ ++#~ msgid "" ++#~ "Text banner message to show in the login window when the user chooser is " ++#~ "empty, instead of banner_message_text." ++#~ msgstr "" ++#~ "Tekst van het welkomstbericht in het aanmeldvenster wanneer de kieslijst " ++#~ "leeg is, in plaats van banner_message_text." ++ ++#~ msgid "True if the XRandR settings manager plugin is enabled." ++#~ msgstr "Ingeschakeld als de xrandr-plug-in gebruikt wordt." ++ ++#~ msgid "True if the background settings manager plugin is enabled." ++#~ msgstr "" ++#~ "Ingeschakeld als de plug-in voor achtergrondinstellingen gebruikt wordt." ++ ++#~ msgid "True if the media-keys settings manager plugin is enabled." ++#~ msgstr "" ++#~ "Ingeschakeld als de plug-in voor het beheer van de media-toetsen gebruikt " ++#~ "wordt." ++ ++#~ msgid "True if the sound settings manager plugin is enabled." ++#~ msgstr "" ++#~ "Ingeschakeld als de plug-in voor het beheer van de geluidsinstellingen " ++#~ "gebruikt wordt." ++ ++#~ msgid "True if the xsettings settings manager plugin is enabled." ++#~ msgstr "" ++#~ "Ingeschakeld als de plug-in voor xsettings-instellingen gebruikt wordt." ++ ++#~ msgid "Use Compiz as the window manager" ++#~ msgstr "Compiz gebruiken voor het vensterbeheer" ++ ++#~ msgid "Activation of this plugin" ++#~ msgstr "Activering van deze plug-in" ++ ++#~ msgid "Whether this plugin would be activated or not" ++#~ msgstr "Of deze plug-in wel of niet geactiveerd moet zijn" + + #~ msgid "AT-SPI Registry Wrapper" + #~ msgstr "AT SPI Registry Wrapper" +@@ -1086,9 +1152,6 @@ msgstr "Een schermafdruk maken" + #~ msgid "Power Manager" + #~ msgstr "Energiebeheer" + +-#~ msgid "Power management daemon" +-#~ msgstr "Energiebeheer-service" +- + #~ msgid "GNOME Session Acceleration Checker" + #~ msgstr "Controle van hardwareversnelling voor de Gnome-sessie" + +diff --git a/po/or.po b/po/or.po +index 9385520..0578c97 100644 +--- a/po/or.po ++++ b/po/or.po +@@ -3,15 +3,17 @@ + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. + # + # Subhransu Behera , 2006. +-# Manoj Kumar Giri , 2008, 2009, 2010, 2011. ++# Manoj Kumar Giri , 2008, 2009, 2010, 2011, 2012. + msgid "" + msgstr "" + "Project-Id-Version: or\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" +-"POT-Creation-Date: 2011-02-17 16:55+0000\n" +-"PO-Revision-Date: 2011-03-04 15:08+0530\n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" ++"product=gdm&keywords=I18N+L10N&component=general\n" ++"POT-Creation-Date: 2012-10-02 17:33+0000\n" ++"PO-Revision-Date: 2012-11-20 19:07+0530\n" + "Last-Translator: Manoj Kumar Giri \n" +-"Language-Team: Oriya \n" ++"Language-Team: Oriya \n" ++"Language: or\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +@@ -22,109 +24,105 @@ msgstr "" + "\n" + "\n" + "\n" +-"X-Generator: Lokalize 1.1\n" ++"X-Generator: Lokalize 1.5\n" + +-#: ../common/gdm-common.c:456 ++#: ../common/gdm-common.c:492 + #, c-format + msgid "/dev/urandom is not a character device" + msgstr "/dev/urandom ଟି ଗୋଟିଏ ସମ୍ପ୍ରତିକ ଉପକରଣ ନୁହଁ" + +-#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +-#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +-msgid "Display ID" +-msgstr "ID ପ୍ରଦର୍ଶନକରନ୍ତୁ" +- +-#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +-#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +-msgid "ID" +-msgstr "ID" +- +-#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +-#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 +-msgid "GNOME Display Manager Slave" +-msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ ଅଧୀନ" +- + #: ../daemon/gdm-display-access-file.c:300 + #, c-format + msgid "could not find user \"%s\" on system" + msgstr "ତନ୍ତ୍ରରେ ଚାଳକ \"%s\" କୁ ଖୋଜି ପାଉନାହିଁ" + +-#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:325 +-msgid "Unable to initialize login system" +-msgstr "ଲଗଇନ ତନ୍ତ୍ରକୁ ଆରମ୍ଭକରିବାରେ ଅସମର୍ଥ" ++#: ../daemon/gdm-display.c:1315 ../daemon/gdm-display.c:1349 ++#, c-format ++#| msgid "no user account available" ++msgid "No session available yet" ++msgstr "ଏପର୍ଯ୍ୟନ୍ତ କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ" ++ ++#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 ++#, c-format ++#| msgid "Unable to authorize user" ++msgid "Unable to look up UID of user %s" ++msgstr "ବ୍ୟବହାରକାରୀ %s ର UID କୁ ଦେଖିବାରେ ଅସମର୍ଥ" ++ ++#: ../daemon/gdm-manager.c:291 ++#| msgid "no user account available" ++msgid "no sessions available" ++msgstr "କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ" + +-#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:361 +-msgid "Unable to authenticate user" +-msgstr "ଚାଳକକୁ ବୈଧିକ୍ରୁତ କରିବାରେ ଅସମର୍ଥ" ++#: ../daemon/gdm-manager.c:352 ++#, c-format ++msgid "No sessions for %s available for reauthentication" ++msgstr "ପୁନଃ ବୈଧିକରଣ କରିବାକୁ %s ପାଇଁ କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ" + +-#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:418 +-msgid "Unable to authorize user" +-msgstr "ଚାଳକକୁ ପ୍ରାଧିକୃତ କରିବାରେ ଅସମର୍ଥ" ++#: ../daemon/gdm-manager.c:406 ++#, c-format ++#| msgid "Unable to open session" ++msgid "Unable to find session for user %s" ++msgstr "%s ପାଇଁ ଅଧିବେଶନ ଖୋଜିବାରେ ଅସମର୍ଥ" + +-#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:547 +-msgid "Unable to establish credentials" +-msgstr "ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକୁ ପ୍ରତିସ୍ଥାପନ କରିବାରେ ଅସମର୍ଥ" ++#: ../daemon/gdm-manager.c:476 ++#, c-format ++#| msgid "Unable to open session" ++msgid "Unable to find appropriate session for user %s" ++msgstr "ବ୍ୟବହାରକାରୀ %s ପାଇଁ ସଠିକ ଅଧିବେଶନ ଖୋଜିବାରେ ଅସମର୍ଥ" + +-#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:581 +-msgid "Unable to open session" +-msgstr "ଅଧିବେଶନ ଖୋଲିବାରେ ଅସମର୍ଥ" ++#: ../daemon/gdm-manager.c:671 ++#| msgid "User %s doesn't exist" ++msgid "User doesn't own session" ++msgstr "ବ୍ୟବହାରକାରୀଙ୍କର ଅଧିବେଶନ ନଥାଏ" + +-#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +-#: ../daemon/gdm-simple-slave.c:1259 +-msgid "" +-"Could not start the X server (your graphical environment) due to an internal " +-"error. Please contact your system administrator or check your syslog to " +-"diagnose. In the meantime this display will be disabled. Please restart GDM " +-"when the problem is corrected." +-msgstr "" +-"କିଛି ଅନ୍ତର୍ନିହିତ କାରଣ ବଶତଃ X ସର୍ଭର (ଆପଣଙ୍କ ଆଲେଖୀକ ପରିବେଶ) କୁ ପ୍ରାରମ୍ଭ କରିପାରିଲା ନାହିଁ. ଦୟାକରି " +-"ଆପଣଙ୍କର ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁକିମ୍ବା ଆପଣଙ୍କ ସମସ୍ଯାର କାରଣକୁ ନିରୂପଣ କରିବା ପାଇଁ " +-"ତନ୍ତ୍ରର ଲଗକୁ ଯାଞ୍ଚ କରନ୍ତୁ.ସେହି ସମୟରେ ଏହି ପ୍ରଦର୍ଶନଟି ନିଷ୍କ୍ରିୟ ହୋଇଯିବ. ଯେତେବେଳେ ସମସ୍ଯାଟି ସମଧାନ " +-"ହୋଇଯିବସେତେବେଳେ ଦୟାକରି GDM କୁ ପୁନଃ ପ୍ରାରମ୍ଭ କରିବେ." ++#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 ++#| msgid "no user account available" ++msgid "No session available" ++msgstr "କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ" + +-#: ../daemon/gdm-server.c:250 ++#: ../daemon/gdm-server.c:273 + #, c-format + msgid "%s: failed to connect to parent display '%s'" + msgstr "%s: ମୂଳ ପ୍ରଦର୍ଶନ '%s' ସହିତ ସଂଯୋଗ କରିବାରେ ଅସମର୍ଥ" + +-#: ../daemon/gdm-server.c:365 ++#: ../daemon/gdm-server.c:452 + #, c-format + msgid "Server was to be spawned by user %s but that user doesn't exist" +-msgstr "ଚାଳକ %s ଦ୍ୱାରା ସର୍ଭର ସୃଷ୍ଟି ହେବାର ଥିଲା କିନ୍ତୁ ସେହି ଚାଳକଟି ଅବସ୍ଥିତ ନାହିଁ" ++msgstr "" ++"ଚାଳକ %s ଦ୍ୱାରା ସର୍ଭର ସୃଷ୍ଟି ହେବାର ଥିଲା କିନ୍ତୁ ସେହି ଚାଳକଟି ଅବସ୍ଥିତ ନାହିଁ" + +-#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +-#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 ++#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 + #, c-format + msgid "Couldn't set groupid to %d" + msgstr "ସମୂହ ପରିଚୟକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ" + +-#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 ++#: ../daemon/gdm-server.c:469 + #, c-format + msgid "initgroups () failed for %s" + msgstr "%s ପାଇଁ initgroups () ବିଫଳ ହେଲା" + +-#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 ++#: ../daemon/gdm-server.c:475 + #, c-format + msgid "Couldn't set userid to %d" + msgstr "ଚାଳକ ପରିଚୟକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ" + +-#: ../daemon/gdm-server.c:435 ++#: ../daemon/gdm-server.c:522 + #, c-format + msgid "%s: Could not open log file for display %s!" + msgstr "%s: %s ପ୍ରଦର୍ଶନ ପାଇଁ ଲଗ ଫାଇଲକୁ ଖୋଲି ପାରିଲା ନାହିଁ!" + +-#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +-#: ../daemon/gdm-server.c:458 ++#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539 ++#: ../daemon/gdm-server.c:545 + #, c-format + msgid "%s: Error setting %s to %s" + msgstr "%s: %s କୁ %s ରେ ବିନ୍ଯାସ କରିବା ସମୟରେ ତ୍ରୁଟି" + +-#: ../daemon/gdm-server.c:478 ++#: ../daemon/gdm-server.c:565 + #, c-format + msgid "%s: Server priority couldn't be set to %d: %s" + msgstr "%s: ସେବକ ଅଗ୍ରଧିକାରକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ: %s" + +-#: ../daemon/gdm-server.c:631 ++#: ../daemon/gdm-server.c:722 + #, c-format + msgid "%s: Empty server command for display %s" + msgstr "%s: %s ପ୍ରଦର୍ଶନ ପାଇଁ ଗୋଟିଏ ଖାଲି ସେବକ ନିର୍ଦ୍ଦେଶ" +@@ -153,339 +151,374 @@ msgstr "ଯନ୍ତ୍ର ପ୍ରଦର୍ଶନକରନ୍ତୁ" + msgid "The display device" + msgstr "ପ୍ରଦର୍ଶନ ଉପକରଣ" + +-#: ../daemon/gdm-session-worker.c:1289 ++#: ../daemon/gdm-session.c:1184 ++#| msgid "%s: Could not read Authentication Names" ++msgid "Could not create authentication helper process" ++msgstr "ବୈଧିକରଣ ସହାୟକ ପ୍ରକ୍ରିୟା ପ୍ରସ୍ତୁତ କରିପାରିଲା ନାହିଁ" ++ ++#: ../daemon/gdm-session-worker.c:1029 + #, c-format +-msgid "error initiating conversation with authentication system: %s" +-msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ର ସହିତ ତ୍ରୁଟି ଆରମ୍ଭ କରୁଥିବା ବାର୍ତ୍ତାଳାପ: %s" ++#| msgid "error initiating conversation with authentication system: %s" ++msgid "error initiating conversation with authentication system - %s" ++msgstr "ବୈଧିକରଣ ତନ୍ତ୍ର ସହିତ ତ୍ରୁଟି ଆରମ୍ଭ କରୁଥିବା ବାର୍ତ୍ତାଳାପ - %s" + +-#: ../daemon/gdm-session-worker.c:1290 ++#: ../daemon/gdm-session-worker.c:1030 + msgid "general failure" + msgstr "ସାଧାରଣ ବିଫଳତା" + +-#: ../daemon/gdm-session-worker.c:1291 ++#: ../daemon/gdm-session-worker.c:1031 + msgid "out of memory" + msgstr "ସ୍ମୃତି ସ୍ଥାନର ଅଭାବ" + +-#: ../daemon/gdm-session-worker.c:1292 ++#: ../daemon/gdm-session-worker.c:1032 + msgid "application programmer error" + msgstr "ପ୍ରୟୋଗ ପ୍ରଗ୍ରାମ ତ୍ରୁଟି" + +-#: ../daemon/gdm-session-worker.c:1293 ++#: ../daemon/gdm-session-worker.c:1033 + msgid "unknown error" + msgstr "ଅଜଣା ତ୍ରୁଟି" + +-#: ../daemon/gdm-session-worker.c:1300 ++#: ../daemon/gdm-session-worker.c:1040 + msgid "Username:" + msgstr "ଚାଳକ ନାମ:" + +-#: ../daemon/gdm-session-worker.c:1306 ++#: ../daemon/gdm-session-worker.c:1046 + #, c-format + msgid "error informing authentication system of preferred username prompt: %s" +-msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଚାଳକନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" ++msgstr "" ++"ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଚାଳକନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" + +-#: ../daemon/gdm-session-worker.c:1320 ++#: ../daemon/gdm-session-worker.c:1060 + #, c-format + msgid "error informing authentication system of user's hostname: %s" +-msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଆଧାରନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" ++msgstr "" ++"ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଆଧାରନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" + +-#: ../daemon/gdm-session-worker.c:1335 ++#: ../daemon/gdm-session-worker.c:1077 + #, c-format + msgid "error informing authentication system of user's console: %s" + msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ଚାଳକର କୋନସୋଲର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" + +-#: ../daemon/gdm-session-worker.c:1348 ++#: ../daemon/gdm-session-worker.c:1101 + #, c-format + msgid "error informing authentication system of display string: %s" + msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ବାକ୍ୟଖଣ୍ଡ ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" + +-#: ../daemon/gdm-session-worker.c:1363 ++#: ../daemon/gdm-session-worker.c:1116 + #, c-format + msgid "error informing authentication system of display xauth credentials: %s" +-msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ xauth ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକର ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" ++msgstr "" ++"ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ xauth ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକର ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" + +-#: ../daemon/gdm-session-worker.c:1660 ../daemon/gdm-session-worker.c:1677 ++#: ../daemon/gdm-session-worker.c:1446 ../daemon/gdm-session-worker.c:1463 + #, c-format + msgid "no user account available" + msgstr "କୌଣସି ଚାଳକ ଖାତା ଉପଲବ୍ଧ ନାହିଁ" + +-#: ../daemon/gdm-session-worker.c:1704 ++#: ../daemon/gdm-session-worker.c:1490 + msgid "Unable to change to user" + msgstr "ଚାଳକକୁ ପରିବର୍ତ୍ତନ ହେବାରେ ଅସମର୍ଥ" + +-#: ../daemon/gdm-welcome-session.c:549 +-#, c-format +-msgid "User %s doesn't exist" +-msgstr "ଚାଳକ %s ଅବସ୍ଥିତ ନାହିଁ" +- +-#: ../daemon/gdm-welcome-session.c:556 +-#, c-format +-msgid "Group %s doesn't exist" +-msgstr "ସମୂହ %s ଅବସ୍ଥିତ ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:604 +-msgid "Could not create socket!" +-msgstr "ସକେଟ ସ୍ରୁଷ୍ଟି କରିପାରିଲା ନାହିଁ!" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:873 +-#, c-format +-msgid "Denied XDMCP query from host %s" +-msgstr "%s ଆଧାରରୁ XDMCP ପ୍ରଶ୍ନ ପଚାରିବାରୁ ମନା କରାଗଲା" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1031 +-#: ../daemon/gdm-xdmcp-display-factory.c:1255 +-msgid "Could not extract authlist from packet" +-msgstr "ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1044 +-#: ../daemon/gdm-xdmcp-display-factory.c:1270 +-msgid "Error in checksum" +-msgstr "ଯାଞ୍ଚ ସମଷ୍ଟିରେ ତ୍ରୁଟି" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1523 +-msgid "Bad address" +-msgstr "ଖରାପ ଠିକଣା" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1607 +-#, c-format +-msgid "%s: Could not read display address" +-msgstr "%s: ପ୍ରଦର୍ଶନ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1615 +-#, c-format +-msgid "%s: Could not read display port number" +-msgstr "%s: ପ୍ରଦର୍ଶନ ସଂଯୋଗିକୀ ସଂଖ୍ଯା ପଢି ପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1624 +-#, c-format +-msgid "%s: Could not extract authlist from packet" +-msgstr "%s: ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1644 +-#, c-format +-msgid "%s: Error in checksum" +-msgstr "%s: ଚେକ-ଶମରେ ତ୍ରୁଟି" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2200 +-#, c-format +-msgid "%s: Got REQUEST from banned host %s" +-msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ ନିବେଦନ ମିଳିଲା" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2210 +-#: ../daemon/gdm-xdmcp-display-factory.c:2568 +-#: ../daemon/gdm-xdmcp-display-factory.c:2822 +-#, c-format +-msgid "%s: Could not read Display Number" +-msgstr "%s: ପ୍ରତର୍ଶନ ସଂଖ୍ଯାକୁ ପଢି ପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2217 +-#, c-format +-msgid "%s: Could not read Connection Type" +-msgstr "%s: ସଂଯୋଗ ପ୍ରକାରକୁ ପଢି ପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2224 +-#, c-format +-msgid "%s: Could not read Client Address" +-msgstr "%s: ଗ୍ରାହକ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2232 +-#, c-format +-msgid "%s: Could not read Authentication Names" +-msgstr "%s: ବୈଧିକରଣ ନାମ ମାନଙ୍କୁ ପଢି ପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2241 +-#, c-format +-msgid "%s: Could not read Authentication Data" +-msgstr "%s: ବୈଧିକରଣ ତଥ୍ଯକୁ ପଢି ପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2251 +-#, c-format +-msgid "%s: Could not read Authorization List" +-msgstr "%s: ବୈଧିକରଣ ତାଲିକାକୁ ପଢି ପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2270 +-#, c-format +-msgid "%s: Could not read Manufacturer ID" +-msgstr "%s: ନିର୍ମାତା ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2297 +-#, c-format +-msgid "%s: Failed checksum from %s" +-msgstr "%s: %s ରୁ ଚେକ-ଶମ ଅସଫଳ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2552 +-#, c-format +-msgid "%s: Got Manage from banned host %s" +-msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ Manage ପାଇଲା" ++#: ../daemon/gdm-simple-slave.c:1381 ++msgid "" ++"Could not start the X server (your graphical environment) due to an internal " ++"error. Please contact your system administrator or check your syslog to " ++"diagnose. In the meantime this display will be disabled. Please restart GDM " ++"when the problem is corrected." ++msgstr "" ++"କିଛି ଅନ୍ତର୍ନିହିତ କାରଣ ବଶତଃ X ସର୍ଭର (ଆପଣଙ୍କ ଆଲେଖୀକ ପରିବେଶ) କୁ ପ୍ରାରମ୍ଭ " ++"କରିପାରିଲା ନାହିଁ. ଦୟାକରି " ++"ଆପଣଙ୍କର ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁକିମ୍ବା ଆପଣଙ୍କ ସମସ୍ଯାର କାରଣକୁ " ++"ନିରୂପଣ କରିବା ପାଇଁ " ++"ତନ୍ତ୍ରର ଲଗକୁ ଯାଞ୍ଚ କରନ୍ତୁ.ସେହି ସମୟରେ ଏହି ପ୍ରଦର୍ଶନଟି ନିଷ୍କ୍ରିୟ ହୋଇଯିବ. " ++"ଯେତେବେଳେ ସମସ୍ଯାଟି ସମଧାନ " ++"ହୋଇଯିବସେତେବେଳେ ଦୟାକରି GDM କୁ ପୁନଃ ପ୍ରାରମ୍ଭ କରିବେ." + +-#: ../daemon/gdm-xdmcp-display-factory.c:2561 +-#: ../daemon/gdm-xdmcp-display-factory.c:2829 ++#: ../daemon/gdm-simple-slave.c:1422 + #, c-format +-msgid "%s: Could not read Session ID" +-msgstr "%s: ଅଧିବେଶନ ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ" ++msgid "Can only be called before user is logged in" ++msgstr "କେବଳ ବ୍ୟବହାରକାରୀ ଲଗଇନ ପୂର୍ବରୁ ଡ଼ାକି ପାରିବେ" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2575 ++#: ../daemon/gdm-simple-slave.c:1432 + #, c-format +-msgid "%s: Could not read Display Class" +-msgstr "%s: ପ୍ରଦର୍ଶନ ଶ୍ରେଣୀକୁ ପଢି ପାରିଲା ନାହିଁ" ++msgid "Caller not GDM" ++msgstr "କଲର GDM ନୁହଁ" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2681 +-#: ../daemon/gdm-xdmcp-display-factory.c:2731 +-#: ../daemon/gdm-xdmcp-display-factory.c:2737 +-#, c-format +-msgid "%s: Could not read address" +-msgstr "%s: ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" ++#: ../daemon/gdm-simple-slave.c:1485 ++#| msgid "Currently logged in" ++msgid "User not logged in" ++msgstr "ବ୍ୟବହାରକାରୀ ଲଗଇନ ହୋଇ ନାହିଁ" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2812 ++#: ../daemon/gdm-xdmcp-chooser-slave.c:370 + #, c-format +-msgid "%s: Got KEEPALIVE from banned host %s" +-msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ KEEPALIVE ପାଇଲା" ++msgid "Currently, only one client can be connected at once" ++msgstr "ବର୍ତ୍ତମାନ, ଏକ ସମୟରେ କେବଳ ଗୋଟିଏ କ୍ଲାଏଣ୍ଟ ସଂଯୁକ୍ତ ହୋଇପାରିବ" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2902 +-msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" +-msgstr "GdmXdmcpDisplayFactory: XDMC ଶୀର୍ଷକକୁ ପଢି ପାରିଲା ନାହିଁ!" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2908 +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 +-msgid "XMDCP: Incorrect XDMCP version!" +-msgstr "XMDCP: ଭୂଲ XDMCP ସଂସ୍କରଣ!" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2914 +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 +-msgid "XMDCP: Unable to parse address" +-msgstr "XMDCP: ଠିକଣା ବିଶ୍ଳେଷଣ କରିବାରେ ଅସମର୍ଥ" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:3359 +-#, c-format +-msgid "Could not get server hostname: %s!" +-msgstr "ସର୍ଭର ଆଧାର ନାମକୁ ପାଇ ପାରିଲା ନାହିଁ: %s!" ++#: ../daemon/gdm-xdmcp-display-factory.c:604 ++msgid "Could not create socket!" ++msgstr "ସକେଟ ସ୍ରୁଷ୍ଟି କରିପାରିଲା ନାହିଁ!" + +-#: ../daemon/main.c:237 ../daemon/main.c:250 ++#: ../daemon/main.c:126 ../daemon/main.c:139 + #, c-format + msgid "Cannot write PID file %s: possibly out of disk space: %s" + msgstr "PID ଫାଇଲ %s କୁ ଲେଖି ପାରିବ ନାହିଁ: ସମ୍ଭବତଃ ଡିସ୍କରେ ଖାଲି ସ୍ଥାନ ନାହିଁ: %s" + +-#: ../daemon/main.c:271 ++#: ../daemon/main.c:160 + #, c-format + msgid "Logdir %s does not exist or isn't a directory." + msgstr "Logdir %s ଅବସ୍ଥିତ ନୁହେଁ କିମ୍ବା ଏହା ଗୋଟିଏ ଡିରେକ୍ଟେରି ନୁହେଁ" + +-#: ../daemon/main.c:287 ++#: ../daemon/main.c:176 + #, c-format + msgid "Authdir %s does not exist. Aborting." + msgstr "Authdir %s ଅବସ୍ଥିତ ନୁହେଁ. ତେଣୁ ଏହାକୁ ପରିତ୍ଯାଗ କରୁଅଛି." + +-#: ../daemon/main.c:291 ++#: ../daemon/main.c:180 + #, c-format + msgid "Authdir %s is not a directory. Aborting." + msgstr "Authdir %s ଗୋଟିଏ ଡିରେକ୍ଟୋରି ନୁହେଁ. ପରିତ୍ଯାଗ କରୁଅଛି." + +-#: ../daemon/main.c:365 ++#: ../daemon/main.c:254 + #, c-format + msgid "Authdir %s is not owned by user %d, group %d. Aborting." +-msgstr "Authdir %s ଟି ଚାଳକ %d, ସମୂହ %d ଦ୍ବାରା ଅଧିକ୍ରୁତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି." ++msgstr "" ++"Authdir %s ଟି ଚାଳକ %d, ସମୂହ %d ଦ୍ବାରା ଅଧିକ୍ରୁତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି." + +-#: ../daemon/main.c:372 ++#: ../daemon/main.c:261 + #, c-format + msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." +-msgstr "Authdir %s ନିକଟରେ ଭୂଲ ପ୍ରବେଶାନୁମତି %o ଅଛି. ଏହା %o ହେବା ଉଚିତ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି." ++msgstr "" ++"Authdir %s ନିକଟରେ ଭୂଲ ପ୍ରବେଶାନୁମତି %o ଅଛି. ଏହା %o ହେବା ଉଚିତ. ତେଣୁ ପରିତ୍ଯାଗ " ++"କରୁଅଛି." + +-#: ../daemon/main.c:409 ++#: ../daemon/main.c:298 + #, c-format + msgid "Can't find the GDM user '%s'. Aborting!" + msgstr "'%s' GDM ଚାଳକକୁ ପାଇ ପାରିବ ନାହିଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!" + +-#: ../daemon/main.c:415 ++#: ../daemon/main.c:304 + msgid "The GDM user should not be root. Aborting!" + msgstr "GDM ଚାଳକ ପ୍ରମୂଖ ଚାଳକ ହେବା ଉଚିତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!" + +-#: ../daemon/main.c:421 ++#: ../daemon/main.c:310 + #, c-format + msgid "Can't find the GDM group '%s'. Aborting!" + msgstr "'%s' GDM ସମୂହକୁ ପାଇ ପାରିବ ନାହିଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!" + +-#: ../daemon/main.c:427 ++#: ../daemon/main.c:316 + msgid "The GDM group should not be root. Aborting!" + msgstr "GDM ସମୂହ ପ୍ରମୂଖ ଚାଳକ ହେବା ଉଚିତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!" + +-#: ../daemon/main.c:533 ++#: ../daemon/main.c:427 + msgid "Make all warnings fatal" + msgstr "ସବୁ ଚେତାବନୀଗୁଡିକୁ ମାରାତ୍ମକ କରନ୍ତୁ" + +-#: ../daemon/main.c:534 ++#: ../daemon/main.c:428 + msgid "Exit after a time (for debugging)" + msgstr "ଗୋଟିଏ ସମୟ ପରେ ପ୍ରସ୍ଥାନକରନ୍ତୁ (ତ୍ରୁଟି ନିବାରଣ ପାଇଁ)" + +-#: ../daemon/main.c:535 ++#: ../daemon/main.c:429 + msgid "Print GDM version" + msgstr "ଜି.ଡି.ଏମ. ସଂସ୍କରଣକୁ ମୂଦ୍ରଣ କରନ୍ତୁ" + +-#: ../daemon/main.c:550 ++#: ../daemon/main.c:442 + msgid "GNOME Display Manager" + msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ" + + #. make sure the pid file doesn't get wiped +-#: ../daemon/main.c:616 ++#: ../daemon/main.c:492 + msgid "Only the root user can run GDM" + msgstr "କେବଳ ପ୍ରମୂଖ ଚାଳକ GDM କୁ ଚଳାଇ ପାରିବେ" + + #. Translators: worker is a helper process that does the work + #. of starting up a session +-#: ../daemon/session-worker-main.c:158 ++#: ../daemon/session-worker-main.c:150 + msgid "GNOME Display Manager Session Worker" + msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ ଅଧିବେଶନ କାର୍ଯ୍ୟକର୍ତ୍ତା" + +-#: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 +-msgid "AT-SPI Registry Wrapper" +-msgstr "AT-SPI ପଞ୍ଜିକରଣ ଆବରଣ" +- +-#: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1753 +-msgid "Login Window" +-msgstr "ଲଗଇନ ୱିଣ୍ଡୋ" ++#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 ++msgid "Display ID" ++msgstr "ID ପ୍ରଦର୍ଶନକରନ୍ତୁ" + +-#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:1 +-msgid "Power Manager" +-msgstr "ଶକ୍ତି ପରିଚାଳକ" ++#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 ++msgid "ID" ++msgstr "ID" + +-#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:2 +-msgid "Power management daemon" +-msgstr "ଶକ୍ତି ପରିଚାଳନ ଡେମନ" ++#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 ++msgid "GNOME Display Manager Slave" ++msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ ଅଧୀନ" + +-#: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 +-msgid "GNOME Settings Daemon" +-msgstr "GNOME ବିନ୍ୟାସ ଡେମନ" ++#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1 ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566 ++msgid "Login Window" ++msgstr "ଲଗଇନ ୱିଣ୍ଡୋ" + +-#: ../data/greeter-autostart/gnome-mag.desktop.in.h:1 ++#: ../data/applications/gnome-mag.desktop.in.h:1 + msgid "GNOME Screen Magnifier" + msgstr "GNOME ପରଦା ଆକାର ବର୍ଦ୍ଧନକର୍ତ୍ତା" + +-#: ../data/greeter-autostart/gnome-mag.desktop.in.h:2 ++#: ../data/applications/gnome-mag.desktop.in.h:2 + msgid "Magnify parts of the screen" + msgstr "ପରଦାର ବର୍ଦ୍ଧିତ ଅଂଶ" + +-#: ../data/greeter-autostart/gok.desktop.in.h:1 ++#: ../data/applications/gnome-shell.desktop.in.h:1 ++msgid "GNOME Shell" ++msgstr "GNOME ସେଲ" ++ ++#: ../data/applications/gnome-shell.desktop.in.h:2 ++#| msgid "Power management daemon" ++msgid "Window management and compositing" ++msgstr "ୱିଣ୍ଡୋ ପରିଚାଳନ ଏବଂ ମିଶ୍ରିତ" ++ ++#: ../data/applications/gok.desktop.in.h:1 + msgid "GNOME On-Screen Keyboard" + msgstr "GNOME ଅନସ୍କ୍ରିନ କି ବୋର୍ଡ" + +-#: ../data/greeter-autostart/gok.desktop.in.h:2 ++#: ../data/applications/gok.desktop.in.h:2 + msgid "Use an on-screen keyboard" + msgstr "ଗୋଟିଏ ଅନସ୍କ୍ରିନ କି ବୋର୍ଡ ବ୍ୟବହାର କରନ୍ତୁ" + +-#: ../data/greeter-autostart/metacity.desktop.in.h:1 +-msgid "Metacity" +-msgstr "Metacity" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:1 ++msgid "Whether or not to allow fingerprint readers for login" ++msgstr "ଅଙ୍ଗୁଳିଚିହ୍ନ ପାଠକକୁ ଲଗଇନ ପାଇଁ ଅନୁମତି ଦେବା ଉଚିତ କି ନୁହଁ" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 ++msgid "" ++"The login screen can optionally allow users who have enrolled their " ++"fingerprints to log in using those prints." ++msgstr "" ++"ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ଅଙ୍ଗୁଳିଚିହ୍ନ ଦାଖଲ କରିଥିବା ବ୍ୟବହାରକାରୀମାନଙ୍କୁ ସେହି " ++"ଚିହ୍ନ ବ୍ୟବହାର କରି " ++"ଲଗଇନ କରିବାକୁ ଅନୁମତି ଦେଇଥାଏ।" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:3 ++msgid "Whether or not to allow smartcard readers for login" ++msgstr "ଲଗଇନ ପାଇଁ ସ୍ମାର୍ଟକାର୍ଡ ପାଠକକୁ ଅନୁମତି ଦେବା ଉଚିତ କି ନୁହଁ" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 ++msgid "" ++"The login screen can optionally allow users who have smartcards to log in " ++"using those smartcards." ++msgstr "" ++"ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ବ୍ୟବହାରକାରୀମାନଙ୍କୁ ଅନୁମତି ଦେଇଥାଏ ଯାହା ପାଖରେ " ++"ଲଗଇନ ପାଇଁ ସ୍ମାର୍ଟକାର୍ଡ ଥାଏ।" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:5 ++msgid "Path to small image at top of user list" ++msgstr "ବ୍ୟବହାରକାରୀ ତାଲିକା ଉପରେ ଛୋଟ ପ୍ରତିଛବି ପାଇଁ ପଥ" + +-#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1 +-msgid "Orca Screen Reader" +-msgstr "Orca ପରଦା ପାଠକ" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 ++msgid "" ++"The login screen can optionally show a small image at the top of its user " ++"list to provide site administrators and distributions a way to provide " ++"branding." ++msgstr "" ++"ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ବ୍ୟବହାରକାରୀ ତାଲିକା ଉପରେ ସାଇଟ ପ୍ରଶାସକ ଏବଂ " ++"ବଣ୍ଟନକାରୀମାନଙ୍କୁ " ++"ପ୍ରଦାନ କରିବା ପାଇଁ ଏକ ଛୋଟ ପ୍ରତିଛବି ଦର୍ଶାଇଥାଏ।" + +-#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:2 +-msgid "Present on-screen information as speech or braille" +-msgstr "ଅନ-ସ୍କ୍ରିନ ସୂଚନାକୁ ବାର୍ତ୍ତାଳାପ ଅଥବା ବ୍ରେଲି ଲିପିରେ ଉପସ୍ଥାପନ କରନ୍ତୁ" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 ++msgid "" ++"The fallback login screen can optionally show a small image at the top of " ++"its user list to provide site administrators and distributions a way to " ++"provide branding." ++msgstr "" ++"ଫଲବ୍ୟାକ ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ଏକ ଛୋଟ ପ୍ରତିଛବିକୁ ବ୍ୟବହାରକାରୀ ତାଲିକା ଉପରେ " ++"ସାଇଟ ପ୍ରଶାସକ ଏବଂ ବଣ୍ଟନକାରୀମାନଙ୍କୁ ପ୍ରଦାନ କରିବା ପାଇଁଦର୍ଶାଇପାରିବ।" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:8 ++msgid "Avoid showing user list" ++msgstr "ବ୍ୟବହାରକାରୀ ତାଲିକା ଦର୍ଶାନ୍ତୁ ନାହିଁ" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 ++msgid "" ++"The login screen normally shows a list of available users to log in as. This " ++"setting can be toggled to disable showing the user list." ++msgstr "" ++"ଲଗଇନ ପରଦା ସାଧାରଣତଃ ଉପଲବ୍ଧ ବ୍ୟବହାରକାରୀ ତାଲିକାକୁ ଲଗଇନ ପାଇଁ ଦର୍ଶାଇଥାଏ। " ++"ଏହି ସଂରଚନାକୁ ବ୍ୟବହାରକାରୀ ତାଲିକା ଦର୍ଶାଇ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଆଗପଛ କରିହେବ।" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:10 ++msgid "Enable showing the banner message" ++msgstr "ପତାକା ସନ୍ଦେଶ ଦର୍ଶାଇବାକୁ ସକ୍ରିୟ କରନ୍ତୁ" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:11 ++msgid "Set to true to show the banner message text." ++msgstr "ପତାକା ସଂଦେଶ ଦର୍ଶାଇବା ପାଇଁ true ସେଟକରନ୍ତୁ." ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:12 ++msgid "Banner message text" ++msgstr "ପତାକା ସନ୍ଦେଶ ପାଠ୍ୟ" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:13 ++msgid "Text banner message to show in the login window." ++msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ।" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:14 ++msgid "Disable showing the restart buttons" ++msgstr "ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:15 ++msgid "Set to true to disable showing the restart buttons in the login window." ++msgstr "" ++"ଲଗଇନ ୱିଣ୍ଡୋରେ ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ true " ++"ସେଟକରନ୍ତୁ।" + +-#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1 +-msgid "PolicyKit Authentication Agent" +-msgstr "PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 ++#| msgid "%s: Could not read Authentication Names" ++msgid "Number of allowed authentication failures" ++msgstr "ଅନୁମତିପ୍ରାପ୍ତ ବୈଧିକରଣ ବିଫଳତା ସଂଖ୍ୟା" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 ++msgid "" ++"The number of times a user is allowed to attempt authentication, before " ++"giving up and going back to user selection." ++msgstr "" ++"ତ୍ୟାଗକରିବା ପୂର୍ବରୁ ଏବଂ ବ୍ୟବହାରକାରୀ ଚୟନ କରିବା ପୂର୍ବରୁ " ++"ବ୍ୟବହାରକାରୀଙ୍କୁ ଅନୁମତି ପ୍ରାପ୍ତ ପ୍ରୟାସ ସଂଖ୍ୟା।" ++ ++#: ../gui/libgdm/gdm-user-switching.c:72 ++#| msgid "Unable to start new display" ++msgid "Unable to create transient display: " ++msgstr "ଅସ୍ଥାୟୀ ପ୍ରଦର୍ଶନୀ ନିର୍ମାଣ କରିବାରେ ଅସମର୍ଥ:" ++ ++#: ../gui/libgdm/gdm-user-switching.c:183 ++#: ../gui/libgdm/gdm-user-switching.c:395 ++#| msgid "Unable to open session" ++msgid "Unable to activate session: " ++msgstr "ଅଧିବେଶନ ସକ୍ରିୟ କରିବାରେ ଅସମର୍ଥ:" ++ ++#: ../gui/libgdm/gdm-user-switching.c:344 ++#: ../gui/libgdm/gdm-user-switching.c:512 ++#, c-format ++msgid "Could not identify the current session." ++msgstr "ପ୍ରଚଳିତ ଅଧିବେଶନକୁ ଚିହ୍ନିପାରିଲା ନାହିଁ." ++ ++#: ../gui/libgdm/gdm-user-switching.c:351 ++#, c-format ++#| msgid "Unable to open session" ++msgid "User unable to switch sessions." ++msgstr "ଅଧିବେଶନ ବଦଳାଇବାରେ ବ୍ୟବହାରକାରୀ ଅସମର୍ଥ।" ++ ++#: ../gui/libgdm/gdm-user-switching.c:521 ++#, c-format ++#| msgid "Could not identify the current session." ++msgid "Could not identify the current seat." ++msgstr "ପ୍ରଚଳିତ ସ୍ଥାନକୁ ଚିହ୍ନିପାରିଲା ନାହିଁ।" ++ ++#: ../gui/libgdm/gdm-user-switching.c:531 ++#, c-format ++msgid "" ++"The system is unable to determine whether to switch to an existing login " ++"screen or start up a new login screen." ++msgstr "" ++"ତନ୍ତ୍ର ଏକ ସ୍ଥିତବାନ ଲଗଇନ ପରଦା କିମ୍ବା ନୂତନ ଲଗଇନ ପରଦା ଆରମ୍ଭ କରିବାକୁ " ++"ନିର୍ଦ୍ଧାରଣ କରିବାରେ ଅସମର୍ଥ।" ++ ++#: ../gui/libgdm/gdm-user-switching.c:539 ++#, c-format ++msgid "The system is unable to start up a new login screen." ++msgstr "ତନ୍ତ୍ର ଏକ ନୂତନ ଲଗଇନ ପରଦା ଆରମ୍ଭ କରିବାରେ ଅସମର୍ଥ।" + + #: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 + msgid "Select System" +@@ -499,6 +532,125 @@ msgstr "XDMCP: XDMCP ବଫର ସୃଷ୍ଟି କରିପାରିଲା + msgid "XDMCP: Could not read XDMCP header!" + msgstr "XDMCP: XDMC ଶୀର୍ଷକକୁ ପଢି ପାରିଲା ନାହିଁ!" + ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 ++msgid "XMDCP: Incorrect XDMCP version!" ++msgstr "XMDCP: ଭୂଲ XDMCP ସଂସ୍କରଣ!" ++ ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 ++msgid "XMDCP: Unable to parse address" ++msgstr "XMDCP: ଠିକଣା ବିଶ୍ଳେଷଣ କରିବାରେ ଅସମର୍ଥ" ++ ++#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 ++#| msgid "PolicyKit Authentication Agent" ++msgid "Fingerprint Authentication" ++msgstr "ଅଙ୍ଗୁଳି ଚିହ୍ନ ବୈଧିକରଣ" ++ ++#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 ++msgid "Log into session with fingerprint" ++msgstr "ଅଙ୍ଗୁଳିଚିହ୍ନ ସହାୟତାରେ ଲଗଇନ କରନ୍ତୁ" ++ ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 ++#| msgid "PolicyKit Authentication Agent" ++msgid "Password Authentication" ++msgstr "ପ୍ରବେଶ ସଂକେତ ବୈଧିକରଣ" ++ ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 ++msgid "Log into session with username and password" ++msgstr "ବ୍ୟବହାରକାରୀ ନାମ ଏବଂ ପ୍ରବେଶ ସଂକେତ ସହାୟତାରେ ଅଧିବେଶନରେ ଲଗଇନ କରନ୍ତୁ" ++ ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 ++msgid "Log In" ++msgstr "ଲଗଇନ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 ++msgid "Slot ID" ++msgstr "ସ୍ଲଟ ID" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 ++msgid "The slot the card is in" ++msgstr "ଯେଉଁ ସ୍ଲଟରେ କାର୍ଡ ଅଛି" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 ++msgid "Slot Series" ++msgstr "ସ୍ଲଟ କ୍ରମ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 ++msgid "per-slot card identifier" ++msgstr "ସ୍ଲଟ ପ୍ରତି କାର୍ଡ ପରିଚାୟକ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 ++#| msgid "Username" ++msgid "name" ++msgstr "ନାମ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 ++msgid "Module" ++msgstr "ମଡ୍ଯୁଲ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 ++msgid "smartcard driver" ++msgstr "ସ୍ମାର୍ଟକାର୍ଡ ଡ୍ରାଇଭର" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 ++msgid "Smartcard Authentication" ++msgstr "ସ୍ମାର୍ଟକାର୍ଡ ବୈଧିକରଣ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 ++msgid "Log into session with smartcard" ++msgstr "ସ୍ମାର୍ଟକାର୍ଡ ସହାୟତାରେ ଅଧିବେଶନରେ ଲଗଇନ କରନ୍ତୁ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 ++msgid "Module Path" ++msgstr "ମଡ୍ଯୁଲ ପଥ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 ++msgid "path to smartcard PKCS #11 driver" ++msgstr "ସ୍ମାର୍ଟକାର୍ଡ PKCS #11 ଡ୍ରାଇଭର ପାଇଁ ପଥ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 ++msgid "received error or hang up from event source" ++msgstr "ତ୍ରୁଟି ଗ୍ରହଣ କରିଛି ଅଥବା ଘଟଣା ଉତ୍ସରୁ ବାହାରିଯାଇଛି" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 ++#, c-format ++msgid "NSS security system could not be initialized" ++msgstr "NSS ସୁରକ୍ଷା ତନ୍ତ୍ରକୁ ଆରମ୍ଭ କରିହେଲା ନାହିଁ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 ++#, c-format ++msgid "no suitable smartcard driver could be found" ++msgstr "ଉପଯୁକ୍ତ ସ୍ମାର୍ଟକାର୍ଡ ଡ୍ରାଇଭର ମିଳିଲା ନାହିଁ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 ++#, c-format ++msgid "smartcard driver '%s' could not be loaded" ++msgstr "ସ୍ମାର୍ଟକାର୍ଡ ଡ୍ରାଇଭର '%s' କୁ ଧାରଣ କରିହେଲା ନାହିଁ" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 ++#, c-format ++msgid "could not watch for incoming card events - %s" ++msgstr "ଆସୁଥିବା କାର୍ଡ ଘଟଣାଗୁଡ଼ିକୁ ଦେଖିପାରିଲା ନାହିଁ - %s" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 ++#, c-format ++msgid "encountered unexpected error while waiting for smartcard events" ++msgstr "" ++"ସ୍ମାର୍ଟକାର୍ଡ ଘଟଣାଗୁଡ଼ିକ ପାଇଁ ଅପେକ୍ଷା କରିଥିବା ସମୟରେ ଅପ୍ରତ୍ୟାଶିତ ତ୍ରୁଟିର " ++"ସମ୍ମୁଖିନ ହୋଇଥିଲା" ++ ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 ++#| msgid "PolicyKit Authentication Agent" ++msgid "Authentication" ++msgstr "ବୈଧିକରଣ" ++ ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 ++#| msgid "Custom session" ++msgid "Log into session" ++msgstr "ଅଧିବେଶନରେ ଲଗଇନ କରନ୍ତୁ" ++ + #: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 + msgid "Value" + msgstr "ମୂଲ୍ଯ" +@@ -559,101 +711,69 @@ msgstr "%a %l:%M:%S %p" + msgid "%a %l:%M %p" + msgstr "%a %l:%M %p" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:314 + msgid "Automatically logging in…" + msgstr "ସ୍ବୟଂଚାଳିତ ଭାବରେ ଲଗଇନ କରୁଅଛି…" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:582 +-msgid "Select language and click Log In" +-msgstr "ଭାଷା ଚୟନକରନ୍ତୁ ଏବଂ ଲଗଇନ ଦବାନ୍ତୁ" +- + #. need to wait for response from backend +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:699 ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:930 + msgid "Cancelling…" + msgstr "ବାତିଲ କରୁଅଛି…" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1087 ++#. just wait for the user to select language and stuff ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 ++msgid "Select language and click Log In" ++msgstr "ଭାଷା ଚୟନକରନ୍ତୁ ଏବଂ ଲଗଇନ ଦବାନ୍ତୁ" ++ ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 + msgctxt "customsession" + msgid "Custom" + msgstr "ଇଚ୍ଛାମୁତାବକ" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1088 ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623 + msgid "Custom session" + msgstr "ଇଚ୍ଛାମୁତାବକ ଅଧିବେଶନ" + + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +-#| msgid "Panel" +-msgid "Cancel" +-msgstr "ବାତିଲ କରନ୍ତୁ" +- +-#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 + msgid "Computer Name" + msgstr "କମ୍ପୁଟର ନାମ" + ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 ++msgid "Version" ++msgstr "ସଂସ୍କରଣ" ++ + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +-msgid "Login" +-msgstr "ଲଗଇନ" ++msgid "Cancel" ++msgstr "ବାତିଲ କରନ୍ତୁ" + + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 + msgid "Unlock" + msgstr "ଖୋଲନ୍ତୁ" + + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 +-msgid "Version" +-msgstr "ସଂସ୍କରଣ" ++msgid "Login" ++msgstr "ଲଗଇନ" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:907 ++#: ../gui/simple-greeter/gdm-greeter-panel.c:953 + msgid "Suspend" + msgstr "ନିଲମ୍ବନ କରନ୍ତୁ" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:912 ++#: ../gui/simple-greeter/gdm-greeter-panel.c:958 + msgid "Restart" + msgstr "ପୂନଃପ୍ରାରମ୍ଭ କରନ୍ତୁ" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:916 ++#: ../gui/simple-greeter/gdm-greeter-panel.c:962 + msgid "Shut Down" + msgstr "ବନ୍ଦ କରନ୍ତୁ" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:965 ++#: ../gui/simple-greeter/gdm-greeter-panel.c:1011 + msgid "Unknown time remaining" + msgstr "କେତେ ସମୟ ବଳିଛି ଜଣାନାହିଁ" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:987 ++#: ../gui/simple-greeter/gdm-greeter-panel.c:1033 + msgid "Panel" + msgstr "ଫଳକ" + +-#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 +-msgid "Languages" +-msgstr "ଭାଷା" +- +-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 +-msgid "_Languages:" +-msgstr "ଭାଷା (_L):" +- +-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 +-msgid "_Language:" +-msgstr "ଭାଷା (_L):" +- +-#. translators: This brings up a dialog +-#. * with a list of languages to choose from +-#. +-#: ../gui/simple-greeter/gdm-language-option-widget.c:231 +-msgctxt "language" +-msgid "Other…" +-msgstr "ଅନ୍ଯାନ୍ଯ…" +- +-#: ../gui/simple-greeter/gdm-language-option-widget.c:232 +-msgid "Choose a language from the full list of available languages." +-msgstr "ଉପଲବ୍ଧ ଭାଷାଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକାରୁ ଭାଷା ଚୟନ କରନ୍ତୁ." +- +-#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +-msgid "Language" +-msgstr "ଭାଷା" +- +-#: ../gui/simple-greeter/gdm-languages.c:709 +-msgid "Unspecified" +-msgstr "ଅନିର୍ଦ୍ଦିଷ୍ଟ" +- + #: ../gui/simple-greeter/gdm-option-widget.c:505 + msgid "Label Text" + msgstr "ପାଠ୍ୟକୁ ଚିହ୍ନଟ କରନ୍ତୁ" +@@ -678,14 +798,6 @@ msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ବସ୍ତୁ" + msgid "The ID of the default item" + msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ବସ୍ତୁର ID" + +-#: ../gui/simple-greeter/gdm-recent-option-widget.c:310 +-msgid "Max Item Count" +-msgstr "ସର୍ବାଧିକ ବସ୍ତୁ ସଂଖ୍ୟା" +- +-#: ../gui/simple-greeter/gdm-recent-option-widget.c:311 +-msgid "The maximum number of items to keep around in the list" +-msgstr "ତାଲିକାରେ ରଖିବାକୁ ଥିବା ସର୍ବାଧିକ ସଂଖ୍ୟକ ବସ୍ତୁ" +- + #: ../gui/simple-greeter/gdm-remote-login-window.c:188 + #, c-format + msgid "Remote Login (Connecting to %s…)" +@@ -704,175 +816,32 @@ msgstr "ସୁଦୂର ଲଗଇନ" + msgid "Session" + msgstr "ଅଧିବେଶନ" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 +-msgid "Banner message text" +-msgstr "ପତାକା ସନ୍ଦେଶ ପାଠ୍ୟ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 +-msgid "Banner message text when chooser is empty" +-msgstr "ଚୟନକର୍ତ୍ତା ଖାଲିଥିବା ସମୟରେ ପତାକାର ସନ୍ଦେଶ ପାଠ୍ୟ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3 +-msgid "Disable showing the restart buttons" +-msgstr "ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 +-msgid "Do not show known users in the login window" +-msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଜଣା ଚାଳକମାନଙ୍କୁ ଦର୍ଶାନ୍ତୁ ନାହିଁ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 +-msgid "Enable accessibility keyboard plugin" +-msgstr "ଅଭିଗମ୍ଯ କି ବୋର୍ଡ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରନ୍ତୁ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 +-msgid "Enable on-screen keyboard" +-msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରନ୍ତୁ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 +-msgid "Enable screen magnifier" +-msgstr "ପରଦା ବର୍ଦ୍ଧନକାରୀକୁ ସକ୍ରିୟ କରନ୍ତୁ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 +-msgid "Enable screen reader" +-msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରନ୍ତୁ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 +-msgid "Enable showing the banner message" +-msgstr "ପତାକା ସନ୍ଦେଶ ଦର୍ଶାଇବାକୁ ସକ୍ରିୟ କରନ୍ତୁ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 +-msgid "Icon name to use for greeter logo" +-msgstr "ଧନ୍ୟବାଦ ଦାତା ପ୍ରତୀକ ବ୍ୟବହାର ହେଉଥିବା ଚିତ୍ରସଂକେତ ନାମ ପାଇଁ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 +-msgid "Recently selected languages" +-msgstr "ନିକଟରେ ବଛାଯାଇଥିବା ଭାଷାଗୁଡ଼ିକ" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +-msgid "Set to a list of languages to be shown by default in the login window." +-msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ବାବରେ ଦର୍ଶାଇବା ପାଇଁ ଗୋଟିଏ ଭାଷା ତାଲିକାରେ ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 +-msgid "Set to the themed icon name to use for the greeter logo." +-msgstr "" +-"ସତ୍କାରକରିବା ପ୍ରତୀକ ଚିହ୍ନ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ବିଷୟ ବସ୍ତୁ ଲିଖିତ ଚିତ୍ର ସଂକେତ ନାମକୁ ସେଟକରନ୍ତୁ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +-msgid "Set to true to disable showing known users in the login window." +-msgstr "ଜଣାଥିବା ଚାଳକମାନଙ୍କୁ ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବା ପାଇଁ ନିଷ୍କ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +-msgid "Set to true to disable showing the restart buttons in the login window." +-msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +-msgid "Set to true to enable the XRandR settings manager plugin." +-msgstr "XRandR ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +-msgid "Set to true to enable the background settings manager plugin." +-msgstr "ପୃଷ୍ଠଭୂମି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +-msgid "Set to true to enable the media-keys settings manager plugin." +-msgstr "ସଞ୍ଚାର ମାଧ୍ଯମ-କି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +-msgid "Set to true to enable the on-screen keyboard." +-msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +-msgid "" +-"Set to true to enable the plugin to manage the accessibility keyboard " +-"settings." +-msgstr "ଅଭିଗମ୍ୟତା କି ବୋର୍ଡ ବିନ୍ୟାସକୁ ପରିଚାଳନା କରିବା ପାଇଁ ପ୍ଲଗଇନ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +-msgid "Set to true to enable the screen magnifier." +-msgstr "ପରଦା ଆକାର ବର୍ଦ୍ଧକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +-msgid "Set to true to enable the screen reader." +-msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +-msgid "Set to true to enable the sound settings manager plugin." +-msgstr "ଧ୍ୱନୀ ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +-msgid "Set to true to enable the xsettings settings manager plugin." +-msgstr "xsettings ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +-msgid "Set to true to show the banner message text." +-msgstr "ପତାକା ସଂଦେଶ ଦର୍ଶାଇବା ପାଇଁ true ସେଟକରନ୍ତୁ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +-msgid "Set to true to use Compiz as the window manager." +-msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +-msgid "" +-"Text banner message to show in the login window when the user chooser is " +-"empty, instead of banner_message_text." +-msgstr "" +-"banner_message_text ବ୍ୟତିତ, ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ ଯେତେବେଳେ " +-"ଚାଳକ ଚୟନକର୍ତ୍ତା ଖାଲି ଥାଏ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +-msgid "Text banner message to show in the login window." +-msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +-msgid "True if the XRandR settings manager plugin is enabled." +-msgstr "True ଯଦି XRandR ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି।" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +-msgid "True if the background settings manager plugin is enabled." +-msgstr "True ଯଦି ପୃଷ୍ଠଭୂମି ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +-msgid "True if the media-keys settings manager plugin is enabled." +-msgstr "True ଯଦି ସଞ୍ଚାର ମାଧ୍ଯମ-କି ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି. " +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +-msgid "True if the sound settings manager plugin is enabled." +-msgstr "True ଯଦି ଧ୍ୱନୀ ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +-msgid "True if the xsettings settings manager plugin is enabled." +-msgstr "True ଯଦି xsettings ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +-msgid "Use Compiz as the window manager" +-msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରନ୍ତୁ" +- +-#: ../gui/simple-greeter/gdm-timer.c:149 ++#: ../gui/simple-greeter/gdm-timer.c:147 + msgid "Duration" + msgstr "ଅବଧି" + +-#: ../gui/simple-greeter/gdm-timer.c:150 ++#: ../gui/simple-greeter/gdm-timer.c:148 + msgid "Number of seconds until timer stops" + msgstr "ସମୟ ମାପକ ବନ୍ଦ ହେବା ପର୍ଯ୍ୟନ୍ତ ସମୟ ସେକଣ୍ଡରେ" + +-#: ../gui/simple-greeter/gdm-timer.c:157 ++#: ../gui/simple-greeter/gdm-timer.c:155 + msgid "Start time" + msgstr "ପ୍ରାରମ୍ଭିକ ସମୟ" + +-#: ../gui/simple-greeter/gdm-timer.c:158 ++#: ../gui/simple-greeter/gdm-timer.c:156 + msgid "Time the timer was started" + msgstr "ସମୟ ମାପକ ଆରମ୍ଭ ହୋଇଥିବା ସମୟ" + +-#: ../gui/simple-greeter/gdm-timer.c:165 ++#: ../gui/simple-greeter/gdm-timer.c:163 + msgid "Is it Running?" + msgstr "ଏହା ଚାଲୁଅଛି କି?" + +-#: ../gui/simple-greeter/gdm-timer.c:166 ++#: ../gui/simple-greeter/gdm-timer.c:164 + msgid "Whether the timer is currently ticking" + msgstr "ସମୟ ମାପକଟି ବର୍ତ୍ତମାନ ଟିକଟିକ କରୁଛି କି ନାହିଁ" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:488 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800 + #, c-format + msgid "Log in as %s" + msgstr "%s ଆକାରରେ ଲଗଇନ କରନ୍ତୁ" +@@ -882,70 +851,39 @@ msgstr "%s ଆକାରରେ ଲଗଇନ କରନ୍ତୁ" + #. * manually instead of choosing from + #. * a list. + #. +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 + msgctxt "user" + msgid "Other…" + msgstr "ଅନ୍ଯାନ୍ଯ…" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 + msgid "Choose a different account" + msgstr "ଗୋଟିଏ ପୃଥକ ଖାତା ଚୟନ କରନ୍ତୁ" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559 + msgid "Guest" + msgstr "ଅତିଥି" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 + msgid "Log in as a temporary guest" + msgstr "ଅସ୍ଥାୟୀ ଅତିଥି ଭାବରେ ଲଗଇନ କରନ୍ତୁ" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 + msgid "Automatic Login" + msgstr "ସ୍ବୟଂଚାଳିତ ଲଗଇନ" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 + msgid "Automatically log into the system after selecting options" + msgstr "ବିକଳ୍ପଗୁଡ଼ିକୁ ବାଛିସାରିବା ପରେ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ତନ୍ତ୍ରରେ ଲଗଇନ ହେବା" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1038 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332 + msgid "Currently logged in" + msgstr "ବର୍ତ୍ତମାନ ଲଗଇନ ହୋଇ ସାରିଛି" + +-#: ../utils/gdmflexiserver.c:61 +-msgid "Only the VERSION command is supported" +-msgstr "କେବଳ VERSION ନିର୍ଦ୍ଦେଶ ସମର୍ଥିତ" +- +-#: ../utils/gdmflexiserver.c:61 +-msgid "COMMAND" +-msgstr "ନିର୍ଦ୍ଦେଶ" +- +-#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 +-#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +-msgid "Ignored — retained for compatibility" +-msgstr "ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି — ସୁସଂଗତି ପାଇଁ ରଖାଯାଇଛି" +- +-#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 ++#: ../utils/gdm-screenshot.c:43 + msgid "Debugging output" + msgstr "ନିର୍ଗମକୁ ତ୍ରୁଟିମୁକ୍ତ କରୁଅଛି" + +-#: ../utils/gdmflexiserver.c:68 +-msgid "Version of this application" +-msgstr "ଏହି ପ୍ରୟୋଗର ସଂସ୍କରଣ" +- +-#: ../utils/gdmflexiserver.c:675 +-#, c-format +-msgid "Could not identify the current session." +-msgstr "ପ୍ରଚଳିତ ଅଧିବେଶନକୁ ଚିହ୍ନିପାରିଲା ନାହିଁ." +- +-#. Option parsing +-#: ../utils/gdmflexiserver.c:711 +-msgid "- New GDM login" +-msgstr "- ନୂତନ GDM ଲଗଇନ" +- +-#: ../utils/gdmflexiserver.c:767 +-msgid "Unable to start new display" +-msgstr "ନୂତନ ପ୍ରଦର୍ଶନକୁ ପ୍ରାରମ୍ଭ କରିପାରିବ ନାହିଁ" +- + #: ../utils/gdm-screenshot.c:212 + msgid "Screenshot taken" + msgstr "ପରଦା ପ୍ରତିଛବି ଗ୍ରହଣ କରାଯାଇଛି" +@@ -955,6 +893,241 @@ msgstr "ପରଦା ପ୍ରତିଛବି ଗ୍ରହଣ କରାଯାଇ + msgid "Take a picture of the screen" + msgstr "ପରଦାର ଗୋଟିଏ ପ୍ରତିଛବି ନିଅନ୍ତୁ" + ++#~ msgid "Unable to initialize login system" ++#~ msgstr "ଲଗଇନ ତନ୍ତ୍ରକୁ ଆରମ୍ଭକରିବାରେ ଅସମର୍ଥ" ++ ++#~ msgid "Unable to authenticate user" ++#~ msgstr "ଚାଳକକୁ ବୈଧିକ୍ରୁତ କରିବାରେ ଅସମର୍ଥ" ++ ++#~ msgid "Unable to establish credentials" ++#~ msgstr "ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକୁ ପ୍ରତିସ୍ଥାପନ କରିବାରେ ଅସମର୍ଥ" ++ ++#~ msgid "Group %s doesn't exist" ++#~ msgstr "ସମୂହ %s ଅବସ୍ଥିତ ନାହିଁ" ++ ++#~ msgid "Denied XDMCP query from host %s" ++#~ msgstr "%s ଆଧାରରୁ XDMCP ପ୍ରଶ୍ନ ପଚାରିବାରୁ ମନା କରାଗଲା" ++ ++#~ msgid "Could not extract authlist from packet" ++#~ msgstr "ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ" ++ ++#~ msgid "Error in checksum" ++#~ msgstr "ଯାଞ୍ଚ ସମଷ୍ଟିରେ ତ୍ରୁଟି" ++ ++#~ msgid "Bad address" ++#~ msgstr "ଖରାପ ଠିକଣା" ++ ++#~ msgid "%s: Could not read display address" ++#~ msgstr "%s: ପ୍ରଦର୍ଶନ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Could not read display port number" ++#~ msgstr "%s: ପ୍ରଦର୍ଶନ ସଂଯୋଗିକୀ ସଂଖ୍ଯା ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Could not extract authlist from packet" ++#~ msgstr "%s: ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Error in checksum" ++#~ msgstr "%s: ଚେକ-ଶମରେ ତ୍ରୁଟି" ++ ++#~ msgid "%s: Got REQUEST from banned host %s" ++#~ msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ ନିବେଦନ ମିଳିଲା" ++ ++#~ msgid "%s: Could not read Display Number" ++#~ msgstr "%s: ପ୍ରତର୍ଶନ ସଂଖ୍ଯାକୁ ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Could not read Connection Type" ++#~ msgstr "%s: ସଂଯୋଗ ପ୍ରକାରକୁ ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Could not read Client Address" ++#~ msgstr "%s: ଗ୍ରାହକ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Could not read Authentication Data" ++#~ msgstr "%s: ବୈଧିକରଣ ତଥ୍ଯକୁ ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Could not read Authorization List" ++#~ msgstr "%s: ବୈଧିକରଣ ତାଲିକାକୁ ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Could not read Manufacturer ID" ++#~ msgstr "%s: ନିର୍ମାତା ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Failed checksum from %s" ++#~ msgstr "%s: %s ରୁ ଚେକ-ଶମ ଅସଫଳ" ++ ++#~ msgid "%s: Got Manage from banned host %s" ++#~ msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ Manage ପାଇଲା" ++ ++#~ msgid "%s: Could not read Session ID" ++#~ msgstr "%s: ଅଧିବେଶନ ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Could not read Display Class" ++#~ msgstr "%s: ପ୍ରଦର୍ଶନ ଶ୍ରେଣୀକୁ ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Could not read address" ++#~ msgstr "%s: ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" ++ ++#~ msgid "%s: Got KEEPALIVE from banned host %s" ++#~ msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ KEEPALIVE ପାଇଲା" ++ ++#~ msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" ++#~ msgstr "GdmXdmcpDisplayFactory: XDMC ଶୀର୍ଷକକୁ ପଢି ପାରିଲା ନାହିଁ!" ++ ++#~ msgid "Could not get server hostname: %s!" ++#~ msgstr "ସର୍ଭର ଆଧାର ନାମକୁ ପାଇ ପାରିଲା ନାହିଁ: %s!" ++ ++#~ msgid "AT-SPI Registry Wrapper" ++#~ msgstr "AT-SPI ପଞ୍ଜିକରଣ ଆବରଣ" ++ ++#~ msgid "Power Manager" ++#~ msgstr "ଶକ୍ତି ପରିଚାଳକ" ++ ++#~ msgid "GNOME Settings Daemon" ++#~ msgstr "GNOME ବିନ୍ୟାସ ଡେମନ" ++ ++#~ msgid "Metacity" ++#~ msgstr "Metacity" ++ ++#~ msgid "Orca Screen Reader" ++#~ msgstr "Orca ପରଦା ପାଠକ" ++ ++#~ msgid "Present on-screen information as speech or braille" ++#~ msgstr "ଅନ-ସ୍କ୍ରିନ ସୂଚନାକୁ ବାର୍ତ୍ତାଳାପ ଅଥବା ବ୍ରେଲି ଲିପିରେ ଉପସ୍ଥାପନ କରନ୍ତୁ" ++ ++#~ msgid "Languages" ++#~ msgstr "ଭାଷା" ++ ++#~ msgid "_Languages:" ++#~ msgstr "ଭାଷା (_L):" ++ ++#~ msgid "_Language:" ++#~ msgstr "ଭାଷା (_L):" ++ ++#~ msgctxt "language" ++#~ msgid "Other…" ++#~ msgstr "ଅନ୍ଯାନ୍ଯ…" ++ ++#~ msgid "Choose a language from the full list of available languages." ++#~ msgstr "ଉପଲବ୍ଧ ଭାଷାଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକାରୁ ଭାଷା ଚୟନ କରନ୍ତୁ." ++ ++#~ msgid "Language" ++#~ msgstr "ଭାଷା" ++ ++#~ msgid "Unspecified" ++#~ msgstr "ଅନିର୍ଦ୍ଦିଷ୍ଟ" ++ ++#~ msgid "Max Item Count" ++#~ msgstr "ସର୍ବାଧିକ ବସ୍ତୁ ସଂଖ୍ୟା" ++ ++#~ msgid "The maximum number of items to keep around in the list" ++#~ msgstr "ତାଲିକାରେ ରଖିବାକୁ ଥିବା ସର୍ବାଧିକ ସଂଖ୍ୟକ ବସ୍ତୁ" ++ ++#~ msgid "Banner message text when chooser is empty" ++#~ msgstr "ଚୟନକର୍ତ୍ତା ଖାଲିଥିବା ସମୟରେ ପତାକାର ସନ୍ଦେଶ ପାଠ୍ୟ" ++ ++#~ msgid "Do not show known users in the login window" ++#~ msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଜଣା ଚାଳକମାନଙ୍କୁ ଦର୍ଶାନ୍ତୁ ନାହିଁ" ++ ++#~ msgid "Enable accessibility keyboard plugin" ++#~ msgstr "ଅଭିଗମ୍ଯ କି ବୋର୍ଡ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରନ୍ତୁ" ++ ++#~ msgid "Enable on-screen keyboard" ++#~ msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରନ୍ତୁ" ++ ++#~ msgid "Enable screen magnifier" ++#~ msgstr "ପରଦା ବର୍ଦ୍ଧନକାରୀକୁ ସକ୍ରିୟ କରନ୍ତୁ" ++ ++#~ msgid "Enable screen reader" ++#~ msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରନ୍ତୁ" ++ ++#~ msgid "Icon name to use for greeter logo" ++#~ msgstr "ଧନ୍ୟବାଦ ଦାତା ପ୍ରତୀକ ବ୍ୟବହାର ହେଉଥିବା ଚିତ୍ରସଂକେତ ନାମ ପାଇଁ" ++ ++#~ msgid "Recently selected languages" ++#~ msgstr "ନିକଟରେ ବଛାଯାଇଥିବା ଭାଷାଗୁଡ଼ିକ" ++ ++#~ msgid "" ++#~ "Set to a list of languages to be shown by default in the login window." ++#~ msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ବାବରେ ଦର୍ଶାଇବା ପାଇଁ ଗୋଟିଏ ଭାଷା ତାଲିକାରେ ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "Set to the themed icon name to use for the greeter logo." ++#~ msgstr "" ++#~ "ସତ୍କାରକରିବା ପ୍ରତୀକ ଚିହ୍ନ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ବିଷୟ ବସ୍ତୁ ଲିଖିତ ଚିତ୍ର ସଂକେତ ନାମକୁ ସେଟକରନ୍ତୁ." ++ ++#~ msgid "Set to true to disable showing known users in the login window." ++#~ msgstr "ଜଣାଥିବା ଚାଳକମାନଙ୍କୁ ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବା ପାଇଁ ନିଷ୍କ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "Set to true to enable the XRandR settings manager plugin." ++#~ msgstr "XRandR ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "Set to true to enable the background settings manager plugin." ++#~ msgstr "ପୃଷ୍ଠଭୂମି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "Set to true to enable the media-keys settings manager plugin." ++#~ msgstr "ସଞ୍ଚାର ମାଧ୍ଯମ-କି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "Set to true to enable the on-screen keyboard." ++#~ msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "" ++#~ "Set to true to enable the plugin to manage the accessibility keyboard " ++#~ "settings." ++#~ msgstr "" ++#~ "ଅଭିଗମ୍ୟତା କି ବୋର୍ଡ ବିନ୍ୟାସକୁ ପରିଚାଳନା କରିବା ପାଇଁ ପ୍ଲଗଇନ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "Set to true to enable the screen magnifier." ++#~ msgstr "ପରଦା ଆକାର ବର୍ଦ୍ଧକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "Set to true to enable the screen reader." ++#~ msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "Set to true to enable the sound settings manager plugin." ++#~ msgstr "ଧ୍ୱନୀ ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "Set to true to enable the xsettings settings manager plugin." ++#~ msgstr "xsettings ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "Set to true to use Compiz as the window manager." ++#~ msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" ++ ++#~ msgid "" ++#~ "Text banner message to show in the login window when the user chooser is " ++#~ "empty, instead of banner_message_text." ++#~ msgstr "" ++#~ "banner_message_text ବ୍ୟତିତ, ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ " ++#~ "ଯେତେବେଳେ ଚାଳକ ଚୟନକର୍ତ୍ତା ଖାଲି ଥାଏ।" ++ ++#~ msgid "True if the XRandR settings manager plugin is enabled." ++#~ msgstr "True ଯଦି XRandR ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି।" ++ ++#~ msgid "True if the background settings manager plugin is enabled." ++#~ msgstr "True ଯଦି ପୃଷ୍ଠଭୂମି ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." ++ ++#~ msgid "True if the media-keys settings manager plugin is enabled." ++#~ msgstr "True ଯଦି ସଞ୍ଚାର ମାଧ୍ଯମ-କି ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି. " ++ ++#~ msgid "True if the sound settings manager plugin is enabled." ++#~ msgstr "True ଯଦି ଧ୍ୱନୀ ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." ++ ++#~ msgid "True if the xsettings settings manager plugin is enabled." ++#~ msgstr "True ଯଦି xsettings ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." ++ ++#~ msgid "Use Compiz as the window manager" ++#~ msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରନ୍ତୁ" ++ ++#~ msgid "Only the VERSION command is supported" ++#~ msgstr "କେବଳ VERSION ନିର୍ଦ୍ଦେଶ ସମର୍ଥିତ" ++ ++#~ msgid "COMMAND" ++#~ msgstr "ନିର୍ଦ୍ଦେଶ" ++ ++#~ msgid "Ignored — retained for compatibility" ++#~ msgstr "ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି — ସୁସଂଗତି ପାଇଁ ରଖାଯାଇଛି" ++ ++#~ msgid "Version of this application" ++#~ msgstr "ଏହି ପ୍ରୟୋଗର ସଂସ୍କରଣ" ++ ++#~ msgid "- New GDM login" ++#~ msgstr "- ନୂତନ GDM ଲଗଇନ" ++ + #~| msgid "Shutdown Options..." + #~ msgid "Shutdown Options…" + #~ msgstr "ବନ୍ଦ କରିବା ବିକଳ୍ପଗୁଡ଼ିକ…" +diff --git a/po/ug.po b/po/ug.po +index 8745201..01c6f0e 100644 +--- a/po/ug.po ++++ b/po/ug.po +@@ -1,118 +1,110 @@ +-# Uighur translation for gdm. +-# Copyright (C) 2010 gdm's COPYRIGHT HOLDER +-# This file is distributed under the same license as the gdm package. +-# Gheyret Kenji , 2010. +-# Sahran , 2010. ++# Uyghur translation for gdm. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# Gheyret Kenji , 2013. + # + msgid "" + msgstr "" +-"Project-Id-Version: gdm gnome-2-32\n" ++"Project-Id-Version: gdm\n" + "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2011-03-17 13:45+0000\n" +-"PO-Revision-Date: 2010-07-30 07:44+0000\n" +-"Last-Translator: Sahran \n" ++"POT-Creation-Date: 2013-01-04 07:15+0000\n" ++"PO-Revision-Date: 2011-11-09 16:10+0900\n" ++"Last-Translator: Gheyret Kenji \n" + "Language-Team: Uyghur Computer Science Association \n" ++"Language: \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../common/gdm-common.c:456 ++#: ../common/gdm-common.c:492 + #, c-format + msgid "/dev/urandom is not a character device" + msgstr "/dev/urandom ھەرپ ئۈسكۈنىسى ئەمەس" + +-#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +-#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +-msgid "Display ID" +-msgstr "ئېكران ID سى" +- +-#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +-#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +-msgid "ID" +-msgstr "ID" +- +-#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +-#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 +-msgid "GNOME Display Manager Slave" +-msgstr "GNOME ئېكران باشقۇرغۇ(ئەگەشكۈچى)" +- + #: ../daemon/gdm-display-access-file.c:300 + #, c-format + msgid "could not find user \"%s\" on system" +-msgstr "سىستېمىدىن ئىشلەتكۈچى \"%s\" تېپىلمىدى" ++msgstr "سىستېمىدىن ئىشلەتكۈچى «%s» تېپىلمىدى" + +-#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 +-msgid "Unable to initialize login system" +-msgstr "كىرىش سىستېمىسىنى دەسلەپلەشتۈرگىلى بولمىدى" ++#: ../daemon/gdm-display.c:1320 ../daemon/gdm-display.c:1354 ++#, c-format ++msgid "No session available yet" ++msgstr "تېخى ئەڭگىمە يوق" + +-#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 +-msgid "Unable to authenticate user" +-msgstr "ئىشلەتكۈچىنى تونۇيالمىدى" ++#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 ++#, c-format ++msgid "Unable to look up UID of user %s" ++msgstr "ئىشلەتكۈچى %s نىڭ كىملىكىنى تاپقىلى بولمىدى" + +-#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 +-msgid "Unable to authorize user" +-msgstr "مۇۋاپىق ئىشلەتكۈچى دەپ ھۆكۈم قىلغىلى بولمىدى" ++#: ../daemon/gdm-manager.c:291 ++msgid "no sessions available" ++msgstr "ئەڭگىمەلەر يوق" + +-#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 +-msgid "Unable to establish credentials" +-msgstr "ئىشەنچلىك ئىشلەتكۈچى دەپ قاراشقا بولمىدى" ++#: ../daemon/gdm-manager.c:352 ++#, c-format ++msgid "No sessions for %s available for reauthentication" ++msgstr "قايتا كىملىك دەلىللەش ئۈچۈن %s نىڭ ئەڭگىمەسى يوق" + +-#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 +-msgid "Unable to open session" +-msgstr "ئەڭگىمەنى باشلىغىلى بولمىدى" ++#: ../daemon/gdm-manager.c:406 ++#, c-format ++msgid "Unable to find session for user %s" ++msgstr "ئىشلەتكۈچى %s ئۈچۈن ئەڭگىمە تاپقىلى بولمىدى" + +-#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +-#: ../daemon/gdm-simple-slave.c:1366 +-msgid "" +-"Could not start the X server (your graphical environment) due to an internal " +-"error. Please contact your system administrator or check your syslog to " +-"diagnose. In the meantime this display will be disabled. Please restart GDM " +-"when the problem is corrected." +-msgstr "ئىچكى خاتالىق تۈپەيلى X مۇلازىمېتىرى(گرافىكىلىق مەشغۇلات مۇھىتى)نى باشلىغىلى بولمىدى. سىستېما باشقۇرغۇچىسى بىلەن ئالاقە قىلىڭ ياكى سىستېما خاتىرىسى(syslog) نى ئېچىپ تەكشۈرۈپ كۆرۈڭ. ھازىرچە مەزكۇر ئېكران چەكلىنىدۇ. مەسىلىنى ھەل قىلغاندا GDM نى قايتا قوزغاتسىڭىز بولىدۇ." ++#: ../daemon/gdm-manager.c:476 ++#, c-format ++msgid "Unable to find appropriate session for user %s" ++msgstr "ئىشلەتكۈچى %s ئۈچۈن مۇۋاپىق ئەڭگىمە تاپقىلى بولمىدى" ++ ++#: ../daemon/gdm-manager.c:671 ++msgid "User doesn't own session" ++msgstr "ئىشلەتكۈچىنىڭ ئەڭگىمەسى يوق" + +-#: ../daemon/gdm-server.c:250 ++#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 ++msgid "No session available" ++msgstr "ئەڭگىمە يوق" ++ ++#: ../daemon/gdm-server.c:273 + #, c-format + msgid "%s: failed to connect to parent display '%s'" +-msgstr "%s: ئاتا ئېكران '%s' نىڭغا باغلىنىش مەغلۇپ بولدى" ++msgstr "%s: ئاتا ئېكران ‹%s› نىڭغا باغلىنىش مەغلۇپ بولدى" + +-#: ../daemon/gdm-server.c:365 ++#: ../daemon/gdm-server.c:452 + #, c-format + msgid "Server was to be spawned by user %s but that user doesn't exist" + msgstr "مۇلازىمېتىرنى ئىشلەتكۈچى %s قوزغىتىپتۇ. بىراق بۇنداق ئىشلەتكۈچى مەۋجۇت ئەمەس" + +-#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +-#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 ++#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 + #, c-format + msgid "Couldn't set groupid to %d" + msgstr "گۇرۇپپا ID سىنى %d غا تەڭشىگىلى بولمىدى" + +-#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 ++#: ../daemon/gdm-server.c:469 + #, c-format + msgid "initgroups () failed for %s" + msgstr "%s نى ئىجرا قىلىۋاتقاندا initgroups () مەغلۇپ بولدى" + +-#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 ++#: ../daemon/gdm-server.c:475 + #, c-format + msgid "Couldn't set userid to %d" + msgstr "ئىشلەتكۈچى ID سىنى %d غا تەڭشىگىلى بولمىدى" + +-#: ../daemon/gdm-server.c:435 ++#: ../daemon/gdm-server.c:522 + #, c-format + msgid "%s: Could not open log file for display %s!" + msgstr "%s: ئېكران %s نىڭ خاتىرە ھۆججىتى(logfile) نى ئاچقىلى بولمىدى!" + +-#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +-#: ../daemon/gdm-server.c:458 ++#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539 ++#: ../daemon/gdm-server.c:545 + #, c-format + msgid "%s: Error setting %s to %s" + msgstr "%s: %s نى %s قا تەڭشىگىلى بولمىدى" + +-#: ../daemon/gdm-server.c:478 ++#: ../daemon/gdm-server.c:565 + #, c-format + msgid "%s: Server priority couldn't be set to %d: %s" +-msgstr "%s: مۇلازىمېتىر ئالدىنلىقىنى %d غا تەڭشىگىلى بولمىدى: %s" ++msgstr "%s: مۇلازىمېتىرنىڭ مەرتىۋىسىنى %d غا تەڭشىگىلى بولمىدى: %s" + +-#: ../daemon/gdm-server.c:631 ++#: ../daemon/gdm-server.c:722 + #, c-format + msgid "%s: Empty server command for display %s" + msgstr "%s: ئېكران %s نىڭ مۇلازىمېتىر بۇيرۇقى قۇرۇق ئىكەن" +@@ -141,344 +133,334 @@ msgstr "كۆرسىتىش ئۈسكۈنىسى" + msgid "The display device" + msgstr "كۆرسىتىش ئۈسكۈنىسى" + +-#: ../daemon/gdm-session-worker.c:1066 ++#: ../daemon/gdm-session.c:1183 ++msgid "Could not create authentication helper process" ++msgstr "كىملىك دەلىللەش ياردەمچى ئىجراسىنى قۇرغىلى بولمىدى" ++ ++#: ../daemon/gdm-session-worker.c:1029 + #, c-format +-#| msgid "error initiating conversation with authentication system: %s" + msgid "error initiating conversation with authentication system - %s" + msgstr "دەلىللەش سىستېمىسى بىلەن كۆرۈشۈشتە دەسلەپلەشتۈرۈش خاتالىقى يۈز بەردى - %s" + +-#: ../daemon/gdm-session-worker.c:1067 ++#: ../daemon/gdm-session-worker.c:1030 + msgid "general failure" + msgstr "ئادەتتىكى مەغلۇبىيەت" + +-#: ../daemon/gdm-session-worker.c:1068 ++#: ../daemon/gdm-session-worker.c:1031 + msgid "out of memory" + msgstr "ئەسلەك يېتىشمىدى" + +-#: ../daemon/gdm-session-worker.c:1069 ++#: ../daemon/gdm-session-worker.c:1032 + msgid "application programmer error" + msgstr "پروگراممىدىكى كەمتۈك" + +-#: ../daemon/gdm-session-worker.c:1070 ++#: ../daemon/gdm-session-worker.c:1033 + msgid "unknown error" + msgstr "نامەلۇم خاتالىق" + +-#: ../daemon/gdm-session-worker.c:1077 ++#: ../daemon/gdm-session-worker.c:1040 + msgid "Username:" + msgstr "ئىشلەتكۈچى ئاتى:" + +-#: ../daemon/gdm-session-worker.c:1083 ++#: ../daemon/gdm-session-worker.c:1046 + #, c-format + msgid "error informing authentication system of preferred username prompt: %s" + msgstr "دەلىللەش سىستېمىسىدا ئىشلەتكۈچى ئاتىنى بىر تەرەپ قىلىشتا خاتالىق كۆرۈلدى: %s" + +-#: ../daemon/gdm-session-worker.c:1097 ++#: ../daemon/gdm-session-worker.c:1060 + #, c-format + msgid "error informing authentication system of user's hostname: %s" + msgstr "دەلىللەش سىستېمىسىدا كومپيۇتېر ئاتىنى بىر تەرەپ قىلىشتا خاتالىق كۆرۈلدى: %s" + +-#: ../daemon/gdm-session-worker.c:1112 ++#: ../daemon/gdm-session-worker.c:1077 + #, c-format + msgid "error informing authentication system of user's console: %s" + msgstr "ئىشلەتكۈچى تىزگىن سۇپىسىنى دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s" + +-#: ../daemon/gdm-session-worker.c:1125 ++#: ../daemon/gdm-session-worker.c:1101 + #, c-format + msgid "error informing authentication system of display string: %s" + msgstr "ھەرپ تىزمىسىنى كۆرسىتىپ دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s" + +-#: ../daemon/gdm-session-worker.c:1140 ++#: ../daemon/gdm-session-worker.c:1116 + #, c-format + msgid "error informing authentication system of display xauth credentials: %s" + msgstr "xauth گۇۋاھنامىنى كۆرسىتىپ دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s" + +-#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 ++#: ../daemon/gdm-session-worker.c:1454 ../daemon/gdm-session-worker.c:1471 + #, c-format + msgid "no user account available" + msgstr "ئىشلەتكۈچى ھېسابى يوق" + +-#: ../daemon/gdm-session-worker.c:1506 ++#: ../daemon/gdm-session-worker.c:1498 + msgid "Unable to change to user" + msgstr "ئىشلەتكۈچى ئالماشتۇرغىلى بولمىدى" + +-#: ../daemon/gdm-welcome-session.c:549 +-#, c-format +-msgid "User %s doesn't exist" +-msgstr "ئىشلەتكۈچى %s مەۋجۇت ئەمەس" +- +-#: ../daemon/gdm-welcome-session.c:556 +-#, c-format +-msgid "Group %s doesn't exist" +-msgstr "گۇرۇپپا %s مەۋجۇت ئەمەس" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:604 +-msgid "Could not create socket!" +-msgstr "socket نى قۇرغىلى بولمىدى!" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:873 +-#, c-format +-msgid "Denied XDMCP query from host %s" +-msgstr "كومپيۇتېر %s دىن كەلگەن XDMCP سۈرۈشتۈرۈش تەلىپى رەت قىلىندى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1031 +-#: ../daemon/gdm-xdmcp-display-factory.c:1255 +-msgid "Could not extract authlist from packet" +-msgstr "بوغچىدىن دەلىللەش تىزىملىكىنى يېيىپ چىقارغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1044 +-#: ../daemon/gdm-xdmcp-display-factory.c:1270 +-msgid "Error in checksum" +-msgstr "تەكشۈرۈش خاتالىقى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1523 +-msgid "Bad address" +-msgstr "ئادرېس توغرا ئەمەس" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1607 +-#, c-format +-msgid "%s: Could not read display address" +-msgstr "%s: ئېكران ئادرېسىنى ئوقۇغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1615 +-#, c-format +-msgid "%s: Could not read display port number" +-msgstr "%s: ئېكران ئېغىزىنى ئوقۇغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1624 +-#, c-format +-msgid "%s: Could not extract authlist from packet" +-msgstr "%s: بوغچىدىن دەلىللەش تىزىملىكىنى يېيىپ چىقارغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:1644 +-#, c-format +-msgid "%s: Error in checksum" +-msgstr "%s: تەكشۈرۈشتە خاتالىق كۆرۈلدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2200 +-#, c-format +-msgid "%s: Got REQUEST from banned host %s" +-msgstr "%s: چەكلەنگەن باش ئاپپارات %s دىن ئىلتىماس تاپشۇرۇۋالدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2210 +-#: ../daemon/gdm-xdmcp-display-factory.c:2568 +-#: ../daemon/gdm-xdmcp-display-factory.c:2822 +-#, c-format +-msgid "%s: Could not read Display Number" +-msgstr "%s: ئېكران نومۇرىنى ئوقۇغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2217 +-#, c-format +-msgid "%s: Could not read Connection Type" +-msgstr "%s: باغلىنىش تىپىنى ئوقۇغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2224 +-#, c-format +-msgid "%s: Could not read Client Address" +-msgstr "%s: خېرىدار ئادرېسىنى ئوقۇغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2232 +-#, c-format +-msgid "%s: Could not read Authentication Names" +-msgstr "%s: دەلىللەش ئاتىنى ئوقۇغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2241 +-#, c-format +-msgid "%s: Could not read Authentication Data" +-msgstr "%s: دەلىللەش سانلىق-ئاساسلىرىنى ئوقۇپ چىققىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2251 +-#, c-format +-msgid "%s: Could not read Authorization List" +-msgstr "%s: دەلىللەش تىزىملىكىنى ئوقۇغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2270 +-#, c-format +-msgid "%s: Could not read Manufacturer ID" +-msgstr "%s: ئىشلەپچىقارغۇچى ID سىنى ئوقۇغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2297 +-#, c-format +-msgid "%s: Failed checksum from %s" +-msgstr "%s: %s نى تەكشۈرۈش مەغلۇپ بولدى." +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2552 +-#, c-format +-msgid "%s: Got Manage from banned host %s" +-msgstr "%s: چەكلەنگەن باش ئاپپارات %s دىن Manage تاپشۇرۇۋالدى" ++#: ../daemon/gdm-simple-slave.c:1426 ++msgid "" ++"Could not start the X server (your graphical environment) due to an internal " ++"error. Please contact your system administrator or check your syslog to " ++"diagnose. In the meantime this display will be disabled. Please restart GDM " ++"when the problem is corrected." ++msgstr "ئىچكى خاتالىق تۈپەيلى X مۇلازىمېتىرى(گرافىكىلىق مەشغۇلات مۇھىتى)نى باشلىغىلى بولمىدى. سىستېما باشقۇرغۇچىسى بىلەن ئالاقە قىلىڭ ياكى سىستېما خاتىرىسى(syslog) نى ئېچىپ تەكشۈرۈپ كۆرۈڭ. ھازىرچە مەزكۇر ئېكران چەكلىنىدۇ. مەسىلىنى ھەل قىلغاندا GDM نى قايتا قوزغاتسىڭىز بولىدۇ." + +-#: ../daemon/gdm-xdmcp-display-factory.c:2561 +-#: ../daemon/gdm-xdmcp-display-factory.c:2829 ++#: ../daemon/gdm-simple-slave.c:1467 + #, c-format +-msgid "%s: Could not read Session ID" +-msgstr "%s: ئەڭگىمە ID سىنى ئوقۇغىلى بولمىدى" ++msgid "Can only be called before user is logged in" ++msgstr "ئىشلەتكۈچى تىزىمغا كىرگەندىن كېيىن ئاندىن چاقىرغىلى بولىدۇ" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2575 ++#: ../daemon/gdm-simple-slave.c:1477 + #, c-format +-msgid "%s: Could not read Display Class" +-msgstr "%s: كۆرسىتىش دەرىجىسىنى ئوقۇغىلى بولمىدى" ++msgid "Caller not GDM" ++msgstr "چاقىرغۇچى GDM ئەمەس" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2681 +-#: ../daemon/gdm-xdmcp-display-factory.c:2731 +-#: ../daemon/gdm-xdmcp-display-factory.c:2737 +-#, c-format +-msgid "%s: Could not read address" +-msgstr "%s: ئادرېسنى ئوقۇغىلى بولمىدى" ++#: ../daemon/gdm-simple-slave.c:1530 ++msgid "User not logged in" ++msgstr "ئىشلەتكۈچى كىرمىدى" + +-#: ../daemon/gdm-xdmcp-display-factory.c:2812 ++#: ../daemon/gdm-xdmcp-chooser-slave.c:370 + #, c-format +-msgid "%s: Got KEEPALIVE from banned host %s" +-msgstr "%s: چەكلەنگەن كومپيۇتېر %s دىن KEEPALIVE تاپشۇرۇۋالدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2902 +-msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" +-msgstr "GdmXdmcpDisplayFactory: XDMCP قېشىنى ئوقۇغىلى بولمىدى" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2908 +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 +-msgid "XMDCP: Incorrect XDMCP version!" +-msgstr "XDMCP: XDMCP نەشرى توغرا ئەمەس" +- +-#: ../daemon/gdm-xdmcp-display-factory.c:2914 +-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 +-msgid "XMDCP: Unable to parse address" +-msgstr "XDMCP: ئادرېسنى پارچىلىيالمىدى" ++msgid "Currently, only one client can be connected at once" ++msgstr "نۆۋەتتە، بىر قېتىمدا پەقەت بىرلا خېرىدار باغلىنالايدۇ" + +-#: ../daemon/gdm-xdmcp-display-factory.c:3359 +-#, c-format +-msgid "Could not get server hostname: %s!" +-msgstr "مۇلازىمېتىر كومپيۇتېرىنىڭ ئاتىنى ئوقۇيالمىدى: %s!" ++#: ../daemon/gdm-xdmcp-display-factory.c:604 ++msgid "Could not create socket!" ++msgstr "socket نى قۇرغىلى بولمىدى!" + +-#: ../daemon/main.c:237 ../daemon/main.c:250 ++#: ../daemon/main.c:126 ../daemon/main.c:139 + #, c-format + msgid "Cannot write PID file %s: possibly out of disk space: %s" + msgstr "PID ھۆججىتىنى %s غا يازالمىدى: دىسكا بوشلۇقى يېتىشمىگەن بولۇشى مۇمكىن: %s" + +-#: ../daemon/main.c:271 ++#: ../daemon/main.c:166 + #, c-format + msgid "Logdir %s does not exist or isn't a directory." + msgstr "%s خاتىرە مۇندەرىجە(Logdir) مەۋجۇت ئەمەس ياكى مۇندەرىجە ئەمەس." + +-#: ../daemon/main.c:287 ++#: ../daemon/main.c:183 + #, c-format + msgid "Authdir %s does not exist. Aborting." + msgstr "%s دەلىللەش مۇندەرىجە(Authdir) مەۋجۇت ئەمەس. توختىتىۋاتىدۇ." + +-#: ../daemon/main.c:291 ++#: ../daemon/main.c:187 + #, c-format + msgid "Authdir %s is not a directory. Aborting." + msgstr "%s دەلىللەش مۇندەرىجە(Authdir) مۇندەرىجە ئەمەس. توختىتىۋاتىدۇ." + +-#: ../daemon/main.c:365 ++#: ../daemon/main.c:261 + #, c-format + msgid "Authdir %s is not owned by user %d, group %d. Aborting." + msgstr "Authdir %s نىڭ ئىگىسى ئىشلەتكۈچى %d، گۇرۇپپا %d ئەمەس. توختىتىۋاتىدۇ." + +-#: ../daemon/main.c:372 ++#: ../daemon/main.c:268 + #, c-format + msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." + msgstr "Authdir %s نىڭ ھوقۇقى %o توغرا ئەمەس. %o بولۇشى كېرەك ئىدى. توختىتىۋاتىدۇ." + +-#: ../daemon/main.c:409 ++#: ../daemon/main.c:305 + #, c-format + msgid "Can't find the GDM user '%s'. Aborting!" +-msgstr "GDM ئىشلەتكۈچىسى '%s' تېپىلمىدى. توختىتىۋاتىدۇ." ++msgstr "GDM ئىشلەتكۈچىسى ‹%s› تېپىلمىدى. توختىتىۋاتىدۇ." + +-#: ../daemon/main.c:415 ++#: ../daemon/main.c:311 + msgid "The GDM user should not be root. Aborting!" + msgstr "root نى GDM ئىشلەتكۈچىسى قىلىشقا بولمايدۇ. توختىتىۋاتىدۇ." + +-#: ../daemon/main.c:421 ++#: ../daemon/main.c:317 + #, c-format + msgid "Can't find the GDM group '%s'. Aborting!" +-msgstr "GDM ئىشلەتكۈچىسى '%s' تېپىلمىدى. توختىتىۋاتىدۇ." ++msgstr "GDM ئىشلەتكۈچىسى ‹%s› تېپىلمىدى. توختىتىۋاتىدۇ." + +-#: ../daemon/main.c:427 ++#: ../daemon/main.c:323 + msgid "The GDM group should not be root. Aborting!" + msgstr "root نى GDM گۇرۇپپىسى قىلىشقا بولمايدۇ. توختىتىۋاتىدۇ." + +-#: ../daemon/main.c:533 ++#: ../daemon/main.c:434 + msgid "Make all warnings fatal" + msgstr "ھەممە ئاگاھلاندۇرۇشنى ئېغىر خاتالىققا ئۆزگەرت" + +-#: ../daemon/main.c:534 ++#: ../daemon/main.c:435 + msgid "Exit after a time (for debugging)" + msgstr "بىردەمدىن كېيىن چېكىن - سازلاش ئۈچۈن" + +-#: ../daemon/main.c:535 ++#: ../daemon/main.c:436 + msgid "Print GDM version" + msgstr "GDM نەشرىنى بېسىپ چىقار" + +-#: ../daemon/main.c:550 ++#: ../daemon/main.c:449 + msgid "GNOME Display Manager" +-msgstr "GNOME ئېكران باشقۇرغۇ(GDM)" ++msgstr "گىنوم ئېكران باشقۇرغۇ(GDM)" + + #. make sure the pid file doesn't get wiped +-#: ../daemon/main.c:616 ++#: ../daemon/main.c:503 + msgid "Only the root user can run GDM" +-msgstr "root لا GDM نى ئىجرا قىلالايدۇ" ++msgstr "ئالىي ئىشلەتكۈچىلا GDM نى ئىجرا قىلالايدۇ" + + #. Translators: worker is a helper process that does the work + #. of starting up a session +-#: ../daemon/session-worker-main.c:158 ++#: ../daemon/session-worker-main.c:150 + msgid "GNOME Display Manager Session Worker" +-msgstr "GNOME ئېكران باشقۇرغۇنىڭ ئىشچى ئەڭگىمەسى" +- +-#: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 +-msgid "AT-SPI Registry Wrapper" +-msgstr "AT-SPI رويخەت تۈرى" +- +-#: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 +-msgid "Login Window" +-msgstr "كىرىش كۆزنىكى" ++msgstr "گىنوم ئېكران باشقۇرغۇنىڭ ئىشچى ئەڭگىمەسى" + +-#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:1 +-msgid "Power Manager" +-msgstr "توك مەنبە باشقۇرغۇچ" ++#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 ++msgid "Display ID" ++msgstr "ئېكران كىملىكى" + +-#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:2 +-msgid "Power management daemon" +-msgstr "توك مەنبە باشقۇرغۇ نازارەتچىسى" ++#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 ++msgid "ID" ++msgstr "ID" + +-#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +-msgid "GNOME Session Acceleration Checker" +-msgstr "GNOME ئەڭگىمە تېزلەتكۈچنى تەكشۈرگۈچ" ++#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 ++msgid "GNOME Display Manager Slave" ++msgstr "گىنوم ئېكران باشقۇرغۇ(ئەگەشكۈچى)" + +-#: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 +-msgid "GNOME Settings Daemon" +-msgstr "GNOME تەڭشەك نازارەتچىسى" ++#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1 ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566 ++msgid "Login Window" ++msgstr "كىرىش كۆزنىكى" + +-#: ../data/greeter-autostart/gnome-mag.desktop.in.h:1 ++#: ../data/applications/gnome-mag.desktop.in.h:1 + msgid "GNOME Screen Magnifier" +-msgstr "GNOME ئېكران چوڭايتقۇ" ++msgstr "گىنوم ئېكران چوڭايتقۇ" + +-#: ../data/greeter-autostart/gnome-mag.desktop.in.h:2 ++#: ../data/applications/gnome-mag.desktop.in.h:2 + msgid "Magnify parts of the screen" + msgstr "ئېكراننىڭ مەلۇم بۆلىكىنى چوڭايتىدۇ" + +-#: ../data/greeter-autostart/gok.desktop.in.h:1 ++#: ../data/applications/gnome-shell.desktop.in.h:1 ++msgid "GNOME Shell" ++msgstr "گىنوم Shell" ++ ++#: ../data/applications/gnome-shell.desktop.in.h:2 ++msgid "Window management and compositing" ++msgstr "كۆزنەك باشقۇرۇش ۋە بىرىكتۈرۈش" ++ ++#: ../data/applications/gok.desktop.in.h:1 + msgid "GNOME On-Screen Keyboard" +-msgstr "GNOME ئېكران ھەرپتاختا" ++msgstr "گىنوم ئېكران ھەرپتاختىسى" + +-#: ../data/greeter-autostart/gok.desktop.in.h:2 ++#: ../data/applications/gok.desktop.in.h:2 + msgid "Use an on-screen keyboard" + msgstr "ئېكران ھەرپتاختىسىنى ئىشلىتىدۇ" + +-#: ../data/greeter-autostart/metacity.desktop.in.h:1 +-msgid "Metacity" +-msgstr "Metacity" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:1 ++msgid "Whether or not to allow fingerprint readers for login" ++msgstr "كىرىشتە بارماق ئىزى ئوقۇغۇچقا ئىجازەتمۇ" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 ++msgid "" ++"The login screen can optionally allow users who have enrolled their " ++"fingerprints to log in using those prints." ++msgstr "كىرىش ئېكرانىدا، بارماق ئىزىنى خەتلەتكەن ئىشلەتكۈچىگە بارماق ئىزىنى ئىشلىتىپ كىرىشكە رۇخسەت قىلىشقىمۇ بولىدۇ." ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:3 ++msgid "Whether or not to allow smartcard readers for login" ++msgstr "كىرىشتە smartcard ئوقۇغۇچقا ئىجازەتمۇ" + +-#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1 +-msgid "Orca Screen Reader" +-msgstr "Orca ئېكران ئوقۇغۇ" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 ++msgid "" ++"The login screen can optionally allow users who have smartcards to log in " ++"using those smartcards." ++msgstr "كىرىش ئېكرانىدا، smartcards بار ئىشلەتكۈچىگە smartcards ئىشلىتىپ كىرىشكە رۇخسەت قىلىشقىمۇ بولىدۇ." ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:5 ++msgid "Path to small image at top of user list" ++msgstr "ئىشلەتكۈچى تىزىمىنىڭ ئەڭ ئۈستىدىكى كىچىك سۈرەتنىڭ يولى" + +-#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:2 +-msgid "Present on-screen information as speech or braille" +-msgstr "ئېكراندىكى ئۇچۇرلارنى ئۇن ياكى ئەمالار يېزىقى شەكلىدە كۆرسىتىدۇ" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 ++msgid "" ++"The login screen can optionally show a small image at the top of its user " ++"list to provide site administrators and distributions a way to provide " ++"branding." ++msgstr "كىرىش ئېكرانىدا ئىشلەتكۈچى تىزىمىنىڭ ئەڭ ئۈستىدە كىچىك سۈرەتنى كۆرسىتىشكىمۇ بولىدۇ. بۇ ئارقىلىق باشقۇرغۇچىنىڭ ئالاھىدە تۇغنى كۆرسىتىشىگە ئىمكانىيەت يارىتىدۇ." ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 ++msgid "" ++"The fallback login screen can optionally show a small image at the top of " ++"its user list to provide site administrators and distributions a way to " ++"provide branding." ++msgstr "fallback كىرىش ئېكرانىدا ئىشلەتكۈچى تىزىمىنىڭ ئەڭ ئۈستىدە كىچىك سۈرەتنى كۆرسىتىشكىمۇ بولىدۇ. بۇ ئارقىلىق باشقۇرغۇچىنىڭ ئالاھىدە تۇغنى كۆرسىتىشىگە ئىمكانىيەت يارىتىدۇ." + +-#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1 +-msgid "PolicyKit Authentication Agent" +-msgstr "PolicyKit دەلىللەش پروگراممىسى" ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:8 ++msgid "Avoid showing user list" ++msgstr "ئىشلەتكۈچى تىزىمىنى كۆرسىتىشتىن ساقلانسۇن" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 ++msgid "" ++"The login screen normally shows a list of available users to log in as. This " ++"setting can be toggled to disable showing the user list." ++msgstr "ئادەتتە كىرىش ئېكرانىدا مەۋجۇت ئىشلەتكۈچىلەرنىڭ تىزىمى كۆرۈنۈپ تۇرىدۇ. بۇ ئارقىلىق ئىشلەتكۈچىلەر تىزىمىنى كۆرسىتىش ياكى كۆرسەتمەسلىكنى بەلگىلىگىلى بولىدۇ." ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:10 ++msgid "Enable showing the banner message" ++msgstr "لەۋھە ئۇچۇرىنى كۆرسەتسۇن" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:11 ++msgid "Set to true to show the banner message text." ++msgstr "لەۋھە ئۇچۇرى تېكىستىنى كۆرسىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:12 ++msgid "Banner message text" ++msgstr "لەۋھە ئۇچۇرىنىڭ تېكىستى" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:13 ++msgid "Text banner message to show in the login window." ++msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان لەۋھە تېكىستى." ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:14 ++msgid "Disable showing the restart buttons" ++msgstr "قايتا قوزغات توپچىلىرىنى چەكلە" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:15 ++msgid "Set to true to disable showing the restart buttons in the login window." ++msgstr "تىزىمغا كىرىش كۆزنىكىدە قايتا قوزغات توپچىسىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ." ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 ++msgid "Number of allowed authentication failures" ++msgstr "كىملىك دەلىللەشتە رۇخسەت قىلىنغان خاتالىق قېتىم سانى" ++ ++#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 ++msgid "" ++"The number of times a user is allowed to attempt authentication, before " ++"giving up and going back to user selection." ++msgstr "كىملىك دەلىللەشتە خاتالىشىشقا رۇخسەت قىلىنغان قېتىم سانى. خاتالاشقان سانى بۇنىڭدىن ئېشىپ كەتسە، ئىشلەتكۈچى تاللاش كۆزنىكىگە قايتىدۇ." ++ ++#: ../gui/libgdm/gdm-user-switching.c:72 ++msgid "Unable to create transient display: " ++msgstr "ۋاقىتلىق كۆرسەتكۈچ قۇرغىلى بولمىدى " ++ ++#: ../gui/libgdm/gdm-user-switching.c:183 ++#: ../gui/libgdm/gdm-user-switching.c:395 ++msgid "Unable to activate session: " ++msgstr "ئەڭگىمەنى ئاكتىپلىغىلى بولمىدى: " ++ ++#: ../gui/libgdm/gdm-user-switching.c:344 ++#: ../gui/libgdm/gdm-user-switching.c:514 ++#, c-format ++msgid "Could not identify the current session." ++msgstr "ھازىرقى ئەڭگىمەنى بىلگىلى بولمىدى." ++ ++#: ../gui/libgdm/gdm-user-switching.c:351 ++#, c-format ++msgid "User unable to switch sessions." ++msgstr "ئىشلەتكۈچى ئەڭگىمەنى ئالماشتۇرالمىدى." ++ ++#: ../gui/libgdm/gdm-user-switching.c:523 ++#, c-format ++msgid "Could not identify the current seat." ++msgstr "ھازىرقى ئورۇننى بىلگىلى بولمىدى." ++ ++#: ../gui/libgdm/gdm-user-switching.c:533 ++#, c-format ++msgid "" ++"The system is unable to determine whether to switch to an existing login " ++"screen or start up a new login screen." ++msgstr "سىستېما نۆۋەتتىكى كىرىش ئېكرانىنى ئالماشتۇرۇش ياكى يېڭى كىرىش ئېكرانىنى قوزغىتىشنى بىلەلمىدى." ++ ++#: ../gui/libgdm/gdm-user-switching.c:541 ++#, c-format ++msgid "The system is unable to start up a new login screen." ++msgstr "سىستېما يېڭى كىرىش ئېكرانىنى باشلىيالمىدى." + + #: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 + msgid "Select System" +@@ -492,9 +474,121 @@ msgstr "XDMCP: XDMCP يىغلەكىنى قۇرغىلى بولمىدى!" + msgid "XDMCP: Could not read XDMCP header!" + msgstr "XDMCP: XDMCP قېشىنى ئوقۇغىلى بولمىدى!" + ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 ++msgid "XMDCP: Incorrect XDMCP version!" ++msgstr "XDMCP: XDMCP نەشرى توغرا ئەمەس" ++ ++#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 ++msgid "XMDCP: Unable to parse address" ++msgstr "XDMCP: ئادرېسنى پارچىلىيالمىدى" ++ ++#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 ++msgid "Fingerprint Authentication" ++msgstr "بارماق ئىزى بىلەن كىملىك دەلىللەش" ++ ++#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 ++msgid "Log into session with fingerprint" ++msgstr "ئەڭگىمەگە بارماق ئىزى بىلەن كىر" ++ ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 ++msgid "Password Authentication" ++msgstr "ئىم بىلەن كىملىك دەلىللەش" ++ ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 ++msgid "Log into session with username and password" ++msgstr "ئەڭگىمەگە ئىشلەتكۈچى ئاتى ۋە ئىم بىلەن كىر" ++ ++#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 ++msgid "Log In" ++msgstr "تىزىمغا كىر" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 ++msgid "Slot ID" ++msgstr "ئوقۇر ID" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 ++msgid "The slot the card is in" ++msgstr "كارتا بار ئوقۇر" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 ++msgid "Slot Series" ++msgstr "ئوقۇر قاتارى" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 ++msgid "per-slot card identifier" ++msgstr "ھەر بىر ئوقۇردىكى كارتىنىڭ پەرقلەندۈرگۈچىسى" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 ++msgid "name" ++msgstr "ئاتى" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 ++msgid "Module" ++msgstr "بۆلەك" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 ++msgid "smartcard driver" ++msgstr "smartcard قوزغاتقۇسى" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 ++msgid "Smartcard Authentication" ++msgstr "smartcard بىلەن كىملىك دەلىللەش" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 ++msgid "Log into session with smartcard" ++msgstr "ئەڭگىمەگە smartcard بىلەن كىر" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 ++msgid "Module Path" ++msgstr "بۆلەك يولى" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 ++msgid "path to smartcard PKCS #11 driver" ++msgstr "smartcard PKCS #11 قوزغاتقۇسىنىڭ يولى" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 ++msgid "received error or hang up from event source" ++msgstr "ھادىسە مەنبەسىدىن خاتالىق ياكى ئېسىپ قويۇشنى تاپشۇرۇۋالدى" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 ++#, c-format ++msgid "NSS security system could not be initialized" ++msgstr "NSS بىخەتەرلىك سىستېمىسىنى دەسلەپلەشتۈرگىلى بولمىدى" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 ++#, c-format ++msgid "no suitable smartcard driver could be found" ++msgstr "مۇۋاپىق smartcard قوزغاتقۇسى تېپىلمىدى" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 ++#, c-format ++msgid "smartcard driver '%s' could not be loaded" ++msgstr "smartcard قوزغاتقۇسى «%s» نى ئوقۇغىلى بولمىدى" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 ++#, c-format ++msgid "could not watch for incoming card events - %s" ++msgstr "كىرگەن كارتا ھادىسىسىنى كۆزىتەلمەيدۇ - %s" ++ ++#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 ++#, c-format ++msgid "encountered unexpected error while waiting for smartcard events" ++msgstr "ئىدراكلىق كارتا ھادىسىسىنى كۈتۈۋاتقاندا تاسادىپىي خاتالىققا يولۇقتى" ++ ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 ++msgid "Authentication" ++msgstr "سالاھىيەت دەلىللەش" ++ ++#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 ++msgid "Log into session" ++msgstr "ئەڭگىمەگە كىر" ++ + #: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 + msgid "Value" +-msgstr "قىممىتى" ++msgstr "قىممەت" + + #: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 + msgid "percentage of time complete" +@@ -502,7 +596,7 @@ msgstr "تاماملانغان ۋاقىتنىڭ پىرسەنتى" + + #: ../gui/simple-greeter/gdm-chooser-widget.c:1465 + msgid "Inactive Text" +-msgstr "بىئاكتىپ تېكىست" ++msgstr "پاسسىپ تېكىست" + + #: ../gui/simple-greeter/gdm-chooser-widget.c:1466 + msgid "The text to use in the label if the user hasn't picked an item yet" +@@ -552,101 +646,69 @@ msgstr "%a %l:%M:%S %p" + msgid "%a %l:%M %p" + msgstr "%p%l:%M (%a)" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:314 + msgid "Automatically logging in…" + msgstr "ئۆزلۈكىدىن كىرىۋاتىدۇ…" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 +-msgid "Select language and click Log In" +-msgstr "تىل تاللاپ «تىزىمغا كىر» نى چېكىڭ" +- + #. need to wait for response from backend +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:930 + msgid "Cancelling…" + msgstr "ۋاز كېچىۋاتىدۇ…" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 ++#. just wait for the user to select language and stuff ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 ++msgid "Select language and click Log In" ++msgstr "تىل تاللاپ «تىزىمغا كىر» نى چېكىڭ" ++ ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 + msgctxt "customsession" + msgid "Custom" + msgstr "ئىختىيارى" + +-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 ++#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623 + msgid "Custom session" + msgstr "ئىختىيارى ئەڭگىمە" + + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +-#| msgid "Panel" +-msgid "Cancel" +-msgstr "ۋاز كەچ" +- +-#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 + msgid "Computer Name" + msgstr "كومپيۇتېر ئاتى" + ++#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 ++msgid "Version" ++msgstr "نەشرى" ++ + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +-msgid "Login" +-msgstr "تىزىمغا كىر" ++msgid "Cancel" ++msgstr "ئەمەلدىن قالدۇر" + + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 + msgid "Unlock" +-msgstr "قۇلۇپسىزلا" ++msgstr "قۇلۇپ ئاچ" + + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 +-msgid "Version" +-msgstr "نەشرى" ++msgid "Login" ++msgstr "كىرىش" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:907 ++#: ../gui/simple-greeter/gdm-greeter-panel.c:953 + msgid "Suspend" + msgstr "توڭلات" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:912 ++#: ../gui/simple-greeter/gdm-greeter-panel.c:958 + msgid "Restart" + msgstr "قايتا قوزغات" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:916 ++#: ../gui/simple-greeter/gdm-greeter-panel.c:962 + msgid "Shut Down" + msgstr "تاقاش" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:965 ++#: ../gui/simple-greeter/gdm-greeter-panel.c:1011 + msgid "Unknown time remaining" + msgstr "ئېشىپ قالغان ۋاقىت نامەلۇم" + +-#: ../gui/simple-greeter/gdm-greeter-panel.c:987 ++#: ../gui/simple-greeter/gdm-greeter-panel.c:1033 + msgid "Panel" + msgstr "تاختا" + +-#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 +-msgid "Languages" +-msgstr "تىللار" +- +-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 +-msgid "_Languages:" +-msgstr "تىللار(_L):" +- +-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 +-msgid "_Language:" +-msgstr "تىل(_L):" +- +-#. translators: This brings up a dialog +-#. * with a list of languages to choose from +-#. +-#: ../gui/simple-greeter/gdm-language-option-widget.c:231 +-msgctxt "language" +-msgid "Other…" +-msgstr "باشقا…" +- +-#: ../gui/simple-greeter/gdm-language-option-widget.c:232 +-msgid "Choose a language from the full list of available languages." +-msgstr "تىل تىزىملىكىدىن تىل تاللايدۇ." +- +-#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +-msgid "Language" +-msgstr "تىل" +- +-#: ../gui/simple-greeter/gdm-languages.c:709 +-msgid "Unspecified" +-msgstr "بەلگىلەنمىگەن" +- + #: ../gui/simple-greeter/gdm-option-widget.c:505 + msgid "Label Text" + msgstr "ئەن تېكىستى" +@@ -671,14 +733,6 @@ msgstr "كۆڭۈلدىكى تۇر" + msgid "The ID of the default item" + msgstr "بۇ كۆڭۈلدىكى تۇرنىڭ ID سىدۇر" + +-#: ../gui/simple-greeter/gdm-recent-option-widget.c:310 +-msgid "Max Item Count" +-msgstr "تۇرنىڭ ئەڭ كوپ سانى" +- +-#: ../gui/simple-greeter/gdm-recent-option-widget.c:311 +-msgid "The maximum number of items to keep around in the list" +-msgstr "تىزىملىكتە ساقلىنىدىغان تۈرلەرنىڭ ئەڭ كوپ سانىنى بىلدۈرىدۇ" +- + #: ../gui/simple-greeter/gdm-remote-login-window.c:188 + #, c-format + msgid "Remote Login (Connecting to %s…)" +@@ -691,178 +745,38 @@ msgstr "يىراقتىن تىزىمغا كىر(%s غا باغلاندى)" + + #: ../gui/simple-greeter/gdm-remote-login-window.c:281 + msgid "Remote Login" +-msgstr "يىراقتىن تىزىمغا كىر" ++msgstr "يىراقتىن كىرىش" + + #: ../gui/simple-greeter/gdm-session-option-widget.c:162 + msgid "Session" + msgstr "ئەڭگىمە" + +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 +-msgid "Banner message text" +-msgstr "لەۋھە ئۇچۇرىنىڭ تېكىستى" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 +-msgid "Banner message text when chooser is empty" +-msgstr "تاللىغۇ قۇرۇق ۋاقىتتا چىقىدىغان لەۋھە ئۇچۇرىنىڭ تېكىستى" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3 +-msgid "Disable showing the restart buttons" +-msgstr "قايتا قوزغات توپچىلىرىنى چەكلە" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 +-msgid "Do not show known users in the login window" +-msgstr "تىزىمغا كىرىش كۆزنىكىدە ئىشلەتكۈچىلەرنىڭ ئاتىنى كۆرسەتمە" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 +-msgid "Enable accessibility keyboard plugin" +-msgstr "ھەرپتاختا قىستۇرمىسىنىڭ ياردەمچى ئىقتىدارىنى ئىشلەت" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 +-msgid "Enable on-screen keyboard" +-msgstr "ئېكران ھەرپتاختىسىنى ئىشلەت" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 +-msgid "Enable screen magnifier" +-msgstr "ئېكران چوڭايتىشنى ئىشلەت" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 +-msgid "Enable screen reader" +-msgstr "ئېكران ئوقۇغۇنى ئىشلەت" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 +-msgid "Enable showing the banner message" +-msgstr "لەۋھە ئۇچۇرىنى كۆرسەتسۇن" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 +-msgid "Icon name to use for greeter logo" +-msgstr "سالام تۇغى ئۈچۈن ئىشلىتىلىدىغان سىنبەلگە ئاتى" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 +-msgid "Recently selected languages" +-msgstr "ئالدىنقى قېتىم تاللانغان تىل" +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +-msgid "Set to a list of languages to be shown by default in the login window." +-msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان كۆڭۈلدىكى تىللار تەڭشىكى." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 +-msgid "Set to the themed icon name to use for the greeter logo." +-msgstr "سالام تۇغى ئۈچۈن ئىشلىتىلىدىغان سىنبەلگىنىڭ ئات تەڭشىكى." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +-msgid "Set to true to disable showing known users in the login window." +-msgstr "تىزىمغا كىرىش كۆزنىكىدە ئىشلەتكۈچى ئاتىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +-msgid "Set to true to disable showing the restart buttons in the login window." +-msgstr "تىزىمغا كىرىش كۆزنىكىدە قايتا قوزغات توپچىسىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +-msgid "Set to true to enable the XRandR settings manager plugin." +-msgstr "xrandr تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +-msgid "Set to true to enable the background settings manager plugin." +-msgstr "تەگلىك تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +-msgid "Set to true to enable the media-keys settings manager plugin." +-msgstr "media-keys تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +-msgid "Set to true to enable the on-screen keyboard." +-msgstr "ئېكران ھەرپتاختىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +-msgid "" +-"Set to true to enable the plugin to manage the accessibility keyboard " +-"settings." +-msgstr "قوشۇمچە ئىقتىدارلىق ھەرپتاختا تەڭشەك قىستۇرمىسى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +-msgid "Set to true to enable the screen magnifier." +-msgstr "ئېكران چوڭايتقۇنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +-msgid "Set to true to enable the screen reader." +-msgstr "ئېكران ئوقۇغۇنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +-msgid "Set to true to enable the sound settings manager plugin." +-msgstr "ئۈن تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +-msgid "Set to true to enable the xsettings settings manager plugin." +-msgstr "xsettings تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +-msgid "Set to true to show the banner message text." +-msgstr "لەۋھە ئۇچۇرى تېكىستىنى كۆرسىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +-msgid "Set to true to use Compiz as the window manager." +-msgstr "compiz نى ئېكران باشقۇرغۇ قىلىپ ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +-msgid "" +-"Text banner message to show in the login window when the user chooser is " +-"empty, instead of banner_message_text." +-msgstr "ئىشلەتكۈچى لەۋھە ئۇچۇرى تېكىستنى تاللىمىغاندا banner_message_text نىڭ ئورنىغا كۆرسىتىلىدىغان تېكىست." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +-msgid "Text banner message to show in the login window." +-msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان لەۋھە تېكىستى." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +-msgid "True if the XRandR settings manager plugin is enabled." +-msgstr "xrandr تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +-msgid "True if the background settings manager plugin is enabled." +-msgstr "تەگلىك تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +-msgid "True if the media-keys settings manager plugin is enabled." +-msgstr "media-keys تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +-msgid "True if the sound settings manager plugin is enabled." +-msgstr "ئۈن تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +-msgid "True if the xsettings settings manager plugin is enabled." +-msgstr "xsettings تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." +- +-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +-msgid "Use Compiz as the window manager" +-msgstr "compiz نى كۆزنەك باشقۇرغۇ قىلىپ ئىشلەت" +- +-#: ../gui/simple-greeter/gdm-timer.c:149 ++#: ../gui/simple-greeter/gdm-timer.c:147 + msgid "Duration" + msgstr "ۋاقتى" + +-#: ../gui/simple-greeter/gdm-timer.c:150 ++#: ../gui/simple-greeter/gdm-timer.c:148 + msgid "Number of seconds until timer stops" + msgstr "ۋاقىت خاتىرىلىگۈچ توختىغۇچە بولغان سېكۇنت" + +-#: ../gui/simple-greeter/gdm-timer.c:157 ++#: ../gui/simple-greeter/gdm-timer.c:155 + msgid "Start time" + msgstr "باشلاش ۋاقتى" + +-#: ../gui/simple-greeter/gdm-timer.c:158 ++#: ../gui/simple-greeter/gdm-timer.c:156 + msgid "Time the timer was started" + msgstr "ۋاقىت خاتىرىلىگۈچ باشلىنىدىغان ۋاقىت" + +-#: ../gui/simple-greeter/gdm-timer.c:165 ++#: ../gui/simple-greeter/gdm-timer.c:163 + msgid "Is it Running?" + msgstr "ئىجرا بولۇۋاتامدۇ؟" + +-#: ../gui/simple-greeter/gdm-timer.c:166 ++#: ../gui/simple-greeter/gdm-timer.c:164 + msgid "Whether the timer is currently ticking" + msgstr "ۋاقىت خاتىرىلىگۈچ ئۆزگىرىۋاتامدۇ يوق" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800 + #, c-format + msgid "Log in as %s" + msgstr "%s ئىشلەتكۈچى سۈپىتىدە كىرىدۇ" +@@ -872,261 +786,44 @@ msgstr "%s ئىشلەتكۈچى سۈپىتىدە كىرىدۇ" + #. * manually instead of choosing from + #. * a list. + #. +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 + msgctxt "user" + msgid "Other…" + msgstr "باشقا…" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 + msgid "Choose a different account" + msgstr "باشقا ھېساب تاللاڭ" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559 + msgid "Guest" + msgstr "مېھمان" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 + msgid "Log in as a temporary guest" + msgstr "ۋاقىتلىق مېھمان سۈپىتىدە كىرىدۇ" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 + msgid "Automatic Login" + msgstr "ئۆزلۈكىدىن تىزىمغا كىر" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 + msgid "Automatically log into the system after selecting options" + msgstr "تاللانمىلار تاللانغاندىن كېيىن سىستېمىغا ئۆزلۈكىدىن كىرىدۇ" + +-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 ++#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332 + msgid "Currently logged in" + msgstr "كىرىپ بولغان" + +-#: ../utils/gdmflexiserver.c:61 +-msgid "Only the VERSION command is supported" +-msgstr "پەقەت VERSION نىڭ بۇيرۇقىنىلا ئىشلەتكىلى بولىدۇ" +- +-#: ../utils/gdmflexiserver.c:61 +-msgid "COMMAND" +-msgstr "بۇيرۇق" +- +-#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 +-#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +-msgid "Ignored — retained for compatibility" +-msgstr "پەرۋا قىلمىدى - بىردەكلىكنى ساقلاش ئۈچۈن" +- +-#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 ++#: ../utils/gdm-screenshot.c:43 + msgid "Debugging output" + msgstr "سازلاشنىڭ چىقىرىلمىسى" + +-#: ../utils/gdmflexiserver.c:68 +-msgid "Version of this application" +-msgstr "بۇ پروگراممىنىڭ نەشرى" +- +-#: ../utils/gdmflexiserver.c:675 +-#, c-format +-msgid "Could not identify the current session." +-msgstr "ھازىرقى ئەڭگىمەنى بىلگىلى بولمىدى." +- +-#. Option parsing +-#: ../utils/gdmflexiserver.c:711 +-msgid "- New GDM login" +-msgstr "- يېڭى GDM كىرىش" +- +-#: ../utils/gdmflexiserver.c:767 +-msgid "Unable to start new display" +-msgstr "يېڭى ئېكراننى باشلىغىلى بولمىدى" +- + #: ../utils/gdm-screenshot.c:212 + msgid "Screenshot taken" +-msgstr "ئېكران كەسمىسى تۇتۇلدى" ++msgstr "ئېكران كۆرۈنۈشى تۇتۇلدى" + + #. Option parsing + #: ../utils/gdm-screenshot.c:279 + msgid "Take a picture of the screen" + msgstr "ئېكراننى رەسىمگە تۇت" +- +-#~ msgid "Shutdown Options…" +-#~ msgstr "تاقاش تاللانما…" +- +-#~ msgid "Keyboard layouts" +-#~ msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى" +- +-#~ msgid "_Keyboard:" +-#~ msgstr "ھەرپتاختا(_K):" +- +-#~ msgctxt "keyboard" +-#~ msgid "Other…" +-#~ msgstr "باشقا…" +- +-#~ msgid "Choose a keyboard layout from the full list of available layouts." +-#~ msgstr "ھەرپتاختا تىزىملىكىدىن ھەرپتاختا تاللاڭ." +- +-#~ msgid "Keyboard" +-#~ msgstr "ھەرپتاختا" +- +-#~ msgid "Recently selected keyboard layouts" +-#~ msgstr "ئالدىنقى قېتىم تاللانغان ھەرپتاختا ئورۇنلاشتۇرۇلۇشى" +- +-#~ msgid "" +-#~ "Set to a list of keyboard layouts to be shown by default in the login " +-#~ "window." +-#~ msgstr "" +-#~ "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان كۆڭۈلدىكى ھەرپتاختا ئورۇنلاشتۇرۇش " +-#~ "تەڭشىكى." +- +-#~ msgid "" +-#~ "The User Switch Applet is free software; you can redistribute it and/or " +-#~ "modify it under the terms of the GNU General Public License as published " +-#~ "by the Free Software Foundation; either version 2 of the License, or (at " +-#~ "your option) any later version." +-#~ msgstr "" +-#~ "مەزكۇر ئىشلەتكۈچى ئالماشتۇرۇش قوللانچىقى ھەقسىز دېتالدۇر. سىز ئەركىن " +-#~ "يۇمشاق دېتال ۋەخپىسى تارقاتقان GNU ئادەتتىكى ئاممىۋى ئىجازەتنامە بويىچە " +-#~ "ئۇنى قايتا تارقىتىپ ياكى ئۆزگەرتەلەيسىز؛ سىز شۇ ئىجازەت كېلىشىمىنىڭ " +-#~ "ئىككىنچى نەشرى ياكى يۇقىرى نەشرىنى ئىشلەتسىڭىز بولىدۇ." +- +-#~ msgid "" +-#~ "This program is distributed in the hope that it will be useful, but " +-#~ "WITHOUT ANY WARRANTY; without even the implied warranty of " +-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General " +-#~ "Public License for more details." +-#~ msgstr "" +-#~ "بۇ پروگراممىنى تارقىتىشتىكى مەقسەت سىزگە قۇلايلىق ئېلىپ كېلىش، ئەمما سودا " +-#~ "ياكى باشقا ئالاھىدە قوللىنىشقا نىسبەتەن ھېچقانداق كاپالەت يوق. GNU " +-#~ "ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىنى كۆرۈپ تېخىمۇ كۆپ تەپسىلاتقا ئېرىشىڭ." +- +-#~ msgid "" +-#~ "You should have received a copy of the GNU General Public License along " +-#~ "with this program; if not, write to the Free Software Foundation, Inc., " +-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " +-#~ msgstr "" +-#~ "مەزكۇر پروگرامما بىلەن بىرگە GNU ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىدىن " +-#~ "بىر نۇسخا تاپشۇرۇۋالىسىز؛ ئۇنداق بولمىسا Free Software Foundation, Inc., " +-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA بىلەن ئالاقە " +-#~ "قىلىڭ. " +- +-#~ msgid "A menu to quickly switch between users." +-#~ msgstr "ئىشلەتكۈچىلەرنى تېز ئالماشتۇرۇش ئۈچۈن ئىشلىتىلىدىغان تىزىملىك." +- +-#~ msgid "translator-credits" +-#~ msgstr "" +-#~ "Gheyret Kenji \n" +-#~ "Sahran" +- +-#~ msgid "Can't lock screen: %s" +-#~ msgstr "ئېكراننى قۇلۇپلىغىلى بولمىدى: %s" +- +-#~ msgid "Can't temporarily set screensaver to blank screen: %s" +-#~ msgstr "" +-#~ "ئېكران قوغدىغۇچنى ۋاقىتلىق قۇرۇق ئېكران قىلىپ تەڭشىگىلى بولمىدى: %s" +- +-#~ msgid "Can't log out: %s" +-#~ msgstr "تىزىمدىن چىقالمىدى: %s" +- +-#~ msgid "Available" +-#~ msgstr "بار" +- +-#~ msgid "Invisible" +-#~ msgstr "يوشۇرۇن" +- +-#~ msgid "Busy" +-#~ msgstr "ئالدىراش" +- +-#~ msgid "Away" +-#~ msgstr "يوق" +- +-#~ msgid "Account Information" +-#~ msgstr "ھېساب ئۇچۇرى" +- +-#~ msgid "System Preferences" +-#~ msgstr "سىستېما مايىللىقى" +- +-#~ msgid "Lock Screen" +-#~ msgstr "ئېكراننى قۇلۇپلاش" +- +-#~ msgid "Switch User" +-#~ msgstr "ئىشلەتكۈچى ئالماشتۇرۇش" +- +-#~ msgid "Quit…" +-#~ msgstr "چېكىن…" +- +-#~ msgid "User Switch Applet" +-#~ msgstr "ئىشلەتكۈچى ئالماشتۇرۇش قوللانچاق پروگراممىسى" +- +-#~ msgid "Change account settings and status" +-#~ msgstr "ھېساب تەڭشەكلىرى ۋە ھالەتنى ئۆزگەرت" +- +-#~ msgid "A menu to quickly switch between users" +-#~ msgstr "ئىشلەتكۈچىلەرنى چاپسان ئالماشتۇرۇش تىزىملىكى" +- +-#~ msgid "User Switcher" +-#~ msgstr "ئىشلەتكۈچى ئالماشتۇرغۇ" +- +-#~ msgid "User Switcher Applet Factory" +-#~ msgstr "ئىشلەتكۈچى ئالماشتۇرغۇ قوللانچاق زاۋۇتى" +- +-#~ msgid "Edit Personal _Information" +-#~ msgstr "شەخسىي ئۇچۇرلارنى تەھرىرلە(_I)" +- +-#~ msgid "_About" +-#~ msgstr "ھەققىدە(_A)" +- +-#~ msgid "_Edit Users and Groups" +-#~ msgstr "ئىشلەتكۈچى ۋە گۇرۇپپا تەھرىرلە(_E)" +- +-#~ msgid "Unknown" +-#~ msgstr "نامەلۇم" +- +-#~ msgid "Quit..." +-#~ msgstr "چېكىن..." +- +-#~ msgid "Couldn't set groupid to 0" +-#~ msgstr "گۇرۇپپا ID سىنى 0 گە تەڭشىگىلى بولمىدى" +- +-#~ msgid "name" +-#~ msgstr "ئاتى" +- +-#~ msgid "Change login screen configuration" +-#~ msgstr "كىرىش ئېكرانىنىڭ تەڭشىكىنى ئۆزگەرت" +- +-#~ msgid "Privileges are required to change the login screen configuration." +-#~ msgstr "كىرىش ئېكرانىنىڭ تەڭشىكىنى ئۆزگەرتىش ئۈچۈن ئىمتىياز بولۇشى كېرەك." +- +-#~ msgid "Configure login screen behavior" +-#~ msgstr "كىرىش ئېكرانىنىڭ ئىش-ھەرىكەتلىرىنى تەڭشە" +- +-#~ msgid "Login Screen" +-#~ msgstr "كىرىش ئېكرانى" +- +-#~ msgid "Log in as %s automatically" +-#~ msgstr "ئىشلەتكۈچى %s ئۆزلۈكىدىن كىرسۇن" +- +-#~ msgid "Allow %s seconds for anyone else to log in first" +-#~ msgstr "باشقىلارنىڭ ئالدىن كىرىۋېلىشى ئۈچۈن %s سېكۇنت ساقلىسۇن" +- +-#~ msgid "Select %s as default session" +-#~ msgstr "%s كۆڭۈلدىكى ئەڭگىمە بولسۇن" +- +-#~ msgid "Login Screen Settings" +-#~ msgstr "كىرىش ئېكرانى تەڭشىكى" +- +-#~ msgid "Play login sound" +-#~ msgstr "ئۈن چالسۇن" +- +-#~ msgid "Show list of users" +-#~ msgstr "ئىشلەتكۈچى تىزىملىكىنى كۆرسەت" +- +-#~ msgid "When the computer starts up:" +-#~ msgstr "كومپيۇتېر قوزغالغاندا: " +- +-#~ msgid "_Show the screen for choosing who will log in" +-#~ msgstr "كىرىدىغان ئىشلەتكۈچىلەرنى تاللاش ئېكرانىنى كۆرسەتسۇن(_S)" +- +-#~ msgid "%x" +-#~ msgstr "%x" +- +-#~ msgid "Manager" +-#~ msgstr "باشقۇرغۇ" +- +-#~ msgid "The user manager this user is controlled by." +-#~ msgstr "بۇ ئىشلەتكۈچىنى باشقۇرۇۋاتقان ئىشلەتكۈچى باشقۇرغۇ جىسمى" diff --git a/extra/gdm/maintain-FamilyLocal-cookie.patch b/extra/gdm/maintain-FamilyLocal-cookie.patch new file mode 100644 index 000000000..446c88860 --- /dev/null +++ b/extra/gdm/maintain-FamilyLocal-cookie.patch @@ -0,0 +1,124 @@ +From 6bc39aa208dbd8105232ae62255c42fafdec0541 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Thu, 20 Dec 2012 16:07:09 +0000 +Subject: display-access-file: maintain FamilyLocal entry for backward compatibility + +commit 0fccf4e0671e49f6e57d0135c97344973c042b23 swapped out the +FamilyLocal auth cookie for a FamilyWild auth cookie, because the +latter is more resilient to hostname changes. Unfortunately, +not all of the tooling accepts FamilyWild cookies (in particular the +xauth command), so things like su broke. + +This commit changes the code to have a FamilyWild and FamilyLocal +cookie. + +https://bugzilla.gnome.org/show_bug.cgi?id=690562 +--- +diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c +index 02bd414..02ec0a0 100644 +--- a/daemon/gdm-display-access-file.c ++++ b/daemon/gdm-display-access-file.c +@@ -438,8 +438,18 @@ _get_auth_info_for_display (GdmDisplayAccessFile *file, + gdm_display_is_local (display, &is_local, NULL); + + if (is_local) { +- *family = FamilyWild; +- *address = g_strdup ("localhost"); ++ /* We could just use FamilyWild here except xauth ++ * (and by extension su and ssh) doesn't support it yet ++ * ++ * https://bugs.freedesktop.org/show_bug.cgi?id=43425 ++ */ ++ char localhost[HOST_NAME_MAX + 1] = ""; ++ *family = FamilyLocal; ++ if (gethostname (localhost, HOST_NAME_MAX) == 0) { ++ *address = g_strdup (localhost); ++ } else { ++ *address = g_strdup ("localhost"); ++ } + } else { + *family = FamilyWild; + gdm_display_get_remote_hostname (display, address, NULL); +@@ -533,6 +543,18 @@ gdm_display_access_file_add_display_with_cookie (GdmDisplayAccessFile *file, + display_added = TRUE; + } + ++ /* If we wrote a FamilyLocal entry, we still want a FamilyWild ++ * entry, because it's more resiliant against hostname changes ++ * ++ */ ++ if (auth_entry.family == FamilyLocal) { ++ auth_entry.family = FamilyWild; ++ ++ if (XauWriteAuth (file->priv->fp, &auth_entry) ++ && fflush (file->priv->fp) != EOF) { ++ display_added = TRUE; ++ } ++ } + + g_free (auth_entry.address); + g_free (auth_entry.number); +@@ -555,6 +577,7 @@ gdm_display_access_file_remove_display (GdmDisplayAccessFile *file, + unsigned short name_length; + char *name; + ++ gboolean result = FALSE; + + g_return_val_if_fail (file != NULL, FALSE); + g_return_val_if_fail (file->priv->path != NULL, FALSE); +@@ -579,25 +602,44 @@ gdm_display_access_file_remove_display (GdmDisplayAccessFile *file, + g_free (number); + g_free (name); + +- if (auth_entry == NULL) { ++ if (auth_entry != NULL) { ++ XauDisposeAuth (auth_entry); ++ result = TRUE; ++ } ++ ++ /* If FamilyLocal, we also added a FamilyWild entry, ++ * so we need to clean that up too ++ */ ++ if (family == FamilyLocal) { ++ auth_entry = XauGetAuthByAddr (FamilyWild, ++ address_length, ++ address, ++ number_length, ++ number, ++ name_length, ++ name); ++ ++ if (auth_entry != NULL) { ++ XauDisposeAuth (auth_entry); ++ result = TRUE; ++ } ++ } ++ ++ ++ if (result == FALSE) { + g_set_error (error, + GDM_DISPLAY_ACCESS_FILE_ERROR, + GDM_DISPLAY_ACCESS_FILE_ERROR_FINDING_AUTH_ENTRY, + "could not find authorization entry"); +- return FALSE; +- } +- +- XauDisposeAuth (auth_entry); +- +- if (fflush (file->priv->fp) == EOF) { ++ } else if (fflush (file->priv->fp) == EOF) { + g_set_error (error, + G_FILE_ERROR, + g_file_error_from_errno (errno), + "%s", g_strerror (errno)); +- return FALSE; ++ result = FALSE; + } + +- return TRUE; ++ return result; + } + + void +-- +cgit v0.9.0.2 diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index fb3e507d9..d836bd86e 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175194 2013-01-16 11:05:56Z jgc $ +# $Id: PKGBUILD 178231 2013-02-18 16:07:47Z jgc $ # Maintainer: Ionut Biru pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.6.2 +pkgver=4.6.4 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('d0578892a5755f3ab661f0312d1a1376f4926afe72e65d83b6890011bc1f9fd7') +sha256sums=('8c75278a4382150ae2d6e477cbcebf541367be05176edd05669f046e24736a0d') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index 958ae9c29..72cf6349a 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 171905 2012-11-23 07:53:25Z andrea $ +# $Id: PKGBUILD 178216 2013-02-18 09:51:49Z andrea $ # Maintainer: Andrea Scarpino pkgname=kwebkitpart -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="A WebKit browser component for KDE" url="https://projects.kde.org/projects/extragear/base/kwebkitpart/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('aec1820fe59ea8f4fe62c81503560f8e') +md5sums=('c8bfcf46b4b01594d328804b6f55dcc6') build() { mkdir build diff --git a/extra/libgnome/PKGBUILD b/extra/libgnome/PKGBUILD index 8c5dc71a4..666a51d5e 100644 --- a/extra/libgnome/PKGBUILD +++ b/extra/libgnome/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 151073 2012-02-24 17:58:01Z ibiru $ +# $Id: PKGBUILD 178221 2013-02-18 14:05:53Z jgc $ # Maintainer: Jan de Groot pkgbase=libgnome pkgname=('libgnome' 'libgnome-data') pkgver=2.32.1 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('intltool' 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28') +makedepends=('intltool' 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2) @@ -23,7 +23,7 @@ build() { package_libgnome() { pkgdesc="Common libraries for GNOME" - depends=("libgnome-data=${pkgver}" 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28') + depends=("libgnome-data=${pkgver}" 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra') cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libgnome/libgnome.install b/extra/libgnome/libgnome.install index db4e04d4d..a36ed4725 100644 --- a/extra/libgnome/libgnome.install +++ b/extra/libgnome/libgnome.install @@ -13,5 +13,5 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --install ${pkgname} + usr/sbin/gconfpkg --uninstall ${pkgname} } diff --git a/extra/libpwquality/PKGBUILD b/extra/libpwquality/PKGBUILD index b40a35d4b..51ea0ac13 100644 --- a/extra/libpwquality/PKGBUILD +++ b/extra/libpwquality/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot pkgname=libpwquality -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="Library for password quality checking and generating random passwords" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('cracklib') optdepends=('python2: Python bindings') makedepends=('python2') source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2) -md5sums=('8827419118064539db70090cbed5cb21') +md5sums=('beb56c9028a713d936e04cc3c50c541d') build() { cd "$pkgname-$pkgver" @@ -22,7 +22,8 @@ build() { PYTHON=python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-static + --disable-static \ + --with-python-rev=2.7 make } diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 3049e28e5..6dd01b714 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 174263 2013-01-03 12:45:07Z juergen $ +# $Id: PKGBUILD 178214 2013-02-18 09:05:06Z juergen $ # Maintainer: Ronald van Haren # Contributor: Damir Perisa pkgname=maxima pkgver=5.28.0 -pkgrel=5 +pkgrel=7 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') url="http://maxima.sourceforge.net" -depends=('sbcl=1.1.3-1' 'texinfo' 'sh') +depends=('sbcl=1.1.4' 'texinfo' 'sh') makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 67b9d5114..06d41efed 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177916 2013-02-10 18:36:01Z andyrtr $ +# $Id: PKGBUILD 178227 2013-02-18 14:46:39Z jgc $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.22.1 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') @@ -42,7 +42,8 @@ check() { package_poppler() { pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms') + optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters') conflicts=("poppler-qt3<${pkgver}") cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 04a3dbeaf..752376596 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 177550 2013-02-07 05:42:47Z eric $ +# $Id: PKGBUILD 178213 2013-02-18 09:01:22Z juergen $ # Contributor: John Proctor # Contributor: Daniel White # Maintainer: Juergen Hoetzel # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -17,7 +17,7 @@ makedepends=('sbcl' 'texinfo') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp") -md5sums=('a0f12d01697373499597018a1aad431a' +md5sums=('9d82ec89abbaf265fbfc71a24445dd66' '7ac0c1936547f4278198b8bf7725204d') build() { diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 51fbe93e6..ab5c5ea24 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178064 2013-02-15 02:39:55Z foutrelis $ +# $Id: PKGBUILD 178202 2013-02-18 00:58:40Z foutrelis $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -pkgver=${_basekernel}.8 +pkgver=${_basekernel}.9 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -23,7 +23,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'fat-3.6.x.patch') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '587477b655e1bccc41d2035feb0167c5' + 'bcffd9fa99c4db6905dc6b22d71cb17a' '48a1026f5d36a915b8ef68f8138a7c18' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index c06a70578..406a31d5c 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.7.8-1-LIBRE-PAE +KERNEL_VERSION=3.7.9-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index b7044e8e1..063c6fed6 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 _releasever=11 -_rtpatchver=rt29 +_rtpatchver=rt30 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 @@ -38,7 +38,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' 'ced16b674906cf8c3733c012f804f5c7' - '37b4bbfe0af9d0f4b1148b8c670b6bf8' + 'b51b1561387f58046547eb06d823d195' '11161582d9050710ccfecbe077fc5a63' 'ac8f20b0cd83acb9525b5557e1fafeaf' '82496e68851d1960543a07ba51cdb44a' diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 14e3bf0bf..c066ccb92 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.6.11-1-rt29-LIBRE-RT +KERNEL_VERSION=3.6.11-1-rt30-LIBRE-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 6e95d3802..122862dbd 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178064 2013-02-15 02:39:55Z foutrelis $ +# $Id: PKGBUILD 178202 2013-02-18 00:58:40Z foutrelis $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -pkgver=${_basekernel}.8 +pkgver=${_basekernel}.9 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -23,7 +23,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'fat-3.6.x.patch') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '587477b655e1bccc41d2035feb0167c5' + 'bcffd9fa99c4db6905dc6b22d71cb17a' '36aadecfb87577e90931025f46cd9d53' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index da9db83a8..170138ceb 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.7.8-1-LIBRE-XEN +KERNEL_VERSION=3.7.9-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 12727f5c0..8567f9693 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.7.8 +_kernver=3.7.9 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=2 +pkgrel=3 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 04fef8c02..7aa2c127b 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.64 +_kernver=3.0.65 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=2 +pkgrel=3 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 1f871f9d3..298bbd2fb 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178066 2013-02-15 02:56:13Z foutrelis $ +# $Id: PKGBUILD 178204 2013-02-18 00:59:48Z foutrelis $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=64 +_sublevel=65 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.63 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.64 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'c2368deec03209ead2ba9b5f43a51964' + '080f45e61f2b17015ac68279a801c17b' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '1c5c1d0c50bfbe42c850abe14049901c') + '62baade17c89e99f9aefc364a4304e78') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index b4b867d9a..67065a1ef 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.64-1-LIBRE-LTS +KERNEL_VERSION=3.0.65-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 4910c7867..9103fd2a5 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178064 2013-02-15 02:39:55Z foutrelis $ +# $Id: PKGBUILD 178202 2013-02-18 00:58:40Z foutrelis $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -_sublevel=8 +_sublevel=9 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'fat-3.6.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '587477b655e1bccc41d2035feb0167c5' + 'bcffd9fa99c4db6905dc6b22d71cb17a' '53c782740eb3ddf875ad98c31c1bf213' '71a6f703cb0bee098a76ea42d5836d06' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -41,7 +41,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' - '461b01b9aa79e5cdd48ed3981cd80445') + '5296bf025db8b17613bc7205459564f0') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 0c061c63b..d96235100 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.7.8-1-LIBRE +KERNEL_VERSION=3.7.9-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/ahcpd/PKGBUILD b/pcr/ahcpd/PKGBUILD new file mode 100644 index 000000000..52c917bbc --- /dev/null +++ b/pcr/ahcpd/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Yann Lopez +pkgname=ahcpd +pkgver=0.53 +pkgrel=2 +pkgdesc="Ad-Hoc Configuration Protocol" +arch=(i686 x86_64 mips64el) +url="http://www.pps.jussieu.fr/~jch/software/ahcp/" +license=('custom') +depends=('sh') +source=(http://www.pps.jussieu.fr/~jch/software/files/$pkgname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's/\$(PREFIX)\/man/$(PREFIX)\/share\/man/g' Makefile + make PREFIX="/usr" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make install TARGET=${pkgdir} PREFIX=/usr + + install -d $pkgdir/usr/share/licenses/ahcpd + install -m 644 LICENCE $pkgdir/usr/share/licenses/ahcpd/ +} +md5sums=('a1a610bf20965aa522cd766bf3d5829a') diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD new file mode 100644 index 000000000..dd132dd35 --- /dev/null +++ b/pcr/babeld/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer (AUR): Yann Lopez +# Maintainer (Parabola): fauno +pkgname=babeld +pkgver=1.3.4 +pkgrel=2 +pkgdesc="Loop-free distance-vector routing protocol" +arch=(i686 x86_64 mips64el) +url="http://www.pps.jussieu.fr/~jch/software/babel/" +license=('custom') +depends=(glibc) +source=(http://www.pps.jussieu.fr/~jch/software/files/$pkgname-$pkgver.tar.gz{,.asc}) +install=babeld.install +md5sums=('37be1cbcc23cd00ee47efc9157c58795' + 'e2dfae49b497ba70c0c1014feae80f3a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -e "s,/man/,/share&,g" -i Makefile + + make PREFIX=/usr CFLAGS="$CFLAGS" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make PREFIX=/usr TARGET=$pkgdir install + + gzip -f $pkgdir/usr/share/man/man8/$pkgname.8 + + install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE +} diff --git a/pcr/babeld/babeld.install b/pcr/babeld/babeld.install new file mode 100644 index 000000000..686153617 --- /dev/null +++ b/pcr/babeld/babeld.install @@ -0,0 +1,18 @@ +compatibility_warning() { + echo "PLEASE NOTE:" + echo " " + echo "-------------------------------------------------------------" + echo " This version uses the IANA-allocated UDP port and multicast" + echo " group and is therefore incompatible with older versions." + echo "-------------------------------------------------------------" +} + +post_upgrade() { + major=$(echo $2 | cut -d '.' -f1) + minor=$(echo $2 | cut -d '.' -f2) + if [ $major -lt 1 ]; then + compatibility_warning + elif [ $major -eq 1 -a $minor -lt 1 ]; then + compatibility_warning + fi +} diff --git a/pcr/batctl/PKGBUILD b/pcr/batctl/PKGBUILD new file mode 100644 index 000000000..521537a50 --- /dev/null +++ b/pcr/batctl/PKGBUILD @@ -0,0 +1,25 @@ +# Contributor: Nathan Owe +# Maintainer: Thomas Weißschuh +pkgname=batctl +pkgver=2012.3.0 +pkgrel=2 +pkgdesc="B.A.T.M.A.N. advanced control and management tool" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.open-mesh.net/" +license=('GPL') +depends=('glibc') +source=("http://downloads.open-mesh.net/batman/releases/batman-adv-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}) + +build(){ + cd ${srcdir}/${pkgname}-${pkgver} + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} PREFIX=/usr install + +} + +# vim:set ts=2 sw=2 et: +md5sums=('fe9e6a3994539037b48afc5e3d31628c' + 'fdc6433ebc7fe59ce9eaec56dd843eb9') diff --git a/pcr/dropbear/PKGBUILD b/pcr/dropbear/PKGBUILD new file mode 100644 index 000000000..1e50534a3 --- /dev/null +++ b/pcr/dropbear/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Jaroslav Lichtblau +# Contributor: Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`> +# Contributor: Jeremy Cowgar + +pkgname=dropbear +pkgver=0.53.1 +pkgrel=2 +pkgdesc="Lightweight replacement for sshd" +arch=('i686' 'x86_64' 'mips64el') +url="http://matt.ucc.asn.au/dropbear/dropbear.html" +license=('custom:BSD' 'custom:PD') +depends=('zlib') +source=(http://matt.ucc.asn.au/$pkgname/releases/$pkgname-$pkgver.tar.bz2 \ + $pkgname-conf.d \ + $pkgname-rc.d) +sha256sums=('e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393' + 'eaec8cecae4476a660351ba9079c91b7c379146a22df881bd24b81af8f50d74c' + '29ab5438d15bfa727620fc04ec52ff55d676577b903c9261ce00bb291ae171a8') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + sed -i 's:usr/libexec/sftp:usr/lib/ssh/sftp:' options.h + + ./configure --prefix=/usr + LIBS="-lcrypt" make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make prefix=${pkgdir}/usr install + +#man pages + install -D -m644 dbclient.1 ${pkgdir}/usr/share/man/man1/dbclient.1 + install -D -m644 $pkgname.8 ${pkgdir}/usr/share/man/man8/$pkgname.8 + install -D -m644 dropbearkey.8 ${pkgdir}/usr/share/man/man8/dropbearkey.8 + +#configuration files + install -d ${pkgdir}/etc/$pkgname + install -D -m644 ${srcdir}/$pkgname-conf.d ${pkgdir}/etc/conf.d/$pkgname + install -D -m755 ${srcdir}/$pkgname-rc.d ${pkgdir}/etc/rc.d/$pkgname + +#license file + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} diff --git a/pcr/dropbear/dropbear-conf.d b/pcr/dropbear/dropbear-conf.d new file mode 100644 index 000000000..6f3b8f0c5 --- /dev/null +++ b/pcr/dropbear/dropbear-conf.d @@ -0,0 +1,15 @@ +# the TCP port that Dropbear listens on +DROPBEAR_PORT="127.0.0.1:22" # Default to local-only. + +# any additional arguments for Dropbear +DROPBEAR_EXTRA_ARGS="-w" # Default to no-root logins. + +# specify an optional banner file containing a message to be +# sent to clients before they connect, such as "/etc/issue.net" +DROPBEAR_BANNER="" + +# RSA hostkey file (default: /etc/dropbear/dropbear_rsa_host_key) +#DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key" + +# DSS hostkey file (default: /etc/dropbear/dropbear_dss_host_key) +DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key" diff --git a/pcr/dropbear/dropbear-rc.d b/pcr/dropbear/dropbear-rc.d new file mode 100644 index 000000000..011880b3b --- /dev/null +++ b/pcr/dropbear/dropbear-rc.d @@ -0,0 +1,88 @@ +#!/bin/bash +daemon_name=dropbear + +. /etc/rc.conf +. /etc/rc.d/functions + +. /etc/conf.d/$daemon_name + +for port in $DROPBEAR_PORT; do + daemon_args="$daemon_args -p $port" +done + +[ ! -z $DROPBEAR_BANNER ] && daemon_args="$daemon_args -b $DROPBEAR_BANNER" +[ ! -z $DROPBEAR_DSSKEY ] && daemon_args="$daemon_args -d $DROPBEAR_DSSKEY" +[ ! -z $DROPBEAR_RSAKEY ] && daemon_args="$daemon_args -r $DROPBEAR_RSAKEY" +[ ! -z $DROPBEAR_EXTRA_ARGS ] && daemon_args="$daemon_args $DROPBEAR_EXTRA_ARGS" +[ -z $DROPBEAR_PIDFILE ] && DROPBEAR_PIDFILE="/var/run/$daemon_name.pid" +daemon_args="$daemon_args -P $DROPBEAR_PIDFILE" + +get_pid() { + PID='' + if [ -r $DROPBEAR_PIDFILE -a -f $DROPBEAR_PIDFILE -a -w $DROPBEAR_PIDFILE ]; then + if kill -0 "`< $DROPBEAR_PIDFILE`" &>/dev/null; then # kill -0 == "exit code indicates if a signal may be sent" + PID="`< $DROPBEAR_PIDFILE`" + else # may not send signals to dropbear, because it's probably not running => remove pidfile + rm -f $DROPBEAR_PIDFILE + fi + fi +} + +case "$1" in + start) + stat_busy "Starting $daemon_name" + get_pid + if [ -z "$PID" ]; then + printhl "Checking for hostkeys" + if [ ! -z $DROPBEAR_DSSKEY ]; then + [ ! -f $DROPBEAR_DSSKEY ] && dropbearkey -t dss -f $DROPBEAR_DSSKEY + fi; + if [ ! -z $DROPBEAR_RSAKEY ]; then + [ ! -f $DROPBEAR_RSAKEY ] && dropbearkey -t rsa -f $DROPBEAR_RSAKEY + fi; + + $daemon_name $daemon_args # Make it Go Joe! + if [ $? -gt 0 ]; then + stat_die + else + add_daemon $daemon_name + stat_done + fi + else + stat_die + fi + ;; + + stop) + stat_busy "Stopping $daemon_name" + + get_pid + [ ! -z "$PID" ] && kill $PID &> /dev/null # Be dead (please), I say! + if [ $? -gt 0 ]; then + stat_die + else + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + fingerprint) + stat_busy "Fingerprinting $daemon_name hostkeys" + if [ ! -z $DROPBEAR_DSSKEY ]; then + printhl "DSS/DSA Key $(dropbearkey -y -f $DROPBEAR_DSSKEY | grep Fingerprint)" + fi; + if [ ! -z $DROPBEAR_RSAKEY ]; then + printhl "RSA Key $(dropbearkey -y -f $DROPBEAR_RSAKEY | grep Fingerprint)" + fi; + ;; + + *) + echo "usage: $0 {start|stop|restart|fingerprint}" +esac +exit 0 diff --git a/pcr/ffingerd/PKGBUILD b/pcr/ffingerd/PKGBUILD new file mode 100644 index 000000000..5b43314d3 --- /dev/null +++ b/pcr/ffingerd/PKGBUILD @@ -0,0 +1,27 @@ +pkgname=ffingerd +pkgver=1.28 +pkgrel=3 +pkgdesc="Secure finger daemon" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.fefe.de/ffingerd/" +license=('GPL2') +depends=('glibc' 'xinetd') +backup=('etc/xinetd.d/finger') +source=(http://www.fefe.de/$pkgname/$pkgname-$pkgver.tar.bz2 finger.xinetd) +md5sums=('fe207448745da07b4e393d8b8694658b' '2ca1a6b3f442a5c0c81fa03d265a203e') + +build() { + cd $srcdir/$pkgname-$pkgver + install -d $pkgdir/usr/sbin $pkgdir/usr/share/man/man8 + ./configure --prefix=/usr + + make +} + +package(){ + cd $srcdir/$pkgname-$pkgver + + make SBINDIR=$pkgdir/usr/sbin MANDIR=$pkgdir/usr/share/man install + + install -D -m644 $srcdir/finger.xinetd $pkgdir/etc/xinetd.d/ffinger +} diff --git a/pcr/ffingerd/finger.xinetd b/pcr/ffingerd/finger.xinetd new file mode 100644 index 000000000..36cd303b4 --- /dev/null +++ b/pcr/ffingerd/finger.xinetd @@ -0,0 +1,8 @@ +service finger +{ + socket_type = stream + wait = no + user = nobody + server = /usr/sbin/ffingerd + disable = yes +} diff --git a/pcr/inadyn-opendns/PKGBUILD b/pcr/inadyn-opendns/PKGBUILD new file mode 100644 index 000000000..37c13d49a --- /dev/null +++ b/pcr/inadyn-opendns/PKGBUILD @@ -0,0 +1,32 @@ +# Contributor: Bug +# Maintainer: Bug +pkgname=inadyn-opendns +pkgver=1.99 +pkgrel=4 +pkgdesc="Simple dynamic DNS client with SSL support" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.opendns.com/account/dynamic_dns/downloads" +license=('GPL') +makedepends=('unzip') +depends=('curl') +conflicts=('inadyn') +provides=('inadyn') +backup=('etc/inadyn.conf') +install='inadyn-opendns.install' +source=("http://www.opendns.com/support/ddns_files/inadyn.source.v$pkgver.zip" + 'inadyn.rc-script') +md5sums=('0f2cf9c3ea3482c03e1c42f8480f1c55' + '73c61f9939546c28119242a1e12ffcff') + +build() { + cd "$srcdir/inadyn.source.v$pkgver" + + make || return 1 + + install -Dm755 bin/linux/inadyn $pkgdir/usr/sbin/inadyn + install -Dm644 man/inadyn.8 $pkgdir/usr/share/man/man8/inadyn.8 + install -Dm644 man/inadyn.conf.5 $pkgdir/usr/share/man/man5/inadyn.conf.5 + install -Dm644 readme.html $pkgdir/usr/share/doc/inadyn/readme.html + install -Dm755 $srcdir/inadyn.rc-script $pkgdir/etc/rc.d/inadyn + install -Dm644 inadyn.conf $pkgdir/etc/inadyn.conf +} diff --git a/pcr/inadyn-opendns/inadyn-opendns.install b/pcr/inadyn-opendns/inadyn-opendns.install new file mode 100644 index 000000000..e1a842430 --- /dev/null +++ b/pcr/inadyn-opendns/inadyn-opendns.install @@ -0,0 +1,17 @@ +post_install() { +/bin/true +echo Please remember to change the /etc/inadyn.conf file for your settings. +} + +post_upgrade() { +/bin/true +} + +pre_remove() { +/bin/true +} + +op=$1 +shift + +$op "$@" \ No newline at end of file diff --git a/pcr/inadyn-opendns/inadyn.rc-script b/pcr/inadyn-opendns/inadyn.rc-script new file mode 100644 index 000000000..2ee29d59e --- /dev/null +++ b/pcr/inadyn-opendns/inadyn.rc-script @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/inadyn` +case "$1" in + start) + stat_busy "Starting INADYN Daemon" + [ -z "$PID" ] && /usr/sbin/inadyn --background --input_file /etc/inadyn.conf >>/var/log/inadyn 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + PID=`pidof -o %PPID /usr/sbin/inadyn` + echo $PID >/var/run/inadyn.pid + add_daemon inadyn + stat_done + fi + ;; + stop) + stat_busy "Stopping INADYN Daemon" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon inadyn + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/pcr/inspircd/PKGBUILD b/pcr/inspircd/PKGBUILD new file mode 100644 index 000000000..3de3d5e57 --- /dev/null +++ b/pcr/inspircd/PKGBUILD @@ -0,0 +1,68 @@ +pkgname=inspircd +pkgver=2.0.8 +pkgrel=2 +pkgdesc='A lightweight IRC daemon' +arch=('x86_64' 'i686' 'mips64el') +url='http://www.inspircd.org/' +license=('GPL2') +depends=('perl') +makedepends=('pkg-config' 'libmysqlclient' 'postgresql' 'sqlite3' 'libldap' 'geoip' + 'tre' 'gnutls' 'openssl' 'libgcrypt') +optdepends=('gnutls: m_ssl_gnutls' + 'libgcrypt: m_ssl_gnutls' + 'openssl: m_ssl_openssl' + 'libmysqlclient: m_mysql' + 'pcre: m_regex_pcre' + 'postgresql: m_pgsql' + 'sqlite3: m_sqlite3' + 'libldap: m_ldapoper and m_ldapauth' + 'geoip: m_geoip' + 'tre: m_regex_tre') +install=inspircd.install + +source=(https://github.com/downloads/inspircd/inspircd/InspIRCd-$pkgver.tar.bz2 + inspircd.rcd inspircd.service) +sha1sums=('c8bcbc222df40bc8110cefdb4a1fee91ad7c73d1' + '59c4aa6929732fb076ca2be96a01385cae9e8484' + '667b28d0d086be6daad7a0c2f110c68e6526264e') + +build() { + cd "${srcdir}/inspircd" + + ./configure \ + --enable-extras=m_geoip.cpp \ + --enable-extras=m_ldapauth.cpp \ + --enable-extras=m_ldapoper.cpp \ + --enable-extras=m_mysql.cpp \ + --enable-extras=m_pgsql.cpp \ + --enable-extras=m_regex_pcre.cpp \ + --enable-extras=m_regex_posix.cpp \ + --enable-extras=m_regex_tre.cpp \ + --enable-extras=m_sqlite3.cpp + + ./configure \ + --prefix=/usr/lib/inspircd \ + --binary-dir=/usr/sbin \ + --module-dir=/usr/lib/inspircd/modules \ + --config-dir=/etc/inspircd \ + --enable-gnutls \ + --enable-openssl \ + --enable-epoll + + make +} + +package() { + install -Dm755 "${srcdir}"/inspircd.rcd "${pkgdir}"/etc/rc.d/inspircd + install -Dm644 "${srcdir}"/inspircd.service "${pkgdir}"/usr/lib/systemd/system/inspircd.service + install -o141 -g141 -dm750 "${pkgdir}/var/log/inspircd" + + cd "${srcdir}/inspircd" + make DESTDIR="$pkgdir" INSTUID=141 install + + mkdir -p "${pkgdir}"/usr/share/inspircd + mv "${pkgdir}"/etc/inspircd/examples "${pkgdir}"/usr/share/inspircd/examples + + rm -rf "${pkgdir}"/usr/lib/inspircd/logs + rm -rf "${pkgdir}"/usr/lib/inspircd/data +} diff --git a/pcr/inspircd/inspircd.install b/pcr/inspircd/inspircd.install new file mode 100644 index 000000000..ec97113f5 --- /dev/null +++ b/pcr/inspircd/inspircd.install @@ -0,0 +1,15 @@ +post_install() { + getent group inspircd &>/dev/null || groupadd -r -g 141 inspircd >/dev/null + getent passwd inspircd &>/dev/null || useradd -r -u 141 -g inspircd -d /var/lib/inspircd -s /bin/false -c inspircd inspircd >/dev/null + + echo '==> You will need to create a config file for inspircd' + echo '==> cp /etc/inspircd/inspircd.conf.example /etc/inspircd/inspircd.conf' + echo '==> You will need to change the pidfile. To do this you can insert the following into your config.' + echo '==> ' + echo '==> Remember to use absolute paths in your config directory and not relative paths like you would do with a user-based inspircd install.' +} + +post_remove() { + getent passwd inspircd &>/dev/null && userdel inspircd >/dev/null + getent group inspircd &>/dev/null && groupdel inspircd >/dev/null +} diff --git a/pcr/inspircd/inspircd.rcd b/pcr/inspircd/inspircd.rcd new file mode 100644 index 000000000..5dbd8198e --- /dev/null +++ b/pcr/inspircd/inspircd.rcd @@ -0,0 +1,54 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof /usr/sbin/inspircd +} + +case "$1" in + start) + stat_busy "Starting inspircd" + PID=$(get_pid) + if [ -z "$PID" ]; then + su -s /bin/sh -c '/usr/sbin/inspircd --logfile /var/log/inspircd/startup.log --config /etc/inspircd/inspircd.conf' 'inspircd' > /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon inspircd + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping inspircd" + PID=$(get_pid) + [ ! -z "$PID" ] && kill $PID + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm_daemon inspircd + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + rehash|reload) + kill -HUP $(get_pid) + ;; + + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/pcr/inspircd/inspircd.service b/pcr/inspircd/inspircd.service new file mode 100644 index 000000000..83230b65c --- /dev/null +++ b/pcr/inspircd/inspircd.service @@ -0,0 +1,17 @@ +[Unit] +Description=InspIRCd IRC daemon +Requires=network.target +After=network.target + +[Service] +Type=forking +PIDFile=/var/lib/inspircd/inspircd.pid +ExecStart=/usr/lib/inspircd/inspircd start +ExecReload=/usr/lib/inspircd/inspircd rehash +ExecStop=/usr/lib/inspircd/inspircd stop +Restart=on-failure +User=inspircd +Group=inspircd + +[Install] +Alias=ircd.service -- cgit v1.2.3-54-g00ecf From 90f97c6f30af5c30599fab0b6d6c1f474ad15fe0 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 24 Feb 2013 00:49:03 -0800 Subject: Sun Feb 24 00:48:48 PST 2013 --- ...x-format-of-video-tabletmode-event-string.patch | 45 ------------- community/acpid/PKGBUILD | 19 +++--- community/cdrtools/PKGBUILD | 48 -------------- community/cdrtools/cdrtools.install | 14 ---- community/ipset/PKGBUILD | 10 +-- community/nginx/PKGBUILD | 6 +- community/nginx/logrotate | 2 +- community/nginx/nginx.install | 4 +- ...isd-fix-typo-in-topology-generator-BZ-731.patch | 30 --------- community/quagga/0002-CVE-2012-1820.patch | 74 ---------------------- community/quagga/PKGBUILD | 18 ++---- extra/ruby/PKGBUILD | 4 +- extra/xf86-video-intel/PKGBUILD | 6 +- extra/xorg-server/PKGBUILD | 23 ++++--- extra/xorg-server/bug59825.patch | 12 ++++ .../xserver-1.6.0-less-acpi-brokenness.patch | 25 ++++++++ libre/cdrkit-libre/PKGBUILD | 42 +++++------- libre/cdrtools-libre/PKGBUILD | 58 +++++++++++++++++ libre/cdrtools-libre/cdrtools.install | 14 ++++ libre/hplip-libre/PKGBUILD | 15 ++--- libre/linux-libre-kmod-alx/PKGBUILD | 10 +-- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 10 +-- libre/linux-libre-lts/linux-libre-lts.install | 2 +- pcr/hexchat-libre/PKGBUILD | 5 +- 25 files changed, 193 insertions(+), 307 deletions(-) delete mode 100644 community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch delete mode 100644 community/cdrtools/PKGBUILD delete mode 100644 community/cdrtools/cdrtools.install delete mode 100644 community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch delete mode 100644 community/quagga/0002-CVE-2012-1820.patch create mode 100644 extra/xorg-server/bug59825.patch create mode 100644 extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch create mode 100644 libre/cdrtools-libre/PKGBUILD create mode 100644 libre/cdrtools-libre/cdrtools.install (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch b/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch deleted file mode 100644 index d111214d3..000000000 --- a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ddf5be1f8fc35c38dc241ca935bf4d408f2ff61d Mon Sep 17 00:00:00 2001 -From: Ted Felix -Date: Thu, 17 Jan 2013 20:03:54 -0500 -Subject: [PATCH] Fix format of video/tabletmode event string - -The previous format caused Xorg's xserver to crash in -lnxACPIGetEventFromOs() because it doesn't check for NULL -returns from strtok(). ---- - input_layer.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/input_layer.c b/input_layer.c -index 591ad64..db410c0 100644 ---- a/input_layer.c -+++ b/input_layer.c -@@ -56,6 +56,14 @@ struct evtab_entry { - evtest.c, acpi_genl, or kacpimon to find new events to add to this - table. */ - -+/* -+ * The two numbers (e.g. "00000080 00000000") in each string is a format -+ * that Xorg and maybe others expect. -+ * -+ * See hw/xfree86/os-support/linux/lnx_acpi.c in xserver and specifically -+ * lnxACPIGetEventFromOs(). -+ */ -+ - static struct evtab_entry evtab[] = { - - /*** COMMON EVENTS ***/ -@@ -66,8 +74,8 @@ static struct evtab_entry evtab[] = { - {{{0,0}, EV_KEY, KEY_SLEEP, 1}, "button/sleep SBTN 00000080 00000000"}, - {{{0,0}, EV_SW, SW_LID, 1}, "button/lid LID close"}, - {{{0,0}, EV_SW, SW_LID, 0}, "button/lid LID open"}, -- {{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT off"}, -- {{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT on"}, -+ {{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT 0000008A 00000000"}, -+ {{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT 0000008A 00000001"}, - - - /*** VIDEO ***/ --- -1.8.1.1 - diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 9f477998c..d31a614a8 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 82787 2013-01-24 12:57:51Z seblu $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 84713 2013-02-23 09:11:56Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: xduugu # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt -pkgname=cdrtools -pkgver=3.01a12 -pkgrel=1 -pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning" -arch=('i686' 'x86_64') -url="http://cdrecord.berlios.de/private/cdrecord.html" -license=('CDDL') -depends=('acl') -conflicts=('cdrkit') -provides=('cdrkit') -options=(!makeflags) -backup=('etc/default/cdrecord' 'etc/default/rscsi') -install=cdrtools.install -source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2) -md5sums=('563d80a7102175bea3e41fbfc269b914') - -build() { - cd "$srcdir"/cdrtools-${pkgver%%a*} - sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux - sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux - - export GMAKE_NOWARN=true - make INS_BASE=/usr INS_RBASE=/ -} - -package() { - cd "$srcdir"/cdrtools-${pkgver%%a*} - - export GMAKE_NOWARN=true - make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/usr/include - rm -rf "$pkgdir"/usr/lib/{*.a,profiled} - - # autoload 'sg' module needed by cdrecord - install -d -m755 "$pkgdir"/usr/lib/modules-load.d/ - echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf - - # create symlinks for cdrkit compatibility - cd "$pkgdir"/usr/bin - ln -s cdrecord wodim - ln -s readcd readom - ln -s mkisofs genisoimage - ln -s cdda2wav icedax -} - -# vim:set ts=2 sw=2 et: diff --git a/community/cdrtools/cdrtools.install b/community/cdrtools/cdrtools.install deleted file mode 100644 index 3f49eb1bb..000000000 --- a/community/cdrtools/cdrtools.install +++ /dev/null @@ -1,14 +0,0 @@ - -post_install() { - echo "To allow other users than root execute rscsi add an entry" - echo "to /etc/default/rscsi or use an \"rscsi\" user" - echo "" - post_upgrade -} - -post_upgrade() { - echo "The manual loading (or loading using rc.conf)" - echo "of the 'sg' module is no longer necessary." - echo "It is automatically loaded during boot by systemd-tools (udev 185)." -} - diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index b9835f0e9..fbf7ba29e 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82785 2013-01-24 12:55:11Z seblu $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 84727 2013-02-23 17:46:16Z seblu $ +# Maintainer: Sébastien Luttringer pkgname=ipset -pkgver=6.16.1 -pkgrel=2 +pkgver=6.17 +pkgrel=1 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64') url='http://ipset.netfilter.org' @@ -14,7 +14,7 @@ options=('!libtool') source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.systemd" "$pkgname.service") -md5sums=('9fd70c825f052db7dc9d5ba0562b7083' +md5sums=('9d439e279e02076f29fe7c9c059a5cae' '7daa4f163eef9db216cb4c428e0342a3' 'b032241b96b5802975fe4321cc511c6b') diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 137fa40dc..58431ac2b 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84707 2013-02-22 20:47:11Z bpiotrowski $ +# $Id: PKGBUILD 84730 2013-02-23 20:47:41Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Miroslaw Szot @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.2.7 -pkgrel=2 +pkgrel=3 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl' 'geoip') @@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz logrotate) sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' - 'b0ef6c00e0e94926588242ed910b387922e513d5152fcdb651dc06e2b84e7d85') + 'a21b564eaf83b4b4ce3a436e895bd37e000677fb314b89818f89f30caca6e6d9') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/nginx/logrotate b/community/nginx/logrotate index 8773578b5..1a5bd6441 100644 --- a/community/nginx/logrotate +++ b/community/nginx/logrotate @@ -1,6 +1,6 @@ /var/log/nginx/*log { missingok - create 750 root log + create 640 root log sharedscripts compress postrotate diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install index 00a7b9cac..242766abd 100644 --- a/community/nginx/nginx.install +++ b/community/nginx/nginx.install @@ -1,12 +1,12 @@ post_install() { if [[ -e var/log/nginx ]]; then - chmod 750 var/log/nginx + chmod 640 var/log/nginx chown root:log var/log/nginx fi } post_upgrade() { - [[ $(vercmp $2 1.2.7-1) -le 0 ]] && post_install + [[ $(vercmp $2 1.2.7-2) -le 0 ]] && post_install if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then echo " >>> Since 1.2.1-2 several changes has been made in package:" echo " - *.conf files have been moved to /etc/nginx" diff --git a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch b/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch deleted file mode 100644 index dda3c48c4..000000000 --- a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a47c5838e9f445ab887ad927706b11ccbb181364 Mon Sep 17 00:00:00 2001 -From: David Lamparter -Date: Thu, 21 Jun 2012 09:55:38 +0200 -Subject: [PATCH] isisd: fix typo in topology generator (BZ#731) - -There was a "lsp->" missing before "level" in line 2416. -(introduced by git commit e38e0df) - -Reported-by: Seblu -Signed-off-by: David Lamparter ---- - isisd/isis_lsp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c -index 5c1e993..082e9dc 100644 ---- a/isisd/isis_lsp.c -+++ b/isisd/isis_lsp.c -@@ -2413,7 +2413,7 @@ top_lsp_refresh (struct thread *thread) - isis_dynhn_insert (lsp->lsp_header->lsp_id, lsp->tlv_data.hostname, - IS_LEVEL_1); - -- lsp->lsp_header->lsp_bits = lsp_bits_generate (level, -+ lsp->lsp_header->lsp_bits = lsp_bits_generate (lsp->level, - lsp->area->overload_bit); - rem_lifetime = lsp_rem_lifetime (lsp->area, IS_LEVEL_1); - lsp->lsp_header->rem_lifetime = htons (rem_lifetime); --- -1.7.11 - diff --git a/community/quagga/0002-CVE-2012-1820.patch b/community/quagga/0002-CVE-2012-1820.patch deleted file mode 100644 index aae2d7b18..000000000 --- a/community/quagga/0002-CVE-2012-1820.patch +++ /dev/null @@ -1,74 +0,0 @@ -@@ -, +, @@ - bgpd: CVE-2012-1820, DoS in bgp_capability_orf() - - An ORF (code 3) capability TLV is defined to contain exactly one - AFI/SAFI block. Function bgp_capability_orf(), which parses ORF - capability TLV, uses do-while cycle to call its helper function - bgp_capability_orf_entry(), which actually processes the AFI/SAFI data - block. The call is made at least once and repeated as long as the input - buffer has enough data for the next call. - - The helper function, bgp_capability_orf_entry(), uses "Number of ORFs" - field of the provided AFI/SAFI block to verify, if it fits the input - buffer. However, the check is made based on the total length of the ORF - TLV regardless of the data already consumed by the previous helper - function call(s). This way, the check condition is only valid for the - first AFI/SAFI block inside an ORF capability TLV. - - For the subsequent calls of the helper function, if any are made, the - check condition may erroneously tell, that the current "Number of ORFs" - field fits the buffer boundary, where in fact it does not. This makes it - possible to trigger an assertion by feeding an OPEN message with a - specially-crafted malformed ORF capability TLV. - - This commit fixes the vulnerability by making the implementation follow - the spec. ---- a/bgpd/bgp_open.c -+++ a/bgpd/bgp_open.c -@@ -231,7 +231,7 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr) - } - - /* validate number field */ -- if (sizeof (struct capability_orf_entry) + (entry.num * 2) > hdr->length) -+ if (sizeof (struct capability_orf_entry) + (entry.num * 2) != hdr->length) - { - zlog_info ("%s ORF Capability entry length error," - " Cap length %u, num %u", -@@ -335,28 +335,6 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr) - } - - static int --bgp_capability_orf (struct peer *peer, struct capability_header *hdr) --{ -- struct stream *s = BGP_INPUT (peer); -- size_t end = stream_get_getp (s) + hdr->length; -- -- assert (stream_get_getp(s) + sizeof(struct capability_orf_entry) <= end); -- -- /* We must have at least one ORF entry, as the caller has already done -- * minimum length validation for the capability code - for ORF there must -- * at least one ORF entry (header and unknown number of pairs of bytes). -- */ -- do -- { -- if (bgp_capability_orf_entry (peer, hdr) == -1) -- return -1; -- } -- while (stream_get_getp(s) + sizeof(struct capability_orf_entry) < end); -- -- return 0; --} -- --static int - bgp_capability_restart (struct peer *peer, struct capability_header *caphdr) - { - struct stream *s = BGP_INPUT (peer); -@@ -573,7 +551,7 @@ bgp_capability_parse (struct peer *peer, size_t length, int *mp_capability, - break; - case CAPABILITY_CODE_ORF: - case CAPABILITY_CODE_ORF_OLD: -- if (bgp_capability_orf (peer, &caphdr)) -+ if (bgp_capability_orf_entry (peer, &caphdr)) - return -1; - break; - case CAPABILITY_CODE_RESTART: diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index 0b3dd2afe..1c93abae0 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83621 2013-02-04 00:43:11Z seblu $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 84732 2013-02-23 20:56:41Z seblu $ +# Maintainer: Sébastien Luttringer pkgname=quagga -pkgver=0.99.21 -pkgrel=3 +pkgver=0.99.22 +pkgrel=1 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' @@ -19,10 +19,8 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar 'ospfd.service' 'ripd.service' 'ripngd.service' - 'zebra.service' - '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch' - '0002-CVE-2012-1820.patch') -md5sums=('99840adbe57047c90dfba6b6ed9aec7f' + 'zebra.service') +md5sums=('3057bf3a91116a1017dd0df7e5e8ef93' '45d8bf56a426b0e7ebe429547be8a27a' 'ab31ed8dafd7a92137f4f00ad0937b4f' '4c05d0105cd0db23a2583bd75a1bde4d' @@ -30,9 +28,7 @@ md5sums=('99840adbe57047c90dfba6b6ed9aec7f' 'c5f8a729685cebf8fc5b1a1552d37b6d' 'e721b334bb0b31983642b307033c63d0' 'effeb26ff78ffcafe7808596ddc5d3fc' - 'f0c0b99346b2c373a74158e45f04cf91' - 'c80174f7bdd32cd84550d52451e8f495' - '44f39016d81f3b13b2744f7dcd93289d') + 'f0c0b99346b2c373a74158e45f04cf91') build() { cd $pkgname-$pkgver diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index b960373e6..5f3c8a174 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jeramy Rutley pkgname=('ruby' 'ruby-docs') -pkgver=1.9.3_p385 +pkgver=1.9.3_p392 pkgrel=1 arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' @@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('5ec9aff670f4912b0f6f0e11e855ef6c' +md5sums=('a810d64e2255179d2f334eb61fb8519c' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 81beb4f8e..adaad515b 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178020 2013-02-13 16:45:46Z andyrtr $ +# $Id: PKGBUILD 178462 2013-02-23 11:12:21Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.21.2 +pkgver=2.21.3 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2e6890ecacc715caa5459581b00b63152e08646ea1b76330bf79b996a139d850') +sha256sums=('1ce672a042226dba776649e9067827c24fbb27383c78919a372265bb0d939dbb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 9e283b69d..ee2a949f0 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175947 2013-01-25 08:45:46Z andyrtr $ +# $Id: PKGBUILD 178463 2013-02-23 11:12:22Z andyrtr $ # Maintainer: Jan de Groot pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.13.2 +pkgver=1.13.2.901 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -16,14 +16,17 @@ options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch + xserver-1.6.0-less-acpi-brokenness.patch + bug59825.patch xvfb-run xvfb-run.1 10-quirks.conf - #git-fixes.patch use-pixman-glyph-cache.patch) -sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408' +sha256sums=('5351e2d18949f22c92350ffa037cfc49d3ac09f2ac4d3be6a3ea566d2052723c' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' + 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' + '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' @@ -32,18 +35,18 @@ sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408' build() { cd "${srcdir}/${pkgbase}-${pkgver}" - # Apply upstream fixes from server-1.13 branch -# patch -Np1 -i "${srcdir}/git-fixes.patch" - - # Use pixman 0.28.0 glyph cache - backported from git master -# patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch" - # Use nouveau/nv/nvidia drivers for nvidia devices patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" # Use unofficial imedia SiS driver for supported SiS devices patch -Np0 -i "${srcdir}/autoconfig-sis.patch" + # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo + patch -Np1 -i "${srcdir}/bug59825.patch" + + # From Fedora. Do not build acpid code, it is buggy and we do not need it + patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch" + autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ diff --git a/extra/xorg-server/bug59825.patch b/extra/xorg-server/bug59825.patch new file mode 100644 index 000000000..b405d136d --- /dev/null +++ b/extra/xorg-server/bug59825.patch @@ -0,0 +1,12 @@ +diff -U 3 -b -d -p -r -- a/glx/glxdri.c b/glx/glxdri.c +--- a/glx/glxdri.c 2013-01-24 22:14:35.216092949 +0100 ++++ b/glx/glxdri.c 2013-01-24 22:13:48.499427991 +0100 +@@ -971,6 +971,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + size_t buffer_size; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + ++ framebuffer.base = NULL; ++ + if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || + !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) { + LogMessage(X_INFO, \ No newline at end of file diff --git a/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch b/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch new file mode 100644 index 000000000..b42c2d7c8 --- /dev/null +++ b/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch @@ -0,0 +1,25 @@ +From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 9 Nov 2011 11:52:06 +1000 +Subject: [PATCH 2/7] Don't build the ACPI code. + +No good can come of this. +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a12783c..54f4464 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then + linux_alpha=yes + ;; + i*86|amd64*|x86_64*|ia64*) +- linux_acpi="yes" + ;; + *) + ;; +-- +1.7.10.1 + diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD index 5e71171f9..41dea657a 100644 --- a/libre/cdrkit-libre/PKGBUILD +++ b/libre/cdrkit-libre/PKGBUILD @@ -1,42 +1,35 @@ +# $Id: PKGBUILD 157442 2012-04-28 11:27:45Z allan $ # Maintainer: Andrea Scarpino -# Maintainer: Henry Jensen # Contributor: Alexander Fehr +_pkgname=cdrkit pkgname=cdrkit-libre pkgver=1.1.11 -pkgrel=2 -pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction" -arch=('i686' 'x86_64') +pkgrel=2.3 +pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)" +arch=('i686' 'x86_64' 'mips64el') url="http://cdrkit.org/" license=('GPL2') -depends=('file' 'bzip2' 'perl') +depends=('file' 'bzip2') +optdepends=('perl: for dirsplit') makedepends=('cmake') -provides=('cdrtools' "cdrkit=${pkgver}") -conflicts=('cdrtools' 'cdrkit') -replaces=('cdrtools' 'cdrkit') -source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz) +provides=("cdrkit=${pkgver}") +conflicts=('cdrkit') +replaces=('cdrkit') +source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz) +md5sums=('efe08e2f3ca478486037b053acd512e9') -mksource() { - if [ ! -d ${pkgname}-${pkgver} ]; then - wget -O - http://cdrkit.org/releases/${pkgname/-libre/}-${pkgver}.tar.gz | \ - bsdtar xzf - - - mv -v ${pkgname/-libre/}-${pkgver} ${pkgname}-${pkgver} - fi +build() { + cd "$srcdir/$_pkgname-$pkgver" - rm -rvf ${pkgname}-${pkgver}/{doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}} + # Remove nonfree apple_driver utility + rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}} - tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/ - rm -r ${pkgname}-${pkgver}/ -} - -build() { - cd "$srcdir/$pkgname-$pkgver" make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" make PREFIX="$pkgdir/usr" install # Make symlinks for cdrtools compatibility @@ -54,4 +47,3 @@ package() { ln -s genisoimage.1 mkhybrid.1 ln -s icedax.1 cdda2wav.1 } -md5sums=('e851c2d69ca17df7cfaabfa0d0e8e435') diff --git a/libre/cdrtools-libre/PKGBUILD b/libre/cdrtools-libre/PKGBUILD new file mode 100644 index 000000000..453979842 --- /dev/null +++ b/libre/cdrtools-libre/PKGBUILD @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Lukas Jirkovsky +_pkgname=cdrtools +pkgname=cdrtools-libre +pkgver=3.01a12 +pkgrel=1 +pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning (without nonfree apple_driver utility)" +arch=('i686' 'x86_64' 'mips64el') +url="http://cdrecord.berlios.de/private/cdrecord.html" +license=('CDDL') +depends=('acl') +replaces=('cdrtools') +conflicts=('cdrtools' 'cdrkit') +provides=("cdrtools=${pkgver}" 'cdrkit') +options=(!makeflags) +backup=('etc/default/cdrecord' 'etc/default/rscsi') +install=cdrtools.install +source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2) +md5sums=('563d80a7102175bea3e41fbfc269b914') + +build() { + cd "$srcdir"/cdrtools-${pkgver%%a*} + + # Remove nonfree apple_driver utility + rm -rvf mkisofs/{apple_driver{.c,.8,.mk,_man.mk},README.hfs_boot,Rhfs_boot.mk} + sed -i -e '/apple_driver/d' mkisofs/Makefile + sed -i -e '/README.hfs_boot/d' pkgdefs/CSW/CSWcdrtools/prototype + sed -i -e '/README.hfs_boot/d' pkgdefs/OCSW/CSWcdrtools/prototype + sed -i -e '/README.hfs_boot/d' vms/vms_name_fix.sh + + sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux + sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux + + export GMAKE_NOWARN=true + make INS_BASE=/usr INS_RBASE=/ +} + +package() { + cd "$srcdir"/cdrtools-${pkgver%%a*} + + export GMAKE_NOWARN=true + make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install + rm -rf "$pkgdir"/usr/include + rm -rf "$pkgdir"/usr/lib/{*.a,profiled} + + # autoload 'sg' module needed by cdrecord + install -d -m755 "$pkgdir"/usr/lib/modules-load.d/ + echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf + + # create symlinks for cdrkit compatibility + cd "$pkgdir"/usr/bin + ln -s cdrecord wodim + ln -s readcd readom + ln -s mkisofs genisoimage + ln -s cdda2wav icedax +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/cdrtools-libre/cdrtools.install b/libre/cdrtools-libre/cdrtools.install new file mode 100644 index 000000000..3f49eb1bb --- /dev/null +++ b/libre/cdrtools-libre/cdrtools.install @@ -0,0 +1,14 @@ + +post_install() { + echo "To allow other users than root execute rscsi add an entry" + echo "to /etc/default/rscsi or use an \"rscsi\" user" + echo "" + post_upgrade +} + +post_upgrade() { + echo "The manual loading (or loading using rc.conf)" + echo "of the 'sg' module is no longer necessary." + echo "It is automatically loaded during boot by systemd-tools (udev 185)." +} + diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 069fa612d..37c9fae8f 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172168 2012-11-30 14:31:06Z tomegun $ +# $Id: PKGBUILD 178145 2013-02-16 23:09:01Z tomegun $ # Maintainer: Tom Gundersen # Contributor : Rémy Oudompheng # Contributor: Morgan LEFIEUX @@ -6,8 +6,8 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.12.11 -pkgrel=2 +pkgver=3.13.2 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" arch=('i686' 'x86_64') url="http://hplipopensource.com" @@ -49,9 +49,6 @@ build() { sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py - # fix rc script path - FS#31921 - sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py - # https://bugs.archlinux.org/task/30085 - hack found in Gentoo # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip # The hpcups driver does not use foomatic-rip @@ -92,7 +89,9 @@ package() { rm -rf "$pkgdir"/usr/share/hal # log dir should not be world writeable chmod 775 "$pkgdir"/var/log/hp{,/tmp} + # remove rc script + rm -rf "$pkgdir"/etc/init.d } -md5sums=('6caadc4a9e49076c284b146e2dce2937' - '835d3b854d097f229a32291338fa2320' +md5sums=('cd7edef6b2df2cdb468b145cd2127e1b' + 'cc3fc6de33ccf8bfce0bc890e30bd4e1' 'ef64578c6cb3ce252dbdcb0f1c2f4a47') diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 756507986..d64060918 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -3,10 +3,10 @@ _kernver=3.8 _kernrel=1 pkgname=('linux-libre-kmod-alx') -_version=v3.8 -_pkgver=3.8-1-u -pkgver=3.8.1 -pkgrel=1 +_version=v3.8-rc7 +_pkgver=3.8-rc7-1-u +pkgver=3.8rc7.1 +pkgrel=4 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) -md5sums=('557e3099c642455ec272d9ddf46de484') +md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') build() { diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 7aa2c127b..4120e933f 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.65 +_kernver=3.0.66 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=3 +pkgrel=4 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 298bbd2fb..3717e9627 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178204 2013-02-18 00:59:48Z foutrelis $ +# $Id: PKGBUILD 178426 2013-02-21 22:37:33Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=65 +_sublevel=66 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.64 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.65 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '080f45e61f2b17015ac68279a801c17b' + 'b27bb5195c9fdb7fa6f609307a7d208b' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '62baade17c89e99f9aefc364a4304e78') + '7a7c3165d735a73cada5851d1b5d04ca') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 67065a1ef..2650a9f83 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.65-1-LIBRE-LTS +KERNEL_VERSION=3.0.66-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/hexchat-libre/PKGBUILD b/pcr/hexchat-libre/PKGBUILD index 26c353fb9..489fb0c91 100644 --- a/pcr/hexchat-libre/PKGBUILD +++ b/pcr/hexchat-libre/PKGBUILD @@ -4,8 +4,8 @@ _pkgname=hexchat pkgname=hexchat-libre pkgver=2.9.4 -pkgrel=2 -pkgdesc='A GTK+ based IRC client without non-free browser reference' +pkgrel=2.1 +pkgdesc='A GTK+ based IRC client without non-free browser reference (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') url='http://www.hexchat.org/' license=('GPL') @@ -29,6 +29,7 @@ md5sums=('5609cac7200fc91be57196501aaf07fa' build() { cd "$srcdir/$_pkgname-$pkgver" + sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" patch -p1 -i "${srcdir}/no-firefox.patch" mkdir m4 -- cgit v1.2.3-54-g00ecf From 3a8d026e8e859ff4c9aa813d5f1eb2afa5663e78 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 4 Mar 2013 00:03:49 -0800 Subject: Mon Mar 4 00:03:48 PST 2013 --- community/cantata/PKGBUILD | 22 +- community/cdcd/PKGBUILD | 37 +- community/cinnamon-control-center/PKGBUILD | 14 +- community/cinnamon/PKGBUILD | 13 +- community/cinnamon/fix-control-center-check.patch | 12 + community/dgen-sdl/PKGBUILD | 8 +- community/erlang-sdl/PKGBUILD | 15 +- community/gen2shp/PKGBUILD | 11 +- community/gputils/PKGBUILD | 16 +- community/gtkpod/PKGBUILD | 20 +- community/kiwi/PKGBUILD | 13 +- community/libextractor/PKGBUILD | 4 +- community/libxkbcommon/PKGBUILD | 28 - community/nautilus-sound-converter/PKGBUILD | 36 - .../nautilus-sound-converter.install | 17 - community/packagekit/PKGBUILD | 11 +- community/packagekit/libarchive.patch | 39 + community/shapelib/PKGBUILD | 29 +- community/sigil/PKGBUILD | 10 +- community/vdrift/PKGBUILD | 12 +- community/winegame/PKGBUILD | 40 + community/winegame/winegame.install | 9 + community/winestuff/PKGBUILD | 36 + ...tree-fix-line-filename-length-calculation.patch | 29 + core/libarchive/PKGBUILD | 33 +- .../libarchive-3.0.x-fix-mtree-writer.patch | 34 - core/libgpg-error/PKGBUILD | 8 +- extra/akonadi/PKGBUILD | 13 +- extra/claws-mail-extra-plugins/PKGBUILD | 4 +- extra/cmake/PKGBUILD | 13 +- extra/cmake/use-qmake4-for-qt4.patch | 11 - extra/evince/PKGBUILD | 4 +- extra/graphviz/PKGBUILD | 11 +- extra/gtk3/PKGBUILD | 18 +- extra/gvfs/PKGBUILD | 4 +- extra/libgxps/PKGBUILD | 4 +- extra/libkolabxml/PKGBUILD | 15 +- extra/libxkbcommon/PKGBUILD | 28 + extra/mariadb/PKGBUILD | 10 +- extra/mariadb/mariadb.install | 5 +- extra/mkvtoolnix/PKGBUILD | 8 +- extra/pkgfile/PKGBUILD | 4 +- extra/qt5/PKGBUILD | 57 +- extra/qwt/PKGBUILD | 13 +- extra/totem-plparser/PKGBUILD | 4 +- kernels/linux-libre-pae/PKGBUILD | 3 +- kernels/linux-libre-xen/PKGBUILD | 3 +- libre/calibre-libre/PKGBUILD | 10 +- libre/calibre-libre/desktop_integration.patch | 12 +- libre/chroottools/PKGBUILD | 4 +- libre/gst-plugins-bad-libre/PKGBUILD | 4 +- libre/gstreamer0.10-bad-libre/PKGBUILD | 4 +- libre/kdeutils-ark-libre/PKGBUILD | 4 +- libre/kdeutils-ark-libre/kdeutils-ark.install | 1 + libre/kernel26-libre-lts/PKGBUILD | 217 - libre/kernel26-libre-lts/buildfix-gcc46.diff | 32 - libre/kernel26-libre-lts/config.i686 | 4776 -------------------- libre/kernel26-libre-lts/config.x86_64 | 4585 ------------------- .../kernel26-libre-lts/kernel26-libre-lts.install | 146 - libre/kernel26-libre-lts/kernel26-lts.preset | 17 - libre/kernel26-libre-lts/libata-alignment.patch | 48 - libre/kernel26-libre-lts/packages/.svn/entries | 36 - libre/kernel26-libre-manpages/PKGBUILD | 31 - libre/libretools/PKGBUILD | 2 +- libre/libretools/libretools.install | 4 +- libre/licenses-libre/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 6 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/mozilla-searchplugins/PKGBUILD | 4 +- libre/mozilla-searchplugins/parabola-packages.xml | 6 +- libre/pacman/PKGBUILD | 16 +- libre/pacman/pacman.conf | 2 +- libre/pacman/pacman.conf.mips64el | 2 +- libre/pacman/pacman.conf.x86_64 | 2 +- libre/virtualbox-libre-modules/PKGBUILD | 4 +- libre/virtualbox-libre-modules/build.sh | 19 +- libre/virtualbox-libre/PKGBUILD | 8 +- libre/your-freedom/PKGBUILD | 1 + pcr/libav/PKGBUILD | 73 +- pcr/qtoctave/PKGBUILD | 31 + pcr/qtoctave/qtoctave.install | 14 + ~emulatorman/mozilla-searchplugins/PKGBUILD | 50 - .../mozilla-searchplugins/duckduckgo-html.xml | 8 - .../mozilla-searchplugins/duckduckgo-lite.xml | 8 - .../mozilla-searchplugins/internet-archive.xml | 12 - .../mozilla-searchplugins/jamendo-en.xml.in | 10 - .../mozilla-searchplugins/parabola-packages.xml | 9 - .../mozilla-searchplugins/parabola-wiki-en.xml | 11 - 89 files changed, 583 insertions(+), 10444 deletions(-) create mode 100644 community/cinnamon/fix-control-center-check.patch delete mode 100644 community/libxkbcommon/PKGBUILD delete mode 100644 community/nautilus-sound-converter/PKGBUILD delete mode 100644 community/nautilus-sound-converter/nautilus-sound-converter.install create mode 100644 community/packagekit/libarchive.patch create mode 100644 community/winegame/PKGBUILD create mode 100644 community/winegame/winegame.install create mode 100644 community/winestuff/PKGBUILD create mode 100644 core/libarchive/0001-mtree-fix-line-filename-length-calculation.patch delete mode 100644 core/libarchive/libarchive-3.0.x-fix-mtree-writer.patch delete mode 100644 extra/cmake/use-qmake4-for-qt4.patch create mode 100644 extra/libxkbcommon/PKGBUILD delete mode 100644 libre/kernel26-libre-lts/PKGBUILD delete mode 100644 libre/kernel26-libre-lts/buildfix-gcc46.diff delete mode 100644 libre/kernel26-libre-lts/config.i686 delete mode 100644 libre/kernel26-libre-lts/config.x86_64 delete mode 100644 libre/kernel26-libre-lts/kernel26-libre-lts.install delete mode 100644 libre/kernel26-libre-lts/kernel26-lts.preset delete mode 100644 libre/kernel26-libre-lts/libata-alignment.patch delete mode 100644 libre/kernel26-libre-lts/packages/.svn/entries delete mode 100644 libre/kernel26-libre-manpages/PKGBUILD create mode 100644 pcr/qtoctave/PKGBUILD create mode 100644 pcr/qtoctave/qtoctave.install delete mode 100644 ~emulatorman/mozilla-searchplugins/PKGBUILD delete mode 100644 ~emulatorman/mozilla-searchplugins/duckduckgo-html.xml delete mode 100644 ~emulatorman/mozilla-searchplugins/duckduckgo-lite.xml delete mode 100644 ~emulatorman/mozilla-searchplugins/internet-archive.xml delete mode 100644 ~emulatorman/mozilla-searchplugins/jamendo-en.xml.in delete mode 100644 ~emulatorman/mozilla-searchplugins/parabola-packages.xml delete mode 100644 ~emulatorman/mozilla-searchplugins/parabola-wiki-en.xml (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD index 72b8df7c7..346a73540 100644 --- a/community/cantata/PKGBUILD +++ b/community/cantata/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 84345 2013-02-16 22:50:24Z ioni $ -# Maintainer: Andrea Scarpino +# $Id: PKGBUILD 85533 2013-03-02 23:09:58Z cinelli $ +# Maintainer: Federico Cinelli +# Contributor: Andrea Scarpino # Contributor: Mcder3 # Contributor: MisterFred @@ -10,23 +11,26 @@ pkgrel=2 arch=('i686' 'x86_64') url="http://kde-apps.org/content/show.php/Cantata?content=147733" license=('GPL') -depends=('kdebase-runtime' 'taglib-extras' 'ffmpeg' 'mpg123' 'libmtp' 'speex') +depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp') makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://cantata.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") +install="$pkgname.install" +source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2") md5sums=('882cec90eb01d190b899689675e990b0') build() { + cd "$srcdir/$pkgname-$pkgver" mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ + + cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_PHONON=ON + make } package() { - cd build - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" PREFIX="/usr" install } diff --git a/community/cdcd/PKGBUILD b/community/cdcd/PKGBUILD index f9d78ad68..b58ecdf2c 100644 --- a/community/cdcd/PKGBUILD +++ b/community/cdcd/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 55773 2011-09-20 06:44:34Z andrea $ -# Maintainer: dorphell +# $Id: PKGBUILD 85538 2013-03-03 01:33:53Z cinelli $ +# Maintainer: Federico Cinelli +# Contributor dorphell # Contributor Sarah Hay pkgname=cdcd @@ -11,23 +12,33 @@ depends=('libcdaudio' 'readline') url="http://libcdaudio.sourceforge.net/" license=('GPL2') install=cdcd.install -source=("http://downloads.sourceforge.net/libcdaudio/$pkgname-$pkgver.tar.gz" - cdcd-0.6.6-x86_64.patch) -md5sums=('dc17f2e275c7214cb693f6abb50f29fb' - '7c39f01408fc084e2c62da4da324370e') +source=("http://downloads.sourceforge.net/libcdaudio/$pkgname-$pkgver.tar.gz") +md5sums=('dc17f2e275c7214cb693f6abb50f29fb') + +if [[ "$CARCH" == "x86_64" ]]; then + source+=("cdcd-0.6.6-$CARCH.patch") + md5sums+=('7c39f01408fc084e2c62da4da324370e') +fi build() { - cd "${srcdir}"/$pkgname-$pkgver - patch -Np1 -i "${srcdir}"/cdcd-0.6.6-x86_64.patch + cd "$srcdir/$pkgname-$pkgver" + + if [[ "$CARCH" == "x86_64" ]]; then + patch -Np1 -i "$srcdir/cdcd-0.6.6-$CARCH.patch" + fi + ./configure --prefix=/usr make } package() { - cd "${srcdir}"/$pkgname-$pkgver - make prefix="${pkgdir}"/usr install + cd "$srcdir/$pkgname-$pkgver" + + make PREFIX=/usr DESTDIR="$pkgdir" install + + mv "$pkgdir/usr/info" "$pkgdir/usr/share/" + mv "$pkgdir/usr/man/" "$pkgdir/usr/share/" + rm "$pkgdir/usr/share/dir" - install -dm755 "${pkgdir}"/usr/share - mv "${pkgdir}"/usr/{man,info} "${pkgdir}"/usr/share - rm "${pkgdir}"/usr/share/info/dir + install -dm755 "$pkgdir/usr/bin" "$pkgdir/usr/share" } diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 1aba7553d..c066ea4b3 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85223 2013-02-27 18:49:20Z bgyorgy $ +# $Id: PKGBUILD 85563 2013-03-03 05:46:41Z bgyorgy $ # Maintainer: Alexandre Filgueira @@ -6,13 +6,13 @@ pkgname=cinnamon-control-center pkgver=1.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') -depends=('cinnamon' 'cheese' 'libgnomekbd' 'libgtop' 'network-manager-applet') +depends=('cinnamon' 'cheese' 'libgtop' 'network-manager-applet') optdepends=('mesa-demos: provides glxinfo for graphics information' 'gnome-color-manager: for color management tasks') -makedepends=('intltool' 'gnome-common') +makedepends=('intltool' 'gnome-common' 'libgnomekbd') url="https://github.com/linuxmint/cinnamon-control-center" install=cinnamon-control-center.install license=('GPL') @@ -42,6 +42,9 @@ build() { # Fix faces location on User accounts dialog patch -Np1 -i ../fix-faces-location.patch + # Use freedesktop as default sound theme instead of ubuntu (otherwise the Sound panel craches) + patch -RNp1 -i debian/patches/98_default_sound_theme.patch + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ @@ -67,6 +70,9 @@ package() { make -C shell DESTDIR="$pkgdir" uninstall make -C shell DESTDIR="$pkgdir" install-libLTLIBRARIES + # Remove Region panel, because it's not compatible with gnome-settings-daemon 3.6 + make -C panels/region DESTDIR="$pkgdir" uninstall + # Remove broken desktop files rm -R "$pkgdir/usr/share/applications" rm -R "$pkgdir/etc" diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 5dc9ee675..ce4c8d209 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84919 2013-02-26 05:29:14Z bgyorgy $ +# $Id: PKGBUILD 85558 2013-03-03 05:39:31Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -26,10 +26,12 @@ options=('!libtool' '!emptydirs') install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver" "gnome-autogen.sh" - "keyboard_applet.patch") + "keyboard_applet.patch" + "fix-control-center-check.patch") md5sums=('13daa8fde1480bbee25eddc2e2630319' 'a925691c9b57a6a884dcf07da057fd1f' - '2b1ece84416c3e4de030be15f1774d82') + '2b1ece84416c3e4de030be15f1774d82' + 'fd429779aa986ffb3f481149f19a0baf') build() { cd ${srcdir}/linuxmint-Cinnamon* @@ -38,6 +40,9 @@ build() { # https://github.com/linuxmint/Cinnamon/issues/1337 patch -Np1 -i ${srcdir}/keyboard_applet.patch + # Check for the cc-panel path, not for the unneeded binary + patch -Np1 -i ${srcdir}/fix-control-center-check.patch + cp ${srcdir}/gnome-autogen.sh . sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh diff --git a/community/cinnamon/fix-control-center-check.patch b/community/cinnamon/fix-control-center-check.patch new file mode 100644 index 000000000..4c7b3bb0e --- /dev/null +++ b/community/cinnamon/fix-control-center-check.patch @@ -0,0 +1,12 @@ +diff -Naur cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings cinnamon-1.7.1/files/usr/bin/cinnamon-settings +--- cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings 2013-02-21 17:23:45.000000000 +0100 ++++ cinnamon-1.7.1/files/usr/bin/cinnamon-settings 2013-03-03 03:03:24.151209998 +0100 +@@ -7,7 +7,7 @@ + if os.path.exists("/usr/lib/cinnamon-settings/modules/cs_%s.py" % module): + print "Python module" + os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:])) +- elif os.path.exists("/usr/bin/cinnamon-control-center"): ++ elif os.path.exists("/usr/lib/cinnamon-control-center-1/panels"): + print "Unknown module %s, using cinnamon-control-center" % module + os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:])) + elif os.path.exists("/usr/bin/gnome-control-center"): diff --git a/community/dgen-sdl/PKGBUILD b/community/dgen-sdl/PKGBUILD index 6e2d2073b..67e8015bc 100644 --- a/community/dgen-sdl/PKGBUILD +++ b/community/dgen-sdl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84168 2013-02-12 18:03:41Z jsteel $ +# $Id: PKGBUILD 85586 2013-03-03 17:28:52Z dreisner $ # Maintainer: Jonathan Steel # Contributor: Tom Newsom # Contributor: Jason Chu @@ -6,13 +6,15 @@ pkgname=dgen-sdl pkgver=1.32 -pkgrel=1 +pkgrel=2 pkgdesc="An emulator for Sega Genesis/Mega Drive systems ported to SDL" arch=('i686' 'x86_64') url="http://dgen.sourceforge.net" license=('BSD') depends=('sdl' 'libgl' 'libarchive') -makedepends=('nasm') +if test "$CARCH" == i686; then + makedepends=('nasm') +fi source=(http://downloads.sourceforge.net/dgen/$pkgname-$pkgver.tar.gz) md5sums=('81b6f1c4bd612e81a9b8663c38d51890') diff --git a/community/erlang-sdl/PKGBUILD b/community/erlang-sdl/PKGBUILD index c7011e33b..5ab68f661 100644 --- a/community/erlang-sdl/PKGBUILD +++ b/community/erlang-sdl/PKGBUILD @@ -1,30 +1,29 @@ -# $Id: PKGBUILD 85286 2013-02-28 12:24:52Z arodseth $ +# $Id: PKGBUILD 85602 2013-03-03 21:28:43Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: kappa pkgname=erlang-sdl pkgver=1.2 -pkgrel=6 +pkgrel=7 arch=('x86_64' 'i686') -pkgdesc='SDL and OpenGL bindings for Erlang (r15b-driver-compat branch)' +pkgdesc='SDL and OpenGL bindings for Erlang' url='http://esdl.sourceforge.net/' license=('custom') depends=('erlang' 'sdl' 'glu' 'libgl' 'erlang') makedepends=('mesa-libgl') replaces=('esdl') -source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tar.gz/dgud/r15b-driver-compat") -sha256sums=('a14d695229b93401a304b773874e87c02c5b304d4b5b66f35cba75e140672086') -_dirname='esdl-dgud-r15b-driver-compat' +source=("$pkgname-$pkgver.tar.gz::https://github.com/dgud/esdl/archive/master.tar.gz") +sha256sums=('6a18010e12eed2abeb9b9893a2d89586e3ff14b44fce9c15b8ed091b67709438') build() { - cd "$srcdir/$_dirname" + cd "$srcdir/esdl-master" find -type f -print0 | xargs -0 chmod 644 make } package() { - cd "$srcdir/$_dirname" + cd "$srcdir/esdl-master" make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/esdl-$pkgver" install install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/community/gen2shp/PKGBUILD b/community/gen2shp/PKGBUILD index ce863bc74..fa57860f3 100644 --- a/community/gen2shp/PKGBUILD +++ b/community/gen2shp/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 66526 2012-02-25 23:23:48Z lfleischer $ +# $Id: PKGBUILD 85542 2013-03-03 01:59:29Z cinelli $ +# Maintainer: Federico Cinelli # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=gen2shp @@ -8,12 +9,12 @@ pkgdesc='Converts ArcInfo generate format to shapefile format' arch=('i686' 'x86_64') url='http://www.intevation.de/~jan/gen2shp/' license=('GPL') -depends=('shapelib') -source=("http://intevation.de/%7Ejan/gen2shp/${pkgname}-${pkgver}.tar.gz") +depends=('glibc' 'shapelib') +source=("http://web.archive.org/web/20110716144136/http://intevation.de/~jan/gen2shp/$pkgname-$pkgver.tar.gz") md5sums=('1cf9f1c2097825ef96290f7e9a7eb195') build() { - cd ${pkgname}-${pkgver} + cd "$pkgname-$pkgver" # fix conflicting function names sed -i 's/getline/get_line/' gen2shp.c utils.c utils.h @@ -22,5 +23,5 @@ build() { } package() { - install -D ${pkgname}-${pkgver}/gen2shp ${pkgdir}/usr/bin/gens2shp + install -D "$pkgname-$pkgver/gen2shp" "$pkgdir/usr/bin/gens2shp" } diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD index 0ca635b09..fb522ec7f 100644 --- a/community/gputils/PKGBUILD +++ b/community/gputils/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 75360 2012-08-21 09:13:35Z ebelanger $ +# $Id: PKGBUILD 85546 2013-03-03 02:24:18Z cinelli $ +# Maintainer: Federico Cinelli # Contributor: Johannes Martin # Contributor: JJDaNiMoTh # Contributor: Stefan Husmann -# Maintainer: Daniel J Griffiths pkgname=gputils -pkgver=0.14.2 +pkgver=1.0.0 pkgrel=1 pkgdesc="PIC Programming Utilities" arch=('i686' 'x86_64') url="http://gputils.sourceforge.net/" license=('GPL') depends=('glibc') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('90fa2803e77723de32b482f6a57d9c5a') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('a68b389b4717adde2b1cf14328e910e3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/community/gtkpod/PKGBUILD b/community/gtkpod/PKGBUILD index 5cb27cb9b..18ca42456 100644 --- a/community/gtkpod/PKGBUILD +++ b/community/gtkpod/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 83150 2013-01-27 16:17:12Z pierre $ +# $Id: PKGBUILD 85548 2013-03-03 02:45:35Z cinelli $ +# Maintainer: Federico Cinelli # Contributor: Kevin Piche # Contributor: Aaron Griffin @@ -9,8 +10,8 @@ pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" license=('GPL') -depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'dconf' 'libwebkit3') -makedepends=('flex' 'intltool' 'libvorbis' 'faad2') +depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'libwebkit3') +makedepends=('flex' 'intltool' 'faad2' 'libvorbis') optdepends=('libmp4v2: MP4/h264 support' 'vorbis-tools: OGG support' 'libvorbis: OGG support' @@ -18,20 +19,23 @@ optdepends=('libmp4v2: MP4/h264 support' 'faad2: m4a conversion support') install=gtkpod.install options=('!libtool') -source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz" +source=("http://downloads.sourceforge.net/gtkpod/$pkgname-$pkgver.tar.gz" gtkpod-2.1.3-gdl-3.6.patch) md5sums=('57f04578de6e3262a436ec574422b144' '8d725015081bd89bc8f9a4521d170aef') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/gtkpod-2.1.3-gdl-3.6.patch" + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i "$srcdir/gtkpod-2.1.3-gdl-3.6.patch" sed -i 's#python#python2#' scripts/sync-palm-jppy.py + ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/community/kiwi/PKGBUILD b/community/kiwi/PKGBUILD index 9319a8395..b532a6e6c 100644 --- a/community/kiwi/PKGBUILD +++ b/community/kiwi/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 66623 2012-02-26 15:04:14Z lfleischer $ -# Maintainer: Brad Fanella +# $Id: PKGBUILD 85550 2013-03-03 03:09:38Z cinelli $ +# Maintainer: Federico Cinelli # Contributor: Douglas Soares de Andrade # Contributor: William Rea @@ -10,7 +10,7 @@ pkgdesc="A set of classes and wrappers for PyGTK" arch=('i686' 'x86_64') url="http://www.async.com.br/projects/kiwi" license=("LGPL") -depends=('pygtk') +depends=('python2' 'python' 'pygtk' 'gtk') makedepends=('gettext') source=("http://download.gnome.org/sources/$pkgname/1.9/$pkgname-$pkgver.tar.bz2") sha256sums=('0ffa912cd180b3092b3ff636c582ab2c40f0f8eb541ada07b1432631a2d49e90') @@ -18,14 +18,15 @@ sha256sums=('0ffa912cd180b3092b3ff636c582ab2c40f0f8eb541ada07b1432631a2d49e90') build() { cd "$srcdir/$pkgname-$pkgver" - # python2 fix + # Apply Python2 fix. for file in bin/{kiwi-i18n,kiwi-ui-test} setup.py; do - echo "Applying python2 fix for ${file}" - sed -i 's_/usr/bin/env python_/usr/bin/env python2_' ${file} + echo "Applying python2 fix for $file" + sed -i 's_/usr/bin/env python_/usr/bin/env python2_' "$file" done } package() { cd "$srcdir/$pkgname-$pkgver" + python2 setup.py install --root="$pkgdir" } diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index f90f535a8..9a113dd10 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85370 2013-03-01 10:35:05Z andrea $ +# $Id: PKGBUILD 85587 2013-03-03 17:28:54Z dreisner $ # Maintainer: Sergej Pupykin # Contributor: damir pkgname=libextractor pkgver=1.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64") license=('GPL') diff --git a/community/libxkbcommon/PKGBUILD b/community/libxkbcommon/PKGBUILD deleted file mode 100644 index e65cefa7d..000000000 --- a/community/libxkbcommon/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id$ -# Maintainer: Daniel Micay -# Contributor: Mladen Pejakovic - -pkgname=libxkbcommon -pkgver=0.2.0 -pkgrel=3 -pkgdesc="Keyboard handling library using XKB data" -arch=(i686 x86_64) -url="http://xkbcommon.org/" -license=('custom') -depends=(glibc) -makedepends=(doxygen xorg-util-macros) -source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.bz2") -md5sums=('2be3d4a255d02c7d46fc6a9486f21f6a') -options=('!libtool') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} diff --git a/community/nautilus-sound-converter/PKGBUILD b/community/nautilus-sound-converter/PKGBUILD deleted file mode 100644 index fa6923e0b..000000000 --- a/community/nautilus-sound-converter/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 79481 2012-11-06 03:41:36Z bgyorgy $ -# Maintainer: Balló György - -pkgname=nautilus-sound-converter -pkgver=3.0.2 -pkgrel=2 -pkgdesc="Nautilus extension to convert audio files formats" -arch=('i686' 'x86_64') -url="http://code.google.com/p/nautilus-sound-converter/" -license=('GPL') -depends=('nautilus' 'libgnome-media-profiles') -makedepends=('intltool') -optdepends=('gstreamer0.10-good-plugins: Extra media codecs' - 'gstreamer0.10-ugly-plugins: Extra media codecs' - 'gstreamer0.10-bad-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs') -conflicts=('totem>=3.6.0') -options=('!libtool') -install=$pkgname.install -source=(http://nautilus-sound-converter.googlecode.com/files/$pkgname-$pkgver.tar.xz) -sha1sums=('f0799af3c7f14e2cd4cf70499d9bde07ec4ab89d') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-install \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community/nautilus-sound-converter/nautilus-sound-converter.install b/community/nautilus-sound-converter/nautilus-sound-converter.install deleted file mode 100644 index d2da24898..000000000 --- a/community/nautilus-sound-converter/nautilus-sound-converter.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=nautilus-sound-converter - -post_install() { - gconfpkg --install $pkgname -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gconfpkg --uninstall $pkgname -} diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index be6935348..65e8fb431 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85382 2013-03-01 10:36:54Z andrea $ +# $Id: PKGBUILD 85588 2013-03-03 17:28:55Z dreisner $ # Maintainer: Jonathan Conder pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt2' 'packagekit-python') pkgver=0.7.6 -pkgrel=3 +pkgrel=5 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64') url="http://www.packagekit.org" @@ -13,9 +13,11 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' 'shared-mime-info' 'sqlite' 'udev') options=('!libtool') source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz" - 'adopt.patch') + 'adopt.patch' + 'libarchive.patch') sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d' - 'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8') + 'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8' + '0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2') build() { cd "$srcdir/PackageKit-$pkgver" @@ -25,6 +27,7 @@ build() { sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py patch -Np1 -i "$srcdir/adopt.patch" + patch -Np1 -i "$srcdir/libarchive.patch" export PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ diff --git a/community/packagekit/libarchive.patch b/community/packagekit/libarchive.patch new file mode 100644 index 000000000..083a9433a --- /dev/null +++ b/community/packagekit/libarchive.patch @@ -0,0 +1,39 @@ +diff -Nru a/lib/packagekit-glib2/pk-service-pack.c b/lib/packagekit-glib2/pk-service-pack.c +--- a/lib/packagekit-glib2/pk-service-pack.c 2012-08-17 00:36:38.000000000 +1200 ++++ b/lib/packagekit-glib2/pk-service-pack.c 2013-03-01 19:00:08.773738469 +1300 +@@ -207,7 +207,7 @@ + archive_read_support_format_tar (arch); + + /* open the tar file */ +- r = archive_read_open_file (arch, filename, 10240); ++ r = archive_read_open_filename (arch, filename, 10240); + if (r) { + g_set_error (error, PK_SERVICE_PACK_ERROR, PK_SERVICE_PACK_ERROR_FAILED_EXTRACTION, + "cannot open: %s", archive_error_string (arch)); +@@ -246,7 +246,7 @@ + /* close the archive */ + if (arch != NULL) { + archive_read_close (arch); +- archive_read_finish (arch); ++ archive_read_free (arch); + } + + /* switch back to PWD */ +@@ -572,7 +572,7 @@ + + /* we can only write tar achives */ + arch = archive_write_new (); +- archive_write_set_compression_none (arch); ++ archive_write_add_filter_none (arch); + archive_write_set_format_ustar (arch); + archive_write_open_filename (arch, state->filename); + +@@ -596,7 +596,7 @@ + /* close the archive */ + if (arch != NULL) { + archive_write_close (arch); +- archive_write_finish (arch); ++ archive_write_free (arch); + } + return ret; + } diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD index c421ae23a..fd1dd0740 100644 --- a/community/shapelib/PKGBUILD +++ b/community/shapelib/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 67779 2012-03-14 11:48:39Z giovanni $ -# Maintainer: Jaroslav Lichtblau +# $Id: PKGBUILD 85552 2013-03-03 03:16:05Z cinelli $ +# Maintainer: Federico Cinelli +# Contributor: Jaroslav Lichtblau # Contributor: Bob Finch pkgname=shapelib -pkgver=1.2.10 -pkgrel=5 +pkgver=1.3.0 +pkgrel=1 pkgdesc='simple C API for reading and writing ESRI Shapefiles' arch=('i686' 'x86_64') url='http://shapelib.maptools.org/' license=('LGPL' 'MIT') options=('!libtool') -source=("http://dl.maptools.org/dl/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'LICENSE') -md5sums=('4d96bd926167193d27bf14d56e2d484e' - '431dfe7afb1d2c082682ecfcc9ee7a34') +source=("http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz" + "LICENSE") +sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f' + '67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789') build() { - cd ${pkgname}-${pkgver} + cd "$pkgname-$pkgver" - sed -i -e s:'-O2':"${CFLAGS}": Makefile make lib } package() { - cd ${pkgname}-${pkgver} + cd "$pkgname-$pkgver" - sed -i -e s:/usr/local:${pkgdir}/usr: Makefile - sed -i -e s:/usr/bin/install:/bin/install: Makefile - make lib_install - install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -d "$pkgdir/usr/lib" "$pkgdir/usr/include" + make PREFIX="$pkgdir/usr lib_install" + install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index b6d034bcc..db6eb6c34 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 85410 2013-03-01 10:40:05Z andrea $ +# $Id: PKGBUILD 85597 2013-03-03 19:43:42Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Larry Hajali pkgname=sigil -pkgver=0.7.0 -pkgrel=2 +pkgver=0.7.1 +pkgrel=1 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64') url="http://code.google.com/p/sigil/" license=('GPL3') depends=('qt5-webkit' 'boost-libs') -makedepends=('qt5-addons' 'qt5-declarative' 'qt5-tools' 'cmake' 'gendesk' 'boost') +makedepends=('qt5-tools' 'qt5-svg' 'cmake' 'gendesk' 'boost') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip") -md5sums=('06ba5ace506e01adf4a37534fa276cec') +md5sums=('e6c281b6702a8f9d79cc85703dc8d3ea') build() { cd "${srcdir}" diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index e721b176c..35ac2775e 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78946 2012-10-27 23:46:16Z ebelanger $ +# $Id: PKGBUILD 85589 2013-03-03 17:28:55Z dreisner $ # Maintainer: Sven-Hendrik Haase # Contributor: Anton Bazhenov # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2012.07.22 -pkgrel=3 +pkgrel=4 pkgdesc="Open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" @@ -22,19 +22,11 @@ md5sums=('fcfd6b65724d32dfe383df216d7afb74' build() { cd VDrift - # select arch - if [ `uname -m` = "x86_64" ]; then - _sconsarch="a64" - else - _sconsarch="686" - fi - patch -Np0 < "$srcdir"/vdrift-2012-07-22c_bullet281_patch.diff # build and install scons $MAKEFLAGS \ "destdir"="$pkgdir" \ - "arch"=$_sconsarch \ "release"=1 \ "force_feedback"=1 \ "prefix"=/usr \ diff --git a/community/winegame/PKGBUILD b/community/winegame/PKGBUILD new file mode 100644 index 000000000..6df4bc45a --- /dev/null +++ b/community/winegame/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 85556 2013-03-03 05:22:22Z cinelli $ +# Maintainer: Federico Cinelli +# Contributor: Laurent Carlier + +pkgname=winegame +pkgver=0.2.0 +pkgrel=2 +pkgdesc="An interface to install windows programs in Wine" +arch=('i686' 'x86_64') +install=winegame.install +url="http://code.google.com/p/winegame/" +license=('GPL3') +depends=('winestuff') +optdepends=('libnotify: Desktop notifaction support') +makedepends=('cmake') +source=("http://winegame.googlecode.com/files/$pkgname-$pkgver.tar.gz") +md5sums=('631dd218707c6efb2901ef1206092538') + +if [[ $CARCH == "x86_64" ]]; then + depends+=('lib32-mesa-libgl') +fi + +build() { + cd "$srcdir/$pkgname-$pkgver" + + mkdir -p build + cd build + + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr .. + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + + make DESTDIR="$pkgdir/" install +} + diff --git a/community/winegame/winegame.install b/community/winegame/winegame.install new file mode 100644 index 000000000..e85c7ac73 --- /dev/null +++ b/community/winegame/winegame.install @@ -0,0 +1,9 @@ +post_install () { + update-desktop-database -q +} +post_upgrade () { + post_install +} +post_removal () { + post_install +} diff --git a/community/winestuff/PKGBUILD b/community/winestuff/PKGBUILD new file mode 100644 index 000000000..d08334eb8 --- /dev/null +++ b/community/winestuff/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 85554 2013-03-03 05:17:35Z cinelli $ +# Maintainer: Federico Cinelli +# Contributor: Laurent Carlier + +pkgname=winestuff +pkgver=0.2.0 +pkgrel=3 +pkgdesc="Library utility for winegame" +arch=('i686' 'x86_64') +url="http://code.google.com/p/winegame/" +license=('LGPL2.1') +makedepends=('qt4' 'cmake') +source=("http://winegame.googlecode.com/files/$pkgname-$pkgver.tar.gz") +md5sums=('a01f55d30bd0e1dcee3a44aa0fa5369d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + mkdir -p build + cd build + + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr .. + + make translations + make +} + +package() { + depends=('qt4' 'fuseiso' 'winetricks') + + cd "$srcdir/$pkgname-$pkgver/build" + + make DESTDIR="$pkgdir" install +} + diff --git a/core/libarchive/0001-mtree-fix-line-filename-length-calculation.patch b/core/libarchive/0001-mtree-fix-line-filename-length-calculation.patch new file mode 100644 index 000000000..a255f2cf2 --- /dev/null +++ b/core/libarchive/0001-mtree-fix-line-filename-length-calculation.patch @@ -0,0 +1,29 @@ +From e65bf287f0133426b26611fe3e80b51267987106 Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Thu, 21 Feb 2013 19:01:06 -0500 +Subject: [PATCH] mtree: fix line filename length calculation. Fixes #301. + Signed-off-by: Andres Mejia + +--- + libarchive/archive_write_set_format_mtree.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c +index 9c0613c..f37f723 100644 +--- a/libarchive/archive_write_set_format_mtree.c ++++ b/libarchive/archive_write_set_format_mtree.c +@@ -1855,9 +1855,9 @@ mtree_entry_setup_filenames(struct archive_write *a, struct mtree_entry *file, + return (ret); + } + +- /* Make a basename from dirname and slash */ ++ /* Make a basename from file->parentdir.s and slash */ + *slash = '\0'; +- file->parentdir.length = slash - dirname; ++ file->parentdir.length = slash - file->parentdir.s; + archive_strcpy(&(file->basename), slash + 1); + return (ret); + } +-- +1.8.1.4 + diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 1b87145a3..05902ecef 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 167058 2012-09-25 03:07:21Z allan $ +# $Id: PKGBUILD 179100 2013-03-03 17:28:26Z dreisner $ # Maintainer: Dan McGee pkgname=libarchive -pkgver=3.0.4 -pkgrel=2 +pkgver=3.1.2 +pkgrel=1 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') -url="http://libarchive.googlecode.com/" +url="http://libarchive.org/" license=('BSD') -depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz" - libarchive-3.0.x-fix-mtree-writer.patch) -md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16' - '6d36a50a7282db6576bd1fbc23f08055') -sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac' - 'f0081c0d7d7875fc91c683b14fe4876d56b6585f45be9181c755eba4b522f5b9') - +depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib') +source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz" + '0001-mtree-fix-line-filename-length-calculation.patch') +md5sums=('efad5a503f66329bb9d2f4308b5de98a' + 'fda89c145bbcd793a96b06b463ef6a72') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i $srcdir/libarchive-3.0.x-fix-mtree-writer.patch + cd "$pkgname-$pkgver" + + # https://code.google.com/p/libarchive/issues/detail?id=301 + # upstream commit e65bf287f0133426b26611fe3e80b51267987106 + patch -Np1 -i "$srcdir/0001-mtree-fix-line-filename-length-calculation.patch" + ./configure --prefix=/usr --without-xml2 make } check() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make check } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING diff --git a/core/libarchive/libarchive-3.0.x-fix-mtree-writer.patch b/core/libarchive/libarchive-3.0.x-fix-mtree-writer.patch deleted file mode 100644 index dbc89686a..000000000 --- a/core/libarchive/libarchive-3.0.x-fix-mtree-writer.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/libarchive/archive_write_set_format_mtree.c -+++ b/libarchive/archive_write_set_format_mtree.c -@@ -887,6 +887,19 @@ write_entry(struct archive_write *a, struct mtree_entry *me) - - archive_string_empty(&mtree->ebuf); - str = (mtree->indent)? &mtree->ebuf : &mtree->buf; -+ -+ /* If the pathname does not have a path separator, we have to -+ * add "./" to the head of the pathename because mtree reader -+ * will suppose that it is v1(a.k.a classic) mtree format and -+ * change the directory unexpectedly and so it will make a wrong -+ * path. */ -+ if (strchr(me->pathname, '/') == NULL && -+ strcmp(me->pathname, ".") != 0) { -+ archive_strcat(str, "./"); -+ } -+ /* mtree reader does not accept an absolute path. */ -+ else if (me->pathname[0] == '/') -+ archive_strappend_char(str, '.'); - mtree_quote(str, me->pathname); - keys = get_keys(mtree, me); - if ((keys & F_NLINK) != 0 && ---- a/libarchive/test/test_read_format_mtree.c -+++ b/libarchive/test/test_read_format_mtree.c -@@ -37,7 +37,8 @@ test_read_format_mtree1(void) - * without relying on overflow. This assumes that long long - * is at least 64 bits. */ - static const long long max_int64 = ((((long long)1) << 62) - 1) + (((long long)1) << 62); -- time_t min_time, t; -+ time_t min_time; -+ volatile time_t t; - - extract_reference_file(reffile); - \ No newline at end of file diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD index c0cc77f39..62dc9c200 100644 --- a/core/libgpg-error/PKGBUILD +++ b/core/libgpg-error/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156350 2012-04-17 15:57:56Z andyrtr $ +# $Id: PKGBUILD 179093 2013-03-03 15:10:38Z andyrtr $ # Maintainer: judd pkgname=libgpg-error -pkgver=1.10 -pkgrel=2 +pkgver=1.11 +pkgrel=1 pkgdesc="Support library for libgcrypt" arch=(i686 x86_64) url="http://www.gnupg.org" @@ -12,7 +12,7 @@ depends=('glibc' 'sh') options=(!libtool) source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) -md5sums=('736a03daa9dc5873047d4eb4a9c22a16') +sha1sums=('be209b013652add5c7e2c473ea114f58203cc6cd') build() { diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 0ba82ecb3..2576210ef 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178946 2013-03-01 10:19:03Z andrea $ +# $Id: PKGBUILD 179115 2013-03-03 18:48:13Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=akonadi -pkgver=1.9.0 -pkgrel=3 +pkgver=1.9.1 +pkgrel=1 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' @@ -13,17 +13,16 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('51ef4c9455f97ce4346c5934174b9da8') +md5sums=('f150d5e9b4776d683d0b1d64316f0276') build() { - . /etc/profile.d/qt4.sh - mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE + -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 make } diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD index b5f7889a6..8c9b61d23 100644 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171015 2012-11-14 20:36:10Z andyrtr $ +# $Id: PKGBUILD 179102 2013-03-03 17:28:30Z dreisner $ # Maintainer: Andreas Radke # Contributor: Mildred pkgname=claws-mail-extra-plugins pkgver=3.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="Extra plugins for claws-mail" url="http://www.claws-mail.org/plugins.php?branch=EXT" license=('GPL3') diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 5424c6049..36f171cac 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178953 2013-03-01 10:19:53Z andrea $ +# $Id: PKGBUILD 179103 2013-03-03 17:28:31Z dreisner $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=cmake pkgver=2.8.10.2 -pkgrel=3 +pkgrel=4 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" @@ -13,10 +13,8 @@ depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt5-base' 'emacs') optdepends=('qt5-base: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" - 'use-qmake4-for-qt4.patch') -md5sums=('097278785da7182ec0aea8769d06860c' - '3136ec7953f2e01cc099f38dbd2655e2') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('097278785da7182ec0aea8769d06860c') build() { cd ${pkgname}-${pkgver} @@ -25,9 +23,6 @@ build() { export CFLAGS="${CFLAGS} -fPIC" export CXXFLAGS="${CXXFLAGS} -fPIC" - # Do not look for 'qmake' as this could referer to the qt5 version - patch -p1 -i "${srcdir}"/use-qmake4-for-qt4.patch - ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ diff --git a/extra/cmake/use-qmake4-for-qt4.patch b/extra/cmake/use-qmake4-for-qt4.patch deleted file mode 100644 index 6e1e6ead1..000000000 --- a/extra/cmake/use-qmake4-for-qt4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-02-24 12:13:41.172266220 +0000 -+++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-02-24 12:20:11.229349625 +0000 -@@ -497,7 +497,7 @@ - # check for qmake - # Debian uses qmake-qt4 - # macports' Qt uses qmake-mac --find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac -+find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac - PATHS - ENV QTDIR - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 6954ffde0..04e7dc001 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169867 2012-10-30 22:25:11Z heftig $ +# $Id: PKGBUILD 179104 2013-03-03 17:28:32Z dreisner $ # Maintainer: Jan de Groot pkgname=evince pkgver=3.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64') diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 2337a154c..f77500bc2 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178958 2013-03-01 10:20:33Z andrea $ +# $Id: PKGBUILD 179080 2013-03-03 07:46:56Z bisson $ # Maintainer: Gaetan Bisson # Contributor: kevin # Contributor: John Proctor pkgname=graphviz -pkgver=2.30.0 -pkgrel=6 +pkgver=2.30.1 +pkgrel=1 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -25,7 +25,7 @@ optdepends=('mono: sharp bindings' 'qt4: gvedit') source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" 'LICENSE') -sha1sums=('596c1ddf60c5428c5c4700d10f3ea86534195311' +sha1sums=('96739220c4bbcf1bd3bd52e7111f4e60497185c6' 'e78277e502c29abb74b9587a5dc951ec392554ea') options=('!libtool') @@ -34,14 +34,13 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - . /etc/profile.d/qt4.sh - sed \ -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \ -e '/CONFIG/s:site:vendor:' \ -i config/config_ruby.rb sed '/LIBPOSTFIX="64"/d' -i configure + source /etc/profile.d/qt4.sh export PYTHON=python2 export LUA=lua5.1 diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index ae8483202..94799147a 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 174777 2013-01-07 13:06:57Z jgc $ +# $Id: PKGBUILD 179073 2013-03-03 00:49:43Z heftig $ # Maintainer: Ionut Biru pkgname=gtk3 pkgver=3.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gtk.org/" install=gtk3.install -depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk') -makedepends=('gobject-introspection') +depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi + libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon) +makedepends=(gobject-introspection mesa) options=('!libtool') backup=(etc/gtk-3.0/settings.ini) -license=('LGPL') +license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) sha256sums=('dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1' @@ -24,7 +25,10 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --enable-gtk2-dependency \ - --disable-schemas-compile + --disable-schemas-compile \ + --enable-x11-backend \ + --enable-broadway-backend \ + --enable-wayland-backend #https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 33d7f3172..71ae96a7d 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175145 2013-01-15 11:34:12Z jgc $ +# $Id: PKGBUILD 179106 2013-03-03 17:28:34Z dreisner $ # Maintainer: Jan de Groot pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.14.2 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL') makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') diff --git a/extra/libgxps/PKGBUILD b/extra/libgxps/PKGBUILD index 3436c4868..776f58f61 100644 --- a/extra/libgxps/PKGBUILD +++ b/extra/libgxps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156904 2012-04-23 09:08:44Z ibiru $ +# $Id: PKGBUILD 179109 2013-03-03 17:28:36Z dreisner $ # Maintainer: Ionut Biru pkgname=libgxps pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="XPS Documents library" arch=(i686 x86_64) url="https://live.gnome.org/libgxps" diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD index 80faee223..eba18f661 100644 --- a/extra/libkolabxml/PKGBUILD +++ b/extra/libkolabxml/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 176289 2013-01-28 16:48:21Z stephane $ +# $Id: PKGBUILD 179113 2013-03-03 18:40:24Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkolabxml -pkgver=0.8.1 -pkgrel=2 +pkgver=0.8.3 +pkgrel=1 pkgdesc="Kolab XML Format Schema Definitions Library" url='http://git.kolab.org/libkolabxml/' arch=('i686' 'x86_64') license=('GPL') depends=('xerces-c' 'boost-libs') -makedepends=('cmake' 'boost' 'xsd') +makedepends=('cmake' 'boost' 'xsd' 'qt4') source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg}) -md5sums=('a02541b35153334c69ee1845dfe464c6' - 'f5e9bc4a21a5bf06baec084435812cc4') +md5sums=('38ded7003255decf9cd46c6a3f442e6b' + '493a9fcca56a244fc7403e4131cf7d5f') build() { mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 make } diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD new file mode 100644 index 000000000..53ca992b1 --- /dev/null +++ b/extra/libxkbcommon/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 179075 2013-03-03 00:51:04Z heftig $ +# Maintainer: Daniel Micay +# Contributor: Mladen Pejakovic + +pkgname=libxkbcommon +pkgver=0.2.0 +pkgrel=3 +pkgdesc="Keyboard handling library using XKB data" +arch=(i686 x86_64) +url="http://xkbcommon.org/" +license=('custom') +depends=(glibc) +makedepends=(doxygen xorg-util-macros) +source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.bz2") +md5sums=('2be3d4a255d02c7d46fc6a9486f21f6a') +options=('!libtool') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 9678abd12..7eaa19def 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179064 2013-03-02 21:39:03Z bpiotrowski $ +# $Id: PKGBUILD 179120 2013-03-03 20:01:04Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.29 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('GPL') url='http://mariadb.org/' @@ -65,7 +65,7 @@ build() { } package_libmariadbclient() { - pkgdesc="MariaDB client libraries" + pkgdesc='MariaDB client libraries' depends=('openssl') conflicts=('libmysqlclient') provides=("libmysqlclient=$pkgver") @@ -84,7 +84,7 @@ package_libmariadbclient() { } package_mariadb-clients() { - pkgdesc="MariaDB client tools" + pkgdesc='MariaDB client tools' depends=('libmariadbclient') conflicts=('mysql-clients') provides=("mysql-clients=$pkgver") @@ -103,7 +103,7 @@ package_mariadb-clients() { } package_mariadb() { - pkgdesc="A fast SQL database server, drop-in replacement for MySQL" + pkgdesc='Fast SQL database server, drop-in replacement for MySQL' backup=('etc/mysql/my.cnf') install=mariadb.install depends=('mariadb-clients') diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install index de619b668..c99114c07 100644 --- a/extra/mariadb/mariadb.install +++ b/extra/mariadb/mariadb.install @@ -14,6 +14,9 @@ post_install(){ fi usr/bin/systemd-tmpfiles --create mysqld.conf + + echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'" + echo " after mysqld.service restart." } post_upgrade(){ @@ -28,7 +31,7 @@ post_upgrade(){ fi if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then - echo ">>> mysql.service has been renamed to mysqld.service to keep" + echo ">> mysql.service has been renamed to mysqld.service to keep" echo " consistency with MySQL package." fi } diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 8a03d7c28..966fb6211 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 176294 2013-01-28 16:48:27Z stephane $ +# $Id: PKGBUILD 179090 2013-03-03 11:15:28Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: xduugu pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=6.0.0 -pkgrel=2 +pkgver=6.1.0 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz") -md5sums=('869dac2061f4ef91dd96ce6bb0fafecb') +md5sums=('171e241756eb3b6f2e506f8539331fd9') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD index 7f9907165..a1b96923c 100644 --- a/extra/pkgfile/PKGBUILD +++ b/extra/pkgfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176818 2013-02-01 01:25:21Z dreisner $ +# $Id: PKGBUILD 179110 2013-03-03 17:28:37Z dreisner $ # Maintainer: Dave Reisner pkgname=pkgfile pkgver=8 -pkgrel=1 +pkgrel=2 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64') url="http://github.com/falconindy/pkgfile" diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index fc04378db..bd1016efa 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 179039 2013-03-01 20:22:01Z andrea $ +# $Id: PKGBUILD 179117 2013-03-03 18:53:03Z andrea $ # Maintainer: Andrea Scarpino pkgbase=qt5 pkgname=('qt5-base' 'qt5-declarative' - 'qt5-doc' 'qt5-graphicaleffects' 'qt5-imageformats' 'qt5-jsbackend' @@ -17,7 +16,7 @@ pkgname=('qt5-base' 'qt5-webkit' 'qt5-xmlpatterns') pkgver=5.0.1 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -25,7 +24,8 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb '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' - 'python2' 'ruby' 'gperf') + 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' + 'libmng' 'openal' 'gtk2') groups=('qt' 'qt5') options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" @@ -74,14 +74,10 @@ build() { -reduce-relocations make - - # Build docs - make qmake_all - make docs } package_qt5-base() { - pkgdesc=('A cross-platform application and UI framework') + 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') @@ -109,7 +105,7 @@ package_qt5-base() { } package_qt5-declarative() { - pkgdesc=('A cross-platform application and UI framework (QtQml, QtQuick)') + pkgdesc='A cross-platform application and UI framework (QtQml, QtQuick)' depends=('qt5-jsbackend' 'qt5-xmlpatterns') conflicts=('qt') @@ -121,21 +117,8 @@ package_qt5-declarative() { -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; } -package_qt5-doc() { - pkgdesc=('A cross-platform application and UI framework (Documentation)') - depends=('qt5-base') - conflicts=('qt-doc') - replaces=('qt-doc') - provides=('qt-doc') - options=('docs') - groups=() - - cd ${_pkgfqn} - make INSTALL_ROOT="${pkgdir}" install_docs -} - package_qt5-jsbackend() { - pkgdesc=('A cross-platform application and UI framework (QtV8)') + pkgdesc='A cross-platform application and UI framework (QtV8)' depends=('qt5-base') cd ${_pkgfqn}/qtjsbackend @@ -147,7 +130,7 @@ package_qt5-jsbackend() { } package_qt5-xmlpatterns() { - pkgdesc=('A cross-platform application and UI framework (QtXmlPatterns)') + pkgdesc='A cross-platform application and UI framework (QtXmlPatterns)' depends=('qt5-base') conflicts=('qt') @@ -160,7 +143,7 @@ package_qt5-xmlpatterns() { } package_qt5-translations() { - pkgdesc=('A cross-platform application and UI framework (Translations)') + pkgdesc='A cross-platform application and UI framework (Translations)' depends=('qt5-base') conflicts=('qt') @@ -169,8 +152,8 @@ package_qt5-translations() { } package_qt5-multimedia() { - pkgdesc=('A cross-platform application and UI framework (QtMultimedia)') - depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base') + pkgdesc='A cross-platform application and UI framework (QtMultimedia)' + depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal') conflicts=('qt') cd ${_pkgfqn}/qtmultimedia @@ -182,7 +165,7 @@ package_qt5-multimedia() { } package_qt5-graphicaleffects() { - pkgdesc=('A cross-platform application and UI framework (QtGraphicalEffects)') + pkgdesc='A cross-platform application and UI framework (QtGraphicalEffects)' depends=('qt5-declarative') cd ${_pkgfqn}/qtgraphicaleffects @@ -190,8 +173,8 @@ package_qt5-graphicaleffects() { } package_qt5-imageformats() { - pkgdesc=('A cross-platform application and UI framework (Images plugins)') - depends=('qt5-base' 'libtiff') + pkgdesc='A cross-platform application and UI framework (Images plugins)' + depends=('qt5-base' 'libtiff' 'libmng') conflicts=('qt') cd ${_pkgfqn}/qtimageformats @@ -199,7 +182,7 @@ package_qt5-imageformats() { } package_qt5-quick1() { - pkgdesc=('A cross-platform application and UI framework (QtDeclarative)') + pkgdesc='A cross-platform application and UI framework (QtDeclarative)' depends=('qt5-webkit' 'qt5-script') conflicts=('qt') @@ -212,7 +195,7 @@ package_qt5-quick1() { } package_qt5-script() { - pkgdesc=('A cross-platform application and UI framework (QtScript)') + pkgdesc='A cross-platform application and UI framework (QtScript)' depends=('qt5-base') conflicts=('qt') @@ -225,7 +208,7 @@ package_qt5-script() { } package_qt5-svg() { - pkgdesc=('A cross-platform application and UI framework (QtSvg)') + pkgdesc='A cross-platform application and UI framework (QtSvg)' depends=('qt5-base') conflicts=('qt') @@ -238,7 +221,7 @@ package_qt5-svg() { } package_qt5-tools() { - pkgdesc=('A cross-platform application and UI framework (Development Tools, QtHelp)') + pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)' depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations') optdepends=('qt5-doc: documentation') install='qt5-tools.install' @@ -270,8 +253,8 @@ package_qt5-tools() { } package_qt5-webkit() { - pkgdesc=('A cross-platform application and UI framework (QtWebKit)') - depends=('qt5-declarative' 'gstreamer0.10-base' 'icu') + pkgdesc='A cross-platform application and UI framework (QtWebKit)' + depends=('qt5-declarative' 'gstreamer0.10-base' 'icu' 'libxslt' 'libxcomposite') cd ${_pkgfqn}/qtwebkit make INSTALL_ROOT="${pkgdir}" install diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index 1fe4ae2c7..3e14cf1c7 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179060 2013-03-02 20:03:20Z andrea $ +# $Id: PKGBUILD 179088 2013-03-03 09:38:46Z andrea $ # Maintainer: Ronald van Haren pkgname=qwt -pkgver=6.0.1 -pkgrel=5 +pkgver=6.0.2 +pkgrel=1 pkgdesc="Qt Widgets for Technical Applications" arch=('i686' 'x86_64') url="http://qwt.sourceforge.net/" @@ -11,7 +11,7 @@ depends=('qt4') license=("custom:$pkgname") source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.bz2" \ "qwtconfig-archlinux.pri") -sha1sums=('301cca0c49c7efc14363b42e082b09056178973e' +sha1sums=('cbdd00b29521987c9e7bc6aa51092f0474b9428d' 'aba0fc75f6d450237028b7b143bdcf05a79cabb3') build() { @@ -28,7 +28,7 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} - make INSTALL_ROOT=${pkgdir} QTDIR=/usr install + make INSTALL_ROOT=${pkgdir} install # install web designer plugin install -d ${pkgdir}/usr/lib/qt4/plugins/designer/ @@ -40,6 +40,9 @@ package() { install -m644 qwtconfig.pri qwt.prf \ "${pkgdir}"/usr/share/qt4/mkspecs/features/ + # move man pages + mv "${pkgdir}"/usr/share/doc/qwt/man/ "${pkgdir}"/usr/share/ + # install licence install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \ ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 2fc7aa293..1ef450a5e 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169976 2012-10-30 22:59:47Z heftig $ +# $Id: PKGBUILD 179111 2013-03-03 17:28:38Z dreisner $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=totem-plparser pkgver=3.4.3 -pkgrel=1 +pkgrel=2 url="http://www.gnome.org" pkgdesc="Totem playlist parser library" license=('LGPL') diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index c67e29310..f6b818fdd 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -22,7 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '208b90a9f3ccbaf2064f05163985bd46' + 'd5ad2ecc865a32378517c3c07ca99173' + '5cc106ba38bab845ea62138fc0d1bbf1' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662') diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 64608f70a..5ddfcd122 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -22,8 +22,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '208b90a9f3ccbaf2064f05163985bd46' + 'd5ad2ecc865a32378517c3c07ca99173' 'c13961a22d8c742fb31b59a1e27a0e7b' + 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662') diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 125a8b3d6..ba4ff1d0c 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -6,8 +6,8 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.20 -pkgrel=1 +pkgver=0.9.21 +pkgrel=2 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" @@ -18,7 +18,7 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-imaging' 'shared-mime-info' 'python2-dnspython' 'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 'python2-netifaces' 'python2-cssselect') -makedepends=('python2-pycountry' 'qt-private-headers') +makedepends=('python2-pycountry' 'qt4-private-headers') optdepends=('ipython2: to use calibre-debug') replaces=$_pkgname conflicts=$_pkgname @@ -27,8 +27,8 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('860b4b28029ae40e5ea59ec4f50b1144' - '42c07b43d575b5e7e7524bd7b9528f0e' +md5sums=('ee0e2d2dc735efcc573d1f77d64acf7e' + '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') build() { diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch index 4c756f5d4..2c6f07672 100644 --- a/libre/calibre-libre/desktop_integration.patch +++ b/libre/calibre-libre/desktop_integration.patch @@ -1,6 +1,6 @@ ---- a/src/calibre/linux.py 2012-09-21 06:56:20.000000000 +0200 -+++ b/src/calibre/linux.py 2012-09-22 18:51:12.000000000 +0200 -@@ -179,19 +179,6 @@ +--- a/src/calibre/linux.py 2013-03-01 05:49:28.000000000 +0100 ++++ b/src/calibre/linux.py 2013-03-03 14:53:05.000000000 +0100 +@@ -447,19 +447,6 @@ self.setup_completion() if islinux or isbsd: self.setup_desktop_integration() @@ -20,7 +20,7 @@ if warn is None and self.warnings: self.info('There were %d warnings'%len(self.warnings)) for args, kwargs in self.warnings: -@@ -237,7 +224,7 @@ +@@ -508,7 +495,7 @@ if isnetbsd: f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') else: @@ -28,8 +28,8 @@ + f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre') if not os.path.exists(os.path.dirname(f)): os.makedirs(os.path.dirname(f)) - self.manifest.append(f) -@@ -357,63 +344,39 @@ + if zsh.dest: +@@ -651,63 +638,39 @@ with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): diff --git a/libre/chroottools/PKGBUILD b/libre/chroottools/PKGBUILD index 90e0e4fd0..55a7e165f 100644 --- a/libre/chroottools/PKGBUILD +++ b/libre/chroottools/PKGBUILD @@ -3,10 +3,10 @@ pkgname=chroottools pkgver=20121202 pkgdesc='Chroot tools for Arch and Parabola package maintainers' -url='http://projects.parabolagnulinux.org/packages/chroottools.git/' +url='https://projects.parabolagnulinux.org/packages/chroottools.git/' license=('GPL') -pkgrel=1 +pkgrel=2 arch=('any') conflicts=(devtools) depends=( diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index da800f965..1cb133713 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=gst-plugins-bad pkgname=gst-plugins-bad-libre pkgver=1.0.5 -pkgrel=1 +pkgrel=1.1 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' arch=( i686 @@ -70,7 +70,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name='GStreamer Bad Plugins (Parabola)' \ - --with-package-origin='http://parabolagnulinux.org/' \ + --with-package-origin='https://parabolagnulinux.org/' \ --with-gtk=3.0 make } diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 46e608da9..883a9eefb 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=gstreamer0.10-bad-libre pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') pkgver=0.10.23 -pkgrel=3 +pkgrel=3.1 arch=('i686' 'x86_64') license=('LGPL' 'GPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus') @@ -20,7 +20,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Bad Plugins (Parabola)" \ - --with-package-origin="http://parabolagnulinux.org/" + --with-package-origin="https://parabolagnulinux.org/" make sed -e 's/gst sys ext/gst/' -i Makefile diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 75a906e72..4b7f1ca34 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 176637 2013-01-31 14:46:33Z andrea $ +# $Id: PKGBUILD 178872 2013-02-27 22:38:42Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/kdeutils-ark-libre/kdeutils-ark.install b/libre/kdeutils-ark-libre/kdeutils-ark.install index 78681144b..8a26818d8 100644 --- a/libre/kdeutils-ark-libre/kdeutils-ark.install +++ b/libre/kdeutils-ark-libre/kdeutils-ark.install @@ -1,5 +1,6 @@ post_install() { update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_update() { diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD deleted file mode 100644 index 7c444e8ff..000000000 --- a/libre/kernel26-libre-lts/PKGBUILD +++ /dev/null @@ -1,217 +0,0 @@ -# $Id: PKGBUILD 142426 2011-11-09 13:05:04Z tpowa $ -# Maintainer: Andreas Radke -# Maintainer (Parabola): fauno - -pkgbase=kernel26-libre-lts -pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts kernel -_kernelname=${pkgname#kernel26-libre} -_basekernel=2.6.32 -pkgver=${_basekernel}.52 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL2') -url="http://linux-libre.fsfla.org" -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" - # the main kernel config files - config.i686 config.x86_64 - # standard config files for mkinitcpio ramdisk - ${pkgname}.preset) -options=(!strip) - -build() { - cd ${srcdir}/linux-$_basekernel - if [ "$_basekernel" != "$pkgver" ]; then - # add latest kernel stable patch - patch -Np1 -i ${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre - fi - - cat ../config.$CARCH >./.config - if [ "${_kernelname}" != "" ]; then - sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config - fi - # set extraversion to pkgrel - sed -ri "s|^(EXTRAVERSION =).*|\1 ${pkgver#$_basekernel}-${pkgrel}|" Makefile - - - # get kernel version - make prepare - # load configuration - # Configure the kernel. Replace the line below with one of your choice. - #make menuconfig # CLI menu for configuration - #make xconfig # X-based configuration - #make oldconfig # using old config from previous kernel version - # ... or manually edit .config - #################### - # stop here - # this is useful to configure the kernel - #msg "Stopping build" - # return 1 - #################### - yes "" | make config - # build! - make ${MAKEFLAGS} bzImage modules -} - -package_kernel26-libre-lts() { - pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers" - backup=(etc/mkinitcpio.d/${pkgname}.preset) - depends=('coreutils' 'module-init-tools>=3.12-2' 'mkinitcpio>=0.6.8-2') - install=${pkgname}.install - provides=("kernel26-lts=$pkgver") - replaces=('kernel26-lts') - conflicts=('kernel26-lts') - - KARCH=x86 - cd ${srcdir}/linux-$_basekernel - # get kernel version - _kernver="$(make kernelrelease)" - mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot} - make INSTALL_MOD_PATH=${pkgdir} modules_install - cp System.map ${pkgdir}/boot/System.map26${_kernelname} - cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz26${_kernelname} - # add vmlinux - install -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux - - # install fallback mkinitcpio.conf file and preset file for kernel - install -m644 -D ${srcdir}/${pkgname}.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset - # set correct depmod command for install - sed \ - -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \ - -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ - -i $startdir/${pkgname}.install - sed \ - -e "s|source .*|source /etc/mkinitcpio.d/kernel26${_kernelname}.kver|g" \ - -e "s|default_image=.*|default_image=\"/boot/${pkgname}.img\"|g" \ - -e "s|fallback_image=.*|fallback_image=\"/boot/${pkgname}-fallback.img\"|g" \ - -i ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset - - echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${pkgdir}/etc/mkinitcpio.d/${pkgname}.kver - # remove build and source links - rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build} - # remove the firmware - rm -rf ${pkgdir}/lib/firmware - # gzip -9 all modules to save 100MB of space - find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; - # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules" - # add real version for building the kernel - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version" -} - -package_kernel26-libre-lts-headers() { - provides=("kernel26-lts-headers=$pkgver") - replaces=('kernel26-lts-headers') - conflicts=('kernel26-lts-headers') - pkgdesc="Header files and scripts for building modules for kernel26-libre-lts" - mkdir -p ${pkgdir}/lib/modules/${_kernver} - cd ${pkgdir}/lib/modules/${_kernver} - ln -sf ../../../usr/src/linux-${_kernver} build - cd ${srcdir}/linux-$_basekernel - install -D -m644 Makefile \ - ${pkgdir}/usr/src/linux-${_kernver}/Makefile - install -D -m644 kernel/Makefile \ - ${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile - install -D -m644 .config \ - ${pkgdir}/usr/src/linux-${_kernver}/.config - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include - - for i in acpi asm-{generic,x86} config crypto drm linux math-emu media net pcmcia scsi sound trace video; do - cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/ - done - - # copy arch includes for external modules - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 - cp -a arch/x86/include ${pkgdir}/usr/src/linux-${_kernver}/arch/x86/ - - # copy files necessary for later builds, like nvidia and vmware - cp Module.symvers ${pkgdir}/usr/src/linux-${_kernver} - cp -a scripts ${pkgdir}/usr/src/linux-${_kernver} - # fix permissions on scripts dir - chmod og-w -R ${pkgdir}/usr/src/linux-${_kernver}/scripts - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions - - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel - - cp arch/$KARCH/Makefile ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/ - if [ "$CARCH" = "i686" ]; then - cp arch/$KARCH/Makefile_32.cpu ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/ - fi - cp arch/$KARCH/kernel/asm-offsets.s ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel/ - - # add headers for lirc package - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video - cp drivers/media/video/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/ - for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo zc0301; do - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i - cp -a drivers/media/video/$i/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i - done - # add docbook makefile - install -D -m644 Documentation/DocBook/Makefile \ - ${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile - # add dm headers - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/md - cp drivers/md/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/md - # add inotify.h - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/linux - cp include/linux/inotify.h ${pkgdir}/usr/src/linux-${_kernver}/include/linux/ - # add wireless headers - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/ - cp net/mac80211/*.h ${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/ - # add dvb headers for external modules - # in reference to: - # http://bugs.archlinux.org/task/9912 - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core - cp drivers/media/dvb/dvb-core/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/ - # add dvb headers for external modules - # in reference to: - # http://bugs.archlinux.org/task/11194 - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/ - cp include/config/dvb/*.h ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/ - # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new - # in reference to: - # http://bugs.archlinux.org/task/13146 - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ - cp drivers/media/dvb/frontends/lgdt330x.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ - cp drivers/media/video/msp3400-driver.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ - # add dvb headers - # in reference to: - # http://bugs.archlinux.org/task/20402 - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb - cp drivers/media/dvb/dvb-usb/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/ - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends - cp drivers/media/dvb/frontends/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners - cp drivers/media/common/tuners/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/ - # add xfs and shmem for aufs building - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm - cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h - - # copy in Kconfig files - for i in `find . -name "Kconfig*"`; do - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'` - cp $i ${pkgdir}/usr/src/linux-${_kernver}/$i - done - - cd ${pkgdir}/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm - # add header for aufs2-util - cp -a ${srcdir}/linux-$_basekernel/include/asm-generic/bitsperlong.h ${pkgdir}/usr/src/linux-${_kernver}/include/asm/ - - chown -R root.root ${pkgdir}/usr/src/linux-${_kernver} - find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \; - # strip scripts directory - find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -bi "$binary")" in - *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip $STRIP_SHARED "$binary";; - *application/x-archive*) # Libraries (.a) - /usr/bin/strip $STRIP_STATIC "$binary";; - *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; - esac - done - # remove unneeded architectures - rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} -} diff --git a/libre/kernel26-libre-lts/buildfix-gcc46.diff b/libre/kernel26-libre-lts/buildfix-gcc46.diff deleted file mode 100644 index 595f97d66..000000000 --- a/libre/kernel26-libre-lts/buildfix-gcc46.diff +++ /dev/null @@ -1,32 +0,0 @@ -From b1d670f10e8078485884f0cf7e384d890909aeaa Mon Sep 17 00:00:00 2001 -From: Greg Rose -Date: Tue, 16 Nov 2010 19:41:36 -0800 -Subject: [PATCH] Remove extra struct page member from the buffer info - structure - -declaration. - -Reported-by: Andi Kleen -Signed-off-by: Greg Rose -Tested-by: Emil Tantilov -Signed-off-by: Jeff Kirsher ---- - drivers/net/igbvf/igbvf.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h -index 63284e3..9d4d63e 100644 ---- a/drivers/net/igbvf/igbvf.h -+++ b/drivers/net/igbvf/igbvf.h -@@ -126,7 +126,6 @@ struct igbvf_buffer { - unsigned int page_offset; - }; - }; -- struct page *page; - }; - - union igbvf_desc { --- -1.7.4.5 - - diff --git a/libre/kernel26-libre-lts/config.i686 b/libre/kernel26-libre-lts/config.i686 deleted file mode 100644 index b9fc967af..000000000 --- a/libre/kernel26-libre-lts/config.i686 +++ /dev/null @@ -1,4776 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.32 -# Tue Jun 7 06:41:37 2011 -# -# CONFIG_64BIT is not set -CONFIG_X86_32=y -# CONFIG_X86_64 is not set -CONFIG_X86=y -CONFIG_OUTPUT_FORMAT="elf32-i386" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_MMU=y -CONFIG_ZONE_DMA=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_GPIO=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -# CONFIG_GENERIC_TIME_VSYSCALL is not set -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -# CONFIG_ZONE_DMA32 is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y -# CONFIG_AUDIT_ARCH is not set -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_HAVE_INTEL_TXT=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_USE_GENERIC_SMP_HELPERS=y -CONFIG_X86_32_SMP=y -CONFIG_X86_HT=y -CONFIG_X86_TRAMPOLINE=y -CONFIG_KTIME_SCALAR=y -CONFIG_ARCH_CPU_PROBE_RELEASE=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_CONSTRUCTORS=y - -# -# General setup -# -CONFIG_EXPERIMENTAL=y -CONFIG_LOCK_KERNEL=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="-lts" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_TREE=y - -# -# RCU Subsystem -# -CONFIG_TREE_RCU=y -# CONFIG_TREE_PREEMPT_RCU is not set -# CONFIG_RCU_TRACE is not set -CONFIG_RCU_FANOUT=32 -# CONFIG_RCU_FANOUT_EXACT is not set -# CONFIG_TREE_RCU_TRACE is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=19 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_CGROUPS=y -# CONFIG_CGROUP_DEBUG is not set -CONFIG_CGROUP_NS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CPUSETS=y -CONFIG_PROC_PID_CPUSET=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_MEM_RES_CTLR=y -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y -CONFIG_CGROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_MM_OWNER=y -# CONFIG_SYSFS_DEPRECATED_V2 is not set -CONFIG_RELAY=y -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_USER_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -# CONFIG_EMBEDDED is not set -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_HAVE_PERF_EVENTS=y - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=y -CONFIG_EVENT_PROFILE=y -CONFIG_PERF_COUNTERS=y -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_PCI_QUIRKS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_OPROFILE=m -CONFIG_OPROFILE_IBS=y -# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set -CONFIG_HAVE_OPROFILE=y -# CONFIG_KPROBES is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_API_DEBUG=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -CONFIG_SLOW_WORK=y -# CONFIG_SLOW_WORK_DEBUG is not set -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_STOP_MACHINE=y -CONFIG_BLOCK=y -CONFIG_LBDAF=y -CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_INTEGRITY is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_AS is not set -CONFIG_DEFAULT_DEADLINE=y -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="deadline" -CONFIG_PREEMPT_NOTIFIERS=y -CONFIG_FREEZER=y - -# -# Processor type and features -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_SMP=y -# CONFIG_SPARSE_IRQ is not set -CONFIG_X86_MPPARSE=y -# CONFIG_X86_BIGSMP is not set -# CONFIG_X86_EXTENDED_PLATFORM is not set -CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_PARAVIRT_GUEST=y -CONFIG_VMI=y -CONFIG_KVM_CLOCK=y -CONFIG_KVM_GUEST=y -CONFIG_LGUEST_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set -CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set -# CONFIG_MEMTEST is not set -# CONFIG_M386 is not set -# CONFIG_M486 is not set -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -CONFIG_M686=y -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set -# CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set -# CONFIG_MATOM is not set -# CONFIG_GENERIC_CPU is not set -CONFIG_X86_GENERIC=y -CONFIG_X86_CPU=y -CONFIG_X86_L1_CACHE_BYTES=64 -CONFIG_X86_INTERNODE_CACHE_BYTES=64 -CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=5 -CONFIG_X86_XADD=y -# CONFIG_X86_PPRO_FENCE is not set -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_INTEL_USERCOPY=y -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_TSC=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_CMOV=y -CONFIG_X86_MINIMUM_CPU_FAMILY=5 -CONFIG_X86_DEBUGCTLMSR=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_CYRIX_32=y -CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -CONFIG_CPU_SUP_TRANSMETA_32=y -CONFIG_CPU_SUP_UMC_32=y -# CONFIG_X86_DS is not set -CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_DMI=y -# CONFIG_IOMMU_HELPER is not set -CONFIG_IOMMU_API=y -CONFIG_NR_CPUS=8 -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_MCE=y -CONFIG_X86_MCE_INTEL=y -CONFIG_X86_MCE_AMD=y -# CONFIG_X86_ANCIENT_MCE is not set -CONFIG_X86_MCE_THRESHOLD=y -# CONFIG_X86_MCE_INJECT is not set -CONFIG_X86_THERMAL_VECTOR=y -CONFIG_VM86=y -CONFIG_TOSHIBA=m -CONFIG_I8K=m -CONFIG_X86_REBOOTFIXUPS=y -CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y -CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_X86_MSR=m -CONFIG_X86_CPUID=m -# CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ILLEGAL_POINTER_VALUE=0 -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_SPARSEMEM_STATIC=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y -CONFIG_VIRT_TO_BUS=y -CONFIG_HAVE_MLOCK=y -CONFIG_HAVE_MLOCKED_PAGE_BIT=y -CONFIG_MMU_NOTIFIER=y -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y -CONFIG_MEMORY_FAILURE=y -CONFIG_HWPOISON_INJECT=m -# CONFIG_HIGHPTE is not set -CONFIG_X86_CHECK_BIOS_CORRUPTION=y -CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -CONFIG_X86_RESERVE_LOW_64K=y -# CONFIG_MATH_EMULATION is not set -CONFIG_MTRR=y -CONFIG_MTRR_SANITIZER=y -CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 -CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 -CONFIG_X86_PAT=y -CONFIG_ARCH_USES_PG_UNCACHED=y -CONFIG_EFI=y -CONFIG_SECCOMP=y -CONFIG_CC_STACKPROTECTOR=y -CONFIG_HZ_100=y -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=100 -CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y -# CONFIG_CRASH_DUMP is not set -# CONFIG_KEXEC_JUMP is not set -CONFIG_PHYSICAL_START=0x1000000 -# CONFIG_RELOCATABLE is not set -CONFIG_PHYSICAL_ALIGN=0x100000 -CONFIG_HOTPLUG_CPU=y -# CONFIG_COMPAT_VDSO is not set -# CONFIG_CMDLINE_BOOL is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y - -# -# Power management and ACPI options -# -CONFIG_PM=y -CONFIG_PM_DEBUG=y -# CONFIG_PM_VERBOSE is not set -CONFIG_CAN_PM_TRACE=y -# CONFIG_PM_TRACE_RTC is not set -CONFIG_PM_SLEEP_SMP=y -CONFIG_PM_SLEEP=y -CONFIG_SUSPEND=y -# CONFIG_PM_TEST_SUSPEND is not set -CONFIG_SUSPEND_FREEZER=y -CONFIG_HIBERNATION_NVS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_RUNTIME=y -CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_PROCFS=y -CONFIG_ACPI_PROCFS_POWER=y -CONFIG_ACPI_POWER_METER=m -CONFIG_ACPI_SYSFS_POWER=y -CONFIG_ACPI_PROC_EVENT=y -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m -CONFIG_ACPI_DOCK=y -CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m -# CONFIG_ACPI_CUSTOM_DSDT is not set -CONFIG_ACPI_BLACKLIST_YEAR=0 -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=m -CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=m -CONFIG_ACPI_SBS=m -CONFIG_SFI=y -CONFIG_X86_APM_BOOT=y -CONFIG_APM=y -# CONFIG_APM_IGNORE_USER_SUSPEND is not set -CONFIG_APM_DO_ENABLE=y -# CONFIG_APM_CPU_IDLE is not set -# CONFIG_APM_DISPLAY_BLANK is not set -# CONFIG_APM_ALLOW_INTS is not set - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=m -# CONFIG_CPU_FREQ_DEBUG is not set -CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - -# -# CPUFreq processor drivers -# -CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_POWERNOW_K6=m -CONFIG_X86_POWERNOW_K7=m -CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=m -CONFIG_X86_GX_SUSPMOD=m -# CONFIG_X86_SPEEDSTEP_CENTRINO is not set -CONFIG_X86_SPEEDSTEP_ICH=m -CONFIG_X86_SPEEDSTEP_SMI=m -CONFIG_X86_P4_CLOCKMOD=m -CONFIG_X86_CPUFREQ_NFORCE2=m -CONFIG_X86_LONGRUN=m -CONFIG_X86_LONGHAUL=m -CONFIG_X86_E_POWERSAVER=m - -# -# shared options -# -CONFIG_X86_SPEEDSTEP_LIB=m -CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y - -# -# Bus options (PCI etc.) -# -CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -# CONFIG_PCI_GOOLPC is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y -CONFIG_PCI_OLPC=y -CONFIG_PCI_DOMAINS=y -CONFIG_DMAR=y -# CONFIG_DMAR_DEFAULT_ON is not set -CONFIG_DMAR_FLOPPY_WA=y -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=m -CONFIG_PCIEAER=y -# CONFIG_PCIE_ECRC is not set -# CONFIG_PCIEAER_INJECT is not set -CONFIG_PCIEASPM=y -# CONFIG_PCIEASPM_DEBUG is not set -CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_PCI_MSI=y -CONFIG_PCI_LEGACY=y -# CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m -CONFIG_HT_IRQ=y -CONFIG_PCI_IOV=y -CONFIG_ISA_DMA_API=y -CONFIG_ISA=y -# CONFIG_EISA is not set -# CONFIG_MCA is not set -# CONFIG_SCx200 is not set -CONFIG_OLPC=y -CONFIG_K8_NB=y -CONFIG_PCCARD=m -# CONFIG_PCMCIA_DEBUG is not set -CONFIG_PCMCIA=m -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y -CONFIG_CARDBUS=y - -# -# PC-card bridges -# -CONFIG_YENTA=m -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_TOSHIBA=y -CONFIG_PD6729=m -CONFIG_I82092=m -CONFIG_I82365=m -CONFIG_TCIC=m -CONFIG_PCMCIA_PROBE=y -CONFIG_PCCARD_NONSTATIC=m -CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m -CONFIG_HOTPLUG_PCI_COMPAQ=m -# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set -CONFIG_HOTPLUG_PCI_IBM=m -CONFIG_HOTPLUG_PCI_ACPI=m -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -CONFIG_HOTPLUG_PCI_CPCI=y -CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m -CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -CONFIG_HOTPLUG_PCI_SHPC=m - -# -# Executable file formats / Emulations -# -CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=y -CONFIG_HAVE_ATOMIC_IOMAP=y -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=m -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -# CONFIG_NET_KEY_MIGRATE is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_ASK_IP_FIB_HASH=y -# CONFIG_IP_FIB_TRIE is not set -CONFIG_IP_FIB_HASH=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -# CONFIG_NET_IPGRE_BROADCAST is not set -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_LRO=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=y -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -# CONFIG_DEFAULT_BIC is not set -CONFIG_DEFAULT_CUBIC=y -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_WESTWOOD is not set -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=m -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -# CONFIG_IPV6_MROUTE is not set -CONFIG_NETLABEL=y -CONFIG_NETWORK_SECMARK=y -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CT_ACCT=y -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=m -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NETFILTER_TPROXY=m -CONFIG_NETFILTER_XTABLES=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_NETFILTER_XT_TARGET_RATEEST=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TRACE=m -CONFIG_NETFILTER_XT_TARGET_SECMARK=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_HL=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_NETFILTER_XT_MATCH_OSF=m -CONFIG_IP_VS=m -# CONFIG_IP_VS_IPV6 is not set -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_AH_ESP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_CONNTRACK_PROC_COMPAT=y -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_SECURITY=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IP6_NF_SECURITY=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m -CONFIG_BRIDGE_EBT_NFLOG=m -CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m - -# -# DCCP CCIDs Configuration (EXPERIMENTAL) -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -CONFIG_IP_DCCP_CCID3=y -# CONFIG_IP_DCCP_CCID3_DEBUG is not set -CONFIG_IP_DCCP_CCID3_RTO=100 -CONFIG_IP_DCCP_TFRC_LIB=y - -# -# DCCP Kernel Hacking -# -# CONFIG_IP_DCCP_DEBUG is not set -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_MSG is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -CONFIG_SCTP_HMAC_SHA1=y -# CONFIG_SCTP_HMAC_MD5 is not set -# CONFIG_RDS is not set -# CONFIG_TIPC is not set -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_STP=m -CONFIG_BRIDGE=m -# CONFIG_NET_DSA is not set -CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set -# CONFIG_DECNET is not set -CONFIG_LLC=m -CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_LTPC=m -CONFIG_COPS=m -CONFIG_COPS_DAYNA=y -CONFIG_COPS_TANGENT=y -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -CONFIG_PHONET=m -CONFIG_IEEE802154=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_MULTIQ=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_INGRESS=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_CLS_CGROUP=y -# CONFIG_NET_EMATCH is not set -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_NAT=m -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_ACT_SKBEDIT=m -CONFIG_NET_CLS_IND=y -CONFIG_NET_SCH_FIFO=y -# CONFIG_DCB is not set - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=y -# CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m -CONFIG_KINGSUN_DONGLE=m -CONFIG_KSDAZZLE_DONGLE=m -CONFIG_KS959_DONGLE=m - -# -# FIR device drivers -# -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -CONFIG_TOSHIBA_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m -CONFIG_MCS_FIR=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -# CONFIG_BT_BNEP_MC_FILTER is not set -# CONFIG_BT_BNEP_PROTO_FILTER is not set -# CONFIG_BT_CMTP is not set -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=m -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_CFG80211=m -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_CFG80211_DEFAULT_PS=y -CONFIG_CFG80211_DEFAULT_PS_VALUE=1 -# CONFIG_CFG80211_DEBUGFS is not set -# CONFIG_WIRELESS_OLD_REGULATORY is not set -CONFIG_WIRELESS_EXT=y -CONFIG_WIRELESS_EXT_SYSFS=y -CONFIG_LIB80211=m -CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIB80211_CRYPT_CCMP=m -CONFIG_LIB80211_CRYPT_TKIP=m -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=m -CONFIG_MAC80211_HAS_RC=y -CONFIG_MAC80211_RC_MINSTREL=y -# CONFIG_MAC80211_RC_DEFAULT_PID is not set -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=m -CONFIG_RFKILL_LEDS=y -CONFIG_RFKILL_INPUT=y -CONFIG_NET_9P=m -CONFIG_NET_9P_VIRTIO=m -# CONFIG_NET_9P_DEBUG is not set - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER_PATH="" -CONFIG_DEVTMPFS=y -# CONFIG_DEVTMPFS_MOUNT is not set -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -# CONFIG_SYS_HYPERVISOR is not set -CONFIG_CONNECTOR=m -CONFIG_MTD=m -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_TESTS=m -# CONFIG_MTD_CONCAT is not set -CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_AR7_PARTS is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -# CONFIG_MTD_BLOCK_RO is not set -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -# CONFIG_MTD_OOPS is not set - -# -# RAM/ROM/Flash chip drivers -# -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_RAM=m -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_TS5500 is not set -# CONFIG_MTD_INTEL_VR_NOR is not set -CONFIG_MTD_PLATRAM=m - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -CONFIG_MTD_SST25L=m -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set -# CONFIG_MTD_NAND is not set -# CONFIG_MTD_ONENAND is not set - -# -# LPDDR flash memory drivers -# -# CONFIG_MTD_LPDDR is not set - -# -# UBI - Unsorted block images -# -# CONFIG_MTD_UBI is not set -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y -CONFIG_PARPORT_PC_PCMCIA=m -# CONFIG_PARPORT_GSC is not set -CONFIG_PARPORT_AX88796=m -CONFIG_PARPORT_1284=y -CONFIG_PARPORT_NOT_PC=y -CONFIG_PNP=y -# CONFIG_PNP_DEBUG_MESSAGES is not set - -# -# Protocols -# -CONFIG_ISAPNP=y -# CONFIG_PNPBIOS is not set -CONFIG_PNPACPI=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_XD is not set -# CONFIG_PARIDE is not set -CONFIG_BLK_CPQ_DA=m -CONFIG_BLK_CPQ_CISS_DA=m -# CONFIG_CISS_SCSI_TAPE is not set -CONFIG_BLK_DEV_DAC960=m -# CONFIG_BLK_DEV_UMEM is not set -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_OSD=m -CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=m -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_BLK_DEV_XIP is not set -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=m -CONFIG_VIRTIO_BLK=m -# CONFIG_BLK_DEV_HD is not set -CONFIG_MISC_DEVICES=y -# CONFIG_IBM_ASM is not set -CONFIG_PHANTOM=m -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -CONFIG_ENCLOSURE_SERVICES=m -CONFIG_HP_ILO=m -CONFIG_DELL_LAPTOP=m -CONFIG_ISL29003=m -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set -CONFIG_CB710_DEBUG_ASSUMPTIONS=y -CONFIG_HAVE_IDE=y -CONFIG_IDE=m - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -CONFIG_IDE_LEGACY=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEACPI=y -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_PLATFORM=m -CONFIG_BLK_DEV_CMD640=m -# CONFIG_BLK_DEV_CMD640_ENHANCED is not set -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_CS5536=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m - -# -# Other IDE chipsets support -# - -# -# Note: most of these also require special kernel boot parameters -# -CONFIG_BLK_DEV_4DRIVES=m -CONFIG_BLK_DEV_ALI14XX=m -CONFIG_BLK_DEV_DTC2278=m -CONFIG_BLK_DEV_HT6560B=m -CONFIG_BLK_DEV_QD65XX=m -CONFIG_BLK_DEV_UMC8672=m -CONFIG_BLK_DEV_IDEDMA=y - -# -# SCSI device support -# -CONFIG_RAID_ATTRS=m -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -CONFIG_SCSI_TGT=m -CONFIG_SCSI_NETLINK=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_ENCLOSURE=m -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_FC_TGT_ATTRS is not set -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_SAS_HOST_SMP=y -# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_SRP_TGT_ATTRS=y -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m -CONFIG_BE2ISCSI=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_7000FASST=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AHA152X=m -CONFIG_SCSI_AHA1542=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=m -CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_DEBUG_ENABLE is not set -CONFIG_AIC7XXX_DEBUG_MASK=0 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -# CONFIG_SCSI_AIC7XXX_OLD is not set -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=32 -CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_DEBUG_ENABLE is not set -CONFIG_AIC79XX_DEBUG_MASK=0 -CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC94XX=m -# CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_MVSAS=m -# CONFIG_SCSI_MVSAS_DEBUG is not set -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_IN2000=m -CONFIG_SCSI_ARCMSR=m -CONFIG_SCSI_ARCMSR_AER=y -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=m -CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_MPT2SAS=m -CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -# CONFIG_SCSI_MPT2SAS_LOGGING is not set -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_BUSLOGIC=m -# CONFIG_SCSI_FLASHPOINT is not set -CONFIG_LIBFC=m -CONFIG_LIBFCOE=m -CONFIG_FCOE=m -CONFIG_FCOE_FNIC=m -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_DTC3280=m -CONFIG_SCSI_EATA=m -# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set -# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set -CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=m -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_GENERIC_NCR5380=m -CONFIG_SCSI_GENERIC_NCR5380_MMIO=m -CONFIG_SCSI_GENERIC_NCR53C400=y -CONFIG_SCSI_IPS=m -CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_NCR53C406A=m -CONFIG_SCSI_STEX=m -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -CONFIG_SCSI_IPR=m -# CONFIG_SCSI_IPR_TRACE is not set -# CONFIG_SCSI_IPR_DUMP is not set -CONFIG_SCSI_PAS16=m -CONFIG_SCSI_QLOGIC_FAS=m -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA_FC=m -CONFIG_SCSI_QLA_ISCSI=m -CONFIG_SCSI_LPFC=m -# CONFIG_SCSI_LPFC_DEBUG_FS is not set -CONFIG_SCSI_SYM53C416=m -CONFIG_SCSI_DC395x=m -CONFIG_SCSI_DC390T=m -CONFIG_SCSI_T128=m -CONFIG_SCSI_U14_34F=m -# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set -# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set -CONFIG_SCSI_U14_34F_MAX_TAGS=8 -CONFIG_SCSI_ULTRASTOR=m -CONFIG_SCSI_NSP32=m -# CONFIG_SCSI_DEBUG is not set -CONFIG_SCSI_PMCRAID=m -CONFIG_SCSI_SRP=m -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_LOWLEVEL_PCMCIA=y -CONFIG_PCMCIA_AHA152X=m -CONFIG_PCMCIA_FDOMAIN=m -CONFIG_PCMCIA_NINJA_SCSI=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m -CONFIG_SCSI_DH=m -CONFIG_SCSI_DH_RDAC=m -CONFIG_SCSI_DH_HP_SW=m -CONFIG_SCSI_DH_EMC=m -CONFIG_SCSI_DH_ALUA=m -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m -CONFIG_SCSI_OSD_DPRINT_SENSE=0 -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=m -# CONFIG_ATA_NONSTANDARD is not set -CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_ATA_ACPI=y -CONFIG_SATA_PMP=y -CONFIG_SATA_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y -CONFIG_SATA_SVW=m -CONFIG_ATA_PIIX=m -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_SX4=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m -CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATP867X=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_CMD640_PCI=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -CONFIG_PATA_CS5535=m -CONFIG_PATA_CS5536=m -CONFIG_PATA_CYPRESS=m -CONFIG_PATA_EFAR=m -CONFIG_ATA_GENERIC=m -CONFIG_PATA_HPT366=m -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=m -CONFIG_PATA_HPT3X3=m -# CONFIG_PATA_HPT3X3_DMA is not set -CONFIG_PATA_ISAPNP=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_IT8213=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_LEGACY=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_MARVELL=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NINJA32=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_NS87415=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_OPTIDMA=m -CONFIG_PATA_PCMCIA=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_QDI=m -CONFIG_PATA_RADISYS=m -CONFIG_PATA_RDC=m -CONFIG_PATA_RZ1000=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m -CONFIG_PATA_WINBOND_VLB=m -CONFIG_PATA_SCH=m -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -# CONFIG_MULTICORE_RAID456 is not set -CONFIG_MD_RAID6_PQ=m -CONFIG_ASYNC_RAID6_TEST=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_MIRROR=m -CONFIG_DM_LOG_USERSPACE=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_QL=m -CONFIG_DM_MULTIPATH_ST=m -CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -# CONFIG_FUSION_LOGGING is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# You can enable one or both FireWire driver stacks. -# - -# -# See the help texts for more information. -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_OHCI_DEBUG=y -CONFIG_FIREWIRE_SBP2=m -CONFIG_FIREWIRE_NET=m -# CONFIG_IEEE1394 is not set -CONFIG_I2O=m -CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y -CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_CONFIG=m -CONFIG_I2O_CONFIG_OLD_IOCTL=y -CONFIG_I2O_BUS=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m -CONFIG_MACINTOSH_DRIVERS=y -CONFIG_MAC_EMUMOUSEBTN=y -CONFIG_NETDEVICES=y -CONFIG_IFB=m -CONFIG_DUMMY=m -CONFIG_BONDING=m -CONFIG_MACVLAN=m -CONFIG_EQUALIZER=m -CONFIG_TUN=m -CONFIG_VETH=m -CONFIG_NET_SB1000=m -# CONFIG_ARCNET is not set -CONFIG_PHYLIB=m - -# -# MII PHY device drivers -# -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_PHY=m -CONFIG_ICPLUS_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_STE10XP=m -CONFIG_LSI_ET1011C_PHY=m -# CONFIG_MDIO_BITBANG is not set -CONFIG_NET_ETHERNET=y -CONFIG_MII=m -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m -CONFIG_EL2=m -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_EL3=m -CONFIG_3C515=m -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_LANCE=m -CONFIG_NET_VENDOR_SMC=y -CONFIG_WD80x3=m -CONFIG_ULTRA=m -CONFIG_SMC9194=m -CONFIG_ENC28J60=m -# CONFIG_ENC28J60_WRITEVERIFY is not set -CONFIG_ETHOC=m -CONFIG_NET_VENDOR_RACAL=y -CONFIG_NI52=m -CONFIG_NI65=m -CONFIG_DNET=m -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_DE2104X_DSL=0 -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_PCMCIA_XIRCOM=m -CONFIG_AT1700=m -CONFIG_DEPCA=m -CONFIG_HP100=m -CONFIG_NET_ISA=y -CONFIG_E2100=m -CONFIG_EWRK3=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m -CONFIG_LP486E=m -CONFIG_ETH16I=m -CONFIG_NE2000=m -CONFIG_ZNET=m -CONFIG_SEEQ8005=m -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -CONFIG_NET_PCI=y -CONFIG_PCNET32=m -CONFIG_AMD8111_ETH=m -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_AC3200=m -CONFIG_APRICOT=m -CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y -CONFIG_FORCEDETH=m -# CONFIG_FORCEDETH_NAPI is not set -CONFIG_CS89x0=m -CONFIG_E100=m -CONFIG_FEALNX=m -CONFIG_NATSEMI=m -CONFIG_NE2K_PCI=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -CONFIG_8139TOO_TUNE_TWISTER=y -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_R6040=m -CONFIG_SIS900=m -CONFIG_EPIC100=m -CONFIG_SMSC9420=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_TLAN=m -CONFIG_KS8842=m -CONFIG_KS8851=m -CONFIG_KS8851_MLL=m -CONFIG_VIA_RHINE=m -# CONFIG_VIA_RHINE_MMIO is not set -CONFIG_SC92031=m -CONFIG_NET_POCKET=y -CONFIG_ATP=m -CONFIG_DE600=m -CONFIG_DE620=m -CONFIG_ATL2=m -CONFIG_NETDEV_1000=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_IP1000=m -CONFIG_IGB=m -CONFIG_IGB_DCA=y -CONFIG_IGBVF=m -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -# CONFIG_R8169_VLAN is not set -CONFIG_SIS190=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_QLA3XXX=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_JME=m -CONFIG_NETDEV_10000=y -CONFIG_MDIO=m -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3_DEPENDS=y -CONFIG_CHELSIO_T3=m -CONFIG_ENIC=m -CONFIG_IXGBE=m -CONFIG_IXGBE_DCA=y -CONFIG_IXGB=m -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y -CONFIG_NETXEN_NIC=m -CONFIG_NIU=m -CONFIG_MLX4_EN=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_TEHUTI=m -CONFIG_BNX2X=m -CONFIG_QLGE=m -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_BE2NET=m -# CONFIG_TR is not set -CONFIG_WLAN=y -# CONFIG_WLAN_PRE80211 is not set -CONFIG_WLAN_80211=y -CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_SPI=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM=m -CONFIG_LIBERTAS_THINFIRM_USB=m -CONFIG_AIRO=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_AT76C50X_USB=m -CONFIG_AIRO_CS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_PRISM54=m -CONFIG_USB_ZD1201=m -CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_ADM8211=m -# CONFIG_MAC80211_HWSIM is not set -CONFIG_MWL8K=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_SPI=m -CONFIG_P54_LEDS=y -CONFIG_ATH_COMMON=m -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -CONFIG_ATH9K=m -# CONFIG_ATH9K_DEBUG is not set -CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y -CONFIG_IPW2200_QOS=y -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -CONFIG_IWLWIFI_LEDS=y -CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y -CONFIG_IWL3945=m -CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_B43=m -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_SDIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -# CONFIG_B43LEGACY_DEBUG is not set -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_HT=y -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_HERMES=m -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_WL12XX=m -CONFIG_WL1251=m -CONFIG_WL1251_SPI=m -CONFIG_WL1251_SDIO=m -CONFIG_WL1271=m -CONFIG_IWM=m -# CONFIG_IWM_DEBUG is not set - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_SDIO=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_PCMCIA_PCNET=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_PCMCIA_AXNET=m -# CONFIG_WAN is not set -CONFIG_ATM_DRIVERS=y -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -# CONFIG_ATM_NICSTAR_USE_SUNI is not set -# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E=m -# CONFIG_ATM_FORE200E_USE_TASKLET is not set -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_HE=m -# CONFIG_ATM_HE_USE_SUNI is not set -CONFIG_ATM_SOLOS=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_PPPOATM=m -CONFIG_PPPOL2TP=m -CONFIG_SLIP=m -# CONFIG_SLIP_COMPRESSED is not set -CONFIG_SLHC=m -# CONFIG_SLIP_SMART is not set -# CONFIG_SLIP_MODE_SLIP6 is not set -# CONFIG_NET_FC is not set -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_VIRTIO_NET=m -CONFIG_VMXNET3=m -CONFIG_ISDN=y -CONFIG_ISDN_I4L=m -CONFIG_MISDN=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_L1OIP=m - -# -# mISDN hardware drivers -# -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_W6692=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_IPAC=m -CONFIG_MISDN_ISAR=m -CONFIG_ISDN_PPP=y -CONFIG_ISDN_PPP_VJ=y -CONFIG_ISDN_MPP=y -CONFIG_IPPP_FILTER=y -CONFIG_ISDN_PPP_BSDCOMP=m -CONFIG_ISDN_AUDIO=y -CONFIG_ISDN_TTY_FAX=y - -# -# ISDN feature submodules -# -CONFIG_ISDN_DIVERSION=m - -# -# ISDN4Linux hardware drivers -# - -# -# Passive cards -# -CONFIG_ISDN_DRV_HISAX=m - -# -# D-channel protocol features -# -CONFIG_HISAX_EURO=y -CONFIG_DE_AOC=y -# CONFIG_HISAX_NO_SENDCOMPLETE is not set -# CONFIG_HISAX_NO_LLC is not set -# CONFIG_HISAX_NO_KEYPAD is not set -CONFIG_HISAX_1TR6=y -CONFIG_HISAX_NI1=y -CONFIG_HISAX_MAX_CARDS=8 - -# -# HiSax supported cards -# -CONFIG_HISAX_16_0=y -CONFIG_HISAX_16_3=y -CONFIG_HISAX_TELESPCI=y -CONFIG_HISAX_S0BOX=y -CONFIG_HISAX_AVM_A1=y -CONFIG_HISAX_FRITZPCI=y -CONFIG_HISAX_AVM_A1_PCMCIA=y -CONFIG_HISAX_ELSA=y -CONFIG_HISAX_IX1MICROR2=y -CONFIG_HISAX_DIEHLDIVA=y -CONFIG_HISAX_ASUSCOM=y -CONFIG_HISAX_TELEINT=y -CONFIG_HISAX_HFCS=y -CONFIG_HISAX_SEDLBAUER=y -CONFIG_HISAX_SPORTSTER=y -CONFIG_HISAX_MIC=y -CONFIG_HISAX_NETJET=y -CONFIG_HISAX_NETJET_U=y -CONFIG_HISAX_NICCY=y -CONFIG_HISAX_ISURF=y -CONFIG_HISAX_HSTSAPHIR=y -CONFIG_HISAX_BKM_A4T=y -CONFIG_HISAX_SCT_QUADRO=y -CONFIG_HISAX_GAZEL=y -CONFIG_HISAX_HFC_PCI=y -CONFIG_HISAX_W6692=y -CONFIG_HISAX_HFC_SX=y -CONFIG_HISAX_ENTERNOW_PCI=y -# CONFIG_HISAX_DEBUG is not set - -# -# HiSax PCMCIA card service modules -# -CONFIG_HISAX_SEDLBAUER_CS=m -CONFIG_HISAX_ELSA_CS=m -CONFIG_HISAX_AVM_A1_CS=m -CONFIG_HISAX_TELES_CS=m - -# -# HiSax sub driver modules -# -CONFIG_HISAX_ST5481=m -CONFIG_HISAX_HFCUSB=m -CONFIG_HISAX_HFC4S8S=m -CONFIG_HISAX_FRITZ_PCIPNP=m - -# -# Active cards -# -CONFIG_ISDN_DRV_ICN=m -CONFIG_ISDN_DRV_PCBIT=m -CONFIG_ISDN_DRV_SC=m -CONFIG_ISDN_DRV_ACT2000=m -CONFIG_HYSDN=m -CONFIG_HYSDN_CAPI=y -CONFIG_ISDN_HDLC=m -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -CONFIG_CAPI_TRACE=y -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m -CONFIG_ISDN_CAPI_CAPIDRV=m - -# -# CAPI hardware drivers -# -CONFIG_CAPI_AVM=y -CONFIG_ISDN_DRV_AVMB1_B1ISA=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_T1ISA=m -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_CAPI_EICON=y -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_M105=m -CONFIG_GIGASET_M101=m -# CONFIG_GIGASET_DEBUG is not set -# CONFIG_PHONE is not set - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ATKBD=y -CONFIG_QT2160=m -# CONFIG_KEYBOARD_LKKBD is not set -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_MATRIX=m -# CONFIG_KEYBOARD_LM8323 is not set -# CONFIG_KEYBOARD_MAX7359 is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_OPENCORES is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_LIFEBOOK=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -CONFIG_MOUSE_PS2_ELANTECH=y -CONFIG_MOUSE_PS2_SENTELIC=y -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -CONFIG_MOUSE_PS2_OLPC=y -CONFIG_MOUSE_SERIAL=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_INPORT=m -# CONFIG_MOUSE_ATIXL is not set -CONFIG_MOUSE_LOGIBM=m -CONFIG_MOUSE_PC110PAD=m -CONFIG_MOUSE_VSXXXAA=m -CONFIG_MOUSE_GPIO=m -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_ZHENHUA=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_JOYSTICK_XPAD=m -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y -CONFIG_JOYSTICK_WALKERA0701=m -CONFIG_INPUT_TABLET=y -CONFIG_TABLET_USB_ACECAD=m -CONFIG_TABLET_USB_AIPTEK=m -CONFIG_TABLET_USB_GTCO=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_WACOM=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -CONFIG_TOUCHSCREEN_MCS5000=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_HTCPEN=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_UCB1400=m -CONFIG_TOUCHSCREEN_WM97XX=m -CONFIG_TOUCHSCREEN_WM9705=y -CONFIG_TOUCHSCREEN_WM9712=y -CONFIG_TOUCHSCREEN_WM9713=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_USB_EGALAX=y -CONFIG_TOUCHSCREEN_USB_PANJIT=y -CONFIG_TOUCHSCREEN_USB_3M=y -CONFIG_TOUCHSCREEN_USB_ITM=y -CONFIG_TOUCHSCREEN_USB_ETURBO=y -CONFIG_TOUCHSCREEN_USB_GUNZE=y -CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y -CONFIG_TOUCHSCREEN_USB_IRTOUCH=y -CONFIG_TOUCHSCREEN_USB_IDEALTEK=y -CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y -CONFIG_TOUCHSCREEN_USB_GOTOP=y -CONFIG_TOUCHSCREEN_USB_JASTEC=y -CONFIG_TOUCHSCREEN_USB_E2I=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC2007=m -CONFIG_TOUCHSCREEN_PCAP=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_APANEL=m -CONFIG_INPUT_WISTRON_BTNS=m -CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_WINBOND_CIR=m -CONFIG_INPUT_PCF50633_PMU=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_WM831X_ON=m -# CONFIG_INPUT_PCAP is not set - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_CT82C710=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_COMPUTONE is not set -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -# CONFIG_DIGIEPCA is not set -# CONFIG_MOXA_INTELLIO is not set -# CONFIG_MOXA_SMARTIO is not set -# CONFIG_ISI is not set -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -# CONFIG_SYNCLINK_GT is not set -CONFIG_N_HDLC=m -# CONFIG_RISCOM8 is not set -# CONFIG_SPECIALIX is not set -# CONFIG_STALDRV is not set -CONFIG_NOZOMI=m - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_JSM=m -CONFIG_UNIX98_PTYS=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_PRINTER=m -# CONFIG_LP_CONSOLE is not set -CONFIG_PPDEV=m -CONFIG_HVC_DRIVER=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_INTEL=m -CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_GEODE=m -CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_NVRAM=m -CONFIG_DTLK=m -CONFIG_R3964=m -CONFIG_APPLICOM=m -CONFIG_SONYPI=m - -# -# PCMCIA character devices -# -CONFIG_SYNCLINK_CS=m -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m -CONFIG_IPWIRELESS=m -CONFIG_MWAVE=m -CONFIG_PC8736x_GPIO=m -CONFIG_NSC_GPIO=m -CONFIG_CS5535_GPIO=m -# CONFIG_RAW_DRIVER is not set -CONFIG_HPET=y -CONFIG_HPET_MMAP=y -CONFIG_HANGCHECK_TIMER=m -CONFIG_TCG_TPM=m -CONFIG_TCG_TIS=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TELCLOCK=m -CONFIG_DEVPORT=y -CONFIG_I2C=m -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD756_S4882=m -CONFIG_I2C_AMD8111=m -CONFIG_I2C_I801=m -CONFIG_I2C_ISCH=m -CONFIG_I2C_PIIX4=m -CONFIG_I2C_NFORCE2=m -CONFIG_I2C_NFORCE2_S4985=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m - -# -# ACPI drivers -# -CONFIG_I2C_SCMI=m - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_GPIO=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_SIMTEC=m - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m - -# -# Graphics adapter I2C/DDC channel drivers -# -# CONFIG_I2C_VOODOO3 is not set - -# -# Other I2C/SMBus bus drivers -# -CONFIG_I2C_PCA_ISA=m -CONFIG_I2C_PCA_PLATFORM=m -# CONFIG_I2C_STUB is not set -CONFIG_SCx200_ACB=m - -# -# Miscellaneous I2C Chip support -# -CONFIG_DS1682=m -CONFIG_SENSORS_TSL2550=m -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m - -# -# SPI Protocol Masters -# -CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m - -# -# PPS support -# -CONFIG_PPS=m -# CONFIG_PPS_DEBUG is not set -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIOLIB=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y - -# -# Memory mapped GPIO expanders: -# - -# -# I2C GPIO expanders: -# -CONFIG_GPIO_MAX732X=m -CONFIG_GPIO_PCA953X=m -CONFIG_GPIO_PCF857X=m -CONFIG_GPIO_WM831X=m - -# -# PCI GPIO expanders: -# -CONFIG_GPIO_LANGWELL=y - -# -# SPI GPIO expanders: -# -CONFIG_GPIO_MAX7301=m -CONFIG_GPIO_MCP23S08=m -CONFIG_GPIO_MC33880=m - -# -# AC97 GPIO expanders: -# -CONFIG_GPIO_UCB1400=y -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_MASTER_GPIO=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set -CONFIG_W1_SLAVE_DS2760=m -CONFIG_W1_SLAVE_BQ27000=m -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -CONFIG_PDA_POWER=m -CONFIG_WM831X_POWER=m -CONFIG_WM8350_POWER=m -CONFIG_BATTERY_DS2760=m -CONFIG_BATTERY_DS2782=m -CONFIG_BATTERY_OLPC=m -CONFIG_BATTERY_BQ27x00=m -CONFIG_BATTERY_MAX17040=m -CONFIG_CHARGER_PCF50633=m -CONFIG_HWMON=y -CONFIG_HWMON_VID=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Native drivers -# -CONFIG_SENSORS_ABITUGURU=m -CONFIG_SENSORS_ABITUGURU3=m -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -CONFIG_SENSORS_ADCXX=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7473=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_K8TEMP=m -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_I5K_AMB=m -CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_F71882FG=m -CONFIG_SENSORS_F75375S=m -CONFIG_SENSORS_FSCHMD=m -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_CORETEMP=m -CONFIG_SENSORS_IBMAEM=m -CONFIG_SENSORS_IBMPEX=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_LM93=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_MAX1111=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_SHT15=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47M192=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_TMP401=m -CONFIG_SENSORS_TMP421=m -CONFIG_SENSORS_VIA686A=m -CONFIG_SENSORS_VT1211=m -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83L786NG=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_WM831X=m -CONFIG_SENSORS_WM8350=m -CONFIG_SENSORS_HDAPS=m -CONFIG_SENSORS_APPLESMC=m - -# -# ACPI drivers -# -CONFIG_SENSORS_ATK0110=m -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_THERMAL=y -CONFIG_THERMAL_HWMON=y -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_WM831X_WATCHDOG=m -CONFIG_WM8350_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_SC520_WDT=m -CONFIG_SBC_FITPC2_WATCHDOG=m -CONFIG_EUROTECH_WDT=m -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m -CONFIG_WAFER_WDT=m -CONFIG_I6300ESB_WDT=m -CONFIG_ITCO_WDT=m -CONFIG_ITCO_VENDOR_SUPPORT=y -CONFIG_IT8712F_WDT=m -CONFIG_IT87_WDT=m -CONFIG_HP_WATCHDOG=m -CONFIG_SC1200_WDT=m -CONFIG_PC87413_WDT=m -CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m -CONFIG_SBC7240_WDT=m -CONFIG_CPU5_WDT=m -CONFIG_SMSC_SCH311X_WDT=m -CONFIG_SMSC37B787_WDT=m -CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m -CONFIG_W83877F_WDT=m -CONFIG_W83977F_WDT=m -CONFIG_MACHZ_WDT=m -CONFIG_SBC_EPX_C3_WATCHDOG=m - -# -# ISA-based Watchdog Cards -# -CONFIG_PCWATCHDOG=m -CONFIG_MIXCOMWD=m -CONFIG_WDT=m - -# -# PCI-based Watchdog Cards -# -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m - -# -# USB-based Watchdog Cards -# -CONFIG_USBPCWATCHDOG=m -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -CONFIG_SSB=m -CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_PCMCIAHOST_POSSIBLE=y -CONFIG_SSB_PCMCIAHOST=y -CONFIG_SSB_SDIOHOST_POSSIBLE=y -CONFIG_SSB_SDIOHOST=y -# CONFIG_SSB_DEBUG is not set -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y -CONFIG_SSB_DRIVER_PCICORE=y - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=m -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y -CONFIG_HTC_PASIC3=m -CONFIG_UCB1400_CORE=m -CONFIG_TPS65010=m -# CONFIG_MFD_TMIO is not set -CONFIG_MFD_WM8400=m -CONFIG_MFD_WM831X=m -CONFIG_MFD_WM8350=m -CONFIG_MFD_WM8350_I2C=m -CONFIG_MFD_PCF50633=m -CONFIG_MFD_MC13783=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_AB3100_CORE=m -CONFIG_AB3100_OTP=m -CONFIG_EZX_PCAP=y -# CONFIG_REGULATOR is not set -CONFIG_MEDIA_SUPPORT=m - -# -# Multimedia core support -# -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m -CONFIG_VIDEO_ALLOW_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_DVB_CORE=m -CONFIG_VIDEO_MEDIA=m - -# -# Multimedia drivers -# -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEO_V4L1=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders/decoders and other helper chips -# - -# -# Audio decoders -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TDA9875=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_ADV7343=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m -CONFIG_VIDEO_VIVI=m -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y -CONFIG_VIDEO_PMS=m -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_W9966=m -CONFIG_VIDEO_CPIA=m -CONFIG_VIDEO_CPIA_PP=m -CONFIG_VIDEO_CPIA_USB=m -CONFIG_VIDEO_CPIA2=m -CONFIG_VIDEO_SAA5246A=m -CONFIG_VIDEO_SAA5249=m -CONFIG_VIDEO_STRADIS=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX23885=m -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_MT9M001=m -CONFIG_SOC_CAMERA_MT9M111=m -CONFIG_SOC_CAMERA_MT9T031=m -CONFIG_SOC_CAMERA_MT9V022=m -CONFIG_SOC_CAMERA_TW9910=m -CONFIG_SOC_CAMERA_PLATFORM=m -CONFIG_SOC_CAMERA_OV772X=m -CONFIG_V4L_USB_DRIVERS=y -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SN9C20X=m -CONFIG_USB_GSPCA_SN9C20X_EVDEV=y -CONFIG_USB_GSPCA_SONIXB=m -CONFIG_USB_GSPCA_SONIXJ=m -CONFIG_USB_GSPCA_SPCA500=m -CONFIG_USB_GSPCA_SPCA501=m -CONFIG_USB_GSPCA_SPCA505=m -CONFIG_USB_GSPCA_SPCA506=m -CONFIG_USB_GSPCA_SPCA508=m -CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_PVRUSB2_SYSFS=y -CONFIG_VIDEO_PVRUSB2_DVB=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m -CONFIG_USB_IBMCAM=m -CONFIG_USB_KONICAWC=m -CONFIG_USB_QUICKCAM_MESSENGER=m -CONFIG_USB_ET61X251=m -CONFIG_VIDEO_OVCAMCHIP=m -CONFIG_USB_W9968CF=m -CONFIG_USB_OV511=m -CONFIG_USB_SE401=m -CONFIG_USB_SN9C102=m -CONFIG_USB_STV680=m -CONFIG_USB_ZC0301=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_CADET=m -CONFIG_RADIO_RTRACK=m -CONFIG_RADIO_RTRACK2=m -CONFIG_RADIO_AZTECH=m -CONFIG_RADIO_GEMTEK=m -CONFIG_RADIO_GEMTEK_PCI=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_MAESTRO=m -CONFIG_RADIO_SF16FMI=m -CONFIG_RADIO_SF16FMR2=m -CONFIG_RADIO_TERRATEC=m -CONFIG_RADIO_TRUST=m -CONFIG_RADIO_TYPHOON=m -CONFIG_RADIO_ZOLTRIX=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI4713=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_SI470X=y -CONFIG_USB_SI470X=m -CONFIG_I2C_SI470X=m -CONFIG_USB_MR800=m -CONFIG_RADIO_TEA5764=m -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y - -# -# Supported SAA7146 based PCI Adapters -# -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m - -# -# Supported USB Adapters -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m - -# -# Siano module components -# -CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m - -# -# Supported FlexCopII (B2C2) Adapters -# -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set - -# -# Supported BT878 Adapters -# -CONFIG_DVB_BT8XX=m - -# -# Supported Pluto2 Adapters -# -CONFIG_DVB_PLUTO2=m - -# -# Supported SDMC DM1105 Adapters -# -CONFIG_DVB_DM1105=m - -# -# Supported Earthsoft PT1 Adapters -# -CONFIG_DVB_PT1=m - -# -# Supported DVB Frontends -# -# CONFIG_DVB_FE_CUSTOMISE is not set -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_STV090x=m -CONFIG_DVB_STV6110x=m -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m -CONFIG_DVB_STB6000=m -CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m -CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_SI21XX=m -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_LGDT3305=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_S5H1411=m -CONFIG_DVB_DIB8000=m -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_ISL6423=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DAB=y -CONFIG_USB_DABUSB=m - -# -# Graphics support -# -CONFIG_AGP=m -CONFIG_AGP_ALI=m -CONFIG_AGP_ATI=m -CONFIG_AGP_AMD=m -CONFIG_AGP_AMD64=m -CONFIG_AGP_INTEL=m -CONFIG_AGP_NVIDIA=m -CONFIG_AGP_SIS=m -CONFIG_AGP_SWORKS=m -CONFIG_AGP_VIA=m -CONFIG_AGP_EFFICEON=m -CONFIG_VGA_ARB=y -CONFIG_DRM=m -CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_TTM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_I810=m -CONFIG_DRM_I830=m -CONFIG_DRM_I915=m -CONFIG_DRM_I915_KMS=y -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_DDC=m -CONFIG_FB_BOOT_VESA_SUPPORT=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_SVGALIB=m -# CONFIG_FB_MACMODES is not set -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -CONFIG_FB_PM2_FIFO_DISCONNECT=y -CONFIG_FB_CYBER2000=m -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -# CONFIG_FB_VGA16 is not set -CONFIG_FB_UVESA=m -CONFIG_FB_VESA=y -CONFIG_FB_EFI=y -# CONFIG_FB_N411 is not set -# CONFIG_FB_HGA is not set -# CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y -CONFIG_FB_I810=m -# CONFIG_FB_I810_GTF is not set -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m -# CONFIG_FB_MATROX is not set -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y -CONFIG_FB_S3=m -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -CONFIG_FB_SAVAGE_ACCEL=y -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_VIA=m -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -CONFIG_FB_3DFX_ACCEL=y -CONFIG_FB_3DFX_I2C=y -CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_TRIDENT=m -# CONFIG_FB_ARK is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_CARMINE is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_TMIO is not set -# CONFIG_FB_SM501 is not set -# CONFIG_FB_VIRTUAL is not set -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX is not set -# CONFIG_FB_BROADSHEET is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_LMS283GF05=m -CONFIG_LCD_LTV350QV=m -CONFIG_LCD_ILI9320=m -CONFIG_LCD_TDO24M=m -CONFIG_LCD_VGG2432A4=m -CONFIG_LCD_PLATFORM=m -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=m -CONFIG_BACKLIGHT_PROGEAR=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m -CONFIG_BACKLIGHT_MBP_NVIDIA=m -CONFIG_BACKLIGHT_SAHARA=m -CONFIG_BACKLIGHT_WM831X=m - -# -# Display device support -# -CONFIG_DISPLAY_SUPPORT=m - -# -# Display hardware drivers -# - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -# CONFIG_MDA_CONSOLE is not set -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -# CONFIG_FONT_8x8 is not set -CONFIG_FONT_8x16=y -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set -# CONFIG_FONT_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -CONFIG_SOUND_OSS_CORE_PRECLAIM=y -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_JACK=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_HRTIMER=m -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=y -CONFIG_SND_DMA_SGBUF=y -CONFIG_SND_RAWMIDI_SEQ=m -CONFIG_SND_OPL3_LIB_SEQ=m -CONFIG_SND_OPL4_LIB_SEQ=m -CONFIG_SND_SBAWE_SEQ=m -CONFIG_SND_EMU10K1_SEQ=m -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_OPL4_LIB=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_DRIVERS=y -# CONFIG_SND_PCSP is not set -CONFIG_SND_DUMMY=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_MTS64=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m -CONFIG_SND_PORTMAN2X4=m -CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 -CONFIG_SND_WSS_LIB=m -CONFIG_SND_SB_COMMON=m -CONFIG_SND_SB8_DSP=m -CONFIG_SND_SB16_DSP=m -CONFIG_SND_ISA=y -CONFIG_SND_ADLIB=m -CONFIG_SND_AD1816A=m -CONFIG_SND_AD1848=m -CONFIG_SND_ALS100=m -CONFIG_SND_AZT2320=m -CONFIG_SND_CMI8330=m -CONFIG_SND_CS4231=m -CONFIG_SND_CS4236=m -CONFIG_SND_DT019X=m -CONFIG_SND_ES968=m -CONFIG_SND_ES1688=m -CONFIG_SND_ES18XX=m -CONFIG_SND_SC6000=m -CONFIG_SND_GUSCLASSIC=m -CONFIG_SND_GUSEXTREME=m -CONFIG_SND_GUSMAX=m -CONFIG_SND_INTERWAVE=m -CONFIG_SND_INTERWAVE_STB=m -CONFIG_SND_OPL3SA2=m -CONFIG_SND_OPTI92X_AD1848=m -CONFIG_SND_OPTI92X_CS4231=m -CONFIG_SND_OPTI93X=m -CONFIG_SND_MIRO=m -CONFIG_SND_SB8=m -CONFIG_SND_SB16=m -CONFIG_SND_SBAWE=m -CONFIG_SND_SB16_CSP=y -CONFIG_SND_SGALAXY=m -CONFIG_SND_SSCAPE=m -CONFIG_SND_WAVEFRONT=m -CONFIG_SND_MSND_PINNACLE=m -CONFIG_SND_MSND_CLASSIC=m -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m -CONFIG_SND_AW2=m -CONFIG_SND_AZT3328=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_OXYGEN_LIB=m -CONFIG_SND_OXYGEN=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS5530=m -CONFIG_SND_CS5535AUDIO=m -CONFIG_SND_CTXFI=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_INDIGOIOX=m -CONFIG_SND_INDIGODJX=m -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_FM801_TEA575X=m -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_JACK=y -CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_CODEC_REALTEK=y -CONFIG_SND_HDA_CODEC_ANALOG=y -CONFIG_SND_HDA_CODEC_SIGMATEL=y -CONFIG_SND_HDA_CODEC_VIA=y -CONFIG_SND_HDA_CODEC_ATIHDMI=y -CONFIG_SND_HDA_CODEC_NVHDMI=y -CONFIG_SND_HDA_CODEC_INTELHDMI=y -CONFIG_SND_HDA_ELD=y -CONFIG_SND_HDA_CODEC_CIRRUS=y -CONFIG_SND_HDA_CODEC_CONEXANT=y -CONFIG_SND_HDA_CODEC_CA0110=y -CONFIG_SND_HDA_CODEC_CMEDIA=y -CONFIG_SND_HDA_CODEC_SI3054=y -CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_HIFIER=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_LX6464ES=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_SIS7019=m -CONFIG_SND_SONICVIBES=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VIRTUOSO=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m -CONFIG_SND_SPI=y -CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_USX2Y=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_US122L=m -CONFIG_SND_PCMCIA=y -CONFIG_SND_VXPOCKET=m -CONFIG_SND_PDAUDIOCF=m -CONFIG_SND_SOC=m -CONFIG_SND_SOC_I2C_AND_SPI=m -# CONFIG_SND_SOC_ALL_CODECS is not set -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=m -CONFIG_HID_SUPPORT=y -CONFIG_HID=m -CONFIG_HIDRAW=y - -# -# USB Input Devices -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -CONFIG_HID_APPLE=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EZKEY=m -CONFIG_HID_KYE=m -CONFIG_HID_GYRATION=m -CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LOGITECH=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_NTRIG=m -CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y -CONFIG_HID_PETALYNX=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m -CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y -CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_HID_TOPSEED=m -CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y -CONFIG_HID_WACOM=m -CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB=m -# CONFIG_USB_DEBUG is not set -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_SUSPEND=y -# CONFIG_USB_OTG is not set -CONFIG_USB_MON=m -CONFIG_USB_WUSB=m -CONFIG_USB_WUSB_CBAF=m -# CONFIG_USB_WUSB_CBAF_DEBUG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_C67X00_HCD=m -CONFIG_USB_XHCI_HCD=m -# CONFIG_USB_XHCI_HCD_DEBUGGING is not set -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_OXU210HP_HCD=m -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_ISP1760_HCD=m -CONFIG_USB_ISP1362_HCD=m -CONFIG_USB_OHCI_HCD=m -# CONFIG_USB_OHCI_HCD_SSB is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=m -CONFIG_USB_U132_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m -CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m -# CONFIG_USB_GADGET_MUSB_HDRC is not set - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_WDM=m -CONFIG_USB_TMC=m - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_STORAGE_ONETOUCH=m -CONFIG_USB_STORAGE_KARMA=m -CONFIG_USB_STORAGE_CYPRESS_ATACB=m -# CONFIG_USB_LIBUSUAL is not set - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP210X=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_FUNSOFT=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_IUU=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MOTOROLA=m -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_OTI6858=m -CONFIG_USB_SERIAL_QUALCOMM=m -CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_SERIAL_HP4X=m -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_SIEMENS_MPI=m -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -# CONFIG_USB_SERIAL_DEBUG is not set - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_BERRY_CHARGE=m -CONFIG_USB_LED=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -# CONFIG_USB_SISUSBVGA_CON is not set -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m -CONFIG_USB_ISIGHTFW=m -CONFIG_USB_VST=m -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_SELECTED=y -# CONFIG_USB_GADGET_AT91 is not set -# CONFIG_USB_GADGET_ATMEL_USBA is not set -# CONFIG_USB_GADGET_FSL_USB2 is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_GADGET_PXA25X is not set -# CONFIG_USB_GADGET_R8A66597 is not set -# CONFIG_USB_GADGET_PXA27X is not set -# CONFIG_USB_GADGET_S3C_HSOTG is not set -# CONFIG_USB_GADGET_IMX is not set -# CONFIG_USB_GADGET_S3C2410 is not set -# CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_AMD5536UDC is not set -# CONFIG_USB_GADGET_FSL_QE is not set -# CONFIG_USB_GADGET_CI13XXX is not set -CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LANGWELL is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -CONFIG_USB_GADGET_DUALSPEED=y -# CONFIG_USB_ZERO is not set -CONFIG_USB_AUDIO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_ETH_EEM is not set -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -CONFIG_USB_G_PRINTER=m -# CONFIG_USB_CDC_COMPOSITE is not set - -# -# OTG and related infrastructure -# -CONFIG_USB_OTG_UTILS=y -CONFIG_USB_GPIO_VBUS=m -CONFIG_NOP_USB_XCEIV=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_WLP=m -CONFIG_UWB_I1480U=m -CONFIG_UWB_I1480U_WLP=m -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_SDIO_UART=m -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -CONFIG_MMC_SDHCI=m -CONFIG_MMC_SDHCI_PCI=m -CONFIG_MMC_RICOH_MMC=m -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_WBSD=m -# CONFIG_MMC_AT91 is not set -# CONFIG_MMC_ATMELMCI is not set -CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_SDRICOH_CS=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MEMSTICK=m -# CONFIG_MEMSTICK_DEBUG is not set - -# -# MemoryStick drivers -# -# CONFIG_MEMSTICK_UNSAFE_RESUME is not set -CONFIG_MSPRO_BLOCK=m - -# -# MemoryStick Host Controller Drivers -# -CONFIG_MEMSTICK_TIFM_MS=m -CONFIG_MEMSTICK_JMICRON_38X=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m - -# -# LED drivers -# -CONFIG_LEDS_ALIX2=m -CONFIG_LEDS_PCA9532=m -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_GPIO_PLATFORM=y -CONFIG_LEDS_LP3944=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_WM831X_STATUS=m -CONFIG_LEDS_WM8350=m -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_BD2802=m - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_IDE_DISK=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_ACCESSIBILITY=y -CONFIG_A11Y_BRAILLE_CONSOLE=y -# CONFIG_INFINIBAND is not set -CONFIG_EDAC=y - -# -# Reporting subsystems -# -# CONFIG_EDAC_DEBUG is not set -CONFIG_EDAC_DECODE_MCE=m -CONFIG_EDAC_MM_EDAC=m -CONFIG_EDAC_AMD76X=m -CONFIG_EDAC_E7XXX=m -CONFIG_EDAC_E752X=m -CONFIG_EDAC_I82875P=m -CONFIG_EDAC_I82975X=m -CONFIG_EDAC_I3000=m -CONFIG_EDAC_I3200=m -CONFIG_EDAC_X38=m -CONFIG_EDAC_I5400=m -CONFIG_EDAC_I82860=m -CONFIG_EDAC_R82600=m -CONFIG_EDAC_I5000=m -CONFIG_EDAC_I5100=m -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y -CONFIG_RTC_DRV_TEST=m - -# -# I2C RTC drivers -# -CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1374=m -CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_PCF8583=m -CONFIG_RTC_DRV_M41T80=m -CONFIG_RTC_DRV_M41T80_WDT=y -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_FM3130=m -CONFIG_RTC_DRV_RX8581=m -CONFIG_RTC_DRV_RX8025=m - -# -# SPI RTC drivers -# -CONFIG_RTC_DRV_M41T94=m -CONFIG_RTC_DRV_DS1305=m -CONFIG_RTC_DRV_DS1390=m -CONFIG_RTC_DRV_MAX6902=m -CONFIG_RTC_DRV_R9701=m -CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_DS3234=m -CONFIG_RTC_DRV_PCF2123=m - -# -# Platform RTC drivers -# -CONFIG_RTC_DRV_CMOS=y -CONFIG_RTC_DRV_DS1286=m -CONFIG_RTC_DRV_DS1511=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_DS1742=m -CONFIG_RTC_DRV_STK17TA8=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_M48T35=m -CONFIG_RTC_DRV_M48T59=m -CONFIG_RTC_DRV_BQ4802=m -CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WM831X=m -CONFIG_RTC_DRV_WM8350=m -CONFIG_RTC_DRV_PCF50633=m -CONFIG_RTC_DRV_AB3100=m - -# -# on-CPU RTC drivers -# -# CONFIG_RTC_DRV_PCAP is not set -CONFIG_DMADEVICES=y - -# -# DMA Devices -# -CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y -CONFIG_INTEL_IOATDMA=m -CONFIG_DMA_ENGINE=y - -# -# DMA Clients -# -CONFIG_NET_DMA=y -CONFIG_ASYNC_TX_DMA=y -# CONFIG_DMATEST is not set -CONFIG_DCA=m -CONFIG_AUXDISPLAY=y -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -CONFIG_CFAG12864B=m -CONFIG_CFAG12864B_RATE=20 -CONFIG_UIO=m -CONFIG_UIO_CIF=m -CONFIG_UIO_PDRV=m -CONFIG_UIO_PDRV_GENIRQ=m -CONFIG_UIO_SMX=m -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m - -# -# TI VLYNQ -# -CONFIG_STAGING=y -# CONFIG_STAGING_EXCLUDE_BUILD is not set -CONFIG_ET131X=m -# CONFIG_ET131X_DEBUG is not set -CONFIG_SLICOSS=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set -CONFIG_VIDEO_GO7007_OV7640=m -CONFIG_VIDEO_GO7007_SAA7113=m -CONFIG_VIDEO_GO7007_SAA7115=m -CONFIG_VIDEO_GO7007_TW9903=m -CONFIG_VIDEO_GO7007_UDA1342=m -CONFIG_VIDEO_GO7007_SONY_TUNER=m -CONFIG_VIDEO_GO7007_TW2804=m -CONFIG_VIDEO_CX25821=m -CONFIG_VIDEO_CX25821_ALSA=m -CONFIG_USB_IP_COMMON=m -CONFIG_USB_IP_VHCI_HCD=m -CONFIG_USB_IP_HOST=m -CONFIG_W35UND=m -CONFIG_PRISM2_USB=m -CONFIG_ECHO=m -CONFIG_POCH=m -CONFIG_OTUS=m -CONFIG_RT2860=m -CONFIG_RT2870=m -CONFIG_RT3090=m -CONFIG_COMEDI=m -# CONFIG_COMEDI_DEBUG is not set -CONFIG_COMEDI_PCI_DRIVERS=m -CONFIG_COMEDI_PCMCIA_DRIVERS=m -CONFIG_COMEDI_USB_DRIVERS=m -CONFIG_COMEDI_8255=m -CONFIG_ASUS_OLED=m -# CONFIG_PANEL is not set -# CONFIG_ALTERA_PCIE_CHDMA is not set -CONFIG_RTL8187SE=m -CONFIG_RTL8192SU=m -CONFIG_RTL8192E=m -# CONFIG_TRANZPORT is not set - -# -# Android -# - -# -# Qualcomm MSM Camera And Video -# - -# -# Camera Sensor Selection -# -CONFIG_INPUT_GPIO=m -CONFIG_DST=m -# CONFIG_DST_DEBUG is not set -CONFIG_POHMELFS=m -# CONFIG_POHMELFS_DEBUG is not set -CONFIG_POHMELFS_CRYPTO=y -CONFIG_B3DFG=m -CONFIG_IDE_PHISON=m -CONFIG_PLAN9AUTH=m -CONFIG_LINE6_USB=m -# CONFIG_DRM_RADEON_KMS is not set -CONFIG_USB_SERIAL_QUATECH2=m -CONFIG_USB_SERIAL_QUATECH_USB2=m -CONFIG_VT6655=m -CONFIG_VT6656=m -CONFIG_FB_UDL=m -CONFIG_HYPERV=m -CONFIG_HYPERV_STORAGE=m -CONFIG_HYPERV_BLOCK=m -CONFIG_HYPERV_NET=m -# CONFIG_VME_BUS is not set - -# -# RAR Register Driver -# -# CONFIG_RAR_REGISTER is not set -# CONFIG_IIO is not set -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ACERHDF=m -CONFIG_ASUS_LAPTOP=m -CONFIG_DELL_WMI=m -CONFIG_FUJITSU_LAPTOP=m -# CONFIG_FUJITSU_LAPTOP_DEBUG is not set -CONFIG_TC1100_WMI=m -CONFIG_HP_WMI=m -CONFIG_MSI_LAPTOP=m -CONFIG_PANASONIC_LAPTOP=m -CONFIG_COMPAL_LAPTOP=m -CONFIG_SONY_LAPTOP=m -# CONFIG_SONYPI_COMPAT is not set -CONFIG_THINKPAD_ACPI=m -# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set -# CONFIG_THINKPAD_ACPI_DEBUG is not set -# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set -CONFIG_THINKPAD_ACPI_VIDEO=y -CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y -CONFIG_INTEL_MENLOW=m -CONFIG_EEEPC_LAPTOP=m -CONFIG_ACPI_WMI=m -CONFIG_ACPI_ASUS=m -CONFIG_TOPSTAR_LAPTOP=m -CONFIG_ACPI_TOSHIBA=m - -# -# Firmware Drivers -# -CONFIG_EDD=m -# CONFIG_EDD_OFF is not set -CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=m -CONFIG_DELL_RBU=m -CONFIG_DCDBAS=m -CONFIG_DMIID=y -# CONFIG_ISCSI_IBFT_FIND is not set - -# -# File systems -# -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=m -CONFIG_EXT4_FS_XATTR=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=m -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=m -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -CONFIG_REISERFS_PROC_INFO=y -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -CONFIG_JFS_STATISTICS=y -CONFIG_FS_POSIX_ACL=y -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -# CONFIG_XFS_DEBUG is not set -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_DLM=y -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_FS_O2CB=m -CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -CONFIG_OCFS2_FS_STATS=y -# CONFIG_OCFS2_DEBUG_MASKLOG is not set -# CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_OCFS2_FS_POSIX_ACL=y -CONFIG_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -CONFIG_NILFS2_FS=m -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -# CONFIG_AUTOFS_FS is not set -CONFIG_AUTOFS4_FS=m -CONFIG_FUSE_FS=m -CONFIG_CUSE=m -CONFIG_GENERIC_ACL=y - -# -# Caches -# -CONFIG_FSCACHE=m -CONFIG_FSCACHE_STATS=y -CONFIG_FSCACHE_HISTOGRAM=y -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=m -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y -CONFIG_CONFIGFS_FS=m -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ADFS_FS is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -# CONFIG_JFFS2_LZO is not set -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -# CONFIG_VXFS_FS is not set -CONFIG_MINIX_FS=m -CONFIG_OMFS_FS=m -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_SYSV_FS is not set -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set -CONFIG_EXOFS_FS=m -# CONFIG_EXOFS_DEBUG is not set -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -# CONFIG_NFS_V4_1 is not set -CONFIG_NFS_FSCACHE=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set -CONFIG_CIFS=m -CONFIG_CIFS_STATS=y -# CONFIG_CIFS_STATS2 is not set -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_CIFS_UPCALL=y -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_DEBUG2 is not set -CONFIG_CIFS_DFS_UPCALL=y -# CONFIG_CIFS_EXPERIMENTAL is not set -CONFIG_NCP_FS=m -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_NLS=y -# CONFIG_NCPFS_EXTRAS is not set -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -# CONFIG_AFS_DEBUG is not set -CONFIG_AFS_FSCACHE=y -CONFIG_9P_FS=m -CONFIG_9P_FSCACHE=y - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -CONFIG_MAC_PARTITION=y -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -# CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -CONFIG_KARMA_PARTITION=y -CONFIG_EFI_PARTITION=y -# CONFIG_SYSV68_PARTITION is not set -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m -CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_PRINTK_TIME=y -CONFIG_ENABLE_WARN_DEPRECATED=y -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=1024 -CONFIG_MAGIC_SYSRQ=y -CONFIG_STRIP_ASM_SYMS=y -CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_SHIRQ is not set -CONFIG_DETECT_SOFTLOCKUP=y -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -CONFIG_DETECT_HUNG_TASK=y -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -CONFIG_SCHED_DEBUG=y -# CONFIG_SCHEDSTATS is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_RT_MUTEX_TESTER is not set -# CONFIG_DEBUG_SPINLOCK is not set -CONFIG_DEBUG_MUTEXES=y -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -CONFIG_STACKTRACE=y -# CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_HIGHMEM is not set -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_VIRTUAL is not set -# CONFIG_DEBUG_WRITECOUNT is not set -CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_CREDENTIALS is not set -CONFIG_ARCH_WANT_FRAME_POINTERS=y -CONFIG_FRAME_POINTER=y -# CONFIG_BOOT_PRINTK_DELAY is not set -# CONFIG_RCU_TORTURE_TEST is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_DEBUG_PAGEALLOC is not set -CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FTRACE_NMI_ENTER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_TRACER_MAX_TRACE=y -CONFIG_RING_BUFFER=y -CONFIG_FTRACE_NMI_ENTER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y -CONFIG_TRACING=y -CONFIG_GENERIC_TRACER=y -CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_FUNCTION_GRAPH_TRACER=y -# CONFIG_IRQSOFF_TRACER is not set -CONFIG_SYSPROF_TRACER=y -CONFIG_SCHED_TRACER=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_BOOT_TRACER=y -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -CONFIG_POWER_TRACER=y -CONFIG_STACK_TRACER=y -CONFIG_KMEMTRACE=y -CONFIG_WORKQUEUE_TRACER=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_DYNAMIC_FTRACE=y -CONFIG_FUNCTION_PROFILER=y -CONFIG_FTRACE_MCOUNT_RECORD=y -# CONFIG_FTRACE_STARTUP_TEST is not set -CONFIG_MMIOTRACE=y -# CONFIG_MMIOTRACE_TEST is not set -CONFIG_RING_BUFFER_BENCHMARK=m -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -# CONFIG_DYNAMIC_DEBUG is not set -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -CONFIG_HAVE_ARCH_KMEMCHECK=y -CONFIG_STRICT_DEVMEM=y -CONFIG_X86_VERBOSE_BOOTUP=y -CONFIG_EARLY_PRINTK=y -# CONFIG_EARLY_PRINTK_DBGP is not set -# CONFIG_DEBUG_STACKOVERFLOW is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_PER_CPU_MAPS is not set -# CONFIG_X86_PTDUMP is not set -CONFIG_DEBUG_RODATA=y -# CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_NX_TEST is not set -# CONFIG_4KSTACKS is not set -CONFIG_DOUBLEFAULT=y -# CONFIG_IOMMU_STRESS is not set -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -CONFIG_IO_DELAY_TYPE_0X80=0 -CONFIG_IO_DELAY_TYPE_0XED=1 -CONFIG_IO_DELAY_TYPE_UDELAY=2 -CONFIG_IO_DELAY_TYPE_NONE=3 -CONFIG_IO_DELAY_0X80=y -# CONFIG_IO_DELAY_0XED is not set -# CONFIG_IO_DELAY_UDELAY is not set -# CONFIG_IO_DELAY_NONE is not set -CONFIG_DEFAULT_IO_DELAY_TYPE=0 -# CONFIG_DEBUG_BOOT_PARAMS is not set -# CONFIG_CPA_DEBUG is not set -# CONFIG_OPTIMIZE_INLINING is not set - -# -# Security options -# -CONFIG_KEYS=y -# CONFIG_KEYS_DEBUG_PROC_KEYS is not set -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set -CONFIG_SECURITY_PATH=y -CONFIG_SECURITY_FILE_CAPABILITIES=y -# CONFIG_INTEL_TXT is not set -# CONFIG_SECURITY_SELINUX is not set -# CONFIG_SECURITY_SMACK is not set -CONFIG_SECURITY_TOMOYO=y -# CONFIG_IMA is not set -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m -CONFIG_ASYNC_PQ=m -CONFIG_ASYNC_RAID6_RECOV=m -CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y -CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_PCOMP=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_SEQIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m - -# -# Hash modes -# -CONFIG_CRYPTO_HMAC=m -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CRC32C_INTEL=m -CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_AES_586=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_TWOFISH_586=m - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_ZLIB=m -CONFIG_CRYPTO_LZO=m - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_DEV_GEODE=m -CONFIG_CRYPTO_DEV_HIFN_795X=m -CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_APIC_ARCHITECTURE=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -CONFIG_LGUEST=m -CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_BITREVERSE=y -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC_T10DIF=m -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_AUDIT_GENERIC=y -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=m -CONFIG_LZO_DECOMPRESS=m -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_NLATTR=y diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 deleted file mode 100644 index 751f759e6..000000000 --- a/libre/kernel26-libre-lts/config.x86_64 +++ /dev/null @@ -1,4585 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.32 -# Tue Jun 7 08:38:42 2011 -# -CONFIG_64BIT=y -# CONFIG_X86_32 is not set -CONFIG_X86_64=y -CONFIG_X86=y -CONFIG_OUTPUT_FORMAT="elf64-x86-64" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" -CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_MMU=y -CONFIG_ZONE_DMA=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_GPIO=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ZONE_DMA32=y -CONFIG_ARCH_POPULATES_NODE_MAP=y -CONFIG_AUDIT_ARCH=y -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_HAVE_INTEL_TXT=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_USE_GENERIC_SMP_HELPERS=y -CONFIG_X86_64_SMP=y -CONFIG_X86_HT=y -CONFIG_X86_TRAMPOLINE=y -# CONFIG_KTIME_SCALAR is not set -CONFIG_ARCH_CPU_PROBE_RELEASE=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_CONSTRUCTORS=y - -# -# General setup -# -CONFIG_EXPERIMENTAL=y -CONFIG_LOCK_KERNEL=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="-lts" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_TREE=y - -# -# RCU Subsystem -# -CONFIG_TREE_RCU=y -# CONFIG_TREE_PREEMPT_RCU is not set -# CONFIG_RCU_TRACE is not set -CONFIG_RCU_FANOUT=64 -# CONFIG_RCU_FANOUT_EXACT is not set -# CONFIG_TREE_RCU_TRACE is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=19 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_CGROUPS=y -# CONFIG_CGROUP_DEBUG is not set -CONFIG_CGROUP_NS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CPUSETS=y -CONFIG_PROC_PID_CPUSET=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_MEM_RES_CTLR=y -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y -CONFIG_CGROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_MM_OWNER=y -# CONFIG_SYSFS_DEPRECATED_V2 is not set -CONFIG_RELAY=y -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_USER_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -# CONFIG_EMBEDDED is not set -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_HAVE_PERF_EVENTS=y - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=y -CONFIG_EVENT_PROFILE=y -CONFIG_PERF_COUNTERS=y -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_PCI_QUIRKS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_OPROFILE=m -CONFIG_OPROFILE_IBS=y -# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set -CONFIG_HAVE_OPROFILE=y -# CONFIG_KPROBES is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_API_DEBUG=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -CONFIG_SLOW_WORK=y -# CONFIG_SLOW_WORK_DEBUG is not set -# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -CONFIG_SLABINFO=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_STOP_MACHINE=y -CONFIG_BLOCK=y -CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_INTEGRITY is not set -CONFIG_BLOCK_COMPAT=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_AS is not set -CONFIG_DEFAULT_DEADLINE=y -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="deadline" -CONFIG_PREEMPT_NOTIFIERS=y -CONFIG_FREEZER=y - -# -# Processor type and features -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_SMP=y -# CONFIG_SPARSE_IRQ is not set -CONFIG_X86_MPPARSE=y -# CONFIG_X86_EXTENDED_PLATFORM is not set -CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_PARAVIRT_GUEST=y -CONFIG_XEN=y -CONFIG_XEN_MAX_DOMAIN_MEMORY=32 -CONFIG_XEN_SAVE_RESTORE=y -# CONFIG_XEN_DEBUG_FS is not set -CONFIG_KVM_CLOCK=y -CONFIG_KVM_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set -CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set -# CONFIG_MEMTEST is not set -# CONFIG_M386 is not set -# CONFIG_M486 is not set -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set -# CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set -# CONFIG_MATOM is not set -CONFIG_GENERIC_CPU=y -CONFIG_X86_CPU=y -CONFIG_X86_L1_CACHE_BYTES=64 -CONFIG_X86_INTERNODE_CACHE_BYTES=64 -CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=6 -CONFIG_X86_XADD=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_TSC=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_CMOV=y -CONFIG_X86_MINIMUM_CPU_FAMILY=64 -CONFIG_X86_DEBUGCTLMSR=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -# CONFIG_X86_DS is not set -CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_DMI=y -CONFIG_GART_IOMMU=y -CONFIG_CALGARY_IOMMU=y -CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y -CONFIG_AMD_IOMMU=y -# CONFIG_AMD_IOMMU_STATS is not set -CONFIG_SWIOTLB=y -CONFIG_IOMMU_HELPER=y -CONFIG_IOMMU_API=y -# CONFIG_MAXSMP is not set -CONFIG_NR_CPUS=64 -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_MCE=y -CONFIG_X86_MCE_INTEL=y -CONFIG_X86_MCE_AMD=y -CONFIG_X86_MCE_THRESHOLD=y -# CONFIG_X86_MCE_INJECT is not set -CONFIG_X86_THERMAL_VECTOR=y -CONFIG_I8K=m -CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y -CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_X86_MSR=m -CONFIG_X86_CPUID=m -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_DIRECT_GBPAGES=y -CONFIG_NUMA=y -CONFIG_K8_NUMA=y -CONFIG_X86_64_ACPI_NUMA=y -CONFIG_NODES_SPAN_OTHER_NODES=y -# CONFIG_NUMA_EMU is not set -CONFIG_NODES_SHIFT=6 -CONFIG_ARCH_PROC_KCORE_TEXT=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_MEMORY_PROBE=y -CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_FLATMEM_MANUAL is not set -# CONFIG_DISCONTIGMEM_MANUAL is not set -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_NEED_MULTIPLE_NODES=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_EXTREME=y -CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y -CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTPLUG_SPARSE=y -CONFIG_MEMORY_HOTREMOVE=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_MIGRATION=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y -CONFIG_VIRT_TO_BUS=y -CONFIG_HAVE_MLOCK=y -CONFIG_HAVE_MLOCKED_PAGE_BIT=y -CONFIG_MMU_NOTIFIER=y -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y -CONFIG_MEMORY_FAILURE=y -CONFIG_HWPOISON_INJECT=m -CONFIG_X86_CHECK_BIOS_CORRUPTION=y -CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -CONFIG_X86_RESERVE_LOW_64K=y -CONFIG_MTRR=y -CONFIG_MTRR_SANITIZER=y -CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 -CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 -CONFIG_X86_PAT=y -CONFIG_ARCH_USES_PG_UNCACHED=y -CONFIG_EFI=y -CONFIG_SECCOMP=y -CONFIG_CC_STACKPROTECTOR=y -CONFIG_HZ_100=y -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=100 -CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y -# CONFIG_CRASH_DUMP is not set -CONFIG_KEXEC_JUMP=y -CONFIG_PHYSICAL_START=0x1000000 -# CONFIG_RELOCATABLE is not set -CONFIG_PHYSICAL_ALIGN=0x1000000 -CONFIG_HOTPLUG_CPU=y -# CONFIG_COMPAT_VDSO is not set -# CONFIG_CMDLINE_BOOL is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y -CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y - -# -# Power management and ACPI options -# -CONFIG_ARCH_HIBERNATION_HEADER=y -CONFIG_PM=y -CONFIG_PM_DEBUG=y -# CONFIG_PM_VERBOSE is not set -CONFIG_CAN_PM_TRACE=y -# CONFIG_PM_TRACE_RTC is not set -CONFIG_PM_SLEEP_SMP=y -CONFIG_PM_SLEEP=y -CONFIG_SUSPEND=y -# CONFIG_PM_TEST_SUSPEND is not set -CONFIG_SUSPEND_FREEZER=y -CONFIG_HIBERNATION_NVS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_RUNTIME=y -CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_PROCFS=y -CONFIG_ACPI_PROCFS_POWER=y -CONFIG_ACPI_POWER_METER=m -CONFIG_ACPI_SYSFS_POWER=y -CONFIG_ACPI_PROC_EVENT=y -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m -CONFIG_ACPI_DOCK=y -CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m -CONFIG_ACPI_NUMA=y -# CONFIG_ACPI_CUSTOM_DSDT is not set -CONFIG_ACPI_BLACKLIST_YEAR=0 -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=m -CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=m -CONFIG_ACPI_HOTPLUG_MEMORY=m -CONFIG_ACPI_SBS=m -CONFIG_SFI=y - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=m -# CONFIG_CPU_FREQ_DEBUG is not set -CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - -# -# CPUFreq processor drivers -# -CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_POWERNOW_K8=m -# CONFIG_X86_SPEEDSTEP_CENTRINO is not set -CONFIG_X86_P4_CLOCKMOD=m - -# -# shared options -# -CONFIG_X86_SPEEDSTEP_LIB=m -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y - -# -# Memory power savings -# -CONFIG_I7300_IDLE_IOAT_CHANNEL=y -CONFIG_I7300_IDLE=m - -# -# Bus options (PCI etc.) -# -CONFIG_PCI=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y -CONFIG_PCI_DOMAINS=y -CONFIG_DMAR=y -# CONFIG_DMAR_DEFAULT_ON is not set -CONFIG_DMAR_FLOPPY_WA=y -# CONFIG_INTR_REMAP is not set -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=m -CONFIG_PCIEAER=y -# CONFIG_PCIE_ECRC is not set -# CONFIG_PCIEAER_INJECT is not set -CONFIG_PCIEASPM=y -# CONFIG_PCIEASPM_DEBUG is not set -CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_PCI_MSI=y -CONFIG_PCI_LEGACY=y -# CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m -CONFIG_HT_IRQ=y -CONFIG_PCI_IOV=y -CONFIG_ISA_DMA_API=y -CONFIG_K8_NB=y -CONFIG_PCCARD=m -# CONFIG_PCMCIA_DEBUG is not set -CONFIG_PCMCIA=m -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y -CONFIG_CARDBUS=y - -# -# PC-card bridges -# -CONFIG_YENTA=m -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_TOSHIBA=y -CONFIG_PD6729=m -CONFIG_I82092=m -CONFIG_PCCARD_NONSTATIC=m -CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m -CONFIG_HOTPLUG_PCI_ACPI=m -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -CONFIG_HOTPLUG_PCI_CPCI=y -CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m -CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -CONFIG_HOTPLUG_PCI_SHPC=m - -# -# Executable file formats / Emulations -# -CONFIG_BINFMT_ELF=y -CONFIG_COMPAT_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -# CONFIG_HAVE_AOUT is not set -CONFIG_BINFMT_MISC=y -CONFIG_IA32_EMULATION=y -CONFIG_IA32_AOUT=m -CONFIG_COMPAT=y -CONFIG_COMPAT_FOR_U64_ALIGNMENT=y -CONFIG_SYSVIPC_COMPAT=y -CONFIG_NET=y -CONFIG_COMPAT_NETLINK_MESSAGES=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=m -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -# CONFIG_NET_KEY_MIGRATE is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_ASK_IP_FIB_HASH=y -# CONFIG_IP_FIB_TRIE is not set -CONFIG_IP_FIB_HASH=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -# CONFIG_NET_IPGRE_BROADCAST is not set -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_LRO=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=y -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -# CONFIG_DEFAULT_BIC is not set -CONFIG_DEFAULT_CUBIC=y -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_WESTWOOD is not set -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=m -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -# CONFIG_IPV6_MROUTE is not set -CONFIG_NETLABEL=y -CONFIG_NETWORK_SECMARK=y -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CT_ACCT=y -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=m -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NETFILTER_TPROXY=m -CONFIG_NETFILTER_XTABLES=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_NETFILTER_XT_TARGET_RATEEST=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TRACE=m -CONFIG_NETFILTER_XT_TARGET_SECMARK=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_HL=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_NETFILTER_XT_MATCH_OSF=m -CONFIG_IP_VS=m -# CONFIG_IP_VS_IPV6 is not set -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_AH_ESP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_CONNTRACK_PROC_COMPAT=y -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_SECURITY=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IP6_NF_SECURITY=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m -CONFIG_BRIDGE_EBT_NFLOG=m -CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m - -# -# DCCP CCIDs Configuration (EXPERIMENTAL) -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -CONFIG_IP_DCCP_CCID3=y -# CONFIG_IP_DCCP_CCID3_DEBUG is not set -CONFIG_IP_DCCP_CCID3_RTO=100 -CONFIG_IP_DCCP_TFRC_LIB=y - -# -# DCCP Kernel Hacking -# -# CONFIG_IP_DCCP_DEBUG is not set -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_MSG is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -CONFIG_SCTP_HMAC_SHA1=y -# CONFIG_SCTP_HMAC_MD5 is not set -# CONFIG_RDS is not set -# CONFIG_TIPC is not set -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_STP=m -CONFIG_BRIDGE=m -# CONFIG_NET_DSA is not set -CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set -# CONFIG_DECNET is not set -CONFIG_LLC=m -CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -CONFIG_PHONET=m -CONFIG_IEEE802154=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_MULTIQ=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_INGRESS=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_CLS_CGROUP=y -# CONFIG_NET_EMATCH is not set -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_NAT=m -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_ACT_SKBEDIT=m -CONFIG_NET_CLS_IND=y -CONFIG_NET_SCH_FIFO=y -# CONFIG_DCB is not set - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=y -# CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m -CONFIG_KINGSUN_DONGLE=m -CONFIG_KSDAZZLE_DONGLE=m -CONFIG_KS959_DONGLE=m - -# -# FIR device drivers -# -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m -CONFIG_MCS_FIR=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -# CONFIG_BT_BNEP_MC_FILTER is not set -# CONFIG_BT_BNEP_PROTO_FILTER is not set -# CONFIG_BT_CMTP is not set -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=m -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_CFG80211=m -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_CFG80211_DEFAULT_PS=y -CONFIG_CFG80211_DEFAULT_PS_VALUE=1 -# CONFIG_CFG80211_DEBUGFS is not set -# CONFIG_WIRELESS_OLD_REGULATORY is not set -CONFIG_WIRELESS_EXT=y -CONFIG_WIRELESS_EXT_SYSFS=y -CONFIG_LIB80211=m -CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIB80211_CRYPT_CCMP=m -CONFIG_LIB80211_CRYPT_TKIP=m -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=m -CONFIG_MAC80211_HAS_RC=y -CONFIG_MAC80211_RC_MINSTREL=y -# CONFIG_MAC80211_RC_DEFAULT_PID is not set -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=m -CONFIG_RFKILL_LEDS=y -CONFIG_RFKILL_INPUT=y -CONFIG_NET_9P=m -CONFIG_NET_9P_VIRTIO=m -# CONFIG_NET_9P_DEBUG is not set - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER_PATH="" -CONFIG_DEVTMPFS=y -# CONFIG_DEVTMPFS_MOUNT is not set -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -CONFIG_SYS_HYPERVISOR=y -CONFIG_CONNECTOR=m -CONFIG_MTD=m -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_TESTS=m -# CONFIG_MTD_CONCAT is not set -CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_AR7_PARTS is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -# CONFIG_MTD_BLOCK_RO is not set -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -# CONFIG_MTD_OOPS is not set - -# -# RAM/ROM/Flash chip drivers -# -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_RAM=m -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_TS5500 is not set -# CONFIG_MTD_INTEL_VR_NOR is not set -CONFIG_MTD_PLATRAM=m - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -CONFIG_MTD_SST25L=m -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set -# CONFIG_MTD_NAND is not set -# CONFIG_MTD_ONENAND is not set - -# -# LPDDR flash memory drivers -# -# CONFIG_MTD_LPDDR is not set - -# -# UBI - Unsorted block images -# -# CONFIG_MTD_UBI is not set -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y -CONFIG_PARPORT_PC_PCMCIA=m -# CONFIG_PARPORT_GSC is not set -CONFIG_PARPORT_AX88796=m -CONFIG_PARPORT_1284=y -CONFIG_PARPORT_NOT_PC=y -CONFIG_PNP=y -# CONFIG_PNP_DEBUG_MESSAGES is not set - -# -# Protocols -# -CONFIG_PNPACPI=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_FD=m -# CONFIG_PARIDE is not set -CONFIG_BLK_CPQ_DA=m -CONFIG_BLK_CPQ_CISS_DA=m -# CONFIG_CISS_SCSI_TAPE is not set -CONFIG_BLK_DEV_DAC960=m -# CONFIG_BLK_DEV_UMEM is not set -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_OSD=m -CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=m -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_BLK_DEV_XIP is not set -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=m -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_VIRTIO_BLK=m -# CONFIG_BLK_DEV_HD is not set -CONFIG_MISC_DEVICES=y -# CONFIG_IBM_ASM is not set -CONFIG_PHANTOM=m -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -CONFIG_ENCLOSURE_SERVICES=m -CONFIG_HP_ILO=m -CONFIG_DELL_LAPTOP=m -CONFIG_ISL29003=m -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set -CONFIG_CB710_DEBUG_ASSUMPTIONS=y -CONFIG_HAVE_IDE=y -CONFIG_IDE=m - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEACPI=y -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_PLATFORM=m -CONFIG_BLK_DEV_CMD640=m -# CONFIG_BLK_DEV_CMD640_ENHANCED is not set -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m -CONFIG_BLK_DEV_IDEDMA=y - -# -# SCSI device support -# -CONFIG_RAID_ATTRS=m -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -CONFIG_SCSI_TGT=m -CONFIG_SCSI_NETLINK=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_ENCLOSURE=m -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_FC_TGT_ATTRS is not set -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_SAS_HOST_SMP=y -# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_SRP_TGT_ATTRS=y -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m -CONFIG_BE2ISCSI=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=m -CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_DEBUG_ENABLE is not set -CONFIG_AIC7XXX_DEBUG_MASK=0 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -# CONFIG_SCSI_AIC7XXX_OLD is not set -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=32 -CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_DEBUG_ENABLE is not set -CONFIG_AIC79XX_DEBUG_MASK=0 -CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC94XX=m -# CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_MVSAS=m -# CONFIG_SCSI_MVSAS_DEBUG is not set -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_ARCMSR=m -CONFIG_SCSI_ARCMSR_AER=y -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=m -CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_MPT2SAS=m -CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -# CONFIG_SCSI_MPT2SAS_LOGGING is not set -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_BUSLOGIC=m -CONFIG_LIBFC=m -CONFIG_LIBFCOE=m -CONFIG_FCOE=m -CONFIG_FCOE_FNIC=m -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_EATA=m -# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set -# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set -CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=m -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_IPS=m -CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_STEX=m -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -CONFIG_SCSI_IPR=m -# CONFIG_SCSI_IPR_TRACE is not set -# CONFIG_SCSI_IPR_DUMP is not set -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA_FC=m -CONFIG_SCSI_QLA_ISCSI=m -CONFIG_SCSI_LPFC=m -# CONFIG_SCSI_LPFC_DEBUG_FS is not set -CONFIG_SCSI_DC395x=m -CONFIG_SCSI_DC390T=m -# CONFIG_SCSI_DEBUG is not set -CONFIG_SCSI_PMCRAID=m -CONFIG_SCSI_SRP=m -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_LOWLEVEL_PCMCIA=y -CONFIG_PCMCIA_FDOMAIN=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m -CONFIG_SCSI_DH=m -CONFIG_SCSI_DH_RDAC=m -CONFIG_SCSI_DH_HP_SW=m -CONFIG_SCSI_DH_EMC=m -CONFIG_SCSI_DH_ALUA=m -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m -CONFIG_SCSI_OSD_DPRINT_SENSE=0 -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=m -# CONFIG_ATA_NONSTANDARD is not set -CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_ATA_ACPI=y -CONFIG_SATA_PMP=y -CONFIG_SATA_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y -CONFIG_SATA_SVW=m -CONFIG_ATA_PIIX=m -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_SX4=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m -CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATP867X=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_CMD640_PCI=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -CONFIG_PATA_CYPRESS=m -CONFIG_PATA_EFAR=m -CONFIG_ATA_GENERIC=m -CONFIG_PATA_HPT366=m -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=m -CONFIG_PATA_HPT3X3=m -# CONFIG_PATA_HPT3X3_DMA is not set -CONFIG_PATA_IT821X=m -CONFIG_PATA_IT8213=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_MARVELL=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NINJA32=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_NS87415=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_OPTIDMA=m -CONFIG_PATA_PCMCIA=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_RADISYS=m -CONFIG_PATA_RDC=m -CONFIG_PATA_RZ1000=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m -CONFIG_PATA_SCH=m -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -# CONFIG_MULTICORE_RAID456 is not set -CONFIG_MD_RAID6_PQ=m -CONFIG_ASYNC_RAID6_TEST=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_MIRROR=m -CONFIG_DM_LOG_USERSPACE=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_QL=m -CONFIG_DM_MULTIPATH_ST=m -CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -# CONFIG_FUSION_LOGGING is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# You can enable one or both FireWire driver stacks. -# - -# -# See the help texts for more information. -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_OHCI_DEBUG=y -CONFIG_FIREWIRE_SBP2=m -CONFIG_FIREWIRE_NET=m -# CONFIG_IEEE1394 is not set -CONFIG_I2O=m -CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y -CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_EXT_ADAPTEC_DMA64=y -CONFIG_I2O_CONFIG=m -CONFIG_I2O_CONFIG_OLD_IOCTL=y -CONFIG_I2O_BUS=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m -CONFIG_MACINTOSH_DRIVERS=y -CONFIG_MAC_EMUMOUSEBTN=y -CONFIG_NETDEVICES=y -CONFIG_IFB=m -CONFIG_DUMMY=m -CONFIG_BONDING=m -CONFIG_MACVLAN=m -CONFIG_EQUALIZER=m -CONFIG_TUN=m -CONFIG_VETH=m -CONFIG_NET_SB1000=m -# CONFIG_ARCNET is not set -CONFIG_PHYLIB=m - -# -# MII PHY device drivers -# -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_PHY=m -CONFIG_ICPLUS_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_STE10XP=m -CONFIG_LSI_ET1011C_PHY=m -# CONFIG_MDIO_BITBANG is not set -CONFIG_NET_ETHERNET=y -CONFIG_MII=m -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_ENC28J60=m -# CONFIG_ENC28J60_WRITEVERIFY is not set -CONFIG_ETHOC=m -CONFIG_DNET=m -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_DE2104X_DSL=0 -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_PCMCIA_XIRCOM=m -CONFIG_HP100=m -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -CONFIG_NET_PCI=y -CONFIG_PCNET32=m -CONFIG_AMD8111_ETH=m -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y -CONFIG_FORCEDETH=m -# CONFIG_FORCEDETH_NAPI is not set -CONFIG_E100=m -CONFIG_FEALNX=m -CONFIG_NATSEMI=m -CONFIG_NE2K_PCI=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -CONFIG_8139TOO_TUNE_TWISTER=y -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_R6040=m -CONFIG_SIS900=m -CONFIG_EPIC100=m -CONFIG_SMSC9420=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_TLAN=m -CONFIG_KS8842=m -CONFIG_KS8851=m -CONFIG_KS8851_MLL=m -CONFIG_VIA_RHINE=m -# CONFIG_VIA_RHINE_MMIO is not set -CONFIG_SC92031=m -CONFIG_NET_POCKET=y -CONFIG_ATP=m -CONFIG_DE600=m -CONFIG_DE620=m -CONFIG_ATL2=m -CONFIG_NETDEV_1000=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_IP1000=m -CONFIG_IGB=m -CONFIG_IGB_DCA=y -CONFIG_IGBVF=m -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -# CONFIG_R8169_VLAN is not set -CONFIG_SIS190=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_QLA3XXX=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_JME=m -CONFIG_NETDEV_10000=y -CONFIG_MDIO=m -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3_DEPENDS=y -CONFIG_CHELSIO_T3=m -CONFIG_ENIC=m -CONFIG_IXGBE=m -CONFIG_IXGBE_DCA=y -CONFIG_IXGB=m -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y -CONFIG_NETXEN_NIC=m -CONFIG_NIU=m -CONFIG_MLX4_EN=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_TEHUTI=m -CONFIG_BNX2X=m -CONFIG_QLGE=m -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_BE2NET=m -# CONFIG_TR is not set -CONFIG_WLAN=y -# CONFIG_WLAN_PRE80211 is not set -CONFIG_WLAN_80211=y -CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_SPI=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM=m -CONFIG_LIBERTAS_THINFIRM_USB=m -CONFIG_AIRO=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_AT76C50X_USB=m -CONFIG_AIRO_CS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_PRISM54=m -CONFIG_USB_ZD1201=m -CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_ADM8211=m -# CONFIG_MAC80211_HWSIM is not set -CONFIG_MWL8K=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_SPI=m -CONFIG_P54_LEDS=y -CONFIG_ATH_COMMON=m -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -CONFIG_ATH9K=m -# CONFIG_ATH9K_DEBUG is not set -CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y -CONFIG_IPW2200_QOS=y -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -CONFIG_IWLWIFI_LEDS=y -CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y -CONFIG_IWL3945=m -CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_B43=m -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_SDIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -# CONFIG_B43LEGACY_DEBUG is not set -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_HT=y -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_HERMES=m -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_WL12XX=m -CONFIG_WL1251=m -CONFIG_WL1251_SPI=m -CONFIG_WL1251_SDIO=m -CONFIG_WL1271=m -CONFIG_IWM=m -# CONFIG_IWM_DEBUG is not set - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_SDIO=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_PCMCIA_PCNET=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_PCMCIA_AXNET=m -# CONFIG_WAN is not set -CONFIG_ATM_DRIVERS=y -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E=m -# CONFIG_ATM_FORE200E_USE_TASKLET is not set -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_HE=m -# CONFIG_ATM_HE_USE_SUNI is not set -CONFIG_ATM_SOLOS=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_XEN_NETDEV_FRONTEND=m -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_PPPOATM=m -CONFIG_PPPOL2TP=m -CONFIG_SLIP=m -# CONFIG_SLIP_COMPRESSED is not set -CONFIG_SLHC=m -# CONFIG_SLIP_SMART is not set -# CONFIG_SLIP_MODE_SLIP6 is not set -# CONFIG_NET_FC is not set -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_VIRTIO_NET=m -CONFIG_VMXNET3=m -CONFIG_ISDN=y -CONFIG_ISDN_I4L=m -CONFIG_MISDN=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_L1OIP=m - -# -# mISDN hardware drivers -# -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_W6692=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_IPAC=m -CONFIG_MISDN_ISAR=m -CONFIG_ISDN_PPP=y -CONFIG_ISDN_PPP_VJ=y -CONFIG_ISDN_MPP=y -CONFIG_IPPP_FILTER=y -CONFIG_ISDN_PPP_BSDCOMP=m -CONFIG_ISDN_AUDIO=y -CONFIG_ISDN_TTY_FAX=y - -# -# ISDN feature submodules -# -CONFIG_ISDN_DIVERSION=m - -# -# ISDN4Linux hardware drivers -# - -# -# Passive cards -# -CONFIG_ISDN_DRV_HISAX=m - -# -# D-channel protocol features -# -CONFIG_HISAX_EURO=y -CONFIG_DE_AOC=y -# CONFIG_HISAX_NO_SENDCOMPLETE is not set -# CONFIG_HISAX_NO_LLC is not set -# CONFIG_HISAX_NO_KEYPAD is not set -CONFIG_HISAX_1TR6=y -CONFIG_HISAX_NI1=y -CONFIG_HISAX_MAX_CARDS=8 - -# -# HiSax supported cards -# -CONFIG_HISAX_16_3=y -CONFIG_HISAX_TELESPCI=y -CONFIG_HISAX_S0BOX=y -CONFIG_HISAX_FRITZPCI=y -CONFIG_HISAX_AVM_A1_PCMCIA=y -CONFIG_HISAX_ELSA=y -CONFIG_HISAX_DIEHLDIVA=y -CONFIG_HISAX_SEDLBAUER=y -CONFIG_HISAX_NETJET=y -CONFIG_HISAX_NETJET_U=y -CONFIG_HISAX_NICCY=y -CONFIG_HISAX_BKM_A4T=y -CONFIG_HISAX_SCT_QUADRO=y -CONFIG_HISAX_GAZEL=y -CONFIG_HISAX_HFC_PCI=y -CONFIG_HISAX_W6692=y -CONFIG_HISAX_HFC_SX=y -CONFIG_HISAX_ENTERNOW_PCI=y -# CONFIG_HISAX_DEBUG is not set - -# -# HiSax PCMCIA card service modules -# -CONFIG_HISAX_SEDLBAUER_CS=m -CONFIG_HISAX_ELSA_CS=m -CONFIG_HISAX_AVM_A1_CS=m -CONFIG_HISAX_TELES_CS=m - -# -# HiSax sub driver modules -# -CONFIG_HISAX_ST5481=m -CONFIG_HISAX_HFCUSB=m -CONFIG_HISAX_HFC4S8S=m -CONFIG_HISAX_FRITZ_PCIPNP=m - -# -# Active cards -# -CONFIG_HYSDN=m -CONFIG_HYSDN_CAPI=y -CONFIG_ISDN_HDLC=m -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -CONFIG_CAPI_TRACE=y -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m -CONFIG_ISDN_CAPI_CAPIDRV=m - -# -# CAPI hardware drivers -# -CONFIG_CAPI_AVM=y -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_CAPI_EICON=y -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_M105=m -CONFIG_GIGASET_M101=m -# CONFIG_GIGASET_DEBUG is not set -# CONFIG_PHONE is not set - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_EVBUG is not set -CONFIG_XEN_KBDDEV_FRONTEND=m - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ATKBD=y -CONFIG_QT2160=m -# CONFIG_KEYBOARD_LKKBD is not set -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_MATRIX=m -# CONFIG_KEYBOARD_LM8323 is not set -# CONFIG_KEYBOARD_MAX7359 is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_OPENCORES is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_LIFEBOOK=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -CONFIG_MOUSE_PS2_ELANTECH=y -CONFIG_MOUSE_PS2_SENTELIC=y -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -CONFIG_MOUSE_SERIAL=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_VSXXXAA=m -CONFIG_MOUSE_GPIO=m -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_ZHENHUA=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_JOYSTICK_XPAD=m -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y -CONFIG_JOYSTICK_WALKERA0701=m -CONFIG_INPUT_TABLET=y -CONFIG_TABLET_USB_ACECAD=m -CONFIG_TABLET_USB_AIPTEK=m -CONFIG_TABLET_USB_GTCO=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_WACOM=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -CONFIG_TOUCHSCREEN_MCS5000=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_UCB1400=m -CONFIG_TOUCHSCREEN_WM97XX=m -CONFIG_TOUCHSCREEN_WM9705=y -CONFIG_TOUCHSCREEN_WM9712=y -CONFIG_TOUCHSCREEN_WM9713=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_USB_EGALAX=y -CONFIG_TOUCHSCREEN_USB_PANJIT=y -CONFIG_TOUCHSCREEN_USB_3M=y -CONFIG_TOUCHSCREEN_USB_ITM=y -CONFIG_TOUCHSCREEN_USB_ETURBO=y -CONFIG_TOUCHSCREEN_USB_GUNZE=y -CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y -CONFIG_TOUCHSCREEN_USB_IRTOUCH=y -CONFIG_TOUCHSCREEN_USB_IDEALTEK=y -CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y -CONFIG_TOUCHSCREEN_USB_GOTOP=y -CONFIG_TOUCHSCREEN_USB_JASTEC=y -CONFIG_TOUCHSCREEN_USB_E2I=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC2007=m -CONFIG_TOUCHSCREEN_PCAP=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_APANEL=m -CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_WINBOND_CIR=m -CONFIG_INPUT_PCF50633_PMU=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_WM831X_ON=m -# CONFIG_INPUT_PCAP is not set - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_CT82C710=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_COMPUTONE is not set -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -# CONFIG_DIGIEPCA is not set -# CONFIG_MOXA_INTELLIO is not set -# CONFIG_MOXA_SMARTIO is not set -# CONFIG_ISI is not set -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -# CONFIG_SYNCLINK_GT is not set -CONFIG_N_HDLC=m -# CONFIG_RISCOM8 is not set -# CONFIG_SPECIALIX is not set -# CONFIG_STALDRV is not set -CONFIG_NOZOMI=m - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_JSM=m -CONFIG_UNIX98_PTYS=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_PRINTER=m -# CONFIG_LP_CONSOLE is not set -CONFIG_PPDEV=m -CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_XEN=y -CONFIG_VIRTIO_CONSOLE=m -CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_INTEL=m -CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_NVRAM=m -CONFIG_R3964=m -CONFIG_APPLICOM=m - -# -# PCMCIA character devices -# -CONFIG_SYNCLINK_CS=m -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m -CONFIG_IPWIRELESS=m -CONFIG_MWAVE=m -CONFIG_PC8736x_GPIO=m -CONFIG_NSC_GPIO=m -# CONFIG_RAW_DRIVER is not set -CONFIG_HPET=y -CONFIG_HPET_MMAP=y -CONFIG_HANGCHECK_TIMER=m -CONFIG_TCG_TPM=m -CONFIG_TCG_TIS=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TELCLOCK=m -CONFIG_DEVPORT=y -CONFIG_I2C=m -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD756_S4882=m -CONFIG_I2C_AMD8111=m -CONFIG_I2C_I801=m -CONFIG_I2C_ISCH=m -CONFIG_I2C_PIIX4=m -CONFIG_I2C_NFORCE2=m -CONFIG_I2C_NFORCE2_S4985=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m - -# -# ACPI drivers -# -CONFIG_I2C_SCMI=m - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_GPIO=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_SIMTEC=m - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m - -# -# Graphics adapter I2C/DDC channel drivers -# -# CONFIG_I2C_VOODOO3 is not set - -# -# Other I2C/SMBus bus drivers -# -CONFIG_I2C_PCA_PLATFORM=m -# CONFIG_I2C_STUB is not set - -# -# Miscellaneous I2C Chip support -# -CONFIG_DS1682=m -CONFIG_SENSORS_TSL2550=m -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m - -# -# SPI Protocol Masters -# -CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m - -# -# PPS support -# -CONFIG_PPS=m -# CONFIG_PPS_DEBUG is not set -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIOLIB=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y - -# -# Memory mapped GPIO expanders: -# - -# -# I2C GPIO expanders: -# -CONFIG_GPIO_MAX732X=m -CONFIG_GPIO_PCA953X=m -CONFIG_GPIO_PCF857X=m -CONFIG_GPIO_WM831X=m - -# -# PCI GPIO expanders: -# -CONFIG_GPIO_LANGWELL=y - -# -# SPI GPIO expanders: -# -CONFIG_GPIO_MAX7301=m -CONFIG_GPIO_MCP23S08=m -CONFIG_GPIO_MC33880=m - -# -# AC97 GPIO expanders: -# -CONFIG_GPIO_UCB1400=y -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_MASTER_GPIO=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set -CONFIG_W1_SLAVE_DS2760=m -CONFIG_W1_SLAVE_BQ27000=m -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -CONFIG_PDA_POWER=m -CONFIG_WM831X_POWER=m -CONFIG_WM8350_POWER=m -CONFIG_BATTERY_DS2760=m -CONFIG_BATTERY_DS2782=m -CONFIG_BATTERY_BQ27x00=m -CONFIG_BATTERY_MAX17040=m -CONFIG_CHARGER_PCF50633=m -CONFIG_HWMON=y -CONFIG_HWMON_VID=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Native drivers -# -CONFIG_SENSORS_ABITUGURU=m -CONFIG_SENSORS_ABITUGURU3=m -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -CONFIG_SENSORS_ADCXX=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7473=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_K8TEMP=m -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_I5K_AMB=m -CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_F71882FG=m -CONFIG_SENSORS_F75375S=m -CONFIG_SENSORS_FSCHMD=m -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_CORETEMP=m -CONFIG_SENSORS_IBMAEM=m -CONFIG_SENSORS_IBMPEX=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_LM93=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_MAX1111=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_SHT15=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47M192=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_TMP401=m -CONFIG_SENSORS_TMP421=m -CONFIG_SENSORS_VIA686A=m -CONFIG_SENSORS_VT1211=m -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83L786NG=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_WM831X=m -CONFIG_SENSORS_WM8350=m -CONFIG_SENSORS_HDAPS=m -CONFIG_SENSORS_APPLESMC=m - -# -# ACPI drivers -# -CONFIG_SENSORS_ATK0110=m -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_THERMAL=y -CONFIG_THERMAL_HWMON=y -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_WM831X_WATCHDOG=m -CONFIG_WM8350_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_SC520_WDT=m -CONFIG_SBC_FITPC2_WATCHDOG=m -CONFIG_EUROTECH_WDT=m -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m -CONFIG_WAFER_WDT=m -CONFIG_I6300ESB_WDT=m -CONFIG_ITCO_WDT=m -CONFIG_ITCO_VENDOR_SUPPORT=y -CONFIG_IT8712F_WDT=m -CONFIG_IT87_WDT=m -CONFIG_HP_WATCHDOG=m -CONFIG_SC1200_WDT=m -CONFIG_PC87413_WDT=m -CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m -CONFIG_CPU5_WDT=m -CONFIG_SMSC_SCH311X_WDT=m -CONFIG_SMSC37B787_WDT=m -CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m -CONFIG_W83877F_WDT=m -CONFIG_W83977F_WDT=m -CONFIG_MACHZ_WDT=m -CONFIG_SBC_EPX_C3_WATCHDOG=m - -# -# PCI-based Watchdog Cards -# -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m - -# -# USB-based Watchdog Cards -# -CONFIG_USBPCWATCHDOG=m -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -CONFIG_SSB=m -CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_PCMCIAHOST_POSSIBLE=y -CONFIG_SSB_PCMCIAHOST=y -CONFIG_SSB_SDIOHOST_POSSIBLE=y -CONFIG_SSB_SDIOHOST=y -# CONFIG_SSB_DEBUG is not set -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y -CONFIG_SSB_DRIVER_PCICORE=y - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=m -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y -CONFIG_HTC_PASIC3=m -CONFIG_UCB1400_CORE=m -CONFIG_TPS65010=m -# CONFIG_MFD_TMIO is not set -CONFIG_MFD_WM8400=m -CONFIG_MFD_WM831X=m -CONFIG_MFD_WM8350=m -CONFIG_MFD_WM8350_I2C=m -CONFIG_MFD_PCF50633=m -CONFIG_MFD_MC13783=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_AB3100_CORE=m -CONFIG_AB3100_OTP=m -CONFIG_EZX_PCAP=y -# CONFIG_REGULATOR is not set -CONFIG_MEDIA_SUPPORT=m - -# -# Multimedia core support -# -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m -CONFIG_VIDEO_ALLOW_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_DVB_CORE=m -CONFIG_VIDEO_MEDIA=m - -# -# Multimedia drivers -# -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEO_V4L1=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders/decoders and other helper chips -# - -# -# Audio decoders -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TDA9875=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_ADV7343=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m -CONFIG_VIDEO_VIVI=m -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_W9966=m -CONFIG_VIDEO_CPIA=m -CONFIG_VIDEO_CPIA_PP=m -CONFIG_VIDEO_CPIA_USB=m -CONFIG_VIDEO_CPIA2=m -CONFIG_VIDEO_SAA5246A=m -CONFIG_VIDEO_SAA5249=m -CONFIG_VIDEO_STRADIS=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX23885=m -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_MT9M001=m -CONFIG_SOC_CAMERA_MT9M111=m -CONFIG_SOC_CAMERA_MT9T031=m -CONFIG_SOC_CAMERA_MT9V022=m -CONFIG_SOC_CAMERA_TW9910=m -CONFIG_SOC_CAMERA_PLATFORM=m -CONFIG_SOC_CAMERA_OV772X=m -CONFIG_V4L_USB_DRIVERS=y -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SN9C20X=m -CONFIG_USB_GSPCA_SN9C20X_EVDEV=y -CONFIG_USB_GSPCA_SONIXB=m -CONFIG_USB_GSPCA_SONIXJ=m -CONFIG_USB_GSPCA_SPCA500=m -CONFIG_USB_GSPCA_SPCA501=m -CONFIG_USB_GSPCA_SPCA505=m -CONFIG_USB_GSPCA_SPCA506=m -CONFIG_USB_GSPCA_SPCA508=m -CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_PVRUSB2_SYSFS=y -CONFIG_VIDEO_PVRUSB2_DVB=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m -CONFIG_USB_IBMCAM=m -CONFIG_USB_KONICAWC=m -CONFIG_USB_QUICKCAM_MESSENGER=m -CONFIG_USB_ET61X251=m -CONFIG_VIDEO_OVCAMCHIP=m -CONFIG_USB_W9968CF=m -CONFIG_USB_OV511=m -CONFIG_USB_SE401=m -CONFIG_USB_SN9C102=m -CONFIG_USB_STV680=m -CONFIG_USB_ZC0301=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_GEMTEK_PCI=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_MAESTRO=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI4713=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_SI470X=y -CONFIG_USB_SI470X=m -CONFIG_I2C_SI470X=m -CONFIG_USB_MR800=m -CONFIG_RADIO_TEA5764=m -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y - -# -# Supported SAA7146 based PCI Adapters -# -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m - -# -# Supported USB Adapters -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m - -# -# Siano module components -# -CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m - -# -# Supported FlexCopII (B2C2) Adapters -# -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set - -# -# Supported BT878 Adapters -# -CONFIG_DVB_BT8XX=m - -# -# Supported Pluto2 Adapters -# -CONFIG_DVB_PLUTO2=m - -# -# Supported SDMC DM1105 Adapters -# -CONFIG_DVB_DM1105=m - -# -# Supported Earthsoft PT1 Adapters -# -CONFIG_DVB_PT1=m - -# -# Supported DVB Frontends -# -# CONFIG_DVB_FE_CUSTOMISE is not set -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_STV090x=m -CONFIG_DVB_STV6110x=m -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m -CONFIG_DVB_STB6000=m -CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m -CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_SI21XX=m -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_LGDT3305=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_S5H1411=m -CONFIG_DVB_DIB8000=m -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_ISL6423=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DAB=y -CONFIG_USB_DABUSB=m - -# -# Graphics support -# -CONFIG_AGP=y -CONFIG_AGP_AMD64=y -CONFIG_AGP_INTEL=m -CONFIG_AGP_SIS=m -CONFIG_AGP_VIA=m -CONFIG_VGA_ARB=y -CONFIG_DRM=m -CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_TTM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_I810=m -CONFIG_DRM_I830=m -CONFIG_DRM_I915=m -CONFIG_DRM_I915_KMS=y -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_DDC=m -CONFIG_FB_BOOT_VESA_SUPPORT=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SVGALIB=m -# CONFIG_FB_MACMODES is not set -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -CONFIG_FB_PM2_FIFO_DISCONNECT=y -CONFIG_FB_CYBER2000=m -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -# CONFIG_FB_VGA16 is not set -CONFIG_FB_UVESA=m -CONFIG_FB_VESA=y -CONFIG_FB_EFI=y -# CONFIG_FB_N411 is not set -# CONFIG_FB_HGA is not set -# CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m -# CONFIG_FB_MATROX is not set -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y -CONFIG_FB_S3=m -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -CONFIG_FB_SAVAGE_ACCEL=y -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_VIA=m -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -CONFIG_FB_3DFX_ACCEL=y -CONFIG_FB_3DFX_I2C=y -CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_TRIDENT=m -# CONFIG_FB_ARK is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_CARMINE is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_TMIO is not set -# CONFIG_FB_SM501 is not set -# CONFIG_FB_VIRTUAL is not set -CONFIG_XEN_FBDEV_FRONTEND=m -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX is not set -# CONFIG_FB_BROADSHEET is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_LMS283GF05=m -CONFIG_LCD_LTV350QV=m -CONFIG_LCD_ILI9320=m -CONFIG_LCD_TDO24M=m -CONFIG_LCD_VGG2432A4=m -CONFIG_LCD_PLATFORM=m -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=m -CONFIG_BACKLIGHT_PROGEAR=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m -CONFIG_BACKLIGHT_MBP_NVIDIA=m -CONFIG_BACKLIGHT_SAHARA=m -CONFIG_BACKLIGHT_WM831X=m - -# -# Display device support -# -CONFIG_DISPLAY_SUPPORT=m - -# -# Display hardware drivers -# - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -# CONFIG_FONT_8x8 is not set -CONFIG_FONT_8x16=y -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set -# CONFIG_FONT_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -CONFIG_SOUND_OSS_CORE_PRECLAIM=y -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_JACK=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_HRTIMER=m -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=y -CONFIG_SND_DMA_SGBUF=y -CONFIG_SND_RAWMIDI_SEQ=m -CONFIG_SND_OPL3_LIB_SEQ=m -# CONFIG_SND_OPL4_LIB_SEQ is not set -# CONFIG_SND_SBAWE_SEQ is not set -CONFIG_SND_EMU10K1_SEQ=m -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_DRIVERS=y -# CONFIG_SND_PCSP is not set -CONFIG_SND_DUMMY=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_MTS64=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m -CONFIG_SND_PORTMAN2X4=m -CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 -CONFIG_SND_SB_COMMON=m -CONFIG_SND_SB16_DSP=m -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m -CONFIG_SND_AW2=m -CONFIG_SND_AZT3328=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_OXYGEN_LIB=m -CONFIG_SND_OXYGEN=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS5530=m -CONFIG_SND_CS5535AUDIO=m -CONFIG_SND_CTXFI=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_INDIGOIOX=m -CONFIG_SND_INDIGODJX=m -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_FM801_TEA575X=m -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_JACK=y -CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_CODEC_REALTEK=y -CONFIG_SND_HDA_CODEC_ANALOG=y -CONFIG_SND_HDA_CODEC_SIGMATEL=y -CONFIG_SND_HDA_CODEC_VIA=y -CONFIG_SND_HDA_CODEC_ATIHDMI=y -CONFIG_SND_HDA_CODEC_NVHDMI=y -CONFIG_SND_HDA_CODEC_INTELHDMI=y -CONFIG_SND_HDA_ELD=y -CONFIG_SND_HDA_CODEC_CIRRUS=y -CONFIG_SND_HDA_CODEC_CONEXANT=y -CONFIG_SND_HDA_CODEC_CA0110=y -CONFIG_SND_HDA_CODEC_CMEDIA=y -CONFIG_SND_HDA_CODEC_SI3054=y -CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_HIFIER=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_LX6464ES=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_SONICVIBES=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VIRTUOSO=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m -CONFIG_SND_SPI=y -CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_USX2Y=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_US122L=m -CONFIG_SND_PCMCIA=y -CONFIG_SND_VXPOCKET=m -CONFIG_SND_PDAUDIOCF=m -CONFIG_SND_SOC=m -CONFIG_SND_SOC_I2C_AND_SPI=m -# CONFIG_SND_SOC_ALL_CODECS is not set -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=m -CONFIG_HID_SUPPORT=y -CONFIG_HID=m -CONFIG_HIDRAW=y - -# -# USB Input Devices -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -CONFIG_HID_APPLE=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EZKEY=m -CONFIG_HID_KYE=m -CONFIG_HID_GYRATION=m -CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LOGITECH=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_NTRIG=m -CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y -CONFIG_HID_PETALYNX=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m -CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y -CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_HID_TOPSEED=m -CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y -CONFIG_HID_WACOM=m -CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB=m -# CONFIG_USB_DEBUG is not set -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_SUSPEND=y -# CONFIG_USB_OTG is not set -CONFIG_USB_MON=m -CONFIG_USB_WUSB=m -CONFIG_USB_WUSB_CBAF=m -# CONFIG_USB_WUSB_CBAF_DEBUG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_C67X00_HCD=m -CONFIG_USB_XHCI_HCD=m -# CONFIG_USB_XHCI_HCD_DEBUGGING is not set -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_OXU210HP_HCD=m -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_ISP1760_HCD=m -CONFIG_USB_ISP1362_HCD=m -CONFIG_USB_OHCI_HCD=m -# CONFIG_USB_OHCI_HCD_SSB is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=m -CONFIG_USB_U132_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m -CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m -# CONFIG_USB_GADGET_MUSB_HDRC is not set - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_WDM=m -CONFIG_USB_TMC=m - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_STORAGE_ONETOUCH=m -CONFIG_USB_STORAGE_KARMA=m -CONFIG_USB_STORAGE_CYPRESS_ATACB=m -# CONFIG_USB_LIBUSUAL is not set - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP210X=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_FUNSOFT=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_IUU=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MOTOROLA=m -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_OTI6858=m -CONFIG_USB_SERIAL_QUALCOMM=m -CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_SERIAL_HP4X=m -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_SIEMENS_MPI=m -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -# CONFIG_USB_SERIAL_DEBUG is not set - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_BERRY_CHARGE=m -CONFIG_USB_LED=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -# CONFIG_USB_SISUSBVGA_CON is not set -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m -CONFIG_USB_ISIGHTFW=m -CONFIG_USB_VST=m -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_SELECTED=y -# CONFIG_USB_GADGET_AT91 is not set -# CONFIG_USB_GADGET_ATMEL_USBA is not set -# CONFIG_USB_GADGET_FSL_USB2 is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_GADGET_PXA25X is not set -# CONFIG_USB_GADGET_R8A66597 is not set -# CONFIG_USB_GADGET_PXA27X is not set -# CONFIG_USB_GADGET_S3C_HSOTG is not set -# CONFIG_USB_GADGET_IMX is not set -# CONFIG_USB_GADGET_S3C2410 is not set -# CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_AMD5536UDC is not set -# CONFIG_USB_GADGET_FSL_QE is not set -# CONFIG_USB_GADGET_CI13XXX is not set -CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LANGWELL is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -CONFIG_USB_GADGET_DUALSPEED=y -# CONFIG_USB_ZERO is not set -CONFIG_USB_AUDIO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_ETH_EEM is not set -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -CONFIG_USB_G_PRINTER=m -# CONFIG_USB_CDC_COMPOSITE is not set - -# -# OTG and related infrastructure -# -CONFIG_USB_OTG_UTILS=y -CONFIG_USB_GPIO_VBUS=m -CONFIG_NOP_USB_XCEIV=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_WLP=m -CONFIG_UWB_I1480U=m -CONFIG_UWB_I1480U_WLP=m -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_SDIO_UART=m -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -CONFIG_MMC_SDHCI=m -CONFIG_MMC_SDHCI_PCI=m -CONFIG_MMC_RICOH_MMC=m -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_WBSD=m -# CONFIG_MMC_AT91 is not set -# CONFIG_MMC_ATMELMCI is not set -CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_SPI=m -CONFIG_MMC_SDRICOH_CS=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MEMSTICK=m -# CONFIG_MEMSTICK_DEBUG is not set - -# -# MemoryStick drivers -# -# CONFIG_MEMSTICK_UNSAFE_RESUME is not set -CONFIG_MSPRO_BLOCK=m - -# -# MemoryStick Host Controller Drivers -# -CONFIG_MEMSTICK_TIFM_MS=m -CONFIG_MEMSTICK_JMICRON_38X=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m - -# -# LED drivers -# -CONFIG_LEDS_ALIX2=m -CONFIG_LEDS_PCA9532=m -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_GPIO_PLATFORM=y -CONFIG_LEDS_LP3944=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_WM831X_STATUS=m -CONFIG_LEDS_WM8350=m -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_BD2802=m - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_IDE_DISK=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_ACCESSIBILITY=y -CONFIG_A11Y_BRAILLE_CONSOLE=y -# CONFIG_INFINIBAND is not set -CONFIG_EDAC=y - -# -# Reporting subsystems -# -# CONFIG_EDAC_DEBUG is not set -CONFIG_EDAC_DECODE_MCE=m -CONFIG_EDAC_MM_EDAC=m -CONFIG_EDAC_AMD64=m -# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set -CONFIG_EDAC_E752X=m -CONFIG_EDAC_I82975X=m -CONFIG_EDAC_I3000=m -CONFIG_EDAC_I3200=m -CONFIG_EDAC_X38=m -CONFIG_EDAC_I5400=m -CONFIG_EDAC_I5000=m -CONFIG_EDAC_I5100=m -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y -CONFIG_RTC_DRV_TEST=m - -# -# I2C RTC drivers -# -CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1374=m -CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_PCF8583=m -CONFIG_RTC_DRV_M41T80=m -CONFIG_RTC_DRV_M41T80_WDT=y -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_FM3130=m -CONFIG_RTC_DRV_RX8581=m -CONFIG_RTC_DRV_RX8025=m - -# -# SPI RTC drivers -# -CONFIG_RTC_DRV_M41T94=m -CONFIG_RTC_DRV_DS1305=m -CONFIG_RTC_DRV_DS1390=m -CONFIG_RTC_DRV_MAX6902=m -CONFIG_RTC_DRV_R9701=m -CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_DS3234=m -CONFIG_RTC_DRV_PCF2123=m - -# -# Platform RTC drivers -# -CONFIG_RTC_DRV_CMOS=y -CONFIG_RTC_DRV_DS1286=m -CONFIG_RTC_DRV_DS1511=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_DS1742=m -CONFIG_RTC_DRV_STK17TA8=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_M48T35=m -CONFIG_RTC_DRV_M48T59=m -CONFIG_RTC_DRV_BQ4802=m -CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WM831X=m -CONFIG_RTC_DRV_WM8350=m -CONFIG_RTC_DRV_PCF50633=m -CONFIG_RTC_DRV_AB3100=m - -# -# on-CPU RTC drivers -# -# CONFIG_RTC_DRV_PCAP is not set -CONFIG_DMADEVICES=y - -# -# DMA Devices -# -CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y -CONFIG_INTEL_IOATDMA=m -CONFIG_DMA_ENGINE=y - -# -# DMA Clients -# -CONFIG_NET_DMA=y -CONFIG_ASYNC_TX_DMA=y -# CONFIG_DMATEST is not set -CONFIG_DCA=m -CONFIG_AUXDISPLAY=y -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -CONFIG_CFAG12864B=m -CONFIG_CFAG12864B_RATE=20 -CONFIG_UIO=m -CONFIG_UIO_CIF=m -CONFIG_UIO_PDRV=m -CONFIG_UIO_PDRV_GENIRQ=m -CONFIG_UIO_SMX=m -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m - -# -# TI VLYNQ -# -CONFIG_XEN_BALLOON=y -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=m -CONFIG_XENFS=m -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_STAGING=y -# CONFIG_STAGING_EXCLUDE_BUILD is not set -CONFIG_ET131X=m -# CONFIG_ET131X_DEBUG is not set -CONFIG_SLICOSS=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set -CONFIG_VIDEO_GO7007_OV7640=m -CONFIG_VIDEO_GO7007_SAA7113=m -CONFIG_VIDEO_GO7007_SAA7115=m -CONFIG_VIDEO_GO7007_TW9903=m -CONFIG_VIDEO_GO7007_UDA1342=m -CONFIG_VIDEO_GO7007_SONY_TUNER=m -CONFIG_VIDEO_GO7007_TW2804=m -CONFIG_VIDEO_CX25821=m -CONFIG_VIDEO_CX25821_ALSA=m -CONFIG_USB_IP_COMMON=m -CONFIG_USB_IP_VHCI_HCD=m -CONFIG_USB_IP_HOST=m -CONFIG_W35UND=m -CONFIG_PRISM2_USB=m -CONFIG_ECHO=m -CONFIG_POCH=m -CONFIG_OTUS=m -CONFIG_RT2860=m -CONFIG_RT2870=m -CONFIG_RT3090=m -CONFIG_COMEDI=m -# CONFIG_COMEDI_DEBUG is not set -CONFIG_COMEDI_PCI_DRIVERS=m -CONFIG_COMEDI_PCMCIA_DRIVERS=m -CONFIG_COMEDI_USB_DRIVERS=m -CONFIG_COMEDI_8255=m -CONFIG_ASUS_OLED=m -# CONFIG_PANEL is not set -# CONFIG_ALTERA_PCIE_CHDMA is not set -CONFIG_RTL8187SE=m -CONFIG_RTL8192SU=m -CONFIG_RTL8192E=m -# CONFIG_TRANZPORT is not set - -# -# Android -# - -# -# Qualcomm MSM Camera And Video -# - -# -# Camera Sensor Selection -# -CONFIG_INPUT_GPIO=m -CONFIG_DST=m -# CONFIG_DST_DEBUG is not set -CONFIG_POHMELFS=m -# CONFIG_POHMELFS_DEBUG is not set -CONFIG_POHMELFS_CRYPTO=y -CONFIG_B3DFG=m -CONFIG_IDE_PHISON=m -CONFIG_PLAN9AUTH=m -CONFIG_LINE6_USB=m -# CONFIG_DRM_RADEON_KMS is not set -CONFIG_USB_SERIAL_QUATECH2=m -CONFIG_USB_SERIAL_QUATECH_USB2=m -CONFIG_VT6655=m -CONFIG_VT6656=m -CONFIG_FB_UDL=m -CONFIG_HYPERV=m -CONFIG_HYPERV_STORAGE=m -CONFIG_HYPERV_BLOCK=m -CONFIG_HYPERV_NET=m -# CONFIG_VME_BUS is not set - -# -# RAR Register Driver -# -# CONFIG_RAR_REGISTER is not set -# CONFIG_IIO is not set -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ACERHDF=m -CONFIG_ASUS_LAPTOP=m -CONFIG_DELL_WMI=m -CONFIG_FUJITSU_LAPTOP=m -# CONFIG_FUJITSU_LAPTOP_DEBUG is not set -CONFIG_HP_WMI=m -CONFIG_MSI_LAPTOP=m -CONFIG_PANASONIC_LAPTOP=m -CONFIG_COMPAL_LAPTOP=m -CONFIG_SONY_LAPTOP=m -# CONFIG_SONYPI_COMPAT is not set -CONFIG_THINKPAD_ACPI=m -# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set -# CONFIG_THINKPAD_ACPI_DEBUG is not set -# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set -CONFIG_THINKPAD_ACPI_VIDEO=y -CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y -CONFIG_INTEL_MENLOW=m -CONFIG_EEEPC_LAPTOP=m -CONFIG_ACPI_WMI=m -CONFIG_ACPI_ASUS=m -CONFIG_TOPSTAR_LAPTOP=m -CONFIG_ACPI_TOSHIBA=m - -# -# Firmware Drivers -# -CONFIG_EDD=m -# CONFIG_EDD_OFF is not set -CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=m -CONFIG_DELL_RBU=m -CONFIG_DCDBAS=m -CONFIG_DMIID=y -# CONFIG_ISCSI_IBFT_FIND is not set - -# -# File systems -# -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=m -CONFIG_EXT4_FS_XATTR=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=m -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=m -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -CONFIG_REISERFS_PROC_INFO=y -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -CONFIG_JFS_STATISTICS=y -CONFIG_FS_POSIX_ACL=y -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -# CONFIG_XFS_DEBUG is not set -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_DLM=y -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_FS_O2CB=m -CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -CONFIG_OCFS2_FS_STATS=y -# CONFIG_OCFS2_DEBUG_MASKLOG is not set -# CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_OCFS2_FS_POSIX_ACL=y -CONFIG_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -CONFIG_NILFS2_FS=m -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -# CONFIG_AUTOFS_FS is not set -CONFIG_AUTOFS4_FS=m -CONFIG_FUSE_FS=m -CONFIG_CUSE=m -CONFIG_GENERIC_ACL=y - -# -# Caches -# -CONFIG_FSCACHE=m -CONFIG_FSCACHE_STATS=y -CONFIG_FSCACHE_HISTOGRAM=y -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=m -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y -CONFIG_CONFIGFS_FS=m -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ADFS_FS is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -# CONFIG_JFFS2_LZO is not set -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -# CONFIG_VXFS_FS is not set -CONFIG_MINIX_FS=m -CONFIG_OMFS_FS=m -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_SYSV_FS is not set -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set -CONFIG_EXOFS_FS=m -# CONFIG_EXOFS_DEBUG is not set -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -# CONFIG_NFS_V4_1 is not set -CONFIG_NFS_FSCACHE=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set -CONFIG_CIFS=m -CONFIG_CIFS_STATS=y -# CONFIG_CIFS_STATS2 is not set -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_CIFS_UPCALL=y -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_DEBUG2 is not set -CONFIG_CIFS_DFS_UPCALL=y -# CONFIG_CIFS_EXPERIMENTAL is not set -CONFIG_NCP_FS=m -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_NLS=y -# CONFIG_NCPFS_EXTRAS is not set -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -# CONFIG_AFS_DEBUG is not set -CONFIG_AFS_FSCACHE=y -CONFIG_9P_FS=m -CONFIG_9P_FSCACHE=y - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -CONFIG_MAC_PARTITION=y -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -# CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -CONFIG_KARMA_PARTITION=y -CONFIG_EFI_PARTITION=y -# CONFIG_SYSV68_PARTITION is not set -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m -CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_PRINTK_TIME=y -CONFIG_ENABLE_WARN_DEPRECATED=y -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=2048 -CONFIG_MAGIC_SYSRQ=y -CONFIG_STRIP_ASM_SYMS=y -CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_SHIRQ is not set -CONFIG_DETECT_SOFTLOCKUP=y -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -CONFIG_DETECT_HUNG_TASK=y -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -CONFIG_SCHED_DEBUG=y -# CONFIG_SCHEDSTATS is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_RT_MUTEX_TESTER is not set -# CONFIG_DEBUG_SPINLOCK is not set -CONFIG_DEBUG_MUTEXES=y -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -CONFIG_STACKTRACE=y -# CONFIG_DEBUG_KOBJECT is not set -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_VIRTUAL is not set -# CONFIG_DEBUG_WRITECOUNT is not set -CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_CREDENTIALS is not set -CONFIG_ARCH_WANT_FRAME_POINTERS=y -CONFIG_FRAME_POINTER=y -# CONFIG_BOOT_PRINTK_DELAY is not set -# CONFIG_RCU_TORTURE_TEST is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_DEBUG_PAGEALLOC is not set -CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FTRACE_NMI_ENTER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_TRACER_MAX_TRACE=y -CONFIG_RING_BUFFER=y -CONFIG_FTRACE_NMI_ENTER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y -CONFIG_TRACING=y -CONFIG_GENERIC_TRACER=y -CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_FUNCTION_GRAPH_TRACER=y -# CONFIG_IRQSOFF_TRACER is not set -CONFIG_SYSPROF_TRACER=y -CONFIG_SCHED_TRACER=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_BOOT_TRACER=y -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -CONFIG_POWER_TRACER=y -CONFIG_STACK_TRACER=y -CONFIG_KMEMTRACE=y -CONFIG_WORKQUEUE_TRACER=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_DYNAMIC_FTRACE=y -CONFIG_FUNCTION_PROFILER=y -CONFIG_FTRACE_MCOUNT_RECORD=y -# CONFIG_FTRACE_STARTUP_TEST is not set -CONFIG_MMIOTRACE=y -# CONFIG_MMIOTRACE_TEST is not set -CONFIG_RING_BUFFER_BENCHMARK=m -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -# CONFIG_DYNAMIC_DEBUG is not set -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -CONFIG_HAVE_ARCH_KMEMCHECK=y -CONFIG_STRICT_DEVMEM=y -CONFIG_X86_VERBOSE_BOOTUP=y -CONFIG_EARLY_PRINTK=y -# CONFIG_EARLY_PRINTK_DBGP is not set -# CONFIG_DEBUG_STACKOVERFLOW is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_PER_CPU_MAPS is not set -# CONFIG_X86_PTDUMP is not set -CONFIG_DEBUG_RODATA=y -# CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_NX_TEST is not set -# CONFIG_IOMMU_DEBUG is not set -# CONFIG_IOMMU_STRESS is not set -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -CONFIG_IO_DELAY_TYPE_0X80=0 -CONFIG_IO_DELAY_TYPE_0XED=1 -CONFIG_IO_DELAY_TYPE_UDELAY=2 -CONFIG_IO_DELAY_TYPE_NONE=3 -CONFIG_IO_DELAY_0X80=y -# CONFIG_IO_DELAY_0XED is not set -# CONFIG_IO_DELAY_UDELAY is not set -# CONFIG_IO_DELAY_NONE is not set -CONFIG_DEFAULT_IO_DELAY_TYPE=0 -# CONFIG_DEBUG_BOOT_PARAMS is not set -# CONFIG_CPA_DEBUG is not set -# CONFIG_OPTIMIZE_INLINING is not set - -# -# Security options -# -CONFIG_KEYS=y -# CONFIG_KEYS_DEBUG_PROC_KEYS is not set -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set -CONFIG_SECURITY_PATH=y -CONFIG_SECURITY_FILE_CAPABILITIES=y -# CONFIG_INTEL_TXT is not set -# CONFIG_SECURITY_SELINUX is not set -# CONFIG_SECURITY_SMACK is not set -CONFIG_SECURITY_TOMOYO=y -# CONFIG_IMA is not set -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m -CONFIG_ASYNC_PQ=m -CONFIG_ASYNC_RAID6_RECOV=m -CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y -CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_PCOMP=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_SEQIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_FPU=m - -# -# Hash modes -# -CONFIG_CRYPTO_HMAC=m -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CRC32C_INTEL=m -CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_AES_X86_64=m -CONFIG_CRYPTO_AES_NI_INTEL=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_X86_64=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_TWOFISH_X86_64=m - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_ZLIB=m -CONFIG_CRYPTO_LZO=m - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_DEV_HIFN_795X=m -CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_APIC_ARCHITECTURE=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_BITREVERSE=y -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC_T10DIF=m -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=m -CONFIG_LZO_DECOMPRESS=m -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_NLATTR=y diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.install b/libre/kernel26-libre-lts/kernel26-libre-lts.install deleted file mode 100644 index 0e4b44fa3..000000000 --- a/libre/kernel26-libre-lts/kernel26-libre-lts.install +++ /dev/null @@ -1,146 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -KERNEL_NAME=-lts -KERNEL_VERSION=2.6.32.50-1-lts - -post_install () { - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - /sbin/depmod $KERNEL_VERSION - # generate init ramdisks - echo ">>> MKINITCPIO SETUP" - echo ">>> ----------------" - echo ">>> If you use LVM2, Encrypted root or software RAID," - echo ">>> Ensure you enable support in /etc/mkinitcpio.conf ." - echo ">>> More information about mkinitcpio setup can be found here:" - echo ">>> http://wiki.archlinux.org/index.php/Mkinitcpio" - echo "" - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p kernel26${KERNEL_NAME} -} - -post_upgrade() { - pacman -Q grub &>/dev/null - hasgrub=$? - pacman -Q grub2 &>/dev/null - hasgrub2=$? - pacman -Q lilo &>/dev/null - haslilo=$? - # reminder notices - if [ $haslilo -eq 0 ]; then - echo ">>>" - if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then - echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting." - else - echo ">>> You appear to be using the LILO bootloader. You should run" - echo ">>> 'lilo' before rebooting." - fi - echo ">>>" - fi - - if grep "/boot" /etc/fstab 2>&1 >/dev/null; then - if ! grep "/boot" /etc/mtab 2>&1 >/dev/null; then - echo "WARNING: /boot appears to be a seperate partition but is not mounted." - echo " You probably just broke your system. Congratulations." - fi - fi - - if [ "`vercmp $2 2.6.13`" -lt 0 ]; then - # important upgrade notice - echo ">>>" - echo ">>> IMPORTANT KERNEL UPGRADE NOTICE" - echo ">>> -------------------------------" - echo ">>> As of kernel 2.6.13, DevFS is NO LONGER AVAILABLE!" - echo ">>> If you still use DevFS, please make the transition to uDev before" - echo ">>> rebooting. If you really need to stay with DevFS for some reason," - echo ">>> then you can manually downgrade to an older version:" - echo ">>>" - echo ">>> # pacman -U http://archlinux.org/~judd/kernel/kernel26-scsi-2.6.12.2-1.pkg.tar.gz" - echo ">>>" - echo ">>> If you choose to downgrade, don't forget to add kernel26-scsi to your" - echo ">>> IgnorePkg list in /etc/pacman.conf" - echo ">>>" - echo ">>> (NOTE: The following portion applies to uDev users as well!)" - echo ">>>" - echo ">>> If you use any DevFS paths in your GRUB menu.lst, then you will not" - echo ">>> be able to boot! Change your root= parameter to use the classic" - echo ">>> naming scheme." - echo ">>>" - echo ">>> EXAMPLES:" - echo ">>> - change root=/dev/discs/disc0/part3 to root=/dev/sda3" - echo ">>> - change root=/dev/md/0 to root=/dev/md0" - echo ">>>" - fi - # generate new init ramdisk - if [ "`vercmp $2 2.6.18`" -lt 0 ]; then - echo ">>> --------------------------------------------------------------" - echo ">>> | WARNING: |" - echo ">>> |mkinitrd is not supported anymore in kernel >=2.6.18 series!|" - echo ">>> | Please change to Mkinitcpio setup. |" - echo ">>> --------------------------------------------------------------" - echo ">>>" - fi - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - /sbin/depmod $KERNEL_VERSION - echo ">>> MKINITCPIO SETUP" - echo ">>> ----------------" - if [ "`vercmp $2 2.6.18`" -lt 0 ]; then - echo ">>> Please change your bootloader config files:" - echo ">>> Grub: /boot/grub/menu.lst | Lilo: /etc/lilo.conf" - echo "------------------------------------------------" - echo "| - initrd26.img to kernel26${KERNEL_NAME}.img |" - echo "| - initrd26-full.img to kernel26${KERNEL_NAME}-fallback.img |" - echo "------------------------------------------------" - fi - if [ "`vercmp $2 2.6.19`" -lt 0 ]; then - echo "" - echo ">>> New PATA/IDE subsystem - EXPERIMENTAL" - echo ">>> ----------" - echo ">>> To use the new pata drivers, change the 'ide' hook " - echo ">>> to 'pata' in /etc/mkinicpio.conf HOOKS=" - echo ">>> The new system changes: /dev/hd? to /dev/sd?" - echo ">>> Don't forget to modify GRUB, LILO and fstab to the" - echo ">>> new naming system. " - echo ">>> eg: hda3 --> sda3, hdc8 --> sdc8" - echo "" - echo ">>> piix/ata_piix (Intel chipsets) - IMPORTANT" - echo "----------" - echo ">>> If you have enabled ide/pata/sata HOOKs in /etc/mkinitcpio.conf" - echo ">>> the 'ata_piix' module will be used." - echo ">>> This may cause your devices to shift names, eg:" - echo ">>> - IDE: devices from hd? to sd?" - echo ">>> - SATA: sda might shift to sdc if you have 2 other disks on a PIIX IDE port." - echo ">>> To check if this will affect you, check 'mkinitcpio -M' for piix/ata_piix" - echo "" - fi - - echo ">>> If you use LVM2, Encrypted root or software RAID," - echo ">>> Ensure you enable support in /etc/mkinitcpio.conf ." - echo ">>> More information about mkinitcpio setup can be found here:" - echo ">>> http://wiki.archlinux.org/index.php/Mkinitcpio" - echo "" - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." -if [ "`vercmp $2 2.6.19`" -lt 0 ]; then - mkinitcpio -p kernel26${KERNEL_NAME} -m "ATTENTION:\nIf you get a kernel panic below -and are using an Intel chipset, append 'earlymodules=piix' to the -kernel commandline" -else - mkinitcpio -p kernel26${KERNEL_NAME} -fi -if [ "`vercmp $2 2.6.21`" -lt 0 ]; then - echo "" - echo "Important ACPI Information:" - echo ">>> Since 2.6.20.7 all possible ACPI parts are modularized." - echo ">>> The modules are located at:" - echo ">>> /lib/modules/$(uname -r)/kernel/drivers/acpi" - echo ">>> For more information about ACPI modules check this wiki page:" - echo ">>> 'http://wiki.archlinux.org/index.php/ACPI_modules'" -fi -} - -post_remove() { - rm -f /boot/kernel26${KERNEL_NAME}.img - rm -f /boot/kernel26${KERNEL_NAME}-fallback.img -} diff --git a/libre/kernel26-libre-lts/kernel26-lts.preset b/libre/kernel26-libre-lts/kernel26-lts.preset deleted file mode 100644 index b65e064b4..000000000 --- a/libre/kernel26-libre-lts/kernel26-lts.preset +++ /dev/null @@ -1,17 +0,0 @@ -# mkinitcpio preset file for kernel26 - -######################################## -# DO NOT EDIT THIS LINE: -source /etc/mkinitcpio.d/kernel26-lts.kver -######################################## -ALL_config="/etc/mkinitcpio.conf" - -PRESETS=('default' 'fallback') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/kernel26-lts.img" -#default_options="" - -#fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/kernel26-lts-fallback.img" -fallback_options="-S autodetect" \ No newline at end of file diff --git a/libre/kernel26-libre-lts/libata-alignment.patch b/libre/kernel26-libre-lts/libata-alignment.patch deleted file mode 100644 index edd96f3b1..000000000 --- a/libre/kernel26-libre-lts/libata-alignment.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nur linux-2.6.32.orig/drivers/ata/libata-scsi.c linux-2.6.32/drivers/ata/libata-scsi.c ---- linux-2.6.32.orig/drivers/ata/libata-scsi.c 2009-12-03 14:51:21.000000000 +1100 -+++ linux-2.6.32/drivers/ata/libata-scsi.c 2011-01-22 20:32:53.353775375 +1100 -@@ -1099,13 +1099,13 @@ - /* configure max sectors */ - blk_queue_max_sectors(sdev->request_queue, dev->max_sectors); - -+ sdev->sector_size = ATA_SECT_SIZE; -+ - if (dev->class == ATA_DEV_ATAPI) { - struct request_queue *q = sdev->request_queue; - void *buf; - -- /* set the min alignment and padding */ -- blk_queue_update_dma_alignment(sdev->request_queue, -- ATA_DMA_PAD_SZ - 1); -+ /* set DMA padding */ - blk_queue_update_dma_pad(sdev->request_queue, - ATA_DMA_PAD_SZ - 1); - -@@ -1119,12 +1119,24 @@ - - blk_queue_dma_drain(q, atapi_drain_needed, buf, ATAPI_MAX_DRAIN); - } else { -- /* ATA devices must be sector aligned */ -- blk_queue_update_dma_alignment(sdev->request_queue, -- ATA_SECT_SIZE - 1); - sdev->manage_start_stop = 1; - } - -+ /* -+ * ata_pio_sectors() expects buffer for each sector to not cross -+ * page boundary. Enforce it by requiring buffers to be sector -+ * aligned, which works iff sector_size is not larger than -+ * PAGE_SIZE. ATAPI devices also need the alignment as -+ * IDENTIFY_PACKET is executed as ATA_PROT_PIO. -+ */ -+ if (sdev->sector_size > PAGE_SIZE) -+ ata_dev_printk(dev, KERN_WARNING, -+ "sector_size=%u > PAGE_SIZE, PIO may malfunction\n", -+ sdev->sector_size); -+ -+ blk_queue_update_dma_alignment(sdev->request_queue, -+ sdev->sector_size - 1); -+ - if (dev->flags & ATA_DFLAG_AN) - set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); - diff --git a/libre/kernel26-libre-lts/packages/.svn/entries b/libre/kernel26-libre-lts/packages/.svn/entries deleted file mode 100644 index 809dc9428..000000000 --- a/libre/kernel26-libre-lts/packages/.svn/entries +++ /dev/null @@ -1,36 +0,0 @@ -10 - -dir -117482 -svn://svn.archlinux.org/packages -svn://svn.archlinux.org/packages - - - -2011-04-03T19:07:21.945297Z -117482 -andyrtr - - - - - - - - - - - - - - -eb2447ed-0c53-47e4-bac8-5bc4a241df78 - - - - - - - -empty - diff --git a/libre/kernel26-libre-manpages/PKGBUILD b/libre/kernel26-libre-manpages/PKGBUILD deleted file mode 100644 index 284d09de9..000000000 --- a/libre/kernel26-libre-manpages/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski -# Maintainer: Thomas Baechler -# Maintainer (Parabola): fauno -pkgname=kernel26-libre-manpages -pkgver=2.6.37 -pkgrel=1 -pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel." -makedepends=('xmlto' 'docbook-xsl') -provides=("kernel26-manpages=$pkgver") -replaces=('kernel26-manpages') -conflicts=('kernel26-manpages') -arch=(any) -license=('GPL2') -url="http://linux-libre.fsfla.org/" -source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.37-libre/linux-2.6.37-libre.tar.bz2) - -build() { -cd ${srcdir}/linux-$pkgver -make mandocs -} - -package() { -install -d ${pkgdir}/usr/share/man/man9/ -install ${srcdir}/linux-$pkgver/Documentation/DocBook/man/*.9.gz \ -${pkgdir}/usr/share/man/man9/ - -find ${pkgdir} -type f -exec chmod 644 {} \; -} - -md5sums=('3e80c55a0927b4439f3aad4f973f05cc') diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 9ed86aa03..9f67689df 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,7 +9,7 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/libretools.git/" license=('GPL3+' 'GPL2') -pkgrel=2 +pkgrel=3 arch=('any') groups=(base-devel) depends=(openssh rsync git wget tokyocabinet) diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 70151e988..50f03ee88 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -3,10 +3,10 @@ # arg 1: the new package version post_install() { cat < -_kernver=3.0.66 +_kernver=3.0.67 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=4 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index ddd854a03..2fa94e7dd 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178426 2013-02-21 22:37:33Z tpowa $ +# $Id: PKGBUILD 179096 2013-03-03 15:52:54Z andyrtr $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,7 +7,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=66 +_sublevel=67 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.66 # nearly always the same as pkgver @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'b27bb5195c9fdb7fa6f609307a7d208b' + '7756388fbd9608b61e33fb41773af010' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 2650a9f83..5fc657d19 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.66-1-LIBRE-LTS +KERNEL_VERSION=3.0.67-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 4e4f94494..0d1d14cd0 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mozilla-searchplugins pkgver=1.3 -pkgrel=4 +pkgrel=5 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') @@ -43,7 +43,7 @@ md5sums=('b4cc6bd8353af36ade441916217619e4' '462c68585461f8cdc23c93c46f6ee4cf' '0c9a3f48971aab8aa0cf2f5e2ff67292' 'e50a847cec81357e8730e0d327515a9c' - '3c4a7f901bfe9000a702c68f7f78428c' + '8d486e7ae47f54c2d6555d96adbdd236' '5bf9ca2558026fa3f4ec52d8e64fee47' 'dc6c76acf4c68a40710383513d72fa8b' 'bdb2640c643493063051bc72eeeff920' diff --git a/libre/mozilla-searchplugins/parabola-packages.xml b/libre/mozilla-searchplugins/parabola-packages.xml index 8f20628dc..f746ad8f8 100644 --- a/libre/mozilla-searchplugins/parabola-packages.xml +++ b/libre/mozilla-searchplugins/parabola-packages.xml @@ -3,7 +3,7 @@ Search the Parabola package repositories. UTF-8 data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA== - - + + - \ No newline at end of file + diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 0cfb73c55..4e92336c2 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,17 +1,17 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 171482 2012-11-18 01:57:51Z allan $ +# $Id: PKGBUILD 178901 2013-02-28 17:05:39Z dreisner $ # Maintainer: Dan McGee # Maintainer: Dave Reisner pkgname=pacman pkgver=4.0.3 -pkgrel=5.1 # no difference from 5 unless on mips64el +pkgrel=7 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" license=('GPL') -groups=('base') -depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4' +groups=('base' 'base-devel') +depends=('bash' 'glibc>=2.15' 'libarchive>=3.1.2' 'curl>=7.19.4' 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring') makedepends=('asciidoc') optdepends=('fakeroot: for makepkg usage as normal user') @@ -29,11 +29,11 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} md5sums=('387965c7125e60e5f0b9ff3b427fe0f9' '1a70392526c8768470da678b31905a6e' '1a9b79788640907a2b34e8671cacc94a' - 'a9ddd43891bed364e1e97d27b2887bf1' + 'a9ddd43891bed364e1e97d27b2887bf1' '2e8cbf55a94b1954b167c5dee6b62317' - '080d9f76f56e135cc62205874636aa0f' - 'ce9943fc8086d491890565e91ea1a0d8' - 'eb8dba9bd0b315230fbf0e5dc0a7335b' + '6f284de1facaead73de918b4f380fa7f' + 'f2213945821548c05d654a299ce077f7' + 'a45ce4bd0bafb2d60181da5cfa7ceede' 'debc512689a1aa8c124fe0ccf27f5758') build() { diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf index 115217b59..59e55cf0b 100644 --- a/libre/pacman/pacman.conf +++ b/libre/pacman/pacman.conf @@ -96,7 +96,7 @@ SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist # Parabola also supports community projects and personal repositories, to find -# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories +# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el index f286c3290..3c32ddb78 100644 --- a/libre/pacman/pacman.conf.mips64el +++ b/libre/pacman/pacman.conf.mips64el @@ -96,7 +96,7 @@ SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist # Parabola also supports community projects and personal repositories, to find -# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories +# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 index 4c67b089f..6a28406eb 100644 --- a/libre/pacman/pacman.conf.x86_64 +++ b/libre/pacman/pacman.conf.x86_64 @@ -107,7 +107,7 @@ Include = /etc/pacman.d/mirrorlist #Include = /etc/pacman.d/mirrorlist # Parabola also supports community projects and personal repositories, to find -# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories +# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 7152ca13c..276007582 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,9 +6,9 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') -pkgver=4.2.6 +pkgver=4.2.8 _extramodules=extramodules-3.8-LIBRE -pkgrel=7.1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh index 6152ec21d..895bea0b1 100755 --- a/libre/virtualbox-libre-modules/build.sh +++ b/libre/virtualbox-libre-modules/build.sh @@ -1,18 +1,25 @@ #!/bin/bash +set -e + if (( $# != 1 )); then echo "usage: $0 extra" echo " $0 testing" exit 1 fi -linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 +here=$PWD +cd /var/empty +linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +cd "$here" +linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686 -makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -r /var/lib/archbuild/$1-x86_64 +cd /var/empty +makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +cd "$here" +makechrootpkg -n -r /var/lib/archbuild/$1-x86_64 # vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 8f16e1ab9..be25bf3b4 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -12,8 +12,8 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-guest-dkms' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') -pkgver=4.2.6 -pkgrel=4 +pkgver=4.2.8 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -53,7 +53,6 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'vboxweb.service' '001-vboxdrv-reference.patch' '002-change_default_driver_dir.patch' - '003-linux-3.8.patch' 'os_blag_64.png' 'os_blag.png' 'os_dragora_64.png' @@ -74,7 +73,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'os_venenux.png' 'libre.patch' 'free-distros.patch') -md5sums=('d680aeb3b4379b8281527aeb012b2df5' +md5sums=('54e35ece40457b1a9e27dd9d0429c3a1' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' @@ -82,7 +81,6 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5' 'bc9efed88e0469cd7fc460d5a5cd7b4b' 'f4e4c7895ede9c524109589bf16ae660' '97e193f050574dd272a38e5ee5ebe62b' - 'e565ff0d028776d4f48e6e5b4d0b48e0' '8538dba8686d7449cb481c9bae9d722a' '545c925b46f2ac95e5f8ae407fad101a' 'f6416f509c2e5460e4dc624e0a57f3c1' diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 8aad59fe4..a57637221 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -20,6 +20,7 @@ package() { conflicts=($(cut -d: -f1,2 ${pkgdir}/usr/share/doc/${pkgname}/blacklist-${pkgver}.txt | \ sed "s/:$//" | \ grep -v ":" | \ + grep -v '^#' | \ sort -u )) } diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD index 6da6f14bd..05dd756c0 100644 --- a/pcr/libav/PKGBUILD +++ b/pcr/libav/PKGBUILD @@ -13,8 +13,8 @@ if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then pkgname=libav fi -pkgver=0.8.4 -pkgrel=3 +pkgver=9.3 +pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc" arch=( i686 @@ -28,6 +28,7 @@ license=( depends=( alsa-lib bzip2 + freetype2 gsm lame libpulse @@ -53,46 +54,48 @@ source=( http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz ) sha512sums=( - d402c7d586708e29b92340c4d03d8431fe607f0b88c2762cc95671786cdb9a7221968164b571e11086b53b2169f3a657c6106dc769c04a1a035429d011e72610 + de3aaa571fed67d22ec2a0c53599af56684afa38445cf67fd09d26c23eeded5a184d045f472d414815d17783b421f937fd3d9565637e20f2050aaaf0081164fe ) build() { cd $pkgbase-$pkgver - ./configure \ - --prefix=/opt/$pkgname \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-libgsm \ - --enable-libspeex \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libschroedinger \ - --enable-libopenjpeg \ - --enable-librtmp \ - --enable-libpulse \ - --enable-gpl \ - --enable-version3 \ - --enable-runtime-cpudetect \ - --disable-debug \ - --enable-static + [[ $static == false ]] && sttcv=disable || sttcv=enable - make - make tools/qt-faststart - make doc/ffmpeg.1 - make doc/av{play,server}.1 + ./configure\ + --prefix=/opt/$pkgname\ + --disable-debug\ + --$sttcv-static\ + --enable-avresample\ + --enable-gpl\ + --enable-libfreetype\ + --enable-libgsm\ + --enable-libmp3lame\ + --enable-libopencore_amrnb\ + --enable-libopencore_amrwb\ + --enable-libopenjpeg\ + --enable-libpulse\ + --enable-librtmp\ + --enable-libschroedinger\ + --enable-libspeex\ + --enable-libtheora\ + --enable-libvorbis\ + --enable-libvpx\ + --enable-libx264\ + --enable-libxvid\ + --enable-runtime-cpudetect\ + --enable-shared\ + --enable-version3\ + --enable-x11grab + + setarch $CARCH make + setarch $CARCH make tools/qt-faststart + setarch $CARCH make doc/av{conv,play,server}.1 } package() { cd $pkgbase-$pkgver - make DESTDIR=$pkgdir install install-man + setarch $CARCH make DESTDIR=$pkgdir install install-man install -m755 -d $pkgdir/etc/ld.so.conf.d install -m755 -d $pkgdir/usr/bin install -m755 -d $pkgdir/usr/share/man/man1 @@ -100,15 +103,11 @@ package() { ln -s /opt/$pkgname/bin/avconv $pkgdir/usr/bin/avconv$pkgflag ln -s /opt/$pkgname/bin/avplay $pkgdir/usr/bin/avplay$pkgflag ln -s /opt/$pkgname/bin/avprobe $pkgdir/usr/bin/avprobe$pkgflag - ln -s /opt/$pkgname/bin/avserver $pkgdir/usr/bin/avserver$pkgflag - ln -s /opt/$pkgname/bin/ffmpeg $pkgdir/usr/bin/ffmpeg-$pkgname ln -s /opt/$pkgname/bin/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname ln -s /opt/$pkgname/share/man/man1/avconv.1 $pkgdir/usr/share/man/man1/avconv$pkgflag.1 ln -s /opt/$pkgname/share/man/man1/avplay.1 $pkgdir/usr/share/man/man1/avplay$pkgflag.1 ln -s /opt/$pkgname/share/man/man1/avprobe.1 $pkgdir/usr/share/man/man1/avprobe$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/ffmpeg.1 $pkgdir/usr/share/man/man1/ffmpeg-$pkgname.1 - echo /opt/libav$pkgflag/lib > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf + echo /opt/libav$pkgflag/lib > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf } # vim:set ts=2 sw=2 et: diff --git a/pcr/qtoctave/PKGBUILD b/pcr/qtoctave/PKGBUILD new file mode 100644 index 000000000..d84dfa3a2 --- /dev/null +++ b/pcr/qtoctave/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Michael Schubert +# Contributor: Ronald van Haren +# Contributor: Stefan Husmann + +pkgname=qtoctave +pkgver=0.10.1 +pkgrel=2 +arch=('i686' 'x86_64') +pkgdesc="Qt4 frontend for octave" +url="https://forja.rediris.es/projects/csl-qtoctave/" +license=('GPL2') +depends=('qt4' 'octave' 'hicolor-icon-theme') +makedepends=('cmake') +source=("http://forja.rediris.es/frs/download.php/2054/${pkgname}-${pkgver}.tar.gz") +md5sums=('f23afd8eb850b950f51b65f256a83835') +install="qtoctave.install" +options=('!libtool' '!emptydirs') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i "s/lrelease/lrelease-qt4/" qtoctave/src/CMakeLists.txt + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_BUILD_TYPE=RELEASE . + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/pcr/qtoctave/qtoctave.install b/pcr/qtoctave/qtoctave.install new file mode 100644 index 000000000..28fdb48fb --- /dev/null +++ b/pcr/qtoctave/qtoctave.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + diff --git a/~emulatorman/mozilla-searchplugins/PKGBUILD b/~emulatorman/mozilla-searchplugins/PKGBUILD deleted file mode 100644 index 4e4f94494..000000000 --- a/~emulatorman/mozilla-searchplugins/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: Figue -# Contributor (Parabola): fauno -# Contributor (Parabola): vando -# Contributor (Parabola): Márcio Silva -# Thank you very much to the older contributors: -# Contributor: evr -# Contributor: Muhammad 'MJ' Jassim - -pkgname=mozilla-searchplugins -pkgver=1.3 -pkgrel=4 -pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." -arch=('any') -license=('MPL' 'GPL' 'LGPL') -url="https://parabolagnulinux.org/" -source=( - duckduckgo-html.xml - duckduckgo-lite.xml - internet-archive.xml - jamendo-en.xml.in - jamendo.ico::http://www.jamendo.com/favicon.ico - parabola-packages.xml - parabola-wiki-en.xml - seeks-search.xml::http://www.seeks.fr/opensearch.xml - yacybluebox.xml::http://yacy.dyndns.org:8000/opensearchdescription.xml - wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php -) - -build() { - cd "$srcdir" - sed "s,@icon@,$(base64 -w0 < jamendo.ico)," < jamendo-en.xml.in > jamendo-en.xml -} - -package() { - install -m755 -d "${pkgdir}/usr/lib/mozilla/searchplugins" - install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins" -} - -md5sums=('b4cc6bd8353af36ade441916217619e4' - '766aa6def4bf63c0d65afd6ca1b1ce37' - '462c68585461f8cdc23c93c46f6ee4cf' - '0c9a3f48971aab8aa0cf2f5e2ff67292' - 'e50a847cec81357e8730e0d327515a9c' - '3c4a7f901bfe9000a702c68f7f78428c' - '5bf9ca2558026fa3f4ec52d8e64fee47' - 'dc6c76acf4c68a40710383513d72fa8b' - 'bdb2640c643493063051bc72eeeff920' - 'cb281f07933210c812a6153f32109645') diff --git a/~emulatorman/mozilla-searchplugins/duckduckgo-html.xml b/~emulatorman/mozilla-searchplugins/duckduckgo-html.xml deleted file mode 100644 index b53408077..000000000 --- a/~emulatorman/mozilla-searchplugins/duckduckgo-html.xml +++ /dev/null @@ -1,8 +0,0 @@ - -DuckDuckGo HTML -Search DuckDuckGo HTML -UTF-8 -http://duckduckgo.com/favicon.ico - - - diff --git a/~emulatorman/mozilla-searchplugins/duckduckgo-lite.xml b/~emulatorman/mozilla-searchplugins/duckduckgo-lite.xml deleted file mode 100644 index 1e651abe6..000000000 --- a/~emulatorman/mozilla-searchplugins/duckduckgo-lite.xml +++ /dev/null @@ -1,8 +0,0 @@ - -DuckDuckGo Lite -Search DuckDuckGo Lite -UTF-8 -http://duckduckgo.com/favicon.ico - - - diff --git a/~emulatorman/mozilla-searchplugins/internet-archive.xml b/~emulatorman/mozilla-searchplugins/internet-archive.xml deleted file mode 100644 index 1556a2d8c..000000000 --- a/~emulatorman/mozilla-searchplugins/internet-archive.xml +++ /dev/null @@ -1,12 +0,0 @@ - -Internet Archive -Search www.archive.org -ISO-8859-1 -data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7 -7 -http://mycroft.mozdev.org/update.php/id0/archive.src -http://mycroft.mozdev.org/update.php/id0/archive.gif -http://www.archive.org/ - - - \ No newline at end of file diff --git a/~emulatorman/mozilla-searchplugins/jamendo-en.xml.in b/~emulatorman/mozilla-searchplugins/jamendo-en.xml.in deleted file mode 100644 index 96b3a008d..000000000 --- a/~emulatorman/mozilla-searchplugins/jamendo-en.xml.in +++ /dev/null @@ -1,10 +0,0 @@ - -Jamendo (en) -Search Jamendo.com English site for downloadable Creative Commons music -UTF-8 -data:image/x-icon;base64,@icon@ -http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml -http://www.jamendo.com/en - - - diff --git a/~emulatorman/mozilla-searchplugins/parabola-packages.xml b/~emulatorman/mozilla-searchplugins/parabola-packages.xml deleted file mode 100644 index 8f20628dc..000000000 --- a/~emulatorman/mozilla-searchplugins/parabola-packages.xml +++ /dev/null @@ -1,9 +0,0 @@ - -Parabola Packages -Search the Parabola package repositories. -UTF-8 -data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA== - - - - \ No newline at end of file diff --git a/~emulatorman/mozilla-searchplugins/parabola-wiki-en.xml b/~emulatorman/mozilla-searchplugins/parabola-wiki-en.xml deleted file mode 100644 index d218b21f8..000000000 --- a/~emulatorman/mozilla-searchplugins/parabola-wiki-en.xml +++ /dev/null @@ -1,11 +0,0 @@ - -Parabola GNU/Linux-Libre Wiki (en) -Parabola GNU/Linux-Libre Wiki (en) -UTF-8 -data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD/// -8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA== -https://wiki.parabolagnulinux.org/Special:Search - - - - \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 582035722561a5ecbadc13abc26331353d810567 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 5 Mar 2013 00:04:04 -0800 Subject: Tue Mar 5 00:04:04 PST 2013 --- community/busybox/PKGBUILD | 4 +- community/busybox/busybox.install | 6 +-- community/conntrack-tools/PKGBUILD | 12 +++--- community/guvcview/PKGBUILD | 8 ++-- community/hercules/PKGBUILD | 37 ++++++++++-------- community/libnetfilter_acct/PKGBUILD | 8 ++-- community/libnetfilter_conntrack/PKGBUILD | 8 ++-- community/libvirt/PKGBUILD | 9 +++-- community/nemo/PKGBUILD | 20 +++++----- community/nemo/use-terminal-config.patch | 45 ++++++++++++++++++++++ community/nfacct/PKGBUILD | 33 ++++++++++++++++ community/tinc/PKGBUILD | 10 ++--- community/wings3d/PKGBUILD | 36 ++++++++--------- community/wings3d/wings3d.sh | 2 - community/xfmedia/PKGBUILD | 7 ++-- extra/opencv/PKGBUILD | 31 +++++++++------ extra/qwt/PKGBUILD | 6 +-- extra/raptor/PKGBUILD | 8 ++-- extra/xfce4-eyes-plugin/PKGBUILD | 42 +++++++++++--------- extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install | 6 ++- extra/xfdesktop/PKGBUILD | 16 +++----- .../add-backgrounds-xfce-to-search-path.patch | 36 ----------------- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 6 +-- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 6 +-- libre/linux-libre/linux-libre.install | 2 +- pcr/libav-builder/PKGBUILD | 2 +- pcr/libnatpmp/PKGBUILD | 8 ++-- pcr/python2-renpy/PKGBUILD | 8 ++-- pcr/renpy/PKGBUILD | 21 +++++----- 32 files changed, 255 insertions(+), 198 deletions(-) create mode 100644 community/nemo/use-terminal-config.patch create mode 100644 community/nfacct/PKGBUILD delete mode 100644 community/wings3d/wings3d.sh delete mode 100644 extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index d20578341..b875b26f6 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73502 2012-07-08 17:57:22Z spupykin $ +# $Id: PKGBUILD 85655 2013-03-04 13:07:52Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jens Pranaitis pkgname=busybox pkgver=1.20.2 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64") url="http://www.busybox.net" diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install index 72a1e98b3..ecbeec39a 100644 --- a/community/busybox/busybox.install +++ b/community/busybox/busybox.install @@ -4,10 +4,10 @@ post_install() { } pre_upgrade() { - stat -c %a bin/busybox >tmp/busybox.upgrade.script + busybox stat -c %a bin/busybox >tmp/busybox.upgrade.script } post_upgrade() { - [ -f tmp/busybox.upgrade.script ] && chmod `cat tmp/busybox.upgrade.script` bin/busybox - rm -f tmp/busybox.upgrade.script + [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` bin/busybox + busybox rm -f tmp/busybox.upgrade.script } diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD index c6dbe7a57..3f394f00b 100644 --- a/community/conntrack-tools/PKGBUILD +++ b/community/conntrack-tools/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 83854 2013-02-05 18:12:01Z eric $ +# $Id: PKGBUILD 85682 2013-03-04 23:03:57Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Valere Monseur # Contributor: Alessandro Sagratini # Contributor: Kevin Edmonds pkgname=conntrack-tools -pkgver=1.4.0 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/conntrack-tools' @@ -21,9 +21,9 @@ source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.b 'conntrackd.service' '01-config-file-path.patch') install=$pkgname.install -md5sums=('ee737c774e01349f75e935228a2d851b' - 'bd135eaefb47923bb8e8d26f084d3e9d' - 'e71ff7b8c4997b797cab3eaaccb693f4') +sha1sums=('6fda497ef1ebd5e4afe01830ece072d2df2fe50f' + '2c205952a447ee0a6a7fc99bddeea1bfaf1b8034' + 'e7607a9ac14dd839f3716ac68d46e19ab26ef112') build() { cd $pkgname-$pkgver diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD index 8ef3c1f61..0d22217cd 100644 --- a/community/guvcview/PKGBUILD +++ b/community/guvcview/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84351 2013-02-16 22:50:29Z ioni $ +# $Id: PKGBUILD 85669 2013-03-04 16:14:23Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Maxwell Pray a.k.a. Synthead pkgname=guvcview -pkgver=1.6.1 -pkgrel=3 +pkgver=1.7.0 +pkgrel=1 pkgdesc="A video viewer and capturer for the linux uvc driver" arch=('i686' 'x86_64') url="http://guvcview.sourceforge.net/" @@ -14,7 +14,7 @@ makedepends=('pkg-config' 'intltool') optdepends=('pulseaudio: for PulseAudio support') options=('!docs') source=("http://downloads.sourceforge.net/project/${pkgname}/source/${pkgname}-src-${pkgver}.tar.gz") -md5sums=('b3dfd04d8aae0c807d5f5d6ba035580f') +md5sums=('fe141fe2fe2a16df69f7866c27334a56') build() { cd "${srcdir}/${pkgname}-src-${pkgver}" diff --git a/community/hercules/PKGBUILD b/community/hercules/PKGBUILD index 4f49a03bf..4db656d80 100644 --- a/community/hercules/PKGBUILD +++ b/community/hercules/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 83152 2013-01-27 16:17:47Z pierre $ +# $Id: PKGBUILD 85609 2013-03-03 23:25:19Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Kevin Piche # Contributor: Tom Newsom -# Maintainer: Kevin Piche pkgname=hercules -pkgver=3.07 -pkgrel=2 -pkgdesc="A software implementation of the mainframe System/370 and ESA/390 architectures" -url="http://www.hercules-390.org/" -source=("http://www.hercules-390.org/$pkgname-$pkgver.tar.gz") -arch=('i686' 'x86_64') +pkgver=3.08 +pkgrel=1 +arch=('x86_64' 'i686') +pkgdesc='Software implementation of System/370 and ESA/390' +url='http://www.hercules-390.eu/' +source=("http://downloads.hercules-390.eu/$pkgname-$pkgver.tar.gz") license=('custom') options=('!libtool') -depends=('bzip2' 'libgcrypt' 'zlib') -md5sums=('a12aa1645b0695b25b7fc0c9a3ccab3a') +depends=('bzip2' 'libgcrypt' 'zlib' 'perl') +sha256sums=('85e217773587f2278d4b6cb6bc815e042cfc982d0fc14baa0da4a84dea399e9d') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + # Change module extension from .la to .so. sed '/HDL_MODULE_SUFFIX/ s/\.la/.so/' -i hdl.h ./configure --prefix=/usr - make + make -j1 } package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install - install -D -m644 COPYRIGHT \ - $pkgdir/usr/share/licenses/hercules/qpl1 + cd "$srcdir/$pkgname-$pkgver" + + make prefix="$pkgdir/usr" install + install -Dm644 COPYRIGHT \ + "$pkgdir/usr/share/licenses/hercules/qpl1" } + +# vim:set ts=2 sw=2 et: diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD index 3ab673656..33666d8fd 100644 --- a/community/libnetfilter_acct/PKGBUILD +++ b/community/libnetfilter_acct/PKGBUILD @@ -1,13 +1,13 @@ # $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $ # Maintainer: Sergej Pupykin -# Maintainer: Sébastien Luttringer +# Maintainer: Sébastien Luttringer # Contributor: Kevin Edmonds # Maintainer: Filip Wojciechowski, filip at loka dot pl pkgname=libnetfilter_acct -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 -pkgdesc='userspace library providing interface to extended accounting infrastructure' +pkgdesc='Library providing interface to extended accounting infrastructure' arch=('i686' 'x86_64') url="http://www.netfilter.org/projects/libnetfilter_acct/index.html" license=('GPL') @@ -15,7 +15,7 @@ depends=('libnfnetlink' 'libmnl') makedepends=('pkgconfig') options=('!libtool') source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('4755429cbd46ad0ed32bb30f84da0dee') +md5sums=('2118d9514c079839ebd9cb3144ad2ad7') build() { cd $pkgname-$pkgver diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD index 1592d9027..302795ef4 100644 --- a/community/libnetfilter_conntrack/PKGBUILD +++ b/community/libnetfilter_conntrack/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77383 2012-10-09 10:14:26Z seblu $ +# $Id: PKGBUILD 85675 2013-03-04 19:37:18Z seblu $ # Maintainer: Sergej Pupykin -# Maintainer: Sébastien Luttringer +# Maintainer: Sébastien Luttringer # Contributor: Alessandro Sagratini # Contributor: Kevin Edmonds pkgname=libnetfilter_conntrack -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc='Library providing an API to the in-kernel connection tracking state table' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url='http://www.netfilter.org/projects/libnetfilter_conntrack/' license=('GPL') options=('!libtool') source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -md5sums=('447114b5d61bb9a9617ead3217c3d3ff') +md5sums=('73394a3d8d0cfecc6abb6027b4792d52') build() { cd $pkgname-$pkgver diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 54337d10f..f4c7301ca 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85292 2013-02-28 15:18:09Z spupykin $ +# $Id: PKGBUILD 85657 2013-03-04 13:08:37Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=1.0.3 -pkgrel=1rc2 +pkgrel=2rc2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -12,7 +12,7 @@ license=('LGPL') depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'libnl' 'libx11' 'audit') + 'iproute2' 'libnl' 'libx11' 'audit' '') makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' @@ -20,7 +20,8 @@ optdepends=('bridge-utils: for briged networking (default)' 'openbsd-netcat: for remote management over ssh' 'qemu' 'radvd' - 'dmidecode') + 'dmidecode' + 'ebtables') options=('emptydirs' '!libtool') backup=('etc/conf.d/libvirtd' 'etc/conf.d/libvirtd-guests' diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index b89dda95c..01df50a53 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84548 2013-02-19 20:34:47Z faidoc $ +# $Id: PKGBUILD 85617 2013-03-04 04:34:16Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo pkgver=1.7.1 -pkgrel=1 -pkgdesc="Cinnamon file manager (Nautilus fork), stable version" +pkgrel=2 +pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" license=('GPL') @@ -19,18 +19,17 @@ conflicts=('nemo-fm') options=('!emptydirs' '!libtool') install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" - "gnome-autogen.sh") + "gnome-autogen.sh" + "use-terminal-config.patch") md5sums=('b348b6e340e055bef3163555b99621bb' - 'a925691c9b57a6a884dcf07da057fd1f') + 'a925691c9b57a6a884dcf07da057fd1f' + '6cca080cc8fe3df7e725c0f8cd5fa485') build() { cd linuxmint-nemo-* - # Get default terminal value - _terminal=$(gsettings get org.gnome.desktop.default-applications.terminal exec | tr -d "'") - - # Set "Open in Terminal" to default terminal (Arch doesn't use x-terminal-emulator) - sed -i "s/x-terminal-emulator/$_terminal/" src/nemo-view.c + # Read the default terminal app from GSettings + patch -Np1 -i ../use-terminal-config.patch cp ${srcdir}/gnome-autogen.sh . sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am @@ -40,7 +39,6 @@ build() { ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/nemo \ - --disable-nst-extension \ --disable-update-mimedb \ --disable-packagekit \ --disable-gtk-doc-html \ diff --git a/community/nemo/use-terminal-config.patch b/community/nemo/use-terminal-config.patch new file mode 100644 index 000000000..a6af75d48 --- /dev/null +++ b/community/nemo/use-terminal-config.patch @@ -0,0 +1,45 @@ +diff -Naur linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.c linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.c +--- linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.c 2013-02-19 17:30:18.000000000 +0100 ++++ linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.c 2013-03-04 04:05:13.472897136 +0100 +@@ -77,5 +77,6 @@ + nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree"); + gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown"); + gnome_background_preferences = g_settings_new("org.gnome.desktop.background"); +- gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); ++ gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); ++ gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); + } +diff -Naur linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.h linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.h +--- linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.h 2013-02-19 17:30:18.000000000 +0100 ++++ linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.h 2013-03-04 04:49:20.581767625 +0100 +@@ -211,6 +211,9 @@ + #define GNOME_DESKTOP_MEDIA_HANDLING_AUTOMOUNT_OPEN "automount-open" + #define GNOME_DESKTOP_MEDIA_HANDLING_AUTORUN "autorun-never" + ++/* Terminal */ ++#define GNOME_DESKTOP_TERMINAL_EXEC "exec" ++ + void nemo_global_preferences_init (void); + char *nemo_global_preferences_get_default_folder_viewer_preference_as_iid (void); + +@@ -224,6 +227,7 @@ + GSettings *gnome_lockdown_preferences; + GSettings *gnome_background_preferences; + GSettings *gnome_media_handling_preferences; ++GSettings *gnome_terminal_preferences; + + G_END_DECLS + +diff -Naur linuxmint-nemo-63f7b44.orig/src/nemo-view.c linuxmint-nemo-63f7b44/src/nemo-view.c +--- linuxmint-nemo-63f7b44.orig/src/nemo-view.c 2013-02-19 17:30:18.000000000 +0100 ++++ linuxmint-nemo-63f7b44/src/nemo-view.c 2013-03-04 04:14:47.222310992 +0100 +@@ -6716,7 +6716,8 @@ + open_in_terminal (gchar *location) + { + gchar *argv[2]; +- argv[0] = "x-terminal-emulator"; ++ argv[0] = g_settings_get_string (gnome_terminal_preferences, ++ GNOME_DESKTOP_TERMINAL_EXEC); + argv[1] = NULL; + g_spawn_async(location, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); + } diff --git a/community/nfacct/PKGBUILD b/community/nfacct/PKGBUILD new file mode 100644 index 000000000..98cacbdfe --- /dev/null +++ b/community/nfacct/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 85684 2013-03-04 23:04:09Z seblu $ +# Maintainer: Sébastien Luttringer +# Contributor: Alessandro Sagratini + +pkgname=nfacct +pkgver=1.0.1 +pkgrel=1 +pkgdesc='Command line tool to create/retrieve/delete accounting objects' +arch=('i686' 'x86_64') +url='http://www.netfilter.org/projects/nfacct/' +license=('GPL2') +depends=('libnetfilter_acct') +options=(!libtool) +source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") +md5sums=('992e863409d144350dbc8f0554a0f478') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + cd $pkgname-$pkgver + make -k check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD index 1fa1f008a..227efcbec 100644 --- a/community/tinc/PKGBUILD +++ b/community/tinc/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 76061 2012-09-10 11:46:16Z tredaelli $ +# $Id: PKGBUILD 85671 2013-03-04 16:46:31Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: helios # Contributor: Lothar Gesslein # Contributor: Dominik George pkgname=tinc -pkgver=1.0.19 -pkgrel=2 +pkgver=1.0.20 +pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=('i686' 'x86_64') url="http://www.tinc-vpn.org/" @@ -16,8 +16,8 @@ backup=(etc/conf.d/tincd.conf) install=tinc.install source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} tincd.rc tincd.conf tincd@.service) -md5sums=('5d97ee0f1ccf8fea5b492f6b54d5ac32' - 'af4a88d89a17c216e38b93630389181a' +md5sums=('001277e0ccd7ca29f7fa4039774ad611' + '8ad9e8784712bdc1496223c6dbd99ab9' '64bb53748d9051255f243003f0d511f5' '7c0276d4812cc5d3cc18142562a3aa82' '035b0e549b08da55d19a8df5b8306e4d') diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index 1cc5d5830..057466d2b 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -1,51 +1,47 @@ -# $Id: PKGBUILD 85259 2013-02-28 10:18:30Z arodseth $ +# $Id: PKGBUILD 85612 2013-03-03 23:56:10Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: kappa pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=12 +pkgrel=15 pkgdesc='3D modeling program' arch=('x86_64' 'i686') url='http://www.wings3d.com/' license=('GPL') -depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang=R15B03_1') +depends=('erlang' 'erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils') makedepends=('setconf' 'gendesk') optdepends=('povray: rendering support via POV-Ray') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/wings/tar.gz/dgud/r15b-driver-compat" - "$pkgname.sh" +options=('!emptydirs') +# Using the binary release, but would prefer using a source release, if there is one that compiles +source=("http://sourceforge.net/projects/$_pkgname/files/$_pkgname/$pkgver/$_pkgname-$pkgver-linux.bzip2.run.gz" "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png") -sha256sums=('b89aca41937d4d07424ccc0447eb5a6c3755350428201d7d7644e467dcd20fdf' - '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' +sha256sums=('760e19fa4973ed0fc75057897135a8efa241e834b078fc05c28786672137b322' '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a') _genericname=('3D Modeler') -_dirname="$_pkgname-dgud-r15b-driver-compat" build() { cd "$srcdir" gendesk setconf "$pkgname.desktop" Categories "Graphics;3DGraphics;" - cd "$_dirname" - export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*) - make - make lang + chmod +x "$_pkgname-$pkgver-linux.bzip2.run" + "./$_pkgname-$pkgver-linux.bzip2.run" --nox11 --nochown --tar xf > /dev/null + setconf install_wings INSTALL_DIR "$pkgdir/opt/$pkgname-$pkgver" } package() { - cd "$srcdir/$_dirname" - - mkdir -p "$pkgdir/usr/lib/$pkgname" - for subdir in ebin fonts patches plugins shaders textures; do - cp -r "$srcdir/$_dirname/$subdir/" "$pkgdir/usr/lib/$pkgname" - done + cd "$srcdir" + ./install_wings - install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cd "$pkgdir" + setconf "opt/$pkgname-$pkgver/$_pkgname" ROOTDIR "/opt/$pkgname-$pkgver" + install -Dm755 "opt/$pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$pkgname" cd "$srcdir" - install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname" + install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" install -Dm644 "$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" diff --git a/community/wings3d/wings3d.sh b/community/wings3d/wings3d.sh deleted file mode 100644 index c0fd3b2fb..000000000 --- a/community/wings3d/wings3d.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"} diff --git a/community/xfmedia/PKGBUILD b/community/xfmedia/PKGBUILD index aad13ec98..399f7423a 100644 --- a/community/xfmedia/PKGBUILD +++ b/community/xfmedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70120 2012-04-30 04:20:16Z foutrelis $ +# $Id: PKGBUILD 85661 2013-03-04 13:23:23Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer : Sergej Pupykin # Maintainer : Tom Killian @@ -6,7 +6,7 @@ pkgname=xfmedia pkgver=0.9.2 -pkgrel=11 +pkgrel=12 pkgdesc="xfce media player" arch=('i686' 'x86_64') license=('GPL') @@ -31,7 +31,8 @@ build() { patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch patch -Np1 -i ../xfmedia-exo-0.6.patch patch -Np1 -i ../xfmedia-xine-1.2.0.patch - LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0" ./configure --prefix=/usr + LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0" ./configure \ + --prefix=/usr --sysconfdir=/etc make } diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 4dbcb64b7..8490915a6 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 178140 2013-02-16 22:48:58Z ioni $ +# $Id: PKGBUILD 179299 2013-03-04 22:18:11Z schiv $ # Maintainer: Ray Rashif # Contributor: Tobias Powalowski pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV -pkgver=2.4.3 -pkgrel=5 +pkgver=2.4.4 +pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -14,7 +14,8 @@ url="http://opencv.org/" depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl' 'xine-lib' 'libdc1394' 'openexr' 'gtkglext') makedepends=('cmake' 'python2-numpy' 'mesa' - 'opencl-headers' 'eigen2') + 'opencl-headers' 'eigen2' + 'texlive-bin' 'python2-sphinx') # for docs optdepends=('opencv-docs' 'opencv-samples' 'eigen2' @@ -22,7 +23,7 @@ optdepends=('opencv-docs' source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2" 'pkgconfig.patch' 'fsh.patch') -md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe' +md5sums=('bb7272c102a801a9f9ee01db6e7ad8e9' 'cb916260b5ec594fe7a0cc2e54fc569f' '35256e3ccace373feba8131d1540a0de') @@ -33,6 +34,7 @@ _cmakeopts=('-D WITH_OPENCL=ON' '-D ENABLE_SSE=OFF' '-D ENABLE_SSE2=OFF' '-D ENABLE_SSE3=OFF' + '-D BUILD_DOCS=ON' '-D BUILD_PACKAGE=OFF' '-D BUILD_WITH_DEBUG_INFO=OFF' '-D BUILD_TESTS=OFF' @@ -49,12 +51,16 @@ build() { # fix pkg-config mess # see https://bugs.archlinux.org/task/32430 + # and http://code.opencv.org/issues/1925 patch -Np1 -i "$srcdir/pkgconfig.patch" - # fix another upstream mess + # fix another upstream mess that they won't fix # see http://code.opencv.org/issues/2512 patch -Np1 -i "$srcdir/fsh.patch" + # python2 compatibility for generating docs + sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake + cmake ${_cmakeopts[@]} . make @@ -72,11 +78,10 @@ package_opencv() { cd "$pkgdir/usr/share" # separate docs package; also be -R friendly - [ -d doc/$pkgname ] && mv doc/$pkgname "$srcdir/opencv-doc" \ - && rm -r doc + [[ -d doc ]] && mv doc "$srcdir/opencv-doc" # separate samples package - [ -d $pkgname/samples ] && mv $pkgname/samples "$srcdir/opencv-samples" + [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples" } package_opencv-docs() { @@ -85,10 +90,14 @@ package_opencv-docs() { unset optdepends options=('docs') + # PDFs are not being generated for some reason as of 2.4.4 + # even after adding latex and sphinx deps + # when previously without them there were a couple of good docs installed + cd "$srcdir" - mkdir -p "$pkgdir/usr/share/doc" - cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" + # doc dir now includes opencv subdir (looks like they finally listened) + cp -r opencv-doc "$pkgdir/usr/share/doc" # install license file #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index 3e14cf1c7..6ea145189 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179088 2013-03-03 09:38:46Z andrea $ +# $Id: PKGBUILD 179293 2013-03-04 21:34:48Z andrea $ # Maintainer: Ronald van Haren pkgname=qwt pkgver=6.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Qt Widgets for Technical Applications" arch=('i686' 'x86_64') url="http://qwt.sourceforge.net/" @@ -37,7 +37,7 @@ package() { # needed by qmake (FS#30407) install -d "${pkgdir}"/usr/share/qt4/mkspecs/features/ - install -m644 qwtconfig.pri qwt.prf \ + install -m644 qwtconfig.pri qwt.prf qwtfunctions.pri \ "${pkgdir}"/usr/share/qt4/mkspecs/features/ # move man pages diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index c87ffb225..47f2f3ed3 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 175875 2013-01-23 00:13:12Z eric $ +# $Id: PKGBUILD 179134 2013-03-04 08:06:34Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Andreas Radke # Contributor: eric # Contributor: Damir Perisa pkgname=raptor -pkgver=2.0.8 -pkgrel=3 +pkgver=2.0.9 +pkgrel=1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') url="http://librdf.org/raptor" @@ -33,4 +33,4 @@ package() { cd "${srcdir}"/raptor2-${pkgver} make prefix="${pkgdir}"/usr install } -md5sums=('ac60858b875aab8fa7917f21a1237aa9') +md5sums=('4ceb9316488b0ea01acf011023cf7fff') diff --git a/extra/xfce4-eyes-plugin/PKGBUILD b/extra/xfce4-eyes-plugin/PKGBUILD index 055380203..d6a099d7d 100644 --- a/extra/xfce4-eyes-plugin/PKGBUILD +++ b/extra/xfce4-eyes-plugin/PKGBUILD @@ -1,32 +1,38 @@ -# $Id: PKGBUILD 157855 2012-04-30 04:20:22Z foutrelis $ -# Maintainer: AndyRTR +# $Id: PKGBUILD 179295 2013-03-04 21:35:04Z foutrelis $ +# Maintainer: +# Contributor: AndyRTR # Contributor: Aurelien Foret pkgname=xfce4-eyes-plugin -pkgver=4.4.1 -pkgrel=3 +pkgver=4.4.2 +pkgrel=1 pkgdesc="A rolling eyes (following mouse pointer) plugin for the Xfce panel" -arch=(i686 x86_64) +arch=('i686' 'x86_64') +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin" license=('GPL2') -url="http://xfce-goodies.berlios.de/" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme') +depends=('xfce4-panel' 'hicolor-icon-theme') makedepends=('intltool' 'perlxml') -install=${pkgname}.install -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/4.4/${pkgname}-${pkgver}.tar.bz2) -md5sums=('dcbf6ea9035d379d168b479be0d09f14') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/4.4/$pkgname-$pkgver.tar.bz2) +sha256sums=('dad102fedd0d9e6df45338a018387b2aacaf24b05eb798275be0dfc05ffa3021') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install b/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install +++ b/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index 463787925..1b999453e 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170256 2012-11-06 11:49:29Z foutrelis $ +# $Id: PKGBUILD 179291 2013-03-04 21:25:21Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: tobias pkgname=xfdesktop -pkgver=4.10.0 -pkgrel=5 +pkgver=4.10.1 +pkgrel=1 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -16,18 +16,12 @@ conflicts=('xfce4-menueditor') replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 - add-backgrounds-xfce-to-search-path.patch) -sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b' - 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) +sha256sums=('2883fe381e1b967d179fdf5ece5ac2566a3ffdb94f4cf139c7fb44567f17d4ad') build() { cd "$srcdir/$pkgname-$pkgver" - # Add backgrounds/xfce/ to the single image list in the settings app - # https://bugzilla.xfce.org/show_bug.cgi?id=8799 - patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch deleted file mode 100644 index c48aeac33..000000000 --- a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -@@ -, +, @@ - settings app. (Bug #8799) ---- - settings/main.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) ---- a/settings/main.c -+++ a/settings/main.c -@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel) - xfconf_channel_set_string(panel->channel, prop_image, image_file); - xfconf_channel_set_string(panel->channel, prop_last, image_file); - -+ /* Add all backdrops in xfce4/backdrops/ */ - backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, - "xfce4/backdrops/"); - for(i = 0; backdrop_dirs[i]; ++i) { -@@ -696,6 +697,19 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel) - if(tmp) - image_file_iter = tmp; - } -+ g_strfreev(backdrop_dirs); -+ -+ /* Add all backdrops in backgrounds/xfce/ */ -+ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, -+ "backgrounds/xfce/"); -+ for(i = 0; backdrop_dirs[i]; ++i) { -+ tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i], -+ image_file); -+ if(tmp) -+ image_file_iter = tmp; -+ } -+ g_strfreev(backdrop_dirs); -+ - - if(!image_file_iter) - image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file); --- diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 898a24f12..95d0c374f 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.1 +_kernver=3.8.2 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=6 +pkgrel=7 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index b8da783ad..c177a1ad6 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.67 +_kernver=3.0.68 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=5 +pkgrel=6 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 2fa94e7dd..fc5cd17c9 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179096 2013-03-03 15:52:54Z andyrtr $ +# $Id: PKGBUILD 179286 2013-03-04 17:14:18Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,7 +7,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=67 +_sublevel=68 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.66 # nearly always the same as pkgver @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '7756388fbd9608b61e33fb41773af010' + '571adcbf6f408967fe4df19c1c17b00b' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 5fc657d19..283424020 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.67-1-LIBRE-LTS +KERNEL_VERSION=3.0.68-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b2a459f37..a1d7989a1 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $ +# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=1 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.1 # nearly always the same as pkgver @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'd5ad2ecc865a32378517c3c07ca99173' + '61b8b43e04065556b2b173d34111674d' '4d73ccd0f1825a4bd474d4fead6c0d42' 'e132184c6d02ef580a504967c067e1c5' 'e49ac236dfeef709f91a3d993ea7b62c' diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index e734fb2aa..e8d4fb3d8 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.1-1-LIBRE +KERNEL_VERSION=3.8.2-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD index 372243b2a..5f7168f86 100644 --- a/pcr/libav-builder/PKGBUILD +++ b/pcr/libav-builder/PKGBUILD @@ -8,7 +8,7 @@ elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; t pkgname=libav-builder fi pkgflag=builder -pkgver=0.8.4 +pkgver=9.3 pkgrel=1 pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)" arch=any diff --git a/pcr/libnatpmp/PKGBUILD b/pcr/libnatpmp/PKGBUILD index 0fa0ff469..f3306e87d 100644 --- a/pcr/libnatpmp/PKGBUILD +++ b/pcr/libnatpmp/PKGBUILD @@ -3,14 +3,15 @@ pkgname=libnatpmp pkgver=20120821 -pkgrel=1 +pkgrel=2 pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr/libnatpmp.html" license=('custom:BSD') depends=('glibc') makedepends=() source=(http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz) +md5sums=('d2b9c2dedba3a00deb0e7589982ceced') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,5 +25,6 @@ package() { # Needed by some packages install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp" + + install -Dm 644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } -md5sums=('22a1225b890471a7750a9bf26eb863f7') diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD index 4d6611548..b5891747d 100644 --- a/pcr/python2-renpy/PKGBUILD +++ b/pcr/python2-renpy/PKGBUILD @@ -5,8 +5,8 @@ pkgname=python2-renpy pkgflag=renpy -pkgver=6.14.1 -pkgrel=3 +pkgver=6.15.0 +pkgrel=1 pkgdesc="Platform-dependant Ren'Py libraries." arch=( i686 @@ -43,8 +43,8 @@ source=( "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2" ) -md5sums=( - 16814530ba9ce1f2968bb8c8c785651b +sha512sums=( + 8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1 ) build() { diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD index 89c07a433..0baad307c 100644 --- a/pcr/renpy/PKGBUILD +++ b/pcr/renpy/PKGBUILD @@ -1,7 +1,8 @@ # Maintainer: AlexanderR +# Maintainer (Parabola): Márcio Silva pkgname=renpy -pkgver=6.14.1 +pkgver=6.15.0 pkgrel=1 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools." arch=('any') @@ -20,12 +21,14 @@ source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2" 'python2.diff' 'renpy-launcher.sh') -md5sums=('16814530ba9ce1f2968bb8c8c785651b' - 'a9beb35fa6c6d8af7ba5d2a764c33158' - 'd206d24b78e207a2c3b603fef14ac47f' - '8b9922e26e567248a2a5adc1d0cdfdd4' - '0476b16220e6faeb031e1dbfe45249b4' - 'dfa92cdecc15e5c1ddee387fbbbb2d9c') +sha512sums=( + 8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1 + 1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5 + 2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df + bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09 + 3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab + 727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7 +) build() { cd "$srcdir/renpy-$pkgver-source" @@ -33,7 +36,7 @@ build() { patch -p1 < ../python2.diff # fonts are provided by ttf-dejavu - rm common/DejaVuSans.ttf common/DejaVuSans.txt + rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt } package(){ @@ -47,7 +50,7 @@ package(){ cd renpy-$pkgver-source - cp -r launcher renpy common renpy.py template the_question tutorial "$pkgdir/usr/share/$pkgname" + cp -r launcher $pkgname{,.py} template the_question tutorial "$pkgdir/usr/share/$pkgname" cp -r doc/* "$pkgdir/usr/share/doc/$pkgname" install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png" install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -- cgit v1.2.3-54-g00ecf From ea60830c19f04f36803e26821bd9db1361489653 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 16 Mar 2013 00:04:27 -0700 Subject: Sat Mar 16 00:04:26 PDT 2013 --- community/acpid/PKGBUILD | 6 +- community/acpid/acpid.socket | 2 +- community/chmsee/PKGBUILD | 6 +- community/chmsee/chmsee | 2 - community/gendesk/PKGBUILD | 15 +- community/me-tv/PKGBUILD | 52 --- community/me-tv/me-tv.install | 18 - community/setconf/PKGBUILD | 35 ++ community/texmaker/PKGBUILD | 29 ++ community/texmaker/texmaker.install | 7 + core/bash/PKGBUILD | 14 +- core/mpfr/PKGBUILD | 21 +- core/mpfr/mpfr-3.1.1-p2.patch | 405 --------------------- ...dbus-fix-serialization-of-calendar-timers.patch | 62 ---- core/systemd/PKGBUILD | 28 +- core/texinfo/PKGBUILD | 8 +- kernels/linux-libre-pae/PKGBUILD | 8 +- .../change-default-console-loglevel.patch | 2 +- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-rt/PKGBUILD | 4 +- .../change-default-console-loglevel.patch | 2 +- kernels/linux-libre-rt/linux-libre-rt.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 8 +- .../change-default-console-loglevel.patch | 2 +- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/crosstool-ng/PKGBUILD | 8 +- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 12 +- .../change-default-console-loglevel.patch | 2 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 12 +- .../change-default-console-loglevel.patch | 2 +- libre/linux-libre/linux-libre.install | 2 +- pcr/grass/PKGBUILD | 138 +++++++ pcr/grass/grass-python2.patch | 327 +++++++++++++++++ pcr/grass/grass-tk86-fix.patch | 11 + pcr/grass/grass.conf | 1 + pcr/grass/grass.install | 26 ++ pcr/grass/grass.sh | 4 + pcr/libfreexl/PKGBUILD | 21 ++ pcr/libowfat/PKGBUILD | 2 +- pcr/libspatialite/PKGBUILD | 24 ++ pcr/opentracker/PKGBUILD | 67 ++++ pcr/opentracker/license.txt | 2 + pcr/opentracker/opentracker.install | 17 + pcr/opentracker/opentracker.rc.d | 37 ++ pcr/opentracker/opentracker.service | 11 + pcr/qgis/PKGBUILD | 65 ++++ pcr/qgis/qgis.desktop | 10 + pcr/spatialindex/LICENSE | 9 + pcr/spatialindex/PKGBUILD | 34 ++ social/opentracker/PKGBUILD | 67 ---- social/opentracker/license.txt | 2 - social/opentracker/opentracker.install | 17 - social/opentracker/opentracker.rc.d | 37 -- social/opentracker/opentracker.service | 11 - 57 files changed, 959 insertions(+), 771 deletions(-) delete mode 100644 community/me-tv/PKGBUILD delete mode 100644 community/me-tv/me-tv.install create mode 100644 community/setconf/PKGBUILD create mode 100644 community/texmaker/PKGBUILD create mode 100644 community/texmaker/texmaker.install delete mode 100644 core/mpfr/mpfr-3.1.1-p2.patch delete mode 100644 core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch create mode 100644 pcr/grass/PKGBUILD create mode 100644 pcr/grass/grass-python2.patch create mode 100644 pcr/grass/grass-tk86-fix.patch create mode 100644 pcr/grass/grass.conf create mode 100644 pcr/grass/grass.install create mode 100644 pcr/grass/grass.sh create mode 100644 pcr/libfreexl/PKGBUILD create mode 100644 pcr/libspatialite/PKGBUILD create mode 100644 pcr/opentracker/PKGBUILD create mode 100644 pcr/opentracker/license.txt create mode 100644 pcr/opentracker/opentracker.install create mode 100644 pcr/opentracker/opentracker.rc.d create mode 100644 pcr/opentracker/opentracker.service create mode 100644 pcr/qgis/PKGBUILD create mode 100644 pcr/qgis/qgis.desktop create mode 100644 pcr/spatialindex/LICENSE create mode 100644 pcr/spatialindex/PKGBUILD delete mode 100644 social/opentracker/PKGBUILD delete mode 100644 social/opentracker/license.txt delete mode 100644 social/opentracker/opentracker.install delete mode 100755 social/opentracker/opentracker.rc.d delete mode 100644 social/opentracker/opentracker.service (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index d31a614a8..617aba45f 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84713 2013-02-23 09:11:56Z seblu $ +# $Id: PKGBUILD 86363 2013-03-15 22:40:51Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: xduugu # Contributor: Manolis Tzanidakis @@ -6,7 +6,7 @@ pkgname=acpid pkgver=2.0.18 -pkgrel=1 +pkgrel=2 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') url='http://tedfelix.com/linux/acpid-netlink.html' @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta 'anything' 'handler.sh') md5sums=('7c4ff315ae960c54eea303c71c49f152' - 'ee6cb99e50e580c50331a73045412ae9' + 'd11700eb136e0489835ddaf977a7905b' '10290f69491206cd104654e5b900b661' '2d37b98d6e74bab815604b8b48c6cfd4' '47f44ff5f02685dce8bcdab8568f0c38') diff --git a/community/acpid/acpid.socket b/community/acpid/acpid.socket index 1e5365bf1..1b23f8735 100644 --- a/community/acpid/acpid.socket +++ b/community/acpid/acpid.socket @@ -2,7 +2,7 @@ Description=ACPID Listen Socket [Socket] -ListenStream=/run/acpid.socket +ListenStream=/var/run/acpid.socket [Install] WantedBy=sockets.target diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index 083591db7..9ec0de701 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83313 2013-01-29 13:27:03Z lcarlier $ +# $Id: PKGBUILD 86352 2013-03-15 14:34:33Z lcarlier $ # Maintainer : Laurent Carlier # Contributor: dionydonny # Contributor: Ermanno pkgname=chmsee pkgver=2.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" @@ -18,7 +18,7 @@ source=(https://chmsee.googlecode.com/files/${pkgname}-${pkgver}.tar.gz chmsee) install=chmsee.install md5sums=('a9a1e79094e5a2674caa3b1f1e34f5e7' - '242a9390bc943cc38237fa71137fb26c') + '1787edd1de8aa75bd9fa75a5ab319e85') build() { cd ${srcdir}/chmsee-*/src diff --git a/community/chmsee/chmsee b/community/chmsee/chmsee index 65a1e195b..cd022f561 100644 --- a/community/chmsee/chmsee +++ b/community/chmsee/chmsee @@ -1,4 +1,2 @@ #!/bin/sh -cd /usr/share/chmsee/ xulrunner /usr/share/chmsee/application.ini "$@" -cd - diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index 1559f9465..cbea9fbae 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 71021 2012-05-21 22:04:13Z arodseth $ -# Maintainer: Alexander Rdseth +# $Id: PKGBUILD 86359 2013-03-15 17:39:45Z arodseth $ +# Maintainer: Alexander Rødseth # Thanks to Moonprincessluna at DeviantArt for the default icon: # http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a pkgname=gendesk -pkgver=0.4.2 +pkgver=0.4.4 pkgrel=1 pkgdesc="Utility to generate .desktop files and download icons" arch=('x86_64' 'i686') url="http://roboticoverlords.org/gendesk/" license=('MIT') depends=('glibc') -makedepends=('go>=2:1-2') -conflicts=('go-hg') -source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.gz" +makedepends=('go') +source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" "http://roboticoverlords.org/images/default.png") -sha256sums=('10b2a294f5d57fcc2fd8612ca9cba7f0f82af03b1bd38d93a3ef757689d20a8a' +sha256sums=('23ca20823dc225ebc35baf53fa07558a1ddf314fe3f9cb9d2c5fc6523ca62334' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { cd "$srcdir/$pkgname-$pkgver" - msg2 "Compiling..." go build } @@ -31,6 +29,7 @@ package() { install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$pkgname" install -Dm644 "$srcdir/default.png" "$pkgdir/usr/share/pixmaps/default.png" + install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD deleted file mode 100644 index eb15b07a1..000000000 --- a/community/me-tv/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -#Maintainer: jakob gruber -#Contributor: gborzi -#Previous Contributor: Vinzenz Vietzke -#Previous Contributor: Heiko Baums -#Previous Contributor: Jeff Bailes - -pkgname=me-tv -pkgver=1.4.0.12 -pkgrel=1 -epoch=1 -pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" -arch=('i686' 'x86_64') -url="https://launchpad.net/me-tv" -license=('GPL') -depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base') -makedepends=('intltool' 'gnome-common') -install='me-tv.install' -source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver:0:5}/+download/${pkgname}-${pkgver}.tar.gz") -options=('!emptydirs') - -build() { - - cd "${srcdir}/${pkgname}-${pkgver}" - - ./autogen.sh - ./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr - - # Missing unistd.h includes :| https://bugs.launchpad.net/me-tv/+bug/1020690 - for file in common/common.cc server/thread.cc; do - sed -i '1 i\ - #include ' $file - done - - make - -} - -package() { - - cd "${srcdir}/${pkgname}-${pkgver}" - - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \ - --domain me-tv "${pkgdir}/usr/etc/gconf/schemas/${pkgname}.schemas" - - rm -rf "${pkgdir}/usr/etc/" - -} - -md5sums=('28c7fd5523fd6ea8f5de89b297eb1391') diff --git a/community/me-tv/me-tv.install b/community/me-tv/me-tv.install deleted file mode 100644 index ca1279c14..000000000 --- a/community/me-tv/me-tv.install +++ /dev/null @@ -1,18 +0,0 @@ -pkgname=me-tv - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 - echo "If you run into errors after upgrading, try deleting ~/.local/share/me-tv/" -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD new file mode 100644 index 000000000..6d0586f00 --- /dev/null +++ b/community/setconf/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 86348 2013-03-15 13:28:26Z arodseth $ +# Maintainer: Alexander Rødseth + +pkgname=setconf +pkgver=0.5.3 +pkgrel=1 +pkgdesc='Utility to easily change settings in configuration files or Makefiles' +arch=('x86_64' 'i686') +url='http://setconf.roboticoverlords.org/' +license=('GPL2') +depends=('pcre' 'gc') +# Comment out the makedepends if you're on a platform not supported by shedskin +makedepends=('shedskin') +source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz") +sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + [ -x /usr/bin/shedskin ] && shedskin "$pkgname.py" && make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + if [ -e "$pkgname" ]; then + install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + else + depends=('python') + install -Dm755 "$pkgname.py" "$pkgdir/usr/bin/$pkgname" + fi + install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD new file mode 100644 index 000000000..cf0ce245c --- /dev/null +++ b/community/texmaker/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 86310 2013-03-15 05:07:25Z cinelli $ +#Maintainer: Federico Cinelli + +pkgname=texmaker +pkgver=4.0 +pkgrel=1 +pkgdesc='Free cross-platform LaTeX editor' +arch=('i686' 'x86_64') +url="http://www.xm1math.net/texmaker/index.html" +license=('GPL') +depends=('poppler-qt' 'qtwebkit') +optdepends=('ghostscript: LaTeX to HTML conversion command' + 'ibus-qt: accented characters support' + 'poppler: PDF rendering support') +install="$pkgname.install" +source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('3599fd142d8d3596b7bd14724fc1888e') + +build() { + cd "$pkgname-$pkgver" + qmake PREFIX=/usr texmaker.pro + make +} +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -dm755 "$pkgdir/usr/share" + make INSTALL_PATH="$pkgdir" INSTALL_ROOT="$pkgdir" PREFIX="/usr" install +} diff --git a/community/texmaker/texmaker.install b/community/texmaker/texmaker.install new file mode 100644 index 000000000..9591f6c5d --- /dev/null +++ b/community/texmaker/texmaker.install @@ -0,0 +1,7 @@ +post_install() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 5c1fc7d4e..cf53e9650 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 176240 2013-01-28 00:29:18Z allan $ +# $Id: PKGBUILD 180066 2013-03-15 22:55:31Z allan $ # Maintainer: Allan McRae # Contributor: Aaron Griffin pkgname=bash _basever=4.2 -_patchlevel=042 #prepare for some patches +_patchlevel=045 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=3 +pkgrel=1 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64') license=('GPL') @@ -162,4 +162,10 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '7bc4942a66ca4024ee964db7ede07896' '7e97f02d9dd1436eed278f2732542ecf' '1cf7701017ebfc8e129de92c8f8b798c' - '4ef8b5af440bf7b939b7955ce68b4dc7') + '4ef8b5af440bf7b939b7955ce68b4dc7' + '9e61168fca692d8d1a733c389a63712e' + '665861582049ba270cc726b7a6e0324d' + 'b4b11d64b45ea9ec50dcc74c6c3861f6' + '233031ccf9cbb1265be30753e0fa41f4' + '1661bcc83c4715f54368877452ff2247' + '302c5516e469171b5187118024fca2a7') diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index e4e66c7dd..d47204c74 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 174749 2013-01-06 02:22:46Z allan $ +# $Id: PKGBUILD 180068 2013-03-15 22:55:34Z allan $ # Maintainer: Allan McRae # Contributor: damir pkgname=mpfr -_pkgver=3.1.1 -_patchlevel=p2 -pkgver=${_pkgver}.${_patchlevel} -pkgrel=2 +_pkgver=3.1.2 +#_patchlevel=p1 +#pkgver=${_pkgver}.${_patchlevel} +pkgver=${_pkgver} +pkgrel=1 pkgdesc="Multiple-precision floating-point library" arch=('i686' 'x86_64') url="http://www.mpfr.org/" @@ -14,15 +15,13 @@ license=('LGPL') depends=('gmp>=5.0') options=('!libtool') install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc} - mpfr-${_pkgver}-${_patchlevel}.patch) -md5sums=('91d51c41fcf2799e4ee7a7126fc95c17' - '91b187a2229211e543ba6fb82a079b2c' - 'eef835f97bc26ea20b0232bd913acdd8') +source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}) +md5sums=('e3d203d188b8fe60bb6578dd3152e05c' + '63d1a00bedd4fed3717115297f70d029') build() { cd "${srcdir}/${pkgname}-${_pkgver}" - patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch + #patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch ./configure --prefix=/usr --enable-thread-safe --enable-shared make } diff --git a/core/mpfr/mpfr-3.1.1-p2.patch b/core/mpfr/mpfr-3.1.1-p2.patch deleted file mode 100644 index 43dfcbfe3..000000000 --- a/core/mpfr/mpfr-3.1.1-p2.patch +++ /dev/null @@ -1,405 +0,0 @@ -diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES ---- mpfr-3.1.1-a/PATCHES 2012-08-30 09:28:51.000000000 +0000 -+++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:28:51.000000000 +0000 -@@ -0,0 +1 @@ -+get_decimal64 -diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION ---- mpfr-3.1.1-a/VERSION 2012-07-03 15:01:13.000000000 +0000 -+++ mpfr-3.1.1-b/VERSION 2012-08-30 09:28:51.000000000 +0000 -@@ -1 +1 @@ --3.1.1 -+3.1.1-p1 -diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c ---- mpfr-3.1.1-a/src/get_d64.c 2012-07-03 15:01:18.000000000 +0000 -+++ mpfr-3.1.1-b/src/get_d64.c 2012-08-30 09:28:51.000000000 +0000 -@@ -32,6 +32,10 @@ - - #ifdef MPFR_WANT_DECIMAL_FLOATS - -+#ifndef DEC64_MAX -+# define DEC64_MAX 9.999999999999999E384dd -+#endif -+ - #ifdef DPD_FORMAT - static int T[1000] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32, -@@ -142,26 +146,14 @@ - static _Decimal64 - get_decimal64_min (int negative) - { -- union ieee_double_extract x; -- -- x.s.sig = (negative) ? 1 : 0; -- x.s.exp = 0; -- x.s.manh = 0; -- x.s.manl = 1; -- return x.d; -+ return negative ? - 1E-398dd : 1E-398dd; - } - - /* construct the decimal64 largest finite number with given sign */ - static _Decimal64 - get_decimal64_max (int negative) - { -- union ieee_double_extract x; -- -- x.s.sig = (negative) ? 1 : 0; -- x.s.exp = 1919; -- x.s.manh = 1048575; /* 2^20-1 */ -- x.s.manl = ~0; -- return x.d; -+ return negative ? - DEC64_MAX : DEC64_MAX; - } - - /* one-to-one conversion: -@@ -334,7 +326,8 @@ - /* the largest decimal64 number is just below 10^(385) < 2^1279 */ - else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */ - { -- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) -+ if (rnd_mode == MPFR_RNDZ -+ || (rnd_mode == MPFR_RNDU && negative != 0) - || (rnd_mode == MPFR_RNDD && negative == 0)) - return get_decimal64_max (negative); - else -@@ -354,6 +347,15 @@ - which corresponds to s=[0.]1000...000 and e=-397 */ - if (e < -397) - { -+ if (rnd_mode == MPFR_RNDN && e == -398) -+ { -+ /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal), -+ src should round to +/- 1E-398 in MPFR_RNDN. */ -+ mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA); -+ return e == -398 && s[negative] <= '5' ? -+ get_decimal64_zero (negative) : -+ get_decimal64_min (negative); -+ } - if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN - || (rnd_mode == MPFR_RNDD && negative == 0) - || (rnd_mode == MPFR_RNDU && negative != 0)) -@@ -379,7 +381,8 @@ - which corresponds to s=[0.]9999...999 and e=385 */ - else if (e > 385) - { -- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) -+ if (rnd_mode == MPFR_RNDZ -+ || (rnd_mode == MPFR_RNDU && negative != 0) - || (rnd_mode == MPFR_RNDD && negative == 0)) - return get_decimal64_max (negative); - else -diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h ---- mpfr-3.1.1-a/src/mpfr.h 2012-07-03 15:01:19.000000000 +0000 -+++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.1.1" -+#define MPFR_VERSION_STRING "3.1.1-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c ---- mpfr-3.1.1-a/src/version.c 2012-07-03 15:01:18.000000000 +0000 -+++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:28:51.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.1"; -+ return "3.1.1-p1"; - } -diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c ---- mpfr-3.1.1-a/tests/tget_set_d64.c 2012-07-03 15:01:24.000000000 +0000 -+++ mpfr-3.1.1-b/tests/tget_set_d64.c 2012-08-30 09:28:51.000000000 +0000 -@@ -25,6 +25,10 @@ - #include /* for exit */ - #include "mpfr-test.h" - -+#ifndef DEC64_MAX -+# define DEC64_MAX 9.999999999999999E384dd -+#endif -+ - /* #define DEBUG */ - - static void -@@ -149,6 +153,15 @@ - mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ); - mpfr_set (y, x, MPFR_RNDZ); - d = mpfr_get_decimal64 (x, MPFR_RNDU); -+ ASSERT_ALWAYS (d == DEC64_MAX); -+ mpfr_set_ui (x, 0, MPFR_RNDZ); -+ mpfr_set_decimal64 (x, d, MPFR_RNDZ); -+ ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); -+ -+ mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ); -+ mpfr_set (y, x, MPFR_RNDZ); -+ d = mpfr_get_decimal64 (x, MPFR_RNDA); -+ ASSERT_ALWAYS (d == -DEC64_MAX); - mpfr_set_ui (x, 0, MPFR_RNDZ); - mpfr_set_decimal64 (x, d, MPFR_RNDZ); - ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); -@@ -225,6 +238,83 @@ - mpfr_clear (x); - } - -+static void -+check_overflow (void) -+{ -+ mpfr_t x; -+ int err = 0, neg, rnd; -+ -+ mpfr_init2 (x, 96); -+ for (neg = 0; neg < 2; neg++) -+ RND_LOOP (rnd) -+ { -+ _Decimal64 d, e; -+ mpfr_rnd_t r = (mpfr_rnd_t) rnd; -+ int sign = neg ? -1 : 1; -+ -+ e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX; -+ /* This tests the binary exponent e > 1279 case of get_d64.c */ -+ mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN); -+ d = mpfr_get_decimal64 (x, r); -+ if (d != e) -+ { -+ printf ("Error 1 in check_overflow for %s, %s\n", -+ neg ? "negative" : "positive", -+ mpfr_print_rnd_mode (r)); -+ err = 1; -+ } -+ /* This tests the decimal exponent e > 385 case of get_d64.c */ -+ mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN); -+ d = mpfr_get_decimal64 (x, r); -+ if (d != e) -+ { -+ printf ("Error 2 in check_overflow for %s, %s\n", -+ neg ? "negative" : "positive", -+ mpfr_print_rnd_mode (r)); -+ err = 1; -+ } -+ /* This tests the last else (-382 <= e <= 385) of get_d64.c */ -+ mpfr_set_decimal64 (x, e, MPFR_RNDA); -+ d = mpfr_get_decimal64 (x, r); -+ if (d != e) -+ { -+ printf ("Error 3 in check_overflow for %s, %s\n", -+ neg ? "negative" : "positive", -+ mpfr_print_rnd_mode (r)); -+ err = 1; -+ } -+ } -+ mpfr_clear (x); -+ if (err) -+ exit (1); -+} -+ -+static void -+check_tiny (void) -+{ -+ mpfr_t x; -+ _Decimal64 d; -+ -+ /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round -+ to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between -+ 0 and 1E-398 is not a representable binary number, so that there -+ are no tests for it. */ -+ mpfr_init2 (x, 128); -+ mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ); -+ d = mpfr_get_decimal64 (x, MPFR_RNDN); -+ MPFR_ASSERTN (d == 1.0E-398dd); -+ mpfr_neg (x, x, MPFR_RNDN); -+ d = mpfr_get_decimal64 (x, MPFR_RNDN); -+ MPFR_ASSERTN (d == -1.0E-398dd); -+ mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU); -+ d = mpfr_get_decimal64 (x, MPFR_RNDN); -+ MPFR_ASSERTN (d == 1.0E-398dd); -+ mpfr_neg (x, x, MPFR_RNDN); -+ d = mpfr_get_decimal64 (x, MPFR_RNDN); -+ MPFR_ASSERTN (d == -1.0E-398dd); -+ mpfr_clear (x); -+} -+ - int - main (void) - { -@@ -241,6 +331,8 @@ - check_inf_nan (); - check_random (); - check_native (); -+ check_overflow (); -+ check_tiny (); - - tests_end_mpfr (); - return 0; -diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES ---- mpfr-3.1.1-a/PATCHES 2012-08-30 09:35:12.000000000 +0000 -+++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:35:12.000000000 +0000 -@@ -0,0 +1 @@ -+strtofr-ternary-value -diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION ---- mpfr-3.1.1-a/VERSION 2012-08-30 09:28:51.000000000 +0000 -+++ mpfr-3.1.1-b/VERSION 2012-08-30 09:35:12.000000000 +0000 -@@ -1 +1 @@ --3.1.1-p1 -+3.1.1-p2 -diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h ---- mpfr-3.1.1-a/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 -+++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:35:12.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.1.1-p1" -+#define MPFR_VERSION_STRING "3.1.1-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c ---- mpfr-3.1.1-a/src/strtofr.c 2012-07-03 15:01:16.000000000 +0000 -+++ mpfr-3.1.1-b/src/strtofr.c 2012-08-30 09:35:12.000000000 +0000 -@@ -667,6 +667,20 @@ - /* (z, exp_z) = base^(exp_base-pstr_size) */ - z = result + 2*ysize + 1; - err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize); -+ /* Since we want y/z rounded toward zero, we must get an upper -+ bound of z. If err >= 0, the error on z is bounded by 2^err. */ -+ if (err >= 0) -+ { -+ mp_limb_t cy; -+ unsigned long h = err / GMP_NUMB_BITS; -+ unsigned long l = err - h * GMP_NUMB_BITS; -+ -+ if (h >= ysize) /* not enough precision in z */ -+ goto next_loop; -+ cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l); -+ if (cy != 0) /* the code below requires z on ysize limbs */ -+ goto next_loop; -+ } - exact = exact && (err == -1); - if (err == -2) - goto underflow; /* FIXME: Sure? */ -@@ -730,6 +744,7 @@ - MPFR_RNDN, rnd, MPFR_PREC(x))) - break; - -+ next_loop: - /* update the prec for next loop */ - MPFR_ZIV_NEXT (loop, prec); - } /* loop */ -diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c ---- mpfr-3.1.1-a/src/version.c 2012-08-30 09:28:51.000000000 +0000 -+++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:35:12.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.1-p1"; -+ return "3.1.1-p2"; - } -diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c ---- mpfr-3.1.1-a/tests/tstrtofr.c 2012-07-03 15:01:24.000000000 +0000 -+++ mpfr-3.1.1-b/tests/tstrtofr.c 2012-08-30 09:35:12.000000000 +0000 -@@ -1105,6 +1105,92 @@ - mpfr_clear (y); - } - -+/* From a bug reported by Joseph S. Myers -+ https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */ -+static void -+bug20120814 (void) -+{ -+ mpfr_exp_t emin = -30, e; -+ mpfr_t x, y; -+ int r; -+ char s[64], *p; -+ -+ mpfr_init2 (x, 2); -+ mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN); -+ mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD); -+ s[0] = s[1]; -+ s[1] = '.'; -+ for (p = s; *p != 0; p++) ; -+ *p = 'e'; -+ sprintf (p + 1, "%d", (int) e - 1); -+ -+ mpfr_init2 (y, 4); -+ r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN); -+ if (r <= 0 || ! mpfr_equal_p (x, y)) -+ { -+ printf ("Error in bug20120814\n"); -+ printf ("mpfr_strtofr failed on string \"%s\"\n", s); -+ printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin); -+ printf ("Got inex = %-6d and y = ", r); -+ mpfr_dump (y); -+ exit (1); -+ } -+ -+ mpfr_clear (x); -+ mpfr_clear (y); -+} -+ -+static void -+bug20120829 (void) -+{ -+ mpfr_t x1, x2, e; -+ int inex1, inex2, i, r; -+ char s[48] = "1e-1"; -+ -+ mpfr_init2 (e, 128); -+ mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0); -+ -+ inex1 = mpfr_set_si (e, -1, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); -+ -+ for (i = 1; i <= sizeof(s) - 5; i++) -+ { -+ s[3+i] = '0'; -+ s[4+i] = 0; -+ inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); -+ RND_LOOP(r) -+ { -+ mpfr_rnd_t rnd = (mpfr_rnd_t) r; -+ -+ inex1 = mpfr_exp10 (x1, e, rnd); -+ inex1 = SIGN (inex1); -+ inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd); -+ inex2 = SIGN (inex2); -+ /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do: -+ strtofr.c:...: MPFR assertion failed: cy == 0 -+ r8396 is OK. -+ On 64-bit machines, for i = 15, -+ r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0) -+ r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize -+ r8394 and r8396 are OK. -+ */ -+ if (! mpfr_equal_p (x1, x2) || inex1 != inex2) -+ { -+ printf ("Error in bug20120829 for i = %d, rnd = %s\n", -+ i, mpfr_print_rnd_mode (rnd)); -+ printf ("Expected inex = %d, x = ", inex1); -+ mpfr_dump (x1); -+ printf ("Got inex = %d, x = ", inex2); -+ mpfr_dump (x2); -+ exit (1); -+ } -+ } -+ } -+ -+ mpfr_clears (e, x1, x2, (mpfr_ptr) 0); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -1117,6 +1203,8 @@ - check_retval (); - bug20081028 (); - test20100310 (); -+ bug20120814 (); -+ bug20120829 (); - - tests_end_mpfr (); - return 0; diff --git a/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch b/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch deleted file mode 100644 index 0d9f1251d..000000000 --- a/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3761902e2e120849c283106fd4b78b6adec7367e Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Tue, 8 Jan 2013 20:00:01 +0100 -Subject: [PATCH] dbus: fix serialization of calendar timers - ---- - src/core/dbus-timer.c | 25 +++++++++++++++---------- - 1 file changed, 15 insertions(+), 10 deletions(-) - -diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c -index 11d18cb..b22fcb5 100644 ---- a/src/core/dbus-timer.c -+++ b/src/core/dbus-timer.c -@@ -69,22 +69,28 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi - return -ENOMEM; - - LIST_FOREACH(value, k, p->values) { -- char *buf; -+ _cleanup_free_ char *buf = NULL; - const char *t; - size_t l; - bool b; - - t = timer_base_to_string(k->base); -- assert(endswith(t, "Sec")); - -- /* s/Sec/USec/ */ -- l = strlen(t); -- buf = new(char, l+2); -- if (!buf) -- return -ENOMEM; -+ if (endswith(t, "Sec")) { -+ -+ /* s/Sec/USec/ */ -+ l = strlen(t); -+ buf = new(char, l+2); -+ if (!buf) -+ return -ENOMEM; - -- memcpy(buf, t, l-3); -- memcpy(buf+l-3, "USec", 5); -+ memcpy(buf, t, l-3); -+ memcpy(buf+l-3, "USec", 5); -+ } else { -+ buf = strdup(t); -+ if (!buf) -+ return -ENOMEM; -+ } - - b = dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) && - dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &buf) && -@@ -92,7 +98,6 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi - dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &k->next_elapse) && - dbus_message_iter_close_container(&sub, &sub2); - -- free(buf); - if (!b) - return -ENOMEM; - } --- -1.8.1 - diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 8bae20a2b..0ba718aa0 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=197 -pkgrel=4 +pkgver=198 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -13,13 +13,11 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - '0001-dbus-fix-serialization-of-calendar-timers.patch' 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' 'use-split-usr-path.patch') -md5sums=('56a860dceadfafe59f40141eb5223743' - '0341d680d5ab16bab3978bac96bf8797' +md5sums=('26a75e2a310f8c1c1ea9ec26ddb171c5' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' @@ -31,13 +29,8 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - # fix assertion failure when using calendar timers - # upstream 3761902e2e120849c283106fd4b78b6adec7367e - patch -Np1 <"$srcdir/0001-dbus-fix-serialization-of-calendar-timers.patch" - ./configure \ - PYTHON=python2 \ - PYTHON_CONFIG=python2-config \ + --enable-static \ --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ @@ -48,9 +41,6 @@ build() { --with-sysvinit-path= \ --with-sysvrcnd-path= - # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. - # https://pokersource.info/show_bug.cgi?id=50989 - make } @@ -69,8 +59,6 @@ package_systemd() { 'libmicrohttpd: systemd-journal-gatewayd' 'quota-tools: kernel-level quota management' 'python: systemd library bindings' - 'python2-cairo: systemd-analyze' - 'python2-gobject: systemd-analyze' 'systemd-sysvcompat: symlink package to provide sysvinit binaries') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf @@ -91,14 +79,6 @@ package_systemd() { install -dm755 "$pkgdir/bin" ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - # move bash-completion and symlink for *ctl's - install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ - "$pkgdir/usr/share/bash-completion/completions/systemctl" - for ctl in {login,journal,timedate,locale,hostname,systemd-coredump}ctl udevadm; do - ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl" - done - rm -rf "$pkgdir/etc/bash_completion.d" - # don't write units to /etc by default -- we'll enable this on post_install # as a sane default rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD index e4e64853d..0c022c9f7 100644 --- a/core/texinfo/PKGBUILD +++ b/core/texinfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178319 2013-02-20 06:23:03Z allan $ +# $Id: PKGBUILD 180067 2013-03-15 22:55:32Z allan $ # Maintainer: Allan McRae # Contributor: Tom Newsom pkgname=texinfo -pkgver=5.0 +pkgver=5.1 pkgrel=1 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ groups=('base' 'base-devel') depends=('ncurses' 'findutils' 'gzip' 'perl' 'sh') install=texinfo.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('ef2fad34c71ddc95b20c7d6a08c0d7a6' - 'a1e46e27d14467b05abe652bfc30684e') +md5sums=('52ee905a3b705020d2a1b6ec36d53ca6' + '65c8c95799ea5905e03cee5825d3553f') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 83427aeed..91da62eb7 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ +# $Id: PKGBUILD 180054 2013-03-15 08:10:52Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,11 +22,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '61b8b43e04065556b2b173d34111674d' + 'a762b6f22a64473a0b4d8dc5366b25d3' '5cc106ba38bab845ea62138fc0d1bbf1' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') + 'f3def2cefdcbb954c21d8505d23cc83c') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-PAE diff --git a/kernels/linux-libre-pae/change-default-console-loglevel.patch b/kernels/linux-libre-pae/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/kernels/linux-libre-pae/change-default-console-loglevel.patch +++ b/kernels/linux-libre-pae/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 88ec434c7..553af3431 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.2-1-LIBRE-PAE +KERNEL_VERSION=3.8.3-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 063c6fed6..3205c4d19 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -13,7 +13,7 @@ _releasever=11 _rtpatchver=rt30 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -pkgrel=1 +pkgrel=2 _lxopkgver=${_basekernel}.11 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -49,7 +49,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' '4909a0271af4e5f373136b382826717f' - '88d501404f172dac6fcb248978251560' + 'f3def2cefdcbb954c21d8505d23cc83c' 'c188074cdc350ac7cf4e9c8d14c0575e') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. diff --git a/kernels/linux-libre-rt/change-default-console-loglevel.patch b/kernels/linux-libre-rt/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/kernels/linux-libre-rt/change-default-console-loglevel.patch +++ b/kernels/linux-libre-rt/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index c066ccb92..9d9a9ad00 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.6.11-1-rt30-LIBRE-RT +KERNEL_VERSION=3.6.11-2-rt30-LIBRE-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index f2bb2f1a7..3fb5fdb37 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ +# $Id: PKGBUILD 180054 2013-03-15 08:10:52Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,11 +22,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '61b8b43e04065556b2b173d34111674d' + 'a762b6f22a64473a0b4d8dc5366b25d3' 'c13961a22d8c742fb31b59a1e27a0e7b' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') + 'f3def2cefdcbb954c21d8505d23cc83c') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-XEN diff --git a/kernels/linux-libre-xen/change-default-console-loglevel.patch b/kernels/linux-libre-xen/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/kernels/linux-libre-xen/change-default-console-loglevel.patch +++ b/kernels/linux-libre-xen/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 88803e55b..136ca7163 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.2-1-LIBRE-XEN +KERNEL_VERSION=3.8.3-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index 6cfb023cb..0f4741470 100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD @@ -3,17 +3,18 @@ # Contributor (Parabola): Márcio Silva pkgname=crosstool-ng -pkgver=1.16.0 +pkgver=1.18.0 pkgrel=1 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)" arch=('i686' 'x86_64') url="http://crosstool-ng.org/" license=(GPL2) -depends=('cvs' 'curl' 'gperf') +depends=('cvs' 'curl' 'gperf' 'wget') makedepends=('libtool') optdepends=('subversion: for retrieving eglibc sources') source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2) #libc_ports_short_name.patch) +md5sums=('3376d389c632baa77f0bce1db1a196a9') build() { cd $srcdir/$pkgname-$pkgver @@ -26,5 +27,6 @@ build() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install + + install -Dm644 ct-ng.comp ${pkgdir}/usr/share/bash-completion/completions/ct-ng } -md5sums=('900f5f72df3ab9b48b6d1efd1d6634b8') diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 95d0c374f..53b7a89ee 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.2 +_kernver=3.8.3 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=7 +pkgrel=8 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index c177a1ad6..3a0571c9d 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.68 +_kernver=3.0.69 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=6 +pkgrel=7 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index fc5cd17c9..fb78c51a3 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179286 2013-03-04 17:14:18Z tpowa $ +# $Id: PKGBUILD 180056 2013-03-15 09:48:23Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=68 +_sublevel=69 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.66 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.68 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,19 +32,19 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '571adcbf6f408967fe4df19c1c17b00b' + 'cf63ee4dfe973aa9f933ed552ac5c277' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' + 'f3def2cefdcbb954c21d8505d23cc83c' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '7870185804a1795293698f9a0b770720') + '31fc866c5f8a15f21222e5f236f5cd03') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/change-default-console-loglevel.patch b/libre/linux-libre-lts/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/libre/linux-libre-lts/change-default-console-loglevel.patch +++ b/libre/linux-libre-lts/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 283424020..f8eccd0c4 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.68-1-LIBRE-LTS +KERNEL_VERSION=3.0.69-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index a1d7989a1..9a9bd3ea3 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ +# $Id: PKGBUILD 180054 2013-03-15 08:10:52Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '61b8b43e04065556b2b173d34111674d' + 'a762b6f22a64473a0b4d8dc5366b25d3' '4d73ccd0f1825a4bd474d4fead6c0d42' 'e132184c6d02ef580a504967c067e1c5' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - 'e46425096ddbfb9566ef276ac4b3e623') + 'f3def2cefdcbb954c21d8505d23cc83c' + '72a7d05df8498c0e45632f083403605a') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/libre/linux-libre/change-default-console-loglevel.patch +++ b/libre/linux-libre/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index e8d4fb3d8..0a442abb8 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.2-1-LIBRE +KERNEL_VERSION=3.8.3-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/grass/PKGBUILD b/pcr/grass/PKGBUILD new file mode 100644 index 000000000..aa32f8ca8 --- /dev/null +++ b/pcr/grass/PKGBUILD @@ -0,0 +1,138 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: Emiliano Vavassori + +pkgname=grass +pkgver=6.4.2 +pkgrel=5 +pkgdesc='Geographic Information System (GIS) used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization.' +arch=('i686' 'x86_64') +url='http://grass.osgeo.org/' +license=('GPL') +depends=('cfitsio' 'fftw' 'gdal' 'glu' 'libjpeg' 'libpng' 'libtiff' 'libxmu' 'mesa' 'python2' 'postgresql' 'proj' 'tcl' 'tk' 'wxpython' 'xorg-server') +makedepends=('freetype2') +optdepends=('sqlite3: sqlite3 database interface' + 'mysql: mysql database interface' + 'r: R language interface' + 'blas: required for GMATH library' + 'lapack: required for GMATH library' + 'cairo: cairo support' + 'ffmpeg: ffmpeg support' + 'lesstif: motif support') +options=('!libtool' '!makeflags') +install='grass.install' +source=("http://grass.osgeo.org/grass64/source/${pkgname}-${pkgver}.tar.gz" + "grass.sh" + "grass.conf" + "grass-python2.patch" + "grass-tk86-fix.patch") +md5sums=('d3398d6b1e3a2ef19cfb6e39a5ae9919' + '23da2e9399b3c5504851dec37821abe1' + '6103480c2a1adc19a50b9e925e5e6d4c' + '8717c73e7d262b1cff44d35ce80c50bb' + 'b7cb69248a387f70dabd5ce20b8297dc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Replacing previous python2 fixes with a patch. + # Thanks to Gunther Schulz to have reported a possible bug in the patching. + patch -p1 -i "${srcdir}/grass-python2.patch" + + # Solves build issue reported here: + # http://trac.osgeo.org/grass/ticket/1843 + patch -p1 -i "${srcdir}/grass-tk86-fix.patch" + + # the following exports are probably not needed + export PYTHON=python2 + export DOXNAME=python2 + export GRASS_python=python2 + + # Enabling 64bit support - EGV + if [ "$CARCH" = "x86_64" ]; then + ENABLE64BIT="--enable-64bit" + else + ENABLE64BIT="--disable-64bit" + fi + + # see ${srcdir}/grass-6.4.0/REQUIREMENTS.html for options + # GLw is hard disabled, since no package in Archlinux can provide it - EGV + ./configure ${ENABLE64BIT} \ + --prefix=/opt \ + --enable-64bit \ + --enable-W11 \ + --with-jpeg \ + --with-tiff \ + --with-png \ + --with-tcltk \ + --with-opengl \ + --with-fftw \ + --with-postgres \ + --with-freetype \ + --with-freetype-includes=/usr/include/freetype2 \ + --without-glw \ + --with-nls \ + --with-gdal \ + --with-geos \ + --with-proj-includes=/usr/include \ + --with-proj-libs=/usr/lib \ + --with-proj-share=/usr/share/proj \ + --with-python=/usr/bin/python2-config \ + --with-wxwidgets=/usr/bin/wx-config + + # sqlite3 support + # --with-sqlite \ + + # mysql support + # --with-mysql \ + # --with-mysql-includes=/usr/include/mysql \ + + # blas support + # --with-blas \ + + # lapack support + # --with-lapack \ + + make + + # some more potential problems nvm, works without, but save for future use if problems arrise + #cd ${pkgdir}/opt/grass-${pkgver} + #sed -i 's/PYTHON = python/PYTHON = python2/' include/Make/Python.make + #sed -i 's/GRASS_PYTHON=python/GRASS_PYTHON=python2/' etc/Init.sh +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make \ + INST_DIR=${pkgdir}/opt/grass-${pkgver} \ + BINDIR=${pkgdir}/usr/bin \ + install + + # fix $GISBASE path + sed -i "s|GISBASE=${pkgdir}/opt/grass-${pkgver}|GISBASE=/opt/grass-${pkgver}|g" \ + ${pkgdir}/usr/bin/grass64 + + # install profile.d file + install -D ${srcdir}/grass.sh \ + ${pkgdir}/etc/profile.d/grass.sh + + # install some freedesktop.org compatibility + install -D -m644 gui/icons/grass.desktop \ + ${pkgdir}/usr/share/applications/grass.desktop + + sed -i -e 's/grass65/grass64/' -e 's_/usr/share/icons_/usr/share/pixmaps_' \ + ${pkgdir}/usr/share/applications/grass.desktop + + install -D -m644 gui/icons/grass-48x48.png \ + ${pkgdir}/usr/share/pixmaps/grass-48x48.png + + install -D -m644 ${srcdir}/grass.conf \ + ${pkgdir}/etc/ld.so.conf.d/grass.conf + + # install g.html2man which is needed for some extensions + # FS#25705 - [grass] g.html2man is not installed into package directory + # https://bugs.archlinux.org/task/25705 + # most likely upstream problem which will be fixed in a version later than 6.4.1 + cp -r ./tools/g.html2man ${pkgdir}/opt/${pkgname}-${pkgver}/tools +} diff --git a/pcr/grass/grass-python2.patch b/pcr/grass/grass-python2.patch new file mode 100644 index 000000000..ee35949b5 --- /dev/null +++ b/pcr/grass/grass-python2.patch @@ -0,0 +1,327 @@ +diff -ur grass-6.4.2/doc/python/example_ctypes.py grass-6.4.2-new/doc/python/example_ctypes.py +--- grass-6.4.2/doc/python/example_ctypes.py 2010-04-17 14:15:26.000000000 +0200 ++++ grass-6.4.2-new/doc/python/example_ctypes.py 2012-08-16 09:33:01.480497320 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + import os, sys, subprocess + from ctypes import * + grass = CDLL("libgrass_gis.so") +diff -ur grass-6.4.2/general/g.parser/test.py grass-6.4.2-new/general/g.parser/test.py +--- grass-6.4.2/general/g.parser/test.py 2009-07-23 23:08:41.000000000 +0200 ++++ grass-6.4.2-new/general/g.parser/test.py 2012-08-16 09:33:01.513831191 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # g.parser demo script for python programing + +diff -ur grass-6.4.2/gui/scripts/g.change.gui.py grass-6.4.2-new/gui/scripts/g.change.gui.py +--- grass-6.4.2/gui/scripts/g.change.gui.py 2009-05-30 07:36:32.000000000 +0200 ++++ grass-6.4.2-new/gui/scripts/g.change.gui.py 2012-08-16 09:33:04.353875090 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ############################################################################ + # +diff -ur grass-6.4.2/gui/scripts/g.extension.py grass-6.4.2-new/gui/scripts/g.extension.py +--- grass-6.4.2/gui/scripts/g.extension.py 2012-02-18 18:28:29.000000000 +0100 ++++ grass-6.4.2-new/gui/scripts/g.extension.py 2012-08-16 09:33:04.393875703 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ############################################################################ + # +diff -ur grass-6.4.2/gui/scripts/g.extension.rebuild.all.py grass-6.4.2-new/gui/scripts/g.extension.rebuild.all.py +--- grass-6.4.2/gui/scripts/g.extension.rebuild.all.py 2012-02-01 10:26:11.000000000 +0100 ++++ grass-6.4.2-new/gui/scripts/g.extension.rebuild.all.py 2012-08-16 09:33:04.320541242 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ############################################################################ + # +diff -ur grass-6.4.2/gui/scripts/v.type_wrapper.py grass-6.4.2-new/gui/scripts/v.type_wrapper.py +--- grass-6.4.2/gui/scripts/v.type_wrapper.py 2009-05-30 07:36:32.000000000 +0200 ++++ grass-6.4.2-new/gui/scripts/v.type_wrapper.py 2012-08-16 09:33:04.287207393 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: v.type_wrapper.py (v.type wrapper script) +diff -ur grass-6.4.2/gui/wxpython/gui_modules/menuform.py grass-6.4.2-new/gui/wxpython/gui_modules/menuform.py +--- grass-6.4.2/gui/wxpython/gui_modules/menuform.py 2012-01-04 10:55:50.000000000 +0100 ++++ grass-6.4.2-new/gui/wxpython/gui_modules/menuform.py 2012-08-16 09:33:03.000520822 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + """ + @brief Construct simple wx.Python GUI from a GRASS command interface + description. +diff -ur grass-6.4.2/gui/wxpython/scripts/d.rast3d.py grass-6.4.2-new/gui/wxpython/scripts/d.rast3d.py +--- grass-6.4.2/gui/wxpython/scripts/d.rast3d.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/d.rast3d.py 2012-08-16 09:33:04.083870925 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + ############################################################################ + # +diff -ur grass-6.4.2/gui/wxpython/scripts/p.cmd.py grass-6.4.2-new/gui/wxpython/scripts/p.cmd.py +--- grass-6.4.2/gui/wxpython/scripts/p.cmd.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/p.cmd.py 2012-08-16 09:33:03.870534267 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: p.cmd +diff -ur grass-6.4.2/gui/wxpython/scripts/p.db.py grass-6.4.2-new/gui/wxpython/scripts/p.db.py +--- grass-6.4.2/gui/wxpython/scripts/p.db.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/p.db.py 2012-08-16 09:33:04.047203667 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: p.db +diff -ur grass-6.4.2/gui/wxpython/scripts/p.mon.py grass-6.4.2-new/gui/wxpython/scripts/p.mon.py +--- grass-6.4.2/gui/wxpython/scripts/p.mon.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/p.mon.py 2012-08-16 09:33:03.940535364 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: p.mon +diff -ur grass-6.4.2/gui/wxpython/scripts/p.rast.py grass-6.4.2-new/gui/wxpython/scripts/p.rast.py +--- grass-6.4.2/gui/wxpython/scripts/p.rast.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/p.rast.py 2012-08-16 09:33:04.013869835 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: p.rast +diff -ur grass-6.4.2/gui/wxpython/scripts/p.vect.py grass-6.4.2-new/gui/wxpython/scripts/p.vect.py +--- grass-6.4.2/gui/wxpython/scripts/p.vect.py 2010-10-17 19:15:32.000000000 +0200 ++++ grass-6.4.2-new/gui/wxpython/scripts/p.vect.py 2012-08-16 09:33:03.980535999 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ############################################################################ + # + # MODULE: p.vect +diff -ur grass-6.4.2/imagery/i.atcorr/create_iwave.py grass-6.4.2-new/imagery/i.atcorr/create_iwave.py +--- grass-6.4.2/imagery/i.atcorr/create_iwave.py 2010-12-22 12:09:24.000000000 +0100 ++++ grass-6.4.2-new/imagery/i.atcorr/create_iwave.py 2012-08-16 09:33:04.430542943 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + """ + Created on Sat Mar 27 11:35:32 2010 + +diff -ur grass-6.4.2/include/Make/Platform.make.in grass-6.4.2-new/include/Make/Platform.make.in +--- grass-6.4.2/include/Make/Platform.make.in 2010-11-08 08:23:48.000000000 +0100 ++++ grass-6.4.2-new/include/Make/Platform.make.in 2012-08-16 09:33:35.484354613 +0200 +@@ -217,7 +217,7 @@ + USE_CAIRO = @USE_CAIRO@ + + #Python +-PYTHON = python ++PYTHON = python2 + PYTHONINC = @PYTHONINC@ + PYTHONCFLAGS = @PYTHONCFLAGS@ + PYTHONLDFLAGS = @PYTHONLDFLAGS@ +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/ctypedescs.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/ctypedescs.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/ctypedescs.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/ctypedescs.py 2012-08-16 09:33:04.987218247 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ''' + ctypesgencore.ctypedescs contains classes to represent a C type. All of them +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/descriptions.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/descriptions.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/descriptions.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/descriptions.py 2012-08-16 09:33:04.883883291 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + ctypesgencore.descriptions contains classes to represent a description of a +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/expressions.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/expressions.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/expressions.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/expressions.py 2012-08-16 09:33:05.023885450 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ''' + The expressions module contains classes to represent an expression. The main +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/__init__.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/__init__.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/__init__.py 2012-08-16 09:33:04.920550527 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + Ctypesgencore is the module that contains the main body of ctypesgen - in fact, +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/messages.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/messages.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/messages.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/messages.py 2012-08-16 09:33:04.503877428 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + ctypesgencore.messages contains functions to display status, error, or warning +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/options.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/options.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/options.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/options.py 2012-08-16 09:33:04.707213885 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + All of the components of ctypegencore require an argument called "options". +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py 2012-08-16 09:33:05.393891162 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ''' + This file contains classes that represent C declarations. cparser produces +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cgrammar.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cgrammar.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cgrammar.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cgrammar.py 2012-08-16 09:33:05.433891816 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + '''This is a yacc grammar for C. + +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cparser.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cparser.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cparser.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cparser.py 2012-08-16 09:33:05.213888390 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ''' + Parse a C source file. +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py 2012-08-16 09:33:05.093886533 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + ''' + ctypesgencore.parser.ctypesparser contains a class, CtypesParser, which is a +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py 2012-08-16 09:33:05.473892425 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + DataCollectingParser subclasses ctypesparser.CtypesParser and builds Description +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/__init__.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/__init__.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/__init__.py 2012-08-16 09:33:05.283889499 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + This package parses C header files and generates lists of functions, typedefs, +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/pplexer.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/pplexer.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/pplexer.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/pplexer.py 2012-08-16 09:33:05.180554533 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + '''Preprocess a C source file using gcc and convert the result into + a token stream +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/preprocessor.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/preprocessor.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/preprocessor.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/preprocessor.py 2012-08-16 09:33:05.250555640 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + '''Preprocess a C source file using gcc and convert the result into + a token stream +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/__init__.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/__init__.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/__init__.py 2012-08-16 09:33:04.640546189 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + This module is the backend to ctypesgen; it contains classes to +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/printer.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/printer.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/printer.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/printer.py 2012-08-16 09:33:04.537211279 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + import os, sys, time + from ctypesgencore.descriptions import * +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/dependencies.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/dependencies.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/dependencies.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/dependencies.py 2012-08-16 09:33:04.743881125 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + The dependencies module determines which descriptions depend on which other +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/__init__.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/__init__.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/__init__.py 2012-08-16 09:33:04.810548840 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + This module contains functions to operate on the DeclarationCollection produced +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/operations.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/operations.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/operations.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/operations.py 2012-08-16 09:33:04.847216053 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ + The operations module contains various functions to process the +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/pipeline.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/pipeline.py +--- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/pipeline.py 2011-04-13 14:57:45.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/pipeline.py 2012-08-16 09:33:04.777214964 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + import ctypes, re, os + from ctypesgencore.processor.operations import * +diff -ur grass-6.4.2/lib/python/ctypes/ctypesgen.py grass-6.4.2-new/lib/python/ctypes/ctypesgen.py +--- grass-6.4.2/lib/python/ctypes/ctypesgen.py 2011-04-13 14:57:46.000000000 +0200 ++++ grass-6.4.2-new/lib/python/ctypes/ctypesgen.py 2012-08-16 09:33:05.573893972 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + def find_names_in_modules(modules): + names = set() diff --git a/pcr/grass/grass-tk86-fix.patch b/pcr/grass/grass-tk86-fix.patch new file mode 100644 index 000000000..f0dbb7c2b --- /dev/null +++ b/pcr/grass/grass-tk86-fix.patch @@ -0,0 +1,11 @@ +--- grass-6.4.2/visualization/nviz/src/draw.c 2008-12-19 21:29:59.000000000 +0100 ++++ grass-6.4.2/visualization/nviz/src/draw_new.c 2013-01-21 22:22:09.819456565 +0100 +@@ -32,7 +32,7 @@ + void CancelFunc_Hook(void) + { + if (cancel_script != NULL) { +- TkCopyAndGlobalEval(cancel_interp, cancel_script); ++ Tcl_EvalEx(cancel_interp, cancel_script, -1, TCL_EVAL_GLOBAL); + } + } + diff --git a/pcr/grass/grass.conf b/pcr/grass/grass.conf new file mode 100644 index 000000000..bb4964d93 --- /dev/null +++ b/pcr/grass/grass.conf @@ -0,0 +1 @@ +/opt/grass/lib diff --git a/pcr/grass/grass.install b/pcr/grass/grass.install new file mode 100644 index 000000000..878ea0186 --- /dev/null +++ b/pcr/grass/grass.install @@ -0,0 +1,26 @@ +## arg 1: the new package version +post_install() { + pkgver=${1%-*} + + # Create symlink for version workaround. + ln -sf /opt/grass-${pkgver} /opt/grass + + echo 'Please relogin for required variables to be set from /etc/profile.d/grass.sh' +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + pkgver=${1%-*} + + # Updating symlink for new version + ln -sf /opt/grass-${pkgver} /opt/grass +} + +## arg 1: the old package version +pre_remove() { + # Removing cruft symlink + rm -f /opt/grass +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/grass/grass.sh b/pcr/grass/grass.sh new file mode 100644 index 000000000..e36980c16 --- /dev/null +++ b/pcr/grass/grass.sh @@ -0,0 +1,4 @@ +export GISBASE=/opt/grass +export PATH=$PATH:$GISBASE/bin:$GISBASE/scripts +export MANPATH=$MANPATH:$GISBASE/man +export GRASS_PYTHON=python2 diff --git a/pcr/libfreexl/PKGBUILD b/pcr/libfreexl/PKGBUILD new file mode 100644 index 000000000..69d94ce99 --- /dev/null +++ b/pcr/libfreexl/PKGBUILD @@ -0,0 +1,21 @@ +# Maintainer: Bruno Gola +pkgname=libfreexl +pkgver=1.0.0e +pkgrel=1 +pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet." +arch=('i686' 'x86_64') +url="https://www.gaia-gis.it/fossil/freexl/index" +license=('MPL') +source=("http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-$pkgver.tar.gz") + +build() { + cd "$srcdir/freexl-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/freexl-$pkgver" + make DESTDIR="$pkgdir/" install +} +md5sums=('9b494d42a079e63afbb9dc0915e8fb56') diff --git a/pcr/libowfat/PKGBUILD b/pcr/libowfat/PKGBUILD index e2602046d..a51638450 100644 --- a/pcr/libowfat/PKGBUILD +++ b/pcr/libowfat/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libowfat pkgver=0.29 -pkgrel=2 +pkgrel=3 pkgdesc='GPL reimplementation of libdjb' arch=(i686 x86_64 mips64el) url=http://www.fefe.de/libowfat/ diff --git a/pcr/libspatialite/PKGBUILD b/pcr/libspatialite/PKGBUILD new file mode 100644 index 000000000..24c775fd8 --- /dev/null +++ b/pcr/libspatialite/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Brian Galey +# Contributor: Pietro Zambelli +pkgname=libspatialite +pkgver=4.0.0 +pkgrel=1 +pkgdesc="SQLite extension to support spatial data types and operations" +arch=('i686' 'x86_64') +url="https://www.gaia-gis.it/fossil/libspatialite/index" +license=('MPL') +depends=('geos' 'proj' 'sqlite3' 'libfreexl') +options=('!libtool') +source=("http://www.gaia-gis.it/gaia-sins/$pkgname-$pkgver.tar.gz") +md5sums=('8040ce4e39913e7d284675c0f15d270d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/opentracker/PKGBUILD b/pcr/opentracker/PKGBUILD new file mode 100644 index 000000000..d2b9a3703 --- /dev/null +++ b/pcr/opentracker/PKGBUILD @@ -0,0 +1,67 @@ +# Contributor: Pierre Schmitz +# Maintainer: Jonas Heinrich + +pkgname=opentracker +pkgver=20130312 +pkgrel=1 +pkgdesc='An open and free bittorrent tracker (open mode)' +arch=('i686' 'x86_64' 'mips64el') +url='http://erdgeist.org/arts/software/opentracker/' +license=('custom:Beer' 'GPL') +makedepends=('libowfat' 'cvs') +depends=('bash' 'zlib') +backup=('etc/opentracker/config') +source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"{,.sig} +'opentracker.service' +'license.txt') +md5sums=('64956fd9bc7b453b4862b8ba15a27511' + '0217a2aeaee2b75017c13cdf86a245f2' + '3c638b71d5ecb65fb7964796975b2078' + '865211941e882c0aff5d36a22ac9efaa') + +_cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot' +_cvsmod='opentracker' + +mksource() { + pushd "${srcdir}" + msg 'Connecting to CVS server....' + if [ -d ${_cvsmod}/CVS ]; then + cd ${_cvsmod} + cvs -z3 update -d + else + cvs -z3 -d ${_cvsroot} co -f ${_cvsmod} + cd ${_cvsmod} + fi + + msg 'CVS checkout done or server timeout' + popd + + tar czf ${pkgname}-${pkgver}.tar.gz ${_cvsmod}/ +} + +build() { + cd "${srcdir}/${_cvsmod}" + msg 'Starting make...' + + sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ + -e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \ + -i opentracker.conf.sample + +# See Makefile for available features + make PREFIX=/usr \ + LIBOWFAT_HEADERS=/usr/includes \ + LIBOWFAT_LIBRARY=/usr/lib \ + FEATURES="-DWANT_SYSLOGS -DDEBUG_HTTPERROR" +} + +package(){ + cd "${srcdir}/${_cvsmod}" + + install -D -m 755 opentracker $pkgdir/usr/bin/opentracker + install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config + install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt + + # Create opentracker service + mkdir -p "$pkgdir/usr/lib/systemd/system/" + install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/" +} diff --git a/pcr/opentracker/license.txt b/pcr/opentracker/license.txt new file mode 100644 index 000000000..ff1bb40f5 --- /dev/null +++ b/pcr/opentracker/license.txt @@ -0,0 +1,2 @@ +This software was written by Dirk Engling +It is considered beerware. Prost. Skol. Cheers or whatever. diff --git a/pcr/opentracker/opentracker.install b/pcr/opentracker/opentracker.install new file mode 100644 index 000000000..59f6f6ebe --- /dev/null +++ b/pcr/opentracker/opentracker.install @@ -0,0 +1,17 @@ +post_install() { + cat </dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon opentracker + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/pcr/opentracker/opentracker.service b/pcr/opentracker/opentracker.service new file mode 100644 index 000000000..5f1b887ea --- /dev/null +++ b/pcr/opentracker/opentracker.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenTracker Daemon +After=network.target + +[Service] +User=nobody +ExecStart=/usr/bin/opentracker -f /etc/opentracker/config +ExecStop=/bin/kill -INT $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD new file mode 100644 index 000000000..7a305285c --- /dev/null +++ b/pcr/qgis/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer: Lantald < lantald at gmx.com +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: Gerardo Exequiel Pozzi +# Contributor: Eric Forgeot < http://esclinux.tk > + +pkgname=qgis +pkgver=1.8.0 +pkgrel=5 +pkgdesc='Quantum GIS is a Geographic Information System (GIS) that supports vector, raster & database formats' +url='http://qgis.org/' +license=('GPL') +arch=('i686' 'x86_64') +# update to http://www.qgis.org/wiki/Building_QGIS_from_Source#Overview +depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'pyqt' 'python2' 'python2-pyqt' 'giflib' 'cfitsio' 'qwt' 'gdal' 'flex' 'bison' 'libspatialite' 'spatialindex') +makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip') +optdepends=('postgis: postgis support and SPIT plugin' + 'fcgi: qgis mapserver' + 'python2-sip: python-support' + 'grass: grass plugin' + 'gsl: georeferencer') +options=('!makeflags') +source=("http://qgis.org/downloads/qgis-${pkgver}.tar.bz2" + 'qgis.desktop') + +md5sums=('1d60520f81d7763c026d0af887ac9a05' + '8ab66039f2aba519b92f52272ec3c13e') + +build() { + # Fix insecure RPATH is weird, but just works ;) + # echo "os.system(\"sed -i '/^LFLAGS/s|-Wl,-rpath,.\+ ||g' gui/Makefile core/Makefile\")" >> python/configure.py.in + #cd qgis-${pkgver} + + rm -rf build + mkdir build + cd build + + cmake ../qgis-${pkgver} \ + -DENABLE_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DGRASS_PREFIX=/opt/grass \ + -DQGIS_MANUAL_SUBDIR=share/man \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DPYTHON_SITE_PACKAGES_DIR=/usr/lib/python2.7/site-packages \ + -DPYTHON_INCLUDE_PATH=/usr/include/python2.7 \ + -DQT_QMAKE_EXECUTABLE=qmake4 + + make +} + +package() { + cd build + + make DESTDIR=${pkgdir} install + + # create a more user-friendly application name link + ln -s /usr/bin/qgis $pkgdir/usr/bin/quantum-gis + + # install some freedesktop.org compatibility + install -D -m644 ${srcdir}/qgis.desktop \ + ${pkgdir}/usr/share/applications/qgis.desktop +} diff --git a/pcr/qgis/qgis.desktop b/pcr/qgis/qgis.desktop new file mode 100644 index 000000000..c3db5ad08 --- /dev/null +++ b/pcr/qgis/qgis.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Quantum GIS +GenericName="GIS" +Comment="Geographic Information System (GIS) that supports vector, raster & database formats" +Exec=/usr/bin/qgis +Icon=/usr/share/qgis/images/icons/qgis-icon.png +Terminal=false +MultipleArgs=false +Type=Application +Categories=Application;Science diff --git a/pcr/spatialindex/LICENSE b/pcr/spatialindex/LICENSE new file mode 100644 index 000000000..888f4e789 --- /dev/null +++ b/pcr/spatialindex/LICENSE @@ -0,0 +1,9 @@ +Permission is hereby granted, free of charge, to any person obtaining acopy of this software and associated documentation files (the "Software"),to deal in the Software without restriction, including without limitationthe rights to use, copy, modify, merge, publish, distribute, sublicense,and/or sell copies of the Software, and to permit persons to whom theSoftware is furnished to do so, subject to the following conditions:The above copyright notice and this permission notice shall be included inall copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/pcr/spatialindex/PKGBUILD b/pcr/spatialindex/PKGBUILD new file mode 100644 index 000000000..ac2e1122e --- /dev/null +++ b/pcr/spatialindex/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Lantald +pkgname=spatialindex +pkgver=1.8.0 +pkgrel=1 +pkgdesc="An extensible framework that supports robust spatial indexing methods and sophisticated spatial queries." +arch=('i686' 'x86_64') +url="http://libspatialindex.github.com/" +license=('MIT') +depends=(gcc-libs) +provides=(spatialindex) +conflicts=(libspatialindex-git) +source=("http://download.osgeo.org/libspatialindex/$pkgname-src-$pkgver.tar.gz" + 'LICENSE') +md5sums=('aa78e2c641c472df257f49cd140669c4' + '6a9a7d8158edbf1529ca46aae5a76752') + +build() { + cd "$srcdir/$pkgname-src-$pkgver/" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-src-$pkgver/" + make -k check +} + +package() { + cd "$srcdir/$pkgname-src-$pkgver/" + make DESTDIR="$pkgdir/" install + install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD deleted file mode 100644 index 5ecf00b3a..000000000 --- a/social/opentracker/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# Contributor: Pierre Schmitz -# Maintainer: Jonas Heinrich - -pkgname=opentracker -pkgver=20130126 -pkgrel=1 -pkgdesc='An open and free bittorrent tracker (open mode)' -arch=('i686' 'x86_64' 'mips64el') -url='http://erdgeist.org/arts/software/opentracker/' -license=('custom:Beer' 'GPL') -makedepends=('libowfat' 'cvs') -depends=('bash' 'zlib') -backup=('etc/opentracker/config') -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"{,.sig} -'opentracker.service' -'license.txt') - -_cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot' -_cvsmod='opentracker' - -mksource() { - pushd "${srcdir}" - msg 'Connecting to CVS server....' - if [ -d ${_cvsmod}/CVS ]; then - cd ${_cvsmod} - cvs -z3 update -d - else - cvs -z3 -d ${_cvsroot} co -f ${_cvsmod} - cd ${_cvsmod} - fi - - msg 'CVS checkout done or server timeout' - popd - - tar czf ${pkgname}-${pkgver}.tar.gz ${_cvsmod}/ -} - -build() { - cd "${srcdir}/${_cvsmod}" - msg 'Starting make...' - - sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ - -e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \ - -i opentracker.conf.sample - -# See Makefile for available features - make PREFIX=/usr \ - LIBOWFAT_HEADERS=/usr/includes \ - LIBOWFAT_LIBRARY=/usr/lib \ - FEATURES="-DWANT_SYSLOGS -DDEBUG_HTTPERROR" -} - -package(){ - cd "${srcdir}/${_cvsmod}" - - install -D -m 755 opentracker $pkgdir/usr/bin/opentracker - install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config - install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt - - # Create opentracker service - mkdir -p "$pkgdir/usr/lib/systemd/system/" - install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/" -} -md5sums=('702a05fc2c205c6367a7e95334d8e152' - '3c80785c33c97dffe6f119417865a309' - '3c638b71d5ecb65fb7964796975b2078' - '865211941e882c0aff5d36a22ac9efaa') diff --git a/social/opentracker/license.txt b/social/opentracker/license.txt deleted file mode 100644 index ff1bb40f5..000000000 --- a/social/opentracker/license.txt +++ /dev/null @@ -1,2 +0,0 @@ -This software was written by Dirk Engling -It is considered beerware. Prost. Skol. Cheers or whatever. diff --git a/social/opentracker/opentracker.install b/social/opentracker/opentracker.install deleted file mode 100644 index 59f6f6ebe..000000000 --- a/social/opentracker/opentracker.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - cat </dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon opentracker - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/social/opentracker/opentracker.service b/social/opentracker/opentracker.service deleted file mode 100644 index 5f1b887ea..000000000 --- a/social/opentracker/opentracker.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenTracker Daemon -After=network.target - -[Service] -User=nobody -ExecStart=/usr/bin/opentracker -f /etc/opentracker/config -ExecStop=/bin/kill -INT $MAINPID - -[Install] -WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf From a42cd7aaabfdb3ecc0a538548e8dbcc7ca860b2d Mon Sep 17 00:00:00 2001 From: root Date: Sat, 23 Mar 2013 00:06:21 -0700 Subject: Sat Mar 23 00:06:20 PDT 2013 --- community/bbswitch/PKGBUILD | 11 +- community/bsd-games/PKGBUILD | 24 +- community/cinnamon-control-center/PKGBUILD | 32 +- .../fix-audio-input-icons.patch | 15 - .../fix-faces-location.patch | 12 - community/cinnamon-control-center/pulse3.0.patch | 25 - .../cinnamon-control-center/sound-nua-rename.patch | 26 - community/cinnamon/PKGBUILD | 16 +- community/cinnamon/fix-control-center-check.patch | 2 +- community/cinnamon/gnome-autogen.sh | 538 -- community/couchdb/PKGBUILD | 10 +- community/couchdb/build-fix.patch | 5568 ++++++++++++++++++++ community/drbd/PKGBUILD | 21 +- community/gens-gs/PKGBUILD | 62 + community/gens-gs/gens-gtk.patch | 187 + community/gens/PKGBUILD | 57 + community/gens/gens.desktop | 9 + community/mixxx/PKGBUILD | 4 +- community/nemo/PKGBUILD | 15 +- community/nemo/gnome-autogen.sh | 538 -- community/nginx/PKGBUILD | 11 +- community/nginx/logrotate | 2 +- community/nginx/nginx.install | 10 +- community/pypanel/PKGBUILD | 4 +- community/qtcreator/PKGBUILD | 8 +- community/rdiff-backup/PKGBUILD | 4 +- community/tremulous/PKGBUILD | 45 +- community/wesnoth/PKGBUILD | 8 +- community/weston/PKGBUILD | 6 +- community/wine/PKGBUILD | 154 - community/wine/wine.install | 12 - core/libgcrypt/PKGBUILD | 8 +- extra/cfitsio/PKGBUILD | 12 +- extra/fetchmail/PKGBUILD | 16 +- extra/fetchmail/fetchmail.conf | 5 - extra/fetchmail/fetchmail.install | 4 +- extra/fetchmail/fetchmail.rc | 38 - extra/fetchmail/fetchmail.service | 3 +- extra/gnuplot/PKGBUILD | 6 +- extra/gst-libav/PKGBUILD | 6 +- extra/gst-plugins-base/PKGBUILD | 8 +- extra/gst-plugins-good/PKGBUILD | 8 +- extra/gst-plugins-ugly/PKGBUILD | 8 +- extra/gstreamer/PKGBUILD | 6 +- extra/xf86-video-intel/PKGBUILD | 6 +- kernels/linux-libre-pae/PKGBUILD | 21 +- ...rm-i915-enable-irqs-earlier-when-resuming.patch | 82 - ...up-sequence-to-have-irqs-for-output-setup.patch | 124 - kernels/linux-libre-pae/fat-3.6.x.patch | 33 - kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 21 +- ...rm-i915-enable-irqs-earlier-when-resuming.patch | 82 - ...up-sequence-to-have-irqs-for-output-setup.patch | 124 - kernels/linux-libre-xen/fat-3.6.x.patch | 33 - kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/gnome-desktop2/PKGBUILD | 35 + libre/gnome-menus/PKGBUILD | 36 + libre/gnome-menus/menus.patch | 25 + libre/gst-libav/PKGBUILD | 35 + libre/gst-plugins-bad-libre/PKGBUILD | 12 +- libre/gst-plugins-base/PKGBUILD | 52 + libre/gst-plugins-good/PKGBUILD | 38 + libre/gst-plugins-ugly/PKGBUILD | 37 + libre/gstreamer/PKGBUILD | 35 + libre/gstreamer0.10-bad-libre/PKGBUILD | 10 +- libre/gstreamer0.10-base/PKGBUILD | 53 + libre/gstreamer0.10-good/PKGBUILD | 8 +- libre/gstreamer0.10-ugly/PKGBUILD | 54 + libre/gstreamer0.10-ugly/cdio-cd-text-api.patch | 183 + libre/gstreamer0.10-ugly/opencore-amr.patch | 35 + libre/gstreamer0.10/PKGBUILD | 41 + libre/libtasn1/PKGBUILD | 36 + libre/libtasn1/libtasn1.install | 18 + libre/linux-libre-kmod-alx/PKGBUILD | 6 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 6 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 17 +- ...rm-i915-enable-irqs-earlier-when-resuming.patch | 82 - ...up-sequence-to-have-irqs-for-output-setup.patch | 124 - libre/linux-libre/linux-libre.install | 2 +- libre/usermin/PKGBUILD | 134 + libre/usermin/usermin.install | 34 + libre/usermin/usermin.rc | 44 + libre/usermin/usermin.service | 9 + libre/webmin/PKGBUILD | 221 + libre/webmin/webmin.install | 35 + libre/webmin/webmin.rc | 46 + libre/webmin/webmin.service | 11 + libre/xsp/PKGBUILD | 64 + libre/xsp/xsp.conf.d | 10 + libre/xsp/xsp.install | 37 + libre/xsp/xsp.rc.d | 40 + libre/xsp/xsp.service | 8 + libre/xsp/xsp.webapp | 8 + 95 files changed, 7483 insertions(+), 2298 deletions(-) delete mode 100644 community/cinnamon-control-center/fix-audio-input-icons.patch delete mode 100644 community/cinnamon-control-center/fix-faces-location.patch delete mode 100644 community/cinnamon-control-center/pulse3.0.patch delete mode 100644 community/cinnamon-control-center/sound-nua-rename.patch delete mode 100644 community/cinnamon/gnome-autogen.sh create mode 100644 community/couchdb/build-fix.patch create mode 100755 community/gens-gs/PKGBUILD create mode 100755 community/gens-gs/gens-gtk.patch create mode 100755 community/gens/PKGBUILD create mode 100755 community/gens/gens.desktop delete mode 100644 community/nemo/gnome-autogen.sh delete mode 100644 community/wine/PKGBUILD delete mode 100644 community/wine/wine.install delete mode 100644 extra/fetchmail/fetchmail.conf delete mode 100644 extra/fetchmail/fetchmail.rc delete mode 100644 kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch delete mode 100644 kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch delete mode 100644 kernels/linux-libre-pae/fat-3.6.x.patch delete mode 100644 kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch delete mode 100644 kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch delete mode 100644 kernels/linux-libre-xen/fat-3.6.x.patch create mode 100644 libre/gnome-desktop2/PKGBUILD create mode 100644 libre/gnome-menus/PKGBUILD create mode 100644 libre/gnome-menus/menus.patch create mode 100644 libre/gst-libav/PKGBUILD create mode 100644 libre/gst-plugins-base/PKGBUILD create mode 100644 libre/gst-plugins-good/PKGBUILD create mode 100644 libre/gst-plugins-ugly/PKGBUILD create mode 100644 libre/gstreamer/PKGBUILD create mode 100644 libre/gstreamer0.10-base/PKGBUILD create mode 100644 libre/gstreamer0.10-ugly/PKGBUILD create mode 100644 libre/gstreamer0.10-ugly/cdio-cd-text-api.patch create mode 100644 libre/gstreamer0.10-ugly/opencore-amr.patch create mode 100644 libre/gstreamer0.10/PKGBUILD create mode 100644 libre/libtasn1/PKGBUILD create mode 100644 libre/libtasn1/libtasn1.install delete mode 100644 libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch delete mode 100644 libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch create mode 100644 libre/usermin/PKGBUILD create mode 100644 libre/usermin/usermin.install create mode 100644 libre/usermin/usermin.rc create mode 100644 libre/usermin/usermin.service create mode 100644 libre/webmin/PKGBUILD create mode 100644 libre/webmin/webmin.install create mode 100644 libre/webmin/webmin.rc create mode 100644 libre/webmin/webmin.service create mode 100644 libre/xsp/PKGBUILD create mode 100644 libre/xsp/xsp.conf.d create mode 100644 libre/xsp/xsp.install create mode 100644 libre/xsp/xsp.rc.d create mode 100644 libre/xsp/xsp.service create mode 100644 libre/xsp/xsp.webapp (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/bbswitch/PKGBUILD b/community/bbswitch/PKGBUILD index 3dbf06f98..9552835c9 100644 --- a/community/bbswitch/PKGBUILD +++ b/community/bbswitch/PKGBUILD @@ -3,9 +3,9 @@ # Contributor: Samsagax pkgname=bbswitch -pkgver=0.5 +pkgver=0.6 _extramodules=extramodules-3.8-ARCH # Don't forget to update bbswitch.install -pkgrel=3 +pkgrel=1 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops" arch=('i686' 'x86_64') url=("http://github.com/Bumblebee-Project/bbswitch") @@ -13,17 +13,14 @@ license=('GPL') depends=('linux>=3.8' 'linux<3.9') makedepends=('linux-headers>=3.8' 'linux-headers<3.9') install=bbswitch.install -source=("https://github.com/downloads/Bumblebee-Project/bbswitch/${pkgname}-${pkgver}.tar.gz" - "https://github.com/Bumblebee-Project/bbswitch/commit/5593d9519364dc7f6f28c3dd8358afb907f39c0f.patch") -md5sums=('5e0e6eb9c5e8c10db56e5b349b43bba7' - 'd76180b8f6fd092038d5ae7c71a9caa8') +source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz") +md5sums=('c5496e3225c8e70d02a24bfd8a50faf6') build() { cd ${srcdir}/${pkgname}-${pkgver} _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - patch -Np1 < ${srcdir}/5593d9519364dc7f6f28c3dd8358afb907f39c0f.patch make KDIR=/usr/src/linux-${_kernver} } diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD index 470e8a2f0..00bb7c247 100644 --- a/community/bsd-games/PKGBUILD +++ b/community/bsd-games/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73816 2012-07-15 23:02:25Z cbrannon $ +# $Id: PKGBUILD 86789 2013-03-22 02:13:44Z eric $ # Maintainer: Chris Brannon # Contributor: Abhishek Dasgupta # Contributor: SmackleFunky @@ -17,15 +17,21 @@ source=(ftp://ftp.ibiblio.org/pub/Linux/games/$pkgname-$pkgver.tar.gz config.params stdio.h.diff gamescreen.h.diff getline.diff number.c.diff bsd-games-2.17-64bit.patch bad-ntohl-cast.diff null-check.diff) +md5sums=('238a38a3a017ca9b216fc42bde405639' + '9916baef5cb8aa09361f67de12ca7bef' + '784f68c796b9e099ac008aecef1af998' + '9c0fa6e2345bd0a7945c9a41d5ba68aa' + '5356bd6999ae53dd27cb2a0f837a3e70' + '47249a90f38ccb4dd07625b245bbc728' + '257813b76a41c8b2c02701571c804227' + '3d21a9dad2e603ddf3842972e4ff85a1' + 'a43ca0b4b9ebc4eec26372c52014ac0a') build() { cd "${srcdir}/$pkgname-$pkgver" [ "$CARCH" = "x86_64" ] && patch -p1 < "$srcdir/bsd-games-2.17-64bit.patch" cp "${srcdir}/config.params" . -# Patches - sed -i "s%PKGDIR%$pkgdir%" config.params - # Several games use their own internal functions named getline. All # are different, and none is the getline from glibc. So we need a patch # in order to compile. Each internal getline function is prefixed @@ -65,6 +71,7 @@ build() { package() { cd "${srcdir}/$pkgname-$pkgver" + sed -i "s%PKGDIR%$pkgdir%g" hide-game install-man install-score Makeconfig subst.sed make install # This make install command does install to $pkgdir, because of the # change to config.params in the build function. @@ -91,12 +98,3 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/COPYING" } -md5sums=('238a38a3a017ca9b216fc42bde405639' - '9916baef5cb8aa09361f67de12ca7bef' - '784f68c796b9e099ac008aecef1af998' - '9c0fa6e2345bd0a7945c9a41d5ba68aa' - '5356bd6999ae53dd27cb2a0f837a3e70' - '47249a90f38ccb4dd07625b245bbc728' - '257813b76a41c8b2c02701571c804227' - '3d21a9dad2e603ddf3842972e4ff85a1' - 'a43ca0b4b9ebc4eec26372c52014ac0a') diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index c066ea4b3..74b724004 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 85563 2013-03-03 05:46:41Z bgyorgy $ +# $Id: PKGBUILD 86850 2013-03-22 21:27:24Z faidoc $ # Maintainer: Alexandre Filgueira # Jan de Groot pkgname=cinnamon-control-center -pkgver=1.7.1 -pkgrel=3 +pkgver=1.7.2 +pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') depends=('cinnamon' 'cheese' 'libgtop' 'network-manager-applet') @@ -17,34 +17,12 @@ url="https://github.com/linuxmint/cinnamon-control-center" install=cinnamon-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" - "pulse3.0.patch" - "sound-nua-rename.patch" - "fix-audio-input-icons.patch" - "fix-faces-location.patch") -sha256sums=('eab36af1accfce7b4d5eaf07a865d7290add07b875ed5e52072c1ad2e8570c1e' - 'ddf7c99a1d45a7be54e69e90f194e33f3e56a7f294aa369bfb2e541d8241156e' - '2f49543e4ccabf5c8ce1cd9e4c37e5b291c23cff494eaa671857b2dcf7af4c5b' - '2cefa2764db206c9c6258e3f374988056907dda0c5bbeedbc249fc7c058a0d6b' - '7360f3e018765e80a7afc5a469c1d54ec3fdeb7e58c867596ef26773fb8e7a8a') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") +sha256sums=('09af52ae7417b611b91ca9fdafbde08c68356f2b66241780b513ad2249a831c1') build() { cd $pkgname-$pkgver - patch -Np1 -i ../pulse3.0.patch - - # Upstream patch: Change sound module registered name from sound-nua to 'sound' - patch -Np1 -i ../sound-nua-rename.patch - - # Fix icons on Sound preferences dialog - patch -Np1 -i ../fix-audio-input-icons.patch - - # Fix faces location on User accounts dialog - patch -Np1 -i ../fix-faces-location.patch - - # Use freedesktop as default sound theme instead of ubuntu (otherwise the Sound panel craches) - patch -RNp1 -i debian/patches/98_default_sound_theme.patch - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/community/cinnamon-control-center/fix-audio-input-icons.patch b/community/cinnamon-control-center/fix-audio-input-icons.patch deleted file mode 100644 index 77c9b3c5b..000000000 --- a/community/cinnamon-control-center/fix-audio-input-icons.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur cinnamon-control-center-1.7.1.orig/panels/sound-nua/gvc-mixer-dialog.c cinnamon-control-center-1.7.1/panels/sound-nua/gvc-mixer-dialog.c ---- cinnamon-control-center-1.7.1.orig/panels/sound-nua/gvc-mixer-dialog.c 2013-02-19 17:37:17.000000000 +0100 -+++ cinnamon-control-center-1.7.1/panels/sound-nua/gvc-mixer-dialog.c 2013-02-26 23:12:37.192399508 +0100 -@@ -1929,9 +1929,9 @@ - gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->input_bar), - _("_Input volume:")); - gvc_channel_bar_set_low_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar), -- "audio-input-microphone-low-symbolic"); -+ "cin-audio-input-microphone-low-symbolic"); - gvc_channel_bar_set_high_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar), -- "audio-input-microphone-high-symbolic"); -+ "cin-audio-input-microphone-high-symbolic"); - gtk_widget_set_sensitive (self->priv->input_bar, FALSE); - - if (self->priv->size_group != NULL) { diff --git a/community/cinnamon-control-center/fix-faces-location.patch b/community/cinnamon-control-center/fix-faces-location.patch deleted file mode 100644 index 1af65fa99..000000000 --- a/community/cinnamon-control-center/fix-faces-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur cinnamon-control-center-1.7.1.orig/panels/user-accounts/um-photo-dialog.c cinnamon-control-center-1.7.1/panels/user-accounts/um-photo-dialog.c ---- cinnamon-control-center-1.7.1.orig/panels/user-accounts/um-photo-dialog.c 2013-02-19 17:37:17.000000000 +0100 -+++ cinnamon-control-center-1.7.1/panels/user-accounts/um-photo-dialog.c 2013-02-27 19:17:18.249329833 +0100 -@@ -406,7 +406,7 @@ - for (i = 0; dirs[i] != NULL; i++) { - char *path; - -- path = g_build_filename (dirs[i], "pixmaps", "faces", NULL); -+ path = g_build_filename (dirs[i], "pixmaps", "cinnamon", "faces", NULL); - dir = g_dir_open (path, 0, NULL); - if (dir == NULL) { - g_free (path); diff --git a/community/cinnamon-control-center/pulse3.0.patch b/community/cinnamon-control-center/pulse3.0.patch deleted file mode 100644 index 9341b788e..000000000 --- a/community/cinnamon-control-center/pulse3.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001 -From: David Henningsson -Date: Fri, 07 Dec 2012 10:52:09 +0000 -Subject: sound: Fix port handling for the unknown availability case - -The current code assumes that port availability transitions will be -between YES and NO, and doesn't account for the fact that it may also be -UNKNOWN. This causes spurious entries if the port availability -transitions between YES and UNKNOWN. ---- -diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c -index 34ddc0c..2f6cf34 100644 ---- a/panels/sound/gvc-mixer-control.c -+++ b/panels/sound/gvc-mixer-control.c -@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control, - else { - for (i = 0; i < info->n_ports; i++) { - if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) { -- if (card_port->available != info->ports[i]->available) { -+ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) { - card_port->available = info->ports[i]->available; - g_debug ("sync port availability on card %i, card port name '%s', new available value %i", - gvc_mixer_card_get_index (card), --- -cgit v0.9.0.2 \ No newline at end of file diff --git a/community/cinnamon-control-center/sound-nua-rename.patch b/community/cinnamon-control-center/sound-nua-rename.patch deleted file mode 100644 index fb25b9f42..000000000 --- a/community/cinnamon-control-center/sound-nua-rename.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/panels/sound-nua/cc-sound-panel.c b/panels/sound-nua/cc-sound-panel.c -index 1c115f0..092f319 100644 ---- a/panels/sound-nua/cc-sound-panel.c -+++ b/panels/sound-nua/cc-sound-panel.c -@@ -120,7 +120,7 @@ enum { - cc_sound_panel_register_type (G_TYPE_MODULE (module)); - g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, - CC_TYPE_SOUND_PANEL, -- "sound-nua", 0); -+ "sound", 0); - } - - /* GIO extension stuff */ -diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c -index 2f69c0f..3b78ce2 100644 ---- a/panels/sound/cc-sound-panel.c -+++ b/panels/sound/cc-sound-panel.c -@@ -127,7 +127,7 @@ enum { - cc_sound_panel_register_type (G_TYPE_MODULE (module)); - g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, - CC_TYPE_SOUND_PANEL, -- "sound", 0); -+ "gnome-sound", 0); - } - - /* GIO extension stuff */ diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 722ca2356..594f40855 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 86162 2013-03-12 14:14:05Z faidoc $ +# $Id: PKGBUILD 86852 2013-03-22 21:33:07Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.7.2 -pkgrel=3 +pkgver=1.7.3 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -24,13 +24,11 @@ optdepends=('cinnamon-control-center: extended configurations for Cinnamon' options=('!libtool' '!emptydirs') install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver" - "gnome-autogen.sh" "keyboard_applet.patch" "fix-control-center-check.patch") -md5sums=('d136978607d2584ea1ca29db436f96df' - 'a925691c9b57a6a884dcf07da057fd1f' +md5sums=('c733e2a2280508aecf3ee010587e6743' '2b1ece84416c3e4de030be15f1774d82' - 'fd429779aa986ffb3f481149f19a0baf') + 'c3f25b06d345d9d36c197cd96e08f496') build() { cd ${srcdir}/linuxmint-Cinnamon* @@ -42,10 +40,6 @@ build() { # Check for the cc-panel path, not for the unneeded binary patch -Np1 -i ${srcdir}/fix-control-center-check.patch - cp ${srcdir}/gnome-autogen.sh . - sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am - sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh - chmod +x gnome-autogen.sh ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/cinnamon/fix-control-center-check.patch b/community/cinnamon/fix-control-center-check.patch index 4c7b3bb0e..981b1c1a5 100644 --- a/community/cinnamon/fix-control-center-check.patch +++ b/community/cinnamon/fix-control-center-check.patch @@ -9,4 +9,4 @@ diff -Naur cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings cinnamon-1.7.1/fi + elif os.path.exists("/usr/lib/cinnamon-control-center-1/panels"): print "Unknown module %s, using cinnamon-control-center" % module os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:])) - elif os.path.exists("/usr/bin/gnome-control-center"): + elif os.path.exists("/usr/bin/gnome-control-center"): \ No newline at end of file diff --git a/community/cinnamon/gnome-autogen.sh b/community/cinnamon/gnome-autogen.sh deleted file mode 100644 index 2467a1de2..000000000 --- a/community/cinnamon/gnome-autogen.sh +++ /dev/null @@ -1,538 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -#name of package -test "$PKG_NAME" || PKG_NAME=Package -test "$srcdir" || srcdir=. - -# default version requirements ... -test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53 -test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9 -test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.4.3 -test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.10.40 -test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0 -test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25 -test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0 -test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0 -test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0 -test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2 - -# a list of required m4 macros. Package can set an initial value -test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS= -test "$FORBIDDEN_M4MACROS" || FORBIDDEN_M4MACROS= - -# Not all echo versions allow -n, so we check what is possible. This test is -# based on the one in autoconf. -ECHO_C= -ECHO_N= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ;; - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -# some terminal codes ... -if tty < /dev/null 1>/dev/null 2>&1; then - boldface="`tput bold 2>/dev/null`" - normal="`tput sgr0 2>/dev/null`" -else - boldface= - normal= -fi -printbold() { - echo $ECHO_N "$boldface" $ECHO_C - echo "$@" - echo $ECHO_N "$normal" $ECHO_C -} -printerr() { - echo "$@" >&2 -} - -# Usage: -# compare_versions MIN_VERSION ACTUAL_VERSION -# returns true if ACTUAL_VERSION >= MIN_VERSION -compare_versions() { - ch_min_version=$1 - ch_actual_version=$2 - ch_status=0 - IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="." - set $ch_actual_version - for ch_min in $ch_min_version; do - ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes - if [ -z "$ch_min" ]; then break; fi - if [ -z "$ch_cur" ]; then ch_status=1; break; fi - if [ $ch_cur -gt $ch_min ]; then break; fi - if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi - done - IFS="$ch_save_IFS" - return $ch_status -} - -# Usage: -# version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE -# checks to see if the package is available -version_check() { - vc_package=$1 - vc_variable=$2 - vc_checkprogs=$3 - vc_min_version=$4 - vc_source=$5 - vc_status=1 - - vc_checkprog=`eval echo "\\$$vc_variable"` - if [ -n "$vc_checkprog" ]; then - printbold "using $vc_checkprog for $vc_package" - return 0 - fi - - if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then - vc_comparator="=" - else - vc_comparator=">=" - fi - printbold "checking for $vc_package $vc_comparator $vc_min_version..." - for vc_checkprog in $vc_checkprogs; do - echo $ECHO_N " testing $vc_checkprog... " $ECHO_C - if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then - vc_actual_version=`$vc_checkprog --version | head -n 1 | \ - sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` - if compare_versions $vc_min_version $vc_actual_version; then - echo "found $vc_actual_version" - # set variables - eval "$vc_variable=$vc_checkprog; \ - ${vc_variable}_VERSION=$vc_actual_version" - vc_status=0 - break - else - echo "too old (found version $vc_actual_version)" - fi - else - echo "not found." - fi - done - if [ "$vc_status" != 0 ]; then - printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed" - printerr " to build $PKG_NAME. Download the appropriate package for" - printerr " from your distribution or get the source tarball at" - printerr " $vc_source" - printerr - exit $vc_status - fi - return $vc_status -} - -# Usage: -# require_m4macro filename.m4 -# adds filename.m4 to the list of required macros -require_m4macro() { - case "$REQUIRED_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;; - esac -} - -forbid_m4macro() { - case "$FORBIDDEN_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;; - esac -} - -# Usage: -# add_to_cm_macrodirs dirname -# Adds the dir to $cm_macrodirs, if it's not there yet. -add_to_cm_macrodirs() { - case $cm_macrodirs in - "$1 "* | *" $1 "* | *" $1") ;; - *) cm_macrodirs="$cm_macrodirs $1";; - esac -} - -# Usage: -# print_m4macros_error -# Prints an error message saying that autoconf macros were misused -print_m4macros_error() { - printerr "***Error***: some autoconf macros required to build $PKG_NAME" - printerr " were not found in your aclocal path, or some forbidden" - printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_FLAGS?" - printerr -} - -# Usage: -# check_m4macros -# Checks that all the requested macro files are in the aclocal macro path -# Uses REQUIRED_M4MACROS and ACLOCAL variables. -check_m4macros() { - # construct list of macro directories - cm_macrodirs=`$ACLOCAL --print-ac-dir` - # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9 - # but it contains only Automake's own macros, so we can ignore it. - - # Read the dirlist file, supported by Automake >= 1.7. - # If AUTOMAKE was defined, no version was detected. - if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then - cm_dirlist=`sed 's/[ ]*#.*//;/^$/d' $cm_macrodirs/dirlist` - if [ -n "$cm_dirlist" ] ; then - for cm_dir in $cm_dirlist; do - if [ -d $cm_dir ]; then - add_to_cm_macrodirs $cm_dir - fi - done - fi - fi - - # Parse $ACLOCAL_FLAGS - set - $ACLOCAL_FLAGS - while [ $# -gt 0 ]; do - if [ "$1" = "-I" ]; then - add_to_cm_macrodirs "$2" - shift - fi - shift - done - - cm_status=0 - if [ -n "$REQUIRED_M4MACROS" ]; then - printbold "Checking for required M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $REQUIRED_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - # The macro dir in Cygwin environments may contain a file - # called dirlist containing other directories to look in. - if [ -f "$cm_dir/dirlist" ]; then - for cm_otherdir in `cat $cm_dir/dirlist`; do - if [ -f "$cm_otherdir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - fi - done - if $cm_macrofound; then - : - else - printerr " $cm_macro not found" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi - if [ -n "$FORBIDDEN_M4MACROS" ]; then - printbold "Checking for forbidden M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $FORBIDDEN_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - if $cm_macrofound; then - printerr " $cm_macro found (should be cleared from macros dir)" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi -} - -# try to catch the case where the macros2/ directory hasn't been cleared out. -forbid_m4macro gnome-cxx-check.m4 - -want_libtool=false -want_gettext=false -want_glib_gettext=false -want_intltool=false -want_pkg_config=false -want_gtk_doc=false -want_gnome_doc_utils=false -want_maintainer_mode=false - -find_configure_files() { - configure_ac= - if test -f "$1/configure.ac"; then - configure_ac="$1/configure.ac" - elif test -f "$1/configure.in"; then - configure_ac="$1/configure.in" - fi - if test "x$configure_ac" != x; then - echo "$configure_ac" - # TODO We have not detected the right autoconf yet! - autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do - find_configure_files "$1/$dir" - done - fi -} - -configure_files="`find_configure_files $srcdir`" - -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - continue - fi - if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || - grep "^LT_INIT" $configure_ac >/dev/null; then - want_libtool=true - fi - if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then - want_gettext=true - fi - if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then - want_glib_gettext=true - fi - if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null || - grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then - want_intltool=true - fi - if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then - want_pkg_config=true - fi - if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then - want_gtk_doc=true - fi - if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then - want_gnome_doc_utils=true - fi - - # check that AM_MAINTAINER_MODE is used - if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then - want_maintainer_mode=true - fi - - if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then - require_m4macro yelp.m4 - fi - - # check to make sure gnome-common macros can be found ... - if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null || - grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null || - grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then - require_m4macro gnome-common.m4 - fi - if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null || - grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then - require_m4macro gnome-compiler-flags.m4 - fi - if grep "^GNOME_CODE_COVERAGE" $configure_ac >/dev/null; then - require_m4macro gnome-code-coverage.m4 - fi -done - -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" -AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - -case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; - 1.12*) automake_progs="automake-1.13 automake-1.12" ;; - 1.13*) automake_progs="automake-1.13" ;; -esac -version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ - "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" -ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` - -if $want_libtool; then - version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \ - "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" - require_m4macro libtool.m4 -fi - -if $want_gettext; then - version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \ - "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz" - require_m4macro gettext.m4 -fi - -if $want_glib_gettext; then - version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \ - "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" - require_m4macro glib-gettext.m4 -fi - -if $want_intltool; then - version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/intltool/" - require_m4macro intltool.m4 -fi - -if $want_pkg_config; then - version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \ - "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" - require_m4macro pkg.m4 -fi - -if $want_gtk_doc; then - version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - require_m4macro gtk-doc.m4 -fi - -if $want_gnome_doc_utils; then - version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/" -fi - -if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - version_check gnome-common DOC_COMMON gnome-doc-common \ - $REQUIRED_DOC_COMMON_VERSION " " -fi - -check_m4macros - -if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then - printerr "**Warning**: I am going to run \`configure' with no arguments." - printerr "If you wish to pass any to it, please specify them on the" - printerr \`$0\'" command line." - printerr -fi - -topdir=`pwd` -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - basename=`basename $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - elif [ ! -w $dirname ]; then - echo skipping $dirname -- directory is read only - else - printbold "Processing $configure_ac" - cd $dirname - - # Note that the order these tools are called should match what - # autoconf's "autoupdate" package does. See bug 138584 for - # details. - - # programs that might install new macros get run before aclocal - if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || - grep "^LT_INIT" $basename >/dev/null; then - printbold "Running $LIBTOOLIZE..." - $LIBTOOLIZE --force --copy || exit 1 - fi - - if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then - printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 - elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then - if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then - printbold "Running autopoint..." - autopoint --force || exit 1 - else - printbold "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy || exit 1 - fi - fi - - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || - grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then - printbold "Running $INTLTOOLIZE..." - $INTLTOOLIZE --force --copy --automake || exit 1 - fi - if grep "^GTK_DOC_CHECK" $basename >/dev/null; then - printbold "Running $GTKDOCIZE..." - $GTKDOCIZE --copy || exit 1 - fi - - if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - printbold "Running gnome-doc-common..." - gnome-doc-common --copy || exit 1 - fi - if grep "^GNOME_DOC_INIT" $basename >/dev/null; then - printbold "Running $GNOME_DOC_PREPARE..." - $GNOME_DOC_PREPARE --force --copy || exit 1 - fi - - # Now run aclocal to pull in any additional macros needed - - # if the AC_CONFIG_MACRO_DIR() macro is used, pass that - # directory to aclocal. - m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` - if [ -n "$m4dir" ]; then - m4dir="-I $m4dir" - fi - printbold "Running $ACLOCAL..." - $ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1 - - if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then - printerr "*** obsolete gnome macros were used in $configure_ac" - fi - - # Now that all the macros are sorted, run autoconf and autoheader ... - printbold "Running $AUTOCONF..." - $AUTOCONF || exit 1 - if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then - printbold "Running $AUTOHEADER..." - $AUTOHEADER || exit 1 - # this prevents automake from thinking config.h.in is out of - # date, since autoheader doesn't touch the file if it doesn't - # change. - test -f config.h.in && touch config.h.in - fi - - # Finally, run automake to create the makefiles ... - printbold "Running $AUTOMAKE..." - if [ -f COPYING ]; then - cp -pf COPYING COPYING.autogen_bak - fi - if [ -f INSTALL ]; then - cp -pf INSTALL INSTALL.autogen_bak - fi - if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then - $AUTOMAKE --gnu --add-missing --copy -Wno-portability || exit 1 - else - $AUTOMAKE --gnu --add-missing --copy || exit 1 - fi - if [ -f COPYING.autogen_bak ]; then - cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING - rm -f COPYING.autogen_bak - fi - if [ -f INSTALL.autogen_bak ]; then - cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL - rm -f INSTALL.autogen_bak - fi - - cd "$topdir" - fi -done - -conf_flags="" - -if $want_maintainer_mode; then - conf_flags="--enable-maintainer-mode" -fi - -if test x$NOCONFIGURE = x; then - printbold Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME || exit 1 -else - echo Skipping configure process. -fi diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index c09195ce1..8fd1b505d 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82681 2013-01-23 00:15:50Z eric $ +# $Id: PKGBUILD 86802 2013-03-22 11:40:46Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger @@ -19,16 +19,18 @@ backup=('etc/couchdb/local.ini' source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} "couchdb.service" "couchdb.tmpfiles" - "couchdb.rc") + "couchdb.rc" + "build-fix.patch") md5sums=('df75b03e56c2431ede7625200f0d44a7' 'e6e943c1da93cfcb41a4286daa80195d' '8914a7ffc6745f94106d96206709acb4' '1e254ebe32eeb061be64193bafa35dbf' - 'a75ee9b310a950eea13b07274b7a0669') + 'a75ee9b310a950eea13b07274b7a0669' + '71afe48505dfc07ba2091786b4650fa2') build() { cd "$srcdir/apache-$pkgname-$pkgver" - + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/community/couchdb/build-fix.patch b/community/couchdb/build-fix.patch new file mode 100644 index 000000000..d847b3cf2 --- /dev/null +++ b/community/couchdb/build-fix.patch @@ -0,0 +1,5568 @@ +diff -wbBur apache-couchdb-1.2.1/src/Makefile.am apache-couchdb-1.2.1.q/src/Makefile.am +--- apache-couchdb-1.2.1/src/Makefile.am 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/Makefile.am 2013-03-22 15:28:06.836935634 +0400 +@@ -10,4 +10,4 @@ + ## License for the specific language governing permissions and limitations under + ## the License. + +-SUBDIRS = couchdb ejson erlang-oauth etap ibrowse mochiweb snappy ++SUBDIRS = couchdb ejson erlang-oauth ibrowse mochiweb snappy +diff -wbBur apache-couchdb-1.2.1/src/Makefile.in apache-couchdb-1.2.1.q/src/Makefile.in +--- apache-couchdb-1.2.1/src/Makefile.in 2012-12-21 01:28:49.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/Makefile.in 2013-03-22 15:28:11.563602246 +0400 +@@ -267,7 +267,7 @@ + version_release = @version_release@ + version_revision = @version_revision@ + version_stage = @version_stage@ +-SUBDIRS = couchdb ejson erlang-oauth etap ibrowse mochiweb snappy ++SUBDIRS = couchdb ejson erlang-oauth ibrowse mochiweb snappy + all: all-recursive + + .SUFFIXES: +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochifmt.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -369,8 +369,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + tokenize_test() -> + {?MODULE, [{raw, "ABC"}]} = tokenize("ABC"), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt_records.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_records.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochifmt_records.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_records.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -9,11 +9,15 @@ + %% M:format("{0.bar}", [#rec{bar=foo}]). + %% foo + +--module(mochifmt_records, [Recs]). ++-module(mochifmt_records). + -author('bob@mochimedia.com'). +--export([get_value/2]). ++-export([new/1, get_value/3]). + +-get_value(Key, Rec) when is_tuple(Rec) and is_atom(element(1, Rec)) -> ++new([{_Rec, RecFields}]=Recs) when is_list(RecFields) -> ++ {?MODULE, Recs}. ++ ++get_value(Key, Rec, {?MODULE, Recs}) ++ when is_tuple(Rec) and is_atom(element(1, Rec)) -> + try begin + Atom = list_to_existing_atom(Key), + {_, Fields} = proplists:lookup(element(1, Rec), Recs), +@@ -21,7 +25,7 @@ + end + catch error:_ -> mochifmt:get_value(Key, Rec) + end; +-get_value(Key, Args) -> ++get_value(Key, Args, {?MODULE, _Recs}) -> + mochifmt:get_value(Key, Args). + + get_rec_index(Atom, [Atom | _], Index) -> +@@ -33,6 +37,6 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt_std.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_std.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochifmt_std.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_std.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -3,28 +3,31 @@ + + %% @doc Template module for a mochifmt formatter. + +--module(mochifmt_std, []). ++-module(mochifmt_std). + -author('bob@mochimedia.com'). +--export([format/2, get_value/2, format_field/2, get_field/2, convert_field/2]). ++-export([new/0, format/3, get_value/3, format_field/3, get_field/3, convert_field/3]). + +-format(Format, Args) -> ++new() -> ++ {?MODULE}. ++ ++format(Format, Args, {?MODULE}=THIS) -> + mochifmt:format(Format, Args, THIS). + +-get_field(Key, Args) -> ++get_field(Key, Args, {?MODULE}=THIS) -> + mochifmt:get_field(Key, Args, THIS). + +-convert_field(Key, Args) -> ++convert_field(Key, Args, {?MODULE}) -> + mochifmt:convert_field(Key, Args). + +-get_value(Key, Args) -> ++get_value(Key, Args, {?MODULE}) -> + mochifmt:get_value(Key, Args). + +-format_field(Arg, Format) -> ++format_field(Arg, Format, {?MODULE}=THIS) -> + mochifmt:format_field(Arg, Format, THIS). + + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiglobal.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiglobal.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiglobal.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiglobal.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -30,7 +30,7 @@ + put(_K, V, Mod) -> + Bin = compile(Mod, V), + code:purge(Mod), +- code:load_binary(Mod, atom_to_list(Mod) ++ ".erl", Bin), ++ {module, Mod} = code:load_binary(Mod, atom_to_list(Mod) ++ ".erl", Bin), + ok. + + -spec delete(atom()) -> boolean(). +@@ -77,8 +77,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + get_put_delete_test() -> + K = '$$test$$mochiglobal', + delete(K), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochihex.erl apache-couchdb-1.2.1.q/src/mochiweb/mochihex.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochihex.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochihex.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -8,9 +8,6 @@ + + -export([to_hex/1, to_bin/1, to_int/1, dehex/1, hexdigit/1]). + +-%% @type iolist() = [char() | binary() | iolist()] +-%% @type iodata() = iolist() | binary() +- + %% @spec to_hex(integer | iolist()) -> string() + %% @doc Convert an iolist to a hexadecimal string. + to_hex(0) -> +@@ -68,8 +65,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + to_hex_test() -> + "ff000ff1" = to_hex([255, 0, 15, 241]), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochijson2.erl apache-couchdb-1.2.1.q/src/mochiweb/mochijson2.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochijson2.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochijson2.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -40,9 +40,9 @@ + -module(mochijson2). + -author('bob@mochimedia.com'). + -export([encoder/1, encode/1]). +--export([decoder/1, decode/1]). ++-export([decoder/1, decode/1, decode/2]). + +-% This is a macro to placate syntax highlighters.. ++%% This is a macro to placate syntax highlighters.. + -define(Q, $\"). + -define(ADV_COL(S, N), S#decoder{offset=N+S#decoder.offset, + column=N+S#decoder.column}). +@@ -64,15 +64,14 @@ + -define(IS_WHITESPACE(C), + (C =:= $\s orelse C =:= $\t orelse C =:= $\r orelse C =:= $\n)). + +-%% @type iolist() = [char() | binary() | iolist()] +-%% @type iodata() = iolist() | binary() + %% @type json_string() = atom | binary() + %% @type json_number() = integer() | float() + %% @type json_array() = [json_term()] + %% @type json_object() = {struct, [{json_string(), json_term()}]} ++%% @type json_eep18_object() = {[{json_string(), json_term()}]} + %% @type json_iolist() = {json, iolist()} + %% @type json_term() = json_string() | json_number() | json_array() | +-%% json_object() | json_iolist() ++%% json_object() | json_eep18_object() | json_iolist() + + -record(encoder, {handler=null, + utf8=false}). +@@ -102,6 +101,14 @@ + State = parse_decoder_options(Options, #decoder{}), + fun (O) -> json_decode(O, State) end. + ++%% @spec decode(iolist(), [{format, proplist | eep18 | struct}]) -> json_term() ++%% @doc Decode the given iolist to Erlang terms using the given object format ++%% for decoding, where proplist returns JSON objects as [{binary(), json_term()}] ++%% proplists, eep18 returns JSON objects as {[binary(), json_term()]}, and struct ++%% returns them as-is. ++decode(S, Options) -> ++ json_decode(S, parse_decoder_options(Options, #decoder{})). ++ + %% @spec decode(iolist()) -> json_term() + %% @doc Decode the given iolist to Erlang terms. + decode(S) -> +@@ -119,7 +126,10 @@ + parse_decoder_options([], State) -> + State; + parse_decoder_options([{object_hook, Hook} | Rest], State) -> +- parse_decoder_options(Rest, State#decoder{object_hook=Hook}). ++ parse_decoder_options(Rest, State#decoder{object_hook=Hook}); ++parse_decoder_options([{format, Format} | Rest], State) ++ when Format =:= struct orelse Format =:= eep18 orelse Format =:= proplist -> ++ parse_decoder_options(Rest, State#decoder{object_hook=Format}). + + json_encode(true, _State) -> + <<"true">>; +@@ -139,6 +149,10 @@ + json_encode_proplist(Props, State); + json_encode({struct, Props}, State) when is_list(Props) -> + json_encode_proplist(Props, State); ++json_encode({Props}, State) when is_list(Props) -> ++ json_encode_proplist(Props, State); ++json_encode({}, State) -> ++ json_encode_proplist([], State); + json_encode(Array, State) when is_list(Array) -> + json_encode_array(Array, State); + json_encode({array, Array}, State) when is_list(Array) -> +@@ -318,8 +332,12 @@ + decode_object(B, S1) + end. + +-make_object(V, #decoder{object_hook=null}) -> ++make_object(V, #decoder{object_hook=N}) when N =:= null orelse N =:= struct -> + V; ++make_object({struct, P}, #decoder{object_hook=eep18}) -> ++ {P}; ++make_object({struct, P}, #decoder{object_hook=proplist}) -> ++ P; + make_object(V, #decoder{object_hook=Hook}) -> + Hook(V). + +@@ -559,8 +577,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + + %% testing constructs borrowed from the Yaws JSON implementation. +@@ -838,12 +856,34 @@ + + handler_test() -> + ?assertEqual( +- {'EXIT',{json_encode,{bad_term,{}}}}, +- catch encode({})), +- F = fun ({}) -> [] end, ++ {'EXIT',{json_encode,{bad_term,{x,y}}}}, ++ catch encode({x,y})), ++ F = fun ({x,y}) -> [] end, + ?assertEqual( + <<"[]">>, +- iolist_to_binary((encoder([{handler, F}]))({}))), ++ iolist_to_binary((encoder([{handler, F}]))({x, y}))), + ok. + ++encode_empty_test_() -> ++ [{A, ?_assertEqual(<<"{}">>, iolist_to_binary(encode(B)))} ++ || {A, B} <- [{"eep18 {}", {}}, ++ {"eep18 {[]}", {[]}}, ++ {"{struct, []}", {struct, []}}]]. ++ ++encode_test_() -> ++ P = [{<<"k">>, <<"v">>}], ++ JSON = iolist_to_binary(encode({struct, P})), ++ [{atom_to_list(F), ++ ?_assertEqual(JSON, iolist_to_binary(encode(decode(JSON, [{format, F}]))))} ++ || F <- [struct, eep18, proplist]]. ++ ++format_test_() -> ++ P = [{<<"k">>, <<"v">>}], ++ JSON = iolist_to_binary(encode({struct, P})), ++ [{atom_to_list(F), ++ ?_assertEqual(A, decode(JSON, [{format, F}]))} ++ || {F, A} <- [{struct, {struct, P}}, ++ {eep18, {P}}, ++ {proplist, P}]]. ++ + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochijson.erl apache-couchdb-1.2.1.q/src/mochiweb/mochijson.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochijson.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochijson.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -15,8 +15,6 @@ + -define(INC_COL(S), S#decoder{column=1+S#decoder.column}). + -define(INC_LINE(S), S#decoder{column=1, line=1+S#decoder.line}). + +-%% @type iolist() = [char() | binary() | iolist()] +-%% @type iodata() = iolist() | binary() + %% @type json_string() = atom | string() | binary() + %% @type json_number() = integer() | float() + %% @type json_array() = {array, [json_term()]} +@@ -406,8 +404,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + %% testing constructs borrowed from the Yaws JSON implementation. + +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochilists.erl apache-couchdb-1.2.1.q/src/mochiweb/mochilists.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochilists.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochilists.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -55,8 +55,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + set_defaults_test() -> + ?assertEqual( +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochilogfile2.erl apache-couchdb-1.2.1.q/src/mochiweb/mochilogfile2.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochilogfile2.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochilogfile2.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -57,8 +57,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + name_test() -> + D = mochitemp:mkdtemp(), + FileName = filename:join(D, "open_close_test.log"), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochinum.erl apache-couchdb-1.2.1.q/src/mochiweb/mochinum.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochinum.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochinum.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -243,8 +243,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + int_ceil_test() -> + ?assertEqual(1, int_ceil(0.0001)), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochitemp.erl apache-couchdb-1.2.1.q/src/mochiweb/mochitemp.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochitemp.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochitemp.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -135,8 +135,9 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). ++ + pushenv(L) -> + [{K, os:getenv(K)} || K <- L]. + popenv(L) -> +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiutf8.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiutf8.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiutf8.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiutf8.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -5,8 +5,9 @@ + %% invalid bytes. + + -module(mochiutf8). +--export([valid_utf8_bytes/1, codepoint_to_bytes/1, bytes_to_codepoints/1]). +--export([bytes_foldl/3, codepoint_foldl/3, read_codepoint/1, len/1]). ++-export([valid_utf8_bytes/1, codepoint_to_bytes/1, codepoints_to_bytes/1]). ++-export([bytes_to_codepoints/1, bytes_foldl/3, codepoint_foldl/3]). ++-export([read_codepoint/1, len/1]). + + %% External API + +@@ -192,8 +193,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + binary_skip_bytes_test() -> + ?assertEqual(<<"foo">>, +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_acceptor.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_acceptor.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_acceptor.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_acceptor.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -14,10 +14,10 @@ + proc_lib:spawn_link(?MODULE, init, [Server, Listen, Loop]). + + init(Server, Listen, Loop) -> +- T1 = now(), ++ T1 = os:timestamp(), + case catch mochiweb_socket:accept(Listen) of + {ok, Socket} -> +- gen_server:cast(Server, {accepted, self(), timer:now_diff(now(), T1)}), ++ gen_server:cast(Server, {accepted, self(), timer:now_diff(os:timestamp(), T1)}), + call_loop(Loop, Socket); + {error, closed} -> + exit(normal); +@@ -35,6 +35,8 @@ + + call_loop({M, F}, Socket) -> + M:F(Socket); ++call_loop({M, F, [A1]}, Socket) -> ++ M:F(Socket, A1); + call_loop({M, F, A}, Socket) -> + erlang:apply(M, F, [Socket | A]); + call_loop(Loop, Socket) -> +@@ -43,6 +45,6 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb.app.src apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.app.src +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb.app.src 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.app.src 2013-03-22 15:26:58.000000000 +0400 +@@ -1,9 +1,9 @@ + %% This is generated from src/mochiweb.app.src + {application, mochiweb, + [{description, "MochiMedia Web Server"}, +- {vsn, "1.4.1"}, ++ {vsn, "2.5.0"}, + {modules, []}, + {registered, []}, +- {mod, {mochiweb_app, []}}, + {env, []}, +- {applications, [kernel, stdlib, crypto, inets]}]}. ++ {applications, [kernel, stdlib, crypto, inets, ssl, xmerl, ++ compiler, syntax_tools]}]}. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_charref.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_charref.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_charref.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_charref.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -1,17 +1,17 @@ + %% @author Bob Ippolito + %% @copyright 2007 Mochi Media, Inc. + +-%% @doc Converts HTML 4 charrefs and entities to codepoints. ++%% @doc Converts HTML 5 charrefs and entities to codepoints (or lists of code points). + -module(mochiweb_charref). + -export([charref/1]). + + %% External API. + +-%% @spec charref(S) -> integer() | undefined + %% @doc Convert a decimal charref, hex charref, or html entity to a unicode + %% codepoint, or return undefined on failure. + %% The input should not include an ampersand or semicolon. + %% charref("#38") = 38, charref("#x26") = 38, charref("amp") = 38. ++-spec charref(binary() | string()) -> integer() | [integer()] | undefined. + charref(B) when is_binary(B) -> + charref(binary_to_list(B)); + charref([$#, C | L]) when C =:= $x orelse C =:= $X -> +@@ -29,266 +29,2141 @@ + + %% Internal API. + +-entity("nbsp") -> 160; +-entity("iexcl") -> 161; +-entity("cent") -> 162; +-entity("pound") -> 163; +-entity("curren") -> 164; +-entity("yen") -> 165; +-entity("brvbar") -> 166; +-entity("sect") -> 167; +-entity("uml") -> 168; +-entity("copy") -> 169; +-entity("ordf") -> 170; +-entity("laquo") -> 171; +-entity("not") -> 172; +-entity("shy") -> 173; +-entity("reg") -> 174; +-entity("macr") -> 175; +-entity("deg") -> 176; +-entity("plusmn") -> 177; +-entity("sup2") -> 178; +-entity("sup3") -> 179; +-entity("acute") -> 180; +-entity("micro") -> 181; +-entity("para") -> 182; +-entity("middot") -> 183; +-entity("cedil") -> 184; +-entity("sup1") -> 185; +-entity("ordm") -> 186; +-entity("raquo") -> 187; +-entity("frac14") -> 188; +-entity("frac12") -> 189; +-entity("frac34") -> 190; +-entity("iquest") -> 191; +-entity("Agrave") -> 192; +-entity("Aacute") -> 193; +-entity("Acirc") -> 194; +-entity("Atilde") -> 195; +-entity("Auml") -> 196; +-entity("Aring") -> 197; +-entity("AElig") -> 198; +-entity("Ccedil") -> 199; +-entity("Egrave") -> 200; +-entity("Eacute") -> 201; +-entity("Ecirc") -> 202; +-entity("Euml") -> 203; +-entity("Igrave") -> 204; +-entity("Iacute") -> 205; +-entity("Icirc") -> 206; +-entity("Iuml") -> 207; +-entity("ETH") -> 208; +-entity("Ntilde") -> 209; +-entity("Ograve") -> 210; +-entity("Oacute") -> 211; +-entity("Ocirc") -> 212; +-entity("Otilde") -> 213; +-entity("Ouml") -> 214; +-entity("times") -> 215; +-entity("Oslash") -> 216; +-entity("Ugrave") -> 217; +-entity("Uacute") -> 218; +-entity("Ucirc") -> 219; +-entity("Uuml") -> 220; +-entity("Yacute") -> 221; +-entity("THORN") -> 222; +-entity("szlig") -> 223; +-entity("agrave") -> 224; +-entity("aacute") -> 225; +-entity("acirc") -> 226; +-entity("atilde") -> 227; +-entity("auml") -> 228; +-entity("aring") -> 229; +-entity("aelig") -> 230; +-entity("ccedil") -> 231; +-entity("egrave") -> 232; +-entity("eacute") -> 233; +-entity("ecirc") -> 234; +-entity("euml") -> 235; +-entity("igrave") -> 236; +-entity("iacute") -> 237; +-entity("icirc") -> 238; +-entity("iuml") -> 239; +-entity("eth") -> 240; +-entity("ntilde") -> 241; +-entity("ograve") -> 242; +-entity("oacute") -> 243; +-entity("ocirc") -> 244; +-entity("otilde") -> 245; +-entity("ouml") -> 246; +-entity("divide") -> 247; +-entity("oslash") -> 248; +-entity("ugrave") -> 249; +-entity("uacute") -> 250; +-entity("ucirc") -> 251; +-entity("uuml") -> 252; +-entity("yacute") -> 253; +-entity("thorn") -> 254; +-entity("yuml") -> 255; +-entity("fnof") -> 402; +-entity("Alpha") -> 913; +-entity("Beta") -> 914; +-entity("Gamma") -> 915; +-entity("Delta") -> 916; +-entity("Epsilon") -> 917; +-entity("Zeta") -> 918; +-entity("Eta") -> 919; +-entity("Theta") -> 920; +-entity("Iota") -> 921; +-entity("Kappa") -> 922; +-entity("Lambda") -> 923; +-entity("Mu") -> 924; +-entity("Nu") -> 925; +-entity("Xi") -> 926; +-entity("Omicron") -> 927; +-entity("Pi") -> 928; +-entity("Rho") -> 929; +-entity("Sigma") -> 931; +-entity("Tau") -> 932; +-entity("Upsilon") -> 933; +-entity("Phi") -> 934; +-entity("Chi") -> 935; +-entity("Psi") -> 936; +-entity("Omega") -> 937; +-entity("alpha") -> 945; +-entity("beta") -> 946; +-entity("gamma") -> 947; +-entity("delta") -> 948; +-entity("epsilon") -> 949; +-entity("zeta") -> 950; +-entity("eta") -> 951; +-entity("theta") -> 952; +-entity("iota") -> 953; +-entity("kappa") -> 954; +-entity("lambda") -> 955; +-entity("mu") -> 956; +-entity("nu") -> 957; +-entity("xi") -> 958; +-entity("omicron") -> 959; +-entity("pi") -> 960; +-entity("rho") -> 961; +-entity("sigmaf") -> 962; +-entity("sigma") -> 963; +-entity("tau") -> 964; +-entity("upsilon") -> 965; +-entity("phi") -> 966; +-entity("chi") -> 967; +-entity("psi") -> 968; +-entity("omega") -> 969; +-entity("thetasym") -> 977; +-entity("upsih") -> 978; +-entity("piv") -> 982; +-entity("bull") -> 8226; +-entity("hellip") -> 8230; +-entity("prime") -> 8242; +-entity("Prime") -> 8243; +-entity("oline") -> 8254; +-entity("frasl") -> 8260; +-entity("weierp") -> 8472; +-entity("image") -> 8465; +-entity("real") -> 8476; +-entity("trade") -> 8482; +-entity("alefsym") -> 8501; +-entity("larr") -> 8592; +-entity("uarr") -> 8593; +-entity("rarr") -> 8594; +-entity("darr") -> 8595; +-entity("harr") -> 8596; +-entity("crarr") -> 8629; +-entity("lArr") -> 8656; +-entity("uArr") -> 8657; +-entity("rArr") -> 8658; +-entity("dArr") -> 8659; +-entity("hArr") -> 8660; +-entity("forall") -> 8704; +-entity("part") -> 8706; +-entity("exist") -> 8707; +-entity("empty") -> 8709; +-entity("nabla") -> 8711; +-entity("isin") -> 8712; +-entity("notin") -> 8713; +-entity("ni") -> 8715; +-entity("prod") -> 8719; +-entity("sum") -> 8721; +-entity("minus") -> 8722; +-entity("lowast") -> 8727; +-entity("radic") -> 8730; +-entity("prop") -> 8733; +-entity("infin") -> 8734; +-entity("ang") -> 8736; +-entity("and") -> 8743; +-entity("or") -> 8744; +-entity("cap") -> 8745; +-entity("cup") -> 8746; +-entity("int") -> 8747; +-entity("there4") -> 8756; +-entity("sim") -> 8764; +-entity("cong") -> 8773; +-entity("asymp") -> 8776; +-entity("ne") -> 8800; +-entity("equiv") -> 8801; +-entity("le") -> 8804; +-entity("ge") -> 8805; +-entity("sub") -> 8834; +-entity("sup") -> 8835; +-entity("nsub") -> 8836; +-entity("sube") -> 8838; +-entity("supe") -> 8839; +-entity("oplus") -> 8853; +-entity("otimes") -> 8855; +-entity("perp") -> 8869; +-entity("sdot") -> 8901; +-entity("lceil") -> 8968; +-entity("rceil") -> 8969; +-entity("lfloor") -> 8970; +-entity("rfloor") -> 8971; +-entity("lang") -> 9001; +-entity("rang") -> 9002; +-entity("loz") -> 9674; +-entity("spades") -> 9824; +-entity("clubs") -> 9827; +-entity("hearts") -> 9829; +-entity("diams") -> 9830; +-entity("quot") -> 34; +-entity("amp") -> 38; +-entity("lt") -> 60; +-entity("gt") -> 62; +-entity("OElig") -> 338; +-entity("oelig") -> 339; +-entity("Scaron") -> 352; +-entity("scaron") -> 353; +-entity("Yuml") -> 376; +-entity("circ") -> 710; +-entity("tilde") -> 732; +-entity("ensp") -> 8194; +-entity("emsp") -> 8195; +-entity("thinsp") -> 8201; +-entity("zwnj") -> 8204; +-entity("zwj") -> 8205; +-entity("lrm") -> 8206; +-entity("rlm") -> 8207; +-entity("ndash") -> 8211; +-entity("mdash") -> 8212; +-entity("lsquo") -> 8216; +-entity("rsquo") -> 8217; +-entity("sbquo") -> 8218; +-entity("ldquo") -> 8220; +-entity("rdquo") -> 8221; +-entity("bdquo") -> 8222; +-entity("dagger") -> 8224; +-entity("Dagger") -> 8225; +-entity("permil") -> 8240; +-entity("lsaquo") -> 8249; +-entity("rsaquo") -> 8250; +-entity("euro") -> 8364; +-entity(_) -> undefined. ++%% [2011-10-14] Generated from: ++%% http://www.w3.org/TR/html5/named-character-references.html + ++entity("AElig") -> 16#000C6; ++entity("AMP") -> 16#00026; ++entity("Aacute") -> 16#000C1; ++entity("Abreve") -> 16#00102; ++entity("Acirc") -> 16#000C2; ++entity("Acy") -> 16#00410; ++entity("Afr") -> 16#1D504; ++entity("Agrave") -> 16#000C0; ++entity("Alpha") -> 16#00391; ++entity("Amacr") -> 16#00100; ++entity("And") -> 16#02A53; ++entity("Aogon") -> 16#00104; ++entity("Aopf") -> 16#1D538; ++entity("ApplyFunction") -> 16#02061; ++entity("Aring") -> 16#000C5; ++entity("Ascr") -> 16#1D49C; ++entity("Assign") -> 16#02254; ++entity("Atilde") -> 16#000C3; ++entity("Auml") -> 16#000C4; ++entity("Backslash") -> 16#02216; ++entity("Barv") -> 16#02AE7; ++entity("Barwed") -> 16#02306; ++entity("Bcy") -> 16#00411; ++entity("Because") -> 16#02235; ++entity("Bernoullis") -> 16#0212C; ++entity("Beta") -> 16#00392; ++entity("Bfr") -> 16#1D505; ++entity("Bopf") -> 16#1D539; ++entity("Breve") -> 16#002D8; ++entity("Bscr") -> 16#0212C; ++entity("Bumpeq") -> 16#0224E; ++entity("CHcy") -> 16#00427; ++entity("COPY") -> 16#000A9; ++entity("Cacute") -> 16#00106; ++entity("Cap") -> 16#022D2; ++entity("CapitalDifferentialD") -> 16#02145; ++entity("Cayleys") -> 16#0212D; ++entity("Ccaron") -> 16#0010C; ++entity("Ccedil") -> 16#000C7; ++entity("Ccirc") -> 16#00108; ++entity("Cconint") -> 16#02230; ++entity("Cdot") -> 16#0010A; ++entity("Cedilla") -> 16#000B8; ++entity("CenterDot") -> 16#000B7; ++entity("Cfr") -> 16#0212D; ++entity("Chi") -> 16#003A7; ++entity("CircleDot") -> 16#02299; ++entity("CircleMinus") -> 16#02296; ++entity("CirclePlus") -> 16#02295; ++entity("CircleTimes") -> 16#02297; ++entity("ClockwiseContourIntegral") -> 16#02232; ++entity("CloseCurlyDoubleQuote") -> 16#0201D; ++entity("CloseCurlyQuote") -> 16#02019; ++entity("Colon") -> 16#02237; ++entity("Colone") -> 16#02A74; ++entity("Congruent") -> 16#02261; ++entity("Conint") -> 16#0222F; ++entity("ContourIntegral") -> 16#0222E; ++entity("Copf") -> 16#02102; ++entity("Coproduct") -> 16#02210; ++entity("CounterClockwiseContourIntegral") -> 16#02233; ++entity("Cross") -> 16#02A2F; ++entity("Cscr") -> 16#1D49E; ++entity("Cup") -> 16#022D3; ++entity("CupCap") -> 16#0224D; ++entity("DD") -> 16#02145; ++entity("DDotrahd") -> 16#02911; ++entity("DJcy") -> 16#00402; ++entity("DScy") -> 16#00405; ++entity("DZcy") -> 16#0040F; ++entity("Dagger") -> 16#02021; ++entity("Darr") -> 16#021A1; ++entity("Dashv") -> 16#02AE4; ++entity("Dcaron") -> 16#0010E; ++entity("Dcy") -> 16#00414; ++entity("Del") -> 16#02207; ++entity("Delta") -> 16#00394; ++entity("Dfr") -> 16#1D507; ++entity("DiacriticalAcute") -> 16#000B4; ++entity("DiacriticalDot") -> 16#002D9; ++entity("DiacriticalDoubleAcute") -> 16#002DD; ++entity("DiacriticalGrave") -> 16#00060; ++entity("DiacriticalTilde") -> 16#002DC; ++entity("Diamond") -> 16#022C4; ++entity("DifferentialD") -> 16#02146; ++entity("Dopf") -> 16#1D53B; ++entity("Dot") -> 16#000A8; ++entity("DotDot") -> 16#020DC; ++entity("DotEqual") -> 16#02250; ++entity("DoubleContourIntegral") -> 16#0222F; ++entity("DoubleDot") -> 16#000A8; ++entity("DoubleDownArrow") -> 16#021D3; ++entity("DoubleLeftArrow") -> 16#021D0; ++entity("DoubleLeftRightArrow") -> 16#021D4; ++entity("DoubleLeftTee") -> 16#02AE4; ++entity("DoubleLongLeftArrow") -> 16#027F8; ++entity("DoubleLongLeftRightArrow") -> 16#027FA; ++entity("DoubleLongRightArrow") -> 16#027F9; ++entity("DoubleRightArrow") -> 16#021D2; ++entity("DoubleRightTee") -> 16#022A8; ++entity("DoubleUpArrow") -> 16#021D1; ++entity("DoubleUpDownArrow") -> 16#021D5; ++entity("DoubleVerticalBar") -> 16#02225; ++entity("DownArrow") -> 16#02193; ++entity("DownArrowBar") -> 16#02913; ++entity("DownArrowUpArrow") -> 16#021F5; ++entity("DownBreve") -> 16#00311; ++entity("DownLeftRightVector") -> 16#02950; ++entity("DownLeftTeeVector") -> 16#0295E; ++entity("DownLeftVector") -> 16#021BD; ++entity("DownLeftVectorBar") -> 16#02956; ++entity("DownRightTeeVector") -> 16#0295F; ++entity("DownRightVector") -> 16#021C1; ++entity("DownRightVectorBar") -> 16#02957; ++entity("DownTee") -> 16#022A4; ++entity("DownTeeArrow") -> 16#021A7; ++entity("Downarrow") -> 16#021D3; ++entity("Dscr") -> 16#1D49F; ++entity("Dstrok") -> 16#00110; ++entity("ENG") -> 16#0014A; ++entity("ETH") -> 16#000D0; ++entity("Eacute") -> 16#000C9; ++entity("Ecaron") -> 16#0011A; ++entity("Ecirc") -> 16#000CA; ++entity("Ecy") -> 16#0042D; ++entity("Edot") -> 16#00116; ++entity("Efr") -> 16#1D508; ++entity("Egrave") -> 16#000C8; ++entity("Element") -> 16#02208; ++entity("Emacr") -> 16#00112; ++entity("EmptySmallSquare") -> 16#025FB; ++entity("EmptyVerySmallSquare") -> 16#025AB; ++entity("Eogon") -> 16#00118; ++entity("Eopf") -> 16#1D53C; ++entity("Epsilon") -> 16#00395; ++entity("Equal") -> 16#02A75; ++entity("EqualTilde") -> 16#02242; ++entity("Equilibrium") -> 16#021CC; ++entity("Escr") -> 16#02130; ++entity("Esim") -> 16#02A73; ++entity("Eta") -> 16#00397; ++entity("Euml") -> 16#000CB; ++entity("Exists") -> 16#02203; ++entity("ExponentialE") -> 16#02147; ++entity("Fcy") -> 16#00424; ++entity("Ffr") -> 16#1D509; ++entity("FilledSmallSquare") -> 16#025FC; ++entity("FilledVerySmallSquare") -> 16#025AA; ++entity("Fopf") -> 16#1D53D; ++entity("ForAll") -> 16#02200; ++entity("Fouriertrf") -> 16#02131; ++entity("Fscr") -> 16#02131; ++entity("GJcy") -> 16#00403; ++entity("GT") -> 16#0003E; ++entity("Gamma") -> 16#00393; ++entity("Gammad") -> 16#003DC; ++entity("Gbreve") -> 16#0011E; ++entity("Gcedil") -> 16#00122; ++entity("Gcirc") -> 16#0011C; ++entity("Gcy") -> 16#00413; ++entity("Gdot") -> 16#00120; ++entity("Gfr") -> 16#1D50A; ++entity("Gg") -> 16#022D9; ++entity("Gopf") -> 16#1D53E; ++entity("GreaterEqual") -> 16#02265; ++entity("GreaterEqualLess") -> 16#022DB; ++entity("GreaterFullEqual") -> 16#02267; ++entity("GreaterGreater") -> 16#02AA2; ++entity("GreaterLess") -> 16#02277; ++entity("GreaterSlantEqual") -> 16#02A7E; ++entity("GreaterTilde") -> 16#02273; ++entity("Gscr") -> 16#1D4A2; ++entity("Gt") -> 16#0226B; ++entity("HARDcy") -> 16#0042A; ++entity("Hacek") -> 16#002C7; ++entity("Hat") -> 16#0005E; ++entity("Hcirc") -> 16#00124; ++entity("Hfr") -> 16#0210C; ++entity("HilbertSpace") -> 16#0210B; ++entity("Hopf") -> 16#0210D; ++entity("HorizontalLine") -> 16#02500; ++entity("Hscr") -> 16#0210B; ++entity("Hstrok") -> 16#00126; ++entity("HumpDownHump") -> 16#0224E; ++entity("HumpEqual") -> 16#0224F; ++entity("IEcy") -> 16#00415; ++entity("IJlig") -> 16#00132; ++entity("IOcy") -> 16#00401; ++entity("Iacute") -> 16#000CD; ++entity("Icirc") -> 16#000CE; ++entity("Icy") -> 16#00418; ++entity("Idot") -> 16#00130; ++entity("Ifr") -> 16#02111; ++entity("Igrave") -> 16#000CC; ++entity("Im") -> 16#02111; ++entity("Imacr") -> 16#0012A; ++entity("ImaginaryI") -> 16#02148; ++entity("Implies") -> 16#021D2; ++entity("Int") -> 16#0222C; ++entity("Integral") -> 16#0222B; ++entity("Intersection") -> 16#022C2; ++entity("InvisibleComma") -> 16#02063; ++entity("InvisibleTimes") -> 16#02062; ++entity("Iogon") -> 16#0012E; ++entity("Iopf") -> 16#1D540; ++entity("Iota") -> 16#00399; ++entity("Iscr") -> 16#02110; ++entity("Itilde") -> 16#00128; ++entity("Iukcy") -> 16#00406; ++entity("Iuml") -> 16#000CF; ++entity("Jcirc") -> 16#00134; ++entity("Jcy") -> 16#00419; ++entity("Jfr") -> 16#1D50D; ++entity("Jopf") -> 16#1D541; ++entity("Jscr") -> 16#1D4A5; ++entity("Jsercy") -> 16#00408; ++entity("Jukcy") -> 16#00404; ++entity("KHcy") -> 16#00425; ++entity("KJcy") -> 16#0040C; ++entity("Kappa") -> 16#0039A; ++entity("Kcedil") -> 16#00136; ++entity("Kcy") -> 16#0041A; ++entity("Kfr") -> 16#1D50E; ++entity("Kopf") -> 16#1D542; ++entity("Kscr") -> 16#1D4A6; ++entity("LJcy") -> 16#00409; ++entity("LT") -> 16#0003C; ++entity("Lacute") -> 16#00139; ++entity("Lambda") -> 16#0039B; ++entity("Lang") -> 16#027EA; ++entity("Laplacetrf") -> 16#02112; ++entity("Larr") -> 16#0219E; ++entity("Lcaron") -> 16#0013D; ++entity("Lcedil") -> 16#0013B; ++entity("Lcy") -> 16#0041B; ++entity("LeftAngleBracket") -> 16#027E8; ++entity("LeftArrow") -> 16#02190; ++entity("LeftArrowBar") -> 16#021E4; ++entity("LeftArrowRightArrow") -> 16#021C6; ++entity("LeftCeiling") -> 16#02308; ++entity("LeftDoubleBracket") -> 16#027E6; ++entity("LeftDownTeeVector") -> 16#02961; ++entity("LeftDownVector") -> 16#021C3; ++entity("LeftDownVectorBar") -> 16#02959; ++entity("LeftFloor") -> 16#0230A; ++entity("LeftRightArrow") -> 16#02194; ++entity("LeftRightVector") -> 16#0294E; ++entity("LeftTee") -> 16#022A3; ++entity("LeftTeeArrow") -> 16#021A4; ++entity("LeftTeeVector") -> 16#0295A; ++entity("LeftTriangle") -> 16#022B2; ++entity("LeftTriangleBar") -> 16#029CF; ++entity("LeftTriangleEqual") -> 16#022B4; ++entity("LeftUpDownVector") -> 16#02951; ++entity("LeftUpTeeVector") -> 16#02960; ++entity("LeftUpVector") -> 16#021BF; ++entity("LeftUpVectorBar") -> 16#02958; ++entity("LeftVector") -> 16#021BC; ++entity("LeftVectorBar") -> 16#02952; ++entity("Leftarrow") -> 16#021D0; ++entity("Leftrightarrow") -> 16#021D4; ++entity("LessEqualGreater") -> 16#022DA; ++entity("LessFullEqual") -> 16#02266; ++entity("LessGreater") -> 16#02276; ++entity("LessLess") -> 16#02AA1; ++entity("LessSlantEqual") -> 16#02A7D; ++entity("LessTilde") -> 16#02272; ++entity("Lfr") -> 16#1D50F; ++entity("Ll") -> 16#022D8; ++entity("Lleftarrow") -> 16#021DA; ++entity("Lmidot") -> 16#0013F; ++entity("LongLeftArrow") -> 16#027F5; ++entity("LongLeftRightArrow") -> 16#027F7; ++entity("LongRightArrow") -> 16#027F6; ++entity("Longleftarrow") -> 16#027F8; ++entity("Longleftrightarrow") -> 16#027FA; ++entity("Longrightarrow") -> 16#027F9; ++entity("Lopf") -> 16#1D543; ++entity("LowerLeftArrow") -> 16#02199; ++entity("LowerRightArrow") -> 16#02198; ++entity("Lscr") -> 16#02112; ++entity("Lsh") -> 16#021B0; ++entity("Lstrok") -> 16#00141; ++entity("Lt") -> 16#0226A; ++entity("Map") -> 16#02905; ++entity("Mcy") -> 16#0041C; ++entity("MediumSpace") -> 16#0205F; ++entity("Mellintrf") -> 16#02133; ++entity("Mfr") -> 16#1D510; ++entity("MinusPlus") -> 16#02213; ++entity("Mopf") -> 16#1D544; ++entity("Mscr") -> 16#02133; ++entity("Mu") -> 16#0039C; ++entity("NJcy") -> 16#0040A; ++entity("Nacute") -> 16#00143; ++entity("Ncaron") -> 16#00147; ++entity("Ncedil") -> 16#00145; ++entity("Ncy") -> 16#0041D; ++entity("NegativeMediumSpace") -> 16#0200B; ++entity("NegativeThickSpace") -> 16#0200B; ++entity("NegativeThinSpace") -> 16#0200B; ++entity("NegativeVeryThinSpace") -> 16#0200B; ++entity("NestedGreaterGreater") -> 16#0226B; ++entity("NestedLessLess") -> 16#0226A; ++entity("NewLine") -> 16#0000A; ++entity("Nfr") -> 16#1D511; ++entity("NoBreak") -> 16#02060; ++entity("NonBreakingSpace") -> 16#000A0; ++entity("Nopf") -> 16#02115; ++entity("Not") -> 16#02AEC; ++entity("NotCongruent") -> 16#02262; ++entity("NotCupCap") -> 16#0226D; ++entity("NotDoubleVerticalBar") -> 16#02226; ++entity("NotElement") -> 16#02209; ++entity("NotEqual") -> 16#02260; ++entity("NotEqualTilde") -> [16#02242, 16#00338]; ++entity("NotExists") -> 16#02204; ++entity("NotGreater") -> 16#0226F; ++entity("NotGreaterEqual") -> 16#02271; ++entity("NotGreaterFullEqual") -> [16#02267, 16#00338]; ++entity("NotGreaterGreater") -> [16#0226B, 16#00338]; ++entity("NotGreaterLess") -> 16#02279; ++entity("NotGreaterSlantEqual") -> [16#02A7E, 16#00338]; ++entity("NotGreaterTilde") -> 16#02275; ++entity("NotHumpDownHump") -> [16#0224E, 16#00338]; ++entity("NotHumpEqual") -> [16#0224F, 16#00338]; ++entity("NotLeftTriangle") -> 16#022EA; ++entity("NotLeftTriangleBar") -> [16#029CF, 16#00338]; ++entity("NotLeftTriangleEqual") -> 16#022EC; ++entity("NotLess") -> 16#0226E; ++entity("NotLessEqual") -> 16#02270; ++entity("NotLessGreater") -> 16#02278; ++entity("NotLessLess") -> [16#0226A, 16#00338]; ++entity("NotLessSlantEqual") -> [16#02A7D, 16#00338]; ++entity("NotLessTilde") -> 16#02274; ++entity("NotNestedGreaterGreater") -> [16#02AA2, 16#00338]; ++entity("NotNestedLessLess") -> [16#02AA1, 16#00338]; ++entity("NotPrecedes") -> 16#02280; ++entity("NotPrecedesEqual") -> [16#02AAF, 16#00338]; ++entity("NotPrecedesSlantEqual") -> 16#022E0; ++entity("NotReverseElement") -> 16#0220C; ++entity("NotRightTriangle") -> 16#022EB; ++entity("NotRightTriangleBar") -> [16#029D0, 16#00338]; ++entity("NotRightTriangleEqual") -> 16#022ED; ++entity("NotSquareSubset") -> [16#0228F, 16#00338]; ++entity("NotSquareSubsetEqual") -> 16#022E2; ++entity("NotSquareSuperset") -> [16#02290, 16#00338]; ++entity("NotSquareSupersetEqual") -> 16#022E3; ++entity("NotSubset") -> [16#02282, 16#020D2]; ++entity("NotSubsetEqual") -> 16#02288; ++entity("NotSucceeds") -> 16#02281; ++entity("NotSucceedsEqual") -> [16#02AB0, 16#00338]; ++entity("NotSucceedsSlantEqual") -> 16#022E1; ++entity("NotSucceedsTilde") -> [16#0227F, 16#00338]; ++entity("NotSuperset") -> [16#02283, 16#020D2]; ++entity("NotSupersetEqual") -> 16#02289; ++entity("NotTilde") -> 16#02241; ++entity("NotTildeEqual") -> 16#02244; ++entity("NotTildeFullEqual") -> 16#02247; ++entity("NotTildeTilde") -> 16#02249; ++entity("NotVerticalBar") -> 16#02224; ++entity("Nscr") -> 16#1D4A9; ++entity("Ntilde") -> 16#000D1; ++entity("Nu") -> 16#0039D; ++entity("OElig") -> 16#00152; ++entity("Oacute") -> 16#000D3; ++entity("Ocirc") -> 16#000D4; ++entity("Ocy") -> 16#0041E; ++entity("Odblac") -> 16#00150; ++entity("Ofr") -> 16#1D512; ++entity("Ograve") -> 16#000D2; ++entity("Omacr") -> 16#0014C; ++entity("Omega") -> 16#003A9; ++entity("Omicron") -> 16#0039F; ++entity("Oopf") -> 16#1D546; ++entity("OpenCurlyDoubleQuote") -> 16#0201C; ++entity("OpenCurlyQuote") -> 16#02018; ++entity("Or") -> 16#02A54; ++entity("Oscr") -> 16#1D4AA; ++entity("Oslash") -> 16#000D8; ++entity("Otilde") -> 16#000D5; ++entity("Otimes") -> 16#02A37; ++entity("Ouml") -> 16#000D6; ++entity("OverBar") -> 16#0203E; ++entity("OverBrace") -> 16#023DE; ++entity("OverBracket") -> 16#023B4; ++entity("OverParenthesis") -> 16#023DC; ++entity("PartialD") -> 16#02202; ++entity("Pcy") -> 16#0041F; ++entity("Pfr") -> 16#1D513; ++entity("Phi") -> 16#003A6; ++entity("Pi") -> 16#003A0; ++entity("PlusMinus") -> 16#000B1; ++entity("Poincareplane") -> 16#0210C; ++entity("Popf") -> 16#02119; ++entity("Pr") -> 16#02ABB; ++entity("Precedes") -> 16#0227A; ++entity("PrecedesEqual") -> 16#02AAF; ++entity("PrecedesSlantEqual") -> 16#0227C; ++entity("PrecedesTilde") -> 16#0227E; ++entity("Prime") -> 16#02033; ++entity("Product") -> 16#0220F; ++entity("Proportion") -> 16#02237; ++entity("Proportional") -> 16#0221D; ++entity("Pscr") -> 16#1D4AB; ++entity("Psi") -> 16#003A8; ++entity("QUOT") -> 16#00022; ++entity("Qfr") -> 16#1D514; ++entity("Qopf") -> 16#0211A; ++entity("Qscr") -> 16#1D4AC; ++entity("RBarr") -> 16#02910; ++entity("REG") -> 16#000AE; ++entity("Racute") -> 16#00154; ++entity("Rang") -> 16#027EB; ++entity("Rarr") -> 16#021A0; ++entity("Rarrtl") -> 16#02916; ++entity("Rcaron") -> 16#00158; ++entity("Rcedil") -> 16#00156; ++entity("Rcy") -> 16#00420; ++entity("Re") -> 16#0211C; ++entity("ReverseElement") -> 16#0220B; ++entity("ReverseEquilibrium") -> 16#021CB; ++entity("ReverseUpEquilibrium") -> 16#0296F; ++entity("Rfr") -> 16#0211C; ++entity("Rho") -> 16#003A1; ++entity("RightAngleBracket") -> 16#027E9; ++entity("RightArrow") -> 16#02192; ++entity("RightArrowBar") -> 16#021E5; ++entity("RightArrowLeftArrow") -> 16#021C4; ++entity("RightCeiling") -> 16#02309; ++entity("RightDoubleBracket") -> 16#027E7; ++entity("RightDownTeeVector") -> 16#0295D; ++entity("RightDownVector") -> 16#021C2; ++entity("RightDownVectorBar") -> 16#02955; ++entity("RightFloor") -> 16#0230B; ++entity("RightTee") -> 16#022A2; ++entity("RightTeeArrow") -> 16#021A6; ++entity("RightTeeVector") -> 16#0295B; ++entity("RightTriangle") -> 16#022B3; ++entity("RightTriangleBar") -> 16#029D0; ++entity("RightTriangleEqual") -> 16#022B5; ++entity("RightUpDownVector") -> 16#0294F; ++entity("RightUpTeeVector") -> 16#0295C; ++entity("RightUpVector") -> 16#021BE; ++entity("RightUpVectorBar") -> 16#02954; ++entity("RightVector") -> 16#021C0; ++entity("RightVectorBar") -> 16#02953; ++entity("Rightarrow") -> 16#021D2; ++entity("Ropf") -> 16#0211D; ++entity("RoundImplies") -> 16#02970; ++entity("Rrightarrow") -> 16#021DB; ++entity("Rscr") -> 16#0211B; ++entity("Rsh") -> 16#021B1; ++entity("RuleDelayed") -> 16#029F4; ++entity("SHCHcy") -> 16#00429; ++entity("SHcy") -> 16#00428; ++entity("SOFTcy") -> 16#0042C; ++entity("Sacute") -> 16#0015A; ++entity("Sc") -> 16#02ABC; ++entity("Scaron") -> 16#00160; ++entity("Scedil") -> 16#0015E; ++entity("Scirc") -> 16#0015C; ++entity("Scy") -> 16#00421; ++entity("Sfr") -> 16#1D516; ++entity("ShortDownArrow") -> 16#02193; ++entity("ShortLeftArrow") -> 16#02190; ++entity("ShortRightArrow") -> 16#02192; ++entity("ShortUpArrow") -> 16#02191; ++entity("Sigma") -> 16#003A3; ++entity("SmallCircle") -> 16#02218; ++entity("Sopf") -> 16#1D54A; ++entity("Sqrt") -> 16#0221A; ++entity("Square") -> 16#025A1; ++entity("SquareIntersection") -> 16#02293; ++entity("SquareSubset") -> 16#0228F; ++entity("SquareSubsetEqual") -> 16#02291; ++entity("SquareSuperset") -> 16#02290; ++entity("SquareSupersetEqual") -> 16#02292; ++entity("SquareUnion") -> 16#02294; ++entity("Sscr") -> 16#1D4AE; ++entity("Star") -> 16#022C6; ++entity("Sub") -> 16#022D0; ++entity("Subset") -> 16#022D0; ++entity("SubsetEqual") -> 16#02286; ++entity("Succeeds") -> 16#0227B; ++entity("SucceedsEqual") -> 16#02AB0; ++entity("SucceedsSlantEqual") -> 16#0227D; ++entity("SucceedsTilde") -> 16#0227F; ++entity("SuchThat") -> 16#0220B; ++entity("Sum") -> 16#02211; ++entity("Sup") -> 16#022D1; ++entity("Superset") -> 16#02283; ++entity("SupersetEqual") -> 16#02287; ++entity("Supset") -> 16#022D1; ++entity("THORN") -> 16#000DE; ++entity("TRADE") -> 16#02122; ++entity("TSHcy") -> 16#0040B; ++entity("TScy") -> 16#00426; ++entity("Tab") -> 16#00009; ++entity("Tau") -> 16#003A4; ++entity("Tcaron") -> 16#00164; ++entity("Tcedil") -> 16#00162; ++entity("Tcy") -> 16#00422; ++entity("Tfr") -> 16#1D517; ++entity("Therefore") -> 16#02234; ++entity("Theta") -> 16#00398; ++entity("ThickSpace") -> [16#0205F, 16#0200A]; ++entity("ThinSpace") -> 16#02009; ++entity("Tilde") -> 16#0223C; ++entity("TildeEqual") -> 16#02243; ++entity("TildeFullEqual") -> 16#02245; ++entity("TildeTilde") -> 16#02248; ++entity("Topf") -> 16#1D54B; ++entity("TripleDot") -> 16#020DB; ++entity("Tscr") -> 16#1D4AF; ++entity("Tstrok") -> 16#00166; ++entity("Uacute") -> 16#000DA; ++entity("Uarr") -> 16#0219F; ++entity("Uarrocir") -> 16#02949; ++entity("Ubrcy") -> 16#0040E; ++entity("Ubreve") -> 16#0016C; ++entity("Ucirc") -> 16#000DB; ++entity("Ucy") -> 16#00423; ++entity("Udblac") -> 16#00170; ++entity("Ufr") -> 16#1D518; ++entity("Ugrave") -> 16#000D9; ++entity("Umacr") -> 16#0016A; ++entity("UnderBar") -> 16#0005F; ++entity("UnderBrace") -> 16#023DF; ++entity("UnderBracket") -> 16#023B5; ++entity("UnderParenthesis") -> 16#023DD; ++entity("Union") -> 16#022C3; ++entity("UnionPlus") -> 16#0228E; ++entity("Uogon") -> 16#00172; ++entity("Uopf") -> 16#1D54C; ++entity("UpArrow") -> 16#02191; ++entity("UpArrowBar") -> 16#02912; ++entity("UpArrowDownArrow") -> 16#021C5; ++entity("UpDownArrow") -> 16#02195; ++entity("UpEquilibrium") -> 16#0296E; ++entity("UpTee") -> 16#022A5; ++entity("UpTeeArrow") -> 16#021A5; ++entity("Uparrow") -> 16#021D1; ++entity("Updownarrow") -> 16#021D5; ++entity("UpperLeftArrow") -> 16#02196; ++entity("UpperRightArrow") -> 16#02197; ++entity("Upsi") -> 16#003D2; ++entity("Upsilon") -> 16#003A5; ++entity("Uring") -> 16#0016E; ++entity("Uscr") -> 16#1D4B0; ++entity("Utilde") -> 16#00168; ++entity("Uuml") -> 16#000DC; ++entity("VDash") -> 16#022AB; ++entity("Vbar") -> 16#02AEB; ++entity("Vcy") -> 16#00412; ++entity("Vdash") -> 16#022A9; ++entity("Vdashl") -> 16#02AE6; ++entity("Vee") -> 16#022C1; ++entity("Verbar") -> 16#02016; ++entity("Vert") -> 16#02016; ++entity("VerticalBar") -> 16#02223; ++entity("VerticalLine") -> 16#0007C; ++entity("VerticalSeparator") -> 16#02758; ++entity("VerticalTilde") -> 16#02240; ++entity("VeryThinSpace") -> 16#0200A; ++entity("Vfr") -> 16#1D519; ++entity("Vopf") -> 16#1D54D; ++entity("Vscr") -> 16#1D4B1; ++entity("Vvdash") -> 16#022AA; ++entity("Wcirc") -> 16#00174; ++entity("Wedge") -> 16#022C0; ++entity("Wfr") -> 16#1D51A; ++entity("Wopf") -> 16#1D54E; ++entity("Wscr") -> 16#1D4B2; ++entity("Xfr") -> 16#1D51B; ++entity("Xi") -> 16#0039E; ++entity("Xopf") -> 16#1D54F; ++entity("Xscr") -> 16#1D4B3; ++entity("YAcy") -> 16#0042F; ++entity("YIcy") -> 16#00407; ++entity("YUcy") -> 16#0042E; ++entity("Yacute") -> 16#000DD; ++entity("Ycirc") -> 16#00176; ++entity("Ycy") -> 16#0042B; ++entity("Yfr") -> 16#1D51C; ++entity("Yopf") -> 16#1D550; ++entity("Yscr") -> 16#1D4B4; ++entity("Yuml") -> 16#00178; ++entity("ZHcy") -> 16#00416; ++entity("Zacute") -> 16#00179; ++entity("Zcaron") -> 16#0017D; ++entity("Zcy") -> 16#00417; ++entity("Zdot") -> 16#0017B; ++entity("ZeroWidthSpace") -> 16#0200B; ++entity("Zeta") -> 16#00396; ++entity("Zfr") -> 16#02128; ++entity("Zopf") -> 16#02124; ++entity("Zscr") -> 16#1D4B5; ++entity("aacute") -> 16#000E1; ++entity("abreve") -> 16#00103; ++entity("ac") -> 16#0223E; ++entity("acE") -> [16#0223E, 16#00333]; ++entity("acd") -> 16#0223F; ++entity("acirc") -> 16#000E2; ++entity("acute") -> 16#000B4; ++entity("acy") -> 16#00430; ++entity("aelig") -> 16#000E6; ++entity("af") -> 16#02061; ++entity("afr") -> 16#1D51E; ++entity("agrave") -> 16#000E0; ++entity("alefsym") -> 16#02135; ++entity("aleph") -> 16#02135; ++entity("alpha") -> 16#003B1; ++entity("amacr") -> 16#00101; ++entity("amalg") -> 16#02A3F; ++entity("amp") -> 16#00026; ++entity("and") -> 16#02227; ++entity("andand") -> 16#02A55; ++entity("andd") -> 16#02A5C; ++entity("andslope") -> 16#02A58; ++entity("andv") -> 16#02A5A; ++entity("ang") -> 16#02220; ++entity("ange") -> 16#029A4; ++entity("angle") -> 16#02220; ++entity("angmsd") -> 16#02221; ++entity("angmsdaa") -> 16#029A8; ++entity("angmsdab") -> 16#029A9; ++entity("angmsdac") -> 16#029AA; ++entity("angmsdad") -> 16#029AB; ++entity("angmsdae") -> 16#029AC; ++entity("angmsdaf") -> 16#029AD; ++entity("angmsdag") -> 16#029AE; ++entity("angmsdah") -> 16#029AF; ++entity("angrt") -> 16#0221F; ++entity("angrtvb") -> 16#022BE; ++entity("angrtvbd") -> 16#0299D; ++entity("angsph") -> 16#02222; ++entity("angst") -> 16#000C5; ++entity("angzarr") -> 16#0237C; ++entity("aogon") -> 16#00105; ++entity("aopf") -> 16#1D552; ++entity("ap") -> 16#02248; ++entity("apE") -> 16#02A70; ++entity("apacir") -> 16#02A6F; ++entity("ape") -> 16#0224A; ++entity("apid") -> 16#0224B; ++entity("apos") -> 16#00027; ++entity("approx") -> 16#02248; ++entity("approxeq") -> 16#0224A; ++entity("aring") -> 16#000E5; ++entity("ascr") -> 16#1D4B6; ++entity("ast") -> 16#0002A; ++entity("asymp") -> 16#02248; ++entity("asympeq") -> 16#0224D; ++entity("atilde") -> 16#000E3; ++entity("auml") -> 16#000E4; ++entity("awconint") -> 16#02233; ++entity("awint") -> 16#02A11; ++entity("bNot") -> 16#02AED; ++entity("backcong") -> 16#0224C; ++entity("backepsilon") -> 16#003F6; ++entity("backprime") -> 16#02035; ++entity("backsim") -> 16#0223D; ++entity("backsimeq") -> 16#022CD; ++entity("barvee") -> 16#022BD; ++entity("barwed") -> 16#02305; ++entity("barwedge") -> 16#02305; ++entity("bbrk") -> 16#023B5; ++entity("bbrktbrk") -> 16#023B6; ++entity("bcong") -> 16#0224C; ++entity("bcy") -> 16#00431; ++entity("bdquo") -> 16#0201E; ++entity("becaus") -> 16#02235; ++entity("because") -> 16#02235; ++entity("bemptyv") -> 16#029B0; ++entity("bepsi") -> 16#003F6; ++entity("bernou") -> 16#0212C; ++entity("beta") -> 16#003B2; ++entity("beth") -> 16#02136; ++entity("between") -> 16#0226C; ++entity("bfr") -> 16#1D51F; ++entity("bigcap") -> 16#022C2; ++entity("bigcirc") -> 16#025EF; ++entity("bigcup") -> 16#022C3; ++entity("bigodot") -> 16#02A00; ++entity("bigoplus") -> 16#02A01; ++entity("bigotimes") -> 16#02A02; ++entity("bigsqcup") -> 16#02A06; ++entity("bigstar") -> 16#02605; ++entity("bigtriangledown") -> 16#025BD; ++entity("bigtriangleup") -> 16#025B3; ++entity("biguplus") -> 16#02A04; ++entity("bigvee") -> 16#022C1; ++entity("bigwedge") -> 16#022C0; ++entity("bkarow") -> 16#0290D; ++entity("blacklozenge") -> 16#029EB; ++entity("blacksquare") -> 16#025AA; ++entity("blacktriangle") -> 16#025B4; ++entity("blacktriangledown") -> 16#025BE; ++entity("blacktriangleleft") -> 16#025C2; ++entity("blacktriangleright") -> 16#025B8; ++entity("blank") -> 16#02423; ++entity("blk12") -> 16#02592; ++entity("blk14") -> 16#02591; ++entity("blk34") -> 16#02593; ++entity("block") -> 16#02588; ++entity("bne") -> [16#0003D, 16#020E5]; ++entity("bnequiv") -> [16#02261, 16#020E5]; ++entity("bnot") -> 16#02310; ++entity("bopf") -> 16#1D553; ++entity("bot") -> 16#022A5; ++entity("bottom") -> 16#022A5; ++entity("bowtie") -> 16#022C8; ++entity("boxDL") -> 16#02557; ++entity("boxDR") -> 16#02554; ++entity("boxDl") -> 16#02556; ++entity("boxDr") -> 16#02553; ++entity("boxH") -> 16#02550; ++entity("boxHD") -> 16#02566; ++entity("boxHU") -> 16#02569; ++entity("boxHd") -> 16#02564; ++entity("boxHu") -> 16#02567; ++entity("boxUL") -> 16#0255D; ++entity("boxUR") -> 16#0255A; ++entity("boxUl") -> 16#0255C; ++entity("boxUr") -> 16#02559; ++entity("boxV") -> 16#02551; ++entity("boxVH") -> 16#0256C; ++entity("boxVL") -> 16#02563; ++entity("boxVR") -> 16#02560; ++entity("boxVh") -> 16#0256B; ++entity("boxVl") -> 16#02562; ++entity("boxVr") -> 16#0255F; ++entity("boxbox") -> 16#029C9; ++entity("boxdL") -> 16#02555; ++entity("boxdR") -> 16#02552; ++entity("boxdl") -> 16#02510; ++entity("boxdr") -> 16#0250C; ++entity("boxh") -> 16#02500; ++entity("boxhD") -> 16#02565; ++entity("boxhU") -> 16#02568; ++entity("boxhd") -> 16#0252C; ++entity("boxhu") -> 16#02534; ++entity("boxminus") -> 16#0229F; ++entity("boxplus") -> 16#0229E; ++entity("boxtimes") -> 16#022A0; ++entity("boxuL") -> 16#0255B; ++entity("boxuR") -> 16#02558; ++entity("boxul") -> 16#02518; ++entity("boxur") -> 16#02514; ++entity("boxv") -> 16#02502; ++entity("boxvH") -> 16#0256A; ++entity("boxvL") -> 16#02561; ++entity("boxvR") -> 16#0255E; ++entity("boxvh") -> 16#0253C; ++entity("boxvl") -> 16#02524; ++entity("boxvr") -> 16#0251C; ++entity("bprime") -> 16#02035; ++entity("breve") -> 16#002D8; ++entity("brvbar") -> 16#000A6; ++entity("bscr") -> 16#1D4B7; ++entity("bsemi") -> 16#0204F; ++entity("bsim") -> 16#0223D; ++entity("bsime") -> 16#022CD; ++entity("bsol") -> 16#0005C; ++entity("bsolb") -> 16#029C5; ++entity("bsolhsub") -> 16#027C8; ++entity("bull") -> 16#02022; ++entity("bullet") -> 16#02022; ++entity("bump") -> 16#0224E; ++entity("bumpE") -> 16#02AAE; ++entity("bumpe") -> 16#0224F; ++entity("bumpeq") -> 16#0224F; ++entity("cacute") -> 16#00107; ++entity("cap") -> 16#02229; ++entity("capand") -> 16#02A44; ++entity("capbrcup") -> 16#02A49; ++entity("capcap") -> 16#02A4B; ++entity("capcup") -> 16#02A47; ++entity("capdot") -> 16#02A40; ++entity("caps") -> [16#02229, 16#0FE00]; ++entity("caret") -> 16#02041; ++entity("caron") -> 16#002C7; ++entity("ccaps") -> 16#02A4D; ++entity("ccaron") -> 16#0010D; ++entity("ccedil") -> 16#000E7; ++entity("ccirc") -> 16#00109; ++entity("ccups") -> 16#02A4C; ++entity("ccupssm") -> 16#02A50; ++entity("cdot") -> 16#0010B; ++entity("cedil") -> 16#000B8; ++entity("cemptyv") -> 16#029B2; ++entity("cent") -> 16#000A2; ++entity("centerdot") -> 16#000B7; ++entity("cfr") -> 16#1D520; ++entity("chcy") -> 16#00447; ++entity("check") -> 16#02713; ++entity("checkmark") -> 16#02713; ++entity("chi") -> 16#003C7; ++entity("cir") -> 16#025CB; ++entity("cirE") -> 16#029C3; ++entity("circ") -> 16#002C6; ++entity("circeq") -> 16#02257; ++entity("circlearrowleft") -> 16#021BA; ++entity("circlearrowright") -> 16#021BB; ++entity("circledR") -> 16#000AE; ++entity("circledS") -> 16#024C8; ++entity("circledast") -> 16#0229B; ++entity("circledcirc") -> 16#0229A; ++entity("circleddash") -> 16#0229D; ++entity("cire") -> 16#02257; ++entity("cirfnint") -> 16#02A10; ++entity("cirmid") -> 16#02AEF; ++entity("cirscir") -> 16#029C2; ++entity("clubs") -> 16#02663; ++entity("clubsuit") -> 16#02663; ++entity("colon") -> 16#0003A; ++entity("colone") -> 16#02254; ++entity("coloneq") -> 16#02254; ++entity("comma") -> 16#0002C; ++entity("commat") -> 16#00040; ++entity("comp") -> 16#02201; ++entity("compfn") -> 16#02218; ++entity("complement") -> 16#02201; ++entity("complexes") -> 16#02102; ++entity("cong") -> 16#02245; ++entity("congdot") -> 16#02A6D; ++entity("conint") -> 16#0222E; ++entity("copf") -> 16#1D554; ++entity("coprod") -> 16#02210; ++entity("copy") -> 16#000A9; ++entity("copysr") -> 16#02117; ++entity("crarr") -> 16#021B5; ++entity("cross") -> 16#02717; ++entity("cscr") -> 16#1D4B8; ++entity("csub") -> 16#02ACF; ++entity("csube") -> 16#02AD1; ++entity("csup") -> 16#02AD0; ++entity("csupe") -> 16#02AD2; ++entity("ctdot") -> 16#022EF; ++entity("cudarrl") -> 16#02938; ++entity("cudarrr") -> 16#02935; ++entity("cuepr") -> 16#022DE; ++entity("cuesc") -> 16#022DF; ++entity("cularr") -> 16#021B6; ++entity("cularrp") -> 16#0293D; ++entity("cup") -> 16#0222A; ++entity("cupbrcap") -> 16#02A48; ++entity("cupcap") -> 16#02A46; ++entity("cupcup") -> 16#02A4A; ++entity("cupdot") -> 16#0228D; ++entity("cupor") -> 16#02A45; ++entity("cups") -> [16#0222A, 16#0FE00]; ++entity("curarr") -> 16#021B7; ++entity("curarrm") -> 16#0293C; ++entity("curlyeqprec") -> 16#022DE; ++entity("curlyeqsucc") -> 16#022DF; ++entity("curlyvee") -> 16#022CE; ++entity("curlywedge") -> 16#022CF; ++entity("curren") -> 16#000A4; ++entity("curvearrowleft") -> 16#021B6; ++entity("curvearrowright") -> 16#021B7; ++entity("cuvee") -> 16#022CE; ++entity("cuwed") -> 16#022CF; ++entity("cwconint") -> 16#02232; ++entity("cwint") -> 16#02231; ++entity("cylcty") -> 16#0232D; ++entity("dArr") -> 16#021D3; ++entity("dHar") -> 16#02965; ++entity("dagger") -> 16#02020; ++entity("daleth") -> 16#02138; ++entity("darr") -> 16#02193; ++entity("dash") -> 16#02010; ++entity("dashv") -> 16#022A3; ++entity("dbkarow") -> 16#0290F; ++entity("dblac") -> 16#002DD; ++entity("dcaron") -> 16#0010F; ++entity("dcy") -> 16#00434; ++entity("dd") -> 16#02146; ++entity("ddagger") -> 16#02021; ++entity("ddarr") -> 16#021CA; ++entity("ddotseq") -> 16#02A77; ++entity("deg") -> 16#000B0; ++entity("delta") -> 16#003B4; ++entity("demptyv") -> 16#029B1; ++entity("dfisht") -> 16#0297F; ++entity("dfr") -> 16#1D521; ++entity("dharl") -> 16#021C3; ++entity("dharr") -> 16#021C2; ++entity("diam") -> 16#022C4; ++entity("diamond") -> 16#022C4; ++entity("diamondsuit") -> 16#02666; ++entity("diams") -> 16#02666; ++entity("die") -> 16#000A8; ++entity("digamma") -> 16#003DD; ++entity("disin") -> 16#022F2; ++entity("div") -> 16#000F7; ++entity("divide") -> 16#000F7; ++entity("divideontimes") -> 16#022C7; ++entity("divonx") -> 16#022C7; ++entity("djcy") -> 16#00452; ++entity("dlcorn") -> 16#0231E; ++entity("dlcrop") -> 16#0230D; ++entity("dollar") -> 16#00024; ++entity("dopf") -> 16#1D555; ++entity("dot") -> 16#002D9; ++entity("doteq") -> 16#02250; ++entity("doteqdot") -> 16#02251; ++entity("dotminus") -> 16#02238; ++entity("dotplus") -> 16#02214; ++entity("dotsquare") -> 16#022A1; ++entity("doublebarwedge") -> 16#02306; ++entity("downarrow") -> 16#02193; ++entity("downdownarrows") -> 16#021CA; ++entity("downharpoonleft") -> 16#021C3; ++entity("downharpoonright") -> 16#021C2; ++entity("drbkarow") -> 16#02910; ++entity("drcorn") -> 16#0231F; ++entity("drcrop") -> 16#0230C; ++entity("dscr") -> 16#1D4B9; ++entity("dscy") -> 16#00455; ++entity("dsol") -> 16#029F6; ++entity("dstrok") -> 16#00111; ++entity("dtdot") -> 16#022F1; ++entity("dtri") -> 16#025BF; ++entity("dtrif") -> 16#025BE; ++entity("duarr") -> 16#021F5; ++entity("duhar") -> 16#0296F; ++entity("dwangle") -> 16#029A6; ++entity("dzcy") -> 16#0045F; ++entity("dzigrarr") -> 16#027FF; ++entity("eDDot") -> 16#02A77; ++entity("eDot") -> 16#02251; ++entity("eacute") -> 16#000E9; ++entity("easter") -> 16#02A6E; ++entity("ecaron") -> 16#0011B; ++entity("ecir") -> 16#02256; ++entity("ecirc") -> 16#000EA; ++entity("ecolon") -> 16#02255; ++entity("ecy") -> 16#0044D; ++entity("edot") -> 16#00117; ++entity("ee") -> 16#02147; ++entity("efDot") -> 16#02252; ++entity("efr") -> 16#1D522; ++entity("eg") -> 16#02A9A; ++entity("egrave") -> 16#000E8; ++entity("egs") -> 16#02A96; ++entity("egsdot") -> 16#02A98; ++entity("el") -> 16#02A99; ++entity("elinters") -> 16#023E7; ++entity("ell") -> 16#02113; ++entity("els") -> 16#02A95; ++entity("elsdot") -> 16#02A97; ++entity("emacr") -> 16#00113; ++entity("empty") -> 16#02205; ++entity("emptyset") -> 16#02205; ++entity("emptyv") -> 16#02205; ++entity("emsp") -> 16#02003; ++entity("emsp13") -> 16#02004; ++entity("emsp14") -> 16#02005; ++entity("eng") -> 16#0014B; ++entity("ensp") -> 16#02002; ++entity("eogon") -> 16#00119; ++entity("eopf") -> 16#1D556; ++entity("epar") -> 16#022D5; ++entity("eparsl") -> 16#029E3; ++entity("eplus") -> 16#02A71; ++entity("epsi") -> 16#003B5; ++entity("epsilon") -> 16#003B5; ++entity("epsiv") -> 16#003F5; ++entity("eqcirc") -> 16#02256; ++entity("eqcolon") -> 16#02255; ++entity("eqsim") -> 16#02242; ++entity("eqslantgtr") -> 16#02A96; ++entity("eqslantless") -> 16#02A95; ++entity("equals") -> 16#0003D; ++entity("equest") -> 16#0225F; ++entity("equiv") -> 16#02261; ++entity("equivDD") -> 16#02A78; ++entity("eqvparsl") -> 16#029E5; ++entity("erDot") -> 16#02253; ++entity("erarr") -> 16#02971; ++entity("escr") -> 16#0212F; ++entity("esdot") -> 16#02250; ++entity("esim") -> 16#02242; ++entity("eta") -> 16#003B7; ++entity("eth") -> 16#000F0; ++entity("euml") -> 16#000EB; ++entity("euro") -> 16#020AC; ++entity("excl") -> 16#00021; ++entity("exist") -> 16#02203; ++entity("expectation") -> 16#02130; ++entity("exponentiale") -> 16#02147; ++entity("fallingdotseq") -> 16#02252; ++entity("fcy") -> 16#00444; ++entity("female") -> 16#02640; ++entity("ffilig") -> 16#0FB03; ++entity("fflig") -> 16#0FB00; ++entity("ffllig") -> 16#0FB04; ++entity("ffr") -> 16#1D523; ++entity("filig") -> 16#0FB01; ++entity("fjlig") -> [16#00066, 16#0006A]; ++entity("flat") -> 16#0266D; ++entity("fllig") -> 16#0FB02; ++entity("fltns") -> 16#025B1; ++entity("fnof") -> 16#00192; ++entity("fopf") -> 16#1D557; ++entity("forall") -> 16#02200; ++entity("fork") -> 16#022D4; ++entity("forkv") -> 16#02AD9; ++entity("fpartint") -> 16#02A0D; ++entity("frac12") -> 16#000BD; ++entity("frac13") -> 16#02153; ++entity("frac14") -> 16#000BC; ++entity("frac15") -> 16#02155; ++entity("frac16") -> 16#02159; ++entity("frac18") -> 16#0215B; ++entity("frac23") -> 16#02154; ++entity("frac25") -> 16#02156; ++entity("frac34") -> 16#000BE; ++entity("frac35") -> 16#02157; ++entity("frac38") -> 16#0215C; ++entity("frac45") -> 16#02158; ++entity("frac56") -> 16#0215A; ++entity("frac58") -> 16#0215D; ++entity("frac78") -> 16#0215E; ++entity("frasl") -> 16#02044; ++entity("frown") -> 16#02322; ++entity("fscr") -> 16#1D4BB; ++entity("gE") -> 16#02267; ++entity("gEl") -> 16#02A8C; ++entity("gacute") -> 16#001F5; ++entity("gamma") -> 16#003B3; ++entity("gammad") -> 16#003DD; ++entity("gap") -> 16#02A86; ++entity("gbreve") -> 16#0011F; ++entity("gcirc") -> 16#0011D; ++entity("gcy") -> 16#00433; ++entity("gdot") -> 16#00121; ++entity("ge") -> 16#02265; ++entity("gel") -> 16#022DB; ++entity("geq") -> 16#02265; ++entity("geqq") -> 16#02267; ++entity("geqslant") -> 16#02A7E; ++entity("ges") -> 16#02A7E; ++entity("gescc") -> 16#02AA9; ++entity("gesdot") -> 16#02A80; ++entity("gesdoto") -> 16#02A82; ++entity("gesdotol") -> 16#02A84; ++entity("gesl") -> [16#022DB, 16#0FE00]; ++entity("gesles") -> 16#02A94; ++entity("gfr") -> 16#1D524; ++entity("gg") -> 16#0226B; ++entity("ggg") -> 16#022D9; ++entity("gimel") -> 16#02137; ++entity("gjcy") -> 16#00453; ++entity("gl") -> 16#02277; ++entity("glE") -> 16#02A92; ++entity("gla") -> 16#02AA5; ++entity("glj") -> 16#02AA4; ++entity("gnE") -> 16#02269; ++entity("gnap") -> 16#02A8A; ++entity("gnapprox") -> 16#02A8A; ++entity("gne") -> 16#02A88; ++entity("gneq") -> 16#02A88; ++entity("gneqq") -> 16#02269; ++entity("gnsim") -> 16#022E7; ++entity("gopf") -> 16#1D558; ++entity("grave") -> 16#00060; ++entity("gscr") -> 16#0210A; ++entity("gsim") -> 16#02273; ++entity("gsime") -> 16#02A8E; ++entity("gsiml") -> 16#02A90; ++entity("gt") -> 16#0003E; ++entity("gtcc") -> 16#02AA7; ++entity("gtcir") -> 16#02A7A; ++entity("gtdot") -> 16#022D7; ++entity("gtlPar") -> 16#02995; ++entity("gtquest") -> 16#02A7C; ++entity("gtrapprox") -> 16#02A86; ++entity("gtrarr") -> 16#02978; ++entity("gtrdot") -> 16#022D7; ++entity("gtreqless") -> 16#022DB; ++entity("gtreqqless") -> 16#02A8C; ++entity("gtrless") -> 16#02277; ++entity("gtrsim") -> 16#02273; ++entity("gvertneqq") -> [16#02269, 16#0FE00]; ++entity("gvnE") -> [16#02269, 16#0FE00]; ++entity("hArr") -> 16#021D4; ++entity("hairsp") -> 16#0200A; ++entity("half") -> 16#000BD; ++entity("hamilt") -> 16#0210B; ++entity("hardcy") -> 16#0044A; ++entity("harr") -> 16#02194; ++entity("harrcir") -> 16#02948; ++entity("harrw") -> 16#021AD; ++entity("hbar") -> 16#0210F; ++entity("hcirc") -> 16#00125; ++entity("hearts") -> 16#02665; ++entity("heartsuit") -> 16#02665; ++entity("hellip") -> 16#02026; ++entity("hercon") -> 16#022B9; ++entity("hfr") -> 16#1D525; ++entity("hksearow") -> 16#02925; ++entity("hkswarow") -> 16#02926; ++entity("hoarr") -> 16#021FF; ++entity("homtht") -> 16#0223B; ++entity("hookleftarrow") -> 16#021A9; ++entity("hookrightarrow") -> 16#021AA; ++entity("hopf") -> 16#1D559; ++entity("horbar") -> 16#02015; ++entity("hscr") -> 16#1D4BD; ++entity("hslash") -> 16#0210F; ++entity("hstrok") -> 16#00127; ++entity("hybull") -> 16#02043; ++entity("hyphen") -> 16#02010; ++entity("iacute") -> 16#000ED; ++entity("ic") -> 16#02063; ++entity("icirc") -> 16#000EE; ++entity("icy") -> 16#00438; ++entity("iecy") -> 16#00435; ++entity("iexcl") -> 16#000A1; ++entity("iff") -> 16#021D4; ++entity("ifr") -> 16#1D526; ++entity("igrave") -> 16#000EC; ++entity("ii") -> 16#02148; ++entity("iiiint") -> 16#02A0C; ++entity("iiint") -> 16#0222D; ++entity("iinfin") -> 16#029DC; ++entity("iiota") -> 16#02129; ++entity("ijlig") -> 16#00133; ++entity("imacr") -> 16#0012B; ++entity("image") -> 16#02111; ++entity("imagline") -> 16#02110; ++entity("imagpart") -> 16#02111; ++entity("imath") -> 16#00131; ++entity("imof") -> 16#022B7; ++entity("imped") -> 16#001B5; ++entity("in") -> 16#02208; ++entity("incare") -> 16#02105; ++entity("infin") -> 16#0221E; ++entity("infintie") -> 16#029DD; ++entity("inodot") -> 16#00131; ++entity("int") -> 16#0222B; ++entity("intcal") -> 16#022BA; ++entity("integers") -> 16#02124; ++entity("intercal") -> 16#022BA; ++entity("intlarhk") -> 16#02A17; ++entity("intprod") -> 16#02A3C; ++entity("iocy") -> 16#00451; ++entity("iogon") -> 16#0012F; ++entity("iopf") -> 16#1D55A; ++entity("iota") -> 16#003B9; ++entity("iprod") -> 16#02A3C; ++entity("iquest") -> 16#000BF; ++entity("iscr") -> 16#1D4BE; ++entity("isin") -> 16#02208; ++entity("isinE") -> 16#022F9; ++entity("isindot") -> 16#022F5; ++entity("isins") -> 16#022F4; ++entity("isinsv") -> 16#022F3; ++entity("isinv") -> 16#02208; ++entity("it") -> 16#02062; ++entity("itilde") -> 16#00129; ++entity("iukcy") -> 16#00456; ++entity("iuml") -> 16#000EF; ++entity("jcirc") -> 16#00135; ++entity("jcy") -> 16#00439; ++entity("jfr") -> 16#1D527; ++entity("jmath") -> 16#00237; ++entity("jopf") -> 16#1D55B; ++entity("jscr") -> 16#1D4BF; ++entity("jsercy") -> 16#00458; ++entity("jukcy") -> 16#00454; ++entity("kappa") -> 16#003BA; ++entity("kappav") -> 16#003F0; ++entity("kcedil") -> 16#00137; ++entity("kcy") -> 16#0043A; ++entity("kfr") -> 16#1D528; ++entity("kgreen") -> 16#00138; ++entity("khcy") -> 16#00445; ++entity("kjcy") -> 16#0045C; ++entity("kopf") -> 16#1D55C; ++entity("kscr") -> 16#1D4C0; ++entity("lAarr") -> 16#021DA; ++entity("lArr") -> 16#021D0; ++entity("lAtail") -> 16#0291B; ++entity("lBarr") -> 16#0290E; ++entity("lE") -> 16#02266; ++entity("lEg") -> 16#02A8B; ++entity("lHar") -> 16#02962; ++entity("lacute") -> 16#0013A; ++entity("laemptyv") -> 16#029B4; ++entity("lagran") -> 16#02112; ++entity("lambda") -> 16#003BB; ++entity("lang") -> 16#027E8; ++entity("langd") -> 16#02991; ++entity("langle") -> 16#027E8; ++entity("lap") -> 16#02A85; ++entity("laquo") -> 16#000AB; ++entity("larr") -> 16#02190; ++entity("larrb") -> 16#021E4; ++entity("larrbfs") -> 16#0291F; ++entity("larrfs") -> 16#0291D; ++entity("larrhk") -> 16#021A9; ++entity("larrlp") -> 16#021AB; ++entity("larrpl") -> 16#02939; ++entity("larrsim") -> 16#02973; ++entity("larrtl") -> 16#021A2; ++entity("lat") -> 16#02AAB; ++entity("latail") -> 16#02919; ++entity("late") -> 16#02AAD; ++entity("lates") -> [16#02AAD, 16#0FE00]; ++entity("lbarr") -> 16#0290C; ++entity("lbbrk") -> 16#02772; ++entity("lbrace") -> 16#0007B; ++entity("lbrack") -> 16#0005B; ++entity("lbrke") -> 16#0298B; ++entity("lbrksld") -> 16#0298F; ++entity("lbrkslu") -> 16#0298D; ++entity("lcaron") -> 16#0013E; ++entity("lcedil") -> 16#0013C; ++entity("lceil") -> 16#02308; ++entity("lcub") -> 16#0007B; ++entity("lcy") -> 16#0043B; ++entity("ldca") -> 16#02936; ++entity("ldquo") -> 16#0201C; ++entity("ldquor") -> 16#0201E; ++entity("ldrdhar") -> 16#02967; ++entity("ldrushar") -> 16#0294B; ++entity("ldsh") -> 16#021B2; ++entity("le") -> 16#02264; ++entity("leftarrow") -> 16#02190; ++entity("leftarrowtail") -> 16#021A2; ++entity("leftharpoondown") -> 16#021BD; ++entity("leftharpoonup") -> 16#021BC; ++entity("leftleftarrows") -> 16#021C7; ++entity("leftrightarrow") -> 16#02194; ++entity("leftrightarrows") -> 16#021C6; ++entity("leftrightharpoons") -> 16#021CB; ++entity("leftrightsquigarrow") -> 16#021AD; ++entity("leftthreetimes") -> 16#022CB; ++entity("leg") -> 16#022DA; ++entity("leq") -> 16#02264; ++entity("leqq") -> 16#02266; ++entity("leqslant") -> 16#02A7D; ++entity("les") -> 16#02A7D; ++entity("lescc") -> 16#02AA8; ++entity("lesdot") -> 16#02A7F; ++entity("lesdoto") -> 16#02A81; ++entity("lesdotor") -> 16#02A83; ++entity("lesg") -> [16#022DA, 16#0FE00]; ++entity("lesges") -> 16#02A93; ++entity("lessapprox") -> 16#02A85; ++entity("lessdot") -> 16#022D6; ++entity("lesseqgtr") -> 16#022DA; ++entity("lesseqqgtr") -> 16#02A8B; ++entity("lessgtr") -> 16#02276; ++entity("lesssim") -> 16#02272; ++entity("lfisht") -> 16#0297C; ++entity("lfloor") -> 16#0230A; ++entity("lfr") -> 16#1D529; ++entity("lg") -> 16#02276; ++entity("lgE") -> 16#02A91; ++entity("lhard") -> 16#021BD; ++entity("lharu") -> 16#021BC; ++entity("lharul") -> 16#0296A; ++entity("lhblk") -> 16#02584; ++entity("ljcy") -> 16#00459; ++entity("ll") -> 16#0226A; ++entity("llarr") -> 16#021C7; ++entity("llcorner") -> 16#0231E; ++entity("llhard") -> 16#0296B; ++entity("lltri") -> 16#025FA; ++entity("lmidot") -> 16#00140; ++entity("lmoust") -> 16#023B0; ++entity("lmoustache") -> 16#023B0; ++entity("lnE") -> 16#02268; ++entity("lnap") -> 16#02A89; ++entity("lnapprox") -> 16#02A89; ++entity("lne") -> 16#02A87; ++entity("lneq") -> 16#02A87; ++entity("lneqq") -> 16#02268; ++entity("lnsim") -> 16#022E6; ++entity("loang") -> 16#027EC; ++entity("loarr") -> 16#021FD; ++entity("lobrk") -> 16#027E6; ++entity("longleftarrow") -> 16#027F5; ++entity("longleftrightarrow") -> 16#027F7; ++entity("longmapsto") -> 16#027FC; ++entity("longrightarrow") -> 16#027F6; ++entity("looparrowleft") -> 16#021AB; ++entity("looparrowright") -> 16#021AC; ++entity("lopar") -> 16#02985; ++entity("lopf") -> 16#1D55D; ++entity("loplus") -> 16#02A2D; ++entity("lotimes") -> 16#02A34; ++entity("lowast") -> 16#02217; ++entity("lowbar") -> 16#0005F; ++entity("loz") -> 16#025CA; ++entity("lozenge") -> 16#025CA; ++entity("lozf") -> 16#029EB; ++entity("lpar") -> 16#00028; ++entity("lparlt") -> 16#02993; ++entity("lrarr") -> 16#021C6; ++entity("lrcorner") -> 16#0231F; ++entity("lrhar") -> 16#021CB; ++entity("lrhard") -> 16#0296D; ++entity("lrm") -> 16#0200E; ++entity("lrtri") -> 16#022BF; ++entity("lsaquo") -> 16#02039; ++entity("lscr") -> 16#1D4C1; ++entity("lsh") -> 16#021B0; ++entity("lsim") -> 16#02272; ++entity("lsime") -> 16#02A8D; ++entity("lsimg") -> 16#02A8F; ++entity("lsqb") -> 16#0005B; ++entity("lsquo") -> 16#02018; ++entity("lsquor") -> 16#0201A; ++entity("lstrok") -> 16#00142; ++entity("lt") -> 16#0003C; ++entity("ltcc") -> 16#02AA6; ++entity("ltcir") -> 16#02A79; ++entity("ltdot") -> 16#022D6; ++entity("lthree") -> 16#022CB; ++entity("ltimes") -> 16#022C9; ++entity("ltlarr") -> 16#02976; ++entity("ltquest") -> 16#02A7B; ++entity("ltrPar") -> 16#02996; ++entity("ltri") -> 16#025C3; ++entity("ltrie") -> 16#022B4; ++entity("ltrif") -> 16#025C2; ++entity("lurdshar") -> 16#0294A; ++entity("luruhar") -> 16#02966; ++entity("lvertneqq") -> [16#02268, 16#0FE00]; ++entity("lvnE") -> [16#02268, 16#0FE00]; ++entity("mDDot") -> 16#0223A; ++entity("macr") -> 16#000AF; ++entity("male") -> 16#02642; ++entity("malt") -> 16#02720; ++entity("maltese") -> 16#02720; ++entity("map") -> 16#021A6; ++entity("mapsto") -> 16#021A6; ++entity("mapstodown") -> 16#021A7; ++entity("mapstoleft") -> 16#021A4; ++entity("mapstoup") -> 16#021A5; ++entity("marker") -> 16#025AE; ++entity("mcomma") -> 16#02A29; ++entity("mcy") -> 16#0043C; ++entity("mdash") -> 16#02014; ++entity("measuredangle") -> 16#02221; ++entity("mfr") -> 16#1D52A; ++entity("mho") -> 16#02127; ++entity("micro") -> 16#000B5; ++entity("mid") -> 16#02223; ++entity("midast") -> 16#0002A; ++entity("midcir") -> 16#02AF0; ++entity("middot") -> 16#000B7; ++entity("minus") -> 16#02212; ++entity("minusb") -> 16#0229F; ++entity("minusd") -> 16#02238; ++entity("minusdu") -> 16#02A2A; ++entity("mlcp") -> 16#02ADB; ++entity("mldr") -> 16#02026; ++entity("mnplus") -> 16#02213; ++entity("models") -> 16#022A7; ++entity("mopf") -> 16#1D55E; ++entity("mp") -> 16#02213; ++entity("mscr") -> 16#1D4C2; ++entity("mstpos") -> 16#0223E; ++entity("mu") -> 16#003BC; ++entity("multimap") -> 16#022B8; ++entity("mumap") -> 16#022B8; ++entity("nGg") -> [16#022D9, 16#00338]; ++entity("nGt") -> [16#0226B, 16#020D2]; ++entity("nGtv") -> [16#0226B, 16#00338]; ++entity("nLeftarrow") -> 16#021CD; ++entity("nLeftrightarrow") -> 16#021CE; ++entity("nLl") -> [16#022D8, 16#00338]; ++entity("nLt") -> [16#0226A, 16#020D2]; ++entity("nLtv") -> [16#0226A, 16#00338]; ++entity("nRightarrow") -> 16#021CF; ++entity("nVDash") -> 16#022AF; ++entity("nVdash") -> 16#022AE; ++entity("nabla") -> 16#02207; ++entity("nacute") -> 16#00144; ++entity("nang") -> [16#02220, 16#020D2]; ++entity("nap") -> 16#02249; ++entity("napE") -> [16#02A70, 16#00338]; ++entity("napid") -> [16#0224B, 16#00338]; ++entity("napos") -> 16#00149; ++entity("napprox") -> 16#02249; ++entity("natur") -> 16#0266E; ++entity("natural") -> 16#0266E; ++entity("naturals") -> 16#02115; ++entity("nbsp") -> 16#000A0; ++entity("nbump") -> [16#0224E, 16#00338]; ++entity("nbumpe") -> [16#0224F, 16#00338]; ++entity("ncap") -> 16#02A43; ++entity("ncaron") -> 16#00148; ++entity("ncedil") -> 16#00146; ++entity("ncong") -> 16#02247; ++entity("ncongdot") -> [16#02A6D, 16#00338]; ++entity("ncup") -> 16#02A42; ++entity("ncy") -> 16#0043D; ++entity("ndash") -> 16#02013; ++entity("ne") -> 16#02260; ++entity("neArr") -> 16#021D7; ++entity("nearhk") -> 16#02924; ++entity("nearr") -> 16#02197; ++entity("nearrow") -> 16#02197; ++entity("nedot") -> [16#02250, 16#00338]; ++entity("nequiv") -> 16#02262; ++entity("nesear") -> 16#02928; ++entity("nesim") -> [16#02242, 16#00338]; ++entity("nexist") -> 16#02204; ++entity("nexists") -> 16#02204; ++entity("nfr") -> 16#1D52B; ++entity("ngE") -> [16#02267, 16#00338]; ++entity("nge") -> 16#02271; ++entity("ngeq") -> 16#02271; ++entity("ngeqq") -> [16#02267, 16#00338]; ++entity("ngeqslant") -> [16#02A7E, 16#00338]; ++entity("nges") -> [16#02A7E, 16#00338]; ++entity("ngsim") -> 16#02275; ++entity("ngt") -> 16#0226F; ++entity("ngtr") -> 16#0226F; ++entity("nhArr") -> 16#021CE; ++entity("nharr") -> 16#021AE; ++entity("nhpar") -> 16#02AF2; ++entity("ni") -> 16#0220B; ++entity("nis") -> 16#022FC; ++entity("nisd") -> 16#022FA; ++entity("niv") -> 16#0220B; ++entity("njcy") -> 16#0045A; ++entity("nlArr") -> 16#021CD; ++entity("nlE") -> [16#02266, 16#00338]; ++entity("nlarr") -> 16#0219A; ++entity("nldr") -> 16#02025; ++entity("nle") -> 16#02270; ++entity("nleftarrow") -> 16#0219A; ++entity("nleftrightarrow") -> 16#021AE; ++entity("nleq") -> 16#02270; ++entity("nleqq") -> [16#02266, 16#00338]; ++entity("nleqslant") -> [16#02A7D, 16#00338]; ++entity("nles") -> [16#02A7D, 16#00338]; ++entity("nless") -> 16#0226E; ++entity("nlsim") -> 16#02274; ++entity("nlt") -> 16#0226E; ++entity("nltri") -> 16#022EA; ++entity("nltrie") -> 16#022EC; ++entity("nmid") -> 16#02224; ++entity("nopf") -> 16#1D55F; ++entity("not") -> 16#000AC; ++entity("notin") -> 16#02209; ++entity("notinE") -> [16#022F9, 16#00338]; ++entity("notindot") -> [16#022F5, 16#00338]; ++entity("notinva") -> 16#02209; ++entity("notinvb") -> 16#022F7; ++entity("notinvc") -> 16#022F6; ++entity("notni") -> 16#0220C; ++entity("notniva") -> 16#0220C; ++entity("notnivb") -> 16#022FE; ++entity("notnivc") -> 16#022FD; ++entity("npar") -> 16#02226; ++entity("nparallel") -> 16#02226; ++entity("nparsl") -> [16#02AFD, 16#020E5]; ++entity("npart") -> [16#02202, 16#00338]; ++entity("npolint") -> 16#02A14; ++entity("npr") -> 16#02280; ++entity("nprcue") -> 16#022E0; ++entity("npre") -> [16#02AAF, 16#00338]; ++entity("nprec") -> 16#02280; ++entity("npreceq") -> [16#02AAF, 16#00338]; ++entity("nrArr") -> 16#021CF; ++entity("nrarr") -> 16#0219B; ++entity("nrarrc") -> [16#02933, 16#00338]; ++entity("nrarrw") -> [16#0219D, 16#00338]; ++entity("nrightarrow") -> 16#0219B; ++entity("nrtri") -> 16#022EB; ++entity("nrtrie") -> 16#022ED; ++entity("nsc") -> 16#02281; ++entity("nsccue") -> 16#022E1; ++entity("nsce") -> [16#02AB0, 16#00338]; ++entity("nscr") -> 16#1D4C3; ++entity("nshortmid") -> 16#02224; ++entity("nshortparallel") -> 16#02226; ++entity("nsim") -> 16#02241; ++entity("nsime") -> 16#02244; ++entity("nsimeq") -> 16#02244; ++entity("nsmid") -> 16#02224; ++entity("nspar") -> 16#02226; ++entity("nsqsube") -> 16#022E2; ++entity("nsqsupe") -> 16#022E3; ++entity("nsub") -> 16#02284; ++entity("nsubE") -> [16#02AC5, 16#00338]; ++entity("nsube") -> 16#02288; ++entity("nsubset") -> [16#02282, 16#020D2]; ++entity("nsubseteq") -> 16#02288; ++entity("nsubseteqq") -> [16#02AC5, 16#00338]; ++entity("nsucc") -> 16#02281; ++entity("nsucceq") -> [16#02AB0, 16#00338]; ++entity("nsup") -> 16#02285; ++entity("nsupE") -> [16#02AC6, 16#00338]; ++entity("nsupe") -> 16#02289; ++entity("nsupset") -> [16#02283, 16#020D2]; ++entity("nsupseteq") -> 16#02289; ++entity("nsupseteqq") -> [16#02AC6, 16#00338]; ++entity("ntgl") -> 16#02279; ++entity("ntilde") -> 16#000F1; ++entity("ntlg") -> 16#02278; ++entity("ntriangleleft") -> 16#022EA; ++entity("ntrianglelefteq") -> 16#022EC; ++entity("ntriangleright") -> 16#022EB; ++entity("ntrianglerighteq") -> 16#022ED; ++entity("nu") -> 16#003BD; ++entity("num") -> 16#00023; ++entity("numero") -> 16#02116; ++entity("numsp") -> 16#02007; ++entity("nvDash") -> 16#022AD; ++entity("nvHarr") -> 16#02904; ++entity("nvap") -> [16#0224D, 16#020D2]; ++entity("nvdash") -> 16#022AC; ++entity("nvge") -> [16#02265, 16#020D2]; ++entity("nvgt") -> [16#0003E, 16#020D2]; ++entity("nvinfin") -> 16#029DE; ++entity("nvlArr") -> 16#02902; ++entity("nvle") -> [16#02264, 16#020D2]; ++entity("nvlt") -> [16#0003C, 16#020D2]; ++entity("nvltrie") -> [16#022B4, 16#020D2]; ++entity("nvrArr") -> 16#02903; ++entity("nvrtrie") -> [16#022B5, 16#020D2]; ++entity("nvsim") -> [16#0223C, 16#020D2]; ++entity("nwArr") -> 16#021D6; ++entity("nwarhk") -> 16#02923; ++entity("nwarr") -> 16#02196; ++entity("nwarrow") -> 16#02196; ++entity("nwnear") -> 16#02927; ++entity("oS") -> 16#024C8; ++entity("oacute") -> 16#000F3; ++entity("oast") -> 16#0229B; ++entity("ocir") -> 16#0229A; ++entity("ocirc") -> 16#000F4; ++entity("ocy") -> 16#0043E; ++entity("odash") -> 16#0229D; ++entity("odblac") -> 16#00151; ++entity("odiv") -> 16#02A38; ++entity("odot") -> 16#02299; ++entity("odsold") -> 16#029BC; ++entity("oelig") -> 16#00153; ++entity("ofcir") -> 16#029BF; ++entity("ofr") -> 16#1D52C; ++entity("ogon") -> 16#002DB; ++entity("ograve") -> 16#000F2; ++entity("ogt") -> 16#029C1; ++entity("ohbar") -> 16#029B5; ++entity("ohm") -> 16#003A9; ++entity("oint") -> 16#0222E; ++entity("olarr") -> 16#021BA; ++entity("olcir") -> 16#029BE; ++entity("olcross") -> 16#029BB; ++entity("oline") -> 16#0203E; ++entity("olt") -> 16#029C0; ++entity("omacr") -> 16#0014D; ++entity("omega") -> 16#003C9; ++entity("omicron") -> 16#003BF; ++entity("omid") -> 16#029B6; ++entity("ominus") -> 16#02296; ++entity("oopf") -> 16#1D560; ++entity("opar") -> 16#029B7; ++entity("operp") -> 16#029B9; ++entity("oplus") -> 16#02295; ++entity("or") -> 16#02228; ++entity("orarr") -> 16#021BB; ++entity("ord") -> 16#02A5D; ++entity("order") -> 16#02134; ++entity("orderof") -> 16#02134; ++entity("ordf") -> 16#000AA; ++entity("ordm") -> 16#000BA; ++entity("origof") -> 16#022B6; ++entity("oror") -> 16#02A56; ++entity("orslope") -> 16#02A57; ++entity("orv") -> 16#02A5B; ++entity("oscr") -> 16#02134; ++entity("oslash") -> 16#000F8; ++entity("osol") -> 16#02298; ++entity("otilde") -> 16#000F5; ++entity("otimes") -> 16#02297; ++entity("otimesas") -> 16#02A36; ++entity("ouml") -> 16#000F6; ++entity("ovbar") -> 16#0233D; ++entity("par") -> 16#02225; ++entity("para") -> 16#000B6; ++entity("parallel") -> 16#02225; ++entity("parsim") -> 16#02AF3; ++entity("parsl") -> 16#02AFD; ++entity("part") -> 16#02202; ++entity("pcy") -> 16#0043F; ++entity("percnt") -> 16#00025; ++entity("period") -> 16#0002E; ++entity("permil") -> 16#02030; ++entity("perp") -> 16#022A5; ++entity("pertenk") -> 16#02031; ++entity("pfr") -> 16#1D52D; ++entity("phi") -> 16#003C6; ++entity("phiv") -> 16#003D5; ++entity("phmmat") -> 16#02133; ++entity("phone") -> 16#0260E; ++entity("pi") -> 16#003C0; ++entity("pitchfork") -> 16#022D4; ++entity("piv") -> 16#003D6; ++entity("planck") -> 16#0210F; ++entity("planckh") -> 16#0210E; ++entity("plankv") -> 16#0210F; ++entity("plus") -> 16#0002B; ++entity("plusacir") -> 16#02A23; ++entity("plusb") -> 16#0229E; ++entity("pluscir") -> 16#02A22; ++entity("plusdo") -> 16#02214; ++entity("plusdu") -> 16#02A25; ++entity("pluse") -> 16#02A72; ++entity("plusmn") -> 16#000B1; ++entity("plussim") -> 16#02A26; ++entity("plustwo") -> 16#02A27; ++entity("pm") -> 16#000B1; ++entity("pointint") -> 16#02A15; ++entity("popf") -> 16#1D561; ++entity("pound") -> 16#000A3; ++entity("pr") -> 16#0227A; ++entity("prE") -> 16#02AB3; ++entity("prap") -> 16#02AB7; ++entity("prcue") -> 16#0227C; ++entity("pre") -> 16#02AAF; ++entity("prec") -> 16#0227A; ++entity("precapprox") -> 16#02AB7; ++entity("preccurlyeq") -> 16#0227C; ++entity("preceq") -> 16#02AAF; ++entity("precnapprox") -> 16#02AB9; ++entity("precneqq") -> 16#02AB5; ++entity("precnsim") -> 16#022E8; ++entity("precsim") -> 16#0227E; ++entity("prime") -> 16#02032; ++entity("primes") -> 16#02119; ++entity("prnE") -> 16#02AB5; ++entity("prnap") -> 16#02AB9; ++entity("prnsim") -> 16#022E8; ++entity("prod") -> 16#0220F; ++entity("profalar") -> 16#0232E; ++entity("profline") -> 16#02312; ++entity("profsurf") -> 16#02313; ++entity("prop") -> 16#0221D; ++entity("propto") -> 16#0221D; ++entity("prsim") -> 16#0227E; ++entity("prurel") -> 16#022B0; ++entity("pscr") -> 16#1D4C5; ++entity("psi") -> 16#003C8; ++entity("puncsp") -> 16#02008; ++entity("qfr") -> 16#1D52E; ++entity("qint") -> 16#02A0C; ++entity("qopf") -> 16#1D562; ++entity("qprime") -> 16#02057; ++entity("qscr") -> 16#1D4C6; ++entity("quaternions") -> 16#0210D; ++entity("quatint") -> 16#02A16; ++entity("quest") -> 16#0003F; ++entity("questeq") -> 16#0225F; ++entity("quot") -> 16#00022; ++entity("rAarr") -> 16#021DB; ++entity("rArr") -> 16#021D2; ++entity("rAtail") -> 16#0291C; ++entity("rBarr") -> 16#0290F; ++entity("rHar") -> 16#02964; ++entity("race") -> [16#0223D, 16#00331]; ++entity("racute") -> 16#00155; ++entity("radic") -> 16#0221A; ++entity("raemptyv") -> 16#029B3; ++entity("rang") -> 16#027E9; ++entity("rangd") -> 16#02992; ++entity("range") -> 16#029A5; ++entity("rangle") -> 16#027E9; ++entity("raquo") -> 16#000BB; ++entity("rarr") -> 16#02192; ++entity("rarrap") -> 16#02975; ++entity("rarrb") -> 16#021E5; ++entity("rarrbfs") -> 16#02920; ++entity("rarrc") -> 16#02933; ++entity("rarrfs") -> 16#0291E; ++entity("rarrhk") -> 16#021AA; ++entity("rarrlp") -> 16#021AC; ++entity("rarrpl") -> 16#02945; ++entity("rarrsim") -> 16#02974; ++entity("rarrtl") -> 16#021A3; ++entity("rarrw") -> 16#0219D; ++entity("ratail") -> 16#0291A; ++entity("ratio") -> 16#02236; ++entity("rationals") -> 16#0211A; ++entity("rbarr") -> 16#0290D; ++entity("rbbrk") -> 16#02773; ++entity("rbrace") -> 16#0007D; ++entity("rbrack") -> 16#0005D; ++entity("rbrke") -> 16#0298C; ++entity("rbrksld") -> 16#0298E; ++entity("rbrkslu") -> 16#02990; ++entity("rcaron") -> 16#00159; ++entity("rcedil") -> 16#00157; ++entity("rceil") -> 16#02309; ++entity("rcub") -> 16#0007D; ++entity("rcy") -> 16#00440; ++entity("rdca") -> 16#02937; ++entity("rdldhar") -> 16#02969; ++entity("rdquo") -> 16#0201D; ++entity("rdquor") -> 16#0201D; ++entity("rdsh") -> 16#021B3; ++entity("real") -> 16#0211C; ++entity("realine") -> 16#0211B; ++entity("realpart") -> 16#0211C; ++entity("reals") -> 16#0211D; ++entity("rect") -> 16#025AD; ++entity("reg") -> 16#000AE; ++entity("rfisht") -> 16#0297D; ++entity("rfloor") -> 16#0230B; ++entity("rfr") -> 16#1D52F; ++entity("rhard") -> 16#021C1; ++entity("rharu") -> 16#021C0; ++entity("rharul") -> 16#0296C; ++entity("rho") -> 16#003C1; ++entity("rhov") -> 16#003F1; ++entity("rightarrow") -> 16#02192; ++entity("rightarrowtail") -> 16#021A3; ++entity("rightharpoondown") -> 16#021C1; ++entity("rightharpoonup") -> 16#021C0; ++entity("rightleftarrows") -> 16#021C4; ++entity("rightleftharpoons") -> 16#021CC; ++entity("rightrightarrows") -> 16#021C9; ++entity("rightsquigarrow") -> 16#0219D; ++entity("rightthreetimes") -> 16#022CC; ++entity("ring") -> 16#002DA; ++entity("risingdotseq") -> 16#02253; ++entity("rlarr") -> 16#021C4; ++entity("rlhar") -> 16#021CC; ++entity("rlm") -> 16#0200F; ++entity("rmoust") -> 16#023B1; ++entity("rmoustache") -> 16#023B1; ++entity("rnmid") -> 16#02AEE; ++entity("roang") -> 16#027ED; ++entity("roarr") -> 16#021FE; ++entity("robrk") -> 16#027E7; ++entity("ropar") -> 16#02986; ++entity("ropf") -> 16#1D563; ++entity("roplus") -> 16#02A2E; ++entity("rotimes") -> 16#02A35; ++entity("rpar") -> 16#00029; ++entity("rpargt") -> 16#02994; ++entity("rppolint") -> 16#02A12; ++entity("rrarr") -> 16#021C9; ++entity("rsaquo") -> 16#0203A; ++entity("rscr") -> 16#1D4C7; ++entity("rsh") -> 16#021B1; ++entity("rsqb") -> 16#0005D; ++entity("rsquo") -> 16#02019; ++entity("rsquor") -> 16#02019; ++entity("rthree") -> 16#022CC; ++entity("rtimes") -> 16#022CA; ++entity("rtri") -> 16#025B9; ++entity("rtrie") -> 16#022B5; ++entity("rtrif") -> 16#025B8; ++entity("rtriltri") -> 16#029CE; ++entity("ruluhar") -> 16#02968; ++entity("rx") -> 16#0211E; ++entity("sacute") -> 16#0015B; ++entity("sbquo") -> 16#0201A; ++entity("sc") -> 16#0227B; ++entity("scE") -> 16#02AB4; ++entity("scap") -> 16#02AB8; ++entity("scaron") -> 16#00161; ++entity("sccue") -> 16#0227D; ++entity("sce") -> 16#02AB0; ++entity("scedil") -> 16#0015F; ++entity("scirc") -> 16#0015D; ++entity("scnE") -> 16#02AB6; ++entity("scnap") -> 16#02ABA; ++entity("scnsim") -> 16#022E9; ++entity("scpolint") -> 16#02A13; ++entity("scsim") -> 16#0227F; ++entity("scy") -> 16#00441; ++entity("sdot") -> 16#022C5; ++entity("sdotb") -> 16#022A1; ++entity("sdote") -> 16#02A66; ++entity("seArr") -> 16#021D8; ++entity("searhk") -> 16#02925; ++entity("searr") -> 16#02198; ++entity("searrow") -> 16#02198; ++entity("sect") -> 16#000A7; ++entity("semi") -> 16#0003B; ++entity("seswar") -> 16#02929; ++entity("setminus") -> 16#02216; ++entity("setmn") -> 16#02216; ++entity("sext") -> 16#02736; ++entity("sfr") -> 16#1D530; ++entity("sfrown") -> 16#02322; ++entity("sharp") -> 16#0266F; ++entity("shchcy") -> 16#00449; ++entity("shcy") -> 16#00448; ++entity("shortmid") -> 16#02223; ++entity("shortparallel") -> 16#02225; ++entity("shy") -> 16#000AD; ++entity("sigma") -> 16#003C3; ++entity("sigmaf") -> 16#003C2; ++entity("sigmav") -> 16#003C2; ++entity("sim") -> 16#0223C; ++entity("simdot") -> 16#02A6A; ++entity("sime") -> 16#02243; ++entity("simeq") -> 16#02243; ++entity("simg") -> 16#02A9E; ++entity("simgE") -> 16#02AA0; ++entity("siml") -> 16#02A9D; ++entity("simlE") -> 16#02A9F; ++entity("simne") -> 16#02246; ++entity("simplus") -> 16#02A24; ++entity("simrarr") -> 16#02972; ++entity("slarr") -> 16#02190; ++entity("smallsetminus") -> 16#02216; ++entity("smashp") -> 16#02A33; ++entity("smeparsl") -> 16#029E4; ++entity("smid") -> 16#02223; ++entity("smile") -> 16#02323; ++entity("smt") -> 16#02AAA; ++entity("smte") -> 16#02AAC; ++entity("smtes") -> [16#02AAC, 16#0FE00]; ++entity("softcy") -> 16#0044C; ++entity("sol") -> 16#0002F; ++entity("solb") -> 16#029C4; ++entity("solbar") -> 16#0233F; ++entity("sopf") -> 16#1D564; ++entity("spades") -> 16#02660; ++entity("spadesuit") -> 16#02660; ++entity("spar") -> 16#02225; ++entity("sqcap") -> 16#02293; ++entity("sqcaps") -> [16#02293, 16#0FE00]; ++entity("sqcup") -> 16#02294; ++entity("sqcups") -> [16#02294, 16#0FE00]; ++entity("sqsub") -> 16#0228F; ++entity("sqsube") -> 16#02291; ++entity("sqsubset") -> 16#0228F; ++entity("sqsubseteq") -> 16#02291; ++entity("sqsup") -> 16#02290; ++entity("sqsupe") -> 16#02292; ++entity("sqsupset") -> 16#02290; ++entity("sqsupseteq") -> 16#02292; ++entity("squ") -> 16#025A1; ++entity("square") -> 16#025A1; ++entity("squarf") -> 16#025AA; ++entity("squf") -> 16#025AA; ++entity("srarr") -> 16#02192; ++entity("sscr") -> 16#1D4C8; ++entity("ssetmn") -> 16#02216; ++entity("ssmile") -> 16#02323; ++entity("sstarf") -> 16#022C6; ++entity("star") -> 16#02606; ++entity("starf") -> 16#02605; ++entity("straightepsilon") -> 16#003F5; ++entity("straightphi") -> 16#003D5; ++entity("strns") -> 16#000AF; ++entity("sub") -> 16#02282; ++entity("subE") -> 16#02AC5; ++entity("subdot") -> 16#02ABD; ++entity("sube") -> 16#02286; ++entity("subedot") -> 16#02AC3; ++entity("submult") -> 16#02AC1; ++entity("subnE") -> 16#02ACB; ++entity("subne") -> 16#0228A; ++entity("subplus") -> 16#02ABF; ++entity("subrarr") -> 16#02979; ++entity("subset") -> 16#02282; ++entity("subseteq") -> 16#02286; ++entity("subseteqq") -> 16#02AC5; ++entity("subsetneq") -> 16#0228A; ++entity("subsetneqq") -> 16#02ACB; ++entity("subsim") -> 16#02AC7; ++entity("subsub") -> 16#02AD5; ++entity("subsup") -> 16#02AD3; ++entity("succ") -> 16#0227B; ++entity("succapprox") -> 16#02AB8; ++entity("succcurlyeq") -> 16#0227D; ++entity("succeq") -> 16#02AB0; ++entity("succnapprox") -> 16#02ABA; ++entity("succneqq") -> 16#02AB6; ++entity("succnsim") -> 16#022E9; ++entity("succsim") -> 16#0227F; ++entity("sum") -> 16#02211; ++entity("sung") -> 16#0266A; ++entity("sup") -> 16#02283; ++entity("sup1") -> 16#000B9; ++entity("sup2") -> 16#000B2; ++entity("sup3") -> 16#000B3; ++entity("supE") -> 16#02AC6; ++entity("supdot") -> 16#02ABE; ++entity("supdsub") -> 16#02AD8; ++entity("supe") -> 16#02287; ++entity("supedot") -> 16#02AC4; ++entity("suphsol") -> 16#027C9; ++entity("suphsub") -> 16#02AD7; ++entity("suplarr") -> 16#0297B; ++entity("supmult") -> 16#02AC2; ++entity("supnE") -> 16#02ACC; ++entity("supne") -> 16#0228B; ++entity("supplus") -> 16#02AC0; ++entity("supset") -> 16#02283; ++entity("supseteq") -> 16#02287; ++entity("supseteqq") -> 16#02AC6; ++entity("supsetneq") -> 16#0228B; ++entity("supsetneqq") -> 16#02ACC; ++entity("supsim") -> 16#02AC8; ++entity("supsub") -> 16#02AD4; ++entity("supsup") -> 16#02AD6; ++entity("swArr") -> 16#021D9; ++entity("swarhk") -> 16#02926; ++entity("swarr") -> 16#02199; ++entity("swarrow") -> 16#02199; ++entity("swnwar") -> 16#0292A; ++entity("szlig") -> 16#000DF; ++entity("target") -> 16#02316; ++entity("tau") -> 16#003C4; ++entity("tbrk") -> 16#023B4; ++entity("tcaron") -> 16#00165; ++entity("tcedil") -> 16#00163; ++entity("tcy") -> 16#00442; ++entity("tdot") -> 16#020DB; ++entity("telrec") -> 16#02315; ++entity("tfr") -> 16#1D531; ++entity("there4") -> 16#02234; ++entity("therefore") -> 16#02234; ++entity("theta") -> 16#003B8; ++entity("thetasym") -> 16#003D1; ++entity("thetav") -> 16#003D1; ++entity("thickapprox") -> 16#02248; ++entity("thicksim") -> 16#0223C; ++entity("thinsp") -> 16#02009; ++entity("thkap") -> 16#02248; ++entity("thksim") -> 16#0223C; ++entity("thorn") -> 16#000FE; ++entity("tilde") -> 16#002DC; ++entity("times") -> 16#000D7; ++entity("timesb") -> 16#022A0; ++entity("timesbar") -> 16#02A31; ++entity("timesd") -> 16#02A30; ++entity("tint") -> 16#0222D; ++entity("toea") -> 16#02928; ++entity("top") -> 16#022A4; ++entity("topbot") -> 16#02336; ++entity("topcir") -> 16#02AF1; ++entity("topf") -> 16#1D565; ++entity("topfork") -> 16#02ADA; ++entity("tosa") -> 16#02929; ++entity("tprime") -> 16#02034; ++entity("trade") -> 16#02122; ++entity("triangle") -> 16#025B5; ++entity("triangledown") -> 16#025BF; ++entity("triangleleft") -> 16#025C3; ++entity("trianglelefteq") -> 16#022B4; ++entity("triangleq") -> 16#0225C; ++entity("triangleright") -> 16#025B9; ++entity("trianglerighteq") -> 16#022B5; ++entity("tridot") -> 16#025EC; ++entity("trie") -> 16#0225C; ++entity("triminus") -> 16#02A3A; ++entity("triplus") -> 16#02A39; ++entity("trisb") -> 16#029CD; ++entity("tritime") -> 16#02A3B; ++entity("trpezium") -> 16#023E2; ++entity("tscr") -> 16#1D4C9; ++entity("tscy") -> 16#00446; ++entity("tshcy") -> 16#0045B; ++entity("tstrok") -> 16#00167; ++entity("twixt") -> 16#0226C; ++entity("twoheadleftarrow") -> 16#0219E; ++entity("twoheadrightarrow") -> 16#021A0; ++entity("uArr") -> 16#021D1; ++entity("uHar") -> 16#02963; ++entity("uacute") -> 16#000FA; ++entity("uarr") -> 16#02191; ++entity("ubrcy") -> 16#0045E; ++entity("ubreve") -> 16#0016D; ++entity("ucirc") -> 16#000FB; ++entity("ucy") -> 16#00443; ++entity("udarr") -> 16#021C5; ++entity("udblac") -> 16#00171; ++entity("udhar") -> 16#0296E; ++entity("ufisht") -> 16#0297E; ++entity("ufr") -> 16#1D532; ++entity("ugrave") -> 16#000F9; ++entity("uharl") -> 16#021BF; ++entity("uharr") -> 16#021BE; ++entity("uhblk") -> 16#02580; ++entity("ulcorn") -> 16#0231C; ++entity("ulcorner") -> 16#0231C; ++entity("ulcrop") -> 16#0230F; ++entity("ultri") -> 16#025F8; ++entity("umacr") -> 16#0016B; ++entity("uml") -> 16#000A8; ++entity("uogon") -> 16#00173; ++entity("uopf") -> 16#1D566; ++entity("uparrow") -> 16#02191; ++entity("updownarrow") -> 16#02195; ++entity("upharpoonleft") -> 16#021BF; ++entity("upharpoonright") -> 16#021BE; ++entity("uplus") -> 16#0228E; ++entity("upsi") -> 16#003C5; ++entity("upsih") -> 16#003D2; ++entity("upsilon") -> 16#003C5; ++entity("upuparrows") -> 16#021C8; ++entity("urcorn") -> 16#0231D; ++entity("urcorner") -> 16#0231D; ++entity("urcrop") -> 16#0230E; ++entity("uring") -> 16#0016F; ++entity("urtri") -> 16#025F9; ++entity("uscr") -> 16#1D4CA; ++entity("utdot") -> 16#022F0; ++entity("utilde") -> 16#00169; ++entity("utri") -> 16#025B5; ++entity("utrif") -> 16#025B4; ++entity("uuarr") -> 16#021C8; ++entity("uuml") -> 16#000FC; ++entity("uwangle") -> 16#029A7; ++entity("vArr") -> 16#021D5; ++entity("vBar") -> 16#02AE8; ++entity("vBarv") -> 16#02AE9; ++entity("vDash") -> 16#022A8; ++entity("vangrt") -> 16#0299C; ++entity("varepsilon") -> 16#003F5; ++entity("varkappa") -> 16#003F0; ++entity("varnothing") -> 16#02205; ++entity("varphi") -> 16#003D5; ++entity("varpi") -> 16#003D6; ++entity("varpropto") -> 16#0221D; ++entity("varr") -> 16#02195; ++entity("varrho") -> 16#003F1; ++entity("varsigma") -> 16#003C2; ++entity("varsubsetneq") -> [16#0228A, 16#0FE00]; ++entity("varsubsetneqq") -> [16#02ACB, 16#0FE00]; ++entity("varsupsetneq") -> [16#0228B, 16#0FE00]; ++entity("varsupsetneqq") -> [16#02ACC, 16#0FE00]; ++entity("vartheta") -> 16#003D1; ++entity("vartriangleleft") -> 16#022B2; ++entity("vartriangleright") -> 16#022B3; ++entity("vcy") -> 16#00432; ++entity("vdash") -> 16#022A2; ++entity("vee") -> 16#02228; ++entity("veebar") -> 16#022BB; ++entity("veeeq") -> 16#0225A; ++entity("vellip") -> 16#022EE; ++entity("verbar") -> 16#0007C; ++entity("vert") -> 16#0007C; ++entity("vfr") -> 16#1D533; ++entity("vltri") -> 16#022B2; ++entity("vnsub") -> [16#02282, 16#020D2]; ++entity("vnsup") -> [16#02283, 16#020D2]; ++entity("vopf") -> 16#1D567; ++entity("vprop") -> 16#0221D; ++entity("vrtri") -> 16#022B3; ++entity("vscr") -> 16#1D4CB; ++entity("vsubnE") -> [16#02ACB, 16#0FE00]; ++entity("vsubne") -> [16#0228A, 16#0FE00]; ++entity("vsupnE") -> [16#02ACC, 16#0FE00]; ++entity("vsupne") -> [16#0228B, 16#0FE00]; ++entity("vzigzag") -> 16#0299A; ++entity("wcirc") -> 16#00175; ++entity("wedbar") -> 16#02A5F; ++entity("wedge") -> 16#02227; ++entity("wedgeq") -> 16#02259; ++entity("weierp") -> 16#02118; ++entity("wfr") -> 16#1D534; ++entity("wopf") -> 16#1D568; ++entity("wp") -> 16#02118; ++entity("wr") -> 16#02240; ++entity("wreath") -> 16#02240; ++entity("wscr") -> 16#1D4CC; ++entity("xcap") -> 16#022C2; ++entity("xcirc") -> 16#025EF; ++entity("xcup") -> 16#022C3; ++entity("xdtri") -> 16#025BD; ++entity("xfr") -> 16#1D535; ++entity("xhArr") -> 16#027FA; ++entity("xharr") -> 16#027F7; ++entity("xi") -> 16#003BE; ++entity("xlArr") -> 16#027F8; ++entity("xlarr") -> 16#027F5; ++entity("xmap") -> 16#027FC; ++entity("xnis") -> 16#022FB; ++entity("xodot") -> 16#02A00; ++entity("xopf") -> 16#1D569; ++entity("xoplus") -> 16#02A01; ++entity("xotime") -> 16#02A02; ++entity("xrArr") -> 16#027F9; ++entity("xrarr") -> 16#027F6; ++entity("xscr") -> 16#1D4CD; ++entity("xsqcup") -> 16#02A06; ++entity("xuplus") -> 16#02A04; ++entity("xutri") -> 16#025B3; ++entity("xvee") -> 16#022C1; ++entity("xwedge") -> 16#022C0; ++entity("yacute") -> 16#000FD; ++entity("yacy") -> 16#0044F; ++entity("ycirc") -> 16#00177; ++entity("ycy") -> 16#0044B; ++entity("yen") -> 16#000A5; ++entity("yfr") -> 16#1D536; ++entity("yicy") -> 16#00457; ++entity("yopf") -> 16#1D56A; ++entity("yscr") -> 16#1D4CE; ++entity("yucy") -> 16#0044E; ++entity("yuml") -> 16#000FF; ++entity("zacute") -> 16#0017A; ++entity("zcaron") -> 16#0017E; ++entity("zcy") -> 16#00437; ++entity("zdot") -> 16#0017C; ++entity("zeetrf") -> 16#02128; ++entity("zeta") -> 16#003B6; ++entity("zfr") -> 16#1D537; ++entity("zhcy") -> 16#00436; ++entity("zigrarr") -> 16#021DD; ++entity("zopf") -> 16#1D56B; ++entity("zscr") -> 16#1D4CF; ++entity("zwj") -> 16#0200D; ++entity("zwnj") -> 16#0200C; ++entity(_) -> undefined. + + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + exhaustive_entity_test() -> + T = mochiweb_cover:clause_lookup_table(?MODULE, entity), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_cookies.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cookies.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_cookies.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cookies.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -23,6 +23,7 @@ + + %% @type proplist() = [{Key::string(), Value::string()}]. + %% @type header() = {Name::string(), Value::string()}. ++%% @type int_seconds() = integer(). + + %% @spec cookie(Key::string(), Value::string()) -> header() + %% @doc Short-hand for cookie(Key, Value, []). +@@ -30,7 +31,7 @@ + cookie(Key, Value, []). + + %% @spec cookie(Key::string(), Value::string(), Options::[Option]) -> header() +-%% where Option = {max_age, integer()} | {local_time, {date(), time()}} ++%% where Option = {max_age, int_seconds()} | {local_time, {date(), time()}} + %% | {domain, string()} | {path, string()} + %% | {secure, true | false} | {http_only, true | false} + %% +@@ -115,12 +116,33 @@ + orelse erlang:error({cookie_quoting_required, V}), + V. + ++ ++%% Return a date in the form of: Wdy, DD-Mon-YYYY HH:MM:SS GMT ++%% See also: rfc2109: 10.1.2 ++rfc2109_cookie_expires_date(LocalTime) -> ++ {{YYYY,MM,DD},{Hour,Min,Sec}} = ++ case calendar:local_time_to_universal_time_dst(LocalTime) of ++ [] -> ++ {Date, {Hour1, Min1, Sec1}} = LocalTime, ++ LocalTime2 = {Date, {Hour1 + 1, Min1, Sec1}}, ++ case calendar:local_time_to_universal_time_dst(LocalTime2) of ++ [Gmt] -> Gmt; ++ [_,Gmt] -> Gmt ++ end; ++ [Gmt] -> Gmt; ++ [_,Gmt] -> Gmt ++ end, ++ DayNumber = calendar:day_of_the_week({YYYY,MM,DD}), ++ lists:flatten( ++ io_lib:format("~s, ~2.2.0w-~3.s-~4.4.0w ~2.2.0w:~2.2.0w:~2.2.0w GMT", ++ [httpd_util:day(DayNumber),DD,httpd_util:month(MM),YYYY,Hour,Min,Sec])). ++ + add_seconds(Secs, LocalTime) -> + Greg = calendar:datetime_to_gregorian_seconds(LocalTime), + calendar:gregorian_seconds_to_datetime(Greg + Secs). + + age_to_cookie_date(Age, LocalTime) -> +- httpd_util:rfc1123_date(add_seconds(Age, LocalTime)). ++ rfc2109_cookie_expires_date(add_seconds(Age, LocalTime)). + + %% @spec parse_cookie(string()) -> [{K::string(), V::string()}] + %% @doc Parse the contents of a Cookie header field, ignoring cookie +@@ -203,8 +225,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + quote_test() -> + %% ?assertError eunit macro is not compatible with coverage module +@@ -293,14 +315,14 @@ + C2 = {"Set-Cookie", + "Customer=WILE_E_COYOTE; " + "Version=1; " +- "Expires=Tue, 15 May 2007 13:45:33 GMT; " ++ "Expires=Tue, 15-May-2007 13:45:33 GMT; " + "Max-Age=0"}, + C2 = cookie("Customer", "WILE_E_COYOTE", + [{max_age, -111}, {local_time, LocalTime}]), + C3 = {"Set-Cookie", + "Customer=WILE_E_COYOTE; " + "Version=1; " +- "Expires=Wed, 16 May 2007 13:45:50 GMT; " ++ "Expires=Wed, 16-May-2007 13:45:50 GMT; " + "Max-Age=86417"}, + C3 = cookie("Customer", "WILE_E_COYOTE", + [{max_age, 86417}, {local_time, LocalTime}]), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_cover.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cover.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_cover.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cover.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -46,8 +46,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + foo_table(a) -> b; + foo_table("a") -> <<"b">>; + foo_table(123) -> {4, 3, 2}; +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_echo.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_echo.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_echo.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_echo.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -11,11 +11,14 @@ + mochiweb_socket_server:stop(?MODULE). + + start() -> +- mochiweb_socket_server:start([{name, ?MODULE}, ++ mochiweb_socket_server:start([{link, false} | options()]). ++ ++options() -> ++ [{name, ?MODULE}, + {port, 6789}, + {ip, "127.0.0.1"}, + {max, 1}, +- {loop, {?MODULE, loop}}]). ++ {loop, {?MODULE, loop}}]. + + loop(Socket) -> + case mochiweb_socket:recv(Socket, 0, 30000) of +@@ -33,6 +36,6 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -6,22 +6,9 @@ + -module(mochiweb). + -author('bob@mochimedia.com'). + +--export([start/0, stop/0]). + -export([new_request/1, new_response/1]). + -export([all_loaded/0, all_loaded/1, reload/0]). +- +-%% @spec start() -> ok +-%% @doc Start the MochiWeb server. +-start() -> +- ensure_started(crypto), +- application:start(mochiweb). +- +-%% @spec stop() -> ok +-%% @doc Stop the MochiWeb server. +-stop() -> +- Res = application:stop(mochiweb), +- application:stop(crypto), +- Res. ++-export([ensure_started/1]). + + reload() -> + [c:l(Module) || Module <- all_loaded()]. +@@ -78,8 +65,8 @@ + Code, + mochiweb_headers:make(Headers)). + +-%% Internal API +- ++%% @spec ensure_started(App::atom()) -> ok ++%% @doc Start the given App if it has not been started already. + ensure_started(App) -> + case application:start(App) of + ok -> +@@ -92,8 +78,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + -record(treq, {path, body= <<>>, xreply= <<>>}). + +@@ -112,7 +98,7 @@ + ssl -> + ServerOpts0 ++ [{ssl, true}, {ssl_opts, ssl_cert_opts()}] + end, +- {ok, Server} = mochiweb_http:start(ServerOpts), ++ {ok, Server} = mochiweb_http:start_link(ServerOpts), + Port = mochiweb_socket_server:get(Server, port), + Res = (catch ClientFun(Transport, Port)), + mochiweb_http:stop(Server), +@@ -123,6 +109,8 @@ + "/foo/bar/baz wibble quux" = R:get(path), + ok. + ++-define(LARGE_TIMEOUT, 60). ++ + single_http_GET_test() -> + do_GET(plain, 1). + +@@ -135,11 +123,13 @@ + multiple_https_GET_test() -> + do_GET(ssl, 3). + +-hundred_http_GET_test() -> +- do_GET(plain, 100). +- +-hundred_https_GET_test() -> +- do_GET(ssl, 100). ++hundred_http_GET_test_() -> % note the underscore ++ {timeout, ?LARGE_TIMEOUT, ++ fun() -> ?assertEqual(ok, do_GET(plain,100)) end}. ++ ++hundred_https_GET_test_() -> % note the underscore ++ {timeout, ?LARGE_TIMEOUT, ++ fun() -> ?assertEqual(ok, do_GET(ssl,100)) end}. + + single_128_http_POST_test() -> + do_POST(plain, 128, 1). +@@ -165,11 +155,13 @@ + multiple_100K_https_POST_test() -> + do_POST(ssl, 102400, 3). + +-hundred_128_http_POST_test() -> +- do_POST(plain, 128, 100). +- +-hundred_128_https_POST_test() -> +- do_POST(ssl, 128, 100). ++hundred_128_http_POST_test_() -> % note the underscore ++ {timeout, ?LARGE_TIMEOUT, ++ fun() -> ?assertEqual(ok, do_POST(plain, 128, 100)) end}. ++ ++hundred_128_https_POST_test_() -> % note the underscore ++ {timeout, ?LARGE_TIMEOUT, ++ fun() -> ?assertEqual(ok, do_POST(ssl, 128, 100)) end}. + + do_GET(Transport, Times) -> + PathPrefix = "/whatever/", +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_headers.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_headers.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_headers.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_headers.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -6,7 +6,7 @@ + -module(mochiweb_headers). + -author('bob@mochimedia.com'). + -export([empty/0, from_list/1, insert/3, enter/3, get_value/2, lookup/2]). +--export([delete_any/2, get_primary_value/2]). ++-export([delete_any/2, get_primary_value/2, get_combined_value/2]). + -export([default/3, enter_from_list/2, default_from_list/2]). + -export([to_list/1, make/1]). + -export([from_binary/1]). +@@ -24,8 +24,8 @@ + %% @doc Construct a headers() from the given list. + make(L) when is_list(L) -> + from_list(L); +-%% assume a tuple is already mochiweb_headers. +-make(T) when is_tuple(T) -> ++%% assume a non-list is already mochiweb_headers. ++make(T) -> + T. + + %% @spec from_binary(iolist()) -> headers() +@@ -112,6 +112,34 @@ + lists:takewhile(fun (C) -> C =/= $; end, V) + end. + ++%% @spec get_combined_value(key(), headers()) -> string() | undefined ++%% @doc Return the value from the given header using a case insensitive search. ++%% If the value of the header is a comma-separated list where holds values ++%% are all identical, the identical value will be returned. ++%% undefined will be returned for keys that are not present or the ++%% values in the list are not the same. ++%% ++%% NOTE: The process isn't designed for a general purpose. If you need ++%% to access all values in the combined header, please refer to ++%% '''tokenize_header_value/1'''. ++%% ++%% Section 4.2 of the RFC 2616 (HTTP 1.1) describes multiple message-header ++%% fields with the same field-name may be present in a message if and only ++%% if the entire field-value for that header field is defined as a ++%% comma-separated list [i.e., #(values)]. ++get_combined_value(K, T) -> ++ case get_value(K, T) of ++ undefined -> ++ undefined; ++ V -> ++ case sets:to_list(sets:from_list(tokenize_header_value(V))) of ++ [Val] -> ++ Val; ++ _ -> ++ undefined ++ end ++ end. ++ + %% @spec lookup(key(), headers()) -> {value, {key(), string()}} | none + %% @doc Return the case preserved key and value for the given header using + %% a case insensitive search. none will be returned for keys that are +@@ -164,6 +192,49 @@ + + %% Internal API + ++tokenize_header_value(undefined) -> ++ undefined; ++tokenize_header_value(V) -> ++ reversed_tokens(trim_and_reverse(V, false), [], []). ++ ++trim_and_reverse([S | Rest], Reversed) when S=:=$ ; S=:=$\n; S=:=$\t -> ++ trim_and_reverse(Rest, Reversed); ++trim_and_reverse(V, false) -> ++ trim_and_reverse(lists:reverse(V), true); ++trim_and_reverse(V, true) -> ++ V. ++ ++reversed_tokens([], [], Acc) -> ++ Acc; ++reversed_tokens([], Token, Acc) -> ++ [Token | Acc]; ++reversed_tokens("\"" ++ Rest, [], Acc) -> ++ case extract_quoted_string(Rest, []) of ++ {String, NewRest} -> ++ reversed_tokens(NewRest, [], [String | Acc]); ++ undefined -> ++ undefined ++ end; ++reversed_tokens("\"" ++ _Rest, _Token, _Acc) -> ++ undefined; ++reversed_tokens([C | Rest], [], Acc) when C=:=$ ;C=:=$\n;C=:=$\t;C=:=$, -> ++ reversed_tokens(Rest, [], Acc); ++reversed_tokens([C | Rest], Token, Acc) when C=:=$ ;C=:=$\n;C=:=$\t;C=:=$, -> ++ reversed_tokens(Rest, [], [Token | Acc]); ++reversed_tokens([C | Rest], Token, Acc) -> ++ reversed_tokens(Rest, [C | Token], Acc); ++reversed_tokens(_, _, _) -> ++ undefeined. ++ ++extract_quoted_string([], _Acc) -> ++ undefined; ++extract_quoted_string("\"\\" ++ Rest, Acc) -> ++ extract_quoted_string(Rest, "\"" ++ Acc); ++extract_quoted_string("\"" ++ Rest, Acc) -> ++ {Acc, Rest}; ++extract_quoted_string([C | Rest], Acc) -> ++ extract_quoted_string(Rest, [C | Acc]). ++ + expand({array, L}) -> + mochiweb_util:join(lists:reverse(L), ", "); + expand(V) -> +@@ -195,8 +266,8 @@ + %% + %% Tests. + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + make_test() -> + Identity = make([{hdr, foo}]), +@@ -237,6 +308,37 @@ + get_primary_value(<<"baz">>, H)), + ok. + ++get_combined_value_test() -> ++ H = make([{hdr, foo}, {baz, <<"wibble,taco">>}, {content_length, "123, 123"}, ++ {test, " 123, 123, 123 , 123,123 "}, ++ {test2, "456, 123, 123 , 123"}, ++ {test3, "123"}, {test4, " 123, "}]), ++ ?assertEqual( ++ "foo", ++ get_combined_value(hdr, H)), ++ ?assertEqual( ++ undefined, ++ get_combined_value(bar, H)), ++ ?assertEqual( ++ undefined, ++ get_combined_value(<<"baz">>, H)), ++ ?assertEqual( ++ "123", ++ get_combined_value(<<"content_length">>, H)), ++ ?assertEqual( ++ "123", ++ get_combined_value(<<"test">>, H)), ++ ?assertEqual( ++ undefined, ++ get_combined_value(<<"test2">>, H)), ++ ?assertEqual( ++ "123", ++ get_combined_value(<<"test3">>, H)), ++ ?assertEqual( ++ "123", ++ get_combined_value(<<"test4">>, H)), ++ ok. ++ + set_cookie_test() -> + H = make([{"set-cookie", foo}, {"set-cookie", bar}, {"set-cookie", baz}]), + ?assertEqual( +@@ -296,4 +398,23 @@ + [] = ?MODULE:to_list(?MODULE:from_binary([<<"\r\n\r\n">>])), + ok. + ++tokenize_header_value_test() -> ++ ?assertEqual(["a quote in a \"quote\"."], ++ tokenize_header_value("\"a quote in a \\\"quote\\\".\"")), ++ ?assertEqual(["abc"], tokenize_header_value("abc")), ++ ?assertEqual(["abc", "def"], tokenize_header_value("abc def")), ++ ?assertEqual(["abc", "def"], tokenize_header_value("abc , def")), ++ ?assertEqual(["abc", "def"], tokenize_header_value(",abc ,, def,,")), ++ ?assertEqual(["abc def"], tokenize_header_value("\"abc def\" ")), ++ ?assertEqual(["abc, def"], tokenize_header_value("\"abc, def\"")), ++ ?assertEqual(["\\a\\$"], tokenize_header_value("\"\\a\\$\"")), ++ ?assertEqual(["abc def", "foo, bar", "12345", ""], ++ tokenize_header_value("\"abc def\" \"foo, bar\" , 12345, \"\"")), ++ ?assertEqual(undefined, ++ tokenize_header_value(undefined)), ++ ?assertEqual(undefined, ++ tokenize_header_value("umatched quote\"")), ++ ?assertEqual(undefined, ++ tokenize_header_value("\"unmatched quote")). ++ + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_html.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_html.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_html.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_html.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -95,7 +95,12 @@ + to_tokens({Tag0, [], Acc}); + to_tokens({Tag0, Attrs, Acc}) -> + Tag = to_tag(Tag0), +- to_tokens([{Tag, Acc}], [{start_tag, Tag, Attrs, is_singleton(Tag)}]). ++ case is_singleton(Tag) of ++ true -> ++ to_tokens([], [{start_tag, Tag, Attrs, true}]); ++ false -> ++ to_tokens([{Tag, Acc}], [{start_tag, Tag, Attrs, false}]) ++ end. + + %% @spec to_html([html_token()] | html_node()) -> iolist() + %% @doc Convert a list of html_token() to a HTML document. +@@ -312,7 +317,8 @@ + {Tag, S1} = tokenize_literal(B, ?ADV_COL(S, 2)), + {S2, _} = find_gt(B, S1), + {{end_tag, Tag}, S2}; +- <<_:O/binary, "<", C, _/binary>> when ?IS_WHITESPACE(C) -> ++ <<_:O/binary, "<", C, _/binary>> ++ when ?IS_WHITESPACE(C); not ?IS_LITERAL_SAFE(C) -> + %% This isn't really strict HTML + {{data, Data, _Whitespace}, S1} = tokenize_data(B, ?INC_COL(S)), + {{data, <<$<, Data/binary>>, false}, S1}; +@@ -501,8 +507,6 @@ + tokenize_quoted_attr_value(B, S1, [Data|Acc], Q); + <<_:O/binary, Q, _/binary>> -> + { iolist_to_binary(lists:reverse(Acc)), ?INC_COL(S) }; +- <<_:O/binary, $\n, _/binary>> -> +- { iolist_to_binary(lists:reverse(Acc)), ?INC_LINE(S) }; + <<_:O/binary, C, _/binary>> -> + tokenize_quoted_attr_value(B, ?INC_COL(S), [C|Acc], Q) + end. +@@ -603,32 +607,33 @@ + end. + + tokenize_charref(Bin, S=#decoder{offset=O}) -> +- tokenize_charref(Bin, S, O). ++ try ++ tokenize_charref(Bin, S, O) ++ catch ++ throw:invalid_charref -> ++ {{data, <<"&">>, false}, S} ++ end. + + tokenize_charref(Bin, S=#decoder{offset=O}, Start) -> + case Bin of + <<_:O/binary>> -> +- <<_:Start/binary, Raw/binary>> = Bin, +- {{data, Raw, false}, S}; ++ throw(invalid_charref); + <<_:O/binary, C, _/binary>> when ?IS_WHITESPACE(C) + orelse C =:= ?SQUOTE + orelse C =:= ?QUOTE + orelse C =:= $/ + orelse C =:= $> -> +- Len = O - Start, +- <<_:Start/binary, Raw:Len/binary, _/binary>> = Bin, +- {{data, Raw, false}, S}; ++ throw(invalid_charref); + <<_:O/binary, $;, _/binary>> -> + Len = O - Start, + <<_:Start/binary, Raw:Len/binary, _/binary>> = Bin, + Data = case mochiweb_charref:charref(Raw) of + undefined -> +- Start1 = Start - 1, +- Len1 = Len + 2, +- <<_:Start1/binary, R:Len1/binary, _/binary>> = Bin, +- R; +- Unichar -> +- mochiutf8:codepoint_to_bytes(Unichar) ++ throw(invalid_charref); ++ Unichar when is_integer(Unichar) -> ++ mochiutf8:codepoint_to_bytes(Unichar); ++ Unichars when is_list(Unichars) -> ++ unicode:characters_to_binary(Unichars) + end, + {{data, Data, false}, ?INC_COL(S)}; + _ -> +@@ -759,8 +764,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + to_html_test() -> + ?assertEqual( +@@ -1232,6 +1237,14 @@ + { <<"img">>, [ { <<"src">>, <<"/images/icon>.png">> } ], [] } + ]}, + mochiweb_html:parse(D2)), ++ ++ %% Quoted attributes can contain whitespace and newlines ++ D3 = <<"">>, ++ ?assertEqual( ++ {<<"html">>,[],[ ++ { <<"a">>, [ { <<"href">>, <<"#">> }, {<<"onclick">>, <<"javascript: test(1,\ntrue);">>} ], [] } ++ ]}, ++ mochiweb_html:parse(D3)), + ok. + + parse_missing_attr_name_test() -> +@@ -1261,4 +1274,59 @@ + mochiweb_html:parse(D0)), + ok. + ++to_html_singleton_test() -> ++ D0 = <<"">>, ++ T0 = {<<"link">>,[],[]}, ++ ?assertEqual(D0, iolist_to_binary(to_html(T0))), ++ ++ D1 = <<"">>, ++ T1 = {<<"head">>,[],[{<<"link">>,[],[]}]}, ++ ?assertEqual(D1, iolist_to_binary(to_html(T1))), ++ ++ D2 = <<"">>, ++ T2 = {<<"head">>,[],[{<<"link">>,[],[]}, {<<"link">>,[],[]}]}, ++ ?assertEqual(D2, iolist_to_binary(to_html(T2))), ++ ++ %% Make sure singletons are converted to singletons. ++ D3 = <<"">>, ++ T3 = {<<"head">>,[],[{<<"link">>,[],[<<"funny">>]}]}, ++ ?assertEqual(D3, iolist_to_binary(to_html(T3))), ++ ++ D4 = <<"">>, ++ T4 = {<<"link">>,[],[<<"funny">>]}, ++ ?assertEqual(D4, iolist_to_binary(to_html(T4))), ++ ++ ok. ++ ++parse_amp_test_() -> ++ [?_assertEqual( ++ {<<"html">>,[], ++ [{<<"body">>,[{<<"onload">>,<<"javascript:A('1&2')">>}],[]}]}, ++ mochiweb_html:parse("")), ++ ?_assertEqual( ++ {<<"html">>,[], ++ [{<<"body">>,[{<<"onload">>,<<"javascript:A('1& 2')">>}],[]}]}, ++ mochiweb_html:parse("")), ++ ?_assertEqual( ++ {<<"html">>,[], ++ [{<<"body">>,[],[<<"& ">>]}]}, ++ mochiweb_html:parse("& ")), ++ ?_assertEqual( ++ {<<"html">>,[], ++ [{<<"body">>,[],[<<"&">>]}]}, ++ mochiweb_html:parse("&"))]. ++ ++parse_unescaped_lt_test() -> ++ D1 = <<"">>, ++ ?assertEqual( ++ {<<"div">>, [], [<<" < < ">>, {<<"a">>, [{<<"href">>, <<"/">>}], ++ [<<"Back">>]}]}, ++ mochiweb_html:parse(D1)), ++ ++ D2 = <<"
<< Back
">>, ++ ?assertEqual( ++ {<<"div">>, [], [<<" << ">>, {<<"a">>, [{<<"href">>, <<"/">>}], ++ [<<"Back">>]}]}, ++ mochiweb_html:parse(D2)). ++ + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_http.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_http.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_http.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_http.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -5,13 +5,13 @@ + + -module(mochiweb_http). + -author('bob@mochimedia.com'). +--export([start/0, start/1, stop/0, stop/1]). +--export([loop/2, default_body/1]). ++-export([start/1, start_link/1, stop/0, stop/1]). ++-export([loop/2]). + -export([after_response/2, reentry/1]). + -export([parse_range_request/1, range_skip_length/2]). + +--define(REQUEST_RECV_TIMEOUT, 300000). % timeout waiting for request line +--define(HEADERS_RECV_TIMEOUT, 30000). % timeout waiting for headers ++-define(REQUEST_RECV_TIMEOUT, 300000). %% timeout waiting for request line ++-define(HEADERS_RECV_TIMEOUT, 30000). %% timeout waiting for headers + + -define(MAX_HEADERS, 1000). + -define(DEFAULTS, [{name, ?MODULE}, +@@ -19,9 +19,7 @@ + + parse_options(Options) -> + {loop, HttpLoop} = proplists:lookup(loop, Options), +- Loop = fun (S) -> +- ?MODULE:loop(S, HttpLoop) +- end, ++ Loop = {?MODULE, loop, [HttpLoop]}, + Options1 = [{loop, Loop} | proplists:delete(loop, Options)], + mochilists:set_defaults(?DEFAULTS, Options1). + +@@ -31,15 +29,12 @@ + stop(Name) -> + mochiweb_socket_server:stop(Name). + +-start() -> +- start([{ip, "127.0.0.1"}, +- {loop, {?MODULE, default_body}}]). +- + %% @spec start(Options) -> ServerRet + %% Options = [option()] + %% Option = {name, atom()} | {ip, string() | tuple()} | {backlog, integer()} + %% | {nodelay, boolean()} | {acceptor_pool_size, integer()} + %% | {ssl, boolean()} | {profile_fun, undefined | (Props) -> ok} ++%% | {link, false} + %% @doc Start a mochiweb server. + %% profile_fun is used to profile accept timing. + %% After each accept, if defined, profile_fun is called with a proplist of a subset of the mochiweb_socket_server state and timing information. +@@ -48,62 +43,18 @@ + start(Options) -> + mochiweb_socket_server:start(parse_options(Options)). + +-frm(Body) -> +- ["" +- "
" +- "" +- "" +- "
" +- "
" +- "
" +- "" +- "" +- "" +- "
" +- "
", Body, "
" +- ""]. +- +-default_body(Req, M, "/chunked") when M =:= 'GET'; M =:= 'HEAD' -> +- Res = Req:ok({"text/plain", [], chunked}), +- Res:write_chunk("First chunk\r\n"), +- timer:sleep(5000), +- Res:write_chunk("Last chunk\r\n"), +- Res:write_chunk(""); +-default_body(Req, M, _Path) when M =:= 'GET'; M =:= 'HEAD' -> +- Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()}, +- {parse_cookie, Req:parse_cookie()}, +- Req:dump()]]), +- Req:ok({"text/html", +- [mochiweb_cookies:cookie("mochiweb_http", "test_cookie")], +- frm(Body)}); +-default_body(Req, 'POST', "/multipart") -> +- Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()}, +- {parse_cookie, Req:parse_cookie()}, +- {body, Req:recv_body()}, +- Req:dump()]]), +- Req:ok({"text/html", [], frm(Body)}); +-default_body(Req, 'POST', _Path) -> +- Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()}, +- {parse_cookie, Req:parse_cookie()}, +- {parse_post, Req:parse_post()}, +- Req:dump()]]), +- Req:ok({"text/html", [], frm(Body)}); +-default_body(Req, _Method, _Path) -> +- Req:respond({501, [], []}). +- +-default_body(Req) -> +- default_body(Req, Req:get(method), Req:get(path)). ++start_link(Options) -> ++ mochiweb_socket_server:start_link(parse_options(Options)). + + loop(Socket, Body) -> +- mochiweb_socket:setopts(Socket, [{packet, http}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, http}]), + request(Socket, Body). + + request(Socket, Body) -> +- mochiweb_socket:setopts(Socket, [{active, once}]), ++ ok = mochiweb_socket:setopts(Socket, [{active, once}]), + receive + {Protocol, _, {http_request, Method, Path, Version}} when Protocol == http orelse Protocol == ssl -> +- mochiweb_socket:setopts(Socket, [{packet, httph}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, httph}]), + headers(Socket, {Method, Path, Version}, [], Body, 0); + {Protocol, _, {http_error, "\r\n"}} when Protocol == http orelse Protocol == ssl -> + request(Socket, Body); +@@ -112,6 +63,13 @@ + {tcp_closed, _} -> + mochiweb_socket:close(Socket), + exit(normal); ++ {ssl_closed, _} -> ++ mochiweb_socket:close(Socket), ++ exit(normal); ++ {tcp_error,_,emsgsize} -> ++ % R15B02 returns this then closes the socket, so close and exit ++ mochiweb_socket:close(Socket), ++ exit(normal); + _Other -> + handle_invalid_request(Socket) + after ?REQUEST_RECV_TIMEOUT -> +@@ -126,10 +84,10 @@ + + headers(Socket, Request, Headers, _Body, ?MAX_HEADERS) -> + %% Too many headers sent, bad request. +- mochiweb_socket:setopts(Socket, [{packet, raw}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), + handle_invalid_request(Socket, Request, Headers); + headers(Socket, Request, Headers, Body, HeaderCount) -> +- mochiweb_socket:setopts(Socket, [{active, once}]), ++ ok = mochiweb_socket:setopts(Socket, [{active, once}]), + receive + {Protocol, _, http_eoh} when Protocol == http orelse Protocol == ssl -> + Req = new_request(Socket, Request, Headers), +@@ -141,6 +99,10 @@ + {tcp_closed, _} -> + mochiweb_socket:close(Socket), + exit(normal); ++ {tcp_error,_,emsgsize} -> ++ % R15B02 returns this then closes the socket, so close and exit ++ mochiweb_socket:close(Socket), ++ exit(normal); + _Other -> + handle_invalid_request(Socket, Request, Headers) + after ?HEADERS_RECV_TIMEOUT -> +@@ -148,14 +110,19 @@ + exit(normal) + end. + ++call_body({M, F, A}, Req) -> ++ erlang:apply(M, F, [Req | A]); + call_body({M, F}, Req) -> + M:F(Req); + call_body(Body, Req) -> + Body(Req). + ++-spec handle_invalid_request(term()) -> no_return(). + handle_invalid_request(Socket) -> +- handle_invalid_request(Socket, {'GET', {abs_path, "/"}, {0,9}}, []). ++ handle_invalid_request(Socket, {'GET', {abs_path, "/"}, {0,9}}, []), ++ exit(normal). + ++-spec handle_invalid_request(term(), term(), term()) -> no_return(). + handle_invalid_request(Socket, Request, RevHeaders) -> + Req = new_request(Socket, Request, RevHeaders), + Req:respond({400, [], []}), +@@ -163,7 +130,7 @@ + exit(normal). + + new_request(Socket, Request, RevHeaders) -> +- mochiweb_socket:setopts(Socket, [{packet, raw}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), + mochiweb:new_request({Socket, Request, lists:reverse(RevHeaders)}). + + after_response(Body, Req) -> +@@ -174,6 +141,7 @@ + exit(normal); + false -> + Req:cleanup(), ++ erlang:garbage_collect(), + ?MODULE:loop(Socket, Body) + end. + +@@ -211,6 +179,8 @@ + invalid_range; + {Start, End} when 0 =< Start, Start =< End, End < Size -> + {Start, End - Start + 1}; ++ {Start, End} when 0 =< Start, Start =< End, End >= Size -> ++ {Start, Size - Start}; + {_OutOfRange, _End} -> + invalid_range + end. +@@ -218,8 +188,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + range_test() -> + %% valid, single ranges +@@ -265,19 +235,23 @@ + BodySizeLess1 = BodySize - 1, + ?assertEqual({BodySizeLess1, 1}, + range_skip_length({BodySize - 1, none}, BodySize)), ++ ?assertEqual({BodySizeLess1, 1}, ++ range_skip_length({BodySize - 1, BodySize+5}, BodySize)), ++ ?assertEqual({BodySizeLess1, 1}, ++ range_skip_length({BodySize - 1, BodySize}, BodySize)), + + %% out of range, return whole thing + ?assertEqual({0, BodySize}, + range_skip_length({none, BodySize + 1}, BodySize)), + ?assertEqual({0, BodySize}, + range_skip_length({none, -1}, BodySize)), ++ ?assertEqual({0, BodySize}, ++ range_skip_length({0, BodySize + 1}, BodySize)), + + %% invalid ranges + ?assertEqual(invalid_range, + range_skip_length({-1, 30}, BodySize)), + ?assertEqual(invalid_range, +- range_skip_length({0, BodySize + 1}, BodySize)), +- ?assertEqual(invalid_range, + range_skip_length({-1, BodySize + 1}, BodySize)), + ?assertEqual(invalid_range, + range_skip_length({BodySize, 40}, BodySize)), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_io.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_io.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_io.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_io.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -38,9 +38,6 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). +- +- +- ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_mime.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_mime.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_mime.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_mime.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -11,72 +11,393 @@ + %% @doc Given a filename extension (e.g. ".html") return a guess for the MIME + %% type such as "text/html". Will return the atom undefined if no good + %% guess is available. +-from_extension(".html") -> +- "text/html"; +-from_extension(".xhtml") -> +- "application/xhtml+xml"; +-from_extension(".xml") -> +- "application/xml"; +-from_extension(".css") -> +- "text/css"; ++ ++from_extension(".stl") -> ++ "application/SLA"; ++from_extension(".stp") -> ++ "application/STEP"; ++from_extension(".step") -> ++ "application/STEP"; ++from_extension(".dwg") -> ++ "application/acad"; ++from_extension(".ez") -> ++ "application/andrew-inset"; ++from_extension(".ccad") -> ++ "application/clariscad"; ++from_extension(".drw") -> ++ "application/drafting"; ++from_extension(".tsp") -> ++ "application/dsptype"; ++from_extension(".dxf") -> ++ "application/dxf"; ++from_extension(".xls") -> ++ "application/excel"; ++from_extension(".unv") -> ++ "application/i-deas"; ++from_extension(".jar") -> ++ "application/java-archive"; ++from_extension(".hqx") -> ++ "application/mac-binhex40"; ++from_extension(".cpt") -> ++ "application/mac-compactpro"; ++from_extension(".pot") -> ++ "application/vnd.ms-powerpoint"; ++from_extension(".ppt") -> ++ "application/vnd.ms-powerpoint"; ++from_extension(".dms") -> ++ "application/octet-stream"; ++from_extension(".lha") -> ++ "application/octet-stream"; ++from_extension(".lzh") -> ++ "application/octet-stream"; ++from_extension(".oda") -> ++ "application/oda"; ++from_extension(".ogg") -> ++ "application/ogg"; ++from_extension(".ogm") -> ++ "application/ogg"; ++from_extension(".pdf") -> ++ "application/pdf"; ++from_extension(".pgp") -> ++ "application/pgp"; ++from_extension(".ai") -> ++ "application/postscript"; ++from_extension(".eps") -> ++ "application/postscript"; ++from_extension(".ps") -> ++ "application/postscript"; ++from_extension(".prt") -> ++ "application/pro_eng"; ++from_extension(".rtf") -> ++ "application/rtf"; ++from_extension(".smi") -> ++ "application/smil"; ++from_extension(".smil") -> ++ "application/smil"; ++from_extension(".sol") -> ++ "application/solids"; ++from_extension(".vda") -> ++ "application/vda"; ++from_extension(".xlm") -> ++ "application/vnd.ms-excel"; ++from_extension(".cod") -> ++ "application/vnd.rim.cod"; ++from_extension(".pgn") -> ++ "application/x-chess-pgn"; ++from_extension(".cpio") -> ++ "application/x-cpio"; ++from_extension(".csh") -> ++ "application/x-csh"; ++from_extension(".deb") -> ++ "application/x-debian-package"; ++from_extension(".dcr") -> ++ "application/x-director"; ++from_extension(".dir") -> ++ "application/x-director"; ++from_extension(".dxr") -> ++ "application/x-director"; ++from_extension(".gz") -> ++ "application/x-gzip"; ++from_extension(".hdf") -> ++ "application/x-hdf"; ++from_extension(".ipx") -> ++ "application/x-ipix"; ++from_extension(".ips") -> ++ "application/x-ipscript"; + from_extension(".js") -> + "application/x-javascript"; +-from_extension(".jpg") -> +- "image/jpeg"; +-from_extension(".gif") -> +- "image/gif"; +-from_extension(".png") -> +- "image/png"; ++from_extension(".skd") -> ++ "application/x-koan"; ++from_extension(".skm") -> ++ "application/x-koan"; ++from_extension(".skp") -> ++ "application/x-koan"; ++from_extension(".skt") -> ++ "application/x-koan"; ++from_extension(".latex") -> ++ "application/x-latex"; ++from_extension(".lsp") -> ++ "application/x-lisp"; ++from_extension(".scm") -> ++ "application/x-lotusscreencam"; ++from_extension(".mif") -> ++ "application/x-mif"; ++from_extension(".com") -> ++ "application/x-msdos-program"; ++from_extension(".exe") -> ++ "application/octet-stream"; ++from_extension(".cdf") -> ++ "application/x-netcdf"; ++from_extension(".nc") -> ++ "application/x-netcdf"; ++from_extension(".pl") -> ++ "application/x-perl"; ++from_extension(".pm") -> ++ "application/x-perl"; ++from_extension(".rar") -> ++ "application/x-rar-compressed"; ++from_extension(".sh") -> ++ "application/x-sh"; ++from_extension(".shar") -> ++ "application/x-shar"; + from_extension(".swf") -> + "application/x-shockwave-flash"; +-from_extension(".zip") -> +- "application/zip"; +-from_extension(".bz2") -> +- "application/x-bzip2"; +-from_extension(".gz") -> +- "application/x-gzip"; ++from_extension(".sit") -> ++ "application/x-stuffit"; ++from_extension(".sv4cpio") -> ++ "application/x-sv4cpio"; ++from_extension(".sv4crc") -> ++ "application/x-sv4crc"; ++from_extension(".tar.gz") -> ++ "application/x-tar-gz"; ++from_extension(".tgz") -> ++ "application/x-tar-gz"; + from_extension(".tar") -> + "application/x-tar"; +-from_extension(".tgz") -> +- "application/x-gzip"; ++from_extension(".tcl") -> ++ "application/x-tcl"; ++from_extension(".texi") -> ++ "application/x-texinfo"; ++from_extension(".texinfo") -> ++ "application/x-texinfo"; ++from_extension(".man") -> ++ "application/x-troff-man"; ++from_extension(".me") -> ++ "application/x-troff-me"; ++from_extension(".ms") -> ++ "application/x-troff-ms"; ++from_extension(".roff") -> ++ "application/x-troff"; ++from_extension(".t") -> ++ "application/x-troff"; ++from_extension(".tr") -> ++ "application/x-troff"; ++from_extension(".ustar") -> ++ "application/x-ustar"; ++from_extension(".src") -> ++ "application/x-wais-source"; ++from_extension(".zip") -> ++ "application/zip"; ++from_extension(".tsi") -> ++ "audio/TSP-audio"; ++from_extension(".au") -> ++ "audio/basic"; ++from_extension(".snd") -> ++ "audio/basic"; ++from_extension(".kar") -> ++ "audio/midi"; ++from_extension(".mid") -> ++ "audio/midi"; ++from_extension(".midi") -> ++ "audio/midi"; ++from_extension(".mp2") -> ++ "audio/mpeg"; ++from_extension(".mp3") -> ++ "audio/mpeg"; ++from_extension(".mpga") -> ++ "audio/mpeg"; ++from_extension(".aif") -> ++ "audio/x-aiff"; ++from_extension(".aifc") -> ++ "audio/x-aiff"; ++from_extension(".aiff") -> ++ "audio/x-aiff"; ++from_extension(".m3u") -> ++ "audio/x-mpegurl"; ++from_extension(".wax") -> ++ "audio/x-ms-wax"; ++from_extension(".wma") -> ++ "audio/x-ms-wma"; ++from_extension(".rpm") -> ++ "audio/x-pn-realaudio-plugin"; ++from_extension(".ram") -> ++ "audio/x-pn-realaudio"; ++from_extension(".rm") -> ++ "audio/x-pn-realaudio"; ++from_extension(".ra") -> ++ "audio/x-realaudio"; ++from_extension(".wav") -> ++ "audio/x-wav"; ++from_extension(".pdb") -> ++ "chemical/x-pdb"; ++from_extension(".ras") -> ++ "image/cmu-raster"; ++from_extension(".gif") -> ++ "image/gif"; ++from_extension(".ief") -> ++ "image/ief"; ++from_extension(".jpe") -> ++ "image/jpeg"; ++from_extension(".jpeg") -> ++ "image/jpeg"; ++from_extension(".jpg") -> ++ "image/jpeg"; ++from_extension(".jp2") -> ++ "image/jp2"; ++from_extension(".png") -> ++ "image/png"; ++from_extension(".tif") -> ++ "image/tiff"; ++from_extension(".tiff") -> ++ "image/tiff"; ++from_extension(".pnm") -> ++ "image/x-portable-anymap"; ++from_extension(".pbm") -> ++ "image/x-portable-bitmap"; ++from_extension(".pgm") -> ++ "image/x-portable-graymap"; ++from_extension(".ppm") -> ++ "image/x-portable-pixmap"; ++from_extension(".rgb") -> ++ "image/x-rgb"; ++from_extension(".xbm") -> ++ "image/x-xbitmap"; ++from_extension(".xwd") -> ++ "image/x-xwindowdump"; ++from_extension(".iges") -> ++ "model/iges"; ++from_extension(".igs") -> ++ "model/iges"; ++from_extension(".mesh") -> ++ "model/mesh"; ++from_extension(".") -> ++ ""; ++from_extension(".msh") -> ++ "model/mesh"; ++from_extension(".silo") -> ++ "model/mesh"; ++from_extension(".vrml") -> ++ "model/vrml"; ++from_extension(".wrl") -> ++ "model/vrml"; ++from_extension(".css") -> ++ "text/css"; ++from_extension(".htm") -> ++ "text/html"; ++from_extension(".html") -> ++ "text/html"; ++from_extension(".asc") -> ++ "text/plain"; ++from_extension(".c") -> ++ "text/plain"; ++from_extension(".cc") -> ++ "text/plain"; ++from_extension(".f90") -> ++ "text/plain"; ++from_extension(".f") -> ++ "text/plain"; ++from_extension(".hh") -> ++ "text/plain"; ++from_extension(".m") -> ++ "text/plain"; + from_extension(".txt") -> + "text/plain"; +-from_extension(".doc") -> +- "application/msword"; +-from_extension(".pdf") -> +- "application/pdf"; +-from_extension(".xls") -> +- "application/vnd.ms-excel"; +-from_extension(".rtf") -> +- "application/rtf"; ++from_extension(".rtx") -> ++ "text/richtext"; ++from_extension(".sgm") -> ++ "text/sgml"; ++from_extension(".sgml") -> ++ "text/sgml"; ++from_extension(".tsv") -> ++ "text/tab-separated-values"; ++from_extension(".jad") -> ++ "text/vnd.sun.j2me.app-descriptor"; ++from_extension(".etx") -> ++ "text/x-setext"; ++from_extension(".xml") -> ++ "application/xml"; ++from_extension(".dl") -> ++ "video/dl"; ++from_extension(".fli") -> ++ "video/fli"; ++from_extension(".flv") -> ++ "video/x-flv"; ++from_extension(".gl") -> ++ "video/gl"; ++from_extension(".mp4") -> ++ "video/mp4"; ++from_extension(".mpe") -> ++ "video/mpeg"; ++from_extension(".mpeg") -> ++ "video/mpeg"; ++from_extension(".mpg") -> ++ "video/mpeg"; + from_extension(".mov") -> + "video/quicktime"; +-from_extension(".mp3") -> +- "audio/mpeg"; ++from_extension(".qt") -> ++ "video/quicktime"; ++from_extension(".viv") -> ++ "video/vnd.vivo"; ++from_extension(".vivo") -> ++ "video/vnd.vivo"; ++from_extension(".asf") -> ++ "video/x-ms-asf"; ++from_extension(".asx") -> ++ "video/x-ms-asx"; ++from_extension(".wmv") -> ++ "video/x-ms-wmv"; ++from_extension(".wmx") -> ++ "video/x-ms-wmx"; ++from_extension(".wvx") -> ++ "video/x-ms-wvx"; ++from_extension(".avi") -> ++ "video/x-msvideo"; ++from_extension(".movie") -> ++ "video/x-sgi-movie"; ++from_extension(".mime") -> ++ "www/mime"; ++from_extension(".ice") -> ++ "x-conference/x-cooltalk"; ++from_extension(".vrm") -> ++ "x-world/x-vrml"; ++from_extension(".spx") -> ++ "audio/ogg"; ++from_extension(".xhtml") -> ++ "application/xhtml+xml"; ++from_extension(".bz2") -> ++ "application/x-bzip2"; ++from_extension(".doc") -> ++ "application/msword"; + from_extension(".z") -> + "application/x-compress"; +-from_extension(".wav") -> +- "audio/x-wav"; + from_extension(".ico") -> + "image/x-icon"; + from_extension(".bmp") -> + "image/bmp"; + from_extension(".m4a") -> + "audio/mpeg"; +-from_extension(".m3u") -> +- "audio/x-mpegurl"; +-from_extension(".exe") -> +- "application/octet-stream"; + from_extension(".csv") -> + "text/csv"; ++from_extension(".eot") -> ++ "application/vnd.ms-fontobject"; ++from_extension(".m4v") -> ++ "video/mp4"; ++from_extension(".svg") -> ++ "image/svg+xml"; ++from_extension(".svgz") -> ++ "image/svg+xml"; ++from_extension(".ttc") -> ++ "application/x-font-ttf"; ++from_extension(".ttf") -> ++ "application/x-font-ttf"; ++from_extension(".vcf") -> ++ "text/x-vcard"; ++from_extension(".webm") -> ++ "video/web"; ++from_extension(".webp") -> ++ "image/web"; ++from_extension(".woff") -> ++ "application/x-font-woff"; ++from_extension(".otf") -> ++ "font/opentype"; + from_extension(_) -> + undefined. + + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + exhaustive_from_extension_test() -> + T = mochiweb_cover:clause_lookup_table(?MODULE, from_extension), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_multipart.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_multipart.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_multipart.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_multipart.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -128,7 +128,7 @@ + + parse_multipart_request(Req, Callback) -> + %% TODO: Support chunked? +- Length = list_to_integer(Req:get_header_value("content-length")), ++ Length = list_to_integer(Req:get_combined_header_value("content-length")), + Boundary = iolist_to_binary( + get_boundary(Req:get_header_value("content-type"))), + Prefix = <<"\r\n--", Boundary/binary>>, +@@ -240,24 +240,22 @@ + S + end. + +-find_in_binary(B, Data) when size(B) > 0 -> +- case size(Data) - size(B) of ++%% @spec find_in_binary(Pattern::binary(), Data::binary()) -> ++%% {exact, N} | {partial, N, K} | not_found ++%% @doc Searches for the given pattern in the given binary. ++find_in_binary(P, Data) when size(P) > 0 -> ++ PS = size(P), ++ DS = size(Data), ++ case DS - PS of + Last when Last < 0 -> +- partial_find(B, Data, 0, size(Data)); ++ partial_find(P, Data, 0, DS); + Last -> +- find_in_binary(B, size(B), Data, 0, Last) ++ case binary:match(Data, P) of ++ {Pos, _} -> {exact, Pos}; ++ nomatch -> partial_find(P, Data, Last+1, PS-1) ++ end + end. + +-find_in_binary(B, BS, D, N, Last) when N =< Last-> +- case D of +- <<_:N/binary, B:BS/binary, _/binary>> -> +- {exact, N}; +- _ -> +- find_in_binary(B, BS, D, 1 + N, Last) +- end; +-find_in_binary(B, BS, D, N, Last) when N =:= 1 + Last -> +- partial_find(B, D, N, BS - 1). +- + partial_find(_B, _D, _N, 0) -> + not_found; + partial_find(B, D, N, K) -> +@@ -295,8 +293,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + ssl_cert_opts() -> + EbinDir = filename:dirname(code:which(?MODULE)), +@@ -313,7 +311,7 @@ + ssl -> + ServerOpts0 ++ [{ssl, true}, {ssl_opts, ssl_cert_opts()}] + end, +- {ok, Server} = mochiweb_socket_server:start(ServerOpts), ++ {ok, Server} = mochiweb_socket_server:start_link(ServerOpts), + Port = mochiweb_socket_server:get(Server, port), + ClientOpts = [binary, {active, false}], + {ok, Client} = case Transport of +@@ -821,4 +819,54 @@ + 10))), + ok. + ++%% @todo Move somewhere more appropriate than in the test suite ++ ++multipart_parsing_benchmark_test() -> ++ run_multipart_parsing_benchmark(1). ++ ++run_multipart_parsing_benchmark(0) -> ok; ++run_multipart_parsing_benchmark(N) -> ++ multipart_parsing_benchmark(), ++ run_multipart_parsing_benchmark(N-1). ++ ++multipart_parsing_benchmark() -> ++ ContentType = "multipart/form-data; boundary=----------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5", ++ Chunk = binary:copy(<<"This Is_%Some=Quite0Long4String2Used9For7BenchmarKing.5">>, 102400), ++ BinContent = <<"------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"Filename\"\r\n\r\nhello.txt\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"success_action_status\"\r\n\r\n201\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"file\"; filename=\"hello.txt\"\r\nContent-Type: application/octet-stream\r\n\r\n", Chunk/binary, "\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"Upload\"\r\n\r\nSubmit Query\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5--">>, ++ Expect = [{headers, ++ [{"content-disposition", ++ {"form-data", [{"name", "Filename"}]}}]}, ++ {body, <<"hello.txt">>}, ++ body_end, ++ {headers, ++ [{"content-disposition", ++ {"form-data", [{"name", "success_action_status"}]}}]}, ++ {body, <<"201">>}, ++ body_end, ++ {headers, ++ [{"content-disposition", ++ {"form-data", [{"name", "file"}, {"filename", "hello.txt"}]}}, ++ {"content-type", {"application/octet-stream", []}}]}, ++ {body, Chunk}, ++ body_end, ++ {headers, ++ [{"content-disposition", ++ {"form-data", [{"name", "Upload"}]}}]}, ++ {body, <<"Submit Query">>}, ++ body_end, ++ eof], ++ TestCallback = fun (Next) -> test_callback(Next, Expect) end, ++ ServerFun = fun (Socket) -> ++ ok = mochiweb_socket:send(Socket, BinContent), ++ exit(normal) ++ end, ++ ClientFun = fun (Socket) -> ++ Req = fake_request(Socket, ContentType, ++ byte_size(BinContent)), ++ Res = parse_multipart_request(Req, TestCallback), ++ {0, <<>>, ok} = Res, ++ ok ++ end, ++ ok = with_socket_server(plain, ServerFun, ClientFun), ++ ok. + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_request.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_request.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -3,7 +3,7 @@ + + %% @doc MochiWeb HTTP Request abstraction. + +--module(mochiweb_request, [Socket, Method, RawPath, Version, Headers]). ++-module(mochiweb_request). + -author('bob@mochimedia.com'). + + -include_lib("kernel/include/file.hrl"). +@@ -11,17 +11,18 @@ + + -define(QUIP, "Any of you quaids got a smint?"). + +--export([get_header_value/1, get_primary_header_value/1, get/1, dump/0]). +--export([send/1, recv/1, recv/2, recv_body/0, recv_body/1, stream_body/3]). +--export([start_response/1, start_response_length/1, start_raw_response/1]). +--export([respond/1, ok/1]). +--export([not_found/0, not_found/1]). +--export([parse_post/0, parse_qs/0]). +--export([should_close/0, cleanup/0]). +--export([parse_cookie/0, get_cookie_value/1]). +--export([serve_file/2, serve_file/3]). +--export([accepted_encodings/1]). +--export([accepts_content_type/1]). ++-export([new/5]). ++-export([get_header_value/2, get_primary_header_value/2, get_combined_header_value/2, get/2, dump/1]). ++-export([send/2, recv/2, recv/3, recv_body/1, recv_body/2, stream_body/4]). ++-export([start_response/2, start_response_length/2, start_raw_response/2]). ++-export([respond/2, ok/2]). ++-export([not_found/1, not_found/2]). ++-export([parse_post/1, parse_qs/1]). ++-export([should_close/1, cleanup/1]). ++-export([parse_cookie/1, get_cookie_value/2]). ++-export([serve_file/3, serve_file/4]). ++-export([accepted_encodings/2]). ++-export([accepts_content_type/2, accepted_content_types/2]). + + -define(SAVE_QS, mochiweb_request_qs). + -define(SAVE_PATH, mochiweb_request_path). +@@ -32,11 +33,10 @@ + -define(SAVE_COOKIE, mochiweb_request_cookie). + -define(SAVE_FORCE_CLOSE, mochiweb_request_force_close). + +-%% @type iolist() = [iolist() | binary() | char()]. +-%% @type iodata() = binary() | iolist(). + %% @type key() = atom() | string() | binary() + %% @type value() = atom() | string() | binary() | integer() + %% @type headers(). A mochiweb_headers structure. ++%% @type request(). A mochiweb_request parameterized module instance. + %% @type response(). A mochiweb_response parameterized module instance. + %% @type ioheaders() = headers() | [{key(), value()}]. + +@@ -46,50 +46,58 @@ + % Maximum recv_body() length of 1MB + -define(MAX_RECV_BODY, (1024*1024)). + +-%% @spec get_header_value(K) -> undefined | Value ++%% @spec new(Socket, Method, RawPath, Version, headers()) -> request() ++%% @doc Create a new request instance. ++new(Socket, Method, RawPath, Version, Headers) -> ++ {?MODULE, [Socket, Method, RawPath, Version, Headers]}. ++ ++%% @spec get_header_value(K, request()) -> undefined | Value + %% @doc Get the value of a given request header. +-get_header_value(K) -> ++get_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> + mochiweb_headers:get_value(K, Headers). + +-get_primary_header_value(K) -> ++get_primary_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> + mochiweb_headers:get_primary_value(K, Headers). + ++get_combined_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> ++ mochiweb_headers:get_combined_value(K, Headers). ++ + %% @type field() = socket | scheme | method | raw_path | version | headers | peer | path | body_length | range + +-%% @spec get(field()) -> term() ++%% @spec get(field(), request()) -> term() + %% @doc Return the internal representation of the given field. If + %% socket is requested on a HTTPS connection, then + %% an ssl socket will be returned as {ssl, SslSocket}. + %% You can use SslSocket with the ssl + %% application, eg: ssl:peercert(SslSocket). +-get(socket) -> ++get(socket, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> + Socket; +-get(scheme) -> ++get(scheme, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> + case mochiweb_socket:type(Socket) of + plain -> + http; + ssl -> + https + end; +-get(method) -> ++get(method, {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}) -> + Method; +-get(raw_path) -> ++get(raw_path, {?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) -> + RawPath; +-get(version) -> ++get(version, {?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}) -> + Version; +-get(headers) -> ++get(headers, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> + Headers; +-get(peer) -> ++get(peer, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case mochiweb_socket:peername(Socket) of + {ok, {Addr={10, _, _, _}, _Port}} -> +- case get_header_value("x-forwarded-for") of ++ case get_header_value("x-forwarded-for", THIS) of + undefined -> + inet_parse:ntoa(Addr); + Hosts -> + string:strip(lists:last(string:tokens(Hosts, ","))) + end; + {ok, {{127, 0, 0, 1}, _Port}} -> +- case get_header_value("x-forwarded-for") of ++ case get_header_value("x-forwarded-for", THIS) of + undefined -> + "127.0.0.1"; + Hosts -> +@@ -100,7 +108,7 @@ + {error, enotconn} -> + exit(normal) + end; +-get(path) -> ++get(path, {?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) -> + case erlang:get(?SAVE_PATH) of + undefined -> + {Path0, _, _} = mochiweb_util:urlsplit_path(RawPath), +@@ -110,35 +118,35 @@ + Cached -> + Cached + end; +-get(body_length) -> ++get(body_length, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case erlang:get(?SAVE_BODY_LENGTH) of + undefined -> +- BodyLength = body_length(), ++ BodyLength = body_length(THIS), + put(?SAVE_BODY_LENGTH, {cached, BodyLength}), + BodyLength; + {cached, Cached} -> + Cached + end; +-get(range) -> +- case get_header_value(range) of ++get(range, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ case get_header_value(range, THIS) of + undefined -> + undefined; + RawRange -> + mochiweb_http:parse_range_request(RawRange) + end. + +-%% @spec dump() -> {mochiweb_request, [{atom(), term()}]} ++%% @spec dump(request()) -> {mochiweb_request, [{atom(), term()}]} + %% @doc Dump the internal representation to a "human readable" set of terms + %% for debugging/inspection purposes. +-dump() -> ++dump({?MODULE, [_Socket, Method, RawPath, Version, Headers]}) -> + {?MODULE, [{method, Method}, + {version, Version}, + {raw_path, RawPath}, + {headers, mochiweb_headers:to_list(Headers)}]}. + +-%% @spec send(iodata()) -> ok ++%% @spec send(iodata(), request()) -> ok + %% @doc Send data over the socket. +-send(Data) -> ++send(Data, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> + case mochiweb_socket:send(Socket, Data) of + ok -> + ok; +@@ -146,16 +154,16 @@ + exit(normal) + end. + +-%% @spec recv(integer()) -> binary() ++%% @spec recv(integer(), request()) -> binary() + %% @doc Receive Length bytes from the client as a binary, with the default + %% idle timeout. +-recv(Length) -> +- recv(Length, ?IDLE_TIMEOUT). ++recv(Length, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ recv(Length, ?IDLE_TIMEOUT, THIS). + +-%% @spec recv(integer(), integer()) -> binary() ++%% @spec recv(integer(), integer(), request()) -> binary() + %% @doc Receive Length bytes from the client as a binary, with the given + %% Timeout in msec. +-recv(Length, Timeout) -> ++recv(Length, Timeout, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> + case mochiweb_socket:recv(Socket, Length, Timeout) of + {ok, Data} -> + put(?SAVE_RECV, true), +@@ -164,12 +172,12 @@ + exit(normal) + end. + +-%% @spec body_length() -> undefined | chunked | unknown_transfer_encoding | integer() ++%% @spec body_length(request()) -> undefined | chunked | unknown_transfer_encoding | integer() + %% @doc Infer body length from transfer-encoding and content-length headers. +-body_length() -> +- case get_header_value("transfer-encoding") of ++body_length({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ case get_header_value("transfer-encoding", THIS) of + undefined -> +- case get_header_value("content-length") of ++ case get_combined_header_value("content-length", THIS) of + undefined -> + undefined; + Length -> +@@ -182,16 +190,16 @@ + end. + + +-%% @spec recv_body() -> binary() ++%% @spec recv_body(request()) -> binary() + %% @doc Receive the body of the HTTP request (defined by Content-Length). + %% Will only receive up to the default max-body length of 1MB. +-recv_body() -> +- recv_body(?MAX_RECV_BODY). ++recv_body({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ recv_body(?MAX_RECV_BODY, THIS). + +-%% @spec recv_body(integer()) -> binary() ++%% @spec recv_body(integer(), request()) -> binary() + %% @doc Receive the body of the HTTP request (defined by Content-Length). + %% Will receive up to MaxBody bytes. +-recv_body(MaxBody) -> ++recv_body(MaxBody, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case erlang:get(?SAVE_BODY) of + undefined -> + % we could use a sane constant for max chunk size +@@ -205,17 +213,18 @@ + true -> + {NewLength, [Bin | BinAcc]} + end +- end, {0, []}, MaxBody), ++ end, {0, []}, MaxBody, THIS), + put(?SAVE_BODY, Body), + Body; + Cached -> Cached + end. + +-stream_body(MaxChunkSize, ChunkFun, FunState) -> +- stream_body(MaxChunkSize, ChunkFun, FunState, undefined). ++stream_body(MaxChunkSize, ChunkFun, FunState, {?MODULE,[_Socket,_Method,_RawPath,_Version,_Headers]}=THIS) -> ++ stream_body(MaxChunkSize, ChunkFun, FunState, undefined, THIS). + +-stream_body(MaxChunkSize, ChunkFun, FunState, MaxBodyLength) -> +- Expect = case get_header_value("expect") of ++stream_body(MaxChunkSize, ChunkFun, FunState, MaxBodyLength, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ Expect = case get_header_value("expect", THIS) of + undefined -> + undefined; + Value when is_list(Value) -> +@@ -223,11 +232,12 @@ + end, + case Expect of + "100-continue" -> +- start_raw_response({100, gb_trees:empty()}); ++ _ = start_raw_response({100, gb_trees:empty()}, THIS), ++ ok; + _Else -> + ok + end, +- case body_length() of ++ case body_length(THIS) of + undefined -> + undefined; + {unknown_transfer_encoding, Unknown} -> +@@ -236,7 +246,7 @@ + % In this case the MaxBody is actually used to + % determine the maximum allowed size of a single + % chunk. +- stream_chunked_body(MaxChunkSize, ChunkFun, FunState); ++ stream_chunked_body(MaxChunkSize, ChunkFun, FunState, THIS); + 0 -> + <<>>; + Length when is_integer(Length) -> +@@ -244,62 +254,64 @@ + MaxBodyLength when is_integer(MaxBodyLength), MaxBodyLength < Length -> + exit({body_too_large, content_length}); + _ -> +- stream_unchunked_body(Length, ChunkFun, FunState) +- end; +- Length -> +- exit({length_not_integer, Length}) ++ stream_unchunked_body(Length, ChunkFun, FunState, THIS) ++ end + end. + + +-%% @spec start_response({integer(), ioheaders()}) -> response() ++%% @spec start_response({integer(), ioheaders()}, request()) -> response() + %% @doc Start the HTTP response by sending the Code HTTP response and + %% ResponseHeaders. The server will set header defaults such as Server + %% and Date if not present in ResponseHeaders. +-start_response({Code, ResponseHeaders}) -> ++start_response({Code, ResponseHeaders}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + HResponse = mochiweb_headers:make(ResponseHeaders), + HResponse1 = mochiweb_headers:default_from_list(server_headers(), + HResponse), +- start_raw_response({Code, HResponse1}). ++ start_raw_response({Code, HResponse1}, THIS). + +-%% @spec start_raw_response({integer(), headers()}) -> response() ++%% @spec start_raw_response({integer(), headers()}, request()) -> response() + %% @doc Start the HTTP response by sending the Code HTTP response and + %% ResponseHeaders. +-start_raw_response({Code, ResponseHeaders}) -> ++start_raw_response({Code, ResponseHeaders}, {?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}=THIS) -> + F = fun ({K, V}, Acc) -> + [mochiweb_util:make_io(K), <<": ">>, V, <<"\r\n">> | Acc] + end, + End = lists:foldl(F, [<<"\r\n">>], + mochiweb_headers:to_list(ResponseHeaders)), +- send([make_version(Version), make_code(Code), <<"\r\n">> | End]), ++ send([make_version(Version), make_code(Code), <<"\r\n">> | End], THIS), + mochiweb:new_response({THIS, Code, ResponseHeaders}). + + +-%% @spec start_response_length({integer(), ioheaders(), integer()}) -> response() ++%% @spec start_response_length({integer(), ioheaders(), integer()}, request()) -> response() + %% @doc Start the HTTP response by sending the Code HTTP response and + %% ResponseHeaders including a Content-Length of Length. The server + %% will set header defaults such as Server + %% and Date if not present in ResponseHeaders. +-start_response_length({Code, ResponseHeaders, Length}) -> ++start_response_length({Code, ResponseHeaders, Length}, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + HResponse = mochiweb_headers:make(ResponseHeaders), + HResponse1 = mochiweb_headers:enter("Content-Length", Length, HResponse), +- start_response({Code, HResponse1}). ++ start_response({Code, HResponse1}, THIS). + +-%% @spec respond({integer(), ioheaders(), iodata() | chunked | {file, IoDevice}}) -> response() ++%% @spec respond({integer(), ioheaders(), iodata() | chunked | {file, IoDevice}}, request()) -> response() + %% @doc Start the HTTP response with start_response, and send Body to the + %% client (if the get(method) /= 'HEAD'). The Content-Length header + %% will be set by the Body length, and the server will insert header + %% defaults. +-respond({Code, ResponseHeaders, {file, IoDevice}}) -> ++respond({Code, ResponseHeaders, {file, IoDevice}}, ++ {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}=THIS) -> + Length = mochiweb_io:iodevice_size(IoDevice), +- Response = start_response_length({Code, ResponseHeaders, Length}), ++ Response = start_response_length({Code, ResponseHeaders, Length}, THIS), + case Method of + 'HEAD' -> + ok; + _ -> +- mochiweb_io:iodevice_stream(fun send/1, IoDevice) ++ mochiweb_io:iodevice_stream( ++ fun (Body) -> send(Body, THIS) end, ++ IoDevice) + end, + Response; +-respond({Code, ResponseHeaders, chunked}) -> ++respond({Code, ResponseHeaders, chunked}, {?MODULE, [_Socket, Method, _RawPath, Version, _Headers]}=THIS) -> + HResponse = mochiweb_headers:make(ResponseHeaders), + HResponse1 = case Method of + 'HEAD' -> +@@ -320,35 +332,35 @@ + put(?SAVE_FORCE_CLOSE, true), + HResponse + end, +- start_response({Code, HResponse1}); +-respond({Code, ResponseHeaders, Body}) -> +- Response = start_response_length({Code, ResponseHeaders, iolist_size(Body)}), ++ start_response({Code, HResponse1}, THIS); ++respond({Code, ResponseHeaders, Body}, {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}=THIS) -> ++ Response = start_response_length({Code, ResponseHeaders, iolist_size(Body)}, THIS), + case Method of + 'HEAD' -> + ok; + _ -> +- send(Body) ++ send(Body, THIS) + end, + Response. + +-%% @spec not_found() -> response() ++%% @spec not_found(request()) -> response() + %% @doc Alias for not_found([]). +-not_found() -> +- not_found([]). ++not_found({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ not_found([], THIS). + +-%% @spec not_found(ExtraHeaders) -> response() ++%% @spec not_found(ExtraHeaders, request()) -> response() + %% @doc Alias for respond({404, [{"Content-Type", "text/plain"} + %% | ExtraHeaders], <<"Not found.">>}). +-not_found(ExtraHeaders) -> ++not_found(ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + respond({404, [{"Content-Type", "text/plain"} | ExtraHeaders], +- <<"Not found.">>}). ++ <<"Not found.">>}, THIS). + +-%% @spec ok({value(), iodata()} | {value(), ioheaders(), iodata() | {file, IoDevice}}) -> ++%% @spec ok({value(), iodata()} | {value(), ioheaders(), iodata() | {file, IoDevice}}, request()) -> + %% response() + %% @doc respond({200, [{"Content-Type", ContentType} | Headers], Body}). +-ok({ContentType, Body}) -> +- ok({ContentType, [], Body}); +-ok({ContentType, ResponseHeaders, Body}) -> ++ok({ContentType, Body}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ ok({ContentType, [], Body}, THIS); ++ok({ContentType, ResponseHeaders, Body}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + HResponse = mochiweb_headers:make(ResponseHeaders), + case THIS:get(range) of + X when (X =:= undefined orelse X =:= fail) orelse Body =:= chunked -> +@@ -357,7 +369,7 @@ + %% full response. + HResponse1 = mochiweb_headers:enter("Content-Type", ContentType, + HResponse), +- respond({200, HResponse1, Body}); ++ respond({200, HResponse1, Body}, THIS); + Ranges -> + {PartList, Size} = range_parts(Body, Ranges), + case PartList of +@@ -366,7 +378,7 @@ + ContentType, + HResponse), + %% could be 416, for now we'll just return 200 +- respond({200, HResponse1, Body}); ++ respond({200, HResponse1, Body}, THIS); + PartList -> + {RangeHeaders, RangeBody} = + mochiweb_multipart:parts_to_body(PartList, ContentType, Size), +@@ -374,46 +386,50 @@ + [{"Accept-Ranges", "bytes"} | + RangeHeaders], + HResponse), +- respond({206, HResponse1, RangeBody}) ++ respond({206, HResponse1, RangeBody}, THIS) + end + end. + +-%% @spec should_close() -> bool() ++%% @spec should_close(request()) -> bool() + %% @doc Return true if the connection must be closed. If false, using + %% Keep-Alive should be safe. +-should_close() -> ++should_close({?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}=THIS) -> + ForceClose = erlang:get(?SAVE_FORCE_CLOSE) =/= undefined, + DidNotRecv = erlang:get(?SAVE_RECV) =:= undefined, + ForceClose orelse Version < {1, 0} + %% Connection: close +- orelse get_header_value("connection") =:= "close" ++ orelse is_close(get_header_value("connection", THIS)) + %% HTTP 1.0 requires Connection: Keep-Alive + orelse (Version =:= {1, 0} +- andalso get_header_value("connection") =/= "Keep-Alive") ++ andalso get_header_value("connection", THIS) =/= "Keep-Alive") + %% unread data left on the socket, can't safely continue + orelse (DidNotRecv +- andalso get_header_value("content-length") =/= undefined +- andalso list_to_integer(get_header_value("content-length")) > 0) ++ andalso get_combined_header_value("content-length", THIS) =/= undefined ++ andalso list_to_integer(get_combined_header_value("content-length", THIS)) > 0) + orelse (DidNotRecv +- andalso get_header_value("transfer-encoding") =:= "chunked"). ++ andalso get_header_value("transfer-encoding", THIS) =:= "chunked"). ++ ++is_close("close") -> ++ true; ++is_close(S=[_C, _L, _O, _S, _E]) -> ++ string:to_lower(S) =:= "close"; ++is_close(_) -> ++ false. + +-%% @spec cleanup() -> ok ++%% @spec cleanup(request()) -> ok + %% @doc Clean up any junk in the process dictionary, required before continuing + %% a Keep-Alive request. +-cleanup() -> +- [erase(K) || K <- [?SAVE_QS, +- ?SAVE_PATH, +- ?SAVE_RECV, +- ?SAVE_BODY, +- ?SAVE_BODY_LENGTH, +- ?SAVE_POST, +- ?SAVE_COOKIE, +- ?SAVE_FORCE_CLOSE]], ++cleanup({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}) -> ++ L = [?SAVE_QS, ?SAVE_PATH, ?SAVE_RECV, ?SAVE_BODY, ?SAVE_BODY_LENGTH, ++ ?SAVE_POST, ?SAVE_COOKIE, ?SAVE_FORCE_CLOSE], ++ lists:foreach(fun(K) -> ++ erase(K) ++ end, L), + ok. + +-%% @spec parse_qs() -> [{Key::string(), Value::string()}] ++%% @spec parse_qs(request()) -> [{Key::string(), Value::string()}] + %% @doc Parse the query string of the URL. +-parse_qs() -> ++parse_qs({?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) -> + case erlang:get(?SAVE_QS) of + undefined -> + {_, QueryString, _} = mochiweb_util:urlsplit_path(RawPath), +@@ -424,17 +440,17 @@ + Cached + end. + +-%% @spec get_cookie_value(Key::string) -> string() | undefined ++%% @spec get_cookie_value(Key::string, request()) -> string() | undefined + %% @doc Get the value of the given cookie. +-get_cookie_value(Key) -> +- proplists:get_value(Key, parse_cookie()). ++get_cookie_value(Key, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ proplists:get_value(Key, parse_cookie(THIS)). + +-%% @spec parse_cookie() -> [{Key::string(), Value::string()}] ++%% @spec parse_cookie(request()) -> [{Key::string(), Value::string()}] + %% @doc Parse the cookie header. +-parse_cookie() -> ++parse_cookie({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case erlang:get(?SAVE_COOKIE) of + undefined -> +- Cookies = case get_header_value("cookie") of ++ Cookies = case get_header_value("cookie", THIS) of + undefined -> + []; + Value -> +@@ -446,17 +462,17 @@ + Cached + end. + +-%% @spec parse_post() -> [{Key::string(), Value::string()}] ++%% @spec parse_post(request()) -> [{Key::string(), Value::string()}] + %% @doc Parse an application/x-www-form-urlencoded form POST. This + %% has the side-effect of calling recv_body(). +-parse_post() -> ++parse_post({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case erlang:get(?SAVE_POST) of + undefined -> +- Parsed = case recv_body() of ++ Parsed = case recv_body(THIS) of + undefined -> + []; + Binary -> +- case get_primary_header_value("content-type") of ++ case get_primary_header_value("content-type",THIS) of + "application/x-www-form-urlencoded" ++ _ -> + mochiweb_util:parse_qs(Binary); + _ -> +@@ -469,41 +485,43 @@ + Cached + end. + +-%% @spec stream_chunked_body(integer(), fun(), term()) -> term() ++%% @spec stream_chunked_body(integer(), fun(), term(), request()) -> term() + %% @doc The function is called for each chunk. + %% Used internally by read_chunked_body. +-stream_chunked_body(MaxChunkSize, Fun, FunState) -> +- case read_chunk_length() of ++stream_chunked_body(MaxChunkSize, Fun, FunState, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ case read_chunk_length(THIS) of + 0 -> +- Fun({0, read_chunk(0)}, FunState); ++ Fun({0, read_chunk(0, THIS)}, FunState); + Length when Length > MaxChunkSize -> +- NewState = read_sub_chunks(Length, MaxChunkSize, Fun, FunState), +- stream_chunked_body(MaxChunkSize, Fun, NewState); ++ NewState = read_sub_chunks(Length, MaxChunkSize, Fun, FunState, THIS), ++ stream_chunked_body(MaxChunkSize, Fun, NewState, THIS); + Length -> +- NewState = Fun({Length, read_chunk(Length)}, FunState), +- stream_chunked_body(MaxChunkSize, Fun, NewState) ++ NewState = Fun({Length, read_chunk(Length, THIS)}, FunState), ++ stream_chunked_body(MaxChunkSize, Fun, NewState, THIS) + end. + +-stream_unchunked_body(0, Fun, FunState) -> ++stream_unchunked_body(0, Fun, FunState, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}) -> + Fun({0, <<>>}, FunState); +-stream_unchunked_body(Length, Fun, FunState) when Length > 0 -> ++stream_unchunked_body(Length, Fun, FunState, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) when Length > 0 -> + PktSize = case Length > ?RECBUF_SIZE of + true -> + ?RECBUF_SIZE; + false -> + Length + end, +- Bin = recv(PktSize), ++ Bin = recv(PktSize, THIS), + NewState = Fun({PktSize, Bin}, FunState), +- stream_unchunked_body(Length - PktSize, Fun, NewState). ++ stream_unchunked_body(Length - PktSize, Fun, NewState, THIS). + +-%% @spec read_chunk_length() -> integer() ++%% @spec read_chunk_length(request()) -> integer() + %% @doc Read the length of the next HTTP chunk. +-read_chunk_length() -> +- mochiweb_socket:setopts(Socket, [{packet, line}]), ++read_chunk_length({?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> ++ ok = mochiweb_socket:setopts(Socket, [{packet, line}]), + case mochiweb_socket:recv(Socket, 0, ?IDLE_TIMEOUT) of + {ok, Header} -> +- mochiweb_socket:setopts(Socket, [{packet, raw}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), + Splitter = fun (C) -> + C =/= $\r andalso C =/= $\n andalso C =/= $ + end, +@@ -513,11 +531,11 @@ + exit(normal) + end. + +-%% @spec read_chunk(integer()) -> Chunk::binary() | [Footer::binary()] ++%% @spec read_chunk(integer(), request()) -> Chunk::binary() | [Footer::binary()] + %% @doc Read in a HTTP chunk of the given length. If Length is 0, then read the + %% HTTP footers (as a list of binaries, since they're nominal). +-read_chunk(0) -> +- mochiweb_socket:setopts(Socket, [{packet, line}]), ++read_chunk(0, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> ++ ok = mochiweb_socket:setopts(Socket, [{packet, line}]), + F = fun (F1, Acc) -> + case mochiweb_socket:recv(Socket, 0, ?IDLE_TIMEOUT) of + {ok, <<"\r\n">>} -> +@@ -529,10 +547,10 @@ + end + end, + Footers = F(F, []), +- mochiweb_socket:setopts(Socket, [{packet, raw}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), + put(?SAVE_RECV, true), + Footers; +-read_chunk(Length) -> ++read_chunk(Length, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> + case mochiweb_socket:recv(Socket, 2 + Length, ?IDLE_TIMEOUT) of + {ok, <>} -> + Chunk; +@@ -540,32 +558,34 @@ + exit(normal) + end. + +-read_sub_chunks(Length, MaxChunkSize, Fun, FunState) when Length > MaxChunkSize -> +- Bin = recv(MaxChunkSize), ++read_sub_chunks(Length, MaxChunkSize, Fun, FunState, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) when Length > MaxChunkSize -> ++ Bin = recv(MaxChunkSize, THIS), + NewState = Fun({size(Bin), Bin}, FunState), +- read_sub_chunks(Length - MaxChunkSize, MaxChunkSize, Fun, NewState); ++ read_sub_chunks(Length - MaxChunkSize, MaxChunkSize, Fun, NewState, THIS); + +-read_sub_chunks(Length, _MaxChunkSize, Fun, FunState) -> +- Fun({Length, read_chunk(Length)}, FunState). ++read_sub_chunks(Length, _MaxChunkSize, Fun, FunState, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ Fun({Length, read_chunk(Length, THIS)}, FunState). + +-%% @spec serve_file(Path, DocRoot) -> Response ++%% @spec serve_file(Path, DocRoot, request()) -> Response + %% @doc Serve a file relative to DocRoot. +-serve_file(Path, DocRoot) -> +- serve_file(Path, DocRoot, []). ++serve_file(Path, DocRoot, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ serve_file(Path, DocRoot, [], THIS). + +-%% @spec serve_file(Path, DocRoot, ExtraHeaders) -> Response ++%% @spec serve_file(Path, DocRoot, ExtraHeaders, request()) -> Response + %% @doc Serve a file relative to DocRoot. +-serve_file(Path, DocRoot, ExtraHeaders) -> ++serve_file(Path, DocRoot, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case mochiweb_util:safe_relative_path(Path) of + undefined -> +- not_found(ExtraHeaders); ++ not_found(ExtraHeaders, THIS); + RelPath -> + FullPath = filename:join([DocRoot, RelPath]), + case filelib:is_dir(FullPath) of + true -> +- maybe_redirect(RelPath, FullPath, ExtraHeaders); ++ maybe_redirect(RelPath, FullPath, ExtraHeaders, THIS); + false -> +- maybe_serve_file(FullPath, ExtraHeaders) ++ maybe_serve_file(FullPath, ExtraHeaders, THIS) + end + end. + +@@ -575,13 +595,14 @@ + directory_index(FullPath) -> + filename:join([FullPath, "index.html"]). + +-maybe_redirect([], FullPath, ExtraHeaders) -> +- maybe_serve_file(directory_index(FullPath), ExtraHeaders); ++maybe_redirect([], FullPath, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ maybe_serve_file(directory_index(FullPath), ExtraHeaders, THIS); + +-maybe_redirect(RelPath, FullPath, ExtraHeaders) -> ++maybe_redirect(RelPath, FullPath, ExtraHeaders, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}=THIS) -> + case string:right(RelPath, 1) of + "/" -> +- maybe_serve_file(directory_index(FullPath), ExtraHeaders); ++ maybe_serve_file(directory_index(FullPath), ExtraHeaders, THIS); + _ -> + Host = mochiweb_headers:get_value("host", Headers), + Location = "http://" ++ Host ++ "/" ++ RelPath ++ "/", +@@ -596,16 +617,16 @@ + "

The document has moved >, + Bottom = <<">here.

\n">>, + Body = <>, +- respond({301, MoreHeaders, Body}) ++ respond({301, MoreHeaders, Body}, THIS) + end. + +-maybe_serve_file(File, ExtraHeaders) -> ++maybe_serve_file(File, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case file:read_file_info(File) of + {ok, FileInfo} -> + LastModified = httpd_util:rfc1123_date(FileInfo#file_info.mtime), +- case get_header_value("if-modified-since") of ++ case get_header_value("if-modified-since", THIS) of + LastModified -> +- respond({304, ExtraHeaders, ""}); ++ respond({304, ExtraHeaders, ""}, THIS); + _ -> + case file:open(File, [raw, binary]) of + {ok, IoDevice} -> +@@ -613,15 +634,15 @@ + Res = ok({ContentType, + [{"last-modified", LastModified} + | ExtraHeaders], +- {file, IoDevice}}), +- file:close(IoDevice), ++ {file, IoDevice}}, THIS), ++ ok = file:close(IoDevice), + Res; + _ -> +- not_found(ExtraHeaders) ++ not_found(ExtraHeaders, THIS) + end + end; + {error, _} -> +- not_found(ExtraHeaders) ++ not_found(ExtraHeaders, THIS) + end. + + server_headers() -> +@@ -669,7 +690,7 @@ + end, + {lists:foldr(F, [], Ranges), Size}. + +-%% @spec accepted_encodings([encoding()]) -> [encoding()] | bad_accept_encoding_value ++%% @spec accepted_encodings([encoding()], request()) -> [encoding()] | bad_accept_encoding_value + %% @type encoding() = string(). + %% + %% @doc Returns a list of encodings accepted by a request. Encodings that are +@@ -693,8 +714,8 @@ + %% accepted_encodings(["gzip", "deflate", "identity"]) -> + %% ["deflate", "gzip", "identity"] + %% +-accepted_encodings(SupportedEncodings) -> +- AcceptEncodingHeader = case get_header_value("Accept-Encoding") of ++accepted_encodings(SupportedEncodings, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ AcceptEncodingHeader = case get_header_value("Accept-Encoding", THIS) of + undefined -> + ""; + Value -> +@@ -709,7 +730,7 @@ + ) + end. + +-%% @spec accepts_content_type(string() | binary()) -> boolean() | bad_accept_header ++%% @spec accepts_content_type(string() | binary(), request()) -> boolean() | bad_accept_header + %% + %% @doc Determines whether a request accepts a given media type by analyzing its + %% "Accept" header. +@@ -731,16 +752,9 @@ + %% 5) For an "Accept" header with value "text/*; q=0.0, */*": + %% accepts_content_type("text/plain") -> false + %% +-accepts_content_type(ContentType) when is_binary(ContentType) -> +- accepts_content_type(binary_to_list(ContentType)); +-accepts_content_type(ContentType1) -> ++accepts_content_type(ContentType1, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + ContentType = re:replace(ContentType1, "\\s", "", [global, {return, list}]), +- AcceptHeader = case get_header_value("Accept") of +- undefined -> +- "*/*"; +- Value -> +- Value +- end, ++ AcceptHeader = accept_header(THIS), + case mochiweb_util:parse_qvalues(AcceptHeader) of + invalid_qvalue_string -> + bad_accept_header; +@@ -761,9 +775,83 @@ + (not lists:member({SuperType, 0.0}, QList)) + end. + ++%% @spec accepted_content_types([string() | binary()], request()) -> [string()] | bad_accept_header ++%% ++%% @doc Filters which of the given media types this request accepts. This filtering ++%% is performed by analyzing the "Accept" header. The returned list is sorted ++%% according to the preferences specified in the "Accept" header (higher Q values ++%% first). If two or more types have the same preference (Q value), they're order ++%% in the returned list is the same as they're order in the input list. ++%% ++%% Examples ++%% ++%% 1) For a missing "Accept" header: ++%% accepted_content_types(["text/html", "application/json"]) -> ++%% ["text/html", "application/json"] ++%% ++%% 2) For an "Accept" header with value "text/html, application/*": ++%% accepted_content_types(["application/json", "text/html"]) -> ++%% ["application/json", "text/html"] ++%% ++%% 3) For an "Accept" header with value "text/html, */*; q=0.0": ++%% accepted_content_types(["text/html", "application/json"]) -> ++%% ["text/html"] ++%% ++%% 4) For an "Accept" header with value "text/html; q=0.5, */*; q=0.1": ++%% accepts_content_types(["application/json", "text/html"]) -> ++%% ["text/html", "application/json"] ++%% ++accepted_content_types(Types1, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ Types = lists:map( ++ fun(T) -> re:replace(T, "\\s", "", [global, {return, list}]) end, ++ Types1), ++ AcceptHeader = accept_header(THIS), ++ case mochiweb_util:parse_qvalues(AcceptHeader) of ++ invalid_qvalue_string -> ++ bad_accept_header; ++ QList -> ++ TypesQ = lists:foldr( ++ fun(T, Acc) -> ++ case proplists:get_value(T, QList) of ++ undefined -> ++ [MainType, _SubType] = string:tokens(T, "/"), ++ case proplists:get_value(MainType ++ "/*", QList) of ++ undefined -> ++ case proplists:get_value("*/*", QList) of ++ Q when is_float(Q), Q > 0.0 -> ++ [{Q, T} | Acc]; ++ _ -> ++ Acc ++ end; ++ Q when Q > 0.0 -> ++ [{Q, T} | Acc]; ++ _ -> ++ Acc ++ end; ++ Q when Q > 0.0 -> ++ [{Q, T} | Acc]; ++ _ -> ++ Acc ++ end ++ end, ++ [], Types), ++ % Note: Stable sort. If 2 types have the same Q value we leave them in the ++ % same order as in the input list. ++ SortFun = fun({Q1, _}, {Q2, _}) -> Q1 >= Q2 end, ++ [Type || {_Q, Type} <- lists:sort(SortFun, TypesQ)] ++ end. ++ ++accept_header({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ case get_header_value("Accept", THIS) of ++ undefined -> ++ "*/*"; ++ Value -> ++ Value ++ end. ++ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_request_tests.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request_tests.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_request_tests.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request_tests.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -1,12 +1,13 @@ + -module(mochiweb_request_tests). + +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + accepts_content_type_test() -> + Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, + mochiweb_headers:make([{"Accept", "multipart/related"}])), + ?assertEqual(true, Req1:accepts_content_type("multipart/related")), ++ ?assertEqual(true, Req1:accepts_content_type(<<"multipart/related">>)), + + Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, + mochiweb_headers:make([{"Accept", "text/html"}])), +@@ -60,4 +61,122 @@ + mochiweb_headers:make([{"Accept", "text/html;level=1;q=0.1, text/html"}])), + ?assertEqual(true, Req14:accepts_content_type("text/html; level=1")). + ++accepted_encodings_test() -> ++ Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([])), ++ ?assertEqual(["identity"], ++ Req1:accepted_encodings(["gzip", "identity"])), ++ ++ Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "gzip, deflate"}])), ++ ?assertEqual(["gzip", "identity"], ++ Req2:accepted_encodings(["gzip", "identity"])), ++ ++ Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "gzip;q=0.5, deflate"}])), ++ ?assertEqual(["deflate", "gzip", "identity"], ++ Req3:accepted_encodings(["gzip", "deflate", "identity"])), ++ ++ Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "identity, *;q=0"}])), ++ ?assertEqual(["identity"], ++ Req4:accepted_encodings(["gzip", "deflate", "identity"])), ++ ++ Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "gzip; q=0.1, *;q=0"}])), ++ ?assertEqual(["gzip"], ++ Req5:accepted_encodings(["gzip", "deflate", "identity"])), ++ ++ Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "gzip; q=, *;q=0"}])), ++ ?assertEqual(bad_accept_encoding_value, ++ Req6:accepted_encodings(["gzip", "deflate", "identity"])), ++ ++ Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "gzip;q=2.0, *;q=0"}])), ++ ?assertEqual(bad_accept_encoding_value, ++ Req7:accepted_encodings(["gzip", "identity"])), ++ ++ Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "deflate, *;q=0.0"}])), ++ ?assertEqual([], ++ Req8:accepted_encodings(["gzip", "identity"])). ++ ++accepted_content_types_test() -> ++ Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/html"}])), ++ ?assertEqual(["text/html"], ++ Req1:accepted_content_types(["text/html", "application/json"])), ++ ++ Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/html, */*;q=0"}])), ++ ?assertEqual(["text/html"], ++ Req2:accepted_content_types(["text/html", "application/json"])), ++ ++ Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/*, */*;q=0"}])), ++ ?assertEqual(["text/html"], ++ Req3:accepted_content_types(["text/html", "application/json"])), ++ ++ Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/*;q=0.8, */*;q=0.5"}])), ++ ?assertEqual(["text/html", "application/json"], ++ Req4:accepted_content_types(["application/json", "text/html"])), ++ ++ Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/*;q=0.8, */*;q=0.5"}])), ++ ?assertEqual(["text/html", "application/json"], ++ Req5:accepted_content_types(["text/html", "application/json"])), ++ ++ Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/*;q=0.5, */*;q=0.5"}])), ++ ?assertEqual(["application/json", "text/html"], ++ Req6:accepted_content_types(["application/json", "text/html"])), ++ ++ Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make( ++ [{"Accept", "text/html;q=0.5, application/json;q=0.5"}])), ++ ?assertEqual(["application/json", "text/html"], ++ Req7:accepted_content_types(["application/json", "text/html"])), ++ ++ Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/html"}])), ++ ?assertEqual([], ++ Req8:accepted_content_types(["application/json"])), ++ ++ Req9 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/*;q=0.9, text/html;q=0.5, */*;q=0.7"}])), ++ ?assertEqual(["application/json", "text/html"], ++ Req9:accepted_content_types(["text/html", "application/json"])). ++ ++should_close_test() -> ++ F = fun (V, H) -> ++ (mochiweb_request:new( ++ nil, 'GET', "/", V, ++ mochiweb_headers:make(H) ++ )):should_close() ++ end, ++ ?assertEqual( ++ true, ++ F({1, 1}, [{"Connection", "close"}])), ++ ?assertEqual( ++ true, ++ F({1, 0}, [{"Connection", "close"}])), ++ ?assertEqual( ++ true, ++ F({1, 1}, [{"Connection", "ClOSe"}])), ++ ?assertEqual( ++ false, ++ F({1, 1}, [{"Connection", "closer"}])), ++ ?assertEqual( ++ false, ++ F({1, 1}, [])), ++ ?assertEqual( ++ true, ++ F({1, 0}, [])), ++ ?assertEqual( ++ false, ++ F({1, 0}, [{"Connection", "Keep-Alive"}])), ++ ok. ++ + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_response.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_response.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_response.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_response.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -3,39 +3,47 @@ + + %% @doc Response abstraction. + +--module(mochiweb_response, [Request, Code, Headers]). ++-module(mochiweb_response). + -author('bob@mochimedia.com'). + + -define(QUIP, "Any of you quaids got a smint?"). + +--export([get_header_value/1, get/1, dump/0]). +--export([send/1, write_chunk/1]). ++-export([new/3, get_header_value/2, get/2, dump/1]). ++-export([send/2, write_chunk/2]). + +-%% @spec get_header_value(string() | atom() | binary()) -> string() | undefined ++%% @type response(). A mochiweb_response parameterized module instance. ++ ++%% @spec new(Request, Code, Headers) -> response() ++%% @doc Create a new mochiweb_response instance. ++new(Request, Code, Headers) -> ++ {?MODULE, [Request, Code, Headers]}. ++ ++%% @spec get_header_value(string() | atom() | binary(), response()) -> ++%% string() | undefined + %% @doc Get the value of the given response header. +-get_header_value(K) -> ++get_header_value(K, {?MODULE, [_Request, _Code, Headers]}) -> + mochiweb_headers:get_value(K, Headers). + +-%% @spec get(request | code | headers) -> term() ++%% @spec get(request | code | headers, response()) -> term() + %% @doc Return the internal representation of the given field. +-get(request) -> ++get(request, {?MODULE, [Request, _Code, _Headers]}) -> + Request; +-get(code) -> ++get(code, {?MODULE, [_Request, Code, _Headers]}) -> + Code; +-get(headers) -> ++get(headers, {?MODULE, [_Request, _Code, Headers]}) -> + Headers. + +-%% @spec dump() -> {mochiweb_request, [{atom(), term()}]} ++%% @spec dump(response()) -> {mochiweb_request, [{atom(), term()}]} + %% @doc Dump the internal representation to a "human readable" set of terms + %% for debugging/inspection purposes. +-dump() -> ++dump({?MODULE, [Request, Code, Headers]}) -> + [{request, Request:dump()}, + {code, Code}, + {headers, mochiweb_headers:to_list(Headers)}]. + +-%% @spec send(iodata()) -> ok ++%% @spec send(iodata(), response()) -> ok + %% @doc Send data over the socket if the method is not HEAD. +-send(Data) -> ++send(Data, {?MODULE, [Request, _Code, _Headers]}) -> + case Request:get(method) of + 'HEAD' -> + ok; +@@ -43,22 +51,22 @@ + Request:send(Data) + end. + +-%% @spec write_chunk(iodata()) -> ok ++%% @spec write_chunk(iodata(), response()) -> ok + %% @doc Write a chunk of a HTTP chunked response. If Data is zero length, + %% then the chunked response will be finished. +-write_chunk(Data) -> ++write_chunk(Data, {?MODULE, [Request, _Code, _Headers]}=THIS) -> + case Request:get(version) of + Version when Version >= {1, 1} -> + Length = iolist_size(Data), +- send([io_lib:format("~.16b\r\n", [Length]), Data, <<"\r\n">>]); ++ send([io_lib:format("~.16b\r\n", [Length]), Data, <<"\r\n">>], THIS); + _ -> +- send(Data) ++ send(Data, THIS) + end. + + + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_socket_server.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_socket_server.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_socket_server.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_socket_server.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -9,7 +9,7 @@ + + -include("internal.hrl"). + +--export([start/1, stop/1]). ++-export([start/1, start_link/1, stop/1]). + -export([init/1, handle_call/3, handle_cast/2, terminate/2, code_change/3, + handle_info/2]). + -export([get/2, set/3]). +@@ -33,10 +33,22 @@ + + -define(is_old_state(State), not is_record(State, mochiweb_socket_server)). + +-start(State=#mochiweb_socket_server{}) -> +- start_server(State); ++start_link(Options) -> ++ start_server(start_link, parse_options(Options)). ++ + start(Options) -> +- start(parse_options(Options)). ++ case lists:keytake(link, 1, Options) of ++ {value, {_Key, false}, Options1} -> ++ start_server(start, parse_options(Options1)); ++ _ -> ++ %% TODO: https://github.com/mochi/mochiweb/issues/58 ++ %% [X] Phase 1: Add new APIs (Sep 2011) ++ %% [_] Phase 2: Add deprecation warning ++ %% [_] Phase 3: Change default to {link, false} and ignore link ++ %% [_] Phase 4: Add deprecation warning for {link, _} option ++ %% [_] Phase 5: Remove support for {link, _} option ++ start_link(Options) ++ end. + + get(Name, Property) -> + gen_server:call(Name, {get, Property}). +@@ -61,6 +73,8 @@ + + %% Internal API + ++parse_options(State=#mochiweb_socket_server{}) -> ++ State; + parse_options(Options) -> + parse_options(Options, #mochiweb_socket_server{}). + +@@ -116,22 +130,22 @@ + parse_options(Rest, State#mochiweb_socket_server{profile_fun=ProfileFun}). + + +-start_server(State=#mochiweb_socket_server{ssl=Ssl, name=Name}) -> +- case Ssl of +- true -> +- application:start(crypto), +- application:start(public_key), +- application:start(ssl); +- false -> +- void +- end, ++start_server(F, State=#mochiweb_socket_server{ssl=Ssl, name=Name}) -> ++ ok = prep_ssl(Ssl), + case Name of + undefined -> +- gen_server:start_link(?MODULE, State, []); ++ gen_server:F(?MODULE, State, []); + _ -> +- gen_server:start_link(Name, ?MODULE, State, []) ++ gen_server:F(Name, ?MODULE, State, []) + end. + ++prep_ssl(true) -> ++ ok = mochiweb:ensure_started(crypto), ++ ok = mochiweb:ensure_started(public_key), ++ ok = mochiweb:ensure_started(ssl); ++prep_ssl(false) -> ++ ok. ++ + ensure_int(N) when is_integer(N) -> + N; + ensure_int(S) when is_list(S) -> +@@ -165,27 +179,7 @@ + {_, _, _, _, _, _, _, _} -> % IPv6 + [inet6, {ip, Ip} | BaseOpts] + end, +- case listen(Port, Opts, State) of +- {stop, eacces} -> +- case Port < 1024 of +- true -> +- case catch fdsrv:start() of +- {ok, _} -> +- case fdsrv:bind_socket(tcp, Port) of +- {ok, Fd} -> +- listen(Port, [{fd, Fd} | Opts], State); +- _ -> +- {stop, fdsrv_bind_failed} +- end; +- _ -> +- {stop, fdsrv_start_failed} +- end; +- false -> +- {stop, eacces} +- end; +- Other -> +- Other +- end. ++ listen(Port, Opts, State). + + new_acceptor_pool(Listen, + State=#mochiweb_socket_server{acceptor_pool=Pool, +@@ -271,15 +265,8 @@ + + terminate(Reason, State) when ?is_old_state(State) -> + terminate(Reason, upgrade_state(State)); +-terminate(_Reason, #mochiweb_socket_server{listen=Listen, port=Port}) -> +- mochiweb_socket:close(Listen), +- case Port < 1024 of +- true -> +- catch fdsrv:stop(), +- ok; +- false -> +- ok +- end. ++terminate(_Reason, #mochiweb_socket_server{listen=Listen}) -> ++ mochiweb_socket:close(Listen). + + code_change(_OldVsn, State, _Extra) -> + State. +@@ -337,8 +324,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + upgrade_state_test() -> + OldState = {mochiweb_socket_server, +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_util.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_util.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_util.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_util.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -9,7 +9,7 @@ + -export([path_split/1]). + -export([urlsplit/1, urlsplit_path/1, urlunsplit/1, urlunsplit_path/1]). + -export([guess_mime/1, parse_header/1]). +--export([shell_quote/1, cmd/1, cmd_string/1, cmd_port/2, cmd_status/1]). ++-export([shell_quote/1, cmd/1, cmd_string/1, cmd_port/2, cmd_status/1, cmd_status/2]). + -export([record_to_proplist/2, record_to_proplist/3]). + -export([safe_relative_path/1, partition/2]). + -export([parse_qvalues/1, pick_accepted_encodings/3]). +@@ -124,11 +124,17 @@ + string:join([shell_quote(X) || X <- Argv], " "). + + %% @spec cmd_status([string()]) -> {ExitStatus::integer(), Stdout::binary()} +-%% @doc Accumulate the output and exit status from the given application, will be +-%% spawned with cmd_port/2. ++%% @doc Accumulate the output and exit status from the given application, ++%% will be spawned with cmd_port/2. + cmd_status(Argv) -> ++ cmd_status(Argv, []). ++ ++%% @spec cmd_status([string()], [atom()]) -> {ExitStatus::integer(), Stdout::binary()} ++%% @doc Accumulate the output and exit status from the given application, ++%% will be spawned with cmd_port/2. ++cmd_status(Argv, Options) -> + Port = cmd_port(Argv, [exit_status, stderr_to_stdout, +- use_stdio, binary]), ++ use_stdio, binary | Options]), + try cmd_loop(Port, []) + after catch port_close(Port) + end. +@@ -578,8 +584,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + make_io_test() -> + ?assertEqual( +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/reloader.erl apache-couchdb-1.2.1.q/src/mochiweb/reloader.erl +--- apache-couchdb-1.2.1/src/mochiweb/reloader.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/reloader.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -59,7 +59,7 @@ + %% @doc gen_server callback. + handle_info(doit, State) -> + Now = stamp(), +- doit(State#state.last, Now), ++ _ = doit(State#state.last, Now), + {noreply, State#state{last = Now}}; + handle_info(_Info, State) -> + {noreply, State}. +@@ -156,6 +156,6 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD index d34757355..fc79acfde 100644 --- a/community/drbd/PKGBUILD +++ b/community/drbd/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 83703 2013-02-04 14:42:03Z seblu $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 86842 2013-03-22 19:15:09Z seblu $ +# Maintainer: Sébastien Luttringer pkgname=drbd -pkgver=8.3.13 -pkgrel=2 +pkgver=8.4.2 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Userland tools for Distributed Replicated Block Device' url='http://www.drbd.org' license=('GPL2') depends=('perl' 'bash') -source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz" +source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz" "$pkgname.service") backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') -md5sums=('760a25459ef6b7262a2a3572c1561c5b' +md5sums=('b081f1046adda1d51ba351c40a8b1107' 'afbb345094db49b0a474c0b4e51c0acd') build() { cd $pkgname-$pkgver + # fix hardcoded path in udev rules + sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' scripts/drbd.rules ./configure \ --prefix=/usr \ --localstatedir=/var \ @@ -30,8 +32,7 @@ build() { --without-pacemaker \ --without-heartbeat \ --without-xen \ - --with-initdir=/etc/rc.d - #--with-legacy_utils \ + --without-legacy_utils make } @@ -42,8 +43,6 @@ package() { cd "$pkgdir" mv sbin/* usr/sbin rmdir sbin - # fix hardcoded path in udev rules - sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules # move udev files mv etc/udev usr/lib # move bash completion @@ -51,6 +50,8 @@ package() { mv etc/bash_completion.d usr/share/bash-completion/completions # remove /var/lock rmdir var/lock + # remove embeded init stuff + rm -r etc/init.d # autoload module install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf diff --git a/community/gens-gs/PKGBUILD b/community/gens-gs/PKGBUILD new file mode 100755 index 000000000..27ebfa3e6 --- /dev/null +++ b/community/gens-gs/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 86824 2013-03-22 13:05:22Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: trya +# Contributor: Yvan + +pkgname=gens-gs +pkgver=2.16.7 +pkgrel=2 +pkgdesc="An emulator of Sega Genesis, Sega CD and 32X, combining features from various forks of Gens" +arch=('i686' 'x86_64') +url="http://segaretro.org/Gens/GS" +license=('GPL') +if [[ $CARCH == "x86_64" ]]; then + makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-sdl' 'nasm') + optdepends=('lib32-alsa-plugins: Sound support for PulseAudio' + 'lib32-libpulse: Sound support for PulseAudio') +else + depends=('gtk2' 'sdl') + makedepends=('nasm') +fi +conflicts=('gens') +options=('!libtool') +source=('http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz' + 'gens-gtk.patch') +sha256sums=('6320cd7bee85472891e1e29b21731d2c8180d04db67ee21256491f3f9ad145c1' + '29b1e9755b34e00ef7d19bdc527dc4f841400a0022c81ee71c331be4a76a6c1c') + +build() { + cd "${srcdir}"/${pkgname}-r7 + +# Patch + patch -Np1 -i ../gens-gtk.patch + +# Multilib + if [[ $CARCH == "x86_64" ]]; then + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + +# Build + if [[ $CARCH == "x86_64" ]]; then + ./configure --host=i686-unknown-linux-gnu --prefix=/usr --libdir=/usr/lib32 --with-pic --disable-static + else + LIBS='-ldl -lX11' ./configure --prefix=/usr --with-pic --disable-static + fi + make +} + +package() { + cd "${srcdir}"/${pkgname}-r7 + +# Multilib + if [[ $CARCH == "x86_64" ]]; then + depends=('lib32-gtk2' 'lib32-sdl') + fi + +# Install + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/community/gens-gs/gens-gtk.patch b/community/gens-gs/gens-gtk.patch new file mode 100755 index 000000000..0bc6fd0ee --- /dev/null +++ b/community/gens-gs/gens-gtk.patch @@ -0,0 +1,187 @@ +diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp +--- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE); ++ g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)about_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp +--- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE); ++ g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)bmf_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp +--- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000 +@@ -109,7 +109,7 @@ + gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE); ++ g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(dir_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp +--- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000 +@@ -140,7 +140,7 @@ + gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(genopt_window), false); + gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false); ++ g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)genopt_window, "delete_event", +@@ -458,11 +458,11 @@ + gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0); + + // Dropdown for intro effect. +- cboIntroEffect = gtk_combo_box_new_text(); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect"); +- //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. ++ cboIntroEffect = gtk_combo_box_text_new(); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None"); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect"); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect"); ++ //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. + gtk_widget_show(cboIntroEffect); + gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0); + g_signal_connect((gpointer)(cboIntroEffect), "changed", +diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp +--- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000 +@@ -154,9 +154,9 @@ + GSFT_UNUSED_PARAMETER(y); + GSFT_UNUSED_PARAMETER(user_data); + +- if (context->targets) ++ if (gdk_drag_context_list_targets(context)) + { +- GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0)); ++ GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0)); + gtk_drag_get_data(widget, context, target_type, time); + return true; + } +diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp +--- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000 +@@ -75,7 +75,7 @@ + gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE); ++ g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(glres_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp +--- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000 +@@ -80,8 +80,7 @@ + // Callbacks. + static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data); + static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data); +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data); ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data); + static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data); + static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data); + +@@ -119,7 +118,7 @@ + gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE); ++ g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)pmgr_window, "delete_event", +@@ -559,11 +558,9 @@ + * @param page_num New notebook page index. + * @param user_data User data. + */ +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data) ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data) + { + GSFT_UNUSED_PARAMETER(notebook); +- GSFT_UNUSED_PARAMETER(page); + GSFT_UNUSED_PARAMETER(user_data); + + // Activate the "cursor-changed" callback for the page. +diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp +--- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000 +@@ -94,7 +94,7 @@ + gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE); ++ g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(selcd_window), "delete_event", +@@ -128,7 +128,7 @@ + gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0); + + // Create the dropdown for the CD-ROM device name. +- cboDeviceName = gtk_combo_box_entry_new_text(); ++ cboDeviceName = gtk_combo_box_text_new_with_entry(); + gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63); + gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName); + gtk_widget_show(cboDeviceName); +@@ -156,7 +156,7 @@ + gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0); + + // Create the dropdown for the CD-ROM drive speed selection. +- cboDriveSpeed = gtk_combo_box_new_text(); ++ cboDriveSpeed = gtk_combo_box_text_new(); + char tmpSpeed[16]; + for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++) + { +@@ -167,7 +167,7 @@ + else + szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]); + +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed); + } + gtk_widget_show(cboDriveSpeed); + gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0); +@@ -252,7 +252,7 @@ + continue; + + // Add the device file. +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName); + } + } + +diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp +--- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000 +@@ -111,7 +111,7 @@ + gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE); + gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE); ++ g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL); + + // Add the window icon. + GList *icon_list = NULL; diff --git a/community/gens/PKGBUILD b/community/gens/PKGBUILD new file mode 100755 index 000000000..3b54528f0 --- /dev/null +++ b/community/gens/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 86823 2013-03-22 12:51:22Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: trya +# Contributor: robb_force + +pkgname=gens +pkgver=2.15.5 +pkgrel=8 +pkgdesc='A Sega Genesis / Sega CD / Sega 32X emulator' +arch=('i686' 'x86_64') +url='http://gens.sourceforge.net' +license=('GPL') +if [[ $CARCH == "x86_64" ]]; then + makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-sdl' 'nasm') + optdepends=('lib32-alsa-plugins: Sound support for PulseAudio' + 'lib32-libpulse: Sound support for PulseAudio') +else + depends=('gtk2' 'sdl') + makedepends=('nasm') +fi +options=('!buildflags') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gens.desktop') +sha256sums=('51910d3056da9ffbb2c01cfec064998c9a4cad0cb379d703ec1b93c83dba305a' + '146a0e98780b909877b3937c9132c85f5aba9450ef9f748bd1374ae8c9dfb751') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + +# Multilib + if [[ $CARCH == "x86_64" ]]; then + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + +# Build + export LDFLAGS=-Wl,-z,noexecstack + ./configure --host=i686-unknown-linux-gnu --prefix=/usr + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + +# Multilib + if [[ $CARCH == "x86_64" ]]; then + depends=('lib32-gtk2' 'lib32-sdl') + fi + +# Install + make DESTDIR=${pkgdir} install + install -dm 755 "${pkgdir}"/usr/share/applications + install -m 644 ../gens.desktop "${pkgdir}"/usr/share/applications/gens.desktop +} + +# vim: ts=2 sw=2 et: diff --git a/community/gens/gens.desktop b/community/gens/gens.desktop new file mode 100755 index 000000000..f668f16af --- /dev/null +++ b/community/gens/gens.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Gens +Type=Application +GenericName=A Sega Genesis / Sega CD / Sega 32X emulator +Comment=A Sega Genesis / Sega CD / Sega 32X emulator +Exec=gens +Icon=/usr/share/gens/Gens2.ico +Categories=Application;Game;Emulator; diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD index a2905b788..5f3fb3b9e 100644 --- a/community/mixxx/PKGBUILD +++ b/community/mixxx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85374 2013-03-01 10:35:42Z andrea $ +# $Id: PKGBUILD 86767 2013-03-22 00:23:48Z eric $ # Maintainer: Lukas Fleischer # Contributor: Ali H. Caliskan # Contributor: Ryan Coyner @@ -19,7 +19,7 @@ md5sums=('765bc5216ec8102c2186dd3ea80187a9') build() { cd "${srcdir}/${pkgname}-${pkgver}" - scons qtdir=/usr/lib/qt4 prefix=/usr install_root="${pkgdir}/usr" + scons qtdir=/usr/lib/qt4 prefix=/usr } package() { diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 01df50a53..778009bb6 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85617 2013-03-04 04:34:16Z bgyorgy $ +# $Id: PKGBUILD 86851 2013-03-22 21:28:54Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo -pkgver=1.7.1 -pkgrel=2 +pkgver=1.7.2 +pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" @@ -19,10 +19,8 @@ conflicts=('nemo-fm') options=('!emptydirs' '!libtool') install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" - "gnome-autogen.sh" "use-terminal-config.patch") -md5sums=('b348b6e340e055bef3163555b99621bb' - 'a925691c9b57a6a884dcf07da057fd1f' +md5sums=('809cf58f472a9e5de628a763d441b246' '6cca080cc8fe3df7e725c0f8cd5fa485') build() { @@ -31,11 +29,6 @@ build() { # Read the default terminal app from GSettings patch -Np1 -i ../use-terminal-config.patch - cp ${srcdir}/gnome-autogen.sh . - sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am - sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh - chmod +x gnome-autogen.sh - ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/nemo \ diff --git a/community/nemo/gnome-autogen.sh b/community/nemo/gnome-autogen.sh deleted file mode 100644 index 2467a1de2..000000000 --- a/community/nemo/gnome-autogen.sh +++ /dev/null @@ -1,538 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -#name of package -test "$PKG_NAME" || PKG_NAME=Package -test "$srcdir" || srcdir=. - -# default version requirements ... -test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53 -test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9 -test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.4.3 -test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.10.40 -test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0 -test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25 -test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0 -test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0 -test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0 -test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2 - -# a list of required m4 macros. Package can set an initial value -test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS= -test "$FORBIDDEN_M4MACROS" || FORBIDDEN_M4MACROS= - -# Not all echo versions allow -n, so we check what is possible. This test is -# based on the one in autoconf. -ECHO_C= -ECHO_N= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ;; - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -# some terminal codes ... -if tty < /dev/null 1>/dev/null 2>&1; then - boldface="`tput bold 2>/dev/null`" - normal="`tput sgr0 2>/dev/null`" -else - boldface= - normal= -fi -printbold() { - echo $ECHO_N "$boldface" $ECHO_C - echo "$@" - echo $ECHO_N "$normal" $ECHO_C -} -printerr() { - echo "$@" >&2 -} - -# Usage: -# compare_versions MIN_VERSION ACTUAL_VERSION -# returns true if ACTUAL_VERSION >= MIN_VERSION -compare_versions() { - ch_min_version=$1 - ch_actual_version=$2 - ch_status=0 - IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="." - set $ch_actual_version - for ch_min in $ch_min_version; do - ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes - if [ -z "$ch_min" ]; then break; fi - if [ -z "$ch_cur" ]; then ch_status=1; break; fi - if [ $ch_cur -gt $ch_min ]; then break; fi - if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi - done - IFS="$ch_save_IFS" - return $ch_status -} - -# Usage: -# version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE -# checks to see if the package is available -version_check() { - vc_package=$1 - vc_variable=$2 - vc_checkprogs=$3 - vc_min_version=$4 - vc_source=$5 - vc_status=1 - - vc_checkprog=`eval echo "\\$$vc_variable"` - if [ -n "$vc_checkprog" ]; then - printbold "using $vc_checkprog for $vc_package" - return 0 - fi - - if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then - vc_comparator="=" - else - vc_comparator=">=" - fi - printbold "checking for $vc_package $vc_comparator $vc_min_version..." - for vc_checkprog in $vc_checkprogs; do - echo $ECHO_N " testing $vc_checkprog... " $ECHO_C - if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then - vc_actual_version=`$vc_checkprog --version | head -n 1 | \ - sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` - if compare_versions $vc_min_version $vc_actual_version; then - echo "found $vc_actual_version" - # set variables - eval "$vc_variable=$vc_checkprog; \ - ${vc_variable}_VERSION=$vc_actual_version" - vc_status=0 - break - else - echo "too old (found version $vc_actual_version)" - fi - else - echo "not found." - fi - done - if [ "$vc_status" != 0 ]; then - printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed" - printerr " to build $PKG_NAME. Download the appropriate package for" - printerr " from your distribution or get the source tarball at" - printerr " $vc_source" - printerr - exit $vc_status - fi - return $vc_status -} - -# Usage: -# require_m4macro filename.m4 -# adds filename.m4 to the list of required macros -require_m4macro() { - case "$REQUIRED_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;; - esac -} - -forbid_m4macro() { - case "$FORBIDDEN_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;; - esac -} - -# Usage: -# add_to_cm_macrodirs dirname -# Adds the dir to $cm_macrodirs, if it's not there yet. -add_to_cm_macrodirs() { - case $cm_macrodirs in - "$1 "* | *" $1 "* | *" $1") ;; - *) cm_macrodirs="$cm_macrodirs $1";; - esac -} - -# Usage: -# print_m4macros_error -# Prints an error message saying that autoconf macros were misused -print_m4macros_error() { - printerr "***Error***: some autoconf macros required to build $PKG_NAME" - printerr " were not found in your aclocal path, or some forbidden" - printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_FLAGS?" - printerr -} - -# Usage: -# check_m4macros -# Checks that all the requested macro files are in the aclocal macro path -# Uses REQUIRED_M4MACROS and ACLOCAL variables. -check_m4macros() { - # construct list of macro directories - cm_macrodirs=`$ACLOCAL --print-ac-dir` - # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9 - # but it contains only Automake's own macros, so we can ignore it. - - # Read the dirlist file, supported by Automake >= 1.7. - # If AUTOMAKE was defined, no version was detected. - if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then - cm_dirlist=`sed 's/[ ]*#.*//;/^$/d' $cm_macrodirs/dirlist` - if [ -n "$cm_dirlist" ] ; then - for cm_dir in $cm_dirlist; do - if [ -d $cm_dir ]; then - add_to_cm_macrodirs $cm_dir - fi - done - fi - fi - - # Parse $ACLOCAL_FLAGS - set - $ACLOCAL_FLAGS - while [ $# -gt 0 ]; do - if [ "$1" = "-I" ]; then - add_to_cm_macrodirs "$2" - shift - fi - shift - done - - cm_status=0 - if [ -n "$REQUIRED_M4MACROS" ]; then - printbold "Checking for required M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $REQUIRED_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - # The macro dir in Cygwin environments may contain a file - # called dirlist containing other directories to look in. - if [ -f "$cm_dir/dirlist" ]; then - for cm_otherdir in `cat $cm_dir/dirlist`; do - if [ -f "$cm_otherdir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - fi - done - if $cm_macrofound; then - : - else - printerr " $cm_macro not found" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi - if [ -n "$FORBIDDEN_M4MACROS" ]; then - printbold "Checking for forbidden M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $FORBIDDEN_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - if $cm_macrofound; then - printerr " $cm_macro found (should be cleared from macros dir)" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi -} - -# try to catch the case where the macros2/ directory hasn't been cleared out. -forbid_m4macro gnome-cxx-check.m4 - -want_libtool=false -want_gettext=false -want_glib_gettext=false -want_intltool=false -want_pkg_config=false -want_gtk_doc=false -want_gnome_doc_utils=false -want_maintainer_mode=false - -find_configure_files() { - configure_ac= - if test -f "$1/configure.ac"; then - configure_ac="$1/configure.ac" - elif test -f "$1/configure.in"; then - configure_ac="$1/configure.in" - fi - if test "x$configure_ac" != x; then - echo "$configure_ac" - # TODO We have not detected the right autoconf yet! - autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do - find_configure_files "$1/$dir" - done - fi -} - -configure_files="`find_configure_files $srcdir`" - -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - continue - fi - if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || - grep "^LT_INIT" $configure_ac >/dev/null; then - want_libtool=true - fi - if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then - want_gettext=true - fi - if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then - want_glib_gettext=true - fi - if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null || - grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then - want_intltool=true - fi - if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then - want_pkg_config=true - fi - if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then - want_gtk_doc=true - fi - if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then - want_gnome_doc_utils=true - fi - - # check that AM_MAINTAINER_MODE is used - if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then - want_maintainer_mode=true - fi - - if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then - require_m4macro yelp.m4 - fi - - # check to make sure gnome-common macros can be found ... - if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null || - grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null || - grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then - require_m4macro gnome-common.m4 - fi - if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null || - grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then - require_m4macro gnome-compiler-flags.m4 - fi - if grep "^GNOME_CODE_COVERAGE" $configure_ac >/dev/null; then - require_m4macro gnome-code-coverage.m4 - fi -done - -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" -AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - -case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; - 1.12*) automake_progs="automake-1.13 automake-1.12" ;; - 1.13*) automake_progs="automake-1.13" ;; -esac -version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ - "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" -ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` - -if $want_libtool; then - version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \ - "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" - require_m4macro libtool.m4 -fi - -if $want_gettext; then - version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \ - "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz" - require_m4macro gettext.m4 -fi - -if $want_glib_gettext; then - version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \ - "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" - require_m4macro glib-gettext.m4 -fi - -if $want_intltool; then - version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/intltool/" - require_m4macro intltool.m4 -fi - -if $want_pkg_config; then - version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \ - "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" - require_m4macro pkg.m4 -fi - -if $want_gtk_doc; then - version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - require_m4macro gtk-doc.m4 -fi - -if $want_gnome_doc_utils; then - version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/" -fi - -if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - version_check gnome-common DOC_COMMON gnome-doc-common \ - $REQUIRED_DOC_COMMON_VERSION " " -fi - -check_m4macros - -if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then - printerr "**Warning**: I am going to run \`configure' with no arguments." - printerr "If you wish to pass any to it, please specify them on the" - printerr \`$0\'" command line." - printerr -fi - -topdir=`pwd` -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - basename=`basename $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - elif [ ! -w $dirname ]; then - echo skipping $dirname -- directory is read only - else - printbold "Processing $configure_ac" - cd $dirname - - # Note that the order these tools are called should match what - # autoconf's "autoupdate" package does. See bug 138584 for - # details. - - # programs that might install new macros get run before aclocal - if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || - grep "^LT_INIT" $basename >/dev/null; then - printbold "Running $LIBTOOLIZE..." - $LIBTOOLIZE --force --copy || exit 1 - fi - - if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then - printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 - elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then - if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then - printbold "Running autopoint..." - autopoint --force || exit 1 - else - printbold "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy || exit 1 - fi - fi - - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || - grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then - printbold "Running $INTLTOOLIZE..." - $INTLTOOLIZE --force --copy --automake || exit 1 - fi - if grep "^GTK_DOC_CHECK" $basename >/dev/null; then - printbold "Running $GTKDOCIZE..." - $GTKDOCIZE --copy || exit 1 - fi - - if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - printbold "Running gnome-doc-common..." - gnome-doc-common --copy || exit 1 - fi - if grep "^GNOME_DOC_INIT" $basename >/dev/null; then - printbold "Running $GNOME_DOC_PREPARE..." - $GNOME_DOC_PREPARE --force --copy || exit 1 - fi - - # Now run aclocal to pull in any additional macros needed - - # if the AC_CONFIG_MACRO_DIR() macro is used, pass that - # directory to aclocal. - m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` - if [ -n "$m4dir" ]; then - m4dir="-I $m4dir" - fi - printbold "Running $ACLOCAL..." - $ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1 - - if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then - printerr "*** obsolete gnome macros were used in $configure_ac" - fi - - # Now that all the macros are sorted, run autoconf and autoheader ... - printbold "Running $AUTOCONF..." - $AUTOCONF || exit 1 - if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then - printbold "Running $AUTOHEADER..." - $AUTOHEADER || exit 1 - # this prevents automake from thinking config.h.in is out of - # date, since autoheader doesn't touch the file if it doesn't - # change. - test -f config.h.in && touch config.h.in - fi - - # Finally, run automake to create the makefiles ... - printbold "Running $AUTOMAKE..." - if [ -f COPYING ]; then - cp -pf COPYING COPYING.autogen_bak - fi - if [ -f INSTALL ]; then - cp -pf INSTALL INSTALL.autogen_bak - fi - if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then - $AUTOMAKE --gnu --add-missing --copy -Wno-portability || exit 1 - else - $AUTOMAKE --gnu --add-missing --copy || exit 1 - fi - if [ -f COPYING.autogen_bak ]; then - cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING - rm -f COPYING.autogen_bak - fi - if [ -f INSTALL.autogen_bak ]; then - cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL - rm -f INSTALL.autogen_bak - fi - - cd "$topdir" - fi -done - -conf_flags="" - -if $want_maintainer_mode; then - conf_flags="--enable-maintainer-mode" -fi - -if test x$NOCONFIGURE = x; then - printbold Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME || exit 1 -else - echo Skipping configure process. -fi diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index b36b88ca2..e889eb458 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84738 2013-02-24 00:14:35Z foutrelis $ +# $Id: PKGBUILD 86846 2013-03-22 20:04:56Z foutrelis $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Miroslaw Szot @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.2.7 -pkgrel=4 +pkgrel=5 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl' 'geoip') @@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz logrotate) sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' - 'a21b564eaf83b4b4ce3a436e895bd37e000677fb314b89818f89f30caca6e6d9') + '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16') build() { cd "$srcdir"/$pkgname-$pkgver @@ -87,9 +87,12 @@ package() { install -d "$pkgdir"/$_tmpdir install -dm700 "$pkgdir"/$_tmpdir/proxy + chmod 750 "$pkgdir"/var/log/nginx + chown http:log "$pkgdir"/var/log/nginx + install -d "$pkgdir"/usr/share/nginx mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx - + install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE diff --git a/community/nginx/logrotate b/community/nginx/logrotate index 1a5bd6441..3d082bcf8 100644 --- a/community/nginx/logrotate +++ b/community/nginx/logrotate @@ -1,6 +1,6 @@ /var/log/nginx/*log { missingok - create 640 root log + create 640 http log sharedscripts compress postrotate diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install index efc155556..0daccc639 100644 --- a/community/nginx/nginx.install +++ b/community/nginx/nginx.install @@ -1,12 +1,8 @@ -post_install() { - if [[ -e var/log/nginx ]]; then +post_upgrade() { + if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then chmod 750 var/log/nginx - chown root:log var/log/nginx + chown http:log var/log/nginx fi -} - -post_upgrade() { - [[ $(vercmp $2 1.2.7-3) -le 0 ]] && post_install if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then echo " >>> Since 1.2.1-2 several changes has been made in package:" echo " - *.conf files have been moved to /etc/nginx" diff --git a/community/pypanel/PKGBUILD b/community/pypanel/PKGBUILD index 82d608970..f078a915d 100644 --- a/community/pypanel/PKGBUILD +++ b/community/pypanel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57834 2011-11-03 10:22:57Z lfleischer $ +# $Id: PKGBUILD 86770 2013-03-22 00:26:29Z eric $ # Maintainer: Lukas Fleischer # Contributor: Jeff Mickey # Contributor: Mr Green @@ -15,7 +15,7 @@ depends=('python2' 'x-server' 'python-xlib' 'imlib2' 'libxft') source=("http://downloads.sourceforge.net/sourceforge/pypanel/PyPanel-${pkgver}.tar.gz") md5sums=('f1f9a2ed80be72ab36e748833618daba') -build() { +package() { cd "${srcdir}/PyPanel-${pkgver}" python2 setup.py install --root="${pkgdir}" } diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 87ec0f2d8..4ec09ea8e 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85927 2013-03-09 00:52:24Z svenstaro $ +# $Id: PKGBUILD 86795 2013-03-22 10:46:14Z svenstaro $ # Maintainer: Imanol Celaya # Maintainer: Sven-Hendrik Haase # Contributor: Lukas Jirkovsky @@ -7,8 +7,8 @@ # Contributor: delor pkgname=qtcreator -pkgver=2.7.0rc -_pkgver=2.7.0-rc +pkgver=2.7.0 +_pkgver=2.7.0 pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') @@ -29,7 +29,7 @@ install=qtcreator.install source=("http://releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" 'qtcreator.desktop' 'fix-build.patch') -md5sums=('5c4baef738b00cfdf53739ffd1434234' +md5sums=('7bf25d211ff8babea47c2034f1b93d08' '82888d4be900e7833d768050a135cd37' '4087c00d853addf97ca329d304e9a0a5') diff --git a/community/rdiff-backup/PKGBUILD b/community/rdiff-backup/PKGBUILD index 3ffb75bad..3a25addab 100644 --- a/community/rdiff-backup/PKGBUILD +++ b/community/rdiff-backup/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57837 2011-11-03 10:27:32Z lfleischer $ +# $Id: PKGBUILD 86773 2013-03-22 00:29:53Z eric $ # Maintainer: Lukas Fleischer # Contributor: Aaron Schaefer # Contributor: Erwin Van de Velde @@ -17,7 +17,7 @@ source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar md5sums=('1a94dc537fcf74d6a3a80bd27808e77b' '3b88b18eb43ac85bc70b8dce92e958ba') -build() { +package() { cd "${srcdir}/${pkgname}-${pkgver}" python2 setup.py install --root="${pkgdir}" -O1 diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD index f53fbc46f..91b84c9e5 100644 --- a/community/tremulous/PKGBUILD +++ b/community/tremulous/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 86782 2013-03-22 00:57:25Z eric $ #Contributor: Daenyth pkgname=tremulous @@ -42,31 +43,35 @@ md5sums=('e0e1b6e03e7596da00a77fe638560402' build() { local _arch=${CARCH/i686/x86} - # Build and install the server - mkdir -p $srcdir/tremded - bsdtar -x -C $srcdir/tremded -f $srcdir/mg_tremded_source_1.01.tar.gz - cd $srcdir/tremded - make || return 1 - install -D -m755 build/release-linux-$_arch/tremded.$_arch $pkgdir/opt/tremulous/tremded.$_arch - install -D -m644 $srcdir/tremdedrc $pkgdir/etc/tremdedrc - install -D -m644 $srcdir/game.qvm $pkgdir/opt/tremulous/game.qvm - install -D -m755 $srcdir/tremded.sh $pkgdir/usr/bin/tremded + # Build the server + mkdir -p "$srcdir/tremded" + bsdtar -x -C "$srcdir/tremded" -f "$srcdir/mg_tremded_source_1.01.tar.gz" + cd "$srcdir/tremded" + make +# Build the client + cd "$srcdir/Release_1.011" + patch -Np1 -i "$srcdir/fix_fs26749.patch" + make +} + +package() { + cd "$srcdir/tremded" + install -D -m755 build/release-linux-$_arch/tremded.$_arch "$pkgdir/opt/tremulous/tremded.$_arch" + install -D -m644 "$srcdir/tremdedrc" "$pkgdir/etc/tremdedrc" + install -D -m644 "$srcdir/game.qvm" "$pkgdir/opt/tremulous/game.qvm" + install -D -m755 "$srcdir/tremded.sh" "$pkgdir/usr/bin/tremded" - # Build and install the client - cd $srcdir/Release_1.011 - patch -Np1 -i $srcdir/fix_fs26749.patch || return 1 - make || return 1 - install -Dm755 build/release-linux-$_arch/tremulous.$_arch $pkgdir/opt/tremulous/tremulous.$_arch - install -D -m755 $srcdir/tremulous.sh $pkgdir/usr/bin/tremulous + cd "$srcdir/Release_1.011" + install -Dm755 build/release-linux-$_arch/tremulous.$_arch "$pkgdir/opt/tremulous/tremulous.$_arch" + install -D -m755 "$srcdir/tremulous.sh" "$pkgdir/usr/bin/tremulous" # Install the documentation - install -Dm644 $srcdir/mg-client-manual.txt $pkgdir/usr/share/tremulous/mg-client-manual.txt - install -Dm644 $srcdir/lakitu7_qvm.txt $pkgdir/usr/share/tremulous/lakitu7_qvm.txt + install -Dm644 "$srcdir/mg-client-manual.txt" "$pkgdir/usr/share/tremulous/mg-client-manual.txt" + install -Dm644 "$srcdir/lakitu7_qvm.txt" "$pkgdir/usr/share/tremulous/lakitu7_qvm.txt" # Install the .desktop and icon files - install -D -m644 $srcdir/tremulous.xpm $pkgdir/usr/share/pixmaps/tremulous.xpm - install -D -m644 $srcdir/tremulous.desktop $pkgdir/usr/share/applications/tremulous.desktop - + install -D -m644 "$srcdir/tremulous.xpm" "$pkgdir/usr/share/pixmaps/tremulous.xpm" + install -D -m644 "$srcdir/tremulous.desktop" "$pkgdir/usr/share/applications/tremulous.desktop" } # vim:set ts=2 sw=2 et: diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD index 3607e4e36..71d6d9981 100644 --- a/community/wesnoth/PKGBUILD +++ b/community/wesnoth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83279 2013-01-28 16:50:16Z stephane $ +# $Id: PKGBUILD 86797 2013-03-22 11:00:44Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Jan de Groot # Contributor: Tobias Powalowski @@ -6,8 +6,8 @@ # Contributor: Douglas Soares de Andrade pkgname=wesnoth -pkgver=1.10.5 -pkgrel=2 +pkgver=1.10.6 +pkgrel=1 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64') license=('GPL') @@ -20,7 +20,7 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t wesnothd.tmpfiles.conf wesnothd.rc.d wesnothd.service) -md5sums=('03d9683cd83d17c6536bdf5c4940bbc8' +md5sums=('547e3489bbfa778912b11dbee612c380' '2d2fea6b3d86dfd589f5ad35a3be1f97' '85659b47d22dfdf4e4d046556973fc3e' 'd1b6bf1d3dc05086ee6a370adff0ae4a') diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index b285d4a11..dfed9d1d8 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Joel Teichroeb pkgname=weston -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64') url='http://wayland.freedesktop.org' @@ -11,7 +11,7 @@ license=('MIT') options=(!libtool) depends=('libxkbcommon' 'wayland' 'mesa' 'cairo' 'poppler-glib' 'mtdev' 'libxcursor' 'glu') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('a97030613e066c05e267ea0d7888fd5f7a08eea2') +sha1sums=('d39d487317ededb9d66365bc1402ee0bc5e20dd0') build() { cd $pkgname-$pkgver diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD deleted file mode 100644 index 30f9fa0cd..000000000 --- a/community/wine/PKGBUILD +++ /dev/null @@ -1,154 +0,0 @@ -# $Id: PKGBUILD 83833 2013-02-05 14:18:11Z svenstaro $ -# Maintainer: Sven-Hendrik Haase -# Contributor: Jan "heftig" Steffens -# Contributor: Eduardo Romero -# Contributor: Giovanni Scafora - -pkgname=wine -pkgver=1.5.23 -pkgrel=2 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign}) -md5sums=('70228ea29efe9700a66202b495b068bc' - '8b8620cf523bb6c7e61d01480c167859') - -pkgdesc="A compatibility layer for running Windows programs" -url="http://www.winehq.com" -arch=(i686 x86_64) -license=(LGPL) -install=wine.install - -depends=( - fontconfig lib32-fontconfig - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxi lib32-libxi - gettext lib32-gettext - glu lib32-glu - libsm lib32-libsm - gcc-libs lib32-gcc-libs - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex prelink - 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' - giflib lib32-giflib - libpng lib32-libpng - gnutls lib32-gnutls - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libxml2 lib32-libxml2 - libldap lib32-libldap - lcms lib32-lcms - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - alsa-lib lib32-alsa-lib - libxcomposite lib32-libxcomposite - mesa lib32-mesa - oss - samba -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - gnutls lib32-gnutls - lcms lib32-lcms - libxml2 lib32-libxml2 - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - libpulse lib32-libpulse - alsa-plugins lib32-alsa-plugins - alsa-lib lib32-alsa-lib - libjpeg-turbo lib32-libjpeg-turbo - libxcomposite lib32-libxcomposite - libxinerama lib32-libxinerama - oss cups - samba -) - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -else - provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") - conflicts=('bin32-wine' 'wine-wow64') - replaces=('bin32-wine') -fi - -build() { - cd "$srcdir" - - # Allow ccache to work - mv $pkgname-$_pkgbasever $pkgname - - # Get rid of old build dirs - rm -rf $pkgname-{32,64}-build - mkdir $pkgname-32-build - - if [[ $CARCH == x86_64 ]]; then - msg2 "Building Wine-64..." - - mkdir $pkgname-64-build - cd "$srcdir/$pkgname-64-build" - ../$pkgname/configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - --with-x \ - --without-gstreamer \ - --enable-win64 - # Gstreamer was disabled for FS#33655 - - make - - _wine32opts=( - --libdir=/usr/lib32 - --with-wine64="$srcdir/$pkgname-64-build" - ) - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - msg2 "Building Wine-32..." - cd "$srcdir/$pkgname-32-build" - ../$pkgname/configure \ - --prefix=/usr \ - --with-x \ - --without-gstreamer \ - "${_wine32opts[@]}" - - # These additional flags solve FS#23277 - make CFLAGS+="-mincoming-stack-boundary=2" CXXFLAGS+="-mincoming-stack-boundary=2" -} - -package() { - msg2 "Packaging Wine-32..." - cd "$srcdir/$pkgname-32-build" - - if [[ $CARCH == i686 ]]; then - make prefix="$pkgdir/usr" install - else - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - fi -} - -# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install deleted file mode 100644 index 0548b7ffd..000000000 --- a/community/wine/wine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - #echo "If you are on x86_64, the default WINEARCH will be win64." - #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - #echo "See the Arch wiki on wine for more information." -} - -post_remove() { - update-desktop-database -q -} diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index e3a887bb4..b0edba380 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156348 2012-04-17 15:57:54Z andyrtr $ +# $Id: PKGBUILD 180517 2013-03-22 13:51:08Z andyrtr $ # Maintainer: Andreas Radke pkgname=libgcrypt -pkgver=1.5.0 -pkgrel=3 +pkgver=1.5.1 +pkgrel=1 pkgdesc="a general purpose crypto library based on the code used" arch=(i686 x86_64) url="http://www.gnupg.org" @@ -14,7 +14,7 @@ install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 ) -sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf') +sha1sums=(8b60a26b7eae1a727d58932d6b1efeb5716648ed'') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index 36f354027..af14bbaa8 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164645 2012-08-01 17:50:06Z andrea $ +# $Id: PKGBUILD 180514 2013-03-22 13:00:52Z andrea $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=cfitsio -pkgver=3.310 +pkgver=3.340 pkgrel=1 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64') @@ -13,16 +13,16 @@ license=('custom') depends=('glibc') options=('!libtool') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz") -md5sums=('75b6411751c7f308d45b281b7beb92d6') +md5sums=('99210838af46b7bf2d945ccbb05e3ad3') build() { - cd "${srcdir}"/${pkgname} + cd ${pkgname} ./configure --prefix=/usr make shared } check() { - cd "${srcdir}"/${pkgname} + cd ${pkgname} make testprog LD_LIBRARY_PATH=. ./testprog > testprog.lis [[ -z $(diff testprog.lis testprog.out) ]] || return 1 @@ -30,7 +30,7 @@ check() { } package() { - cd "${srcdir}"/${pkgname} + cd ${pkgname} make DESTDIR="${pkgdir}" install install -D -m644 License.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index 2373b5e23..83ebe7b7f 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 173827 2012-12-24 15:21:34Z pierre $ +# $Id: PKGBUILD 180506 2013-03-22 07:41:24Z pierre $ pkgname=fetchmail -pkgver=6.3.24 +pkgver=6.3.25 pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64') @@ -16,13 +16,11 @@ options=('!makeflags') install='fetchmail.install' source=("http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz" "http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" - 'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service') -sha1sums=('8cb2aa3a85dd307ccd1899ddbb4463e011048535' - 'dff091c04ab64c25f7b6af758f93a75b969117e0' - 'fc25180f1add26df0a3bdaac03fd9d2e3473ff88' - '30401729386d6f774c6c36ab8530842166de54a8' + 'fetchmail.tmpfiles' 'fetchmail.service') +sha1sums=('a246a6a3caf90e1106448c9dde4463e87d816031' + '9a7f76c9fd9f85fc4b421e34fa8c15d2838d61fc' '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' - '11ff81fc8363a54099880da18634b0d1ecf9fa82') + '69caf3fd4d4446db3bf53144e4fa8edbdbbfcd10') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -34,8 +32,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail" - install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail" install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail" install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service diff --git a/extra/fetchmail/fetchmail.conf b/extra/fetchmail/fetchmail.conf deleted file mode 100644 index dcac2a067..000000000 --- a/extra/fetchmail/fetchmail.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Daemon polling interval -INTERVAL=60 - -# Config location -CONFIG=/etc/fetchmailrc diff --git a/extra/fetchmail/fetchmail.install b/extra/fetchmail/fetchmail.install index 81b374c57..5f6dc4911 100644 --- a/extra/fetchmail/fetchmail.install +++ b/extra/fetchmail/fetchmail.install @@ -5,7 +5,7 @@ post_install() { getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \ -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail if [[ ! -d run/fetchmail ]]; then - usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf + usr/bin/systemd-tmpfiles --create fetchmail.conf fi } @@ -17,7 +17,7 @@ post_upgrade() { usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail fi if [[ ! -d run/fetchmail ]]; then - usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf + usr/bin/systemd-tmpfiles --create fetchmail.conf fi } diff --git a/extra/fetchmail/fetchmail.rc b/extra/fetchmail/fetchmail.rc deleted file mode 100644 index 4d8b98d40..000000000 --- a/extra/fetchmail/fetchmail.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/fetchmail - -PID=`pidof -o %PPID /usr/bin/fetchmail` -case "$1" in - start) - stat_busy "Starting fetchmail" - [ -z "$PID" ] && - su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon fetchmail - stat_done - fi - ;; - stop) - stat_busy "Stopping fetchmail" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fetchmail - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/fetchmail/fetchmail.service b/extra/fetchmail/fetchmail.service index 3e7da7545..4653cc587 100644 --- a/extra/fetchmail/fetchmail.service +++ b/extra/fetchmail/fetchmail.service @@ -4,8 +4,7 @@ After=network.target [Service] User=fetchmail -EnvironmentFile=/etc/conf.d/fetchmail -ExecStart=/usr/bin/fetchmail -d ${INTERVAL} -f ${CONFIG} +ExecStart=/usr/bin/fetchmail -d 900 -f /etc/fetchmailrc RestartSec=1 [Install] diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index 807cc09e1..ff32fa449 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180427 2013-03-21 20:41:25Z eric $ +# $Id: PKGBUILD 180538 2013-03-22 21:03:11Z eric $ # Maintainer: Ronald van Haren # Contributor: damir # Contributor: Tom Newsom pkgname=gnuplot pkgver=4.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64') url="http://www.gnuplot.info" @@ -35,7 +35,7 @@ build() { --libexecdir=/usr/bin \ --with-gihdir=/usr/share/gnuplot \ --with-readline=gnu - make + make pkglibexecdir=/usr/bin } diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index 3506ba984..b0633edde 100644 --- a/extra/gst-libav/PKGBUILD +++ b/extra/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 176320 2013-01-29 20:24:29Z eric $ +# $Id: PKGBUILD 180533 2013-03-22 19:27:55Z heftig $ # Maintainer: Jan de Groot pkgname=gst-libav -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('yasm') options=(!libtool !emptydirs) provides=("gst-ffmpeg=$pkgver-$pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('aef8be665096b3a4e64424fb39d7c5da57faaaf95e9fea6c1bb44295d4fb32d5') +sha256sums=('8ab222a52bf7482e913f2c9a4f490cda8f8ed1acfbc429f27451b0558b08044d') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD index f0f04ebe0..4ba806478 100644 --- a/extra/gst-plugins-base/PKGBUILD +++ b/extra/gst-plugins-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174936 2013-01-09 12:40:39Z jgc $ +# $Id: PKGBUILD 180528 2013-03-22 19:20:44Z heftig $ # Maintainer: Jan de Groot pkgbase=gst-plugins-base pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Base Plugins" arch=('i686' 'x86_64') @@ -12,11 +12,11 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('37ce6e09b99ef3879111c861ee5090582b4fd4c764e81ab6eb2b2b4dd77d7173') +sha256sums=('85e5f99af690f720ccde5ea7e793269d35883a3ead80ca9985fa44e18bb1a4a5') build() { cd $pkgbase-$pkgver - sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + sed -i -e '/AC_PATH_XTRA/d' configure.ac aclocal -I m4 -I common/m4 autoconf automake --add-missing diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index d48925d3c..c80dad8e1 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174938 2013-01-09 13:33:08Z jgc $ +# $Id: PKGBUILD 180529 2013-03-22 19:22:28Z heftig $ # Maintainer: Jan de Groot pkgname=gst-plugins-good -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64') @@ -12,11 +12,11 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' ' makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('53bd0b848e7896f1b22548ca4e8be56cf425e5100e121c472dff8272d5140bc5') +sha256sums=('67f7690a9826d9a6ab28b9af2536a6f3e833ee412bd59dd603c48fb3c6823e0d') build() { cd $pkgname-$pkgver - sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + sed -i -e '/AC_PATH_XTRA/d' configure.ac aclocal -I m4 -I common/m4 autoconf automake --add-missing diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index b19368690..62f2cf4b0 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178130 2013-02-16 22:48:48Z ioni $ +# $Id: PKGBUILD 180531 2013-03-22 19:24:55Z heftig $ # Maintainer: Jan de Groot pkgname=gst-plugins-ugly -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64') license=('LGPL') @@ -11,7 +11,7 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('a62a182ea96d9b2783b493b46d531914db9d2ebb9e537e9c84668fe752791331') +sha256sums=('8655ceec7533b5d30080a5051025e26ff8d06bea8d03a6b2af56c2f839d60586') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD index 3676c53d6..24478f37f 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174933 2013-01-09 12:15:29Z jgc $ +# $Id: PKGBUILD 180527 2013-03-22 19:18:50Z heftig $ # Maintainer: Jan de Groot pkgname=gstreamer -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('26c2827567f09a46d0a3bc1e7f8696b2ae72b047306539178079abae487c5b77') +sha256sums=('50d4050cd6a23684b6bbf40a9b7c132edfb39fe9db2d81980adaa6e72f4d5826') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 3f576ae3b..9fa9d3913 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180201 2013-03-18 16:09:09Z andyrtr $ +# $Id: PKGBUILD 180518 2013-03-22 13:51:11Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.21.4 +pkgver=2.21.5 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2f5983627013170db5b53d5c3ca7ad5fe843f3a0fa16ea136d6a4aa684c9cb03') +sha256sums=('0fd8265039bee8f8533e8bac4df8ba8f67a65a4e78763a4982980309b05fd954') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 5e937cbf8..bee732c0c 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180114 2013-03-17 13:00:07Z tpowa $ +# $Id: PKGBUILD 180406 2013-03-21 07:26:50Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,8 +6,8 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.3 -pkgrel=2 +pkgver=${_basekernel}.4 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -20,17 +20,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' - 'change-default-console-loglevel.patch' - 'drm-i915-enable-irqs-earlier-when-resuming.patch' - 'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch') + 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'a762b6f22a64473a0b4d8dc5366b25d3' + 'be610dd93dbe033cfe04018b27557c3e' '5cc106ba38bab845ea62138fc0d1bbf1' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' - 'f3def2cefdcbb954c21d8505d23cc83c' - '40e7b328977ad787a0b5584f193d63fe' - '8b9159931fab0c191a86dbd5a46fa328') + 'f3def2cefdcbb954c21d8505d23cc83c') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-PAE @@ -50,11 +46,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # revert 2 patches which breaks displays - # FS 34327 - patch -Rp1 -i "${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch" - patch -Rp1 -i "${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch" - cat "${srcdir}/config" > ./.config # simpler if [ "${_kernelname}" != "" ]; then diff --git a/kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch b/kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch deleted file mode 100644 index cb621d520..000000000 --- a/kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Tue, 5 Mar 2013 09:50:58 +0100 -Subject: drm/i915: enable irqs earlier when resuming - -From: Daniel Vetter - -commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream. - -We need it to restore the ilk rc6 context, since the gpu wait no -requires interrupts. But in general having interrupts around should -help in code sanity, since more and more stuff is interrupt driven. - -This regression has been introduced in - -commit 3e9605018ab3e333d51cc90fccfde2031886763b -Author: Chris Wilson -Date: Tue Nov 27 16:22:54 2012 +0000 - - drm/i915: Rearrange code to only have a single method for waiting upon the ring - -Like in the driver load code we need to make sure that hotplug -interrupts don't cause havoc with our modeset state, hence block them -with the existing infrastructure. Again we ignore races where we might -loose hotplug interrupts ... - -Note that the driver load part of the regression has already been -fixed in - -commit 52d7ecedac3f96fb562cb482c139015372728638 -Author: Daniel Vetter -Date: Sat Dec 1 21:03:22 2012 +0100 - - drm/i915: reorder setup sequence to have irqs for output setup - -v2: Add a note to the commit message about which patch fixed the -driver load part of the regression. Stable kernels need to backport -both patches. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691 -Cc: Chris Wilson -Cc: Mika Kuoppala -Reported-and-Tested-by: Ilya Tumaykin -Reviewed-by: Chris wilson (v1) -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_drv.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/i915/i915_drv.c -+++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -486,6 +486,7 @@ static int i915_drm_freeze(struct drm_de - intel_modeset_disable(dev); - - drm_irq_uninstall(dev); -+ dev_priv->enable_hotplug_processing = false; - } - - i915_save_state(dev); -@@ -562,9 +563,19 @@ static int __i915_drm_thaw(struct drm_de - error = i915_gem_init_hw(dev); - mutex_unlock(&dev->struct_mutex); - -+ /* We need working interrupts for modeset enabling ... */ -+ drm_irq_install(dev); -+ - intel_modeset_init_hw(dev); - intel_modeset_setup_hw_state(dev, false); -- drm_irq_install(dev); -+ -+ /* -+ * ... but also need to make sure that hotplug processing -+ * doesn't cause havoc. Like in the driver load code we don't -+ * bother with the tiny race here where we might loose hotplug -+ * notifications. -+ * */ -+ dev_priv->enable_hotplug_processing = true; - } - - intel_opregion_init(dev); diff --git a/kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch b/kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch deleted file mode 100644 index 8dc354488..000000000 --- a/kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 52d7ecedac3f96fb562cb482c139015372728638 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Sat, 1 Dec 2012 21:03:22 +0100 -Subject: drm/i915: reorder setup sequence to have irqs for output setup - -From: Daniel Vetter - -commit 52d7ecedac3f96fb562cb482c139015372728638 upstream. - -Otherwise the new&shiny irq-driven gmbus and dp aux code won't work that -well. Noticed since the dp aux code doesn't have an automatic fallback -with a timeout (since the hw provides for that already). - -v2: Simple move drm_irq_install before intel_modeset_gem_init, as -suggested by Ben Widawsky. - -v3: Now that interrupts are enabled before all connectors are fully -set up, we might fall over serving a HPD interrupt while things are -still being set up. Instead of jumping through massive hoops and -complicating the code with a separate hpd irq enable step, simply -block out the hotplug work item from doing anything until things are -in place. - -v4: Actually, we can enable hotplug processing only after the fbdev is -fully set up, since we call down into the fbdev from the hotplug work -functions. So stick the hpd enabling right next to the poll helper -initialization. - -v5: We need to enable irqs before intel_modeset_init, since that -function sets up the outputs. - -v6: Fixup cleanup sequence, too. - -Reviewed-by: Imre Deak -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_dma.c | 23 ++++++++++++++--------- - drivers/gpu/drm/i915/i915_drv.h | 1 + - drivers/gpu/drm/i915/i915_irq.c | 4 ++++ - 3 files changed, 19 insertions(+), 9 deletions(-) - ---- a/drivers/gpu/drm/i915/i915_dma.c -+++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -1297,19 +1297,21 @@ static int i915_load_modeset_init(struct - if (ret) - goto cleanup_vga_switcheroo; - -+ ret = drm_irq_install(dev); -+ if (ret) -+ goto cleanup_gem_stolen; -+ -+ /* Important: The output setup functions called by modeset_init need -+ * working irqs for e.g. gmbus and dp aux transfers. */ - intel_modeset_init(dev); - - ret = i915_gem_init(dev); - if (ret) -- goto cleanup_gem_stolen; -- -- intel_modeset_gem_init(dev); -+ goto cleanup_irq; - - INIT_WORK(&dev_priv->console_resume_work, intel_console_resume); - -- ret = drm_irq_install(dev); -- if (ret) -- goto cleanup_gem; -+ intel_modeset_gem_init(dev); - - /* Always safe in the mode setting case. */ - /* FIXME: do pre/post-mode set stuff in core KMS code */ -@@ -1317,7 +1319,10 @@ static int i915_load_modeset_init(struct - - ret = intel_fbdev_init(dev); - if (ret) -- goto cleanup_irq; -+ goto cleanup_gem; -+ -+ /* Only enable hotplug handling once the fbdev is fully set up. */ -+ dev_priv->enable_hotplug_processing = true; - - drm_kms_helper_poll_init(dev); - -@@ -1326,13 +1331,13 @@ static int i915_load_modeset_init(struct - - return 0; - --cleanup_irq: -- drm_irq_uninstall(dev); - cleanup_gem: - mutex_lock(&dev->struct_mutex); - i915_gem_cleanup_ringbuffer(dev); - mutex_unlock(&dev->struct_mutex); - i915_gem_cleanup_aliasing_ppgtt(dev); -+cleanup_irq: -+ drm_irq_uninstall(dev); - cleanup_gem_stolen: - i915_gem_cleanup_stolen(dev); - cleanup_vga_switcheroo: ---- a/drivers/gpu/drm/i915/i915_drv.h -+++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -672,6 +672,7 @@ typedef struct drm_i915_private { - - u32 hotplug_supported_mask; - struct work_struct hotplug_work; -+ bool enable_hotplug_processing; - - int num_pipe; - int num_pch_pll; ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -287,6 +287,10 @@ static void i915_hotplug_work_func(struc - struct drm_mode_config *mode_config = &dev->mode_config; - struct intel_encoder *encoder; - -+ /* HPD irq before everything is fully set up. */ -+ if (!dev_priv->enable_hotplug_processing) -+ return; -+ - mutex_lock(&mode_config->mutex); - DRM_DEBUG_KMS("running encoder hotplug functions\n"); - diff --git a/kernels/linux-libre-pae/fat-3.6.x.patch b/kernels/linux-libre-pae/fat-3.6.x.patch deleted file mode 100644 index d8deeb788..000000000 --- a/kernels/linux-libre-pae/fat-3.6.x.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Dave Reisner -Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100) -Subject: fs/fat: strip "cp" prefix from codepage in display -X-Git-Tag: next-20121130~1^2~97 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 - -fs/fat: strip "cp" prefix from codepage in display - -Option parsing code expects an unsigned integer for the codepage option, -but prefixes and stores this option with "cp" before passing to -load_nls(). This makes the displayed option in /proc an invalid one. -Strip the prefix when printing so that the displayed option is valid for -reuse. - -Signed-off-by: Dave Reisner -Acked-by: OGAWA Hirofumi -Signed-off-by: Andrew Morton ---- - -diff --git a/fs/fat/inode.c b/fs/fat/inode.c -index 3b733a7..3580681 100644 ---- a/fs/fat/inode.c -+++ b/fs/fat/inode.c -@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) - if (opts->allow_utime) - seq_printf(m, ",allow_utime=%04o", opts->allow_utime); - if (sbi->nls_disk) -- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); -+ /* strip "cp" prefix from displayed option */ -+ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); - if (isvfat) { - if (sbi->nls_io) - seq_printf(m, ",iocharset=%s", sbi->nls_io->charset); diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 7951e0156..5053eb190 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.3-2-LIBRE-PAE +KERNEL_VERSION=3.8.4-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 91dc1484c..77e0ed1ff 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180114 2013-03-17 13:00:07Z tpowa $ +# $Id: PKGBUILD 180406 2013-03-21 07:26:50Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,8 +6,8 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.3 -pkgrel=2 +pkgver=${_basekernel}.4 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -20,17 +20,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' - 'change-default-console-loglevel.patch' - 'drm-i915-enable-irqs-earlier-when-resuming.patch' - 'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch') + 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'a762b6f22a64473a0b4d8dc5366b25d3' + 'be610dd93dbe033cfe04018b27557c3e' 'c13961a22d8c742fb31b59a1e27a0e7b' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' - 'f3def2cefdcbb954c21d8505d23cc83c' - '40e7b328977ad787a0b5584f193d63fe' - '8b9159931fab0c191a86dbd5a46fa328') + 'f3def2cefdcbb954c21d8505d23cc83c') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-XEN @@ -50,11 +46,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # revert 2 patches which breaks displays - # FS 34327 - patch -Rp1 -i "${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch" - patch -Rp1 -i "${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch" - cat "${srcdir}/config" > ./.config # simpler if [ "${_kernelname}" != "" ]; then diff --git a/kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch b/kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch deleted file mode 100644 index cb621d520..000000000 --- a/kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Tue, 5 Mar 2013 09:50:58 +0100 -Subject: drm/i915: enable irqs earlier when resuming - -From: Daniel Vetter - -commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream. - -We need it to restore the ilk rc6 context, since the gpu wait no -requires interrupts. But in general having interrupts around should -help in code sanity, since more and more stuff is interrupt driven. - -This regression has been introduced in - -commit 3e9605018ab3e333d51cc90fccfde2031886763b -Author: Chris Wilson -Date: Tue Nov 27 16:22:54 2012 +0000 - - drm/i915: Rearrange code to only have a single method for waiting upon the ring - -Like in the driver load code we need to make sure that hotplug -interrupts don't cause havoc with our modeset state, hence block them -with the existing infrastructure. Again we ignore races where we might -loose hotplug interrupts ... - -Note that the driver load part of the regression has already been -fixed in - -commit 52d7ecedac3f96fb562cb482c139015372728638 -Author: Daniel Vetter -Date: Sat Dec 1 21:03:22 2012 +0100 - - drm/i915: reorder setup sequence to have irqs for output setup - -v2: Add a note to the commit message about which patch fixed the -driver load part of the regression. Stable kernels need to backport -both patches. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691 -Cc: Chris Wilson -Cc: Mika Kuoppala -Reported-and-Tested-by: Ilya Tumaykin -Reviewed-by: Chris wilson (v1) -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_drv.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/i915/i915_drv.c -+++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -486,6 +486,7 @@ static int i915_drm_freeze(struct drm_de - intel_modeset_disable(dev); - - drm_irq_uninstall(dev); -+ dev_priv->enable_hotplug_processing = false; - } - - i915_save_state(dev); -@@ -562,9 +563,19 @@ static int __i915_drm_thaw(struct drm_de - error = i915_gem_init_hw(dev); - mutex_unlock(&dev->struct_mutex); - -+ /* We need working interrupts for modeset enabling ... */ -+ drm_irq_install(dev); -+ - intel_modeset_init_hw(dev); - intel_modeset_setup_hw_state(dev, false); -- drm_irq_install(dev); -+ -+ /* -+ * ... but also need to make sure that hotplug processing -+ * doesn't cause havoc. Like in the driver load code we don't -+ * bother with the tiny race here where we might loose hotplug -+ * notifications. -+ * */ -+ dev_priv->enable_hotplug_processing = true; - } - - intel_opregion_init(dev); diff --git a/kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch b/kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch deleted file mode 100644 index 8dc354488..000000000 --- a/kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 52d7ecedac3f96fb562cb482c139015372728638 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Sat, 1 Dec 2012 21:03:22 +0100 -Subject: drm/i915: reorder setup sequence to have irqs for output setup - -From: Daniel Vetter - -commit 52d7ecedac3f96fb562cb482c139015372728638 upstream. - -Otherwise the new&shiny irq-driven gmbus and dp aux code won't work that -well. Noticed since the dp aux code doesn't have an automatic fallback -with a timeout (since the hw provides for that already). - -v2: Simple move drm_irq_install before intel_modeset_gem_init, as -suggested by Ben Widawsky. - -v3: Now that interrupts are enabled before all connectors are fully -set up, we might fall over serving a HPD interrupt while things are -still being set up. Instead of jumping through massive hoops and -complicating the code with a separate hpd irq enable step, simply -block out the hotplug work item from doing anything until things are -in place. - -v4: Actually, we can enable hotplug processing only after the fbdev is -fully set up, since we call down into the fbdev from the hotplug work -functions. So stick the hpd enabling right next to the poll helper -initialization. - -v5: We need to enable irqs before intel_modeset_init, since that -function sets up the outputs. - -v6: Fixup cleanup sequence, too. - -Reviewed-by: Imre Deak -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_dma.c | 23 ++++++++++++++--------- - drivers/gpu/drm/i915/i915_drv.h | 1 + - drivers/gpu/drm/i915/i915_irq.c | 4 ++++ - 3 files changed, 19 insertions(+), 9 deletions(-) - ---- a/drivers/gpu/drm/i915/i915_dma.c -+++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -1297,19 +1297,21 @@ static int i915_load_modeset_init(struct - if (ret) - goto cleanup_vga_switcheroo; - -+ ret = drm_irq_install(dev); -+ if (ret) -+ goto cleanup_gem_stolen; -+ -+ /* Important: The output setup functions called by modeset_init need -+ * working irqs for e.g. gmbus and dp aux transfers. */ - intel_modeset_init(dev); - - ret = i915_gem_init(dev); - if (ret) -- goto cleanup_gem_stolen; -- -- intel_modeset_gem_init(dev); -+ goto cleanup_irq; - - INIT_WORK(&dev_priv->console_resume_work, intel_console_resume); - -- ret = drm_irq_install(dev); -- if (ret) -- goto cleanup_gem; -+ intel_modeset_gem_init(dev); - - /* Always safe in the mode setting case. */ - /* FIXME: do pre/post-mode set stuff in core KMS code */ -@@ -1317,7 +1319,10 @@ static int i915_load_modeset_init(struct - - ret = intel_fbdev_init(dev); - if (ret) -- goto cleanup_irq; -+ goto cleanup_gem; -+ -+ /* Only enable hotplug handling once the fbdev is fully set up. */ -+ dev_priv->enable_hotplug_processing = true; - - drm_kms_helper_poll_init(dev); - -@@ -1326,13 +1331,13 @@ static int i915_load_modeset_init(struct - - return 0; - --cleanup_irq: -- drm_irq_uninstall(dev); - cleanup_gem: - mutex_lock(&dev->struct_mutex); - i915_gem_cleanup_ringbuffer(dev); - mutex_unlock(&dev->struct_mutex); - i915_gem_cleanup_aliasing_ppgtt(dev); -+cleanup_irq: -+ drm_irq_uninstall(dev); - cleanup_gem_stolen: - i915_gem_cleanup_stolen(dev); - cleanup_vga_switcheroo: ---- a/drivers/gpu/drm/i915/i915_drv.h -+++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -672,6 +672,7 @@ typedef struct drm_i915_private { - - u32 hotplug_supported_mask; - struct work_struct hotplug_work; -+ bool enable_hotplug_processing; - - int num_pipe; - int num_pch_pll; ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -287,6 +287,10 @@ static void i915_hotplug_work_func(struc - struct drm_mode_config *mode_config = &dev->mode_config; - struct intel_encoder *encoder; - -+ /* HPD irq before everything is fully set up. */ -+ if (!dev_priv->enable_hotplug_processing) -+ return; -+ - mutex_lock(&mode_config->mutex); - DRM_DEBUG_KMS("running encoder hotplug functions\n"); - diff --git a/kernels/linux-libre-xen/fat-3.6.x.patch b/kernels/linux-libre-xen/fat-3.6.x.patch deleted file mode 100644 index d8deeb788..000000000 --- a/kernels/linux-libre-xen/fat-3.6.x.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Dave Reisner -Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100) -Subject: fs/fat: strip "cp" prefix from codepage in display -X-Git-Tag: next-20121130~1^2~97 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 - -fs/fat: strip "cp" prefix from codepage in display - -Option parsing code expects an unsigned integer for the codepage option, -but prefixes and stores this option with "cp" before passing to -load_nls(). This makes the displayed option in /proc an invalid one. -Strip the prefix when printing so that the displayed option is valid for -reuse. - -Signed-off-by: Dave Reisner -Acked-by: OGAWA Hirofumi -Signed-off-by: Andrew Morton ---- - -diff --git a/fs/fat/inode.c b/fs/fat/inode.c -index 3b733a7..3580681 100644 ---- a/fs/fat/inode.c -+++ b/fs/fat/inode.c -@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) - if (opts->allow_utime) - seq_printf(m, ",allow_utime=%04o", opts->allow_utime); - if (sbi->nls_disk) -- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); -+ /* strip "cp" prefix from displayed option */ -+ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); - if (isvfat) { - if (sbi->nls_io) - seq_printf(m, ",iocharset=%s", sbi->nls_io->charset); diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index d707e2ef8..0165e78f0 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.3-2-LIBRE-XEN +KERNEL_VERSION=3.8.4-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/gnome-desktop2/PKGBUILD b/libre/gnome-desktop2/PKGBUILD new file mode 100644 index 000000000..e8744d4a4 --- /dev/null +++ b/libre/gnome-desktop2/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan "heftig" Steffens +# Contributor: Jan de Groot + +_pkgname=gnome-desktop +pkgname=${_pkgname}2 +pkgver=2.32.1 +pkgrel=2.1 +pkgdesc="Library with common API for various GNOME modules (legacy version), Parabola rebranded" +arch=(i686 x86_64 mips64el) +license=(GPL LGPL) +depends=(gconf gtk2 startup-notification) +makedepends=(gnome-doc-utils intltool) +url="http://www.gnome.org" +options=(!libtool !emptydirs) +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2) +sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-gnome-distributor="Parabola GNU/Linux-libre" \ + --disable-scrollkeeper \ + --disable-gnome-about --disable-desktop-docs + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/libre/gnome-menus/PKGBUILD b/libre/gnome-menus/PKGBUILD new file mode 100644 index 000000000..186473b5b --- /dev/null +++ b/libre/gnome-menus/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gnome-menus +pkgver=3.6.2 +pkgrel=1.1 +pkgdesc="GNOME menu specifications, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +depends=('glib2' 'python2-gobject') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +license=('GPL' 'LGPL') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + menus.patch) +sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f' + 'de14815d63ab98f999975680a8981702dee0f70d129d4d4fcf4778d966e67435') + +build() { + cd "$pkgname-$pkgver" + + patch -Np0 -i "$srcdir/menus.patch" + + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package(){ + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + sed -i "1s|#!/usr/bin/env python$|&2|" \ + "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py" +} diff --git a/libre/gnome-menus/menus.patch b/libre/gnome-menus/menus.patch new file mode 100644 index 000000000..6648e09ec --- /dev/null +++ b/libre/gnome-menus/menus.patch @@ -0,0 +1,25 @@ +--- layout/applications.menu 2005-06-28 10:16:39.000000000 +0200 ++++ layout/applications.menu 2005-09-12 23:21:20.000000000 +0200 +@@ -7,7 +7,6 @@ + Applications.directory + + +- + /etc/X11/applnk + /usr/share/gnome/apps + +@@ -18,6 +17,14 @@ + + + ++ ++ ++ Parabola ++ Parabola.directory ++ ++ Parabola ++ ++ + + + Accessories diff --git a/libre/gst-libav/PKGBUILD b/libre/gst-libav/PKGBUILD new file mode 100644 index 000000000..3d92dcd9b --- /dev/null +++ b/libre/gst-libav/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gst-libav +pkgver=1.0.6 +pkgrel=1 +pkgdesc="Gstreamer libav Plugin, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url="http://gstreamer.freedesktop.org/" +depends=('gst-plugins-base-libs' 'bzip2') +makedepends=('yasm') +options=(!libtool !emptydirs) +provides=("gst-ffmpeg=$pkgver-$pkgrel") +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('8ab222a52bf7482e913f2c9a4f490cda8f8ed1acfbc429f27451b0558b08044d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \ + --with-package-name="GStreamer libav Plugin (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index 1cb133713..7a12f8ca9 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 178027 2013-02-13 20:38:52Z heftig $ +# $Id: PKGBUILD 180524 2013-03-22 19:07:19Z heftig $ # Maintainer: Jan de Groot # Maintainer (Parabola): Márcio Silva pkgbase=gst-plugins-bad pkgname=gst-plugins-bad-libre -pkgver=1.0.5 -pkgrel=1.1 -pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' +pkgver=1.0.6 +pkgrel=1 +pkgdesc='GStreamer Multimedia Framework Bad Plugins, with nonfree faac support removed and Parabola rebranded' arch=( i686 x86_64 @@ -58,7 +58,7 @@ source=( "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz" ) sha256sums=( - 2e8f5b9a2fd274142d0a916b6425b9466028978b85858dc835dc80de744b276a + 92130899d0b78b71f1551cada9b10b550e91506c2d7b8b748e5cc18a620d302d ) build() { @@ -69,7 +69,7 @@ build() { automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ - --with-package-name='GStreamer Bad Plugins (Parabola)' \ + --with-package-name='GStreamer Bad Plugins (Parabola GNU/Linux-libre)' \ --with-package-origin='https://parabolagnulinux.org/' \ --with-gtk=3.0 make diff --git a/libre/gst-plugins-base/PKGBUILD b/libre/gst-plugins-base/PKGBUILD new file mode 100644 index 000000000..55ac8e72c --- /dev/null +++ b/libre/gst-plugins-base/PKGBUILD @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgbase=gst-plugins-base +pkgname=('gst-plugins-base-libs' 'gst-plugins-base') +pkgver=1.0.6 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Base Plugins, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') +options=(!libtool !emptydirs) +url="http://gstreamer.freedesktop.org/" +source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) +sha256sums=('85e5f99af690f720ccde5ea7e793269d35883a3ead80ca9985fa44e18bb1a4a5') + +build() { + cd $pkgbase-$pkgver + sed -i -e '/AC_PATH_XTRA/d' configure.ac + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Base Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + make + sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile +} + +check() { + cd $pkgbase-$pkgver + # Testsuite fails on one test. Some refcount leak + make check +} + +package_gst-plugins-base-libs() { + pkgdesc="GStreamer Multimedia Framework Base Plugin libraries, Parabola rebranded" + depends=('gstreamer' 'orc' 'libxv') + + cd $pkgbase-$pkgver + make DESTDIR="${pkgdir}" install +} + +package_gst-plugins-base() { + depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') + + cd $pkgbase-$pkgver + make -C gst-libs DESTDIR="${pkgdir}" install + make -C ext DESTDIR="${pkgdir}" install + make -C gst-libs DESTDIR="${pkgdir}" uninstall +} diff --git a/libre/gst-plugins-good/PKGBUILD b/libre/gst-plugins-good/PKGBUILD new file mode 100644 index 000000000..9101bfdba --- /dev/null +++ b/libre/gst-plugins-good/PKGBUILD @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gst-plugins-good +pkgver=1.0.6 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Good Plugins, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo') +makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') +options=(!libtool !emptydirs) +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('67f7690a9826d9a6ab28b9af2536a6f3e833ee412bd59dd603c48fb3c6823e0d') + +build() { + cd $pkgname-$pkgver + sed -i -e '/AC_PATH_XTRA/d' configure.ac + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Good Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install +} diff --git a/libre/gst-plugins-ugly/PKGBUILD b/libre/gst-plugins-ugly/PKGBUILD new file mode 100644 index 000000000..e0cc268ff --- /dev/null +++ b/libre/gst-plugins-ugly/PKGBUILD @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gst-plugins-ugly +pkgver=1.0.6 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Ugly Plugins, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +options=(!libtool !emptydirs) +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('8655ceec7533b5d30080a5051025e26ff8d06bea8d03a6b2af56c2f839d60586') + +build() { + cd $pkgname-$pkgver + sed -i '/AC_PATH_XTRA/d' configure.ac + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/libre/gstreamer/PKGBUILD b/libre/gstreamer/PKGBUILD new file mode 100644 index 000000000..2eb34bb72 --- /dev/null +++ b/libre/gstreamer/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gstreamer +pkgver=1.0.6 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('libxml2' 'glib2') +optdepends=('sh: feedback script') +makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') +options=('!libtool') +source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) +sha256sums=('50d4050cd6a23684b6bbf40a9b7c132edfb39fe9db2d81980adaa6e72f4d5826') + +build() { + cd "${srcdir}/gstreamer-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ + --with-package-name="GStreamer (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" \ + --enable-gtk-doc --disable-static + make +} + +check() { + cd "${srcdir}/gstreamer-${pkgver}" + make check +} + +package() { + cd "${srcdir}/gstreamer-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 883a9eefb..30c475d39 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=gstreamer0.10-bad-libre pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') pkgver=0.10.23 -pkgrel=3.1 -arch=('i686' 'x86_64') +pkgrel=3.2 +arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus') url="http://gstreamer.freedesktop.org/" @@ -19,7 +19,7 @@ build() { cd "${srcdir}/gst-plugins-bad-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ - --with-package-name="GStreamer Bad Plugins (Parabola)" \ + --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \ --with-package-origin="https://parabolagnulinux.org/" make @@ -33,7 +33,7 @@ build() { #} package_gstreamer0.10-bad-libre() { - pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)" + pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad), with non free faac support removed and Parabola rebranded" depends=('gstreamer0.10-base>=0.10.34') provides=("gstreamer0.10-bad=$pkgver") conflicts=('gstreamer0.10-bad') @@ -44,7 +44,7 @@ package_gstreamer0.10-bad-libre() { } package_gstreamer0.10-bad-libre-plugins() { - pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)" + pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad), with non free faac support removed and Parabola rebranded" depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus') groups=('gstreamer0.10-plugins') install=gstreamer0.10-bad-plugins.install diff --git a/libre/gstreamer0.10-base/PKGBUILD b/libre/gstreamer0.10-base/PKGBUILD new file mode 100644 index 000000000..620c0bd87 --- /dev/null +++ b/libre/gstreamer0.10-base/PKGBUILD @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgbase=('gstreamer0.10-base') +pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') +pkgver=0.10.36 +pkgrel=1.1 +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') +options=(!libtool !emptydirs) +url="http://gstreamer.freedesktop.org/" +source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.xz) +sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a') + +build() { + cd "${srcdir}/gst-plugins-base-${pkgver}" + sed -i '/AC_PATH_XTRA/d' configure.ac + autoreconf + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental --disable-gnome_vfs \ + --with-package-name="GStreamer Base Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + + make + sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile +} + +check() { + cd "${srcdir}/gst-plugins-base-${pkgver}" + make check +} + +package_gstreamer0.10-base() { + pkgdesc="GStreamer Multimedia Framework Base plugin libraries, Parabola rebranded" + depends=('gstreamer0.10>=0.10.35' 'orc' 'libxv') + + cd "${srcdir}/gst-plugins-base-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gstreamer0.10-base-plugins() { + pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base), Parabola rebranded" + depends=("gstreamer0.10-base=${pkgver}" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') + replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') + conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') + groups=('gstreamer0.10-plugins') + + cd "${srcdir}/gst-plugins-base-${pkgver}" + make -C gst-libs DESTDIR="${pkgdir}" install + make -C ext DESTDIR="${pkgdir}" install + make -C gst-libs DESTDIR="${pkgdir}" uninstall +} diff --git a/libre/gstreamer0.10-good/PKGBUILD b/libre/gstreamer0.10-good/PKGBUILD index abe7dc0ef..4cbaddd1e 100644 --- a/libre/gstreamer0.10-good/PKGBUILD +++ b/libre/gstreamer0.10-good/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') pkgver=0.10.31 -pkgrel=1.1 -arch=('i686' 'x86_64') +pkgrel=1.2 +arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') url="http://gstreamer.freedesktop.org/" @@ -32,7 +32,7 @@ build() { package_gstreamer0.10-good() { depends=('gstreamer0.10-base>=0.10.34' 'bzip2') - pkgdesc="GStreamer Multimedia Framework Good plugin libraries (Parabola rebranded)" + pkgdesc="GStreamer Multimedia Framework Good plugin libraries, Parabola rebranded" cd "${srcdir}/gst-plugins-good-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install @@ -41,7 +41,7 @@ package_gstreamer0.10-good() { package_gstreamer0.10-good-plugins() { depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') - pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" + pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good), Parabola rebranded" groups=('gstreamer0.10-plugins') replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') diff --git a/libre/gstreamer0.10-ugly/PKGBUILD b/libre/gstreamer0.10-ugly/PKGBUILD new file mode 100644 index 000000000..6709ab2ea --- /dev/null +++ b/libre/gstreamer0.10-ugly/PKGBUILD @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgbase=gstreamer0.10-ugly +pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') +pkgver=0.10.19 +pkgrel=5.1 +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +url="http://gstreamer.freedesktop.org/" +options=(!libtool) +source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz + opencore-amr.patch + cdio-cd-text-api.patch) +md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' + 'd8feb6c99bfaff8be6b2c48ea4e98e47' + '6c1c665f864387f3a77d32231fedeaab') + +build() { + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + patch -Np0 -i "${srcdir}/opencore-amr.patch" + patch -Np1 -i "${srcdir}/cdio-cd-text-api.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + make + sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile +} + +check() { + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make check +} + +package_gstreamer0.10-ugly() { + pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries, Parabola rebranded" + depends=('gstreamer0.10-base>=0.10.34') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gstreamer0.10-ugly-plugins() { + pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly), Parabola rebranded" + depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') + groups=('gstreamer0.10-plugins') + replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make -C ext DESTDIR="${pkgdir}" install +} diff --git a/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch b/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch new file mode 100644 index 000000000..cbd16b8e4 --- /dev/null +++ b/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch @@ -0,0 +1,183 @@ +From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 +From: Leon Merten Lohse +Date: Thu, 03 May 2012 22:50:30 +0000 +Subject: cdio: compensate for libcdio's recent cd-text api changes + +https://bugzilla.gnome.org/show_bug.cgi?id=675112 + +Conflicts: + + ext/cdio/gstcdiocddasrc.c +--- +diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c +index 2f58d18..483ebf5 100644 +--- a/ext/cdio/gstcdio.c ++++ b/ext/cdio/gstcdio.c +@@ -30,12 +30,16 @@ + GST_DEBUG_CATEGORY (gst_cdio_debug); + + void +-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, ++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, + cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) + { + const gchar *txt; + ++#if LIBCDIO_VERSION_NUM > 83 ++ txt = cdtext_get_const (cdtext, field, track); ++#else + txt = cdtext_get_const (field, cdtext); ++#endif + if (txt == NULL || *txt == '\0') { + GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); + return; +@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, + } + + GstTagList * ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) ++{ ++ GstTagList *tags = NULL; ++ ++#else + gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + { + GstTagList *tags = NULL; +@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); + return NULL; + } ++#endif + +- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, ++ &tags); + + return tags; + } + + void ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, ++ GstTagList * tags) ++{ ++#else + gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + { + cdtext_t *t; +@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); + return; + } ++#endif + +- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); +- ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ALBUM_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, ++ &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, ++ &tags); + GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); + } + +diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h +index ef31ed0..c6da580 100644 +--- a/ext/cdio/gstcdio.h ++++ b/ext/cdio/gstcdio.h +@@ -24,22 +24,38 @@ + #include + #include + #include ++#include ++ ++#if LIBCDIO_VERSION_NUM <= 83 ++ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER ++ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE ++ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE ++#endif + + GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); + #define GST_CAT_DEFAULT gst_cdio_debug + + void gst_cdio_add_cdtext_field (GstObject * src, + cdtext_t * cdtext, ++ track_t track, + cdtext_field_t field, + const gchar * gst_tag, + GstTagList ** p_tags); + + GstTagList * gst_cdio_get_cdtext (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + track_t track); + + void gst_cdio_add_cdtext_album_tags (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + GstTagList * tags); + + #endif /* __GST_CDIO_H__ */ +diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c +index 615a0c8..830839e 100644 +--- a/ext/cdio/gstcdiocddasrc.c ++++ b/ext/cdio/gstcdiocddasrc.c +@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + GstCdioCddaSrc *src; + discmode_t discmode; + gint first_track, num_tracks, i; ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t *cdtext; ++#endif + + src = GST_CDIO_CDDA_SRC (audiocdsrc); + +@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + if (src->read_speed != -1) + cdio_set_speed (src->cdio, src->read_speed); + ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext = cdio_get_cdtext (src->cdio); ++ ++ if (NULL == cdtext) ++ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); ++ else ++ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, ++ cddabasesrc->tags); ++#else + gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, + cddabasesrc->tags); ++#endif + + GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); + +@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + * the right thing here (for cddb id calculations etc. as well) */ + track.start = cdio_get_track_lsn (src->cdio, i + first_track); + track.end = track.start + len_sectors - 1; /* -1? */ ++#if LIBCDIO_VERSION_NUM > 83 ++ if (NULL != cdtext) ++ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, ++ i + first_track); ++#else + track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, + i + first_track); ++#endif + + gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/libre/gstreamer0.10-ugly/opencore-amr.patch b/libre/gstreamer0.10-ugly/opencore-amr.patch new file mode 100644 index 000000000..0a350dc46 --- /dev/null +++ b/libre/gstreamer0.10-ugly/opencore-amr.patch @@ -0,0 +1,35 @@ +--- ext/amrnb/amrnbdec.h.orig 2012-03-12 16:49:14.417405139 +0000 ++++ ext/amrnb/amrnbdec.h 2012-03-12 16:49:35.393899419 +0000 +@@ -22,7 +22,7 @@ + + #include + #include +-#include ++#include + + G_BEGIN_DECLS + +--- ext/amrnb/amrnbenc.h.orig 2012-03-12 16:49:23.833996062 +0000 ++++ ext/amrnb/amrnbenc.h 2012-03-12 16:49:46.597141876 +0000 +@@ -21,7 +21,7 @@ + #define __GST_AMRNBENC_H__ + + #include +-#include ++#include + #include + + G_BEGIN_DECLS +--- ext/amrwbdec/amrwbdec.h.orig 2012-03-12 16:47:48.658100992 +0000 ++++ ext/amrwbdec/amrwbdec.h 2012-03-12 16:48:12.177910733 +0000 +@@ -22,8 +22,8 @@ + + #include + #include +-#include +-#include ++#include ++#include + + G_BEGIN_DECLS + diff --git a/libre/gstreamer0.10/PKGBUILD b/libre/gstreamer0.10/PKGBUILD new file mode 100644 index 000000000..416c1cbd9 --- /dev/null +++ b/libre/gstreamer0.10/PKGBUILD @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gstreamer0.10 +pkgver=0.10.36 +pkgrel=1.1 +pkgdesc="GStreamer Multimedia Framework, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('libxml2' 'glib2') +optdepends=('sh: feedback script') +makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') +options=('!libtool') +source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) +md5sums=('15389c73e091b1dda915279c388b9cb2') + +build() { + cd "${srcdir}/gstreamer-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ + --with-package-name="GStreamer (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" \ + --enable-gtk-doc --disable-static + make +} + +check() { + cd "${srcdir}/gstreamer-${pkgver}" + make check +} + +package() { + cd "${srcdir}/gstreamer-${pkgver}" + make DESTDIR="${pkgdir}" install + + #Remove unversioned gst-* binaries to get rid of conflicts + cd "${pkgdir}/usr/bin" + for bins in `ls *-0.10`; do + rm -f ${bins/-0.10/} + done +} diff --git a/libre/libtasn1/PKGBUILD b/libre/libtasn1/PKGBUILD new file mode 100644 index 000000000..2131a323b --- /dev/null +++ b/libre/libtasn1/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jan de Groot +# Contributor: judd + +pkgname=libtasn1 +pkgver=3.2 +pkgrel=1.1 +pkgdesc="The ASN.1 library used in GNUTLS, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL3' 'LGPL') +url="http://www.gnu.org/software/libtasn1/" +depends=('glibc' 'texinfo') +options=('!libtool') +install=libtasn1.install +source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('1b07629163025b9693aae9b8957842b2' + '67bdae9b78ac7bbfa2ab24c7d46bd577') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --with-packager="Parabola GNU/Linux-libre" \ + --with-packager-bug-reports="https://labs.parabola.nu/" \ + --with-packager-version=${pkgver}-${pkgrel} + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/libtasn1/libtasn1.install b/libre/libtasn1/libtasn1.install new file mode 100644 index 000000000..2d1ecc09f --- /dev/null +++ b/libre/libtasn1/libtasn1.install @@ -0,0 +1,18 @@ +info_dir=/usr/share/info +info_files=(libtasn1.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index b9860cb3f..25343fd26 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.3 -_kernrel=2 +_kernver=3.8.4 +_kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=9 +pkgrel=10 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 3a0571c9d..5e59c2fec 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.69 +_kernver=3.0.70 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=7 +pkgrel=8 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index fc87dbdb6..eaa185f4f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180056 2013-03-15 09:48:23Z tpowa $ +# $Id: PKGBUILD 180408 2013-03-21 07:53:18Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,7 +7,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=69 +_sublevel=70 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.69 # nearly always the same as pkgver @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'cf63ee4dfe973aa9f933ed552ac5c277' + '0f4930f721d1815e7e1d724775bfadd9' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index f8eccd0c4..e0a21d3fa 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.69-1-LIBRE-LTS +KERNEL_VERSION=3.0.70-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d242c7cc8..080c8dcba 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180114 2013-03-17 13:00:07Z tpowa $ +# $Id: PKGBUILD 180406 2013-03-21 07:26:50Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,9 +10,9 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=3 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} -pkgrel=2 +pkgrel=1 _lxopkgver=${_basekernel}.3 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -29,11 +29,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'drm-i915-enable-irqs-earlier-when-resuming.patch' - 'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'a762b6f22a64473a0b4d8dc5366b25d3' + 'be610dd93dbe033cfe04018b27557c3e' '4d73ccd0f1825a4bd474d4fead6c0d42' 'e132184c6d02ef580a504967c067e1c5' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -41,8 +39,6 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '40e7b328977ad787a0b5584f193d63fe' - '8b9159931fab0c191a86dbd5a46fa328' '6dcf31e2ad8625ab2864af257e86564b') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -68,11 +64,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # revert 2 patches which breaks displays - # FS 34327 - patch -Rp1 -i "${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch" - patch -Rp1 -i "${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch b/libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch deleted file mode 100644 index cb621d520..000000000 --- a/libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Tue, 5 Mar 2013 09:50:58 +0100 -Subject: drm/i915: enable irqs earlier when resuming - -From: Daniel Vetter - -commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream. - -We need it to restore the ilk rc6 context, since the gpu wait no -requires interrupts. But in general having interrupts around should -help in code sanity, since more and more stuff is interrupt driven. - -This regression has been introduced in - -commit 3e9605018ab3e333d51cc90fccfde2031886763b -Author: Chris Wilson -Date: Tue Nov 27 16:22:54 2012 +0000 - - drm/i915: Rearrange code to only have a single method for waiting upon the ring - -Like in the driver load code we need to make sure that hotplug -interrupts don't cause havoc with our modeset state, hence block them -with the existing infrastructure. Again we ignore races where we might -loose hotplug interrupts ... - -Note that the driver load part of the regression has already been -fixed in - -commit 52d7ecedac3f96fb562cb482c139015372728638 -Author: Daniel Vetter -Date: Sat Dec 1 21:03:22 2012 +0100 - - drm/i915: reorder setup sequence to have irqs for output setup - -v2: Add a note to the commit message about which patch fixed the -driver load part of the regression. Stable kernels need to backport -both patches. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691 -Cc: Chris Wilson -Cc: Mika Kuoppala -Reported-and-Tested-by: Ilya Tumaykin -Reviewed-by: Chris wilson (v1) -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_drv.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/i915/i915_drv.c -+++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -486,6 +486,7 @@ static int i915_drm_freeze(struct drm_de - intel_modeset_disable(dev); - - drm_irq_uninstall(dev); -+ dev_priv->enable_hotplug_processing = false; - } - - i915_save_state(dev); -@@ -562,9 +563,19 @@ static int __i915_drm_thaw(struct drm_de - error = i915_gem_init_hw(dev); - mutex_unlock(&dev->struct_mutex); - -+ /* We need working interrupts for modeset enabling ... */ -+ drm_irq_install(dev); -+ - intel_modeset_init_hw(dev); - intel_modeset_setup_hw_state(dev, false); -- drm_irq_install(dev); -+ -+ /* -+ * ... but also need to make sure that hotplug processing -+ * doesn't cause havoc. Like in the driver load code we don't -+ * bother with the tiny race here where we might loose hotplug -+ * notifications. -+ * */ -+ dev_priv->enable_hotplug_processing = true; - } - - intel_opregion_init(dev); diff --git a/libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch b/libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch deleted file mode 100644 index 8dc354488..000000000 --- a/libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 52d7ecedac3f96fb562cb482c139015372728638 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Sat, 1 Dec 2012 21:03:22 +0100 -Subject: drm/i915: reorder setup sequence to have irqs for output setup - -From: Daniel Vetter - -commit 52d7ecedac3f96fb562cb482c139015372728638 upstream. - -Otherwise the new&shiny irq-driven gmbus and dp aux code won't work that -well. Noticed since the dp aux code doesn't have an automatic fallback -with a timeout (since the hw provides for that already). - -v2: Simple move drm_irq_install before intel_modeset_gem_init, as -suggested by Ben Widawsky. - -v3: Now that interrupts are enabled before all connectors are fully -set up, we might fall over serving a HPD interrupt while things are -still being set up. Instead of jumping through massive hoops and -complicating the code with a separate hpd irq enable step, simply -block out the hotplug work item from doing anything until things are -in place. - -v4: Actually, we can enable hotplug processing only after the fbdev is -fully set up, since we call down into the fbdev from the hotplug work -functions. So stick the hpd enabling right next to the poll helper -initialization. - -v5: We need to enable irqs before intel_modeset_init, since that -function sets up the outputs. - -v6: Fixup cleanup sequence, too. - -Reviewed-by: Imre Deak -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_dma.c | 23 ++++++++++++++--------- - drivers/gpu/drm/i915/i915_drv.h | 1 + - drivers/gpu/drm/i915/i915_irq.c | 4 ++++ - 3 files changed, 19 insertions(+), 9 deletions(-) - ---- a/drivers/gpu/drm/i915/i915_dma.c -+++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -1297,19 +1297,21 @@ static int i915_load_modeset_init(struct - if (ret) - goto cleanup_vga_switcheroo; - -+ ret = drm_irq_install(dev); -+ if (ret) -+ goto cleanup_gem_stolen; -+ -+ /* Important: The output setup functions called by modeset_init need -+ * working irqs for e.g. gmbus and dp aux transfers. */ - intel_modeset_init(dev); - - ret = i915_gem_init(dev); - if (ret) -- goto cleanup_gem_stolen; -- -- intel_modeset_gem_init(dev); -+ goto cleanup_irq; - - INIT_WORK(&dev_priv->console_resume_work, intel_console_resume); - -- ret = drm_irq_install(dev); -- if (ret) -- goto cleanup_gem; -+ intel_modeset_gem_init(dev); - - /* Always safe in the mode setting case. */ - /* FIXME: do pre/post-mode set stuff in core KMS code */ -@@ -1317,7 +1319,10 @@ static int i915_load_modeset_init(struct - - ret = intel_fbdev_init(dev); - if (ret) -- goto cleanup_irq; -+ goto cleanup_gem; -+ -+ /* Only enable hotplug handling once the fbdev is fully set up. */ -+ dev_priv->enable_hotplug_processing = true; - - drm_kms_helper_poll_init(dev); - -@@ -1326,13 +1331,13 @@ static int i915_load_modeset_init(struct - - return 0; - --cleanup_irq: -- drm_irq_uninstall(dev); - cleanup_gem: - mutex_lock(&dev->struct_mutex); - i915_gem_cleanup_ringbuffer(dev); - mutex_unlock(&dev->struct_mutex); - i915_gem_cleanup_aliasing_ppgtt(dev); -+cleanup_irq: -+ drm_irq_uninstall(dev); - cleanup_gem_stolen: - i915_gem_cleanup_stolen(dev); - cleanup_vga_switcheroo: ---- a/drivers/gpu/drm/i915/i915_drv.h -+++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -672,6 +672,7 @@ typedef struct drm_i915_private { - - u32 hotplug_supported_mask; - struct work_struct hotplug_work; -+ bool enable_hotplug_processing; - - int num_pipe; - int num_pch_pll; ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -287,6 +287,10 @@ static void i915_hotplug_work_func(struc - struct drm_mode_config *mode_config = &dev->mode_config; - struct intel_encoder *encoder; - -+ /* HPD irq before everything is fully set up. */ -+ if (!dev_priv->enable_hotplug_processing) -+ return; -+ - mutex_lock(&mode_config->mutex); - DRM_DEBUG_KMS("running encoder hotplug functions\n"); - diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 24bb42986..6b7f58a8b 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.3-2-LIBRE +KERNEL_VERSION=3.8.4-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD new file mode 100644 index 000000000..7d594cdcd --- /dev/null +++ b/libre/usermin/PKGBUILD @@ -0,0 +1,134 @@ +# $Id$ +# Maintainer: Tobias Powalowski +pkgname=usermin +pkgver=1.540 +pkgrel=1.1 +pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)" +arch=(i686 x86_64 mips64el) +license=('custom:usermin') +url="http://www.webmin.com/" +depends=('perl' 'webmin') +makedepends=('perl-net-ssleay') +backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \ +'etc/usermin/at/config' \ +'etc/usermin/man/config' \ +'etc/usermin/ssh/config' \ +'etc/usermin/chfn/config' \ +'etc/usermin/cron/config' \ +'etc/usermin/file/config' \ +'etc/usermin/plan/config' \ +'etc/usermin/proc/config' \ +'etc/usermin/spam/config' \ +'etc/usermin/htaccess/config' \ +'etc/usermin/cshrc/config' \ +'etc/usermin/gnupg/config' \ +'etc/usermin/mysql/config' \ +'etc/usermin/quota/config' \ +'etc/usermin/shell/config' \ +'etc/usermin/theme/config' \ +'etc/usermin/mailbox/config' \ +'etc/usermin/schedule/config' \ +'etc/usermin/config' \ +'etc/usermin/commands/config' \ +'etc/usermin/htaccess-htpasswd/config' \ +'etc/usermin/forward/config' \ +'etc/usermin/telnet/config' \ +'etc/usermin/tunnel/config' \ +'etc/usermin/updown/config' \ +'etc/usermin/procmail/config' \ +'etc/usermin/fetchmail/config' \ +'etc/usermin/changepass/config' \ +'etc/usermin/language/config' \ +'etc/usermin/postgresql/config' \ +'etc/usermin/usermount/config' \ +) +install=usermin.install +source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz + usermin.rc + usermin.service + ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) + +package() { + cd "$srcdir"/$pkgname-$pkgver + + # remove modules we do not support + + #remove config files from other distros + rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*') + + # remove caldera theme + rm -rf caldera + + # remove init-scripts from other distros + rm usermin-init + rm usermin-daemon + + # setting perl path + (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - + + # create dirs + mkdir -p "$pkgdir"/opt/usermin + mkdir -p "$pkgdir"/var/log/usermin + mkdir -p "$pkgdir"/etc/usermin + + # install pam stuff + install -D -m 644 usermin-pam "$pkgdir"/etc/pam.d/usermin + + # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work! + rm os_list.txt + echo 'Parabola GNU/Linux-libre Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt + + # copy stuff to right dirs + cd "$srcdir"/$pkgname-$pkgver + cp -rp * "$pkgdir"/opt/usermin + cd "$srcdir"/usermin-config + cp -rfp * "$pkgdir"/opt/usermin + + # define parameters for setup.sh + config_dir="$pkgdir"/etc/usermin + var_dir="$pkgdir"/var/log/usermin + perl=/usr/bin/perl + autoos=1 + port=20000 + login=root + crypt="XXX" + ssl=1 + atboot=0 + nostart=1 + nochown=1 + autothird=1 + nouninstall=1 + noperlpath=1 + atbootyn=n + tempdir="$pkgdir"/tmp + export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt + + # Fix setup.sh + sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/usermin/setup.sh + "$pkgdir"/opt/usermin/setup.sh + + # Fixup the config files to use their real locations + sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf + find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \; + + # make it only accessible by localhost + echo 'allow=127.0.0.1' >> "$pkgdir"/etc/usermin/miniserv.conf + + # enable user and password login + sed -i -e '/localauth/d' "$pkgdir"/etc/usermin/miniserv.conf + + #install systemd service file + install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service + + #install rc file + install -D -m 755 "$srcdir"/usermin.rc "$pkgdir"/etc/rc.d/usermin + + # delete temp dir + rm -r "$pkgdir"/tmp + #install license + install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE +} +md5sums=('d29c9fdebab14c168c33bde8906efe21' + 'cfef4490cd1ef9517c0b39a7bd75c968' + 'a5bd5e5ee779f8a3cf3d776ca77ee36e' + 'ec37a79f948f778224550930d2a7ca07') diff --git a/libre/usermin/usermin.install b/libre/usermin/usermin.install new file mode 100644 index 000000000..3ace10ea2 --- /dev/null +++ b/libre/usermin/usermin.install @@ -0,0 +1,34 @@ +# arg 1: the new package version +post_install() { + local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :) + crypt=${crypt//\\/\\\\} + crypt=${crypt//\//\\\/} + sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users +cat << EOF +Note: +==> It is not allowed to install 3rd party modules, or delete existing modules. +==> Please write your own PKGBUILDS for 3rd party modules and additional themes. +Setup: +==> To make usermin start at boot time, add usermin to rc.conf daemons +==> Point your web browser to http://localhost:20000 to use usermin. +==> To change the modules setup please use webmin. + +==> The access is restricted to localhost, if you want to connect from other locations +==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 +==> If you want to have ssl encryption please install 'perl-net-ssleay' additional. +EOF +# fix man module + cd /opt/usermin/man + gzip -df $(find . -name '*.gz') +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +pre_remove() { + # uninstall unzipped files + rm -r /opt/usermin/man +} diff --git a/libre/usermin/usermin.rc b/libre/usermin/usermin.rc new file mode 100644 index 000000000..af365780a --- /dev/null +++ b/libre/usermin/usermin.rc @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +start=/etc/usermin/start +stop=/etc/usermin/stop +lockfile=/var/lock/usermin + +case "$1" in +'start') + stat_busy "Starting Usermin daemon" + $start >/dev/null 2>&1 /dev/null 2>&1 + stat_done + else + stat_fail +fi +;; + +'stop') + stat_busy "Stopping Usermin daemon" + $stop >/dev/null 2>&1 +pkgname=webmin +pkgver=1.620 +pkgrel=1.1 +pkgdesc="a web-based interface for system administration, Parabola rebranded" +arch=(i686 x86_64 mips64el) +license=('custom:webmin') +url="http://www.webmin.com/" +depends=('perl' 'perl-perl4-corelibs') +makedepends=('perl-net-ssleay') +backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \ +'etc/webmin/pacman/config' \ +'etc/webmin/at/config' \ +'etc/webmin/acl/config' \ +'etc/webmin/lvm/config' \ +'etc/webmin/net/config' \ +'etc/webmin/nis/config' \ +'etc/webmin/pam/config' \ +'etc/webmin/cron/config' \ +'etc/webmin/file/config' \ +'etc/webmin/grub/config' \ +'etc/webmin/init/config' \ +'etc/webmin/ipfw/config' \ +'etc/webmin/lilo/config' \ +'etc/webmin/proc/config' \ +'etc/webmin/raid/config' \ +'etc/webmin/spam/config' \ +'etc/webmin/sshd/config' \ +'etc/webmin/time/config' \ +'etc/webmin/cluster-passwd/config' \ +'etc/webmin/software/config' \ +'etc/webmin/webminlog/config' \ +'etc/webmin/cluster-webmin/config' \ +'etc/webmin/bind8/config' \ +'etc/webmin/dhcpd/config' \ +'etc/webmin/fdisk/config' \ +'etc/webmin/mount/config' \ +'etc/webmin/mysql/config' \ +'etc/webmin/quota/config' \ +'etc/webmin/samba/config' \ +'etc/webmin/shell/config' \ +'etc/webmin/squid/config' \ +'etc/webmin/adsl-client/config' \ +'etc/webmin/servers/config' \ +'etc/webmin/cluster-shell/config' \ +'etc/webmin/bandwidth/config' \ +'etc/webmin/ppp-client/config' \ +'etc/webmin/lpadmin/config' \ +'etc/webmin/apache/config' \ +'etc/webmin/firewall/config' \ +'etc/webmin/stunnel/config' \ +'etc/webmin/burner/config' \ +'etc/webmin/exports/config' \ +'etc/webmin/backup-config/config' \ +'etc/webmin/custom/config' \ +'etc/webmin/htaccess-htpasswd/config' \ +'etc/webmin/logrotate/config' \ +'etc/webmin/format/config' \ +'etc/webmin/fsdump/config' \ +'etc/webmin/passwd/config' \ +'etc/webmin/cluster-useradmin/config' \ +'etc/webmin/cluster-software/config' \ +'etc/webmin/cluster-copy/config' \ +'etc/webmin/cluster-cron/config' \ +'etc/webmin/telnet/config' \ +'etc/webmin/status/config' \ +'etc/webmin/syslog/config' \ +'etc/webmin/updown/config' \ +'etc/webmin/usermin/config' \ +'etc/webmin/webmin/config' \ +'etc/webmin/xinetd/config' \ +'etc/webmin/openslp/config' \ +'etc/webmin/procmail/config' \ +'etc/webmin/fetchmail/config' \ +'etc/webmin/postgresql/config' \ +'etc/webmin/useradmin/config' \ +'etc/webmin/mailboxes/config' \ +'etc/webmin/inittab/config' \ +'etc/webmin/change-user/config' \ +'etc/webmin/postfix/config' \ +'etc/webmin/proftpd/config' \ +'etc/webmin/pserver/config' \ +'etc/webmin/dnsadmin/config' ) +install=webmin.install +source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz + ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 + ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 + webmin.rc + webmin.service) +options=(!strip) + +package() { + # NOTE: USE --asroot build option to avoid fakeroot error! + cd "$srcdir"/$pkgname-$pkgver + # add patches from webmin.com + #for i in ../*.wbm + #do tar xvf $i + #done + #for i in ../*.wbt + #do tar xvf $i + #done + # delete stuff that's not needed + rm -f mount/freebsd-mounts* + rm -f mount/openbsd-mounts* + rm -f mount/macos-mounts* + + # remove modules we do not support + rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin} + + #remove config files from other distros + rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*') + + # remove caldera theme + rm -rf caldera + + # remove init-scripts from other distros + rm webmin-gentoo-init + rm webmin-init + rm webmin-caldera-init + rm webmin-daemon + + # remove update stuff to avoid problems with updating webmin,modules and themes without pacman + rm -f webmin/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi} + rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi} + + # remove modules add because we don't want files installed without pacman control + rm -f webmin/{install_mod.cgi,delete_mod.cgi} + + # setting perl path + (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - + + # create dirs + mkdir -p "$pkgdir"/opt/webmin + mkdir -p "$pkgdir"/var/log/webmin + mkdir -p "$pkgdir"/etc/webmin + + # install pam stuff + install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin + + # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work! + rm os_list.txt + echo 'Parabola GNU/linux-libre Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt + + # Add rc.conf support to boot and shutdown menu and lock editing of this module + cd init/ + sed -i -e 's:^local_down=.*:local_down=Parabola GNU/Linux-libre RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') + sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') + sed -i -e 's:^index_downscript=.*:index_downscript=Parabola GNU/Linux-libre RC.CONF:g' lang/* + sed -i -e 's:^index_script=.*:index_script=Parabola GNU/Linux-libre RC.LOCAL:g' lang/* + sed -i -e 's:^noconfig=0:noconfig=1:g' defaultacl + + # Add pacman menu + cd "$srcdir"/$pkgname-$pkgver + cp -rf custom/ pacman + cp -rf mscstyle3/custom mscstyle3/pacman + sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl + sed -i -e '/desc/d' -e '/longdesc/d' pacman/module.info + sed -i -e 's:^name=Custom:name=Pacman:g' pacman/module.info + echo 'category=system' >> pacman/module.info + echo 'desc=Pacman' >> pacman/module.info + sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/* + + # copy stuff to right dirs + cd "$srcdir"/$pkgname-$pkgver + cp -rp * "$pkgdir"/opt/webmin + cd "$srcdir"/webmin-config + cp -rfp * "$pkgdir"/opt/webmin + + # define parameters for setup.sh + config_dir="$pkgdir"/etc/webmin + var_dir="$pkgdir"/var/log/webmin + perl=/usr/bin/perl + autoos=1 + port=10000 + login=root + crypt="XXX" + ssl=1 + atboot=0 + nostart=1 + nochown=1 + autothird=1 + nouninstall=1 + noperlpath=1 + atbootyn=n + tempdir="$pkgdir"/tmp + export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn + + # Fix setup.sh + sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh + "$pkgdir"/opt/webmin/setup.sh + + # Fixup the config files to use their real locations + sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf + find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; + + # make it only accessible by localhost + echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf + + # install pacman menu + cd "$srcdir"/webmin-pacman/config + cp -rfp * "$pkgdir"/etc/webmin/pacman + + #install rc file + install -D -m 755 "$srcdir"/webmin.rc "$pkgdir"/etc/rc.d/webmin + + # install systemd files + install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service + + # delete temp dir + rm -r "$pkgdir"/tmp + # change sticky bit + chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux + # install license + install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE +} +md5sums=('e93bc5057a5b7d7e31ecb2bb228d7044' + 'b0b3e3fb231a12e60165b6b4d604dcfa' + 'bfebb75bb94029b48c46b7f1ba1aa811' + 'c77dfcd621b417a7826d25f56a1e60ae' + 'fc29ecb6a5cd8c278abe054e60381095') diff --git a/libre/webmin/webmin.install b/libre/webmin/webmin.install new file mode 100644 index 000000000..efdd9291d --- /dev/null +++ b/libre/webmin/webmin.install @@ -0,0 +1,35 @@ +# arg 1: the new package version +post_install() { + local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :) + crypt=${crypt//\\/\\\\} + crypt=${crypt//\//\\\/} + sed -i "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users + +cat << EOF +Note: +==> It is not allowed to install 3rd party modules, or delete existing modules. +==> Please write your own PKGBUILDS for 3rd party modules and additional themes. +Setup: +==> To make webmin start at boot time, add webmin to rc.conf daemons +==> Point your web browser to http://localhost:10000 to use webmin. +==> The access is restricted to localhost, if you want to connect from other locations +==> change /etc/webmin/miniserv.conf to something like that: allow=127.0.0.1 +==> If you want to have ssl encryption please install 'perl-net-ssleay' additional. +EOF +# fix man module + cd /opt/webmin/man + for i in $(find . -name '*.gz'); do + gzip -df $i + done +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +pre_remove() { + # uninstall unzipped files + rm -r /opt/webmin/man +} diff --git a/libre/webmin/webmin.rc b/libre/webmin/webmin.rc new file mode 100644 index 000000000..6aac8941d --- /dev/null +++ b/libre/webmin/webmin.rc @@ -0,0 +1,46 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +start=/etc/webmin/start +stop=/etc/webmin/stop +lockfile=/var/lock/webmin + +case "$1" in +'start') + stat_busy "Starting Webmin daemon" + $start >/dev/null 2>&1 /dev/null 2>&1 + add_daemon webmin + stat_done + else + stat_fail +fi +;; + +'stop') + stat_busy "Stopping Webmin daemon" + $stop >/dev/null 2>&1 +# Contributor: Tobias Kieslich + +pkgname=xsp +pkgver=2.10.2 +pkgrel=4.1 +pkgdesc="A simple webserver based on mono - provides ASP.NET support, Parabola rebranded" +arch=(i686 x86_64 mips64el) +license=('custom') +url="http://www.go-mono.com" +depends=('mono>=2.10.2' 'sqlite') +options=(!makeflags) +install=${pkgname}.install +source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2 + ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service) + +build() { + # get rid of that .wapi errors; thanks to brice + export MONO_SHARED_DIR=${srcdir}/src/weird + mkdir -p "${MONO_SHARED_DIR}" + # import pathes + # build + cd ${srcdir}/${pkgname}-${pkgver} + #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in + ./configure --prefix=/usr --sysconfdir=/etc + make || return 1 + # tweak the xsp shellscript to grab system dll's + for script in scripts/*2; do + sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script + done + #destdir related bugfixes + sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile + sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir}/ install + # move test files from share to arch' default html home + mkdir -p ${pkgdir}/srv/http/html + mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp + rm -rf ${pkgdir}/usr/share + chown -R http:http ${pkgdir}/srv/http/html/${pkgname} + + # install a deamon + install -D -m755 ${srcdir}/${pkgname}.rc.d \ + ${pkgdir}/etc/rc.d/${pkgname} + # install a deamon configurationfile + install -D -m644 ${srcdir}/$pkgname.conf.d \ + ${pkgdir}/etc/conf.d/${pkgname} + # install a xsp configuration home + install -D -m644 ${srcdir}/${pkgname}.webapp \ + ${pkgdir}/etc/${pkgname}/${pkgname}.webapp + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + # install systemd service file + install -D -m644 ${srcdir}/${pkgname}.service \ + ${pkgdir}/usr/lib/systemd/system/xsp.service +} +md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6' + '9575bd7d6f64d51ba05bdd6370665858' + '35d921df0fefc30f47a438c95d420efc' + 'c917c07f68b945691506c29750db482f' + '9d83bd36d209f8d36a11dfbc4fa50819') diff --git a/libre/xsp/xsp.conf.d b/libre/xsp/xsp.conf.d new file mode 100644 index 000000000..b100baef1 --- /dev/null +++ b/libre/xsp/xsp.conf.d @@ -0,0 +1,10 @@ +# xsp options + + +# note that is just the helping app for mod_mono if you like production like +# quality +# xsp is for ASP testing mainly -- read the manpage for xsp to know what +# options are available. Parabola will provide xsp configured by a .webapp +# configuration file which rests in /etc/xsp + +XSP_PARAMS="--appconfigdir /etc/xsp" diff --git a/libre/xsp/xsp.install b/libre/xsp/xsp.install new file mode 100644 index 000000000..d2cc5955a --- /dev/null +++ b/libre/xsp/xsp.install @@ -0,0 +1,37 @@ +# arg 1: the new package version +post_install() { + cat << EOM + +--> xsp is just the helping app for mod_mono if you like a production like +--> server. xsp itself is for ASP testing mainly -- read the manpage for xsp +--> to know which options are available. +--> Parabola will provide xsp configured by a .webapp configuration file +--> which rests in /etc/xsp. Just put your other webapp files there to let +--> xsp pick them up. +--> xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all +--> your arguments there. Don't forget that you can run xsp from the console +--> as oridinary user, which is safer and for testing absolutely sufficient!! + +--> You can run the testpages simply by starting the server and calling + http://localhost:8080 +--> from your browser's location bar + + +EOM +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +# arg 1: the old package version +post_remove() { + /bin/true +} diff --git a/libre/xsp/xsp.rc.d b/libre/xsp/xsp.rc.d new file mode 100644 index 000000000..b4fcda15c --- /dev/null +++ b/libre/xsp/xsp.rc.d @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/xsp ] && . /etc/conf.d/xsp + +PID=`pidof -o %PPID /usr/bin/mono` +case "$1" in + start) + stat_busy "Starting Xsp Daemon" + if [ -z "$PID" ]; then + /usr/bin/xsp $XSP_PARAMS --nonstop &> /dev/null & + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon xsp + stat_done + fi + ;; + stop) + stat_busy "Stopping Xsp Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon xsp + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/libre/xsp/xsp.service b/libre/xsp/xsp.service new file mode 100644 index 000000000..36b802e21 --- /dev/null +++ b/libre/xsp/xsp.service @@ -0,0 +1,8 @@ +[Unit] +Description=XSP Web Server + +[Service] +ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop + +[Install] +WantedBy=multi-user.target diff --git a/libre/xsp/xsp.webapp b/libre/xsp/xsp.webapp new file mode 100644 index 000000000..a685dd171 --- /dev/null +++ b/libre/xsp/xsp.webapp @@ -0,0 +1,8 @@ + + + Root + / + /srv/http/html/xsp + localhost + + -- cgit v1.2.3-54-g00ecf From ec8ec85d765aa7c0826e20196c70e20e0e4e7169 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 30 Mar 2013 00:06:23 -0700 Subject: Sat Mar 30 00:06:23 PDT 2013 --- community/gsoap/PKGBUILD | 6 ++-- community/nodejs/PKGBUILD | 8 ++--- community/pokerth/PKGBUILD | 11 ++++--- community/ruby-gtk3/PKGBUILD | 11 ++++--- community/weston/PKGBUILD | 4 +-- community/xmlrpc-c/PKGBUILD | 10 +++--- extra/bind/PKGBUILD | 9 +++-- extra/bluedevil/PKGBUILD | 6 ++-- extra/dnsutils/PKGBUILD | 9 ++--- extra/ffmpeg/PKGBUILD | 6 ++-- extra/libbluedevil/PKGBUILD | 10 +++--- extra/nx/PKGBUILD | 6 ++-- kernels/linux-libre-pae/PKGBUILD | 8 ++--- kernels/linux-libre-pae/config | 4 ++- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 8 ++--- kernels/linux-libre-xen/config | 4 ++- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/calibre-libre/PKGBUILD | 10 +++--- libre/gummiboot/PKGBUILD | 44 +++++++++++++++++++++++++ libre/gummiboot/gummiboot.install | 11 +++++++ libre/gummiboot/loader.conf | 2 ++ libre/gummiboot/parabola.conf | 7 ++++ libre/linux-libre-kmod-alx/PKGBUILD | 4 +-- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +-- libre/linux-libre-lts/PKGBUILD | 10 +++--- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 14 ++++---- libre/linux-libre/config.i686 | 4 ++- libre/linux-libre/config.x86_64 | 4 ++- libre/linux-libre/linux-libre.install | 2 +- 31 files changed, 157 insertions(+), 85 deletions(-) create mode 100644 libre/gummiboot/PKGBUILD create mode 100644 libre/gummiboot/gummiboot.install create mode 100644 libre/gummiboot/loader.conf create mode 100644 libre/gummiboot/parabola.conf (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index dfa853405..b5f17fb81 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82656 2013-01-22 15:07:23Z spupykin $ +# $Id: PKGBUILD 87262 2013-03-29 11:58:05Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Tor Krill # Contributor: Lee.MaRS pkgname=gsoap -pkgver=2.8.13 +pkgver=2.8.14 pkgrel=1 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" @@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip LICENSE) -md5sums=('55324ce514886d336511407b440b8bc5' +md5sums=('a032616b7c3b613ce67260a89db9df74' '27aaa3f5166db94d44044c11a7b2c37b') build() { diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 8e20d2a31..db855d9d0 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86736 2013-03-21 18:07:50Z bpiotrowski $ +# $Id: PKGBUILD 87259 2013-03-29 09:42:40Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,17 +8,17 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' license=('MIT') depends=('openssl' 'python2') -checkdepends=('curl') # curl used for check() +checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('2628dbf42fb3ec3927e595dc66f2f96e3c23455990dea690e300296d92afe4d3') +sha256sums=('4eb642897fdb945b49720f2604afc493587aec7a9ff1537e882df659e4dd8aa2') build() { cd node-v${pkgver} diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index d9b83a43a..1c85368b1 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 85448 2013-03-01 18:25:07Z svenstaro $ +# $Id: PKGBUILD 87277 2013-03-29 18:53:13Z cinelli $ # Maintainer: Mateusz Herych # Maintainer: Bartłomiej Piotrowski # Contributor: Vasco Costa +# Contributor: Federico Cinelli pkgname=pokerth _realname=PokerTH pkgver=1.0 -pkgrel=4 +pkgrel=5 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64') url="http://www.pokerth.net/" @@ -22,7 +23,7 @@ build() { sed -i '31 i #include ' src/net/common/ircthread.cpp - qmake $pkgname.pro + qmake-qt4 "$pkgname.pro" make } @@ -31,6 +32,6 @@ package() { make INSTALL_ROOT="$pkgdir" install - install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1" - install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt" + install -Dm644 "docs/pokerth.1" "$pkgdir/usr/share/man/man1/pokerth.1" + install -Dm644 "data/data-copyright.txt" "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt" } diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index 608698d8d..9251f7016 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86881 2013-03-23 23:10:44Z td123 $ +# $Id: PKGBUILD 87329 2013-03-29 22:49:20Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -8,14 +8,14 @@ pkgbase=ruby-gtk3 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-glib2' 'ruby-pango') -pkgver=1.2.2 -pkgrel=2 +pkgver=1.2.5 +pkgrel=1 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz") -sha256sums=('1dd73c4aa184199f373edad589b715b68da8eb43ae6bdae360e0aa62189a681d') +sha256sums=('ecd3fde8e56442944a2b692c773081c553d48b621bb53c49b40b7575216f6c6a') build() { cd "$srcdir/ruby-gtk3-$pkgver" @@ -30,6 +30,7 @@ package_ruby-gtk3() { "ruby-gdkpixbuf2=$pkgver" "ruby-gdk3=$pkgver") cd "$srcdir/ruby-gtk3-$pkgver/gtk3" + mkdir -p "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux" make DESTDIR="$pkgdir/" install } @@ -38,7 +39,7 @@ package_ruby-gdk3() { depends=('ruby' 'gtk3') cd "$srcdir/ruby-gtk3-$pkgver/gdk3" - [ $CARCH == 'i686' ] && mkdir -p /usr/lib/ruby/vendor_ruby/2.0.0/i686-linux + mkdir -p "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux" make DESTDIR="$pkgdir/" install } diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index dfed9d1d8..c0f56bf36 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -3,13 +3,13 @@ pkgname=weston pkgver=1.0.6 -pkgrel=1 +pkgrel=2 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64') url='http://wayland.freedesktop.org' license=('MIT') options=(!libtool) -depends=('libxkbcommon' 'wayland' 'mesa' 'cairo' 'poppler-glib' 'mtdev' 'libxcursor' 'glu') +depends=('libxkbcommon' 'wayland' 'mesa' 'cairo' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'xkeyboard-config') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") sha1sums=('d39d487317ededb9d66365bc1402ee0bc5e20dd0') diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD index 099d69fac..7083d92a4 100644 --- a/community/xmlrpc-c/PKGBUILD +++ b/community/xmlrpc-c/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84192 2013-02-13 14:29:27Z arodseth $ +# $Id: PKGBUILD 87246 2013-03-29 00:18:37Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Daenyth # Contributor: Pierre Schmitz # Contributor: Vitaliy Berdinskikh pkgname=xmlrpc-c -pkgver=1.33.01 +pkgver=1.33.03 pkgrel=1 epoch=1 pkgdesc='XML-RPC for C and C++' @@ -16,7 +16,7 @@ depends=('curl' 'libxml2') makedepends=('libtool' 'setconf') options=('!makeflags' '!libtool' '!emptydirs') source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar") -sha256sums=('6aa984a710794cb64ffece9811dcaee32277947b74cf35ca11baeba5d774f814') +sha256sums=('5e52978f4c96591c9732b4e7a336a4abb75550b1403ba0ed59fb3ddd49595309') build() { cd "$srcdir/advanced" @@ -43,8 +43,8 @@ package() { make DESTDIR="$pkgdir" -C tools install install -Dm644 doc/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Remove references to build directory - setconf "$pkgdir/usr/bin/xmlrpc-c-config" BLDDIR "" - setconf "$pkgdir/usr/bin/xmlrpc-c-config" ABS_SRCDIR "" + setconf "$pkgdir/usr/bin/xmlrpc-c-config" BLDDIR '' + setconf "$pkgdir/usr/bin/xmlrpc-c-config" ABS_SRCDIR '' } # vim:set ts=2 sw=2 et: diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index 09d053fad..b491d68a9 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172756 2012-12-04 21:31:54Z bisson $ +# $Id: PKGBUILD 181006 2013-03-29 15:52:14Z bpiotrowski $ # Maintainer: Gaetan Bisson # Contributor: judd # Contributor: Mario Vazquez pkgname=bind -_pkgver=9.9.2-P1 +_pkgver=9.9.2-P2 pkgver=${_pkgver//-/.} pkgrel=1 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' @@ -24,8 +24,8 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('9d56db2a86dde8167f7adfb200beee0f51d771a5' - 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' +sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d' + '029f89c49550c40ec7a95116b6a33f0e5a041094' '14264affa71bcfe7703d0fb7c3556c4c47efaa8b' 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' '47f9ac4f6f70bc9167c1cf7859a298531197ad20' @@ -35,7 +35,6 @@ sha1sums=('9d56db2a86dde8167f7adfb200beee0f51d771a5' '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b' '76a0d4cd1b913db177a5a375bebc47e5956866ec' '53be0f1437ebe595240d8dbdd819939582b97fb9') - provides=('dns-server') install=install diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index 39e99e35d..593f2f1e6 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173983 2012-12-31 10:39:10Z andrea $ +# $Id: PKGBUILD 180985 2013-03-29 12:10:22Z andrea $ # Maintainer: Andrea Scarpino pkgname=bluedevil -pkgver=1.3 +pkgver=1.3.1 pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('3a90e8826eb9f464084bbdafa549bf3e') +md5sums=('d21ad78030ffd892bb2ae5c78aa37919') build(){ mkdir build diff --git a/extra/dnsutils/PKGBUILD b/extra/dnsutils/PKGBUILD index 8478160a3..e1b3a1cd0 100644 --- a/extra/dnsutils/PKGBUILD +++ b/extra/dnsutils/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 180327 2013-03-20 14:31:55Z bisson $ -# Maintainer: Gaetan Bisson +# $Id: PKGBUILD 180987 2013-03-29 12:51:19Z jgc $ +# Maintainer: Jan de Groot +# Contributor: Gaetan Bisson # Contributor: kevin # Contributor: mario pkgname=dnsutils -_pkgver=9.9.2-P1 +_pkgver=9.9.2-P2 pkgver=${_pkgver//-/.} pkgrel=1 pkgdesc='DNS utilities: dig host nslookup' @@ -15,7 +16,7 @@ options=('!makeflags') depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'remove-bind.patch') -sha1sums=('9d56db2a86dde8167f7adfb200beee0f51d771a5' +sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d' 'bb13bd54134e4d787469be25461a3cc3f5cb57f4') replaces=('bind-tools' 'host') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index ea369be40..53f3f7ea9 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178756 2013-02-26 18:03:18Z ioni $ +# $Id: PKGBUILD 181002 2013-03-29 15:14:37Z bpiotrowski $ # Maintainer : Ionut Biru # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=1.1.3 +pkgver=1.2 pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" @@ -19,7 +19,7 @@ depends=( ) makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8') +sha256sums=('9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf') build() { cd $pkgname-$pkgver diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index 92e19b608..b35f4db2c 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178964 2013-03-01 10:21:29Z andrea $ +# $Id: PKGBUILD 180983 2013-03-29 12:07:34Z andrea $ # Maintainer: Andrea Scarpino pkgname=libbluedevil -pkgver=1.9.2 -pkgrel=2 +pkgver=1.9.3 +pkgrel=1 pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64') url="https://projects.kde.org/projects/playground/libs/libbluedevil" @@ -11,11 +11,9 @@ license=('GPL') depends=('qt4' 'bluez') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b492db1825b239e5185c543badb21c26') +md5sums=('fcb1480feba45dcd076b3ee54150bdf5') build() { - . /etc/profile.d/qt4.sh - mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index 504011d9e..f6da078fe 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180939 2013-03-28 18:40:16Z andyrtr $ +# $Id: PKGBUILD 180978 2013-03-29 10:06:34Z andyrtr $ # Maintainer: Andreas Radke pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers') -pkgver=3.5.0.19 +pkgver=3.5.0.20 pkgrel=1 arch=('i686' 'x86_64') url="http://wiki.x2go.org/" @@ -14,7 +14,7 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime dependen ) source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz keyboard_rule.diff) -md5sums=('6343c8bfee72e9b0bc2686c7785d1b0f' +md5sums=('9dd4b22579cf048c14c9c75302553f18' 'f681bc66827cd7ddff4b81b983c20401') build() { diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index bee732c0c..67494dd01 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180406 2013-03-21 07:26:50Z tpowa $ +# $Id: PKGBUILD 181027 2013-03-29 20:15:42Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.4 +pkgver=${_basekernel}.5 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'be610dd93dbe033cfe04018b27557c3e' - '5cc106ba38bab845ea62138fc0d1bbf1' + '0439191aaca9f09786f7ab70a080a8f9' + 'cbba928fbe4bc917929c05d633ddad52' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 5c13c2571..9f367b509 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.0-2 Kernel Configuration +# Linux/i386 3.8.5-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5489,6 +5489,8 @@ CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 5053eb190..f15f0e466 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.4-1-LIBRE-PAE +KERNEL_VERSION=3.8.5-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 77e0ed1ff..2007d3831 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180406 2013-03-21 07:26:50Z tpowa $ +# $Id: PKGBUILD 181027 2013-03-29 20:15:42Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.4 +pkgver=${_basekernel}.5 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'be610dd93dbe033cfe04018b27557c3e' - 'c13961a22d8c742fb31b59a1e27a0e7b' + '0439191aaca9f09786f7ab70a080a8f9' + 'a803a7f37290dbfd7a657e9b18bc2332' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index 1b83ef084..efbfa6030 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.0-2 Kernel Configuration +# Linux/i386 3.8.5-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5527,6 +5527,8 @@ CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 0165e78f0..7cdf644f1 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.4-1-LIBRE-XEN +KERNEL_VERSION=3.8.5-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index d09cbdf48..7604ea11a 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -7,13 +7,13 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.23 -pkgrel=2 -pkgdesc="Ebook management application (with unar support included and nonfree fonts removed)" +pkgver=0.9.25 +pkgrel=1 +pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" license=('GPL3') -depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' +depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 'python2-imaging' 'shared-mime-info' 'python2-dnspython' @@ -28,7 +28,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('eff937f38c5cb7a2319364c86f6b925b' +md5sums=('5a6d9a94cde6233a233ab1be41d3459d' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD new file mode 100644 index 000000000..8ce0f23cf --- /dev/null +++ b/libre/gummiboot/PKGBUILD @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Tom Gundersen +# Contributor: Tobias Powalowski +# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor: Mantas Mikulėnas + +pkgname="gummiboot" +pkgver="29" +pkgrel="1.1" +pkgdesc="Simple text-mode UEFI Boot Manager, Parabola rebranded" +url="http://freedesktop.org/wiki/Software/gummiboot" +arch=('x86_64' 'i686' 'mips64el') +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' + 'parabola.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}/parabola.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/parabola.conf" + + cd "${srcdir}/${pkgname}-${pkgver}/" + make DESTDIR="${pkgdir}" install +} +md5sums=('7e133411b805ce6fb5dd3e3bd08b88a2' + '3d700d13aec5ab1b78a921eaf22e5bfa' + '9f770584795496c0e3409679eaf7be3b') diff --git a/libre/gummiboot/gummiboot.install b/libre/gummiboot/gummiboot.install new file mode 100644 index 000000000..770087361 --- /dev/null +++ b/libre/gummiboot/gummiboot.install @@ -0,0 +1,11 @@ +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/libre/gummiboot/loader.conf b/libre/gummiboot/loader.conf new file mode 100644 index 000000000..b8bfb988e --- /dev/null +++ b/libre/gummiboot/loader.conf @@ -0,0 +1,2 @@ +timeout 10 +default parabola diff --git a/libre/gummiboot/parabola.conf b/libre/gummiboot/parabola.conf new file mode 100644 index 000000000..bbb6dddfa --- /dev/null +++ b/libre/gummiboot/parabola.conf @@ -0,0 +1,7 @@ +## This is just an exmaple config file. +## Please edit the paths and kernel parameters according to your system. + +title Parabola GNU/Linux-libre +linux /vmlinuz-linux-libre +initrd /initramfs-linux-libre.img +options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 25343fd26..264685501 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.4 +_kernver=3.8.5 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=10 +pkgrel=11 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 5e59c2fec..2e3f82a44 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.70 +_kernver=3.0.71 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=8 +pkgrel=9 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index eaa185f4f..3d56fdaa6 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180408 2013-03-21 07:53:18Z tpowa $ +# $Id: PKGBUILD 180979 2013-03-29 10:54:31Z andyrtr $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=70 +_sublevel=71 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.69 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.70 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '0f4930f721d1815e7e1d724775bfadd9' + 'a2ae6b2117cd99fef375764947302435' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'affdc85f42267d4e01b34fcbea66b191') + '864cfb1ffa4023f9794d5c0270ca4aa5') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index e0a21d3fa..4dbbe33d3 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.70-1-LIBRE-LTS +KERNEL_VERSION=3.0.71-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 080c8dcba..4ae75f749 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180406 2013-03-21 07:26:50Z tpowa $ +# $Id: PKGBUILD 181027 2013-03-29 20:15:42Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=4 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'be610dd93dbe033cfe04018b27557c3e' - '4d73ccd0f1825a4bd474d4fead6c0d42' - 'e132184c6d02ef580a504967c067e1c5' + '0439191aaca9f09786f7ab70a080a8f9' + 'f33ffeda1f61705bc568036656cc462f' + '437924c863dae99e6283713c130ac71e' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '6dcf31e2ad8625ab2864af257e86564b') + 'a245684c46c8bc2348ebb259c18e40a6') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 4cdc0a65f..4167d805b 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.0-2 Kernel Configuration +# Linux/i386 3.8.5-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5478,6 +5478,8 @@ CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 92976aa89..3b4ba29d2 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.8.0-2 Kernel Configuration +# Linux/x86_64 3.8.5-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -5249,6 +5249,8 @@ CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 6b7f58a8b..947339de7 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.4-1-LIBRE +KERNEL_VERSION=3.8.5-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' -- cgit v1.2.3-54-g00ecf From ce26b1905ac40cd9389e1c9f364a2ccd8f4ec13c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 8 Apr 2013 03:43:17 -0700 Subject: Mon Apr 8 03:43:17 PDT 2013 --- kernels/linux-libre-pae/PKGBUILD | 8 +- kernels/linux-libre-pae/config | 2 +- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 8 +- kernels/linux-libre-xen/config | 2 +- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/bbswitch-libre/PKGBUILD | 2 +- libre/cdfs-libre/PKGBUILD | 2 +- libre/linux-libre-kmod-alx/PKGBUILD | 8 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 8 +- libre/linux-libre-lts/PKGBUILD | 20 ++- libre/linux-libre-lts/config.i686 | 2 +- libre/linux-libre-lts/config.x86_64 | 2 +- ..._t-for-the-per-flexbg-free_clusters-count.patch | 187 +++++++++++++++++++++ libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/linux-libre.install | 2 +- libre/lirc-libre/PKGBUILD | 4 +- libre/luxblend25/PKGBUILD | 49 +++--- libre/luxrender-libre/PKGBUILD | 15 +- libre/tp_smapi-libre-lts/PKGBUILD | 2 +- libre/tp_smapi-libre/PKGBUILD | 2 +- libre/vhba-module-libre/PKGBUILD | 2 +- libre/virtualbox-libre-modules-lts/PKGBUILD | 2 +- libre/virtualbox-libre-modules/PKGBUILD | 2 +- .../virtualbox-libre-guest-modules.install | 6 +- .../virtualbox-libre-host-modules.install | 6 +- 26 files changed, 268 insertions(+), 81 deletions(-) create mode 100644 libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 67494dd01..f003a128a 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181027 2013-03-29 20:15:42Z tpowa $ +# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.5 +pkgver=${_basekernel}.6 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '0439191aaca9f09786f7ab70a080a8f9' - 'cbba928fbe4bc917929c05d633ddad52' + '1b3cd03d2add3bfe74e98a953f28c8d0' + '6294513cfa9830d48ad1915ff7053a98' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 9f367b509..11b5bb531 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -5548,7 +5548,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index f15f0e466..c8ba6a356 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.5-1-LIBRE-PAE +KERNEL_VERSION=3.8.6-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 2007d3831..8d112b6ab 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181027 2013-03-29 20:15:42Z tpowa $ +# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.5 +pkgver=${_basekernel}.6 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '0439191aaca9f09786f7ab70a080a8f9' - 'a803a7f37290dbfd7a657e9b18bc2332' + '1b3cd03d2add3bfe74e98a953f28c8d0' + '2708b6f03f827e2c94ecbd050df4286d' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index efbfa6030..3464a1814 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -5586,7 +5586,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 7cdf644f1..2b4029b64 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.5-1-LIBRE-XEN +KERNEL_VERSION=3.8.6-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 4f4b5fd44..2b3d37e0b 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.6 _extramodules=extramodules-3.8-LIBRE # Don't forget to update bbswitch.install -pkgrel=2 +pkgrel=3 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index c519fb4a1..cbf479d1c 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.8-LIBRE # Don't forget to update cdfs.install -pkgrel=39 +pkgrel=40 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 264685501..524b24bae 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer: André Silva -_kernver=3.8.5 +_kernver=3.8.6 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=11 +pkgrel=12 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' license=('GPL2') -depends=("linux-libre=$_kernver") -makedepends=("linux-libre-headers=$_kernver") +depends=("linux-libre=$_kernver-$_kernrel") +makedepends=("linux-libre-headers=$_kernver-$_kernrel") install=linux-libre-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 2e3f82a44..d2b2839ea 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer: André Silva -_kernver=3.0.71 +_kernver=3.0.72 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=9 +pkgrel=10 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' license=('GPL2') -depends=("linux-libre-lts=$_kernver") -makedepends=("linux-libre-lts-headers=$_kernver") +depends=("linux-libre-lts=$_kernver-$_kernrel") +makedepends=("linux-libre-lts-headers=$_kernver-$_kernrel") install=linux-libre-lts-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 3d56fdaa6..e0fb91bd4 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180979 2013-03-29 10:54:31Z andyrtr $ +# $Id: PKGBUILD 182062 2013-04-06 09:14:10Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=71 +_sublevel=72 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.70 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.71 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,11 +30,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' 'module-symbol-waiting-3.0.patch' 'module-init-wait-3.0.patch' + 'ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'a2ae6b2117cd99fef375764947302435' - '99f9c408b64393aceb2482c9a3e329ee' - 'fba95bf1857ce6bf863e13a1ab73f584' + '337d8baa608067d3ef79a553af790416' + 'fe0e9b4415b82f306fc1b63eb9a742a4' + '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -44,7 +45,8 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '864cfb1ffa4023f9794d5c0270ca4aa5') + 'ee587972bbd35841cc0efe82db9caa7c' + 'fd5bb788a849895ebf1b8efe64646715') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -64,6 +66,10 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # revert i686 build breaker 3.0.72 kernel + if [ "${CARCH}" = "i686" ]; then + patch -Rp1 -i "${srcdir}/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch" + fi # Some chips detect a ghost TV output # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html # Arch Linux bug report: FS#19234 diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index f903b2114..849fd016b 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -4978,7 +4978,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index c369e1b5b..fe5875138 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -4736,7 +4736,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch b/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch new file mode 100644 index 000000000..be6f7d1e9 --- /dev/null +++ b/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch @@ -0,0 +1,187 @@ +From 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Mon, 11 Mar 2013 23:39:59 -0400 +Subject: ext4: use atomic64_t for the per-flexbg free_clusters count + +From: Theodore Ts'o + +commit 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 upstream. + +A user who was using a 8TB+ file system and with a very large flexbg +size (> 65536) could cause the atomic_t used in the struct flex_groups +to overflow. This was detected by PaX security patchset: + +http://forums.grsecurity.net/viewtopic.php?f=3&t=3289&p=12551#p12551 + +This bug was introduced in commit 9f24e4208f7e, so it's been around +since 2.6.30. :-( + +Fix this by using an atomic64_t for struct orlav_stats's +free_clusters. + +[Backported for 3.0-stable. Renamed free_clusters back to free_blocks; +fixed a few more atomic_read's of free_blocks left in 3.0.] + +Signed-off-by: "Theodore Ts'o" +Reviewed-by: Lukas Czerner +Signed-off-by: Lingzhu Xiang +Reviewed-by: CAI Qian +Signed-off-by: Greg Kroah-Hartman + +--- a/fs/ext4/ext4.h ++++ b/fs/ext4/ext4.h +@@ -288,9 +288,9 @@ struct ext4_group_desc + */ + + struct flex_groups { +- atomic_t free_inodes; +- atomic_t free_blocks; +- atomic_t used_dirs; ++ atomic64_t free_blocks; ++ atomic_t free_inodes; ++ atomic_t used_dirs; + }; + + #define EXT4_BG_INODE_UNINIT 0x0001 /* Inode table/bitmap not in use */ +diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c +index 29272de..dd732c7 100644 +--- a/fs/ext4/ialloc.c ++++ b/fs/ext4/ialloc.c +@@ -345,8 +345,8 @@ static int find_group_flex(struct super_block *sb, struct inode *parent, + ext4_group_t ngroups = ext4_get_groups_count(sb); + int flex_size = ext4_flex_bg_size(sbi); + ext4_group_t best_flex = parent_fbg_group; +- int blocks_per_flex = sbi->s_blocks_per_group * flex_size; +- int flexbg_free_blocks; ++ ext4_fsblk_t blocks_per_flex = sbi->s_blocks_per_group * flex_size; ++ ext4_fsblk_t flexbg_free_blocks; + int flex_freeb_ratio; + ext4_group_t n_fbg_groups; + ext4_group_t i; +@@ -355,7 +355,7 @@ static int find_group_flex(struct super_block *sb, struct inode *parent, + sbi->s_log_groups_per_flex; + + find_close_to_parent: +- flexbg_free_blocks = atomic_read(&flex_group[best_flex].free_blocks); ++ flexbg_free_blocks = atomic64_read(&flex_group[best_flex].free_blocks); + flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex; + if (atomic_read(&flex_group[best_flex].free_inodes) && + flex_freeb_ratio > free_block_ratio) +@@ -370,7 +370,7 @@ find_close_to_parent: + if (i == parent_fbg_group || i == parent_fbg_group - 1) + continue; + +- flexbg_free_blocks = atomic_read(&flex_group[i].free_blocks); ++ flexbg_free_blocks = atomic64_read(&flex_group[i].free_blocks); + flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex; + + if (flex_freeb_ratio > free_block_ratio && +@@ -380,14 +380,14 @@ find_close_to_parent: + } + + if ((atomic_read(&flex_group[best_flex].free_inodes) == 0) || +- ((atomic_read(&flex_group[i].free_blocks) > +- atomic_read(&flex_group[best_flex].free_blocks)) && ++ ((atomic64_read(&flex_group[i].free_blocks) > ++ atomic64_read(&flex_group[best_flex].free_blocks)) && + atomic_read(&flex_group[i].free_inodes))) + best_flex = i; + } + + if (!atomic_read(&flex_group[best_flex].free_inodes) || +- !atomic_read(&flex_group[best_flex].free_blocks)) ++ !atomic64_read(&flex_group[best_flex].free_blocks)) + return -1; + + found_flexbg: +@@ -406,8 +406,8 @@ out: + } + + struct orlov_stats { ++ __u64 free_blocks; + __u32 free_inodes; +- __u32 free_blocks; + __u32 used_dirs; + }; + +@@ -424,7 +424,7 @@ static void get_orlov_stats(struct super_block *sb, ext4_group_t g, + + if (flex_size > 1) { + stats->free_inodes = atomic_read(&flex_group[g].free_inodes); +- stats->free_blocks = atomic_read(&flex_group[g].free_blocks); ++ stats->free_blocks = atomic64_read(&flex_group[g].free_blocks); + stats->used_dirs = atomic_read(&flex_group[g].used_dirs); + return; + } +diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c +index 31bbdb5..35959f6 100644 +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -2814,8 +2814,8 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, + if (sbi->s_log_groups_per_flex) { + ext4_group_t flex_group = ext4_flex_group(sbi, + ac->ac_b_ex.fe_group); +- atomic_sub(ac->ac_b_ex.fe_len, +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_sub(ac->ac_b_ex.fe_len, ++ &sbi->s_flex_groups[flex_group].free_blocks); + } + + err = ext4_handle_dirty_metadata(handle, NULL, bitmap_bh); +@@ -4614,7 +4614,7 @@ do_more: + + if (sbi->s_log_groups_per_flex) { + ext4_group_t flex_group = ext4_flex_group(sbi, block_group); +- atomic_add(count, &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(count, &sbi->s_flex_groups[flex_group].free_blocks); + } + + ext4_mb_unload_buddy(&e4b); +@@ -4745,8 +4745,8 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, + + if (sbi->s_log_groups_per_flex) { + ext4_group_t flex_group = ext4_flex_group(sbi, block_group); +- atomic_add(blocks_freed, +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(blocks_freed, ++ &sbi->s_flex_groups[flex_group].free_blocks); + } + + ext4_mb_unload_buddy(&e4b); +diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c +index 244100f..d2661aac 100644 +--- a/fs/ext4/resize.c ++++ b/fs/ext4/resize.c +@@ -929,8 +929,8 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) + sbi->s_log_groups_per_flex) { + ext4_group_t flex_group; + flex_group = ext4_flex_group(sbi, input->group); +- atomic_add(input->free_blocks_count, +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(input->free_blocks_count, ++ &sbi->s_flex_groups[flex_group].free_blocks); + atomic_add(EXT4_INODES_PER_GROUP(sb), + &sbi->s_flex_groups[flex_group].free_inodes); + } +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index c6a3363..e05cd34 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1992,8 +1992,8 @@ static int ext4_fill_flex_info(struct super_block *sb) + flex_group = ext4_flex_group(sbi, i); + atomic_add(ext4_free_inodes_count(sb, gdp), + &sbi->s_flex_groups[flex_group].free_inodes); +- atomic_add(ext4_free_blks_count(sb, gdp), +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(ext4_free_blks_count(sb, gdp), ++ &sbi->s_flex_groups[flex_group].free_blocks); + atomic_add(ext4_used_dirs_count(sb, gdp), + &sbi->s_flex_groups[flex_group].used_dirs); + } +-- +1.7.11.7 + +-- +To unsubscribe from this list: send the line "unsubscribe stable" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 4dbbe33d3..76b9b14f0 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.71-1-LIBRE-LTS +KERNEL_VERSION=3.0.72-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 947339de7..a7672f35c 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.5-1-LIBRE +KERNEL_VERSION=3.8.6-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index f647e3913..bdc8b63c0 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181035 2013-03-30 11:31:35Z foutrelis $ +# $Id: PKGBUILD 182068 2013-04-06 09:25:55Z tpowa $ # Maintainer: Paul Mattal # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=40 +pkgrel=41 epoch=1 _extramodules=extramodules-3.8-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD index 26640795f..2af861641 100644 --- a/libre/luxblend25/PKGBUILD +++ b/libre/luxblend25/PKGBUILD @@ -3,44 +3,33 @@ pkgbase=luxrender pkgname=luxblend25 -srcver=3a928b723b29 -pkgver=1.1.v2.65 -_pkgver=${pkgver::3} +srcver=c9deae0646d0 +pkgver=1.2.1.v2.66 +_pkgver=${pkgver::5} reqname=blender -reqver=${pkgver:5} +reqver=${pkgver:7} +reqep=7 pkgrel=1 -pkgdesc='LuxRender exporter for Blender-libre' -arch=( - any -) -url="http://www.$pkgbase.net/" -license=( - GPL -) +pkgdesc="LuxRender exporter for ${reqname^}." +arch=any +url=http://www.$pkgbase.net/ +license=GPL depends=( $pkgbase=$_pkgver - "$reqname>=$reqver" -) -provides=( - $pkgname=$_pkgver -) -conflicts=( - $pkgname - #"$reqname>=${reqver::2}$((${reqver:2}+1))" -) -replaces=( - $pkgname -) -source=( - "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2" -) -sha512sums=( - f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017 -) + "$reqname>=$(($reqep-1)):$reqver" + "$reqname<$reqep:${reqver::2}$((${reqver:2:4}+1))" +) +provides=($pkgname=$_pkgver) +conflicts=$pkgname +replaces=$pkgname +source=http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2 +sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92 package() { a=$pkgname-$srcver/src/$pkgbase b=usr/share/$reqname/$reqver/scripts/addons install -d -m755 $pkgdir/$b cp -a $srcdir/$a $pkgdir/$b + # change the search path in exporter so it finds pylux in its new location + sed -i 's|from.*import pylux|import pylux|' $pkgdir/$b/$pkgbase/outputs/pure_api.py } diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 3ec9854e6..1d4dd0702 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -5,8 +5,8 @@ # Maintainer (Parabola): Márcio Silva pkgname=luxrender-libre _pkgflag=libre -pkgver=1.2 -_pkgver=ee0b9ff73d62 +pkgver=1.2.1 +_pkgver=3066b2161439 pkgrel=1 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendations" arch=('i686' 'x86_64' 'mips64el') @@ -15,18 +15,23 @@ license=('GPL') depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl') optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=${pkgver::3}" 'python' 'opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) conflicts=${pkgname%-$_pkgflag} replaces=${pkgname%-$_pkgflag} -source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2) -md5sums=('eb1ed9ecfe540896863ad4ee4da5a2f9') +source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2 + boost-1.53-shared_array_constructor.diff) +md5sums=( + '87958798c164ad14f92fb4af2595d332' + 'dd19c7ac2ba8c9b703018a176ef77f98') build() { cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver # fix the installation sed -i '/.*wxgui.*/ d' CMakeLists.txt + # fix for boost 1.53 + patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true export CXXFLAGS="$CXXFLAGS -lpthread" cmake -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index cf38b1882..faf704096 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=9.4 +pkgrel=10 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 2fda312b6..51329569f 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=16 +pkgrel=17 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 764beed0d..5bbbf618d 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.8-LIBRE -pkgrel=19 +pkgrel=20 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index f48fd9f32..038191729 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.10 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 45bbfb86d..c7c0c7707 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.10 _extramodules=extramodules-3.8-LIBRE -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index 41b5ac73a..3a8199ff8 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index 1ac430c3b..0a6d187e5 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -3,17 +3,17 @@ cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } -- cgit v1.2.3-54-g00ecf From 8ec4fd7a9e4748c568b20fefcb2dec0f289dc213 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 14 Apr 2013 00:46:08 -0700 Subject: Sun Apr 14 00:46:05 PDT 2013 --- community/csfml/PKGBUILD | 49 +- community/ffmpegsource/PKGBUILD | 50 +- community/ffmpegsource/enable-libavresample.patch | 970 ---------------------- community/intellij-idea-libs/PKGBUILD | 9 +- community/nodejs/PKGBUILD | 6 +- community/python-psutil/PKGBUILD | 12 +- core/sudo/PKGBUILD | 10 +- extra/libdiscid/PKGBUILD | 6 +- extra/perl-dbi/PKGBUILD | 6 +- extra/timidity++/PKGBUILD | 8 +- extra/timidity++/timidity++.sh | 38 - kernels/linux-libre-pae/PKGBUILD | 14 +- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-rt/PKGBUILD | 8 +- kernels/linux-libre-xen/PKGBUILD | 14 +- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/calibre-libre/PKGBUILD | 8 +- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 24 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 14 +- libre/linux-libre/linux-libre.install | 2 +- pcr/debootstrap/PKGBUILD | 44 +- pcr/debootstrap/metad | 203 +++++ pcr/debootstrap/trisquel | 199 +++++ 26 files changed, 551 insertions(+), 1157 deletions(-) delete mode 100755 community/ffmpegsource/enable-libavresample.patch delete mode 100644 extra/timidity++/timidity++.sh create mode 100644 pcr/debootstrap/metad create mode 100644 pcr/debootstrap/trisquel (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD index 1f47c2772..4ed6778c8 100644 --- a/community/csfml/PKGBUILD +++ b/community/csfml/PKGBUILD @@ -1,59 +1,34 @@ -# $Id: PKGBUILD 70299 2012-05-04 03:01:09Z svenstaro $ +# $Id: PKGBUILD 88191 2013-04-13 15:25:43Z svenstaro $ # Maintainer: Sven-Hendrik Haase pkgname=csfml - -_git=true - -if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20120504 -fi - +pkgver=2.0 pkgrel=1 pkgdesc='C bindings for sfml' arch=('i686' 'x86_64') url='http://www.sfml-dev.org/' license=('zlib') -depends=('sfml') -makedepends=('git' 'cmake' 'doxygen') - -_gitroot='https://github.com/LaurentGomila/CSFML.git' -_gitname='CSFML' +depends=("sfml=${pkgver}") +makedepends=('cmake' 'doxygen') +source=("csfml-${pkgver}::https://github.com/LaurentGomila/CSFML/archive/2.0.tar.gz") +md5sums=('d609c9e3b115d480d8c61911d774472c') build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot - cd $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" + cd "$srcdir"/CSFML-${pkgver} mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ - -DBUILD_DOC=true + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_DOC=true make make doc } package() { - cd "$srcdir/$_gitname-build/build/" + cd "$srcdir"/CSFML-${pkgver}/build make DESTDIR="$pkgdir/" install - install -Dm644 ../license.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - make clean + install -Dm644 ../license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD index eac86386e..e32088959 100755 --- a/community/ffmpegsource/PKGBUILD +++ b/community/ffmpegsource/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85215 2013-02-27 18:14:32Z alucryd $ +# $Id: PKGBUILD 88204 2013-04-13 20:20:33Z alucryd $ # Maintainer: Maxime Gauduin pkgname=ffmpegsource -pkgver=743 -pkgrel=2 +pkgver=753 +pkgrel=1 pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" arch=('i686' 'x86_64') url="http://code.google.com/p/ffmpegsource/" @@ -11,49 +11,35 @@ license=('MIT') depends=('ffmpeg') makedepends=('svn') options=('!libtool') -source=('autoconf.patch' 'enable-libavresample.patch') -sha256sums=('b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93' - '05f03515cc2405cdf8a8ba835f5adc2057f40054a4a1d9e493f0ad512c5de70d') +source=("${pkgname}::svn+http://ffmpegsource.googlecode.com/svn/trunk/" + 'autoconf.patch') +sha256sums=('SKIP' + 'b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93') -_svntrunk=http://ffmpegsource.googlecode.com/svn/trunk/ -_svnmod=ffmpegsource +pkgver() { + cd "${SRCDEST}"/${pkgname} -build() { - cd "${srcdir}" - -# Checkout - msg "Connecting to SVN server...." - - if [[ -d ${_svnmod}/.svn ]]; then - (cd ${_svnmod} && svn up -r ${pkgver}) - else - svn co ${_svntrunk} --config-dir ./ -r ${pkgver} ${_svnmod} - fi + svnversion | tr -d [A-z] +} - msg "SVN checkout done or server timeout" - msg "Starting build..." +prepare() { + cd "${srcdir}"/${pkgname} - rm -rf "${srcdir}"/${_svnmod}-build -# svn export "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build - cp -R "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build - cd "${srcdir}"/${_svnmod}-build + patch -Np1 -i ../autoconf.patch +} -# Patch - patch -Np1 -i "${srcdir}"/autoconf.patch - patch -Np1 -i "${srcdir}"/enable-libavresample.patch +build() { + cd "${srcdir}"/${pkgname} -# Build ./autogen.sh --prefix=/usr --enable-shared --disable-static make } package() { - cd "${srcdir}"/${_svnmod}-build + cd "${srcdir}"/${pkgname} -# Install make DESTDIR="${pkgdir}" install -# License install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE } diff --git a/community/ffmpegsource/enable-libavresample.patch b/community/ffmpegsource/enable-libavresample.patch deleted file mode 100755 index 56d435782..000000000 --- a/community/ffmpegsource/enable-libavresample.patch +++ /dev/null @@ -1,970 +0,0 @@ -# enable-libavresample.patch -# -# Adds libavresample support. Created by diffing Thomas Goyne's GIT repo -# with official ffms SVN. -# - -diff -ru ffmpegsource/configure.ac ffms2/configure.ac ---- ffmpegsource/configure.ac 2013-02-27 16:53:39.230691825 +0100 -+++ ffms2/configure.ac 2013-02-27 16:53:31.737713841 +0100 -@@ -181,6 +181,25 @@ - AC_MSG_RESULT([no]) - ]) - -+AC_ARG_ENABLE(avresample, -+ AS_HELP_STRING([--enable-avresample], -+ [use libavresample for audio resampling])) -+AS_IF([test x$enable_avresample != xno], [ -+ PKG_CHECK_MODULES(AVRESAMPLE, [libavresample >= 1.0.0], [enable_avresample=yes], [ -+ AS_IF([test x$enable_avresample = xyes], -+ [AC_MSG_ERROR([--enable-avresample was specified, but avresample 1.0.0+ could not be found.])]) -+ enable_avresample=no -+ ]) -+]) -+ -+AS_IF([test x$enable_avresample], -+ [libavresample="libavresample" -+ AC_DEFINE([WITH_AVRESAMPLE], [1], [Use avresample])]) -+ -+AC_SUBST([AVRESAMPLE_CFLAGS]) -+AC_SUBST([AVRESAMPLE_LIBS]) -+AC_SUBST([libavresample]) -+ - AC_MSG_CHECKING([whether -Wl,-Bsymbolic is needed]) - if test "$enable_shared" = yes; then - _LDFLAGS="$LDFLAGS" -diff -ru ffmpegsource/ffms2.pc.in ffms2/ffms2.pc.in ---- ffmpegsource/ffms2.pc.in 2013-02-27 16:53:38.924039701 +0100 -+++ ffms2/ffms2.pc.in 2013-02-27 16:53:31.737713841 +0100 -@@ -7,7 +7,7 @@ - - Name: ffms2 - Description: The Fabulous FM Library 2 --Requires.private: libavformat libavcodec libswscale libavutil -+Requires.private: libavformat libavcodec libswscale libavutil @libavresample@ - Version: @FFMS_VERSION@ - Libs.private: @ZLIB_LDFLAGS@ -lz - Libs: -L${libdir} -lffms2 -diff -ru ffmpegsource/include/ffmscompat.h ffms2/include/ffmscompat.h ---- ffmpegsource/include/ffmscompat.h 2013-02-27 16:53:38.920706525 +0100 -+++ ffms2/include/ffmscompat.h 2013-02-27 16:53:31.737713841 +0100 -@@ -71,6 +71,15 @@ - # define FFMS_CodecID AVCodecID - # undef CodecID - # endif -+# if VERSION_CHECK(LIBAVCODEC_VERSION_INT, <, 54, 28, 0, 54, 59, 100) -+# define avcodec_free_frame av_free -+# endif -+#endif -+ -+#ifdef LIBAVUTIL_VERSION_INT -+# if VERSION_CHECK(LIBAVUTIL_VERSION_INT, <, 51, 27, 0, 51, 46, 100) -+# define av_get_packed_sample_fmt(fmt) (fmt < AV_SAMPLE_FMT_U8P ? fmt : fmt - (AV_SAMPLE_FMT_U8P - AV_SAMPLE_FMT_U8)) -+# endif - #endif - - #endif // FFMSCOMPAT_H -diff -ru ffmpegsource/include/ffms.h ffms2/include/ffms.h ---- ffmpegsource/include/ffms.h 2013-02-27 16:53:38.920706525 +0100 -+++ ffms2/include/ffms.h 2013-02-27 16:53:31.737713841 +0100 -@@ -113,6 +113,7 @@ - FFMS_ERROR_TRACK, // track handling - FFMS_ERROR_WAVE_WRITER, // WAVE64 file writer - FFMS_ERROR_CANCELLED, // operation aborted -+ FFMS_ERROR_RESAMPLING, // audio resampling (libavresample) - - // Subtypes - what caused the error - FFMS_ERROR_UNKNOWN = 20, // unknown error -@@ -237,6 +238,53 @@ - FFMS_CR_JPEG = 2 // 2^n-1, or "fullrange" - } FFMS_ColorRanges; - -+typedef enum FFMS_MixingCoefficientType { -+ FFMS_MIXING_COEFFICIENT_Q8 = 0, -+ FFMS_MIXING_COEFFICIENT_Q15 = 1, -+ FFMS_MIXING_COEFFICIENT_FLT = 2 -+} FFMS_MixingCoefficientType; -+ -+typedef enum FFMS_MatrixEncoding { -+ FFMS_MATRIX_ENCODING_NONE = 0, -+ FFMS_MATRIX_ENCODING_DOBLY = 1, -+ FFMS_MATRIX_ENCODING_PRO_LOGIC_II = 2 -+} FFMS_MatrixEncoding; -+ -+typedef enum FFMS_ResampleFilterType { -+ FFMS_RESAMPLE_FILTER_CUBIC = 0, -+ FFMS_RESAMPLE_FILTER_SINC = 1, -+ FFMS_RESAMPLE_FILTER_KAISER = 2 -+} FFMS_ResampleFilterType; -+ -+typedef enum FFMS_AudioDitherMethod { -+ FFMS_RESAMPLE_DITHER_NONE = 0, -+ FFMS_RESAMPLE_DITHER_RECTANGULAR = 1, -+ FFMS_RESAMPLE_DITHER_TRIANGULAR = 2, -+ FFMS_RESAMPLE_DITHER_TRIANGULAR_HIGHPASS = 3, -+ FFMS_RESAMPLE_DITHER_TRIANGULAR_NOISESHAPING = 4 -+} FFMS_AudioDitherMethod; -+ -+typedef struct FFMS_ResampleOptions { -+ int64_t ChannelLayout; -+ FFMS_SampleFormat SampleFormat; -+ int SampleRate; -+ FFMS_MixingCoefficientType MixingCoefficientType; -+ double CenterMixLevel; -+ double SurroundMixLevel; -+ double LFEMixLevel; -+ int Normalize; -+ int ForceResample; -+ int ResampleFilterSize; -+ int ResamplePhaseShift; -+ int LinearInterpolation; -+ double CutoffFrequencyRatio; -+ FFMS_MatrixEncoding MatrixedStereoEncoding; -+ FFMS_ResampleFilterType FilterType; -+ int KaiserBeta; -+ FFMS_AudioDitherMethod DitherMethod; -+} FFMS_ResampleOptions; -+ -+ - typedef struct FFMS_Frame { - uint8_t *Data[4]; - int Linesize[4]; -@@ -319,6 +367,9 @@ - FFMS_API(void) FFMS_ResetOutputFormatV(FFMS_VideoSource *V); - FFMS_API(int) FFMS_SetInputFormatV(FFMS_VideoSource *V, int ColorSpace, int ColorRange, int Format, FFMS_ErrorInfo *ErrorInfo); /* Introduced in FFMS_VERSION ((2 << 24) | (17 << 16) | (1 << 8) | 0) */ - FFMS_API(void) FFMS_ResetInputFormatV(FFMS_VideoSource *V); -+FFMS_API(FFMS_ResampleOptions *) FFMS_CreateResampleOptions(FFMS_AudioSource *A); /* Introduced in FFMS_VERSION ((2 << 24) | (15 << 16) | (4 << 8) | 0) */ -+FFMS_API(int) FFMS_SetOutputFormatA(FFMS_AudioSource *A, const FFMS_ResampleOptions*options, FFMS_ErrorInfo *ErrorInfo); /* Introduced in FFMS_VERSION ((2 << 24) | (15 << 16) | (4 << 8) | 0) */ -+FFMS_API(void) FFMS_DestroyResampleOptions(FFMS_ResampleOptions *options); /* Introduced in FFMS_VERSION ((2 << 24) | (15 << 16) | (4 << 8) | 0) */ - FFMS_API(void) FFMS_DestroyIndex(FFMS_Index *Index); - FFMS_API(int) FFMS_GetSourceType(FFMS_Index *Index); - FFMS_API(int) FFMS_GetSourceTypeI(FFMS_Indexer *Indexer); -diff -ru ffmpegsource/Makefile.am ffms2/Makefile.am ---- ffmpegsource/Makefile.am 2013-02-27 16:53:39.310688030 +0100 -+++ ffms2/Makefile.am 2013-02-27 16:53:31.724381141 +0100 -@@ -9,7 +9,7 @@ - INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h - - lib_LTLIBRARIES = src/core/libffms2.la --src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@ -+src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @AVRESAMPLE_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@ - src_core_libffms2_la_SOURCES = \ - src/core/audiosource.h \ - src/core/audiosource.cpp \ -diff -ru ffmpegsource/src/config/config.h.in ffms2/src/config/config.h.in ---- ffmpegsource/src/config/config.h.in 2013-02-27 16:53:39.017368608 +0100 -+++ ffms2/src/config/config.h.in 2013-02-27 16:53:31.744380192 +0100 -@@ -90,5 +90,8 @@ - /* Version number of package */ - #undef VERSION - -+/* Use avresample */ -+#undef WITH_AVRESAMPLE -+ - /* Define to `unsigned int' if does not define. */ - #undef size_t -diff -ru ffmpegsource/src/config/libs.cpp ffms2/src/config/libs.cpp ---- ffmpegsource/src/config/libs.cpp 2013-02-27 16:53:39.017368608 +0100 -+++ ffms2/src/config/libs.cpp 2013-02-27 16:53:31.744380192 +0100 -@@ -45,6 +45,9 @@ - #pragma comment(lib, "libavcodec.a") - #pragma comment(lib, "libavformat.a") - #pragma comment(lib, "libswscale.a") -+#ifdef WITH_AVRESAMPLE -+#pragma comment(lib, "libavresample.a") -+#endif - - #ifdef WITH_OPENCORE_AMR_NB - #ifdef WITH_GCC_LIBAV -diff -ru ffmpegsource/src/core/audiosource.cpp ffms2/src/core/audiosource.cpp ---- ffmpegsource/src/core/audiosource.cpp 2013-02-27 16:53:39.137362917 +0100 -+++ ffms2/src/core/audiosource.cpp 2013-02-27 16:53:31.744380192 +0100 -@@ -23,17 +23,45 @@ - #include - #include - -+namespace { -+ -+ int64_t ChannelLayout; -+ FFMS_SampleFormat SampleFormat; -+ int SampleRate; -+#define MAPPER(m, n) OptionMapper(n, &FFMS_ResampleOptions::m) -+OptionMapper resample_options[] = { -+ MAPPER(ChannelLayout, "out_channel_layout"), -+ MAPPER(SampleFormat, "out_sample_fmt"), -+ MAPPER(SampleRate, "out_sample_rate"), -+ MAPPER(MixingCoefficientType, "mix_coeff_type"), -+ MAPPER(CenterMixLevel, "center_mix_level"), -+ MAPPER(SurroundMixLevel, "surround_mix_level"), -+ MAPPER(LFEMixLevel, "lfe_mix_level"), -+ MAPPER(Normalize, "normalize_mix_level"), -+ MAPPER(ForceResample, "force_resampling"), -+ MAPPER(ResampleFilterSize, "filter_size"), -+ MAPPER(ResamplePhaseShift, "phase_shift"), -+ MAPPER(LinearInterpolation, "linear_interp"), -+ MAPPER(CutoffFrequencyRatio, "cutoff"), -+ MAPPER(MatrixedStereoEncoding, "matrix_encoding"), -+ MAPPER(FilterType, "filter_type"), -+ MAPPER(KaiserBeta, "kaiser_beta"), -+ MAPPER(DitherMethod, "dither_method") -+}; -+#undef MAPPER -+ -+} -+ - FFMS_AudioSource::FFMS_AudioSource(const char *SourceFile, FFMS_Index &Index, int Track) - : Delay(0) - , MaxCacheBlocks(50) - , BytesPerSample(0) --, Decoded(0) -+, NeedsResample(false) - , CurrentSample(-1) - , PacketNumber(0) - , CurrentFrame(NULL) - , TrackNumber(Track) - , SeekOffset(0) --, DecodingBuffer(AVCODEC_MAX_AUDIO_FRAME_SIZE * 10) - , Index(Index) - { - if (Track < 0 || Track >= static_cast(Index.size())) -@@ -57,44 +85,14 @@ - Index.AddRef(); - } - -- - #define EXCESSIVE_CACHE_SIZE 400 - - void FFMS_AudioSource::Init(const FFMS_Index &Index, int DelayMode) { -- // The first packet after a seek is often decoded incorrectly, which -- // makes it impossible to ever correctly seek back to the beginning, so -- // store the first block now -- -- // In addition, anything with the same PTS as the first packet can't be -- // distinguished from the first packet and so can't be seeked to, so -- // store those as well -- -- // Some of LAVF's splitters don't like to seek to the beginning of the -- // file (ts and?), so cache a few blocks even if PTSes are unique -- // Packet 7 is the last packet I've had be unseekable to, so cache up to -- // 10 for a bit of an extra buffer -- CacheIterator end = Cache.end(); -- while (PacketNumber < Frames.size() && -- ((Frames[0].PTS != ffms_av_nopts_value && Frames[PacketNumber].PTS == Frames[0].PTS) || -- Cache.size() < 10)) { -- -- // Vorbis in particular seems to like having 60+ packets at the start of the file with a PTS of 0, -- // so we might need to expand the search range to account for that. -- if (Cache.size() >= MaxCacheBlocks - 1) { -- if (MaxCacheBlocks >= EXCESSIVE_CACHE_SIZE) -- throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_ALLOCATION_FAILED, "Exceeded the search range for an initial valid audio PTS"); -- MaxCacheBlocks *= 2; -- } -- -+ // Decode the first packet to ensure all properties are initialized -+ // Don't cache it since it might be in the wrong format -+ // Instead, leave it in DecodeFrame and it'll get cached later -+ while (DecodeFrame->nb_samples == 0) - DecodeNextBlock(); -- if (Decoded) -- CacheBlock(end, CurrentSample, Decoded, &DecodingBuffer[0]); -- } -- // Store the iterator to the last element of the cache which is used for -- // correctness rather than speed, so that when looking for one to delete -- // we know how much to skip -- CacheNoDelete = Cache.end(); -- --CacheNoDelete; - - // Read properties of the audio which may not be available until the first - // frame has been decoded -@@ -104,6 +102,11 @@ - throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_CODEC, - "Codec returned zero size audio"); - -+ if (av_sample_fmt_is_planar(CodecContext->sample_fmt)) { -+ std::auto_ptr opt(CreateResampleOptions()); -+ SetOutputFormat(opt.get()); -+ } -+ - if (DelayMode < FFMS_DELAY_NO_SHIFT) - throw FFMS_Exception(FFMS_ERROR_INDEX, FFMS_ERROR_INVALID_ARGUMENT, - "Bad audio delay compensation mode"); -@@ -146,8 +149,133 @@ - AP.NumSamples += Delay; - } - --void FFMS_AudioSource::CacheBlock(CacheIterator &pos, int64_t Start, size_t Samples, uint8_t *SrcData) { -- Cache.insert(pos, AudioBlock(Start, Samples, SrcData, Samples * BytesPerSample)); -+void FFMS_AudioSource::CacheBeginning() { -+ // Nothing to do if the cache is already populated -+ if (!Cache.empty()) return; -+ -+ // The first frame is already decoded, so add it to the cache -+ CacheBlock(Cache.end()); -+ -+ // The first packet after a seek is often decoded incorrectly, which -+ // makes it impossible to ever correctly seek back to the beginning, so -+ // store the first block now -+ -+ // In addition, anything with the same PTS as the first packet can't be -+ // distinguished from the first packet and so can't be seeked to, so -+ // store those as well -+ -+ // Some of LAVF's splitters don't like to seek to the beginning of the -+ // file (ts and?), so cache a few blocks even if PTSes are unique -+ // Packet 7 is the last packet I've had be unseekable to, so cache up to -+ // 10 for a bit of an extra buffer -+ CacheIterator end = Cache.end(); -+ while (PacketNumber < Frames.size() && -+ ((Frames[0].PTS != ffms_av_nopts_value && Frames[PacketNumber].PTS == Frames[0].PTS) || -+ Cache.size() < 10)) { -+ -+ // Vorbis in particular seems to like having 60+ packets at the start -+ // of the file with a PTS of 0, so we might need to expand the search -+ // range to account for that. -+ // Expanding slightly before it's strictly needed to ensure there's a -+ // bit of space for an actual cache -+ if (Cache.size() >= MaxCacheBlocks - 5) { -+ if (MaxCacheBlocks >= EXCESSIVE_CACHE_SIZE) -+ throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_ALLOCATION_FAILED, -+ "Exceeded the search range for an initial valid audio PTS"); -+ MaxCacheBlocks *= 2; -+ } -+ -+ DecodeNextBlock(&end); -+ } -+ // Store the iterator to the last element of the cache which is used for -+ // correctness rather than speed, so that when looking for one to delete -+ // we know how much to skip -+ CacheNoDelete = Cache.end(); -+ --CacheNoDelete; -+} -+ -+void FFMS_AudioSource::SetOutputFormat(const FFMS_ResampleOptions *opt) { -+ if (!Cache.empty()) -+ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_USER, -+ "Cannot change the output format after audio decoding has begun"); -+ -+ BytesPerSample = av_get_bytes_per_sample(static_cast(opt->SampleFormat)) * av_get_channel_layout_nb_channels(opt->ChannelLayout); -+ -+ NeedsResample = -+ opt->SampleFormat != (int)CodecContext->sample_fmt || -+ opt->SampleRate != AP.SampleRate || -+ opt->ChannelLayout != AP.ChannelLayout || -+ opt->ForceResample; -+ if (!NeedsResample) return; -+ -+ if (opt->SampleRate != AP.SampleRate) -+ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_UNSUPPORTED, -+ "Sample rate changes are currently unsupported."); -+ -+#ifdef WITH_AVRESAMPLE -+ if (opt->SampleRate != AP.SampleRate) -+ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_UNSUPPORTED, -+ "Changing the audio sample rate is currently not supported"); -+ -+ std::auto_ptr oldOptions(ReadOptions(ResampleContext, resample_options)); -+ SetOptions(opt, ResampleContext, resample_options); -+ av_opt_set_int(ResampleContext, "in_sample_rate", AP.SampleRate, 0); -+ av_opt_set_int(ResampleContext, "in_sample_fmt", CodecContext->sample_fmt, 0); -+ av_opt_set_int(ResampleContext, "in_channel_layout", AP.ChannelLayout, 0); -+ -+ if (avresample_open(ResampleContext)) { -+ SetOptions(oldOptions.get(), ResampleContext, resample_options); -+ avresample_open(ResampleContext); -+ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_UNKNOWN, -+ "Could not open avresample context"); -+ } -+#else -+ if (opt->SampleFormat != AP.SampleFormat || opt->SampleRate != AP.SampleRate || opt->ChannelLayout != AP.ChannelLayout) -+ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_UNSUPPORTED, -+ "FFMS was not built with resampling enabled. The only supported conversion is interleaving planar audio."); -+#endif -+} -+ -+FFMS_ResampleOptions *FFMS_AudioSource::CreateResampleOptions() const { -+#ifdef WITH_AVRESAMPLE -+ FFMS_ResampleOptions *ret = ReadOptions(ResampleContext, resample_options); -+#else -+ FFMS_ResampleOptions *ret = new FFMS_ResampleOptions; -+ memset(ret, 0, sizeof(FFMS_ResampleOptions)); -+#endif -+ ret->SampleRate = AP.SampleRate; -+ ret->SampleFormat = static_cast(AP.SampleFormat); -+ ret->ChannelLayout = AP.ChannelLayout; -+ return ret; -+} -+ -+void FFMS_AudioSource::ResampleAndCache(CacheIterator pos) { -+ AudioBlock& block = *Cache.insert(pos, AudioBlock(CurrentSample, DecodeFrame->nb_samples)); -+ block.Data.reserve(DecodeFrame->nb_samples * BytesPerSample); -+ -+#ifdef WITH_AVRESAMPLE -+ block.Data.resize(block.Data.capacity()); -+ -+ uint8_t *OutPlanes[1] = { static_cast(&block.Data[0]) }; -+ avresample_convert(ResampleContext, -+ OutPlanes, block.Data.size(), DecodeFrame->nb_samples, -+ DecodeFrame->extended_data, DecodeFrame->nb_samples * av_get_bytes_per_sample(CodecContext->sample_fmt), DecodeFrame->nb_samples); -+#else -+ int width = av_get_bytes_per_sample(CodecContext->sample_fmt); -+ uint8_t **Data = DecodeFrame->extended_data; -+ -+ for (int s = 0; s < DecodeFrame->nb_samples; ++s) { -+ for (int c = 0; c < CodecContext->channels; ++c) -+ block.Data.insert(block.Data.end(), &Data[c][s * width], &Data[c][(s + 1) * width]); -+ } -+#endif -+} -+ -+void FFMS_AudioSource::CacheBlock(CacheIterator pos) { -+ if (NeedsResample) -+ ResampleAndCache(pos); -+ else -+ Cache.insert(pos, AudioBlock(CurrentSample, DecodeFrame->nb_samples, DecodeFrame->extended_data[0], DecodeFrame->nb_samples * BytesPerSample)); - - if (Cache.size() >= MaxCacheBlocks) { - // Kill the oldest one -@@ -162,45 +290,45 @@ - } - } - --void FFMS_AudioSource::DecodeNextBlock() { -- if (BytesPerSample == 0) BytesPerSample = av_get_bytes_per_sample(CodecContext->sample_fmt) * CodecContext->channels; -- -+void FFMS_AudioSource::DecodeNextBlock(CacheIterator *pos) { - CurrentFrame = &Frames[PacketNumber]; - - AVPacket Packet; - if (!ReadPacket(&Packet)) -- throw FFMS_Exception(FFMS_ERROR_PARSER, FFMS_ERROR_UNKNOWN, "ReadPacket unexpectedly failed to read a packet"); -+ throw FFMS_Exception(FFMS_ERROR_PARSER, FFMS_ERROR_UNKNOWN, -+ "ReadPacket unexpectedly failed to read a packet"); - - // ReadPacket may have changed the packet number - CurrentFrame = &Frames[PacketNumber]; - CurrentSample = CurrentFrame->SampleStart; -- ++PacketNumber; - -- uint8_t *Buf = &DecodingBuffer[0]; -+ bool GotSamples = false; - uint8_t *Data = Packet.data; - while (Packet.size > 0) { -- int TempOutputBufSize = AVCODEC_MAX_AUDIO_FRAME_SIZE * 10 - (Buf - &DecodingBuffer[0]); -- int Ret = avcodec_decode_audio3(CodecContext, (int16_t *)Buf, &TempOutputBufSize, &Packet); -+ DecodeFrame.reset(); -+ int GotFrame = 0; -+ int Ret = avcodec_decode_audio4(CodecContext, DecodeFrame, &GotFrame, &Packet); - - // Should only ever happen if the user chose to ignore decoding errors - // during indexing, so continue to just ignore decoding errors - if (Ret < 0) break; - -- if (Ret > 0) { -+ if (Ret > 0 && GotFrame) { - Packet.size -= Ret; - Packet.data += Ret; -- Buf += TempOutputBufSize; -+ if (DecodeFrame->nb_samples > 0) { -+ GotSamples = true; -+ if (pos) -+ CacheBlock(*pos); -+ } - } - } - Packet.data = Data; - FreePacket(&Packet); - -- Decoded = (Buf - &DecodingBuffer[0]) / BytesPerSample; -- if (Decoded == 0) { -- // zero sample packets aren't included in the index so we didn't -- // actually move to the next packet -- --PacketNumber; -- } -+ // Zero sample packets aren't included in the index -+ if (GotSamples) -+ ++PacketNumber; - } - - static bool SampleStartComp(const TFrameInfo &a, const TFrameInfo &b) { -@@ -216,6 +344,8 @@ - throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_INVALID_ARGUMENT, - "Out of bounds audio samples requested"); - -+ CacheBeginning(); -+ - uint8_t *Dst = static_cast(Buf); - - // Apply audio delay (if any) and fill any samples before the start time with zero -@@ -253,10 +383,12 @@ - } - // Decode another block - else { -+ CacheIterator cachePos = it; --cachePos; -+ - if (Start < CurrentSample && SeekOffset == -1) - throw FFMS_Exception(FFMS_ERROR_SEEKING, FFMS_ERROR_CODEC, "Audio stream is not seekable"); - -- if (SeekOffset >= 0 && (Start < CurrentSample || Start > CurrentSample + Decoded * 5)) { -+ if (SeekOffset >= 0 && (Start < CurrentSample || Start > CurrentSample + DecodeFrame->nb_samples * 5)) { - TFrameInfo f; - f.SampleStart = Start; - int NewPacketNumber = std::distance(Frames.begin(), std::lower_bound(Frames.begin(), Frames.end(), f, SampleStartComp)); -@@ -266,32 +398,22 @@ - // Only seek forward if it'll actually result in moving forward - if (Start < CurrentSample || static_cast(NewPacketNumber) > PacketNumber) { - PacketNumber = NewPacketNumber; -- Decoded = 0; - CurrentSample = -1; -+ DecodeFrame.reset(); - avcodec_flush_buffers(CodecContext); - Seek(); - } - } - -- // Decode everything between the last keyframe and the block we want -+ // Decode until we hit the block we want - if (PacketNumber >= Frames.size()) - throw FFMS_Exception(FFMS_ERROR_SEEKING, FFMS_ERROR_CODEC, "Seeking is severely broken"); -- while (CurrentSample + Decoded <= Start && PacketNumber < Frames.size()) -- DecodeNextBlock(); -+ while (CurrentSample + DecodeFrame->nb_samples <= Start && PacketNumber < Frames.size()) -+ DecodeNextBlock(&it); - if (CurrentSample > Start) - throw FFMS_Exception(FFMS_ERROR_SEEKING, FFMS_ERROR_CODEC, "Seeking is severely broken"); - -- CacheBlock(it, CurrentSample, Decoded, &DecodingBuffer[0]); -- -- size_t FirstSample = static_cast(Start - CurrentSample); -- size_t Samples = static_cast(Decoded - FirstSample); -- size_t Bytes = FFMIN(Samples, static_cast(Count)) * BytesPerSample; -- -- memcpy(Dst, &DecodingBuffer[FirstSample * BytesPerSample], Bytes); -- -- Start += Samples; -- Count -= Samples; -- Dst += Bytes; -+ it = cachePos; - } - } - } -diff -ru ffmpegsource/src/core/audiosource.h ffms2/src/core/audiosource.h ---- ffmpegsource/src/core/audiosource.h 2013-02-27 16:53:39.130696566 +0100 -+++ ffms2/src/core/audiosource.h 2013-02-27 16:53:31.744380192 +0100 -@@ -46,7 +46,6 @@ - #endif - - struct FFMS_AudioSource { --private: - struct AudioBlock { - int64_t Age; - int64_t Start; -@@ -54,9 +53,17 @@ - std::vector Data; - - AudioBlock(int64_t Start, int64_t Samples, uint8_t *SrcData, size_t SrcBytes) -- : Start(Start) -- , Samples(Samples) -- , Data(SrcData, SrcData + SrcBytes) -+ : Start(Start) -+ , Samples(Samples) -+ , Data(SrcData, SrcData + SrcBytes) -+ { -+ static int64_t Now = 0; -+ Age = Now++; -+ } -+ -+ AudioBlock(int64_t Start, int64_t Samples) -+ : Start(Start) -+ , Samples(Samples) - { - static int64_t Now = 0; - Age = Now++; -@@ -74,11 +81,18 @@ - CacheIterator CacheNoDelete; - // bytes per sample * number of channels - size_t BytesPerSample; -- // Number of samples stored in the decoding buffer -- size_t Decoded; - -- // Insert a block into the cache -- void CacheBlock(CacheIterator &pos, int64_t Start, size_t Samples, uint8_t *SrcData); -+ bool NeedsResample; -+ FFResampleContext ResampleContext; -+ -+ // Insert the current audio frame into the cache -+ void CacheBlock(CacheIterator pos); -+ -+ // Interleave the current audio frame and insert it into the cache -+ void ResampleAndCache(CacheIterator pos); -+ -+ // Cache the unseekable beginning of the file once the output format is set -+ void CacheBeginning(); - - // Called after seeking - virtual void Seek() { }; -@@ -99,13 +113,13 @@ - int SeekOffset; - - // Buffer which audio is decoded into -- AlignedBuffer DecodingBuffer; -+ ScopedFrame DecodeFrame; - FFMS_Index &Index; - FFMS_Track Frames; - FFCodecContext CodecContext; - FFMS_AudioProperties AP; - -- void DecodeNextBlock(); -+ void DecodeNextBlock(CacheIterator *cachePos = 0); - // Initialization which has to be done after the codec is opened - void Init(const FFMS_Index &Index, int DelayMode); - -@@ -116,6 +130,9 @@ - FFMS_Track *GetTrack() { return &Frames; } - const FFMS_AudioProperties& GetAudioProperties() const { return AP; } - void GetAudio(void *Buf, int64_t Start, int64_t Count); -+ -+ FFMS_ResampleOptions *CreateResampleOptions() const; -+ void SetOutputFormat(const FFMS_ResampleOptions *opt); - }; - - class FFLAVFAudio : public FFMS_AudioSource { -diff -ru ffmpegsource/src/core/ffms.cpp ffms2/src/core/ffms.cpp ---- ffmpegsource/src/core/ffms.cpp 2013-02-27 16:53:39.137362917 +0100 -+++ ffms2/src/core/ffms.cpp 2013-02-27 16:53:31.744380192 +0100 -@@ -256,6 +256,24 @@ - V->ResetInputFormat(); - } - -+FFMS_API(FFMS_ResampleOptions *) FFMS_CreateResampleOptions(FFMS_AudioSource *A) { -+ return A->CreateResampleOptions(); -+} -+ -+FFMS_API(void) FFMS_DestroyResampleOptions(FFMS_ResampleOptions *options) { -+ delete options; -+} -+ -+FFMS_API(int) FFMS_SetOutputFormatA(FFMS_AudioSource *A, const FFMS_ResampleOptions *options, FFMS_ErrorInfo *ErrorInfo) { -+ ClearErrorInfo(ErrorInfo); -+ try { -+ A->SetOutputFormat(options); -+ } catch (FFMS_Exception &e) { -+ return e.CopyOut(ErrorInfo); -+ } -+ return FFMS_ERROR_SUCCESS; -+} -+ - FFMS_API(void) FFMS_DestroyIndex(FFMS_Index *Index) { - assert(Index != NULL); - if (Index == NULL) -diff -ru ffmpegsource/src/core/indexing.cpp ffms2/src/core/indexing.cpp ---- ffmpegsource/src/core/indexing.cpp 2013-02-27 16:53:39.134029741 +0100 -+++ ffms2/src/core/indexing.cpp 2013-02-27 16:53:31.744380192 +0100 -@@ -693,7 +693,6 @@ - , ANC(0) - , ANCPrivate(0) - , SourceFile(Filename) --, DecodingBuffer(AVCODEC_MAX_AUDIO_FRAME_SIZE * 10) - { - FFMS_Index::CalculateFileSignature(Filename, &Filesize, Digest); - } -@@ -702,9 +701,9 @@ - - } - --void FFMS_Indexer::WriteAudio(SharedAudioContext &AudioContext, FFMS_Index *Index, int Track, int DBSize) { -+void FFMS_Indexer::WriteAudio(SharedAudioContext &AudioContext, FFMS_Index *Index, int Track) { - // Delay writer creation until after an audio frame has been decoded. This ensures that all parameters are known when writing the headers. -- if (DBSize <= 0) return; -+ if (DecodeFrame->nb_samples) return; - - if (!AudioContext.W64Writer) { - FFMS_AudioProperties AP; -@@ -715,6 +714,8 @@ - return; - } - -+ int Format = av_get_packed_sample_fmt(AudioContext.CodecContext->sample_fmt); -+ - std::vector WName(FNSize); - (*ANC)(SourceFile.c_str(), Track, &AP, &WName[0], FNSize, ANCPrivate); - std::string WN(&WName[0]); -@@ -724,14 +725,14 @@ - av_get_bytes_per_sample(AudioContext.CodecContext->sample_fmt), - AudioContext.CodecContext->channels, - AudioContext.CodecContext->sample_rate, -- (AudioContext.CodecContext->sample_fmt == AV_SAMPLE_FMT_FLT) || (AudioContext.CodecContext->sample_fmt == AV_SAMPLE_FMT_DBL)); -+ (Format == AV_SAMPLE_FMT_FLT) || (Format == AV_SAMPLE_FMT_DBL)); - } catch (...) { - throw FFMS_Exception(FFMS_ERROR_WAVE_WRITER, FFMS_ERROR_FILE_WRITE, - "Failed to write wave data"); - } - } - -- AudioContext.W64Writer->WriteData(&DecodingBuffer[0], DBSize); -+ AudioContext.W64Writer->WriteData(*DecodeFrame); - } - - int64_t FFMS_Indexer::IndexAudioPacket(int Track, AVPacket *Packet, SharedAudioContext &Context, FFMS_Index &TrackIndices) { -@@ -739,8 +740,10 @@ - int64_t StartSample = Context.CurrentSample; - int Read = 0; - while (Packet->size > 0) { -- int dbsize = AVCODEC_MAX_AUDIO_FRAME_SIZE*10; -- int Ret = avcodec_decode_audio3(CodecContext, (int16_t *)&DecodingBuffer[0], &dbsize, Packet); -+ DecodeFrame.reset(); -+ -+ int GotFrame = 0; -+ int Ret = avcodec_decode_audio4(CodecContext, DecodeFrame, &GotFrame, Packet); - if (Ret < 0) { - if (ErrorHandling == FFMS_IEH_ABORT) { - throw FFMS_Exception(FFMS_ERROR_CODEC, FFMS_ERROR_DECODING, "Audio decoding error"); -@@ -756,13 +759,14 @@ - Packet->data += Ret; - Read += Ret; - -- CheckAudioProperties(Track, CodecContext); -+ if (GotFrame) { -+ CheckAudioProperties(Track, CodecContext); - -- if (dbsize > 0) -- Context.CurrentSample += dbsize / (av_get_bytes_per_sample(CodecContext->sample_fmt) * CodecContext->channels); -+ Context.CurrentSample += DecodeFrame->nb_samples; - -- if (DumpMask & (1 << Track)) -- WriteAudio(Context, &TrackIndices, Track, dbsize); -+ if (DumpMask & (1 << Track)) -+ WriteAudio(Context, &TrackIndices, Track); -+ } - } - Packet->size += Read; - Packet->data -= Read; -diff -ru ffmpegsource/src/core/indexing.h ffms2/src/core/indexing.h ---- ffmpegsource/src/core/indexing.h 2013-02-27 16:53:39.127363391 +0100 -+++ ffms2/src/core/indexing.h 2013-02-27 16:53:31.744380192 +0100 -@@ -155,7 +155,6 @@ - }; - - struct FFMS_Indexer { --private: - std::map LastAudioProperties; - protected: - int IndexMask; -@@ -166,12 +165,12 @@ - TAudioNameCallback ANC; - void *ANCPrivate; - std::string SourceFile; -- AlignedBuffer DecodingBuffer; -+ ScopedFrame DecodeFrame; - - int64_t Filesize; - uint8_t Digest[20]; - -- void WriteAudio(SharedAudioContext &AudioContext, FFMS_Index *Index, int Track, int DBSize); -+ void WriteAudio(SharedAudioContext &AudioContext, FFMS_Index *Index, int Track); - void CheckAudioProperties(int Track, AVCodecContext *Context); - int64_t IndexAudioPacket(int Track, AVPacket *Packet, SharedAudioContext &Context, FFMS_Index &TrackIndices); - void ParseVideoPacket(SharedVideoContext &VideoContext, AVPacket &pkt, int *RepeatPict, int *FrameType, bool *Invisible); -diff -ru ffmpegsource/src/core/utils.cpp ffms2/src/core/utils.cpp ---- ffmpegsource/src/core/utils.cpp 2013-02-27 16:53:39.134029741 +0100 -+++ ffms2/src/core/utils.cpp 2013-02-27 16:53:31.744380192 +0100 -@@ -214,10 +214,32 @@ - pkt.size = 0; - } - -+extern "C" { -+#if VERSION_CHECK(LIBAVUTIL_VERSION_INT, >=, 52, 2, 0, 52, 6, 100) -+#include -+#elif VERSION_CHECK(LIBAVUTIL_VERSION_INT, >=, 51, 26, 0, 51, 45, 100) -+#include -+#else -+static int64_t av_get_default_channel_layout(int nb_channels) { -+ switch(nb_channels) { -+ case 1: return AV_CH_LAYOUT_MONO; -+ case 2: return AV_CH_LAYOUT_STEREO; -+ case 3: return AV_CH_LAYOUT_SURROUND; -+ case 4: return AV_CH_LAYOUT_QUAD; -+ case 5: return AV_CH_LAYOUT_5POINT0; -+ case 6: return AV_CH_LAYOUT_5POINT1; -+ case 7: return AV_CH_LAYOUT_6POINT1; -+ case 8: return AV_CH_LAYOUT_7POINT1; -+ default: return 0; -+ } -+} -+#endif -+} -+ - void FillAP(FFMS_AudioProperties &AP, AVCodecContext *CTX, FFMS_Track &Frames) { -- AP.SampleFormat = static_cast(CTX->sample_fmt); -+ AP.SampleFormat = static_cast(av_get_packed_sample_fmt(CTX->sample_fmt)); - AP.BitsPerSample = av_get_bytes_per_sample(CTX->sample_fmt) * 8; -- AP.Channels = CTX->channels;; -+ AP.Channels = CTX->channels; - AP.ChannelLayout = CTX->channel_layout; - AP.SampleRate = CTX->sample_rate; - if (!Frames.empty()) { -@@ -225,6 +247,9 @@ - AP.FirstTime = ((Frames.front().PTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000; - AP.LastTime = ((Frames.back().PTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000; - } -+ -+ if (AP.ChannelLayout == 0) -+ AP.ChannelLayout = av_get_default_channel_layout(AP.Channels); - } - - #ifdef HAALISOURCE -diff -ru ffmpegsource/src/core/utils.h ffms2/src/core/utils.h ---- ffmpegsource/src/core/utils.h 2013-02-27 16:53:39.127363391 +0100 -+++ ffms2/src/core/utils.h 2013-02-27 16:53:31.744380192 +0100 -@@ -31,9 +31,13 @@ - extern "C" { - #include "stdiostream.h" - #include -+#include - #include - #include - #include -+#ifdef WITH_AVRESAMPLE -+#include -+#endif - } - - // must be included after ffmpeg headers -@@ -133,6 +137,34 @@ - } - }; - -+template -+class unknown_size { -+ T *ptr; -+ -+ unknown_size(unknown_size const&); -+ unknown_size& operator=(unknown_size const&); -+public: -+ operator T*() const { return ptr; } -+ operator void*() const { return ptr; } -+ T *operator->() const { return ptr; } -+ -+ unknown_size() : ptr(Alloc()) { } -+ ~unknown_size() { Del(&ptr); } -+}; -+ -+class ScopedFrame : public unknown_size { -+public: -+ void reset() { -+ avcodec_get_frame_defaults(*this); -+ } -+}; -+ -+#ifdef WITH_AVRESAMPLE -+typedef unknown_size FFResampleContext; -+#else -+typedef struct {} FFResampleContext; -+#endif -+ - inline void DeleteHaaliCodecContext(AVCodecContext *CodecContext) { - av_freep(&CodecContext->extradata); - av_freep(&CodecContext); -@@ -228,4 +240,68 @@ - - void FlushBuffers(AVCodecContext *CodecContext); - -+namespace optdetail { -+ template -+ T get_av_opt(void *v, const char *name) { -+ return static_cast(av_get_int(v, name, 0)); -+ } -+ -+ template<> -+ inline double get_av_opt(void *v, const char *name) { -+ return av_get_double(v, name, 0); -+ } -+ -+ template -+ void set_av_opt(void *v, const char *name, T value) { -+ av_opt_set_int(v, name, value, 0); -+ } -+ -+ template<> -+ inline void set_av_opt(void *v, const char *name, double value) { -+ av_opt_set_double(v, name, value, 0); -+ } -+} -+ -+template -+class OptionMapper { -+ struct OptionMapperBase { -+ virtual void ToOpt(const FFMS_Struct *src, void *dst) const=0; -+ virtual void FromOpt(FFMS_Struct *dst, void *src) const=0; -+ }; -+ -+ template -+ class OptionMapperImpl : public OptionMapperBase { -+ T (FFMS_Struct::*ptr); -+ const char *name; -+ -+ public: -+ OptionMapperImpl(T (FFMS_Struct::*ptr), const char *name) : ptr(ptr), name(name) { } -+ void ToOpt(const FFMS_Struct *src, void *dst) const { optdetail::set_av_opt(dst, name, src->*ptr); } -+ void FromOpt(FFMS_Struct *dst, void *src) const { dst->*ptr = optdetail::get_av_opt(src, name); } -+ }; -+ -+ OptionMapperBase *impl; -+ -+public: -+ template -+ OptionMapper(const char *opt_name, T (FFMS_Struct::*member)) : impl(new OptionMapperImpl(member, opt_name)) { } -+ -+ void ToOpt(const FFMS_Struct *src, void *dst) const { impl->ToOpt(src, dst); } -+ void FromOpt(FFMS_Struct *dst, void *src) const { impl->FromOpt(dst, src); } -+}; -+ -+template -+T *ReadOptions(void *opt, OptionMapper (&options)[N]) { -+ T *ret = new T; -+ for (int i = 0; i < N; ++i) -+ options[i].FromOpt(ret, opt); -+ return ret; -+} -+ -+template -+void SetOptions(const T* src, void *opt, OptionMapper (&options)[N]) { -+ for (int i = 0; i < N; ++i) -+ options[i].ToOpt(src, opt); -+} -+ - #endif -diff -ru ffmpegsource/src/core/wave64writer.cpp ffms2/src/core/wave64writer.cpp ---- ffmpegsource/src/core/wave64writer.cpp 2013-02-27 16:53:39.134029741 +0100 -+++ ffms2/src/core/wave64writer.cpp 2013-02-27 16:53:31.744380192 +0100 -@@ -106,7 +106,16 @@ - WavFile.seekp(CPos, std::ios::beg); - } - --void Wave64Writer::WriteData(void *Data, std::streamsize Length) { -- WavFile.write(reinterpret_cast(Data), Length); -+void Wave64Writer::WriteData(AVFrame const& Frame) { -+ uint64_t Length = Frame.nb_samples * BytesPerSample * Channels; -+ if (Channels > 1 && av_sample_fmt_is_planar(static_cast(Frame.format))) { -+ for (int32_t sample = 0; sample < Frame.nb_samples; ++sample) { -+ for (int32_t channel = 0; channel < Channels; ++channel) -+ WavFile.write(reinterpret_cast(&Frame.extended_data[channel][sample * BytesPerSample]), BytesPerSample); -+ } -+ } -+ else { -+ WavFile.write(reinterpret_cast(Frame.extended_data[0]), Length); -+ } - BytesWritten += Length; - } -diff -ru /tmp/ffmpegsource/src/ffmpegsource/src/core/wave64writer.h ffms2/src/core/wave64writer.h ---- /tmp/ffmpegsource/src/ffmpegsource/src/core/wave64writer.h 2013-02-27 16:53:39.127363391 +0100 -+++ ffms2/src/core/wave64writer.h 2013-02-27 16:53:31.744380192 +0100 -@@ -28,8 +28,8 @@ - class Wave64Writer { - public: - Wave64Writer(const char *Filename, uint16_t BitsPerSample, uint16_t Channels, uint32_t SamplesPerSec, bool IsFloat); - ~Wave64Writer(); -- void WriteData(void *Data, std::streamsize Length); -+ void WriteData(AVFrame const& Frame); - private: - ffms_fstream WavFile; - int32_t BytesPerSample; diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index f2e0d699c..6cd5c12f5 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 87801 2013-04-06 19:27:42Z stativ $ +# $Id: PKGBUILD 88193 2013-04-13 15:39:41Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=intellij-idea-libs -pkgver=12.1 -_pkgver=129.161 +pkgver=12.1.1 +_pkgver=129.239 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') url="http://www.jetbrains.org/" license=('apache') depends=('glibc') +options=(!strip) source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('687ba6aea524099f10605bb50569864d') +md5sums=('279905aa380822f8a72a01e2b4955b44') package() { cd "$srcdir" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index b466757ed..571fc58a8 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87751 2013-04-06 09:18:35Z bpiotrowski $ +# $Id: PKGBUILD 88176 2013-04-13 10:02:06Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.3 +pkgver=0.10.4 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ depends=('openssl' 'python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('bc8796ff6414231fa0603e0383404f14648dfd2fe9fb0fa4d4a6043dfddbb328') +sha256sums=('1c960d2822447a9e4f7c46b832ff05e86743033c6643d644975af1cbf6a44fb8') build() { cd node-v${pkgver} diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index 4b00d7e8c..041dcacb4 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 78236 2012-10-17 10:26:22Z allan $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 88178 2013-04-13 10:41:30Z seblu $ +# Maintainer: Sébastien Luttringer pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') -pkgver=0.6.1 -pkgrel=2 +pkgver=0.7.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://code.google.com/p/psutil/' license=('custom: BSD') makedepends=('python' 'python-distribute' 'python2' 'python2-distribute') source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") -sha1sums=('f7a76e201601d8e06a1fdf434422f884888aac86') +sha1sums=('e19bd1c050786616dd81a3b200c61b8147eb9985') build() { cd psutil-$pkgver @@ -40,4 +40,4 @@ package_python2-psutil() { install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index c9ae17802..9892da00a 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 180116 2013-03-17 15:39:56Z foutrelis $ +# $Id: PKGBUILD 182700 2013-04-12 23:52:17Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Allan McRae # Contributor: Tom Newsom pkgname=sudo -_sudover=1.8.6p7 +_sudover=1.8.6p8 pkgver=${_sudover/p/.p} -pkgrel=2 +pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" arch=('i686' 'x86_64') url="http://www.sudo.ws/sudo/" @@ -17,8 +17,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} sudo.pam) -sha256sums=('301089edb22356f59d097f6abbe1303f03927a38691b02959d618546c2125036' - 'ab7660cbaba45f6aff03abbae69a62e9644a86bed76b53334364147569f104d6' +sha256sums=('c0baaa87f59153967b650a0dde2f7d4147d358fa15f3fdabb47e84d0282fe625' + 'SKIP' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') build() { diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD index 5d882d42c..9e1832778 100644 --- a/extra/libdiscid/PKGBUILD +++ b/extra/libdiscid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179626 2013-03-08 21:37:31Z eric $ +# $Id: PKGBUILD 182706 2013-04-13 00:27:30Z eric $ # Maintainer: Andrea Scarpino # Contributor: Eric Gillingham pkgname=libdiscid -pkgver=0.4.1 +pkgver=0.5.0 pkgrel=1 pkgdesc="A Library for creating MusicBrainz DiscIDs" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('glibc') options=('!libtool') source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz") -md5sums=('d8287c46dff9858c2ce2d70154fe6f4c') +md5sums=('a029355e53db1c2c24cc34a6d3e3b626') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index b5d8ee573..8dc1bc45f 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175925 2013-01-25 04:01:07Z eric $ +# $Id: PKGBUILD 182702 2013-04-12 23:53:53Z eric $ # Maintainer: kevin # Contributor: Matt Thompson pkgname=perl-dbi _realname=DBI -pkgver=1.623 +pkgver=1.625 pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('b45654dca3b495f3d496c359f0029d96') +md5sums=('b0521be412faff4ec8d511cd5f3f6a31') build() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD index bbcf6a742..a948629e6 100644 --- a/extra/timidity++/PKGBUILD +++ b/extra/timidity++/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173850 2012-12-25 00:34:49Z foutrelis $ +# $Id: PKGBUILD 182711 2013-04-13 07:33:18Z eric $ # Maintainer: Eric Bélanger pkgname=timidity++ pkgver=2.14.0 -pkgrel=4 +pkgrel=5 pkgdesc="A MIDI to WAVE converter and player" arch=('i686' 'x86_64') url="http://timidity.sourceforge.net" @@ -14,10 +14,9 @@ optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface 'xaw3d: for using the Xaw interface') backup=('etc/timidity++/timidity.cfg') source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \ - timidity.cfg timidity++.sh timidity.service) + timidity.cfg timidity.service) sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b' '660b3afbb720d26e8f008034cee66dd8da082d6e' - '9f3e732a7ca1e97119a76df62ecf154df04d4f77' 'f0351b9eb8928d3d82c380107654a7dbe7cd2d54') build() { @@ -35,6 +34,5 @@ package() { cd "${srcdir}/TiMidity++-${pkgver}" make DESTDIR="${pkgdir}" install install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg" - install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++" install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service" } diff --git a/extra/timidity++/timidity++.sh b/extra/timidity++/timidity++.sh deleted file mode 100644 index 3fa13cea9..000000000 --- a/extra/timidity++/timidity++.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/timidity` -case "$1" in - start) - stat_busy "Starting Timidity++ ALSA Daemon" - [ -z "$PID" ] && /usr/bin/timidity -iAD > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/timidity.pid - add_daemon timidity++ - stat_done - fi - ;; - stop) - stat_busy "Stopping Timidity++ ALSA Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/timidity.pid - rm_daemon timidity++ - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index f003a128a..296bea51a 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $ +# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,12 +6,12 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.6 +pkgver=${_basekernel}.7 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') -makedepends=('xmlto' 'docbook-xsl') +makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '1b3cd03d2add3bfe74e98a953f28c8d0' + 'f83582104813c022e6739e12664dbb0c' '6294513cfa9830d48ad1915ff7053a98' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' @@ -31,7 +31,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-PAE -build() { +prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then @@ -58,6 +58,10 @@ build() { # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh +} + +build() { + cd "${srcdir}/linux-${_basekernel}" # get kernel version make prepare diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index c8ba6a356..1e8ed6868 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.6-1-LIBRE-PAE +KERNEL_VERSION=3.8.7-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index a239bce41..fed3ad748 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -18,7 +18,7 @@ _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') -makedepends=('xmlto' 'docbook-xsl') +makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz" @@ -52,7 +52,7 @@ fi _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-RT -build() { +prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then @@ -102,6 +102,10 @@ build() { # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh +} + +build() { + cd "${srcdir}/linux-${_basekernel}" # get kernel version make prepare diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 8d112b6ab..45759cd92 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $ +# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,12 +6,12 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.6 +pkgver=${_basekernel}.7 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') -makedepends=('xmlto' 'docbook-xsl') +makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '1b3cd03d2add3bfe74e98a953f28c8d0' + 'f83582104813c022e6739e12664dbb0c' '2708b6f03f827e2c94ecbd050df4286d' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' @@ -31,7 +31,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-XEN -build() { +prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then @@ -58,6 +58,10 @@ build() { # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh +} + +build() { + cd "${srcdir}/linux-${_basekernel}" # get kernel version make prepare diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 2b4029b64..f9430058d 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.6-1-LIBRE-XEN +KERNEL_VERSION=3.8.7-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 9279a463f..1ef8b1d76 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,5 +1,7 @@ # $Id$ -# Maintainer: Giovanni Scafora +# Maintainer: jelle van der Waa +# Maintainer: Daniel Wallace +# Contributor: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani # Contributor: Larry Hajali @@ -7,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.26 +pkgver=0.9.27 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -28,7 +30,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('14df8fbe5e0fa5e8cc14b480603920e2' +md5sums=('1d5bbe102e3ec6ec71399aad5d074137' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 524b24bae..d6dc1c328 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.6 +_kernver=3.8.7 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=12 +pkgrel=13 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index d2b2839ea..1963f2536 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.72 +_kernver=3.0.73 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=10 +pkgrel=11 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index e0fb91bd4..df302a20d 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182062 2013-04-06 09:14:10Z tpowa $ +# $Id: PKGBUILD 182731 2013-04-13 15:31:06Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,14 +7,14 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=72 +_sublevel=73 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.71 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.72 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') -makedepends=('xmlto' 'docbook-xsl') +makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" @@ -30,10 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' 'module-symbol-waiting-3.0.patch' 'module-init-wait-3.0.patch' - 'ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '337d8baa608067d3ef79a553af790416' + '846a503d4bacfaca417fbea67aceabc2' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -45,8 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'ee587972bbd35841cc0efe82db9caa7c' - 'fd5bb788a849895ebf1b8efe64646715') + '5d433e634f9744824a5a3122d734e6f6') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -56,7 +54,7 @@ fi _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-LTS -build() { +prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then @@ -66,10 +64,6 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # revert i686 build breaker 3.0.72 kernel - if [ "${CARCH}" = "i686" ]; then - patch -Rp1 -i "${srcdir}/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch" - fi # Some chips detect a ghost TV output # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html # Arch Linux bug report: FS#19234 @@ -125,6 +119,10 @@ build() { # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh +} + +build() { + cd "${srcdir}/linux-${_basekernel}" # get kernel version make prepare diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 76b9b14f0..c3aff92ae 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.72-1-LIBRE-LTS +KERNEL_VERSION=3.0.73-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e340623ac..f0ca4a325 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $ +# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,14 +10,14 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=6 +_sublevel=7 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') -makedepends=('xmlto' 'docbook-xsl') +makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '1b3cd03d2add3bfe74e98a953f28c8d0' + 'f83582104813c022e6739e12664dbb0c' '9b425f069f920cdd6798b3adab79d3af' '9316ebdb21ea9948ae5c83795a3dcf61' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -49,7 +49,7 @@ fi _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE -build() { +prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then @@ -96,6 +96,10 @@ build() { # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh +} + +build() { + cd "${srcdir}/linux-${_basekernel}" # get kernel version make prepare diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index a7672f35c..46f383749 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.6-1-LIBRE +KERNEL_VERSION=3.8.7-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD index 9f03c48db..e46a7d0b1 100644 --- a/pcr/debootstrap/PKGBUILD +++ b/pcr/debootstrap/PKGBUILD @@ -2,19 +2,43 @@ # Maintainer: André Silva pkgname=debootstrap -pkgver=1.0.26 +pkgver=1.0.48 pkgrel=1 -pkgdesc="A tool used to create a gNewSense base system from scratch, without requiring the availability of dpkg or apt" +pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt" arch=('any') license=('GPL') -url="http://www.gnewsense.org" -depends=('bash' 'wget') -source=("http://archive.gnewsense.org/gnewsense-three/gnewsense/pool/overlays/parkes/kgoetz/${pkgname}/${pkgname}_${pkgver}+squeeze1+gnewsense1_all.deb") +url="http://packages.debian.org/sid/debootstrap" +depends=('wget') +source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver}_all.deb" + 'metad' + 'trisquel') install="debootstrap.install" -md5sums=('2049317eac54c0fac6c3201a90fadc18') +md5sums=('f75ae43204ed273c7a95c12a5a2f715a' + '4425300ca68d60fb60a6d699e153a519' + 'b020aa8426e70a6024c8e76312c17d78') -build(){ - tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/" - # doesn't work with gpg 2.x, patch to point to gpgv1 - sed 's/gpgv/gpgv1/g;' -i "${pkgdir}/usr/sbin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions" +package(){ + tar -xzf "$srcdir/data.tar.gz" -C "$pkgdir/" + + # doesn't work with gpg 2.x, patch to point to gpg1v + sed 's/gpgv/gpg1v/g;' -i "$pkgdir/usr/sbin/debootstrap" "$pkgdir/usr/share/debootstrap/functions" + + # add gNewSense script + install -m644 metad "$pkgdir/usr/share/debootstrap/scripts" + + # create gNewSense symlinks + ln -s metad "$pkgdir/usr/share/debootstrap/scripts/deltah" + ln -s metad "$pkgdir/usr/share/debootstrap/scripts/parkes" + + # add Trisquel script + install -m644 trisquel "$pkgdir/usr/share/debootstrap/scripts" + + # create Trisquel symlinks + ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/awen" + ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/brigantia" + ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/dagda" + ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/dwyn" + ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/robur" + ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/slaine" + ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/taranis" } diff --git a/pcr/debootstrap/metad b/pcr/debootstrap/metad new file mode 100644 index 000000000..8d14c0ed9 --- /dev/null +++ b/pcr/debootstrap/metad @@ -0,0 +1,203 @@ +case $SUITE in + parkes|metad) + default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense/ + ;; + deltah) + default_mirror http://archive.gnewsense.org/gnewsense + ;; +esac + + +mirror_style release +download_style apt +finddebs_style from-indices +variants - buildd fakechroot minbase scratchbox + +if doing_variant fakechroot; then + test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started" +fi + +case $ARCH in + alpha|ia64) LIBC="libc6.1" ;; + kfreebsd-*) LIBC="libc0.1" ;; + hurd-*) LIBC="libc0.3" ;; + *) LIBC="libc6" ;; +esac + +work_out_debs () { + required="$(get_debs Priority: required)" + + if doing_variant - || doing_variant fakechroot; then + #required="$required $(get_debs Priority: important)" + # ^^ should be getting debconf here somehow maybe + base="$(get_debs Priority: important)" + elif doing_variant buildd || doing_variant scratchbox; then + base="apt $(get_debs Build-Essential: yes)" + elif doing_variant minbase; then + base="apt" + fi + + if doing_variant fakechroot; then + # ldd.fake needs binutils + required="$required binutils" + fi +} + +first_stage_install () { + extract $required + + mkdir -p "$TARGET/var/lib/dpkg" + : >"$TARGET/var/lib/dpkg/status" + : >"$TARGET/var/lib/dpkg/available" + + setup_etc + if [ ! -e "$TARGET/etc/fstab" ]; then + echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" + chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" + fi + + if doing_variant fakechroot; then + setup_devices_fakechroot + else + setup_devices + fi + + x_feign_install () { + local pkg="$1" + local deb="$(debfor $pkg)" + local ver="$(extract_deb_field "$TARGET/$deb" Version)" + + mkdir -p "$TARGET/var/lib/dpkg/info" + + echo \ +"Package: $pkg +Version: $ver +Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" + + touch "$TARGET/var/lib/dpkg/info/${pkg}.list" + } + + x_feign_install dpkg +} + +second_stage_install () { + x_core_install () { + smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") + } + + p () { + baseprog="$(($baseprog + ${1:-1}))" + } + + if doing_variant fakechroot; then + setup_proc_fakechroot + elif doing_variant scratchbox; then + true + else + setup_proc + in_target /sbin/ldconfig + fi + + DEBIAN_FRONTEND=noninteractive + DEBCONF_NONINTERACTIVE_SEEN=true + export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN + + baseprog=0 + bases=7 + + p; progress $baseprog $bases INSTCORE "Installing core packages" #1 + info INSTCORE "Installing core packages..." + + p; progress $baseprog $bases INSTCORE "Installing core packages" #2 + ln -sf mawk "$TARGET/usr/bin/awk" + x_core_install base-files base-passwd + p; progress $baseprog $bases INSTCORE "Installing core packages" #3 + x_core_install dpkg + + if [ ! -e "$TARGET/etc/localtime" ]; then + ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime" + fi + + if doing_variant fakechroot; then + install_fakechroot_tools + fi + + p; progress $baseprog $bases INSTCORE "Installing core packages" #4 + x_core_install $LIBC + + p; progress $baseprog $bases INSTCORE "Installing core packages" #5 + x_core_install perl-base + + p; progress $baseprog $bases INSTCORE "Installing core packages" #6 + rm "$TARGET/usr/bin/awk" + x_core_install mawk + + p; progress $baseprog $bases INSTCORE "Installing core packages" #7 + if doing_variant -; then + x_core_install debconf + fi + + baseprog=0 + bases=$(set -- $required; echo $#) + + info UNPACKREQ "Unpacking required packages..." + + exec 7>&1 + + smallyes '' | + (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \ + dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) | + dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING + + info CONFREQ "Configuring required packages..." + + mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" + echo \ +"#!/bin/sh +echo +echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" + chmod 755 "$TARGET/sbin/start-stop-daemon" + + setup_dselect_method apt + + smallyes '' | + (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \ + dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 || echo EXITCODE $?) | + dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING + + baseprog=0 + bases="$(set -- $base; echo $#)" + + info UNPACKBASE "Unpacking the base system..." + + setup_available $required $base + done_predeps= + while predep=$(get_next_predep); do + # We have to resolve dependencies of pre-dependencies manually because + # dpkg --predep-package doesn't handle this. + predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps") + # XXX: progress is tricky due to how dpkg_progress works + # -- cjwatson 2009-07-29 + p; smallyes '' | + in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep) + base=$(without "$base" "$predep") + done_predeps="$done_predeps $predep" + done + + smallyes '' | + (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) | + dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING + + info CONFBASE "Configuring the base system..." + + smallyes '' | + (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) | + dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING + + mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" + + progress $bases $bases CONFBASE "Configuring base system" + info BASESUCCESS "Base system installed successfully." +} diff --git a/pcr/debootstrap/trisquel b/pcr/debootstrap/trisquel new file mode 100644 index 000000000..7efa062f9 --- /dev/null +++ b/pcr/debootstrap/trisquel @@ -0,0 +1,199 @@ +default_mirror http://archive.trisquel.info/trisquel +mirror_style release +download_style apt +finddebs_style from-indices +variants - buildd fakechroot minbase + +if doing_variant fakechroot; then + test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started" +fi + +case $ARCH in + alpha|ia64) LIBC="libc6.1" ;; + *) LIBC="libc6" ;; +esac + +work_out_debs () { + required="$(get_debs Priority: required)" + + if doing_variant -; then + #required="$required $(get_debs Priority: important)" + # ^^ should be getting debconf here somehow maybe + base="$(get_debs Priority: important)" + elif doing_variant buildd; then + base="$(get_debs Build-Essential: yes)" + elif doing_variant fakechroot || doing_variant minbase; then + base="apt" + fi +} + +first_stage_install () { + extract $required + + mkdir -p "$TARGET/var/lib/dpkg" + : >"$TARGET/var/lib/dpkg/status" + : >"$TARGET/var/lib/dpkg/available" + + setup_etc + if [ ! -e "$TARGET/etc/fstab" ]; then + echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" + chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" + fi + + if doing_variant fakechroot; then + setup_devices_fakechroot + else + setup_devices + fi + + x_feign_install () { + local pkg="$1" + local deb="$(debfor $pkg)" + local ver="$(extract_deb_field "$TARGET/$deb" Version)" + + mkdir -p "$TARGET/var/lib/dpkg/info" + + echo \ +"Package: $pkg +Version: $ver +Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" + + touch "$TARGET/var/lib/dpkg/info/${pkg}.list" + } + + x_feign_install dpkg +} + +second_stage_install () { + x_core_install () { + smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") + } + + p () { + baseprog="$(($baseprog + ${1:-1}))" + } + + if doing_variant fakechroot; then + setup_proc_fakechroot + else + setup_proc + in_target /sbin/ldconfig + fi + + DEBIAN_FRONTEND=noninteractive + DEBCONF_NONINTERACTIVE_SEEN=true + export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN + + baseprog=0 + bases=7 + + p; progress $baseprog $bases INSTCORE "Installing core packages" #1 + info INSTCORE "Installing core packages..." + + p; progress $baseprog $bases INSTCORE "Installing core packages" #2 + ln -sf mawk "$TARGET/usr/bin/awk" + x_core_install base-files base-passwd + p; progress $baseprog $bases INSTCORE "Installing core packages" #3 + x_core_install dpkg + + if [ ! -e "$TARGET/etc/localtime" ]; then + ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime" + fi + + if doing_variant fakechroot; then + install_fakechroot_tools + fi + + p; progress $baseprog $bases INSTCORE "Installing core packages" #4 + x_core_install $LIBC + + p; progress $baseprog $bases INSTCORE "Installing core packages" #5 + x_core_install perl-base + + p; progress $baseprog $bases INSTCORE "Installing core packages" #6 + rm "$TARGET/usr/bin/awk" + x_core_install mawk + + p; progress $baseprog $bases INSTCORE "Installing core packages" #7 + if doing_variant -; then + x_core_install debconf + fi + + baseprog=0 + bases=$(set -- $required; echo $#) + + info UNPACKREQ "Unpacking required packages..." + + smallyes '' | + (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \ + dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | + dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1 + + info CONFREQ "Configuring required packages..." + + if doing_variant fakechroot; then + # fix initscripts postinst (no mounting possible, and wrong if condition) + sed -i '/dpkg.*--compare-versions/ s/\/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst" + fi + + mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" + echo \ +"#!/bin/sh +echo +echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" + chmod 755 "$TARGET/sbin/start-stop-daemon" + + if [ -x "$TARGET/sbin/initctl" ]; then + mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL" + echo \ +"#!/bin/sh +echo +echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl" + chmod 755 "$TARGET/sbin/initctl" + fi + + setup_dselect_method apt + + smallyes '' | + (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \ + dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 | + dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1 + + baseprog=0 + bases="$(set -- $base; echo $#)" + + info UNPACKBASE "Unpacking the base system..." + + setup_available $required $base + done_predeps= + while predep=$(get_next_predep); do + # We have to resolve dependencies of pre-dependencies manually because + # dpkg --predep-package doesn't handle this. + predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps") + # XXX: progress is tricky due to how dpkg_progress works + # -- cjwatson 2009-07-29 + p; smallyes '' | in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep) + base=$(without "$base" "$predep") + done_predeps="$done_predeps $predep" + done + + smallyes '' | + (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | + dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1 + + info CONFBASE "Configuring the base system..." + + smallyes '' | + (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be attempted 5 times." "" \ + dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 | + dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1 + + if [ -x "$TARGET/sbin/initctl.REAL" ]; then + mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl" + fi + mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" + + progress $bases $bases CONFBASE "Configuring base system" + info BASESUCCESS "Base system installed successfully." +} -- cgit v1.2.3-54-g00ecf From 55c3b92ede6a3b9eb17f254b338931f01a3ea5c6 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 18 Apr 2013 00:07:00 -0700 Subject: Thu Apr 18 00:06:59 PDT 2013 --- community/at/PKGBUILD | 36 +++++++++ community/at/atd | 35 +++++++++ community/at/atd.service | 9 +++ community/cinnamon-control-center/PKGBUILD | 6 +- community/collectd/PKGBUILD | 18 ++--- community/collectd/install | 8 -- community/gsql/PKGBUILD | 22 +++--- community/libgit2/PKGBUILD | 22 ++++-- community/lightdm-kde-greeter/PKGBUILD | 11 ++- community/opensmtpd/PKGBUILD | 69 ++++++++++++++++++ community/opensmtpd/opensmtpd.install | 14 ++++ community/opensmtpd/smtpd.service | 10 +++ community/opensmtpd/smtpd.socket | 8 ++ community/openssh-askpass/PKGBUILD | 6 +- community/xlockmore/PKGBUILD | 12 ++- core/bison/PKGBUILD | 8 +- core/expat/PKGBUILD | 6 +- core/m4/PKGBUILD | 17 ++++- core/m4/m4.install | 2 +- core/tar/PKGBUILD | 19 ++++- extra/alsa-utils/PKGBUILD | 11 ++- extra/alsa-utils/arecord-1.0.27.patch | 24 ++++++ extra/apr-util/PKGBUILD | 6 +- extra/at/PKGBUILD | 36 --------- extra/at/atd | 35 --------- extra/at/atd.service | 9 --- extra/cairo-perl/PKGBUILD | 13 ++-- extra/chkrootkit/PKGBUILD | 42 ----------- extra/chkrootkit/backslashes.patch | 22 ------ extra/chkrootkit/chkrootkit.cron | 2 - extra/chkrootkit/fix-tools-path.patch | 11 --- extra/chkrootkit/kallsyms.patch | 30 -------- extra/gob2/PKGBUILD | 6 +- extra/icedtea-web-java7/PKGBUILD | 15 ++-- extra/libkdcraw/PKGBUILD | 7 +- extra/libplist/PKGBUILD | 9 ++- extra/libpst/PKGBUILD | 14 ++-- extra/mediastreamer/PKGBUILD | 37 ++++++++++ extra/mediastreamer/mediastreamer-ffmpeg.patch | 57 +++++++++++++++ extra/telepathy-kde-accounts-kcm/PKGBUILD | 8 +- extra/telepathy-kde-approver/PKGBUILD | 6 +- extra/telepathy-kde-auth-handler/PKGBUILD | 6 +- extra/telepathy-kde-common-internals/PKGBUILD | 10 +-- extra/telepathy-kde-contact-list/PKGBUILD | 8 +- extra/telepathy-kde-contact-runner/PKGBUILD | 6 +- extra/telepathy-kde-desktop-applets/PKGBUILD | 6 +- extra/telepathy-kde-filetransfer-handler/PKGBUILD | 6 +- extra/telepathy-kde-integration-module/PKGBUILD | 6 +- extra/telepathy-kde-send-file/PKGBUILD | 6 +- extra/telepathy-kde-text-ui/PKGBUILD | 6 +- extra/xf86-video-vmware/PKGBUILD | 12 ++- extra/xf86-video-vmware/git-fixes.patch | 89 ----------------------- extra/xorg-server/PKGBUILD | 8 +- kernels/linux-libre-pae/PKGBUILD | 6 +- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 6 +- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 10 +-- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 10 +-- libre/linux-libre/linux-libre.install | 2 +- libre/lirc-libre/PKGBUILD | 20 +---- libre/lirc-libre/irexec.conf | 5 -- libre/lirc-libre/irexecd | 38 ---------- libre/lirc-libre/lircd | 52 ------------- libre/lirc-libre/lircd.conf | 8 -- libre/lirc-libre/lircmd | 36 --------- libre/virtualbox-libre-modules/PKGBUILD | 2 +- pcr/gnuhealth/PKGBUILD | 4 +- pcr/mediastreamer/PKGBUILD | 33 --------- pcr/mediastreamer/mediastreamer-ffmpeg.patch | 57 --------------- pcr/python2-pycha/PKGBUILD | 35 +++++++++ pcr/python2-relatorio/PKGBUILD | 42 +++++++---- pcr/trytond/PKGBUILD | 6 +- 76 files changed, 573 insertions(+), 720 deletions(-) create mode 100644 community/at/PKGBUILD create mode 100644 community/at/atd create mode 100644 community/at/atd.service delete mode 100644 community/collectd/install create mode 100644 community/opensmtpd/PKGBUILD create mode 100644 community/opensmtpd/opensmtpd.install create mode 100644 community/opensmtpd/smtpd.service create mode 100644 community/opensmtpd/smtpd.socket create mode 100644 extra/alsa-utils/arecord-1.0.27.patch delete mode 100644 extra/at/PKGBUILD delete mode 100644 extra/at/atd delete mode 100644 extra/at/atd.service delete mode 100644 extra/chkrootkit/PKGBUILD delete mode 100644 extra/chkrootkit/backslashes.patch delete mode 100644 extra/chkrootkit/chkrootkit.cron delete mode 100644 extra/chkrootkit/fix-tools-path.patch delete mode 100644 extra/chkrootkit/kallsyms.patch create mode 100644 extra/mediastreamer/PKGBUILD create mode 100644 extra/mediastreamer/mediastreamer-ffmpeg.patch delete mode 100644 extra/xf86-video-vmware/git-fixes.patch delete mode 100644 libre/lirc-libre/irexec.conf delete mode 100644 libre/lirc-libre/irexecd delete mode 100644 libre/lirc-libre/lircd delete mode 100644 libre/lirc-libre/lircd.conf delete mode 100644 libre/lirc-libre/lircmd delete mode 100644 pcr/mediastreamer/PKGBUILD delete mode 100644 pcr/mediastreamer/mediastreamer-ffmpeg.patch create mode 100644 pcr/python2-pycha/PKGBUILD (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/at/PKGBUILD b/community/at/PKGBUILD new file mode 100644 index 000000000..43bdaf5af --- /dev/null +++ b/community/at/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 88443 2013-04-17 18:45:36Z eric $ +# Maintainer: Judd Vinet +# Contributor: Todd Musall + +pkgname=at +pkgver=3.1.13 +pkgrel=2 +pkgdesc="AT and batch delayed command scheduling utility and daemon" +arch=('i686' 'x86_64') +url="http://packages.qa.debian.org/a/at.html" +license=('GPL') +depends=('pam') +makedepends=('ssmtp') +backup=('etc/at.deny') +options=('!makeflags') +source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz + atd atd.service) +md5sums=('1da61af6c29e323abaaf13ee1a8dad79' + '35574e34829e7df07a3269d4ab646a29' + '33976a813f4fe7f5659354601044c6f8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --with-jobdir=/var/spool/atd \ + --with-atspool=/var/spool/atd + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make IROOT="${pkgdir}" docdir=/usr/share/doc install + install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd" + install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service" +} diff --git a/community/at/atd b/community/at/atd new file mode 100644 index 000000000..d10a46a3b --- /dev/null +++ b/community/at/atd @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/atd` +case "$1" in + start) + stat_busy "Starting ATD Daemon" + [ -z "$PID" ] && /usr/sbin/atd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon atd + stat_done + fi + ;; + stop) + stat_busy "Stopping ATD Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon atd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/at/atd.service b/community/at/atd.service new file mode 100644 index 000000000..ba359878c --- /dev/null +++ b/community/at/atd.service @@ -0,0 +1,9 @@ +[Unit] +Description=ATD daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/atd + +[Install] +WantedBy=multi-user.target diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 74b724004..d187b373f 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86850 2013-03-22 21:27:24Z faidoc $ +# $Id: PKGBUILD 88411 2013-04-17 07:47:53Z faidoc $ # Maintainer: Alexandre Filgueira # Jan de Groot pkgname=cinnamon-control-center -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ install=cinnamon-control-center.install license=('GPL') options=('!libtool' '!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") -sha256sums=('09af52ae7417b611b91ca9fdafbde08c68356f2b66241780b513ad2249a831c1') +sha256sums=('44a4484238c2b9e9060d062028438df589fc29c9e3da45edad068198a990c8be') build() { cd $pkgname-$pkgver diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 3f8ac903d..07b3708d9 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86998 2013-03-25 19:16:35Z bpiotrowski $ +# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Gerhard Brauer pkgname=collectd -pkgver=5.2.1 +pkgver=5.3.0 pkgrel=1 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' @@ -42,39 +42,37 @@ source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'libperl.patch' 'service' 'rc.d') -sha1sums=('2c51c21d339c221bd9f94b1ee2b44b1e388d6b39' +sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539' '245c098d121a4a05594553583310953b3a2f6461' 'b56907f532b9174e1b6995aadb518228d7464d3b' '0f441718d5519cb043b1130e5a1d0379078adbcc') backup=('etc/collectd.conf') options=('!libtool') -install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../libperl.patch autoconf + sed 's/-Werror//g' -i src/Makefile.in +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-static=no \ --with-python=/usr/bin/python2 - make all } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - rmdir "${pkgdir}/var/run" # FS#30201 install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl - mv "${pkgdir}"/usr/man/man3 "${pkgdir}"/usr/share/man # perl man magic ignores datarootdir } diff --git a/community/collectd/install b/community/collectd/install deleted file mode 100644 index 54cc0e1b3..000000000 --- a/community/collectd/install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - cat < Customize your /etc/collectd.conf (you really want to). -==> Then start and stop the daemon using: /etc/rc.d/collectd -==> To see some result of collected data, use the Perl script: -==> /usr/share/collectd/collectd2html.pl -EOF -} diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD index 6b2ade1d1..a4d3f5c39 100644 --- a/community/gsql/PKGBUILD +++ b/community/gsql/PKGBUILD @@ -1,32 +1,36 @@ -# $Id: PKGBUILD 87004 2013-03-25 19:16:44Z bpiotrowski $ +# $Id: PKGBUILD 88439 2013-04-17 16:49:53Z bgyorgy $ # Contributor: Michael Kanis pkgname=gsql pkgver=0.2.2 -pkgrel=5 +pkgrel=6 pkgdesc="Integrated database development tool for GNOME" url="http://gsql.org/" license=('GPL') arch=('i686' 'x86_64') -depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf' - 'desktop-file-utils' 'libnotify') -makedepends=('libmariadbclient' 'postgresql-libs' 'libssh') -optdepends=('libmariadbclient' 'postgresql-libs' 'libssh') +depends=('gtk2>=2.12' 'gtksourceview2' 'libglade' 'gconf' + 'desktop-file-utils' 'libnotify' 'hicolor-icon-theme') +makedepends=('vte' 'libmariadbclient' 'postgresql-libs' 'libssh') +optdepends=('libmariadbclient: MySQL engine' + 'libssh: SSH tunneling plugin' + 'postgresql-libs: PostgreSQL engine' + 'vte: Terminal session plugin') install=gsql.install -options=(!libtool) +options=(!libtool !emptydirs) source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) md5sums=('8f3322a75390584729e84a8570e08bea') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's/notify_notification_new (subj, message, NULL, NULL);/notify_notification_new (subj, message, NULL);/' libgsql/notify.c - ./configure --prefix=/usr --sysconfdir=/etc + LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-static --without-gnome make } package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install install -d "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas diff --git a/community/libgit2/PKGBUILD b/community/libgit2/PKGBUILD index 3a093b9af..f47445fe9 100644 --- a/community/libgit2/PKGBUILD +++ b/community/libgit2/PKGBUILD @@ -1,27 +1,33 @@ -# $Id$ +# $Id: PKGBUILD 88415 2013-04-17 09:17:05Z thestinger $ # Maintainer: Daniel Micay # Contributor: Hilton Medeiros # Contributor: Dave Reisner pkgname=libgit2 -pkgver=0.17.0 -pkgrel=2 +pkgver=0.18.0 +pkgrel=1 pkgdesc="A linkable library for Git" arch=('i686' 'x86_64') url="http://libgit2.github.com/" -depends=('zlib') +depends=(zlib openssl) makedepends=(cmake python) license=('GPL2') source=("src-$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/tarball/v$pkgver") -md5sums=('5a09dd1118d1354375407119d19e0f2c') +md5sums=('50409ddb0c34713677b33ef617e92c94') build() { - cd "$srcdir"/$pkgname-* - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr + cd $pkgname-* + export LANG=en_US.UTF-8 + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DTHREADSAFE=ON make } +check() { + cd $pkgname-* + make test +} + package() { - cd "$srcdir"/$pkgname-* + cd $pkgname-* make DESTDIR="$pkgdir" install } diff --git a/community/lightdm-kde-greeter/PKGBUILD b/community/lightdm-kde-greeter/PKGBUILD index f9730bd45..4625234db 100755 --- a/community/lightdm-kde-greeter/PKGBUILD +++ b/community/lightdm-kde-greeter/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 86258 2013-03-14 11:40:16Z alucryd $ +# $Id: PKGBUILD 88435 2013-04-17 15:31:11Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: Massimiliano Torromeo # Contributor: Mladen Pejakovic # Contributor: Xiao-Long Chen pkgname=lightdm-kde-greeter -pkgver=0.3.1 -pkgrel=2 +pkgver=0.3.2.1 +pkgrel=1 pkgdesc="KDE greeter for LightDM" arch=('i686' 'x86_64') url="https://projects.kde.org/projects/playground/base/lightdm" @@ -17,17 +17,17 @@ backup=('etc/lightdm/lightdm-kde-greeter.conf' 'etc/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf') source=("ftp://ftp.kde.org/pub/kde/unstable/${pkgname%-*}/src/${pkgname%-*}-${pkgver}.tar.bz2" 'lightdm-kde-greeter.conf') -sha256sums=('855cffaccc6500e25016e104cd593189cad9aa88ee34f237b01964fce1bcfcf9' +sha256sums=('65b2a1bab2c88bf55a07e62cbe0eb8ac3660638636c5825e5925b28d03f12188' 'a8fe10ef68d553781b91b1377106f95915c3ca14d835bd66910e08f922ef64c8') build() { cd "${srcdir}"/lightdm-${pkgver} -# Build if [[ -d build ]]; then rm -rf build fi mkdir build && cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } @@ -35,7 +35,6 @@ build() { package() { cd "${srcdir}"/lightdm-${pkgver}/build -# Install make DESTDIR="${pkgdir}" install install -dm 755 "${pkgdir}"/etc/lightdm install -m 644 ../../lightdm-kde-greeter.conf "${pkgdir}"/etc/lightdm/lightdm-kde-greeter.conf diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD new file mode 100644 index 000000000..77d165f5e --- /dev/null +++ b/community/opensmtpd/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 88392 2013-04-17 00:49:59Z seblu $ +# Maintainer: Sébastien Luttringer + +pkgname=opensmtpd +pkgver=5.3.1p1 +pkgrel=1 +pkgdesc='Free implementation of the server-side SMTP protocol' +arch=('i686' 'x86_64') +url='http://www.opensmtpd.org/' +license=('custom') +depends=('libevent') +provides=('smtp-server' 'smtp-forwarder') +conflicts=('smtp-server' 'smtp-forwarder') +backup=('etc/smtpd.conf' 'etc/aliases') +install=opensmtpd.install +source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz" + 'smtpd.service' + 'smtpd.socket') +md5sums=('0ee036a473f19fe27012cda0068cd287' + 'a278f272d97a9fe5a8aac784a7c98d67' + 'c2c01e9ca78df3f65efe40a7c0e17ee0') + +build() { + cd $pkgname-$pkgver + ./bootstrap + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --libexecdir=/usr/bin \ + --with-maildir=/var/spool/mail \ + --with-privsep-path=/var/empty \ + --with-sock-dir=/run \ + --with-privsep-user=mail \ + --with-filter-user=mail \ + --with-queue-user=mail \ + --with-pam + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$pkgdir" + # working directory + install -dm711 var/spool/smtpd + # license + install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service + install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket + # remove duplicate hardlink into a subfolder + rm -r usr/bin/opensmtpd + # empty aliases file + install -Dm644 /dev/null "$pkgdir/etc/aliases" + install -Dm644 /dev/null "$pkgdir/etc/virtual" + install -Dm644 /dev/null "$pkgdir/etc/secrets" + # fake sendmail binary (used to be smtp-forwarder) + # use hardlink as upstream does... + cd "$pkgdir/usr/bin" + ln smtpctl "$pkgdir/usr/bin/sendmail" + # symlink binary from usr/bin to usr/sbin (waiting /usr merge) + install -dm755 "$pkgdir/usr/sbin" + for _p in *; do + ln -s "../bin/$_p" "$pkgdir/usr/sbin/$_p" + done +} + +# vim:set ts=2 sw=2 et: diff --git a/community/opensmtpd/opensmtpd.install b/community/opensmtpd/opensmtpd.install new file mode 100644 index 000000000..0e3d8c0e1 --- /dev/null +++ b/community/opensmtpd/opensmtpd.install @@ -0,0 +1,14 @@ +# arg 1: the new package version +# arg 2: the old package version + +# arg 1: the new package version +post_install() { + makemap -t aliases /etc/aliases +} + +# arg 1: the old package version +post_remove() { + rm -f /etc/aliases.db +} + +# vim:set ts=2 sw=2 et: diff --git a/community/opensmtpd/smtpd.service b/community/opensmtpd/smtpd.service new file mode 100644 index 000000000..0ad21825c --- /dev/null +++ b/community/opensmtpd/smtpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=OpenSMTPD +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/smtpd + +[Install] +WantedBy=multi-user.target diff --git a/community/opensmtpd/smtpd.socket b/community/opensmtpd/smtpd.socket new file mode 100644 index 000000000..5d1d105cb --- /dev/null +++ b/community/opensmtpd/smtpd.socket @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSMTPD Socket + +[Socket] +ListenStream=/run/smtpd.sock + +[Install] +WantedBy=sockets.target diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD index 423f36f6b..f69d7eb9b 100644 --- a/community/openssh-askpass/PKGBUILD +++ b/community/openssh-askpass/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Massimiliano Torromeo pkgname=openssh-askpass -pkgver=1.3.6 -pkgrel=2 +pkgver=2.0.0 +pkgrel=1 pkgdesc='A plasma-like passphrase dialog for ssh' arch=('i686' 'x86_64') url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1' @@ -32,5 +32,5 @@ package() { install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" } -md5sums=('795519396f070038857cd35710e2ff85' +md5sums=('99b31e5bc2c12f91cc88869661ad92be' '961738244318f3723ba99cdcaac91a21') diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index d2add346c..dfbdd8fa0 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 80569 2012-11-25 17:22:16Z spupykin $ +# $Id: PKGBUILD 88423 2013-04-17 12:42:33Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: dorphell pkgname=xlockmore -pkgver=5.41 +pkgver=5.42 pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64) license=('BSD') depends=(freetype2 gtk2 libxpm lesstif pam libxmu glu) +optdepends=('fortune-mod') makedepends=(mesa) url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 LICENSE) -md5sums=('a9af1cc72f0fd096ba4bba9097f9291c' +md5sums=('de1dc31f686178703659fbb46d638518' 'a64afab4283f53972a6702c2e59850d7') build() { @@ -23,6 +24,11 @@ build() { --enable-appdefaultdir=/usr/share/X11/app-defaults \ --enable-pam --with-gtk2 --without-esound --without-ftgl make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make xapploaddir=$pkgdir/usr/share/X11/app-defaults \ mandir=$pkgdir/usr/man/man1 \ prefix=$pkgdir/usr install diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index 4905ff507..7b254540a 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173327 2012-12-19 01:16:33Z allan $ +# $Id: PKGBUILD 183046 2013-04-17 02:02:01Z allan $ # Maintainer: Allan McRae # Contributor: Eric Belanger pkgname=bison -pkgver=2.7 +pkgver=2.7.1 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('234cdfac99257cf99ac4a03c898f37b9' - '853204af1f9a5602d84989b4852e317e') +md5sums=('7be02eb973eccf388f1ae750fc09eed0' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD index 73688e009..5c2967ff7 100644 --- a/core/expat/PKGBUILD +++ b/core/expat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156201 2012-04-16 03:41:12Z allan $ +# $Id: PKGBUILD 183047 2013-04-17 02:02:02Z allan $ # Maintainer: Allan McRae # Committer: Judd Vinet pkgname=expat pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="An XML parser library" arch=('i686' 'x86_64') url="http://expat.sourceforge.net/" @@ -16,7 +16,7 @@ md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr #--mandir=/usr/share/man make } diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD index de13524da..d0e2ffb5a 100644 --- a/core/m4/PKGBUILD +++ b/core/m4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142068 2011-11-04 23:36:00Z allan $ +# $Id: PKGBUILD 183048 2013-04-17 02:02:03Z allan $ # Maintainer: Allan McRae # Contributor: Andreas Radke pkgname=m4 pkgver=1.4.16 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU macro processor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/m4" @@ -15,12 +15,21 @@ install=m4.install source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig} m4-1.4.16-readlink-einval.patch) md5sums=('7548ec061a1ba993790159764f522d0e' - 'eebe5c94e74e7551e2e30c5844f1b653' + 'SKIP' 'cea138fa9b568d06e46269611cec8dd0') -build() { +prepare() { cd ${srcdir}/$pkgname-$pkgver + + # glibc-2.16 compatibility + sed -i -e '/gets is a/d' lib/stdio.in.h + + # patch testsuite failure with newer kernels patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch +} + +build() { + cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr make } diff --git a/core/m4/m4.install b/core/m4/m4.install index be4138170..523d39bd6 100644 --- a/core/m4/m4.install +++ b/core/m4/m4.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(m4.info m4.info-1 m4.info-2) +filelist=('m4.info' 'm4.info-1' 'm4.info-2') post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD index f064f08c1..472bf0d44 100644 --- a/core/tar/PKGBUILD +++ b/core/tar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142080 2011-11-04 23:36:17Z allan $ +# $Id: PKGBUILD 183049 2013-04-17 02:02:04Z allan $ # Maintainer: Allan McRae # Contributor: Andreas Radke pkgname=tar pkgver=1.26 -pkgrel=2 +pkgrel=3 pkgdesc="Utility used to store, backup, and transport files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/tar/tar.html" @@ -19,10 +19,16 @@ md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1' '6618d5fe7785e138c27d7d6a24e998b2' 'e97e7343f4e23724b4c48bca2f033e38') -build() { +prepare() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin + # fix build failure with glibc-2.16 + sed -i -e '/gets is a/d' gnu/stdio.in.h +} + +build() { + cd ${srcdir}/$pkgname-$pkgver + ./configure --prefix=/usr --libexecdir=/usr/lib/tar make } @@ -34,5 +40,10 @@ check() { package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install + + # probably needed for compatibility + install -dm755 ${pkgdir}/bin + ln -s ../usr/bin/tar ${pkgdir}/bin/tar + install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1 } diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index e63024bb2..ff0ae1a20 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182805 2013-04-15 13:03:31Z tpowa $ +# $Id: PKGBUILD 183071 2013-04-17 07:11:00Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=alsa-utils pkgver=1.0.27 -pkgrel=3 +pkgrel=4 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -15,13 +15,15 @@ license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 90alsa alsa-restore-1.0.27.service.patch - alsactl-fix-buffer-overflow-1.0.27.patch) + alsactl-fix-buffer-overflow-1.0.27.patch + arecord-1.0.27.patch) backup=(etc/conf.d/alsa) prepare() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch + patch -Np1 -i ${srcdir}/arecord-1.0.27.patch } build() { @@ -43,4 +45,5 @@ package() { md5sums=('cbfb21a24f63fb052b3392195639ce48' '529216f6a46e61a546640e08ea7a0879' '0a27f7b80351d6baa274c32d859bf037' - 'cd577445636542f9f60b420e4ffe3f0f') + 'cd577445636542f9f60b420e4ffe3f0f' + 'cecb38f03bd245d0584bfd63370e9a05') diff --git a/extra/alsa-utils/arecord-1.0.27.patch b/extra/alsa-utils/arecord-1.0.27.patch new file mode 100644 index 000000000..f9edb2d21 --- /dev/null +++ b/extra/alsa-utils/arecord-1.0.27.patch @@ -0,0 +1,24 @@ +From: Jaroslav Kysela +Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200) +Subject: arecord: add a missing break to the capture loop +X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977 + +arecord: add a missing break to the capture loop + +Signed-off-by: Jaroslav Kysela +--- + +diff --git a/aplay/aplay.c b/aplay/aplay.c +index 5bdc39c..000d25b 100644 +--- a/aplay/aplay.c ++++ b/aplay/aplay.c +@@ -3021,6 +3021,9 @@ static void capture(char *orig_name) + fd = -1; + } + ++ if (in_aborting) ++ break; ++ + /* repeat the loop when format is raw without timelimit or + * requested counts of data are recorded + */ diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index 377e14c69..13be5ebf5 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172058 2012-11-27 12:16:31Z jgc $ +# $Id: PKGBUILD 183103 2013-04-17 15:00:29Z jgc $ # Maintainer: Jan de Groot # Maintainer: Pierre Schmitz pkgname=apr-util -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('9c1db8606e520f201c451ec9a0b095f6') +md5sums=('89c1348aa79e898d7c34a6206311c9c2') build() { cd "${srcdir}/apr-util-${pkgver}" diff --git a/extra/at/PKGBUILD b/extra/at/PKGBUILD deleted file mode 100644 index 19267a906..000000000 --- a/extra/at/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 168299 2012-10-08 05:32:58Z eric $ -# Maintainer: Judd Vinet -# Contributor: Todd Musall - -pkgname=at -pkgver=3.1.13 -pkgrel=2 -pkgdesc="AT and batch delayed command scheduling utility and daemon" -arch=('i686' 'x86_64') -url="http://packages.qa.debian.org/a/at.html" -license=('GPL') -depends=('pam') -makedepends=('ssmtp') -backup=('etc/at.deny') -options=('!makeflags') -source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz - atd atd.service) -md5sums=('1da61af6c29e323abaaf13ee1a8dad79' - '35574e34829e7df07a3269d4ab646a29' - '33976a813f4fe7f5659354601044c6f8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --with-jobdir=/var/spool/atd \ - --with-atspool=/var/spool/atd - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make IROOT="${pkgdir}" docdir=/usr/share/doc install - install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd" - install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service" -} diff --git a/extra/at/atd b/extra/at/atd deleted file mode 100644 index d10a46a3b..000000000 --- a/extra/at/atd +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/atd` -case "$1" in - start) - stat_busy "Starting ATD Daemon" - [ -z "$PID" ] && /usr/sbin/atd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon atd - stat_done - fi - ;; - stop) - stat_busy "Stopping ATD Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon atd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/at/atd.service b/extra/at/atd.service deleted file mode 100644 index ba359878c..000000000 --- a/extra/at/atd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=ATD daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/atd - -[Install] -WantedBy=multi-user.target diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD index 17cae72ed..710f42b82 100644 --- a/extra/cairo-perl/PKGBUILD +++ b/extra/cairo-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160461 2012-06-02 10:25:40Z bluewind $ +# $Id: PKGBUILD 183105 2013-04-17 15:04:54Z jgc $ # Maintainer: Jan de Groot pkgname=cairo-perl -pkgver=1.082 -pkgrel=2 +pkgver=1.103 +pkgrel=1 pkgdesc="Perl wrappers for cairo" arch=(i686 x86_64) license=('LGPL') @@ -11,14 +11,11 @@ url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') depends=('cairo' 'perl') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz - testsuite.patch) -md5sums=('cfd61e519ff20023979c255d4040fe06' - '6a3ceac304a5a53f8fdd5652d98f6855') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz) +md5sums=('c693e5535ed60283c068d92120412f98') build() { cd "${srcdir}/Cairo-${pkgver}" - patch -Np1 -i "${srcdir}/testsuite.patch" perl Makefile.PL INSTALLDIRS=vendor make } diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD deleted file mode 100644 index 2b950dc9c..000000000 --- a/extra/chkrootkit/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 143673 2011-11-28 09:58:36Z eric $ -# Maintainer: Eric Bélanger - -pkgname=chkrootkit -pkgver=0.49 -pkgrel=3 -pkgdesc="Locally checks for signs of a rootkit" -arch=('i686' 'x86_64') -url="http://www.chkrootkit.org" -depends=('sh' 'net-tools') -license=('BSD') -source=(http://www.reznor.com/tools/chkrootkit.tar.gz chkrootkit.cron \ - fix-tools-path.patch backslashes.patch kallsyms.patch) -md5sums=('304d840d52840689e0ab0af56d6d3a18' - 'f4b6494270f708bf016e087104681739' - '3e5f2d5e2f4fa7a0d780baec9039c07f' - '758f892dcf73e8a2a4694662fba366d4' - 'd087f3aad8a9e97fea496ef83e4f1d48') -sha1sums=('cec1a3c482b95b20d3a946b07fffb23290abc4a6' - '6dda90abf779b6f5c3bacd638e1231f34635575d' - '7fcad8117a064f0a6910134e8bb3a55de110650f' - 'e22546f445c145cf05dbc1a10f7b196fcd1c8202' - 'dc5b402ee69a7a5ae622ecfd733682516df54e88') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|/var/adm|/var/log|' check_wtmpx.c chklastlog.c chkutmp.c chkwtmp.c - patch -p0 -i "${srcdir}/fix-tools-path.patch" - patch -p1 -i "${srcdir}/backslashes.patch" - patch -p1 -i "${srcdir}/kallsyms.patch" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit \ - chkutmp chkwtmp ifpromisc strings-static ; do - install -D -m755 $i "${pkgdir}/usr/sbin/$i" - done - install -D -m744 "${srcdir}/chkrootkit.cron" "${pkgdir}/etc/cron.weekly/chkrootkit" - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/chkrootkit/backslashes.patch b/extra/chkrootkit/backslashes.patch deleted file mode 100644 index 6ac981441..000000000 --- a/extra/chkrootkit/backslashes.patch +++ /dev/null @@ -1,22 +0,0 @@ -Author: James R. Van Zandt -Description: Two of the chkrootkit messages have unnecessary backslashes (#498063) ---- a/chkrootkit -+++ b/chkrootkit -@@ -672,7 +672,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h - if [ "`find ${LIBS} -name libproc.a 2> /dev/null`" != "" -a \ - "$SYSTEM" != "FreeBSD" ] - then -- echo "Possible t0rn v8 \(or variation\) rootkit installed" -+ echo "Possible t0rn v8 (or variation) rootkit installed" - else - if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi - fi -@@ -726,7 +726,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h - - if [ -d ${ROOTDIR}dev/ptyxx -o -r "${ROOTDIR}usr/lib/.ark?" -o \ - -d ${ROOTDIR}usr/doc/"... " ]; then -- echo "Possible Ambient's rootkit \(ark\) installed" -+ echo "Possible Ambient's rootkit (ark) installed" - else - if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi - fi diff --git a/extra/chkrootkit/chkrootkit.cron b/extra/chkrootkit/chkrootkit.cron deleted file mode 100644 index 0fc84ded8..000000000 --- a/extra/chkrootkit/chkrootkit.cron +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/sbin/chkrootkit -q diff --git a/extra/chkrootkit/fix-tools-path.patch b/extra/chkrootkit/fix-tools-path.patch deleted file mode 100644 index d45f07901..000000000 --- a/extra/chkrootkit/fix-tools-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- chkrootkit -+++ chkrootkit -@@ -17,6 +17,8 @@ unalias netstat > /dev/null 2>&1 - unalias ps > /dev/null 2>&1 - unalias dirname > /dev/null 2>&1 - -+cd /usr/sbin -+ - # Workaround for recent GNU coreutils - _POSIX2_VERSION=199209 - export _POSIX2_VERSION diff --git a/extra/chkrootkit/kallsyms.patch b/extra/chkrootkit/kallsyms.patch deleted file mode 100644 index 4e3694aad..000000000 --- a/extra/chkrootkit/kallsyms.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/chkrootkit -+++ b/chkrootkit -@@ -308,7 +316,7 @@ lkm () - fi - - if [ "${EXPERT}" = "t" ]; then -- [ -r /proc/ksyms ] && ${egrep} -i "adore|sebek" < /proc/ksyms 2>/dev/null -+ [ -r /proc/kallsyms ] && ${egrep} -i "adore|sebek" < /proc/kallsyms 2>/dev/null - [ -d /proc/knark ] && ${ls} -la /proc/knark 2> /dev/null - PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |${awk} -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 3; else if ($0 < 2.015) print 1; else print 2 }'` - [ "$PV" = "" ] && PV=2 -@@ -318,14 +326,14 @@ lkm () - fi - - ### adore LKM -- [ -r /proc/ksyms ] && \ -- if `${egrep} -i adore < /proc/ksyms >/dev/null 2>&1`; then -+ [ -r /proc/kallsyms ] && \ -+ if `${egrep} -i adore < /proc/kallsyms >/dev/null 2>&1`; then - echo "Warning: Adore LKM installed" - fi - - ### sebek LKM (Adore based) -- [ -r /proc/ksyms ] && \ -- if `${egrep} -i sebek < /proc/ksyms >/dev/null 2>&1`; then -+ [ -r /proc/kallsyms ] && \ -+ if `${egrep} -i sebek < /proc/kallsyms >/dev/null 2>&1`; then - echo "Warning: Sebek LKM installed" - fi - diff --git a/extra/gob2/PKGBUILD b/extra/gob2/PKGBUILD index 061325a4b..b2f85a97f 100644 --- a/extra/gob2/PKGBUILD +++ b/extra/gob2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145709 2011-12-28 14:25:19Z jgc $ +# $Id: PKGBUILD 183109 2013-04-17 15:27:46Z jgc $ # Contributor: Sarah Hay # Maintainer: Kevin Piche pkgname=gob2 -pkgver=2.0.18 +pkgver=2.0.19 pkgrel=1 pkgdesc="GTK Object Builder (GOB) is a simple preprocessor for easily creating GTK objects" arch=(i686 x86_64) @@ -11,7 +11,7 @@ license=('GPL') depends=('glib2') url="http://www.5z.com/jirka/gob.html" source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz) -md5sums=('cd08248762962aec88100ddaaff4f9e0') +md5sums=('d7f2e7b96c33458d69b6381e28e4ac69') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index d304aa9e8..64ad7fd10 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,15 +3,15 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56') +md5sums=('94ce02c42c1e4d1411357fb3c1014f67') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk @@ -28,9 +28,8 @@ build() { --with-browser-tests \ --with-firefox=/usr/bin/firefox \ --with-chromium=/usr/bin/chromium \ - --with-epiphany=/usr/bin/epiphany \ - --with-gtk=2 - make + --with-epiphany=/usr/bin/epiphany + make } check() { @@ -44,7 +43,7 @@ check() { package_icedtea-web-java7() { pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" - depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') + depends=('jre7-openjdk' 'desktop-file-utils') provides=('java-web-start=7') replaces=('icedtea-web') install=${pkgname}.install diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index f3d91846b..44aadff7a 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181892 2013-04-05 08:54:36Z svenstaro $ +# $Id: PKGBUILD 183096 2013-04-17 14:16:08Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkdcraw pkgver=4.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" arch=('i686' 'x86_64') @@ -22,7 +22,8 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_LCMS2=ON make } diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD index ebf732b69..542980296 100644 --- a/extra/libplist/PKGBUILD +++ b/extra/libplist/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 156914 2012-04-23 09:08:57Z ibiru $ +# $Id: PKGBUILD 183073 2013-04-17 10:22:07Z tomegun $ +# Maintainer : Tom Gundersen # Maintainer : Ionut Biru # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libplist -pkgver=1.8 -pkgrel=2 +pkgver=1.10 +pkgrel=1 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML" url="http://libimobiledevice.org/" arch=('i686' 'x86_64') @@ -12,7 +13,6 @@ license=('GPL2' 'LGPL2.1') depends=('glib2' 'libxml2' 'python2') makedepends=('cmake' 'swig') source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) -sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec') build() { mkdir build @@ -28,3 +28,4 @@ package() { cd build make DESTDIR="$pkgdir" install } +md5sums=('fe642d0c8602d70c408994555c330dd1') diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD index c54ba288a..dc851c80a 100644 --- a/extra/libpst/PKGBUILD +++ b/extra/libpst/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 181123 2013-03-31 19:16:47Z stephane $ +# $Id: PKGBUILD 183115 2013-04-17 16:05:23Z jgc $ # Maintainer: Jan de Groot pkgbase=libpst pkgname=('libpst' 'libpst-docs') -pkgver=0.6.54 -pkgrel=4 +pkgver=0.6.58 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.five-ten-sg.com/libpst/" license=('GPL') -makedepends=('python2' 'boost') +makedepends=('python2' 'boost' 'libgsf') source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz) -sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84') +sha1sums=('c398d58b8b5106725f1659c900305c6385c0773e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -21,7 +21,7 @@ build() { package_libpst() { pkgdesc="Outlook .pst file converter" - depends=('gcc-libs') + depends=('gcc-libs' 'libgsf') optdepends=('boost-libs: for libpst python interface') options=('!libtool' '!docs') @@ -31,7 +31,7 @@ package_libpst() { package_libpst-docs() { pkgdesc="Documentation for Outlook .pst file converter" - options=('!libtool') + options=('!libtool' 'docs') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install-htmlDATA diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD new file mode 100644 index 000000000..1c3a15fa7 --- /dev/null +++ b/extra/mediastreamer/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 183011 2013-04-16 22:29:29Z eric $ +# Maintainer: +# Contributor: Andrea Scarpino +# Contributor: Sergej Pupykin +# Contributor: Adrià Arrufat + +pkgname=mediastreamer +pkgver=2.8.2 +pkgrel=5 +pkgdesc="A library written in C that allows you to create and run audio and video streams" +arch=('i686' 'x86_64') +url="http://www.linphone.org/" +license=('GPL') +depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') +makedepends=('intltool') +options=('!libtool') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} + mediastreamer-ffmpeg.patch) +md5sums=('e51ea9d5fce1396b374d10473dfbadec' + '805da7def98f367e621363fa0c951fe8' + '553d5d47ea4a8c8dfeabdc0281849d5f') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch new file mode 100644 index 000000000..3304e9f56 --- /dev/null +++ b/extra/mediastreamer/mediastreamer-ffmpeg.patch @@ -0,0 +1,57 @@ +commit f586917ea4d66f9ba8910f0967a8830e54d50784 +Author: Yann Diorcet +Date: Tue Jun 5 11:07:48 2012 +0200 + + Fixes for new versions of ffmpeg + +diff --git a/src/h264dec.c b/src/h264dec.c +index c4a84ee..5229b5e 100644 +--- a/src/h264dec.c ++++ b/src/h264dec.c +@@ -45,7 +45,9 @@ typedef struct _DecData{ + static void ffmpeg_init(){ + static bool_t done=FALSE; + if (!done){ ++#ifdef FF_API_AVCODEC_INIT + avcodec_init(); ++#endif + avcodec_register_all(); + done=TRUE; + } +diff --git a/src/videoenc.c b/src/videoenc.c +index 21d016f..fb35760 100644 +--- a/src/videoenc.c ++++ b/src/videoenc.c +@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + static bool_t avcodec_initialized=FALSE; + ++#ifndef FF_I_TYPE ++#define FF_I_TYPE AV_PICTURE_TYPE_I ++#endif ++ + #ifdef ENABLE_LOG_FFMPEG + + void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) +@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) + + void ms_ffmpeg_check_init(){ + if(!avcodec_initialized){ ++#ifdef FF_API_AVCODEC_INIT + avcodec_init(); ++#endif + avcodec_register_all(); + avcodec_initialized=TRUE; + #ifdef ENABLE_LOG_FFMPEG +@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ + if (s->profile==0){ + s->codec=CODEC_ID_H263; + }else{ ++ /* + c->flags|=CODEC_FLAG_H263P_UMV; + c->flags|=CODEC_FLAG_AC_PRED; + c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; +- /* + c->flags|=CODEC_FLAG_OBMC; + c->flags|=CODEC_FLAG_AC_PRED; + */ diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index e5baa2980..6ec245c68 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 182124 2013-04-08 00:32:17Z eric $ +# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-accounts-kcm _pkgname=ktp-accounts-kcm -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'boost') optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support' 'telepathy-haze: all protocols supported by libpurple') groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('8951573b54d5d940687c3c2b7b77fb441b0fddd9') +sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc') build() { mkdir build diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index 0797a87af..294b9af44 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182126 2013-04-08 00:43:14Z eric $ +# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-approver _pkgname=ktp-approver -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('340cd26c37297540c0f70e75adbb43bcab0889c7') +sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e') build() { mkdir build diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index f499a624f..b4bbdfc43 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182128 2013-04-08 00:45:51Z eric $ +# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('392ee2e0146e445950ecad1b0cae27ece77b7a3e') +sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a') build() { mkdir build diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index acc3dc578..381f9c610 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 182129 2013-04-08 00:46:52Z eric $ +# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-common-internals _pkgname=ktp-common-internals -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Common components for KDE-Telepathy" arch=('i686' 'x86_64') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control') -makedepends=('cmake' 'automoc4') +depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control') +makedepends=('cmake' 'automoc4' 'boost' 'doxygen') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('93ef0f8498c44b86dc25539f0b4f55354dc566ec') +sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709') build() { mkdir build diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index 92aa1fcd1..d698242bd 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 182131 2013-04-08 00:47:59Z eric $ +# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-contact-list _pkgname=ktp-contact-list -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') depends=('telepathy-kde-common-internals' 'kdebase-runtime') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('2cb4bf8f7b5df1660027eab606d513b9cccebad5') +sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de') build() { mkdir build diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index f6902403d..2adaa1652 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182133 2013-04-08 00:48:26Z eric $ +# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-contact-runner _pkgname=ktp-contact-runner -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="KRunner plugin for KDE Telepathy" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('576642c35f2d03b7859e15a004590ed6cc321ebd') +sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821') build() { mkdir build diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD index 904250ff9..cd38cc095 100644 --- a/extra/telepathy-kde-desktop-applets/PKGBUILD +++ b/extra/telepathy-kde-desktop-applets/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182019 2013-04-05 09:11:00Z andrea $ +# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-desktop-applets _pkgname=ktp-desktop-applets -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="The KDE-Telepathy Plasma desktop applets" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('890ea9e21b56d794c079e6437ef8a3d356eeb4af') +sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07') build() { mkdir build diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index d7546bc42..62eb1109f 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182135 2013-04-08 00:49:01Z eric $ +# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-filetransfer-handler _pkgname=ktp-filetransfer-handler -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6c061a13f483fd14d3ef184d1008e4f8002e46a8') +sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214') build() { mkdir build diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 363064114..397e4b620 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182137 2013-04-08 00:49:44Z eric $ +# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-integration-module _pkgname=ktp-kded-integration-module -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('eb1fc514199587b018036bc307d385766fc40094') +sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930') build() { mkdir build diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 2e3edb768..99a821e8d 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182139 2013-04-08 00:50:17Z eric $ +# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-send-file _pkgname=ktp-send-file -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('bc3b7832c88a866b396d5358c20c3a1f3a0048d2') +sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00') build() { mkdir build diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index 268eb3b86..74cddc43f 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182141 2013-04-08 00:51:21Z eric $ +# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-text-ui _pkgname=ktp-text-ui -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('87a519f132cc338b7f1f47aa8997e89f9f566bfd') +sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b') build() { mkdir build diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD index ade9eedff..2ce3dc6ab 100644 --- a/extra/xf86-video-vmware/PKGBUILD +++ b/extra/xf86-video-vmware/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182671 2013-04-12 14:13:36Z andyrtr $ +# $Id: PKGBUILD 183093 2013-04-17 14:08:02Z jgc $ # Maintainer: Jan de Groot pkgname=xf86-video-vmware -pkgver=13.0.0 -pkgrel=3 +pkgver=13.0.1 +pkgrel=1 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -13,13 +13,11 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) -sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6' - '9322d467d2111be4049e8649b1d2729a2a2ab35cc9769cfee5be63f18e176938') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git-fixes.patch ./configure --prefix=/usr --enable-vmwarectrl-client make } diff --git a/extra/xf86-video-vmware/git-fixes.patch b/extra/xf86-video-vmware/git-fixes.patch deleted file mode 100644 index f1cde34aa..000000000 --- a/extra/xf86-video-vmware/git-fixes.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001 -From: Zack Rusin -Date: Thu, 14 Feb 2013 22:33:01 +0000 -Subject: Kill mibstore - -It was a noop for at least 5 years and it has been removed. - -Signed-off-by: Zack Rusin ---- -diff --git a/saa/saa_priv.h b/saa/saa_priv.h -index 6652054..5d81453 100644 ---- a/saa/saa_priv.h -+++ b/saa/saa_priv.h -@@ -48,7 +48,6 @@ - #include "pixmapstr.h" - #include "windowstr.h" - #include "servermd.h" --#include "mibstore.h" - #include "colormapst.h" - #include "gcstruct.h" - #include "input.h" -diff --git a/src/vmware.c b/src/vmware.c -index 41201f1..6b74e14 100644 ---- a/src/vmware.c -+++ b/src/vmware.c -@@ -23,7 +23,6 @@ char rcsId_vmware[] = - #include "xf86Pci.h" /* pci */ - - #include "mipointer.h" /* sw cursor */ --#include "mibstore.h" /* backing store */ - #include "micmap.h" /* mi color map */ - #include "vgaHW.h" /* VGA hardware */ - #include "fb.h" -@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) - * If backing store is to be supported (as is usually the case), - * initialise it. - */ -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index 9959ffb..7863ba2 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL) - (ms->only_hw_presents) ? "enabled" : "disabled"); - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); --- -cgit v0.9.0.2-2-gbebe -From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001 -From: Loïc Yhuel -Date: Thu, 11 Apr 2013 09:29:10 +0000 -Subject: vmwgfx: Use myGlyphs to fix crashes - -Tested-by: Christian Hesse -Reviewed-by: Jakob Bornecrantz -Signed-off-by: Loïc Yhuel -Signed-off-by: Jakob Bornecrantz ---- -diff --git a/saa/saa_render.c b/saa/saa_render.c -index c69f2c9..c6ce68c 100644 ---- a/saa/saa_render.c -+++ b/saa/saa_render.c -@@ -406,6 +406,8 @@ saa_render_setup(ScreenPtr pScreen) - saa_wrap(sscreen, ps, Trapezoids, saa_trapezoids); - saa_wrap(sscreen, ps, Triangles, saa_triangles); - saa_wrap(sscreen, ps, Composite, saa_composite); -+ saa_wrap(sscreen, ps, Glyphs, miGlyphs); -+ saa_wrap(sscreen, ps, UnrealizeGlyph, miUnrealizeGlyph); - } - } - -@@ -419,6 +421,8 @@ saa_render_takedown(ScreenPtr pScreen) - saa_unwrap(sscreen, ps, Trapezoids); - saa_unwrap(sscreen, ps, Triangles); - saa_unwrap(sscreen, ps, Composite); -+ saa_unwrap(sscreen, ps, Glyphs); -+ saa_unwrap(sscreen, ps, UnrealizeGlyph); - } - } - #endif --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 4a9e967e4..77ce16d88 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180178 2013-03-18 16:08:50Z andyrtr $ +# $Id: PKGBUILD 183085 2013-04-17 12:51:32Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.14.0 -pkgrel=2 +pkgver=1.14.1 +pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -23,7 +23,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run.1 10-quirks.conf git-fixes.patch) -sha256sums=('1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630' +sha256sums=('a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 296bea51a..c5b27882b 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $ +# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.8 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'f83582104813c022e6739e12664dbb0c' + 'cc93810441658cdf40a4bc051f8f4774' '6294513cfa9830d48ad1915ff7053a98' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 1e8ed6868..69d8bc984 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.7-1-LIBRE-PAE +KERNEL_VERSION=3.8.8-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 45759cd92..e34f4919e 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $ +# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.8 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'f83582104813c022e6739e12664dbb0c' + 'cc93810441658cdf40a4bc051f8f4774' '2708b6f03f827e2c94ecbd050df4286d' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index f9430058d..c385956af 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.7-1-LIBRE-XEN +KERNEL_VERSION=3.8.8-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index d6dc1c328..6c04db17b 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.7 +_kernver=3.8.8 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=13 +pkgrel=14 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 1963f2536..d7902119f 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.73 +_kernver=3.0.74 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=11 +pkgrel=12 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index df302a20d..f4341cb83 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182731 2013-04-13 15:31:06Z tpowa $ +# $Id: PKGBUILD 183082 2013-04-17 12:40:54Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=73 +_sublevel=74 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.72 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.73 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '846a503d4bacfaca417fbea67aceabc2' + 'a0984b44eba8de48e20357c9c146baf6' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '5d433e634f9744824a5a3122d734e6f6') + '624eacedd2a576161512ffefc1797bc1') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index c3aff92ae..b8118b60d 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.73-1-LIBRE-LTS +KERNEL_VERSION=3.0.74-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index f0ca4a325..9d1e52de9 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $ +# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=7 +_sublevel=8 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'f83582104813c022e6739e12664dbb0c' + 'cc93810441658cdf40a4bc051f8f4774' '9b425f069f920cdd6798b3adab79d3af' '9316ebdb21ea9948ae5c83795a3dcf61' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '5629a56818c1875bcc77a51c69347d98') + 'fead20edc727fbb89789194eaebb6daa') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 46f383749..c6fa71c97 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.7-1-LIBRE +KERNEL_VERSION=3.8.8-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index bdc8b63c0..0634f6f6c 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182068 2013-04-06 09:25:55Z tpowa $ +# $Id: PKGBUILD 183118 2013-04-17 16:51:39Z tpowa $ # Maintainer: Paul Mattal # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=41 +pkgrel=42 epoch=1 _extramodules=extramodules-3.8-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar lirc_atiusb-kfifo.patch kernel-2.6.39.patch linux-3.8.patch - lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd + lirc.logrotate lirc.service lircm.service irexec.service lirc.tmpfiles) @@ -82,13 +82,10 @@ package_lirc-utils-libre() { replaces=('lirc-utils') conflicts=('lirc-utils') provides=("lirc-utils=$pkgver") - backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') install=lirc-utils.install cd "${srcdir}/lirc-${pkgver}" make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" - cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service @@ -99,12 +96,6 @@ package_lirc-utils-libre() { # install the logrotate config install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" - # install conf.d file - install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf" - - # install conf.d file - install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf" - install -d "${pkgdir}/etc/lirc" # remove built modules @@ -116,12 +107,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '1f8b104a2365d9f93404b143f499059b' '087a7d102e1c96bf1179f38db2b0b237' '9ee196bd03ea44af5a752fb0cc6ca96a' - '8d0e238dc0eda95e340fe570605da492' - '85f7fdac55e5256967241864049bf5e9' '3deb02604b37811d41816e9b4385fcc3' - '5b1f8c9cd788a39a6283f93302ce5c6e' - 'f0c0ac930326168035f0c8e24357ae55' - '69d099e6deedfa3c1ee2b6e82d9b8bfb' 'dab8a73bcc5fd5479d8750493d8d97dc' 'c2e20fe68b034df752dba2773db16ebe' '07131d117fcfe9dcd50c453c3a5e9531' diff --git a/libre/lirc-libre/irexec.conf b/libre/lirc-libre/irexec.conf deleted file mode 100644 index f911c7515..000000000 --- a/libre/lirc-libre/irexec.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters for irexec daemon (path to lircrc) -# - -IREXEC_OPTS="" \ No newline at end of file diff --git a/libre/lirc-libre/irexecd b/libre/lirc-libre/irexecd deleted file mode 100644 index a64b033a5..000000000 --- a/libre/lirc-libre/irexecd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/irexec.conf - -PID=`pidof -o %PPID /usr/bin/irexec` -case "$1" in - start) - stat_busy "Starting IREXEC Daemon" - [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon irexecd - stat_done - fi - ;; - stop) - stat_busy "Stopping IREXEC Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irexecd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/libre/lirc-libre/lircd b/libre/lirc-libre/lircd deleted file mode 100644 index e9739b36e..000000000 --- a/libre/lirc-libre/lircd +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/lircd.conf - -PID=$(pidof -o %PPID /usr/sbin/lircd) -LIRCD_SYMLINKFILE=/dev/lircd -LIRCD_SOCKET=/var/run/lirc/lircd -case "$1" in - start) - stat_busy "Starting LIRC Daemon" - [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null - rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE - if [ $? -ne 0 ]; then - stat_fail - exit 0 - fi - [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS" - [ -z "$PID" ] && - if [ -n "$LIRC_DEVICE" ] ; then - eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE - else - /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE - fi - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lircd - stat_done - fi - ;; - stop) - stat_busy "Stopping LIRC Daemon" - rm -f $LIRCD_SYMLINKFILE - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lircd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 start|stop|restart" -esac -exit 0 diff --git a/libre/lirc-libre/lircd.conf b/libre/lirc-libre/lircd.conf deleted file mode 100644 index 760dab065..000000000 --- a/libre/lirc-libre/lircd.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Parameters for lirc daemon -# - -LIRC_DEVICE="/dev/lirc0" -LIRC_DRIVER="" -LIRC_EXTRAOPTS="" -LIRC_CONFIGFILE="" diff --git a/libre/lirc-libre/lircmd b/libre/lirc-libre/lircmd deleted file mode 100644 index 220c47c9c..000000000 --- a/libre/lirc-libre/lircmd +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/lircmd` -case "$1" in - start) - stat_busy "Starting lircmd Daemon" - [ -z "$PID" ] && /usr/sbin/lircmd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lircmd - stat_done - fi - ;; - stop) - stat_busy "Stopping lircmd Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lircmd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index d6d50f425..59816a051 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 _extramodules=extramodules-3.8-LIBRE -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD index c7db21793..0a02eba94 100644 --- a/pcr/gnuhealth/PKGBUILD +++ b/pcr/gnuhealth/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer (Parabola): André Silva pkgname=gnuhealth -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="A free Health and Hospital Information System" arch=(any) @@ -10,7 +10,7 @@ url="http://health.gnu.org/" license=('GPL3') depends=('trytond') source=("http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz") -md5sums=('2273870ccd77a24ac21b398d095a29b5') +md5sums=('d3837242011df1d39ce7a0f1d6e6a46a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/pcr/mediastreamer/PKGBUILD b/pcr/mediastreamer/PKGBUILD deleted file mode 100644 index e55ace473..000000000 --- a/pcr/mediastreamer/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Andrea Scarpino -# Contributor: Sergej Pupykin -# Contributor: Adrià Arrufat - -pkgname=mediastreamer -pkgver=2.8.2 -pkgrel=4.1 -pkgdesc="A library written in C that allows you to create and run audio and video streams" -arch=('i686' 'x86_64') -url="http://www.linphone.org/" -license=('GPL') -depends=('ortp' 'speex' 'ffmpeg=1:1.2' 'v4l-utils' 'libxv' 'libpulse') -makedepends=('intltool') -options=('!libtool') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} - mediastreamer-ffmpeg.patch) -md5sums=('e51ea9d5fce1396b374d10473dfbadec' - '805da7def98f367e621363fa0c951fe8' - '553d5d47ea4a8c8dfeabdc0281849d5f') - -build() { - cd "${srcdir}"/$pkgname-$pkgver - patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/pcr/mediastreamer/mediastreamer-ffmpeg.patch b/pcr/mediastreamer/mediastreamer-ffmpeg.patch deleted file mode 100644 index 3304e9f56..000000000 --- a/pcr/mediastreamer/mediastreamer-ffmpeg.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit f586917ea4d66f9ba8910f0967a8830e54d50784 -Author: Yann Diorcet -Date: Tue Jun 5 11:07:48 2012 +0200 - - Fixes for new versions of ffmpeg - -diff --git a/src/h264dec.c b/src/h264dec.c -index c4a84ee..5229b5e 100644 ---- a/src/h264dec.c -+++ b/src/h264dec.c -@@ -45,7 +45,9 @@ typedef struct _DecData{ - static void ffmpeg_init(){ - static bool_t done=FALSE; - if (!done){ -+#ifdef FF_API_AVCODEC_INIT - avcodec_init(); -+#endif - avcodec_register_all(); - done=TRUE; - } -diff --git a/src/videoenc.c b/src/videoenc.c -index 21d016f..fb35760 100644 ---- a/src/videoenc.c -+++ b/src/videoenc.c -@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - static bool_t avcodec_initialized=FALSE; - -+#ifndef FF_I_TYPE -+#define FF_I_TYPE AV_PICTURE_TYPE_I -+#endif -+ - #ifdef ENABLE_LOG_FFMPEG - - void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) -@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) - - void ms_ffmpeg_check_init(){ - if(!avcodec_initialized){ -+#ifdef FF_API_AVCODEC_INIT - avcodec_init(); -+#endif - avcodec_register_all(); - avcodec_initialized=TRUE; - #ifdef ENABLE_LOG_FFMPEG -@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ - if (s->profile==0){ - s->codec=CODEC_ID_H263; - }else{ -+ /* - c->flags|=CODEC_FLAG_H263P_UMV; - c->flags|=CODEC_FLAG_AC_PRED; - c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; -- /* - c->flags|=CODEC_FLAG_OBMC; - c->flags|=CODEC_FLAG_AC_PRED; - */ diff --git a/pcr/python2-pycha/PKGBUILD b/pcr/python2-pycha/PKGBUILD new file mode 100644 index 000000000..4c9cf4ea4 --- /dev/null +++ b/pcr/python2-pycha/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jakub Klinkovský +# Contributor (Parabola): André Silva +pkgname=python2-pycha +pkgver=279 +pkgrel=1 +pkgdesc="Pycha is a very simple Python package for drawing charts using the great Cairo library." +arch=('any') +url="http://bitbucket.org/lgs/pycha/" +license=('LGPL') +depends=('pycairo') +makedepends=('mercurial' 'python2-distribute') + +_hgroot="https://bitbucket.org/lgs/pycha" +_hgrepo="pycha" + +build() { + cd "$srcdir" + msg "Connecting to Mercurial server...." + + if [[ -d "$_hgrepo" ]]; then + cd "$_hgrepo" + hg pull -u + msg "The local files are updated." + else + hg clone "$_hgroot" "$_hgrepo" + fi + + msg "Mercurial checkout done or server timeout" +} + +package() { + cd "$srcdir/$_hgrepo" + msg "Starting build..." + python2 setup.py install --root=$pkgdir +} diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD index 497a50920..fcaae5c7a 100644 --- a/pcr/python2-relatorio/PKGBUILD +++ b/pcr/python2-relatorio/PKGBUILD @@ -1,21 +1,35 @@ -# Contributor: Florian Walch -# Maintainer: Thomas Bahn +# Maintainer: Jakub Klinkovský +# Contributor (Parabola): André Silva pkgname=python2-relatorio -pkgver=0.5.6 -pkgrel=2 -pkgdesc="A templating library able to output odt and pdf files" -arch=('i686' 'x86_64' 'mips64el') +pkgver=183 +pkgrel=1 +pkgdesc="Relatorio is an OpenHex and B2CK project to easily create reports in a variety of formats (openoffice text, PDF, XHTML) from python objects." +arch=('any') url="http://relatorio.openhex.org" license=('GPL') -depends=('python2-genshi>=0.5' 'python2-lxml>=1.3.6') -makedepends=('python2-distribute') -source=("http://pypi.python.org/packages/source/r/relatorio/relatorio-$pkgver.tar.gz") +depends=('python2-genshi' 'python2-lxml' 'python2-yaml' 'python2-pycha') +makedepends=('mercurial' 'python2-distribute') + +_hgroot="http://hg.openhex.org/hgwebdir.cgi/relatorio" +_hgrepo="relatorio" build() { - cd $srcdir/relatorio-$pkgver - chmod 644 relatorio.egg-info/* - python2 setup.py install --root=$pkgdir -} + cd "$srcdir" + msg "Connecting to Mercurial server...." + if [[ -d "$_hgrepo" ]]; then + cd "$_hgrepo" + hg pull -u + msg "The local files are updated." + else + hg clone "$_hgroot" "$_hgrepo" + fi -md5sums=('944fb60fadaff451ab6ee8818de516ad') + msg "Mercurial checkout done or server timeout" +} + +package() { + cd "$srcdir/$_hgrepo" + msg "Starting build..." + python2 setup.py install --root=$pkgdir +} diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD index b270df368..a34a8890f 100644 --- a/pcr/trytond/PKGBUILD +++ b/pcr/trytond/PKGBUILD @@ -3,12 +3,12 @@ pkgname=trytond pkgver=2.6.3 _pkgdir=2.6 -pkgrel=1 +pkgrel=2 pkgdesc="A three-tiers high-level general purpose application platform (server application)" arch=('any') url="http://www.tryton.org/" license=('GPL3') -depends=('python2>=2.4' 'python-lxml' 'python2-egenix-mx-base' 'python2-relatorio>=0.2.0' 'python2-genshi>=0.5' 'python2-polib') +depends=('python2>=2.7' 'python-lxml' 'python2-egenix-mx-base' 'python2-relatorio>=183' 'python2-genshi>=0.6' 'python2-polib') optdepends=('python-psycopg2: support for PostgreSQL database' 'python-pywebdav: support for WebDAV feature' 'pydot: support for displaying workflow graphs' @@ -23,7 +23,7 @@ md5sums=('0dd81769fc18fe2d20e83de4f17cb10d' '768e68c01cb5913e36ea89c67fc98038' 'b1535a8528dfd8f655624bf6faea6985') -build() { +package() { cd $srcdir/$pkgname-$pkgver python2 setup.py install --root=$pkgdir install -D -m644 etc/trytond.conf $pkgdir/etc/trytond.conf -- cgit v1.2.3-54-g00ecf From f38edbff3878008c8b2ae1ca8a496c349763017b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 28 Apr 2013 01:12:25 -0700 Subject: Sun Apr 28 01:11:42 PDT 2013 --- community/bind/127.0.0.zone | 11 ++ community/bind/PKGBUILD | 85 +++++++++++++ community/bind/install | 21 ++++ community/bind/localhost.zone | 10 ++ community/bind/named | 49 ++++++++ community/bind/named.conf | 64 ++++++++++ community/bind/named.conf.d | 4 + community/bind/named.logrotate | 6 + community/bind/named.service | 11 ++ community/bind/remove-tools.patch | 12 ++ community/bind/tmpfiles.d | 1 + community/catdoc/PKGBUILD | 8 +- community/gtk-kde4/PKGBUILD | 34 ------ community/gtk-kde4/fix-permission.patch | 27 ----- community/gtkwave/PKGBUILD | 6 +- community/hubbub/PKGBUILD | 27 +++-- community/kde-gtk-config/PKGBUILD | 36 ++++++ community/kde-gtk-config/kde-gtk-config.install | 11 ++ community/kicad/PKGBUILD | 12 +- community/libcss/PKGBUILD | 17 +-- community/libdom/PKGBUILD | 32 +++++ community/libnsbmp/PKGBUILD | 20 ++-- community/libnsgif/PKGBUILD | 20 ++-- community/libwapcaplet/PKGBUILD | 14 ++- community/netsurf/PKGBUILD | 30 +++-- community/qupzilla/PKGBUILD | 9 +- core/glib2/PKGBUILD | 20 +++- core/glib2/gvariant-fix-annotation.patch | 25 ++++ ...-ce0022933c255313e010b27f977f4ae02aad1e7e.patch | 132 +++++++++++++++++++++ extra/bind/127.0.0.zone | 11 -- extra/bind/PKGBUILD | 85 ------------- extra/bind/install | 21 ---- extra/bind/localhost.zone | 10 -- extra/bind/named | 49 -------- extra/bind/named.conf | 64 ---------- extra/bind/named.conf.d | 4 - extra/bind/named.logrotate | 6 - extra/bind/named.service | 11 -- extra/bind/remove-tools.patch | 12 -- extra/bind/tmpfiles.d | 1 - extra/fetchmail/PKGBUILD | 9 +- extra/gdb/PKGBUILD | 15 ++- extra/gdb/gdb.install | 4 +- extra/git/PKGBUILD | 8 +- extra/tcl/PKGBUILD | 43 +++---- libre/bbswitch-libre/PKGBUILD | 2 +- libre/bumblebee-libre/PKGBUILD | 4 +- libre/cdfs-libre/PKGBUILD | 2 +- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 10 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 10 +- libre/linux-libre/linux-libre.install | 2 +- libre/lirc-libre/PKGBUILD | 2 +- libre/tp_smapi-libre-lts/PKGBUILD | 2 +- libre/tp_smapi-libre/PKGBUILD | 2 +- libre/vhba-module-libre/PKGBUILD | 2 +- libre/virtualbox-libre-modules-lts/PKGBUILD | 2 +- libre/virtualbox-libre-modules/PKGBUILD | 2 +- multilib-staging/lib32-cairo/PKGBUILD | 46 +++++++ multilib-staging/lib32-cairo/libpng16.patch | 40 +++++++ multilib-staging/lib32-gdk-pixbuf2/PKGBUILD | 46 +++++++ .../lib32-gdk-pixbuf2/gdk-pixbuf2.install | 11 ++ multilib-staging/lib32-libpng/PKGBUILD | 55 +++++++++ 65 files changed, 882 insertions(+), 475 deletions(-) create mode 100644 community/bind/127.0.0.zone create mode 100644 community/bind/PKGBUILD create mode 100644 community/bind/install create mode 100644 community/bind/localhost.zone create mode 100755 community/bind/named create mode 100644 community/bind/named.conf create mode 100644 community/bind/named.conf.d create mode 100644 community/bind/named.logrotate create mode 100644 community/bind/named.service create mode 100644 community/bind/remove-tools.patch create mode 100644 community/bind/tmpfiles.d delete mode 100644 community/gtk-kde4/PKGBUILD delete mode 100644 community/gtk-kde4/fix-permission.patch create mode 100644 community/kde-gtk-config/PKGBUILD create mode 100644 community/kde-gtk-config/kde-gtk-config.install create mode 100644 community/libdom/PKGBUILD create mode 100644 core/glib2/gvariant-fix-annotation.patch create mode 100644 core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch delete mode 100644 extra/bind/127.0.0.zone delete mode 100644 extra/bind/PKGBUILD delete mode 100644 extra/bind/install delete mode 100644 extra/bind/localhost.zone delete mode 100755 extra/bind/named delete mode 100644 extra/bind/named.conf delete mode 100644 extra/bind/named.conf.d delete mode 100644 extra/bind/named.logrotate delete mode 100644 extra/bind/named.service delete mode 100644 extra/bind/remove-tools.patch delete mode 100644 extra/bind/tmpfiles.d create mode 100644 multilib-staging/lib32-cairo/PKGBUILD create mode 100644 multilib-staging/lib32-cairo/libpng16.patch create mode 100644 multilib-staging/lib32-gdk-pixbuf2/PKGBUILD create mode 100644 multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install create mode 100644 multilib-staging/lib32-libpng/PKGBUILD (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/bind/127.0.0.zone b/community/bind/127.0.0.zone new file mode 100644 index 000000000..509c311f6 --- /dev/null +++ b/community/bind/127.0.0.zone @@ -0,0 +1,11 @@ +$ORIGIN 0.0.127.in-addr.arpa. + +@ 1D IN SOA localhost. root.localhost. ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS localhost. +1 1D IN PTR localhost. diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD new file mode 100644 index 000000000..4cff0b633 --- /dev/null +++ b/community/bind/PKGBUILD @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 89171 2013-04-27 13:07:51Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: judd +# Contributor: Mario Vazquez + +pkgname=bind +_pkgver=9.9.2-P2 +pkgver=${_pkgver//-/.} +pkgrel=1 +pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' +url='http://www.isc.org/software/bind/' +license=('custom:ISC') +arch=('i686' 'x86_64') +options=('!makeflags' '!libtool') +depends=('openssl' 'krb5' 'libxml2') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'root.hint::http://www.internic.net/zones/named.root' + 'remove-tools.patch' + 'tmpfiles.d' + 'named' + 'named.conf' + 'named.conf.d' + 'named.service' + 'named.logrotate' + 'localhost.zone' + '127.0.0.zone') +sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d' + '029f89c49550c40ec7a95116b6a33f0e5a041094' + '14264affa71bcfe7703d0fb7c3556c4c47efaa8b' + 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' + '47f9ac4f6f70bc9167c1cf7859a298531197ad20' + 'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726' + '7848edbfb9a848843f57c11c02b0289eefd42d00' + '7de92fff4b90c4821b3b133a05affd186fb93951' + '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b' + '76a0d4cd1b913db177a5a375bebc47e5956866ec' + '53be0f1437ebe595240d8dbdd819939582b97fb9') +provides=('dns-server') + +install=install +backup=('etc/logrotate.d/named' + 'etc/conf.d/named' + 'etc/named.conf') + +build() { + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../remove-tools.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-libxml2 \ + --with-libtool \ + + make +} + +package() { + cd "${srcdir}/bind-${_pkgver}" + + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + make DESTDIR="${pkgdir}" install + + rmdir "${pkgdir}/var/run" + install -d "${pkgdir}"/usr/share/doc/bind + install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind + + install -D -m755 ../named "${pkgdir}"/etc/rc.d/named + install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf + install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named + install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service + install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named + install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf + + install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named +} diff --git a/community/bind/install b/community/bind/install new file mode 100644 index 000000000..287d0e05b --- /dev/null +++ b/community/bind/install @@ -0,0 +1,21 @@ +post_install() { + getent group named &>/dev/null || groupadd -g 40 named + getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named + passwd -l named &>/dev/null + + touch var/log/named.log + chown named:named var/log/named.log + + # create an rndc.key if it doesn't already exist + if [[ ! -s etc/rndc.key ]]; then + usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key + chown root:named etc/rndc.key + chmod 640 etc/rndc.key + fi +} + +pre_remove() { + getent passwd named &>/dev/null && userdel named >/dev/null + getent group named &>/dev/null && groupdel named >/dev/null + return 0 +} diff --git a/community/bind/localhost.zone b/community/bind/localhost.zone new file mode 100644 index 000000000..e3ff9641c --- /dev/null +++ b/community/bind/localhost.zone @@ -0,0 +1,10 @@ +$ORIGIN localhost. +@ 1D IN SOA @ root ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS @ + 1D IN A 127.0.0.1 diff --git a/community/bind/named b/community/bind/named new file mode 100755 index 000000000..65dd0fe82 --- /dev/null +++ b/community/bind/named @@ -0,0 +1,49 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/named + +PIDFILE=/run/named/named.pid +PID=$(cat $PIDFILE 2>/dev/null) +readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } + +case "$1" in + start) + stat_busy "Starting BIND" + [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon named + stat_done + fi + ;; + stop) + stat_busy "Stopping BIND" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon named + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading BIND" + [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|reload|restart}" +esac +exit 0 diff --git a/community/bind/named.conf b/community/bind/named.conf new file mode 100644 index 000000000..4aaf19a49 --- /dev/null +++ b/community/bind/named.conf @@ -0,0 +1,64 @@ +// +// /etc/named.conf +// + +options { + directory "/var/named"; + pid-file "/run/named/named.pid"; + auth-nxdomain yes; + datasize default; +// Uncomment these to enable IPv6 connections support +// IPv4 will still work: +// listen-on-v6 { any; }; +// Add this for no IPv4: +// listen-on { none; }; + + // Default security settings. + allow-recursion { 127.0.0.1; }; + allow-transfer { none; }; + allow-update { none; }; + version none; + hostname none; + server-id none; +}; + +zone "localhost" IN { + type master; + file "localhost.zone"; + allow-transfer { any; }; +}; + +zone "0.0.127.in-addr.arpa" IN { + type master; + file "127.0.0.zone"; + allow-transfer { any; }; +}; + +zone "." IN { + type hint; + file "root.hint"; +}; + +//zone "example.org" IN { +// type slave; +// file "example.zone"; +// masters { +// 192.168.1.100; +// }; +// allow-query { any; }; +// allow-transfer { any; }; +//}; + +logging { + channel xfer-log { + file "/var/log/named.log"; + print-category yes; + print-severity yes; + print-time yes; + severity info; + }; + category xfer-in { xfer-log; }; + category xfer-out { xfer-log; }; + category notify { xfer-log; }; +}; + diff --git a/community/bind/named.conf.d b/community/bind/named.conf.d new file mode 100644 index 000000000..aecbd2307 --- /dev/null +++ b/community/bind/named.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to BIND +# +NAMED_ARGS="-u named" diff --git a/community/bind/named.logrotate b/community/bind/named.logrotate new file mode 100644 index 000000000..5f9a47693 --- /dev/null +++ b/community/bind/named.logrotate @@ -0,0 +1,6 @@ +/var/log/named.log { + missingok + postrotate + /bin/kill -HUP `cat /run/named/named.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/community/bind/named.service b/community/bind/named.service new file mode 100644 index 000000000..c21f13f4b --- /dev/null +++ b/community/bind/named.service @@ -0,0 +1,11 @@ +[Unit] +Description=Internet domain name server +After=network.target + +[Service] +ExecStart=/usr/sbin/named -f -u named +ExecReload=/usr/sbin/rndc reload +ExecStop=/usr/sbin/rndc stop + +[Install] +WantedBy=multi-user.target diff --git a/community/bind/remove-tools.patch b/community/bind/remove-tools.patch new file mode 100644 index 000000000..29b4c9c5f --- /dev/null +++ b/community/bind/remove-tools.patch @@ -0,0 +1,12 @@ +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 ++++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700 +@@ -19,7 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ ++SUBDIRS = named rndc dnssec tests tools nsupdate \ + check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ + TARGETS = + diff --git a/community/bind/tmpfiles.d b/community/bind/tmpfiles.d new file mode 100644 index 000000000..1cfc82d08 --- /dev/null +++ b/community/bind/tmpfiles.d @@ -0,0 +1 @@ +d /run/named 0750 named named - diff --git a/community/catdoc/PKGBUILD b/community/catdoc/PKGBUILD index bad621899..549cddb7d 100644 --- a/community/catdoc/PKGBUILD +++ b/community/catdoc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75719 2012-08-29 11:08:22Z bisson $ +# $Id: PKGBUILD 89169 2013-04-27 12:49:08Z kkeen $ # Maintainer: Juergen Hoetzel # Contributor: Paulius Palevicius pkgname=catdoc -pkgver=0.94.3 +pkgver=0.94.4 pkgrel=1 pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text" arch=('i686' 'x86_64') @@ -13,12 +13,12 @@ depends=('glibc') optdepends=('tk: for using wordview') options=('!makeflags') source=(http://ftp.de.debian.org/debian/pool/main/c/catdoc/${pkgname}_$pkgver.orig.tar.gz) -md5sums=('61212b9fd06b0a31aa7bc9a671130f57') +md5sums=('4820680e3611392caf2b4dd2413bfae5') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's/$(prefix)/$(installroot)$(prefix)/' desktop/Makefile.in - sed -i 's/0.94.2/0.94.3/' configure* doc/*.1 src/makefile.tc + sed -i 's/0.94.2/0.94.4/' configure* doc/*.1 src/makefile.tc ./configure --prefix=/usr --with-wish=/usr/bin/wish make } diff --git a/community/gtk-kde4/PKGBUILD b/community/gtk-kde4/PKGBUILD deleted file mode 100644 index 367b79207..000000000 --- a/community/gtk-kde4/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 57913 2011-11-04 12:08:54Z lcarlier $ -# Maintainer: Andrea Scarpino -# Contributor: Viliam Pucik - -pkgname=gtk-kde4 -pkgver=0.9.5b -pkgrel=2 -pkgdesc='Allows you to change style, icons, font of GTK applications in KDE4.' -arch=('i686' 'x86_64') -url='http://kde-look.org/content/show.php?content=74689' -license=('GPL') -depends=('kdebase-workspace' 'gtk-engines') -makedepends=('cmake' 'automoc4') -provides=('gtk-qt-engine') -source=("http://betta.houa.org/no-site/${pkgname}(src)${pkgver}.tar.gz" - 'fix-permission.patch') -md5sums=('d5998e4ccd4bd4b4d6a61e7afe8bbecb' - 'f52fa3288c728e5fad72c5d136b49bc5') - -build() { - cd ${pkgname} - - patch -p1 -i ${srcdir}/fix-permission.patch - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - - make -} - -package() { - cd ${pkgname} - - make DESTDIR=${pkgdir} install -} diff --git a/community/gtk-kde4/fix-permission.patch b/community/gtk-kde4/fix-permission.patch deleted file mode 100644 index 29d6c3903..000000000 --- a/community/gtk-kde4/fix-permission.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- gtk-kde4/CMakeLists.txt~ 2010-09-28 11:16:32.000000000 -0700 -+++ gtk-kde4/CMakeLists.txt 2010-10-26 12:31:35.400040780 -0700 -@@ -32,15 +32,8 @@ - - add_subdirectory(kcm/helper) - --INSTALL(FILES ${PROJECT_BINARY_DIR}/daemon/gtk-kde4 DESTINATION ${KDE4_BIN_INSTALL_DIR} PERMISSIONS WORLD_EXECUTE) --#INSTALL(FILES ${PROJECT_BINARY_DIR}/.gtkrc-2.0-kde4 DESTINATION $ENV{HOME} PERMISSIONS WORLD_READ) -- --string(LENGTH conf len) --IF (NOT len) -- INSTALL(FILES ${PROJECT_BINARY_DIR}/daemon/gtk-kde4.desktop DESTINATION $ENV{XDG_CONFIG_DIRS}/autostart PERMISSIONS WORLD_EXECUTE) --ELSE() -- INSTALL(FILES ${PROJECT_BINARY_DIR}/daemon/gtk-kde4.desktop DESTINATION /etc/xdg/autostart PERMISSIONS WORLD_EXECUTE WORLD_READ) --ENDIF() -+INSTALL(PROGRAMS daemon/gtk-kde4 DESTINATION ${KDE4_BIN_INSTALL_DIR}) -+INSTALL(PROGRAMS daemon/gtk-kde4.desktop DESTINATION /etc/xdg/autostart) - - FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt) - -@@ -74,4 +67,4 @@ - - ENDFOREACH(_poFile ${PO_FILES}) - --ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE) -\ No newline at end of file -+ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE) diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index d7a20adce..ade697db8 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76513 2012-09-20 19:33:36Z kkeen $ +# $Id: PKGBUILD 89164 2013-04-27 12:32:34Z kkeen $ # Maintainer: Kyle Keen # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Jared Casper pkgname=gtkwave -pkgver=3.3.40 +pkgver=3.3.45 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('f7b4cd0d056084f6725173b7f939152c') +md5sums=('d746e1ce0584155e3af1d7ba5b0e56f0') build() { cd "${srcdir}/gtkwave-${pkgver}" diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD index 5510e5d13..c22b6f1ea 100644 --- a/community/hubbub/PKGBUILD +++ b/community/hubbub/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 70911 2012-05-18 23:52:08Z arodseth $ +# $Id: PKGBUILD 89120 2013-04-26 23:11:48Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Daniel J Griffiths # Contributor: Paulo Matias pkgname=hubbub -pkgver=0.1.2 +pkgver=0.2.0 pkgrel=1 -pkgdesc="HTML5 compliant parsing library" +pkgdesc='HTML5 compliant parsing library' arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/projects/hubbub/" +url='http://www.netsurf-browser.org/projects/hubbub/' license=('MIT') -depends=('libparserutils') -source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -sha256sums=('95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52') +depends=('libparserutils>=0.1.2') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/lib$pkgname-$pkgver-src.tar.gz") +sha256sums=('91c90965fdbbfb9137c7881b33736a03fc80bd16f5cd7808e1efff3d63000eaf') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/lib$pkgname-$pkgver" sed -i 's:-Werror::' Makefile - make PREFIX=/usr COMPONENT_TYPE="lib-shared" - make PREFIX=/usr COMPONENT_TYPE="lib-static" + make PREFIX=/usr COMPONENT_TYPE='lib-shared' + make PREFIX=/usr COMPONENT_TYPE='lib-static' } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/lib$pkgname-$pkgver" - make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" - make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-shared' + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-static' install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/kde-gtk-config/PKGBUILD b/community/kde-gtk-config/PKGBUILD new file mode 100644 index 000000000..88840a813 --- /dev/null +++ b/community/kde-gtk-config/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 89140 2013-04-27 07:58:51Z lcarlier $ +# Maintainer: Laurent Carlier +# Contributor: birdflesh + +pkgname=kde-gtk-config +pkgver=2.2.1 +pkgrel=1 +pkgdesc="GTK2 and GTK3 Configurator for KDE" +arch=('i686' 'x86_64') +url="https://projects.kde.org/kde-gtk-config" +license=('GPL3') +depends=('kdelibs') +makedepends=('cmake' 'automoc4' 'gtk2' 'gtk3') +optdepends=('gtk2: GTK+ v2 support' + 'gtk3: GTK+ v3 support') +source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz") +md5sums=('d155ed431d509e54a60383a70b700e1c') +install=$pkgname.install + +build() { + cd "$srcdir" + + mkdir -p build && cd build + + cmake ../$pkgname-$pkgver \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package(){ + cd "$srcdir/build" + + make DESTDIR="$pkgdir" install +} diff --git a/community/kde-gtk-config/kde-gtk-config.install b/community/kde-gtk-config/kde-gtk-config.install new file mode 100644 index 000000000..6905e303e --- /dev/null +++ b/community/kde-gtk-config/kde-gtk-config.install @@ -0,0 +1,11 @@ +post_install() { +xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD index 15518c6c7..fca285645 100644 --- a/community/kicad/PKGBUILD +++ b/community/kicad/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 85759 2013-03-06 14:22:48Z kkeen $ +# $Id: PKGBUILD 89177 2013-04-27 13:49:24Z kkeen $ # Maintainer: Kyle Keen # Contributor: Marq Schneider pkgname=kicad -pkgver=20130226 +pkgver=20130331 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} -_pkgbzr=3974 -pkgrel=4 +_pkgbzr=4008 +pkgrel=1 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" arch=('i686' 'x86_64') url="http://iut-tice.ujf-grenoble.fr/kicad/" @@ -16,9 +16,9 @@ makedepends=('cmake' 'zlib' 'mesa') optdepends=('kicad-docs-bzr: for documentation' 'kicad-library-bzr: for footprints') install=kicad.install -source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}_sources_stable_${_pkgver}_BZR${_pkgbzr}.zip +source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources_stable_${_pkgver}_BZR${_pkgbzr}.zip kicad-boost-polygon-declare-gtlsort-earlier.patch) -md5sums=('9b7748efedc355473c72fdb7c37b0500' +md5sums=('9c88273a5b323b6622d1704a90ffa399' 'a2c39704238946e74a5ed0c38326345f') build() { diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD index eb4ab2817..4c5fb155e 100644 --- a/community/libcss/PKGBUILD +++ b/community/libcss/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 70921 2012-05-19 18:26:38Z arodseth $ +# $Id: PKGBUILD 89131 2013-04-27 00:42:21Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella # Contributor: Daniel J Griffiths pkgname=libcss -pkgver=0.1.2 -pkgrel=2 -pkgdesc="CSS parser and selection engine" +pkgver=0.2.0 +pkgrel=1 +pkgdesc='CSS parser and selection engine' arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/projects/libcss/" +url='http://www.netsurf-browser.org/projects/libcss/' license=('MIT') -depends=('libparserutils>=0.1.1' 'libwapcaplet>=0.1.1') -source=("http://www.netsurf-browser.org/projects/releases/libcss-$pkgver-src.tar.gz") -sha256sums=('92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e') +depends=('libparserutils>=0.1.2' 'libwapcaplet>=0.2.0') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/libcss-$pkgver-src.tar.gz") +sha256sums=('31b08f6f2259366ccad8b455440f364dc33e7dc78cdb0cf4905da56d5372f613') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libdom/PKGBUILD b/community/libdom/PKGBUILD new file mode 100644 index 000000000..0ee76677c --- /dev/null +++ b/community/libdom/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 89135 2013-04-27 01:19:34Z arodseth $ +# Maintainer: Alexander Rødseth + +pkgname=libdom +pkgver=0.0.1 +pkgrel=1 +pkgdesc='Implementation of the W3C DOM' +arch=('x86_64' 'i686') +url='http://www.netsurf-browser.org/projects/libdom/' +license=('MIT') +depends=('hubbub>=0.2.0' 'libwapcaplet>=0.2.0' 'expat') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz") +sha256sums=('2aa75861c8a8291b6b3d1a3856c65ca615677afeec64ccfdf35a113a292c36b1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + export CFLAGS="-Wno-error=unused-but-set-variable" + make PREFIX=/usr COMPONENT_TYPE="lib-shared" + make PREFIX=/usr COMPONENT_TYPE="lib-static" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/libnsbmp/PKGBUILD b/community/libnsbmp/PKGBUILD index 8193e85dd..6b01b1638 100644 --- a/community/libnsbmp/PKGBUILD +++ b/community/libnsbmp/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 59663 2011-11-29 08:59:46Z arodseth $ +# $Id: PKGBUILD 89122 2013-04-26 23:30:55Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Paulo Matias # Contributor: Daniel J Griffiths + pkgname=libnsbmp -pkgver=0.0.3 -pkgrel=3 -pkgdesc="Decoding library for BMP and ICO image file formats" +pkgver=0.1.0 +pkgrel=1 +pkgdesc='Decoding library for BMP and ICO image file formats' arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/projects/libnsbmp/" +url='http://www.netsurf-browser.org/projects/libnsbmp/' license=('MIT') depends=('glibc') -source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -md5sums=('52eef940713a4c8a7afbb6888583057c') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz") +sha256sums=('fb576af6bd4d02d3626d5c2092bc06c80b2a80089a14decf40c813d9ec80ddc0') build() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" make PREFIX=/usr COMPONENT_TYPE="lib-shared" make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" diff --git a/community/libnsgif/PKGBUILD b/community/libnsgif/PKGBUILD index b31fff221..c17d5a370 100644 --- a/community/libnsgif/PKGBUILD +++ b/community/libnsgif/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 59664 2011-11-29 09:06:33Z arodseth $ +# $Id: PKGBUILD 89124 2013-04-26 23:34:05Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Daniel J Griffiths # Contributor: Paulo Matias + pkgname=libnsgif -pkgver=0.0.3 -pkgrel=3 -pkgdesc="Decoding library for the GIF image file format" +pkgver=0.1.0 +pkgrel=1 +pkgdesc='Decoding library for the GIF image file format' arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/projects/libnsgif/" +url='http://www.netsurf-browser.org/projects/libnsgif/' license=('MIT') depends=('glibc') -source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -md5sums=('d4fa9679939e9b1b243799d6a0623cec') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz") +sha256sums=('e7dc7ee887fefc19e7c7985c5a2b057870e0fa3dd0dcfc1fdb4e98da1f36593c') build() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" CFLAGS="$CFLAGS -fno-strict-aliasing" make PREFIX=/usr COMPONENT_TYPE="lib-shared" @@ -22,7 +24,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD index 62c641f11..e9425b8c5 100644 --- a/community/libwapcaplet/PKGBUILD +++ b/community/libwapcaplet/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 70913 2012-05-18 23:56:14Z arodseth $ +# $Id: PKGBUILD 89126 2013-04-26 23:37:42Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella # Contributor: Daniel J Griffiths pkgname=libwapcaplet -pkgver=0.1.1 +pkgver=0.2.0 pkgrel=1 -pkgdesc="String internment library with rapid string comparison" +pkgdesc='String internment library with rapid string comparison' arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/projects/libwapcaplet/" +url='http://www.netsurf-browser.org/projects/libwapcaplet/' license=('MIT') -source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -sha256sums=('cf05159d7d515523697ce07228cff6a6339dc6bdcfec3e02e3b72d8b773f5258') +depends=('glibc') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz") +sha256sums=('5fb49841ba335b0c7a1420d92c3a60480df63696c50353c02724aa8c6b45cb24') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD index e24d0c0b3..1f760a693 100644 --- a/community/netsurf/PKGBUILD +++ b/community/netsurf/PKGBUILD @@ -1,45 +1,49 @@ -# $Id: PKGBUILD 81235 2012-12-13 22:54:07Z arodseth $ +# $Id: PKGBUILD 89138 2013-04-27 07:58:18Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Paulo Matias # Contributor: Georgij Kondratjev # Contributor: Daniel J Griffiths pkgname=netsurf -pkgver=2.9 -pkgrel=5 +pkgver=3.0 +pkgrel=1 pkgdesc='Lightweight and fast web browser' arch=('x86_64' 'i686') url='http://www.netsurf-browser.org/' license=('GPL') -depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss>=0.1.2' 'hubbub>=0.1.2' 'libwebp>=0.2.0' 'gstreamer0.10') -makedepends=('re2c' 'lcms' 'gendesk>=0.4.2') -provides=('netsurf') -conflicts=('netsurf') -install=netsurf.install +depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss' 'libwebp' 'libdom') # 'libharu' 'gstreamer0.10' +makedepends=('js' 're2c' 'lcms' 'gendesk' 'netsurf-buildsystem' 'libglade') +install="$pkgname.install" source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" "http://download.$pkgname-browser.org/$pkgname/releases/source/$pkgname-$pkgver-src.tar.gz") sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00' - 'f74767161fd7f3186e483b438a183f2ea3cae160020ad5dd63c75a4d78f5c797') + '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6') + _exec=('netsurf %U') _genericname=('Web Browser') _comment=('Lightweight web browser') _mimetype=('text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo') -build() { +prepare() { cd "$srcdir" gendesk - cd "$pkgname" +} + +build() { + cd "$pkgname-$pkgver" make \ PREFIX=/usr \ TARGET=gtk \ NETSURF_USE_WEBP=YES \ - NETSURF_USE_VIDEO=YES + NETSURF_USE_VIDEO=NO \ + NETSURF_USE_MOZILLA_JS=YES \ + NETSURF_USE_HARU_PDF=NO } package() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" make install PREFIX=/usr DESTDIR="$pkgdir" install -Dm644 "../$pkgname.png" \ diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD index 516da13b9..55558bef9 100644 --- a/community/qupzilla/PKGBUILD +++ b/community/qupzilla/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 87097 2013-03-27 02:25:04Z speps $ +# $Id: PKGBUILD 89115 2013-04-26 22:11:32Z speps $ # Maintainer: speps _name=QupZilla -_commit=953ca72 # pkgname=qupzilla -pkgver=1.4.1_git20130326 +pkgver=1.4.2 pkgrel=1 pkgdesc="Cross-platform QtWebKit browser" arch=(i686 x86_64) @@ -13,8 +12,8 @@ license=('GPL3') depends=('qtwebkit' 'hunspell') optdepends=('bash-completion: bash completion support') install="$pkgname.install" -source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/$_commit") -md5sums=('1b1b94a53a422436975b19f9ca05f006') +source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/v$pkgver") +md5sums=('e1989427fea976312ca4c0ec84ce41b2') build() { cd "$srcdir/$_name-$pkgname-"* diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index d277d9892..50260971f 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,21 +1,33 @@ -# $Id: PKGBUILD 183313 2013-04-21 22:06:25Z heftig $ +# $Id: PKGBUILD 183737 2013-04-27 14:20:45Z jgc $ # Maintainer: Jan de Groot pkgbase=glib2 pkgname=(glib2 glib2-docs) pkgver=2.36.1 -pkgrel=1 +pkgrel=3 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz - revert-warn-glib-compile-schemas.patch) + revert-warn-glib-compile-schemas.patch + gvariant-fix-annotation.patch + partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch) sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97' + 'ebbb0581322b1fc546f93f9d77f39f37584004086d2f6f2637a8bb7894e36b2b' + '5928ac4fd114cda846fe38a3b8bedc5b038dbf9e47f76029af7d75e5dc8ae5be') build() { cd glib-$pkgver + + # fix FS#34630 https://bugs.archlinux.org/task/34630 + export CFLAGS+=" -Wall" + + # Upstream fixes from 2.36 branch + patch -Np1 -i ../gvariant-fix-annotation.patch + patch -Np1 -i ../partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch + patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ diff --git a/core/glib2/gvariant-fix-annotation.patch b/core/glib2/gvariant-fix-annotation.patch new file mode 100644 index 000000000..ee10312c8 --- /dev/null +++ b/core/glib2/gvariant-fix-annotation.patch @@ -0,0 +1,25 @@ +From 7304bbd5d8ad56dcf3ee9fadf74f6104c49d4df7 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +Date: Fri, 12 Apr 2013 15:25:15 +0000 +Subject: GVariant: fix transfer annotation + +g_variant_new_from_bytes() returns a floating reference, so it +must be annotated (transfer none) + +https://bugzilla.gnome.org/show_bug.cgi?id=697887 +--- +diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c +index b96bc90..f823e01 100644 +--- a/glib/gvariant-core.c ++++ b/glib/gvariant-core.c +@@ -498,7 +498,7 @@ g_variant_alloc (const GVariantType *type, + * + * A reference is taken on @bytes. + * +- * Returns: a new #GVariant with a floating reference ++ * Returns: (transfer none): a new #GVariant with a floating reference + * + * Since: 2.36 + */ +-- +cgit v0.9.1 diff --git a/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch b/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch new file mode 100644 index 000000000..f623c1b21 --- /dev/null +++ b/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch @@ -0,0 +1,132 @@ +From f3b1054b0ebb4912f700e08da0c3d35c30113e79 Mon Sep 17 00:00:00 2001 +From: Ryan Lortie +Date: Tue, 23 Apr 2013 17:26:48 +0000 +Subject: Partially revert "Merge waitpid() from g_spawn_sync into gmain()" + +This partially reverts commit ce0022933c255313e010b27f977f4ae02aad1e7e. + +It used to be safe to use g_spawn_sync() from processes that had their +own SIGCHLD handler because it simply called wait(). When it was +changed to depend on the GLib child watching infrastructure this meant +that GLib had to own the SIGCHLD handler. + +This caused hangs in at least Pidgin. + +The patch contained two other improvements to the child watch code which +we want to keep, so only revert the changes to gspawn itself. + +https://bugzilla.gnome.org/show_bug.cgi?id=698081 +--- +diff --git a/glib/gspawn.c b/glib/gspawn.c +index 381ed5c..01cedf6 100644 +--- a/glib/gspawn.c ++++ b/glib/gspawn.c +@@ -47,7 +47,6 @@ + + #include "genviron.h" + #include "gmem.h" +-#include "gmain.h" + #include "gshell.h" + #include "gstring.h" + #include "gstrfuncs.h" +@@ -207,21 +206,6 @@ read_data (GString *str, + } + } + +-typedef struct { +- GMainLoop *loop; +- gint *status_p; +-} SyncWaitpidData; +- +-static void +-on_sync_waitpid (GPid pid, +- gint status, +- gpointer user_data) +-{ +- SyncWaitpidData *data = user_data; +- *(data->status_p) = status; +- g_main_loop_quit (data->loop); +-} +- + /** + * g_spawn_sync: + * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's +@@ -277,7 +261,6 @@ g_spawn_sync (const gchar *working_directory, + GString *errstr = NULL; + gboolean failed; + gint status; +- SyncWaitpidData waitpid_data; + + g_return_val_if_fail (argv != NULL, FALSE); + g_return_val_if_fail (!(flags & G_SPAWN_DO_NOT_REAP_CHILD), FALSE); +@@ -410,32 +393,45 @@ g_spawn_sync (const gchar *working_directory, + close_and_invalidate (&outpipe); + if (errpipe >= 0) + close_and_invalidate (&errpipe); +- +- /* Now create a temporary main context and loop, with just one +- * waitpid source. We used to invoke waitpid() directly here, but +- * this way we unify with the worker thread in gmain.c. ++ ++ /* Wait for child to exit, even if we have ++ * an error pending. + */ +- { +- GMainContext *context; +- GMainLoop *loop; +- GSource *source; +- +- context = g_main_context_new (); +- loop = g_main_loop_new (context, TRUE); ++ again: ++ ++ ret = waitpid (pid, &status, 0); + +- waitpid_data.loop = loop; +- waitpid_data.status_p = &status; +- +- source = g_child_watch_source_new (pid); +- g_source_set_callback (source, (GSourceFunc)on_sync_waitpid, &waitpid_data, NULL); +- g_source_attach (source, context); +- g_source_unref (source); +- +- g_main_loop_run (loop); ++ if (ret < 0) ++ { ++ if (errno == EINTR) ++ goto again; ++ else if (errno == ECHILD) ++ { ++ if (exit_status) ++ { ++ g_warning ("In call to g_spawn_sync(), exit status of a child process was requested but ECHILD was received by waitpid(). Most likely the process is ignoring SIGCHLD, or some other thread is invoking waitpid() with a nonpositive first argument; either behavior can break applications that use g_spawn_sync either directly or indirectly."); ++ } ++ else ++ { ++ /* We don't need the exit status. */ ++ } ++ } ++ else ++ { ++ if (!failed) /* avoid error pileups */ ++ { ++ int errsv = errno; + +- g_main_context_unref (context); +- g_main_loop_unref (loop); +- } ++ failed = TRUE; ++ ++ g_set_error (error, ++ G_SPAWN_ERROR, ++ G_SPAWN_ERROR_READ, ++ _("Unexpected error in waitpid() (%s)"), ++ g_strerror (errsv)); ++ } ++ } ++ } + + if (failed) + { +-- +cgit v0.9.1 diff --git a/extra/bind/127.0.0.zone b/extra/bind/127.0.0.zone deleted file mode 100644 index 509c311f6..000000000 --- a/extra/bind/127.0.0.zone +++ /dev/null @@ -1,11 +0,0 @@ -$ORIGIN 0.0.127.in-addr.arpa. - -@ 1D IN SOA localhost. root.localhost. ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS localhost. -1 1D IN PTR localhost. diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD deleted file mode 100644 index b491d68a9..000000000 --- a/extra/bind/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 181006 2013-03-29 15:52:14Z bpiotrowski $ -# Maintainer: Gaetan Bisson -# Contributor: judd -# Contributor: Mario Vazquez - -pkgname=bind -_pkgver=9.9.2-P2 -pkgver=${_pkgver//-/.} -pkgrel=1 -pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -arch=('i686' 'x86_64') -options=('!makeflags' '!libtool') -depends=('openssl' 'krb5' 'libxml2') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'root.hint::http://www.internic.net/zones/named.root' - 'remove-tools.patch' - 'tmpfiles.d' - 'named' - 'named.conf' - 'named.conf.d' - 'named.service' - 'named.logrotate' - 'localhost.zone' - '127.0.0.zone') -sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d' - '029f89c49550c40ec7a95116b6a33f0e5a041094' - '14264affa71bcfe7703d0fb7c3556c4c47efaa8b' - 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' - '47f9ac4f6f70bc9167c1cf7859a298531197ad20' - 'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726' - '7848edbfb9a848843f57c11c02b0289eefd42d00' - '7de92fff4b90c4821b3b133a05affd186fb93951' - '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b' - '76a0d4cd1b913db177a5a375bebc47e5956866ec' - '53be0f1437ebe595240d8dbdd819939582b97fb9') -provides=('dns-server') - -install=install -backup=('etc/logrotate.d/named' - 'etc/conf.d/named' - 'etc/named.conf') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../remove-tools.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-libxml2 \ - --with-libtool \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}" - - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - make DESTDIR="${pkgdir}" install - - rmdir "${pkgdir}/var/run" - install -d "${pkgdir}"/usr/share/doc/bind - install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind - - install -D -m755 ../named "${pkgdir}"/etc/rc.d/named - install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf - install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named - install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service - install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named - install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf - - install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named -} diff --git a/extra/bind/install b/extra/bind/install deleted file mode 100644 index 287d0e05b..000000000 --- a/extra/bind/install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - getent group named &>/dev/null || groupadd -g 40 named - getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named - passwd -l named &>/dev/null - - touch var/log/named.log - chown named:named var/log/named.log - - # create an rndc.key if it doesn't already exist - if [[ ! -s etc/rndc.key ]]; then - usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key - chown root:named etc/rndc.key - chmod 640 etc/rndc.key - fi -} - -pre_remove() { - getent passwd named &>/dev/null && userdel named >/dev/null - getent group named &>/dev/null && groupdel named >/dev/null - return 0 -} diff --git a/extra/bind/localhost.zone b/extra/bind/localhost.zone deleted file mode 100644 index e3ff9641c..000000000 --- a/extra/bind/localhost.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN localhost. -@ 1D IN SOA @ root ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS @ - 1D IN A 127.0.0.1 diff --git a/extra/bind/named b/extra/bind/named deleted file mode 100755 index 65dd0fe82..000000000 --- a/extra/bind/named +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/named - -PIDFILE=/run/named/named.pid -PID=$(cat $PIDFILE 2>/dev/null) -readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } - -case "$1" in - start) - stat_busy "Starting BIND" - [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon named - stat_done - fi - ;; - stop) - stat_busy "Stopping BIND" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon named - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading BIND" - [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|reload|restart}" -esac -exit 0 diff --git a/extra/bind/named.conf b/extra/bind/named.conf deleted file mode 100644 index 4aaf19a49..000000000 --- a/extra/bind/named.conf +++ /dev/null @@ -1,64 +0,0 @@ -// -// /etc/named.conf -// - -options { - directory "/var/named"; - pid-file "/run/named/named.pid"; - auth-nxdomain yes; - datasize default; -// Uncomment these to enable IPv6 connections support -// IPv4 will still work: -// listen-on-v6 { any; }; -// Add this for no IPv4: -// listen-on { none; }; - - // Default security settings. - allow-recursion { 127.0.0.1; }; - allow-transfer { none; }; - allow-update { none; }; - version none; - hostname none; - server-id none; -}; - -zone "localhost" IN { - type master; - file "localhost.zone"; - allow-transfer { any; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "127.0.0.zone"; - allow-transfer { any; }; -}; - -zone "." IN { - type hint; - file "root.hint"; -}; - -//zone "example.org" IN { -// type slave; -// file "example.zone"; -// masters { -// 192.168.1.100; -// }; -// allow-query { any; }; -// allow-transfer { any; }; -//}; - -logging { - channel xfer-log { - file "/var/log/named.log"; - print-category yes; - print-severity yes; - print-time yes; - severity info; - }; - category xfer-in { xfer-log; }; - category xfer-out { xfer-log; }; - category notify { xfer-log; }; -}; - diff --git a/extra/bind/named.conf.d b/extra/bind/named.conf.d deleted file mode 100644 index aecbd2307..000000000 --- a/extra/bind/named.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to BIND -# -NAMED_ARGS="-u named" diff --git a/extra/bind/named.logrotate b/extra/bind/named.logrotate deleted file mode 100644 index 5f9a47693..000000000 --- a/extra/bind/named.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/named.log { - missingok - postrotate - /bin/kill -HUP `cat /run/named/named.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/extra/bind/named.service b/extra/bind/named.service deleted file mode 100644 index c21f13f4b..000000000 --- a/extra/bind/named.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Internet domain name server -After=network.target - -[Service] -ExecStart=/usr/sbin/named -f -u named -ExecReload=/usr/sbin/rndc reload -ExecStop=/usr/sbin/rndc stop - -[Install] -WantedBy=multi-user.target diff --git a/extra/bind/remove-tools.patch b/extra/bind/remove-tools.patch deleted file mode 100644 index 29b4c9c5f..000000000 --- a/extra/bind/remove-tools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 -+++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700 -@@ -19,7 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -+SUBDIRS = named rndc dnssec tests tools nsupdate \ - check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ - TARGETS = - diff --git a/extra/bind/tmpfiles.d b/extra/bind/tmpfiles.d deleted file mode 100644 index 1cfc82d08..000000000 --- a/extra/bind/tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/named 0750 named named - diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index 83ebe7b7f..b45c77d8d 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 180506 2013-03-22 07:41:24Z pierre $ +# $Id: PKGBUILD 183744 2013-04-27 16:59:09Z pierre $ pkgname=fetchmail -pkgver=6.3.25 +pkgver=6.3.26 pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64') @@ -11,14 +11,13 @@ depends=('openssl') makedepends=('python2') optdepends=('tk: for using fetchmailconf' 'python2: for using fetchmailconf') -backup=('etc/conf.d/fetchmail') options=('!makeflags') install='fetchmail.install' source=("http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz" "http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" 'fetchmail.tmpfiles' 'fetchmail.service') -sha1sums=('a246a6a3caf90e1106448c9dde4463e87d816031' - '9a7f76c9fd9f85fc4b421e34fa8c15d2838d61fc' +sha1sums=('de8dbe62a8edfa232ee4278257a1fe67aa1c797a' + 'SKIP' '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' '69caf3fd4d4446db3bf53144e4fa8edbdbbfcd10') diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD index 6e0648ba4..6cfef2bdf 100644 --- a/extra/gdb/PKGBUILD +++ b/extra/gdb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172148 2012-11-30 04:20:34Z allan $ +# $Id: PKGBUILD 183696 2013-04-27 07:01:47Z allan $ # Maintainer: Allan McRae # Contributor: Jan de Groot pkgname=gdb -pkgver=7.5.1 +pkgver=7.6 pkgrel=1 pkgdesc="The GNU Debugger" arch=('i686' 'x86_64') @@ -15,8 +15,15 @@ backup=('etc/gdb/gdbinit') options=('!libtool') install=gdb.install source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('3f48f468b24447cf24820054ff6e85b1' - '31ab569c78a01d3f946c6fe0336175fe') +md5sums=('fda57170e4d11cdde74259ca575412a8' + 'SKIP') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure +} build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/gdb/gdb.install b/extra/gdb/gdb.install index 986ec547c..e260d0225 100644 --- a/extra/gdb/gdb.install +++ b/extra/gdb/gdb.install @@ -1,7 +1,8 @@ infodir=usr/share/info -filelist=(annotate.info gdb.info gdb.info-1 gdb.info-2 gdb.info-3 gdb.info-4 gdbint.info gdbint.info-1 gdbint.info-2 stabs.info) +filelist=(annotate.info gdb.info{,-{1,2,3,4,5,6,7}} gdbint.info{,-{1,2}} stabs.info) post_install() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file.gz $infodir/dir 2> /dev/null done @@ -12,6 +13,7 @@ post_upgrade() { } pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index eb5b753b2..3cbc58c2c 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182157 2013-04-08 13:21:41Z dan $ +# $Id: PKGBUILD 183712 2013-04-27 12:28:29Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.8.2.1 +pkgver=1.8.2.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('3f6ebca116c627490e4ee1f1324d5e65' - '8ec6ab4d8c868305e9a679f5c3d2ccfa' +md5sums=('f7407df37facf579dcaa979266cc3c59' + '765e8b9bbed49333f78103c6afd1dd0b' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index bf83d62be..a52cb810b 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,44 +1,47 @@ -# $Id: PKGBUILD 173926 2012-12-28 05:57:13Z andyrtr $ -# Maintainer: Allan McRae -# Committer: Judd Vinet +# $Id: PKGBUILD 183693 2013-04-27 04:42:47Z eric $ +# Maintainer: Eric Bélanger pkgname=tcl pkgver=8.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') +depends=('zlib') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) md5sums=('573aa5fe678e9185ef2b3c56b24658d3') -build() { - cd ${srcdir}/tcl${pkgver}/unix - +prepare() { + cd tcl${pkgver} # we build the tcl sqlite interface in sqlite-tcl package - rm -rf ${srcdir}/tcl${pkgver}/pkgs/sqlite3* - + rm -rf pkgs/sqlite3* + + sed -i 's/#define DUPTRAVERSE_MAX_DEPTH 500/#define DUPTRAVERSE_MAX_DEPTH 5000/' \ + generic/regc_nfa.c +} + +build() { + cd tcl${pkgver}/unix [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT - make } check() { - cd ${srcdir}/tcl${pkgver}/unix + cd tcl${pkgver}/unix make test } -package() -{ - cd ${srcdir}/tcl${pkgver}/unix - - make INSTALL_ROOT=${pkgdir} install install-private-headers - ln -sf tclsh8.6 ${pkgdir}/usr/bin/tclsh - +package() { + cd tcl${pkgver}/unix + make INSTALL_ROOT="${pkgdir}" install install-private-headers + find "${pkgdir}" -name '*.a' -type f -exec chmod 644 {} \; + ln -sf tclsh8.6 "${pkgdir}/usr/bin/tclsh" + # install license - install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # remove buildroot traces - sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh + sed -i "s#${srcdir}#/usr/src#" "${pkgdir}"/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh } diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 2b3d37e0b..9a39c7a8f 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.6 _extramodules=extramodules-3.8-LIBRE # Don't forget to update bbswitch.install -pkgrel=3 +pkgrel=5 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD index d07cb1c64..4ac8c524d 100644 --- a/libre/bumblebee-libre/PKGBUILD +++ b/libre/bumblebee-libre/PKGBUILD @@ -3,7 +3,7 @@ _pkgname=bumblebee pkgname=bumblebee-libre -pkgver=3.2 +pkgver=3.2.1 pkgrel=1 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" arch=('i686' 'x86_64') @@ -27,7 +27,7 @@ backup=('etc/bumblebee/bumblebee.conf' 'etc/bumblebee/xorg.conf.nouveau') source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz" 'libre.patch') -md5sums=('690d0b3aea4ae1fc2a72fe2719ecfd74' +md5sums=('30974e677bb13e8a3825fd6f3e7d3b24' 'f8b6044310039911236f53a625c611a6') prepare() { diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index cbf479d1c..86ff43820 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.8-LIBRE # Don't forget to update cdfs.install -pkgrel=40 +pkgrel=42 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 6c04db17b..efe1c3371 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.8 +_kernver=3.8.10 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=14 +pkgrel=15 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index d7902119f..ec552b834 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.74 +_kernver=3.0.75 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=12 +pkgrel=13 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index f4341cb83..a4f2d18ee 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183082 2013-04-17 12:40:54Z tpowa $ +# $Id: PKGBUILD 183699 2013-04-27 07:33:10Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=74 +_sublevel=75 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.73 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.74 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'a0984b44eba8de48e20357c9c146baf6' + '13ae458b95cc12f1fcf7e37e91206cbe' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '624eacedd2a576161512ffefc1797bc1') + '8e9b3e526d0d339004e141fddf2390dc') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index b8118b60d..9f7b9706d 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.74-1-LIBRE-LTS +KERNEL_VERSION=3.0.75-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 9d1e52de9..67bbcdc5d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ +# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=8 +_sublevel=10 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'cc93810441658cdf40a4bc051f8f4774' + 'fd9713a31ee671a9dec8ad0e65996c84' '9b425f069f920cdd6798b3adab79d3af' '9316ebdb21ea9948ae5c83795a3dcf61' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'fead20edc727fbb89789194eaebb6daa') + '259774469ac9b2b1f41cf2f978743055') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index c6fa71c97..fd8297ddf 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.8-1-LIBRE +KERNEL_VERSION=3.8.10-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 0634f6f6c..07abf931b 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=42 +pkgrel=43 epoch=1 _extramodules=extramodules-3.8-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index faf704096..f726d9a8c 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=10 +pkgrel=12 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 51329569f..92e66fc6a 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=17 +pkgrel=19 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 5bbbf618d..3ba9ec1aa 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.8-LIBRE -pkgrel=20 +pkgrel=22 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 172e318c5..175c9c49f 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.12 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 59816a051..713c61158 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 _extramodules=extramodules-3.8-LIBRE -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/multilib-staging/lib32-cairo/PKGBUILD b/multilib-staging/lib32-cairo/PKGBUILD new file mode 100644 index 000000000..87ddae50b --- /dev/null +++ b/multilib-staging/lib32-cairo/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 89175 2013-04-27 13:22:02Z ioni $ +# Maintainer: Ionut Biru + +_pkgbasename=cairo +pkgname=lib32-$_pkgbasename +pkgver=1.12.14 +pkgrel=4 +pkgdesc="Cairo vector graphics library (32-bit)" +arch=('x86_64') +url="http://cairographics.org/" +license=('LGPL' 'MPL') +makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa>=9.1' 'lib32-mesa-libgl>=9.1' 'mesa-libgl') # we need to avoid old libgl in [extra] +source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz + libpng16.patch) +options=(!libtool) +sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15' + 'c9911f185637d266ce1d2985bd6fb7d0df3d75b2') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + patch -Np1 -i ../libpng16.patch + ./configure --prefix=/usr \ + --libdir=/usr/lib32 \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --enable-tee \ + --enable-gl \ + --enable-egl + # --disable-xlib-xcb + make +} + +package() { + depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig' + 'lib32-pixman' 'lib32-glib2' 'lib32-mesa>=9.1' 'lib32-libgl' ${_pkgbasename}) + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/{include,share,bin} +} diff --git a/multilib-staging/lib32-cairo/libpng16.patch b/multilib-staging/lib32-cairo/libpng16.patch new file mode 100644 index 000000000..c16317811 --- /dev/null +++ b/multilib-staging/lib32-cairo/libpng16.patch @@ -0,0 +1,40 @@ +From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Tue, 16 Apr 2013 09:58:56 +0000 +Subject: png: Avoid marking the surface as in error after a png warning + +It turns out that libpng will continue to load an image after throwing a +warning, and that libpng16 now throws warnings for images that libpng15 +and earlier loaded without error. As we were happily loading those +images into cairo surfaces before, we are therefore being overzealous +in throwing an error now - so just squelch the warning. + +Signed-off-by: Chris Wilson +--- +diff --git a/src/cairo-png.c b/src/cairo-png.c +index e74a4a8..068617d 100644 +--- a/src/cairo-png.c ++++ b/src/cairo-png.c +@@ -149,13 +149,13 @@ static void + png_simple_warning_callback (png_structp png, + png_const_charp error_msg) + { +- cairo_status_t *error = png_get_error_ptr (png); +- +- /* default to the most likely error */ +- if (*error == CAIRO_STATUS_SUCCESS) +- *error = _cairo_error (CAIRO_STATUS_NO_MEMORY); +- +- /* png does not expect to abort and will try to tidy up after a warning */ ++ /* png does not expect to abort and will try to tidy up and continue ++ * loading the image after a warning. So we also want to return the ++ * (incorrect?) surface. ++ * ++ * We use our own warning callback to squelch any attempts by libpng ++ * to write to stderr as we may not be in control of that output. ++ */ + } + + +-- +cgit v0.9.0.2-2-gbebe diff --git a/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD b/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD new file mode 100644 index 000000000..a517b2722 --- /dev/null +++ b/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 89167 2013-04-27 12:41:00Z ioni $ +# Maintainer: Ionut Biru +_pkgbasename=gdk-pixbuf2 +pkgname=lib32-$_pkgbasename +pkgver=2.28.1 +pkgrel=2 +pkgdesc="An image loading library (32-bit)" +arch=('x86_64') +url="http://www.gtk.org/" +license=('LGPL2') +depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg lib32-libx11 + $_pkgbasename) +makedepends=(gcc-multilib) +options=('!libtool' '!docs') +install=gdk-pixbuf2.install +source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz) +sha256sums=('bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/gdk-pixbuf-${pkgver}" + + ./configure --prefix=/usr --libdir=/usr/lib32 \ + --without-libjasper \ + --with-x11 \ + --with-included-loaders=png + make +} + +package() { + cd "${srcdir}/gdk-pixbuf-${pkgver}" + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/etc + rm -rf "${pkgdir}"/usr/{include,share} + + cd "${pkgdir}"/usr/bin + mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32 + rm gdk-pixbuf-pixdata + rm gdk-pixbuf-csource +} + +# vim:set ts=2 sw=2 et: diff --git a/multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install b/multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install new file mode 100644 index 000000000..92d58ef04 --- /dev/null +++ b/multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gdk-pixbuf-query-loaders-32 --update-cache +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache +} diff --git a/multilib-staging/lib32-libpng/PKGBUILD b/multilib-staging/lib32-libpng/PKGBUILD new file mode 100644 index 000000000..fb0e987e1 --- /dev/null +++ b/multilib-staging/lib32-libpng/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 89165 2013-04-27 12:32:54Z ioni $ +# Maintainer: Jan de Groot +# Contributor: dorphell +# Contributor: Travis Willard +# Contributor: Douglas Soares de Andrade + +_pkgbasename=libpng +pkgname=lib32-$_pkgbasename +pkgver=1.6.2 +_apngver=1.6.1 +_libversion=16 +pkgrel=1 +pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)" +arch=('x86_64') +url="http://www.libpng.org/pub/png/libpng.html" +license=('custom') +depends=('lib32-zlib' $_pkgbasename) +makedepends=(gcc-multilib) +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz" + "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz") +md5sums=('9d838f6fca9948a9f360a0cc1b516d5f' + '39c34060c2f0e48f3849dcdbd4a16b7a') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + # Add animated PNG (apng) support + # see http://sourceforge.net/projects/libpng-apng/ + patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch" + + ./configure --prefix=/usr --libdir=/usr/lib32 --program-suffix=-32 + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + cd contrib/pngminus + make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png + + rm -rf "${pkgdir}"/usr/{include,share} + + rm "$pkgdir/usr/bin/libpng-config" + ln -s "libpng${_libversion}-config-32" "$pkgdir/usr/bin/libpng-config-32" + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} -- cgit v1.2.3-54-g00ecf From 5f3b2100b811506bec6bcf63b24d1c605dfe8cb6 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 4 May 2013 00:41:51 -0700 Subject: Sat May 4 00:41:51 PDT 2013 --- community/cinnamon-control-center/PKGBUILD | 6 ++-- community/cinnamon/PKGBUILD | 8 ++--- community/desmume/PKGBUILD | 10 +++--- community/muffin/PKGBUILD | 18 +++++------ community/nemo/PKGBUILD | 6 ++-- community/setconf/PKGBUILD | 8 +++-- core/ed/PKGBUILD | 11 ++++--- core/nfs-utils/PKGBUILD | 20 +++++------- core/pciutils/PKGBUILD | 12 ++++---- extra/colord/PKGBUILD | 16 +++++----- extra/freetds/PKGBUILD | 8 ++--- extra/glibmm/PKGBUILD | 6 ++-- extra/gnome-nettool/PKGBUILD | 21 +++++++------ extra/gnome-nettool/printf.patch | 34 +++++++++++++++++++++ extra/gnome-session/PKGBUILD | 6 ++-- extra/gtkmm3/PKGBUILD | 6 ++-- extra/kdevelop-python/PKGBUILD | 6 ++-- extra/libgda/PKGBUILD | 6 ++-- extra/network-manager-applet/PKGBUILD | 21 ++++++++++--- .../fixed-signal-icons.tar.xz | Bin 0 -> 2044 bytes extra/perl-alien-sdl/PKGBUILD | 8 ++--- extra/smplayer/PKGBUILD | 13 ++++++-- kernels/linux-libre-pae/PKGBUILD | 12 ++++---- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-rt/PKGBUILD | 24 +++++++-------- kernels/linux-libre-rt/config.i686 | 4 ++- kernels/linux-libre-rt/config.x86_64 | 4 ++- kernels/linux-libre-rt/linux-libre-rt.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 12 ++++---- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/linux-libre-kmod-alx/PKGBUILD | 6 ++-- libre/linux-libre-lts-kmod-alx/PKGBUILD | 6 ++-- libre/linux-libre-lts/PKGBUILD | 6 ++-- libre/linux-libre/PKGBUILD | 18 +++++------ libre/linux-libre/linux-libre.install | 2 +- pcr/babeld/PKGBUILD | 4 +-- 36 files changed, 206 insertions(+), 148 deletions(-) create mode 100644 extra/gnome-nettool/printf.patch create mode 100644 extra/network-manager-applet/fixed-signal-icons.tar.xz (limited to 'libre/linux-libre-lts-kmod-alx/PKGBUILD') diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 3e6a3f2de..fcde00b2b 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89381 2013-04-29 01:59:05Z bgyorgy $ +# $Id: PKGBUILD 89868 2013-05-03 19:53:33Z faidoc $ # Maintainer: Alexandre Filgueira # Jan de Groot pkgname=cinnamon-control-center -pkgver=1.7.4 +pkgver=1.7.5 pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" "gnomerrlabeler.patch" "idle-delay.patch") -sha256sums=('33425b57d13acf015ddbeba8e9139f7b3488d80f900bd2234f49db1c0944c96b' +sha256sums=('50192b279bd2d6c9a0cb686144d5cf8195e33fbe1e107baeca6da03a638e1f8d' '826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6' '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 5ff5db12a..f13d2c1e5 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 89831 2013-05-02 18:23:50Z bgyorgy $ +# $Id: PKGBUILD 89873 2013-05-03 22:01:21Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.7.8 -pkgrel=2 +pkgver=1.7.10 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -31,7 +31,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "switch-applications.patch" "fallback-helpers.patch" "idle-dim.patch") -sha256sums=('812042c6b7685e2054602a29ed190f8efc07f67f92be1bc496358307534cb969' +sha256sums=('32ac069773b7d1634136d4f8f01c2083708fa26a1a5bc21957c2144cd9244bf7' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3' diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD index 7905f5e16..7fbd8f70e 100644 --- a/community/desmume/PKGBUILD +++ b/community/desmume/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77627 2012-10-13 11:41:54Z allan $ +# $Id: PKGBUILD 89839 2013-05-03 06:49:03Z schuay $ # Maintainer: Jonathan Conder # Maintainer: Brad Fanella # Contributor: Arkham @@ -11,15 +11,15 @@ # Contributor: Asher256 pkgname=desmume -pkgver=0.9.8 -pkgrel=3 +pkgver=0.9.9 +pkgrel=1 pkgdesc="Nintendo DS emulator" arch=('i686' 'x86_64') url="http://desmume.org/" license=('GPL') depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap' 'soundtouch' 'alsa-lib' 'zziplib' 'glu') -makedepends=('intltool') +makedepends=('intltool' 'mesa') install=desmume.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir/" install } -md5sums=('fb7c984c924087888b9eaaad8cb1875e') +md5sums=('458b5f8b3dbb38a47e6d0518f97aa82a') diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 5c0d9cde1..53534603d 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89819 2013-05-02 15:47:37Z bgyorgy $ +# $Id: PKGBUILD 89864 2013-05-03 19:33:13Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=1.7.4 -pkgrel=2 +pkgver=1.7.5 +pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -15,15 +15,15 @@ depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver" +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" "switch-applications.patch" "fix-dnd.patch") -md5sums=('d64bfe853e6fda5ec11a06581743f774' - 'a5d5d76dc281277a8afc83d7affdcc7b' - '6d787466831def299360419cc3b5e47b') +sha256sums=('ef10c19353e5d2ff86d24c2fa40bd53ba3c7eeb03e9d3c8fbd3f4b56d16a2f07' + '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' + '745dd3ef7eb8a496c68f5a728253205a849ac63851c0c0930c42442aec5af939') build() { - cd linuxmint-muffin-* + cd ${pkgname}-${pkgver} # Fix windows switcher keybinding with default settings in GNOME 3.8 patch -Np1 -i ../switch-applications.patch @@ -37,7 +37,7 @@ build() { } package() { - cd linuxmint-muffin-* + cd ${pkgname}-${pkgver} make DESTDIR="$pkgdir/" install } diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 774a2a350..804efe07b 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89644 2013-04-30 21:20:15Z faidoc $ +# $Id: PKGBUILD 89860 2013-05-03 19:19:27Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo -pkgver=1.7.5 +pkgver=1.7.6 pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" "tracker-0.16.patch" "remove-desktop-background.patch") -sha256sums=('d7937ddeb6e9fe1da1283ff306fbb32e6554701d629b63232cbb0a5a9268c99d' +sha256sums=('670faa09fff6b2919231bbe6c580363c4cd0a7c87fc5324570083ed8955db9c8' '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626' '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5') diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index a2a9fbb34..f3e2edad2 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89807 2013-05-02 13:36:01Z arodseth $ +# $Id: PKGBUILD 89870 2013-05-03 20:55:10Z arodseth $ # Maintainer: Alexander Rødseth pkgname=setconf pkgver=0.5.3 -pkgrel=2 +pkgrel=3 pkgdesc='Utility to easily change settings in configuration files or Makefiles' arch=('x86_64' 'i686') url='http://setconf.roboticoverlords.org/' @@ -18,7 +18,9 @@ sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6') build() { cd "$srcdir/$pkgname-$pkgver" - [ -x /usr/bin/shedskin ] && shedskin "$pkgname.py" && make + if [ "$CARCH" == 'x86_64' ] || [ "$CARCH" == 'i686' ]; then + shedskin "$pkgname.py" && make + fi } package() { diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index 80a32233c..c3785934d 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 173766 2012-12-22 18:16:53Z dreisner $ +# $Id: PKGBUILD 184200 2013-05-03 13:44:53Z dreisner $ # Maintainer: Dave Reisner # Maintainer: Andreas Radke pkgname=ed -pkgver=1.7 -pkgrel=2 +pkgver=1.8 +pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnu.org/software/ed/ed.html" depends=('glibc' 'sh') options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz) +source=("ftp://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.gz"{,.sig}) install='ed.install' -md5sums=('0aa4e2428e325203d0d7c3e86c961b1c') +md5sums=('2268d2344b3c52d23730acb2e3c942fe' + 'SKIP') build() { cd "$pkgname-$pkgver" diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 079afece1..36bd7fd53 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175118 2013-01-14 07:37:11Z tpowa $ +# $Id: PKGBUILD 184188 2013-05-03 10:22:57Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: John Proctor # Contributor: dibblethewrecker @@ -6,8 +6,8 @@ # Contributor: Marco Lima pkgname=nfs-utils -pkgver=1.2.6 -pkgrel=4 +pkgver=1.2.7 +pkgrel=1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -16,9 +16,7 @@ backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs- depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') makedepends=('pkgconfig' 'autoconf' 'automake') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - nfs-common nfs-common.conf - nfs-server nfs-server.conf exports idmapd.conf @@ -37,10 +35,8 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn blkmapd.service nfs-utils.conf) install=nfs-utils.install -md5sums=('8be543ca270c2234ff18f8c8d35e0d37' - 'dd0d65fc6e8f422fa12520813098264b' +md5sums=('3b5ca797197765dc0c3a4122720c7716' 'f73f197a16b02c3e248488ec35c4cf43' - 'e619f18354ff958ed624d05d08853d8f' '9cef69bc686cc5dcac23fbb51450747d' 'ff585faf410a62c4333a027c50b56bae' 'eb4f4027fab6fc1201f1ca04f5954c76' @@ -59,13 +55,16 @@ md5sums=('8be543ca270c2234ff18f8c8d35e0d37' '8ffc2ebe932d29efe17d6f3f23d5b975' '8ac484023d786766d287ccbe878ae4ba') -build() { +prepare() { cd $srcdir/${pkgname}-${pkgver} patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch # arch specific patch patch -Np0 -i $srcdir/start-statd.patch +} +build() { + cd $srcdir/${pkgname}-${pkgver} ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ --without-tcp-wrappers --with-statedir=/var/lib/nfs \ --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ @@ -83,9 +82,6 @@ package() { # support python2 (FS#25120) sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} - # NFS & NFSv4 init scripts - install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common - install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server # Configuration install -D -m 644 ../exports "$pkgdir/"etc/exports install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 30462893c..3ff913b2e 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 162716 2012-06-28 20:04:34Z tpowa $ +# $Id: PKGBUILD 184187 2013-05-03 10:22:45Z tpowa $ # Maintainer: Tobias Powalowski pkgname=pciutils -pkgver=3.1.10 -pkgrel=1 +pkgver=3.2.0 +pkgrel=2 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64) license=('GPL2') groups=('base') url="http://mj.ucw.cz/sw/pciutils/" -depends=('glibc' 'hwids') +depends=('glibc' 'hwids' 'kmod') source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) -md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c') +md5sums=('3fccb0b28879adb57d8156115f8003c8') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all + make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man lib/libpci.a cp lib/libpci.a "${srcdir}/" make clean make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 8b78e733e..73843903a 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 183240 2013-04-19 01:14:07Z heftig $ +# $Id: PKGBUILD 184190 2013-05-03 11:21:48Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Ionut Biru pkgname=colord -pkgver=0.1.33 +pkgver=0.1.34 pkgrel=1 pkgdesc="System daemon for managing color devices" arch=(i686 x86_64) url="http://www.freedesktop.org/software/colord" license=(GPL2) depends=(lcms2 libgusb polkit shared-color-profiles sqlite udev dconf dbus) -makedepends=(intltool gobject-introspection vala docbook2x sane) +makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion) optdepends=('sane: UseSANE support [/etc/colord.conf]') options=('!libtool') install=colord.install backup=(etc/colord.conf) source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('41888fc853e033302c59539777b09317a7e1ab3d') +sha1sums=('e4168ca34c2ce228276299efaf12d2f9fb7ecb2e') build() { cd $pkgname-$pkgver @@ -24,9 +24,8 @@ build() { # put udev files in /usr/lib sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure - ./configure --prefix=/usr \ - --sysconfdir=/etc --libexecdir=/usr/lib/colord \ - --localstatedir=/var --disable-static \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --enable-vala --enable-sane --disable-volume-search make @@ -34,8 +33,7 @@ build() { package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install \ - bashcompletiondir=/usr/share/bash-completion/completions + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD index c91427f2c..10ddb2d89 100644 --- a/extra/freetds/PKGBUILD +++ b/extra/freetds/PKGBUILD @@ -13,16 +13,16 @@ options=('!libtool') backup=('etc/freetds/freetds.conf' 'etc/freetds/locales.conf' 'etc/freetds/pool.conf') -source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgver}.tar.gz") -md5sums=('b14db5823980a32f0643d1a84d3ec3ad') +source=("ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${pkgver}.tar.bz2") +md5sums=('e88e96800c89d62307812315b235eb18') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0 make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index 23388f7b8..cf87cfd3e 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183952 2013-04-29 21:53:23Z heftig $ +# $Id: PKGBUILD 184169 2013-05-03 03:02:45Z heftig $ # Maintainer: Jan de Groot # Contributor: Tom Newsom pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.36.1 +pkgver=2.36.2 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') url="http://www.gtkmm.org/" -sha256sums=('d1f7dec2fd75ea95034ec143fcf2ff77a02e92aacf3e0cc110f9c67e7fe23766') +sha256sums=('f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index bfe38c4cb..97913cd16 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 183390 2013-04-21 22:10:08Z heftig $ +# $Id: PKGBUILD 184172 2013-05-03 03:24:57Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Kritoke pkgname=gnome-nettool -pkgver=3.2.0 -pkgrel=3 +pkgver=3.8.0 +pkgrel=1 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64) -license=('GPL') -depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme') -makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools') +license=(GPL) +depends=(gtk3 libgtop dnsutils iputils dconf whois hicolor-icon-theme) +makedepends=(yelp-tools intltool nmap net-tools) optdepends=('nmap: Port scanning' 'net-tools: Network statistics') -groups=('gnome-extra') +groups=(gnome-extra) url="http://www.gnome.org" install=gnome-nettool.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + printf.patch) +sha256sums=('3a3480dcef181684f3e37d779cfd43f9b21920412aff78501de1695faf194a28' + '4b06c0748650996100f710a2d7c90afc8fb75bbdd1984f243f42318d0985229e') build() { cd $pkgname-$pkgver + patch -Np1 -i ../printf.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-compile make diff --git a/extra/gnome-nettool/printf.patch b/extra/gnome-nettool/printf.patch new file mode 100644 index 000000000..89868411a --- /dev/null +++ b/extra/gnome-nettool/printf.patch @@ -0,0 +1,34 @@ +diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c +--- gnome-nettool-3.8.0/src/info.c 2013-05-02 13:58:40.000000000 +0200 ++++ gnome-nettool-3.8.0-printf/src/info.c 2013-05-03 05:20:04.684921458 +0200 +@@ -232,13 +232,13 @@ + text_rx_bytes = util_legible_bytes (netload.bytes_in); + text_tx_bytes = util_legible_bytes (netload.bytes_out); + +- g_sprintf (rx_pkt, "%lld", netload.packets_in); +- g_sprintf (tx_pkt, "%lld", netload.packets_out); ++ g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in); ++ g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out); + +- g_sprintf (rx_error, "%lld", netload.errors_in); +- g_sprintf (tx_error, "%lld", netload.errors_out); ++ g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in); ++ g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out); + +- g_sprintf (collisions, "%lld", netload.collisions); ++ g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions); + + gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes); + gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt); +diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c +--- gnome-nettool-3.8.0/src/utils.c 2013-05-02 13:58:40.000000000 +0200 ++++ gnome-nettool-3.8.0-printf/src/utils.c 2013-05-03 05:21:45.704202804 +0200 +@@ -272,7 +272,7 @@ + unit = "KiB"; + } + +- result = g_strdup_printf ("%lld.%lld %s", short_rx / 10, ++ result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10, + short_rx % 10, unit); + return result; + } diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 04b381bc3..7ff833891 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 183397 2013-04-21 22:10:21Z heftig $ +# $Id: PKGBUILD 184166 2013-05-03 02:07:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-session pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) license=(GPL LGPL) depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop hicolor-icon-theme json-glib libgl libsm libxtst upower) -makedepends=(intltool mesa gtk-doc) +makedepends=(intltool mesa gtk-doc xtrans) options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index f0a9b4a3c..10880858a 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183317 2013-04-21 22:06:35Z heftig $ +# $Id: PKGBUILD 184170 2013-05-03 03:05:29Z heftig $ # Maintainer: Ionut Biru pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 arch=('i686' 'x86_64') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('dbddb143fe671ee321d19de2dbae00c0f67e78ce90447227b23062137b1828bd') +sha256sums=('d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD index 1a5551ab5..acbcf2f6e 100644 --- a/extra/kdevelop-python/PKGBUILD +++ b/extra/kdevelop-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172007 2012-11-26 13:00:02Z andrea $ +# $Id: PKGBUILD 184199 2013-05-03 13:03:50Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdevelop-python -pkgver=1.4.1 +pkgver=1.5.0 pkgrel=1 pkgdesc="Python language and documentation plugin for KDevelop" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('kdevelop') makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.bz2") -sha1sums=('b887811d9a79eee3323cf3ad1be093c5801d31d6') +sha1sums=('fb9af112910c5655ce52bf9cfef19bacbab4f62f') build() { mkdir build diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index d604f74e2..333aee8ee 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183427 2013-04-21 22:11:12Z heftig $ +# $Id: PKGBUILD 184204 2013-05-03 19:46:09Z heftig $ # Maintainer: tobias # Contributor: Tobias Kieslich pkgname=libgda pkgver=5.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64) license=('GPL') @@ -24,7 +24,7 @@ build() { sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py ./configure --prefix=/usr --sysconfdir=/etc \ --with-bdb=/usr --with-bdb-libdir-name=lib \ - --disable-static --enable-json + --disable-static --enable-json --enable-gda-gi make } diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 7ab3fe6a8..8e93cf29e 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183448 2013-04-21 22:11:51Z heftig $ +# $Id: PKGBUILD 184181 2013-05-03 08:14:17Z foutrelis $ # Maintainer: Jan de Groot # Contributor: Arjan Timmerman # Contributor: Wael Nasreddine @@ -7,19 +7,30 @@ pkgname=network-manager-applet pkgver=0.9.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME frontends to NetWorkmanager" arch=(i686 x86_64) license=(GPL) url="http://www.gnome.org/projects/NetworkManager/" depends=("networkmanager>=${pkgver::5}" libgnome-keyring gtk3 libnotify gnome-icon-theme mobile-broadband-provider-info iso-codes) -makedepends=(intltool gnome-bluetooth) +makedepends=(intltool gnome-bluetooth gobject-introspection) optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool' '!emptydirs') install=network-manager-applet.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz + fixed-signal-icons.tar.xz) +noextract=(fixed-signal-icons.tar.xz) +sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590' + '08ffd9d045c98119eb1991c036f41e51950e72eea5638549075239256c000e91') + +prepare() { + cd ${pkgname}-${pkgver} + + # Fix signal icons to work with libpng 1.6 + # https://bugzilla.gnome.org/show_bug.cgi?id=697286 + tar xf ${srcdir}/fixed-signal-icons.tar.xz +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/network-manager-applet/fixed-signal-icons.tar.xz b/extra/network-manager-applet/fixed-signal-icons.tar.xz new file mode 100644 index 000000000..1f85541dc Binary files /dev/null and b/extra/network-manager-applet/fixed-signal-icons.tar.xz differ diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD index 4b6bdedd3..712653e42 100644 --- a/extra/perl-alien-sdl/PKGBUILD +++ b/extra/perl-alien-sdl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165868 2012-09-01 20:47:49Z heftig $ +# $Id: PKGBUILD 184164 2013-05-03 01:57:18Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Sarah Hay @@ -8,7 +8,7 @@ pkgname=perl-alien-sdl _realname=Alien-SDL -pkgver=1.438 +pkgver=1.440 pkgrel=1 pkgdesc="Building, finding and using SDL binaries" arch=(i686 x86_64) @@ -17,9 +17,9 @@ url="http://search.cpan.org/dist/Alien-SDL/" depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny) makedepends=(perl-file-which perl-text-patch) options=(!emptydirs) -_author=JTPALMER +_author=FROGGS source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/$_realname-$pkgver.tar.gz) -md5sums=('1936ba9e300677151124b62883cedf20') +md5sums=('ad665d058d186e673114024ba10dfa09') package() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD index 39521015b..6aaf6b25b 100644 --- a/extra/smplayer/PKGBUILD +++ b/extra/smplayer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181042 2013-03-30 15:19:33Z foutrelis $ +# $Id: PKGBUILD 184186 2013-05-03 10:19:10Z foutrelis $ # Maintainer : Ionut Biru # Contributor: Allan McRae # Contributor: Alessio 'mOLOk' Bolognino @@ -6,16 +6,25 @@ pkgname=smplayer pkgver=0.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64') url="http://smplayer.sourceforge.net/" license=('GPL') depends=('qt4' 'mplayer') +makedepends=('optipng') install=smplayer.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('4691b569c4209d7e5a2c1386d9319881') +prepare() { + cd "$pkgname-$pkgver" + + # Fix invalid PNG icons to work with libpng 1.6 + # http://sourceforge.net/p/smplayer/bugs/571/ + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "$pkgname-$pkgver" sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 292be2408..a1e90b3b6 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -6,23 +6,23 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.10 +pkgver=${_basekernel}.11 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'fd9713a31ee671a9dec8ad0e65996c84' +md5sums=('5c7787be882c343e41fb49136ff60aec' + 'c0ccd5624a61eaae1a00a349e90b5a26' '6294513cfa9830d48ad1915ff7053a98' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' @@ -35,7 +35,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index a4f59e9b3..76fa87eb8 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.10-1-LIBRE-PAE +KERNEL_VERSION=3.8.11-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index fed3ad748..77ebe521f 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -9,19 +9,19 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_releasever=4 -_rtpatchver=rt2 +_releasever=10 +_rtpatchver=rt6 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu1/patch-${_basekernel}-gnu1-${_pkgver}-gnu1.xz" "http://www.kernel.org/pub/linux/kernel/projects/rt/${_basekernel}/patch-${_pkgver}-${_rtpatchver}.patch.xz" # the main kernel config files 'config.i686' 'config.x86_64' @@ -32,17 +32,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'be610dd93dbe033cfe04018b27557c3e' - '22014502fe176ae6dfa33d26f20dbc92' - '4c8f8e66f934b14b48298fd23583ee5f' - '80388869acf87c930fd6bf956682f35c' +md5sums=('5c7787be882c343e41fb49136ff60aec' + '1a05d0c781ac02fed58ad405a8b8355a' + '23d715c891ecfb436cb2a4c4ea5286af' + '5ed195b8c44e1e00c1885077566e1f81' + 'f97a0be3b9252e788a0cf67e93cb5c6f' '82496e68851d1960543a07ba51cdb44a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'a245684c46c8bc2348ebb259c18e40a6') + 'c1a8440ffdae7c352d77bc4002cb6d3d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -56,7 +56,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${_pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${_pkgver}-gnu1" fi # add realtime patch diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index 7fec50cc4..d6e6d82c9 100644 --- a/kernels/linux-libre-rt/config.i686 +++ b/kernels/linux-libre-rt/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.4 Kernel Configuration +# Linux/i386 3.8.10 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5468,6 +5468,8 @@ CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64 index 8d48b274f..d4cef655e 100644 --- a/kernels/linux-libre-rt/config.x86_64 +++ b/kernels/linux-libre-rt/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.8.4 Kernel Configuration +# Linux/x86_64 3.8.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -5238,6 +5238,8 @@ CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 449e2c823..4b78a3997 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.8.4-1-rt2-LIBRE-RT +KERNEL_VERSION=3.8.10-1-rt6-LIBRE-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 19e0233a8..2d2ba5338 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -6,23 +6,23 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.10 +pkgver=${_basekernel}.11 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'fd9713a31ee671a9dec8ad0e65996c84' +md5sums=('5c7787be882c343e41fb49136ff60aec' + 'c0ccd5624a61eaae1a00a349e90b5a26' '2708b6f03f827e2c94ecbd050df4286d' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' @@ -35,7 +35,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 905244477..dbbd5e8fd 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.10-1-LIBRE-XEN +KERNEL_VERSION=3.8.11-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index efe1c3371..75bcfdc6a 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.10 +_kernver=3.8.11 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=15 +pkgrel=16 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -22,7 +22,7 @@ source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_versi md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') -build() { +package() { # current extramodules version _extraver=extramodules-3.8-LIBRE diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index ec552b834..c8c40e338 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.75 +_kernver=3.0.76 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=13 +pkgrel=14 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -22,7 +22,7 @@ source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_versi md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') -build() { +package() { # current extramodules version _extraver=extramodules-3.0-LIBRE-LTS diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 8e41245c2..bb72f209f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,7 +10,7 @@ _basekernel=3.0 _sublevel=76 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.75 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.76 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,7 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' 'module-symbol-waiting-3.0.patch' 'module-init-wait-3.0.patch' - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' 'e405de6581d02d44c2c06a81a1d93f93' 'fe0e9b4415b82f306fc1b63eb9a742a4' @@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '9f8275e1bd316b2b93fd21df3b26228f') + '5b330cc23071e1250b7e0a1613a25952') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 67bbcdc5d..2be94b22d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,17 +10,17 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=10 +_sublevel=11 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -29,9 +29,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'fd9713a31ee671a9dec8ad0e65996c84' + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") +md5sums=('5c7787be882c343e41fb49136ff60aec' + 'c0ccd5624a61eaae1a00a349e90b5a26' '9b425f069f920cdd6798b3adab79d3af' '9316ebdb21ea9948ae5c83795a3dcf61' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '259774469ac9b2b1f41cf2f978743055') + '8c00187e43a678a1db821974a1c0a39c') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -53,7 +53,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index fd8297ddf..e34d8347f 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.10-1-LIBRE +KERNEL_VERSION=3.8.11-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD index e125f83e9..e1e3eb0c4 100644 --- a/pcr/babeld/PKGBUILD +++ b/pcr/babeld/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer (AUR): Yann Lopez # Maintainer (Parabola): fauno pkgname=babeld -pkgver=1.3.6 +pkgver=1.4.0 pkgrel=1 pkgdesc="Loop-free distance-vector routing protocol" arch=(i686 x86_64 mips64el) @@ -28,5 +28,5 @@ package() { install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE } -md5sums=('5dfccfeb2db5d8244c2fd2dc301e89a0' +md5sums=('4ad44bca59f594a629306ac5c9b89d57' 'SKIP') -- cgit v1.2.3-54-g00ecf