diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-15 21:35:07 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-15 21:35:07 -0300 |
commit | 1a65caeb80e2cc8c7b39262d72255124d0c8614e (patch) | |
tree | fb2047cbeaa71fabba55e68dc8f5d4838fb5018c | |
parent | 9f7fb9c12e84f20cd108b933f1a51e216f76cd98 (diff) | |
parent | b90f83b99150003a2022c3a4bbad90b12eb56b7e (diff) |
Merge branch 'master' of gparabola:abslibre-mips64el
778 files changed, 5823 insertions, 43192 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index d4aefca01..7be1fe0f5 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87879 2013-04-08 12:35:31Z svenstaro $ +# $Id: PKGBUILD 90002 2013-05-06 19:36:12Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com> pkgname=0ad pkgver=a13 _pkgver=0.0.13-alpha -pkgrel=2 +pkgrel=4 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://play0ad.com/" diff --git a/community/aiccu/01-fix-makefile.patch b/community/aiccu/01-fix-makefile.patch new file mode 100644 index 000000000..211df7a6a --- /dev/null +++ b/community/aiccu/01-fix-makefile.patch @@ -0,0 +1,39 @@ +--- a/Makefile 2007-01-11 01:29:33.000000000 +0100 ++++ b/Makefile 2013-05-12 23:38:17.171000000 +0200 +@@ -17,9 +17,9 @@ + PROJECT_VERSION=$(shell grep "AICCU_VER" common/aiccu.h | head -n 1 | awk '{print $$3}' | tr -d \") + + # Misc bins +-RM=@rm -f +-MAKE:=@${MAKE} +-CP=@echo [Copy]; cp ++RM=rm -f ++MAKE:=${MAKE} ++CP=cp + RPMBUILD=@echo [RPMBUILD]; rpmbuild + RPMBUILD_SILENCE=>/dev/null 2>/dev/null + +@@ -78,21 +78,11 @@ + @mkdir -p ${DESTDIR}${dirdoc} + @echo "Configuration..." + @mkdir -p ${DESTDIR}${diretc} +-ifeq ($(shell echo "A${RPM_BUILD_ROOT}"),A) +- $(shell [ -f ${DESTDIR}${diretc}${PROJECT}.conf ] || cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf) ++ @cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf + @echo "Documentation..." + @cp doc/README ${DESTDIR}${dirdoc} +- @cp doc/LICENSE ${DESTDIR}${dirdoc} ++ @cp doc/changelog ${DESTDIR}${dirdoc} + @cp doc/HOWTO ${DESTDIR}${dirdoc} +- @echo "Installing Debian-style init.d" +- @mkdir -p ${DESTDIR}${diretc}init.d +- @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} +-else +- @echo "Installing Redhat-style init.d" +- @mkdir -p ${DESTDIR}${diretc}init.d +- @cp doc/${PROJECT}.init.rpm ${DESTDIR}${diretc}init.d/${PROJECT} +- @cp doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf +-endif + @echo "Installation into ${DESTDIR}/ completed" + + help: diff --git a/community/aiccu/01-no-init-script.patch b/community/aiccu/01-no-init-script.patch deleted file mode 100644 index 930d5d21a..000000000 --- a/community/aiccu/01-no-init-script.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: aiccu-20070115/Makefile -=================================================================== ---- aiccu-20070115.orig/Makefile 2009-10-25 22:25:45.000000000 +0100 -+++ aiccu-20070115/Makefile 2009-10-25 22:25:58.000000000 +0100 -@@ -84,9 +84,9 @@ - @cp doc/README ${DESTDIR}${dirdoc} - @cp doc/LICENSE ${DESTDIR}${dirdoc} - @cp doc/HOWTO ${DESTDIR}${dirdoc} -- @echo "Installing Debian-style init.d" -- @mkdir -p ${DESTDIR}${diretc}init.d -- @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} -+# @echo "Installing Debian-style init.d" -+# @mkdir -p ${DESTDIR}${diretc}init.d -+# @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} - else - @echo "Installing Redhat-style init.d" - @mkdir -p ${DESTDIR}${diretc}init.d diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD index 504dd2369..5b374e1a1 100644 --- a/community/aiccu/PKGBUILD +++ b/community/aiccu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84114 2013-02-10 18:32:51Z seblu $ +# $Id: PKGBUILD 90477 2013-05-12 21:46:51Z seblu $ # Maintainer: Sébastien Luttringer pkgname=aiccu pkgver=20070115 -pkgrel=2 +pkgrel=3 pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility' arch=('i686' 'x86_64' 'mips64el') url='http://www.sixxs.net/tools/aiccu/' @@ -12,40 +12,40 @@ depends=('gnutls' 'iproute2') backup=('etc/aiccu.conf') source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz" 'aiccu.service' - '01-no-init-script.patch' + '01-fix-makefile.patch' '02-allow-tunnels.patch' '03-no-quiet-gcc.patch' '04-skip-strip.patch' '05-spelling-error.patch' '06-setup-script.patch') md5sums=('c9bcc83644ed788e22a7c3f3d4021350' - 'e038c9d7882e6e603d87962bac7a0f2a' - '6de05338752bfb01772dee37b1dc0454' + '891b0fa527c1b847ce803dac047cf80d' + '7c7c563ecc6d3fa64a7766de28ba1927' 'b9b2c0e7186f3f96366caaa39252dccc' 'b38db1d95760cd9687330b7db5f4ea1d' '6dfa2df27bb4859c7511bfea91337925' '21a37c376ebfcf787c0e7ee8552053ac' '98e73756609f4e09c45c4e5139fd5aed') -build() { +prepare() { cd $pkgname for _p in "$srcdir"/*.patch; do patch -p1 -i "$_p" done +} + +build() { + cd $pkgname [[ $LDFLAGS ]] && LDFLAGS="$LDFLAGS,--no-as-needed" make } package() { cd $pkgname - make DESTDIR="$pkgdir" install - # default config - install -Dm640 doc/aiccu.conf "$pkgdir/etc/aiccu.conf" + make DESTDIR="$pkgdir" dirsbin="/usr/bin/" install # license install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - # doc - install -dm755 "$pkgdir/usr/share/doc/$pkgname" - install -m644 doc/{README,HOWTO,changelog} "$pkgdir/usr/share/doc/$pkgname/" + # man install -Dm644 doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1" # systemd install -Dm644 "$srcdir/aiccu.service" "$pkgdir/usr/lib/systemd/system/aiccu.service" diff --git a/community/aiccu/aiccu.service b/community/aiccu/aiccu.service index 7371b2849..23f562ea0 100644 --- a/community/aiccu/aiccu.service +++ b/community/aiccu/aiccu.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=forking PIDFile=/var/run/aiccu.pid -ExecStart=/usr/sbin/aiccu start -ExecStop=/usr/sbin/aiccu stop +ExecStart=/usr/bin/aiccu start +ExecStop=/usr/bin/aiccu stop [Install] WantedBy=multi-user.target diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD index d6a253120..2681b5db3 100644 --- a/community/allegro/PKGBUILD +++ b/community/allegro/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84380 2013-02-17 11:58:40Z arodseth $ +# $Id: PKGBUILD 90003 2013-05-06 19:36:13Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -6,13 +6,13 @@ pkgname=allegro pkgver=5.0.9 -pkgrel=1 +pkgrel=3 pkgdesc='Portable library mainly aimed at video game and multimedia programming' arch=('x86_64' 'i686' 'mips64el') url='http://alleg.sourceforge.net/' license=('custom') +makedepends=('cmake' 'mesa-libgl' 'glu') depends=('jack' 'libxpm' 'libxxf86dga' 'libgl' 'physfs' 'gtk2' 'libpulse') -makedepends=('cmake' 'mesa' 'glu') source=("http://downloads.sourceforge.net/alleg/$pkgname-$pkgver.tar.gz") sha256sums=('ba28ac307023f1c756f1c421086f81d1e19ec5f09412d5848303c64177a20bd5') diff --git a/community/amsn/PKGBUILD b/community/amsn/PKGBUILD index 710f9437a..fce3bae19 100644 --- a/community/amsn/PKGBUILD +++ b/community/amsn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81685 2012-12-26 19:27:13Z foutrelis $ +# $Id: PKGBUILD 90004 2013-05-06 19:36:15Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <j@codemac.net> pkgname=amsn pkgver=0.98.9 -pkgrel=2 +pkgrel=3 pkgdesc="MSN client written in Tcl/Tk" arch=('i686' 'x86_64' 'mips64el') url="http://amsn.sourceforge.net/" diff --git a/community/armagetronad/PKGBUILD b/community/armagetronad/PKGBUILD index 3c30de49d..b624e966a 100644 --- a/community/armagetronad/PKGBUILD +++ b/community/armagetronad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79394 2012-11-04 02:16:41Z kkeen $ +# $Id: PKGBUILD 90005 2013-05-06 19:36:16Z foutrelis $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Filippo 'JoeyrS' Civiletti <joeyrs@gmail.com> pkgname=armagetronad pkgver=0.2.8.3.2 -pkgrel=3 +pkgrel=4 pkgdesc='A Tron Clone in 3D.' arch=('i686' 'x86_64' 'mips64el') url='http://armagetronad.net/' diff --git a/community/at/PKGBUILD b/community/at/PKGBUILD index a1bb86500..119ac60f8 100644 --- a/community/at/PKGBUILD +++ b/community/at/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88443 2013-04-17 18:45:36Z eric $ +# $Id: PKGBUILD 90448 2013-05-12 14:38:17Z eric $ # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Todd Musall <tmusall@comcast.net> pkgname=at pkgver=3.1.13 -pkgrel=2 +pkgrel=3 pkgdesc="AT and batch delayed command scheduling utility and daemon" arch=('i686' 'x86_64' 'mips64el') url="http://packages.qa.debian.org/a/at.html" @@ -14,23 +14,20 @@ 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) + atd.service) md5sums=('1da61af6c29e323abaaf13ee1a8dad79' - '35574e34829e7df07a3269d4ab646a29' - '33976a813f4fe7f5659354601044c6f8') + '58856a1081e101ed6f0f02f9a20ada4e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sbindir=/usr/bin \ --with-jobdir=/var/spool/atd \ --with-atspool=/var/spool/atd make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${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 deleted file mode 100644 index d10a46a3b..000000000 --- a/community/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/community/at/atd.service b/community/at/atd.service index ba359878c..df754956a 100644 --- a/community/at/atd.service +++ b/community/at/atd.service @@ -3,7 +3,7 @@ Description=ATD daemon [Service] Type=forking -ExecStart=/usr/sbin/atd +ExecStart=/usr/bin/atd [Install] WantedBy=multi-user.target diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index 5b3be46f0..38ee8c5ec 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88732 2013-04-22 07:51:09Z mtorromeo $ +# $Id: PKGBUILD 90472 2013-05-12 21:18:29Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> # Contributor: henning mueller <henning@orgizm.net> pkgname=audit pkgver=2.2.3 -pkgrel=1 +pkgrel=2 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' url=http://people.redhat.com/sgrubb/$pkgname arch=(i686 x86_64 mips64el) @@ -27,7 +27,6 @@ backup=( ) source=( $url/$pkgname-$pkgver.tar.gz - auditd.rc auditd.service python2.patch ) @@ -37,6 +36,7 @@ build() { patch -p0 -i "$srcdir/python2.patch" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --libexecdir=/usr/lib/audit \ --with-python=yes \ @@ -52,14 +52,12 @@ package() { install -Dm755 "$srcdir/auditd.service" "$pkgdir/usr/lib/systemd/system/auditd.service" cd "$pkgdir" - install -m755 "$srcdir/auditd.rc" etc/rc.d/auditd install -d var/log/audit rm -rf etc/rc.d/init.d etc/sysconfig - sed -ri 's| /sbin| /usr/sbin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf + sed -ri 's| /sbin| /usr/bin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf } sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02' - '1e374ff164667b6a11f84c825a39996b449dc712d573996907cd47f063bf0dd5' - '3c7179f40216b594675f26bb73884406c8ac91577b609dd1ab9837f889954007' + '83ebda69bbc2d4058d7baddbf91ab8a2aafd70e64ceb2137d9c9335f8d8d4b83' '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4') diff --git a/community/audit/auditd.rc b/community/audit/auditd.rc deleted file mode 100644 index 13976341c..000000000 --- a/community/audit/auditd.rc +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID auditd` - -case "$1" in - start) - stat_busy "Starting auditd" - [ -z "$PID" ] && { - /usr/sbin/auditctl -R /etc/audit/audit.rules >/dev/null || stat_die - /usr/sbin/auditd || stat_die - } - add_daemon auditd - stat_done - ;; - - stop) - stat_busy "Stopping auditd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon auditd - stat_done - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - reload) - stat_busy "Reloading auditd" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon auditd - stat_done - fi - ;; - - *) - echo "usage: $0 {start|stop|restart|reload}" -esac - -exit 0 diff --git a/community/audit/auditd.service b/community/audit/auditd.service index 208b5c38e..959dcc112 100644 --- a/community/audit/auditd.service +++ b/community/audit/auditd.service @@ -3,8 +3,8 @@ Description=Security Auditing Service After=syslog.target [Service] -ExecStart=/usr/sbin/auditd -n -ExecStartPost=/usr/sbin/auditctl -R /etc/audit/audit.rules +ExecStart=/usr/bin/auditd -n +ExecStartPost=/usr/bin/auditctl -R /etc/audit/audit.rules [Install] WantedBy=multi-user.target
\ No newline at end of file diff --git a/community/bind/remove-tools.patch b/community/bind/01-remove-tools.patch index 29b4c9c5f..29b4c9c5f 100644 --- a/community/bind/remove-tools.patch +++ b/community/bind/01-remove-tools.patch diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD index d8caa3a2e..55857058c 100644 --- a/community/bind/PKGBUILD +++ b/community/bind/PKGBUILD @@ -1,85 +1,82 @@ -# $Id: PKGBUILD 89171 2013-04-27 13:07:51Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# $Id: PKGBUILD 90480 2013-05-12 21:56:44Z seblu $ +# Maintainer: Sébastien Luttringer +# Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> pkgname=bind _pkgver=9.9.2-P2 pkgver=${_pkgver//-/.} -pkgrel=1 -pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' +pkgrel=3 +pkgdesc='The ISC BIND nameserver' url='http://www.isc.org/software/bind/' license=('custom:ISC') arch=('i686' 'x86_64' 'mips64el') options=('!makeflags' '!libtool') depends=('openssl' 'krb5' 'libxml2') +provides=('dns-server') +backup=('etc/logrotate.d/named' + 'etc/named.conf') +install=$pkgname.install 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') + '127.0.0.zone' + '01-remove-tools.patch') sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d' '029f89c49550c40ec7a95116b6a33f0e5a041094' - '14264affa71bcfe7703d0fb7c3556c4c47efaa8b' 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' - '47f9ac4f6f70bc9167c1cf7859a298531197ad20' 'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726' - '7848edbfb9a848843f57c11c02b0289eefd42d00' - '7de92fff4b90c4821b3b133a05affd186fb93951' + 'cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec' '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b' '76a0d4cd1b913db177a5a375bebc47e5956866ec' - '53be0f1437ebe595240d8dbdd819939582b97fb9') -provides=('dns-server') + '53be0f1437ebe595240d8dbdd819939582b97fb9' + '14264affa71bcfe7703d0fb7c3556c4c47efaa8b') -install=install -backup=('etc/logrotate.d/named' - 'etc/conf.d/named' - 'etc/named.conf') +prepare() { + patch -p1 -d bind-$_pkgver < 01-remove-tools.patch +} 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 + cd bind-$_pkgver + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-libxml2 \ + --with-libtool + make } package() { - cd "${srcdir}/bind-${_pkgver}" + cd "bind-$_pkgver" - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install - rmdir "${pkgdir}/var/run" - install -d "${pkgdir}"/usr/share/doc/bind - install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind + rmdir "$pkgdir/var/run" + install -d "$pkgdir/usr/share/doc/$pkgname" + install doc/arm/*.html "$pkgdir/usr/share/doc/$pkgname" - 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 + cd "$srcdir" + install -D -m644 tmpfiles.d "$pkgdir/usr/lib/tmpfiles.d/named.conf" + 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 + 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" } + +# vim:set ts=2 sw=2 et: diff --git a/community/bind/bind.install b/community/bind/bind.install new file mode 100644 index 000000000..170042111 --- /dev/null +++ b/community/bind/bind.install @@ -0,0 +1,23 @@ +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 + 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 +} + +# vim:set ts=2 sw=2 et: diff --git a/community/bind/install b/community/bind/install deleted file mode 100644 index 287d0e05b..000000000 --- a/community/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/community/bind/named b/community/bind/named deleted file mode 100755 index 65dd0fe82..000000000 --- a/community/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/community/bind/named.conf.d b/community/bind/named.conf.d deleted file mode 100644 index aecbd2307..000000000 --- a/community/bind/named.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to BIND -# -NAMED_ARGS="-u named" diff --git a/community/bind/named.service b/community/bind/named.service index c21f13f4b..1a7832edc 100644 --- a/community/bind/named.service +++ b/community/bind/named.service @@ -3,9 +3,9 @@ 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 +ExecStart=/usr/bin/named -f -u named +ExecReload=/usr/bin/rndc reload +ExecStop=/usr/bin/rndc stop [Install] WantedBy=multi-user.target diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index 332b9fd78..5103e34e7 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82772 2013-01-24 11:12:07Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 90166 2013-05-07 19:14:15Z seblu $ +# Maintainer: Sébastien Luttringer pkgbase=bird pkgname=('bird' 'bird6') -pkgver=1.3.9 +pkgver=1.3.10 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://bird.network.cz/' @@ -12,7 +12,7 @@ depends=('readline' 'ncurses') source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.service' 'bird6.service') -md5sums=('86042560b5053dd008ba0b5ecbdde136' +md5sums=('553c331b32bca9e926519cb2f67d68be' 'ccd12c994501e28a7256a6a2a17154b2' '631eea3de9be2f259aaf91f281d2d39a') diff --git a/community/brise/PKGBUILD b/community/brise/PKGBUILD index 9cc64b8c9..efbeccd76 100644 --- a/community/brise/PKGBUILD +++ b/community/brise/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 83933 2013-02-07 02:02:02Z fyan $ +# $Id: PKGBUILD 90136 2013-05-07 05:26:31Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> pkgname=brise -pkgver=0.18 +pkgver=0.22 pkgrel=1 pkgdesc="Rime schema repository" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" license=('GPL3') depends=() -makedepends=('cmake' 'librime>=0.9.8') +makedepends=('cmake' 'librime>=0.9.9') provides=('librime-data') -conflicts=('librime<0.9.8' 'ibus-rime<0.9.8') +conflicts=('librime<0.9.9' 'ibus-rime<0.9.9') source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") build() { @@ -24,4 +24,4 @@ package() { cd "${srcdir}/$pkgname" make DESTDIR="$pkgdir" install } -md5sums=('1ba32458c6c697c454d65b0764f925ad') +md5sums=('d9a55bc0b6bdd49e2622b76df43ef12f') diff --git a/community/bwbar/PKGBUILD b/community/bwbar/PKGBUILD index 71dcf16d3..8d082652e 100644 --- a/community/bwbar/PKGBUILD +++ b/community/bwbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63506 2012-02-05 11:52:02Z ibiru $ +# $Id: PKGBUILD 90007 2013-05-06 19:36:19Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Rosenstand <mark@borkware.net> pkgname=bwbar pkgver=1.2.3 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64 mips64el) pkgdesc="Generates text and graphical readout of the current bandwidth usage." url="http://www.kernel.org/pub/software/web/bwbar/" @@ -20,5 +20,9 @@ build() { sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' bwbar.c ./configure make +} + +package() { + cd $srcdir/$pkgname-$pkgver install -D -m755 bwbar $pkgdir/usr/bin/bwbar } diff --git a/community/caph/PKGBUILD b/community/caph/PKGBUILD index 13cb1b7e5..6887119cb 100644 --- a/community/caph/PKGBUILD +++ b/community/caph/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84880 2013-02-25 19:41:45Z arodseth $ +# $Id: PKGBUILD 90008 2013-05-06 19:36:20Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: jose <jose1711 [at] gmail (dot) com> pkgname=caph arch=('i686' 'x86_64' 'mips64el') pkgver=1.1 -pkgrel=3 +pkgrel=4 pkgdesc='Sandbox game based on physics which uses doodles as a primary gameplay element' license=('GPL') url='http://sourceforge.net/projects/caphgame/' diff --git a/community/cdargs/PKGBUILD b/community/cdargs/PKGBUILD index fdddf911b..92a9ca38f 100644 --- a/community/cdargs/PKGBUILD +++ b/community/cdargs/PKGBUILD @@ -4,9 +4,9 @@ pkgname=cdargs pkgver=1.35 -pkgrel=3 +pkgrel=3.2 pkgdesc="A replacement for 'cd' that includes bookmarks/browsing for faster navigation" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.skamphausen.de/cgi-bin/ska/CDargs" depends=('ncurses' 'gcc-libs') diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index 50af1b4d7..3a4d80446 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 85509 2013-03-02 08:05:25Z thestinger $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Maintainer: Daniel Micay <danielmicay@gmail.com> +# $Id: PKGBUILD 90367 2013-05-12 04:56:34Z thestinger $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> # Contributor: cdhotfire <cdhotfire@gmail.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> @@ -9,7 +9,7 @@ pkgname=chrony pkgver=1.27 -pkgrel=2 +pkgrel=3 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64' 'mips64el') url="http://chrony.tuxfamily.org/" @@ -20,25 +20,28 @@ backup=('etc/chrony.conf') source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz service) sha256sums=('d44835ee2180a9a0f4f320fc498c39d59dec33d35c2aa05b446fe65a2a83ae9d' - 'b4f68b335820b6a8429591750da294e5a9fafc1e8f6af8d865f6604516ecb306') + 'bef4305fa7e5828e1a1fd43aa8e631f22f21902f6cdc2d3b5b41a57bd9a175dc') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - install -Dm0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf + install -Dm0644 "$srcdir/$pkgname-$pkgver/examples/chrony.conf.example" "$pkgdir/etc/chrony.conf" # Arch's kernel has enhanced RTC support, make chrony use it by default - sed -ie '/^! \(rtconutc\|rtcfile \/etc\/chrony.rtc\)$/ s/^! //' \ + sed -i '/^! \(rtconutc\|rtcfile \/etc\/chrony.rtc\)$/ s/^! //' \ "$pkgdir/etc/chrony.conf" - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service + mv "$pkgdir/usr/sbin/chronyd" "$pkgdir/usr/bin" + rmdir "$pkgdir/usr/sbin" + + install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/chrony.service" install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d" echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list" diff --git a/community/chrony/service b/community/chrony/service index b04196f77..3a012ffac 100644 --- a/community/chrony/service +++ b/community/chrony/service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/chronyd +ExecStart=/usr/bin/chronyd PIDFile=/var/run/chronyd.pid [Install] diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 36131c4f9..725fb6e40 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89868 2013-05-03 19:53:33Z faidoc $ +# $Id: PKGBUILD 90134 2013-05-06 22:58:48Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com # Based on gnome-control-center: # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Jan de Groot <jgc@archlinux.org> pkgname=cinnamon-control-center -pkgver=1.7.5 +pkgver=1.8.0 pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64' 'mips64el') @@ -19,8 +19,8 @@ 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=('50192b279bd2d6c9a0cb686144d5cf8195e33fbe1e107baeca6da03a638e1f8d' - '826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6' +sha256sums=('7230d509f5837906b5497279cfbd96180e5c8dad89777fb31a81fd0c73354fa9' + '604f0a30369d0380a0c5634f1fd50f3f44a89c0b3caec66b60d9e2648b569b90' '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') build() { diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch index b763078ba..b263613c4 100644 --- a/community/cinnamon-control-center/gnomerrlabeler.patch +++ b/community/cinnamon-control-center/gnomerrlabeler.patch @@ -1,6 +1,5 @@ -diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c ---- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c 2013-04-15 16:04:38.000000000 +0200 -+++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c 2013-04-22 03:46:53.499944701 +0200 +--- cinnamon-control-center-1.8.0.orig/panels/display/cc-display-panel.c 2013-05-05 13:12:28.000000000 +0200 ++++ cinnamon-control-center-1.8.0/panels/display/cc-display-panel.c 2013-05-07 00:27:44.901035877 +0200 @@ -31,12 +31,13 @@ #define GNOME_DESKTOP_USE_UNSTABLE_API #include <libgnome-desktop/gnome-rr.h> @@ -8,7 +7,7 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c -#include <libgnome-desktop/gnome-rr-labeler.h> #include <gdk/gdkx.h> #include <X11/Xlib.h> - #include <glib/gi18n.h> + #include <glib/gi18n-lib.h> #include <gdesktop-enums.h> +#include "cc-rr-labeler.h" @@ -34,7 +33,7 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c g_object_unref (self->priv->labeler); G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object); -@@ -293,16 +294,16 @@ +@@ -293,14 +294,14 @@ self->priv->current_output = NULL; if (self->priv->labeler) { @@ -43,36 +42,26 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c g_object_unref (self->priv->labeler); } -- self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration); -+ self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration); + self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration); if (cc_panel_get_shell (CC_PANEL (self)) == NULL) - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); else -- gnome_rr_labeler_show (self->priv->labeler); -+ cc_rr_labeler_show (self->priv->labeler); + gnome_rr_labeler_show (self->priv->labeler); - select_current_output_from_dialog_position (self); - -@@ -2594,9 +2595,9 @@ - if (self->priv->labeler == NULL) - return; +@@ -2596,7 +2597,7 @@ if (gtk_window_has_toplevel_focus (window)) -- gnome_rr_labeler_show (self->priv->labeler); -+ cc_rr_labeler_show (self->priv->labeler); + gnome_rr_labeler_show (self->priv->labeler); else - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); } static void -@@ -2606,9 +2607,9 @@ - if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL) - return; +@@ -2608,7 +2609,7 @@ if (gtk_widget_get_visible (widget)) { -- gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); -+ cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); + gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); } else { - gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler); + cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler); diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD index b3e764c01..0fdc354ef 100644 --- a/community/cinnamon-screensaver/PKGBUILD +++ b/community/cinnamon-screensaver/PKGBUILD @@ -4,7 +4,7 @@ # Jan de Groot <jgc@archlinux.org> pkgname=cinnamon-screensaver -pkgver=1.7.2 +pkgver=1.8.0 pkgrel=1 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop." arch=('i686' 'x86_64' 'mips64el') @@ -18,20 +18,16 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensav cinnamon-screensaver.desktop cinnamon2d-screensaver.desktop cinnamon-screensaver.pam - configure.patch fix-dbus-compatibility.patch) -sha256sums=('c04d2c9c85729b5ae5635202b89084ea23e5211c50cf2dcce11869ffb2acce9f' +sha256sums=('e85722d5af2ecbed98f50909285b335d7635214bf8cada49964f60bb5d1339c1' '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa' '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a' 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda' - 'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a' 'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6') build() { cd $pkgname-$pkgver - # Fix build with automake 1.13 - patch -uNp2 -r- -i ${srcdir}/configure.patch # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch diff --git a/community/cinnamon-screensaver/configure.patch b/community/cinnamon-screensaver/configure.patch deleted file mode 100644 index 289825536..000000000 --- a/community/cinnamon-screensaver/configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur cinnamon-screensaver-1.7.1.orig/configure.ac cinnamon-screensaver-1.7.1/configure.ac ---- ./cinnamon-screensaver-1.7.1.orig/configure.ac 2013-02-19 17:35:35.000000000 +0100 -+++ ./cinnamon-screensaver-1.7.1/configure.ac 2013-02-20 12:40:34.936078052 +0100 -@@ -10,7 +10,7 @@ - AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AM_MAINTAINER_MODE([enable]) - diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 3c68672d1..950712169 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 89873 2013-05-03 22:01:21Z faidoc $ +# $Id: PKGBUILD 90347 2013-05-11 17:08:40Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.7.10 -pkgrel=1 +pkgver=1.8.2 +pkgrel=2 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64' 'mips64el') url="http://cinnamon.linuxmint.com/" @@ -31,10 +31,10 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "switch-applications.patch" "fallback-helpers.patch" "idle-dim.patch") -sha256sums=('32ac069773b7d1634136d4f8f01c2083708fa26a1a5bc21957c2144cd9244bf7' +sha256sums=('83179f98f9e6c88928146d43a9d3f581c64706c0a60dac5e58d845a30a275a91' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' - '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3' + '9a091c0b651a5af1700c8eca90b9e81bb9a50a8a9bfa6a7352d0c0daa2f3f271' '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262' 'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e' 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100') diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch index 4053a151b..5af7c3a79 100644 --- a/community/cinnamon/gnome-3.8.patch +++ b/community/cinnamon/gnome-3.8.patch @@ -3950,3 +3950,234 @@ index c8427ac..a7b2e09 100644 -- 1.8.1.6 +From 1f209cec0fa0e9d12b3c29884302f4b8e70ff4c9 Mon Sep 17 00:00:00 2001 +From: Michael Webster <miketwebster@gmail.com> +Date: Thu, 9 May 2013 11:48:08 -0400 +Subject: [PATCH] Fix notifications and other stuff + +--- + .../cinnamon/applets/sound@cinnamon.org/applet.js | 2 +- + js/ui/notificationDaemon.js | 7 +- + src/main.c | 169 ++++++++++++--------- + 3 files changed, 103 insertions(+), 75 deletions(-) + +diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js +index b037e07..58b2df3 100644 +--- a/js/ui/notificationDaemon.js ++++ b/js/ui/notificationDaemon.js +@@ -220,7 +220,12 @@ NotificationDaemon.prototype = { + NotifyAsync: function(params, invocation) { + let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params; + let id; +- ++ ++ for (let hint in hints) { ++ // unpack the variants ++ hints[hint] = hints[hint].deep_unpack(); ++ } ++ + let rewrites = rewriteRules[appName]; + if (rewrites) { + for (let i = 0; i < rewrites.length; i++) { +diff --git a/src/main.c b/src/main.c +index 418fb60..773fb65 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -34,99 +34,122 @@ + #define OVERRIDES_SCHEMA "org.cinnamon.overrides" + + static void ++cinnamon_dbus_acquire_name (GDBusProxy *bus, ++ guint32 request_name_flags, ++ guint32 *request_name_result, ++ gchar *name, ++ gboolean fatal) ++{ ++ GError *error = NULL; ++ GVariant *request_name_variant; ++ ++ if (!(request_name_variant = g_dbus_proxy_call_sync (bus, ++ "RequestName", ++ g_variant_new ("(su)", name, request_name_flags), ++ 0, /* call flags */ ++ -1, /* timeout */ ++ NULL, /* cancellable */ ++ &error))) ++ { ++ g_printerr ("failed to acquire %s: %s\n", name, error->message); ++ if (!fatal) ++ return; ++ exit (1); ++ } ++ g_variant_get (request_name_variant, "(u)", request_name_result); ++} ++ ++static void ++cinnamon_dbus_acquire_names (GDBusProxy *bus, ++ guint32 request_name_flags, ++ gchar *name, ++ gboolean fatal, ...) G_GNUC_NULL_TERMINATED; ++ ++static void ++cinnamon_dbus_acquire_names (GDBusProxy *bus, ++ guint32 request_name_flags, ++ gchar *name, ++ gboolean fatal, ...) ++{ ++ va_list al; ++ guint32 request_name_result; ++ va_start (al, fatal); ++ for (;;) ++ { ++ cinnamon_dbus_acquire_name (bus, ++ request_name_flags, ++ &request_name_result, ++ name, fatal); ++ name = va_arg (al, gchar *); ++ if (!name) ++ break; ++ fatal = va_arg (al, gboolean); ++ } ++ va_end (al); ++} ++ ++static void + cinnamon_dbus_init (gboolean replace) + { ++ GDBusConnection *session; ++ GDBusProxy *bus; + GError *error = NULL; +- DBusGConnection *session; +- DBusGProxy *bus; + guint32 request_name_flags; + guint32 request_name_result; + +- /** TODO: +- * In the future we should use GDBus for this. However, in +- * order to do that, we need to port all of the JavaScript +- * code. Otherwise, the name will be claimed on the wrong +- * connection. +- */ +- session = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); ++ session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); + +- bus = dbus_g_proxy_new_for_name (session, +- DBUS_SERVICE_DBUS, +- DBUS_PATH_DBUS, +- DBUS_INTERFACE_DBUS); ++ if (error) { ++ g_printerr ("Failed to connect to session bus: %s", error->message); ++ exit (1); ++ } + +- request_name_flags = DBUS_NAME_FLAG_DO_NOT_QUEUE | DBUS_NAME_FLAG_ALLOW_REPLACEMENT; ++ bus = g_dbus_proxy_new_sync (session, ++ G_DBUS_PROXY_FLAGS_NONE, ++ NULL, /* interface info */ ++ "org.freedesktop.DBus", ++ "/org/freedesktop/DBus", ++ "org.freedesktop.DBus", ++ NULL, /* cancellable */ ++ &error); ++ ++ request_name_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT; + if (replace) + request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING; +- if (!dbus_g_proxy_call (bus, "RequestName", &error, +- G_TYPE_STRING, CINNAMON_DBUS_SERVICE, +- G_TYPE_UINT, request_name_flags, +- G_TYPE_INVALID, +- G_TYPE_UINT, &request_name_result, +- G_TYPE_INVALID)) +- { +- g_printerr ("failed to acquire org.Cinnamon: %s\n", error->message); +- exit (1); +- } ++ ++ cinnamon_dbus_acquire_name (bus, ++ request_name_flags, ++ &request_name_result, ++ CINNAMON_DBUS_SERVICE, TRUE); + if (!(request_name_result == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER + || request_name_result == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER)) + { +- g_printerr ("%s already exists on bus and --replace not specified\n", +- CINNAMON_DBUS_SERVICE); ++ g_printerr (CINNAMON_DBUS_SERVICE " already exists on bus and --replace not specified\n"); + exit (1); + } + +- /* Also grab org.gnome.Panel to replace any existing panel process */ +- if (!dbus_g_proxy_call (bus, "RequestName", &error, G_TYPE_STRING, +- "org.gnome.Panel", G_TYPE_UINT, +- DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags, +- G_TYPE_INVALID, G_TYPE_UINT, +- &request_name_result, G_TYPE_INVALID)) +- { +- g_print ("failed to acquire org.gnome.Panel: %s\n", error->message); +- exit (1); +- } +- +- /* ...and the org.gnome.Magnifier service. +- */ +- if (!dbus_g_proxy_call (bus, "RequestName", &error, +- G_TYPE_STRING, MAGNIFIER_DBUS_SERVICE, +- G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags, +- G_TYPE_INVALID, +- G_TYPE_UINT, &request_name_result, +- G_TYPE_INVALID)) +- { +- g_print ("failed to acquire %s: %s\n", MAGNIFIER_DBUS_SERVICE, error->message); +- /* Failing to acquire the magnifer service is not fatal. Log the error, +- * but keep going. */ +- } +- +- /* ...and the org.freedesktop.Notifications service; we always +- * specify REPLACE_EXISTING to ensure we kill off +- * notification-daemon if it was running. ++ /* ++ * We always specify REPLACE_EXISTING to ensure we kill off ++ * the existing service if it was running. + */ +- if (!dbus_g_proxy_call (bus, "RequestName", &error, +- G_TYPE_STRING, "org.freedesktop.Notifications", +- G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags, +- G_TYPE_INVALID, +- G_TYPE_UINT, &request_name_result, +- G_TYPE_INVALID)) +- { +- g_print ("failed to acquire org.freedesktop.Notifications: %s\n", error->message); +- } ++ request_name_flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE; + ++ cinnamon_dbus_acquire_names (bus, ++ request_name_flags, ++ /* Also grab org.gnome.Panel to replace any existing panel process */ ++ "org.gnome.Panel", TRUE, ++ /* ...and the org.gnome.Magnifier service. */ ++ MAGNIFIER_DBUS_SERVICE, FALSE, ++ /* ...and the org.freedesktop.Notifications service. */ ++ "org.freedesktop.Notifications", FALSE, ++ NULL); + /* ...and the on-screen keyboard service */ +- if (!dbus_g_proxy_call (bus, "RequestName", &error, +- G_TYPE_STRING, "org.gnome.Caribou.Keyboard", +- G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING, +- G_TYPE_INVALID, +- G_TYPE_UINT, &request_name_result, +- G_TYPE_INVALID)) +- { +- g_print ("failed to acquire org.gnome.Caribou.Keyboard: %s\n", error->message); +- } +- ++ cinnamon_dbus_acquire_name (bus, ++ DBUS_NAME_FLAG_REPLACE_EXISTING, ++ &request_name_result, ++ "org.gnome.Caribou.Keyboard", FALSE); + g_object_unref (bus); ++ g_object_unref (session); + } + + static void +-- +1.8.1.6 diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index 88a9daad9..a3d3256fe 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80858 2012-12-04 15:55:11Z svenstaro $ +# $Id: PKGBUILD 90010 2013-05-06 19:36:25Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib pkgver=2.3.6 -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64' 'mips64el') url="http://clanlib.org/" diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD index 177282ddd..b69e9e0f5 100644 --- a/community/compiz/PKGBUILD +++ b/community/compiz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77624 2012-10-13 11:41:40Z allan $ +# $Id: PKGBUILD 90011 2013-05-06 19:36:27Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Hussam Al-Tayeb ht990332@gmail.com # Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net> @@ -9,13 +9,13 @@ pkgname=('compiz-core' 'compiz-decorator-kde' 'compiz-decorator-gtk') pkgver=0.8.8 -pkgrel=4 +pkgrel=5 pkgdesc="Composite manager for Aiglx and Xgl" url="http://www.compiz.org/" license=('GPL' 'LGPL' 'MIT') arch=('i686' 'x86_64' 'mips64el') groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') -makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace' +makedepends=('intltool' 'gnome-control-center' 'gconf' 'libwnck' 'kdebase-workspace' 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity') options=(!libtool !emptydirs) conflicts=('compiz' 'compiz-core-git' 'compiz-git') @@ -23,19 +23,27 @@ replaces=('compiz') source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz compiz-kde-4.8.patch compiz-kde-4.9.patch + compiz-kde-4.10.patch compiz-gcc-4.7.patch) sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e' '148656352f8a20b3781ee185025c5c8d4b7d720f' '2b6fa7398ccb96172a99f4d12990bbc0491e355c' + 'f3c97cc9835643d48058682506eac98d6deceeb7' '2138342ae9f253bae003e96e91fdd0bc9918291a') -build() +prepare() { cd "$srcdir/compiz-$pkgver" patch -p0 -i ../compiz-gcc-4.7.patch - patch -p1 -i ../compiz-kde-4.8.patch + patch -p1 -i ../compiz-kde-4.8.patch patch -p1 -i ../compiz-kde-4.9.patch + patch -p0 -i ../compiz-kde-4.10.patch +} + +build() +{ + cd "$srcdir/compiz-$pkgver" ./configure --prefix=/usr \ --enable-gnome \ @@ -48,7 +56,7 @@ build() --disable-kde \ --enable-kde4 - make + make QDBUSXML2CPP=/usr/bin/qdbusxml2cpp-qt4 } package_compiz-core() @@ -75,7 +83,7 @@ package_compiz-core() package_compiz-decorator-gtk() { pkgdesc="Compiz decorator for GNOME" - depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity') + depends=('gnome-control-center' 'gconf' 'libwnck' 'compiz-core' 'metacity') install=compiz-decorator-gtk.install cd "$srcdir/compiz-$pkgver" diff --git a/community/compiz/compiz-kde-4.10.patch b/community/compiz/compiz-kde-4.10.patch new file mode 100644 index 000000000..a30d54b90 --- /dev/null +++ b/community/compiz/compiz-kde-4.10.patch @@ -0,0 +1,30 @@ +--- kde/window-decorator-kde4/window.cpp 2012-11-14 10:17:09 +0000 ++++ kde/window-decorator-kde4/window.cpp 2012-11-23 06:43:18 +0000 +@@ -554,6 +554,15 @@ + showWindowMenu (pos.bottomLeft ()); + } + ++void KWD::Window::showApplicationMenu (const QPoint &p) ++{ ++} ++ ++bool KWD::Window::menuAvailable () const ++{ ++ return false; ++} ++ + KWD::Options::MouseCommand + KWD::Window::buttonToCommand (Qt::MouseButtons button) + { + +--- kde/window-decorator-kde4/window.h 2012-09-03 07:19:30 +0000 ++++ kde/window-decorator-kde4/window.h 2012-11-23 06:43:18 +0000 +@@ -92,6 +92,8 @@ + virtual void processMousePressEvent (QMouseEvent *); + virtual void showWindowMenu (const QRect &); + virtual void showWindowMenu (const QPoint &); ++ virtual void showApplicationMenu (const QPoint &); ++ virtual bool menuAvailable () const; + virtual void performWindowOperation (WindowOperation); + virtual void setMask (const QRegion &, int); + virtual bool isPreview (void) const; diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index c825c5ea9..d9d53862d 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 88577 2013-04-20 14:52:33Z dwallace $ +#$Id: PKGBUILD 90387 2013-05-12 06:30:53Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.13 -pkgrel=1 +pkgver=1.14 +pkgrel=2 pkgdesc="Wireless LAN network manager" url="http://connman.net/" arch=('i686' 'x86_64' 'mips64el') @@ -17,15 +17,20 @@ makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn') options=('!libtool') source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') -md5sums=('12c0d5a52ad3749afac260ebc7151d16' +md5sums=('d8c98071ca244d2e66ae49becfcd0634' 'a8d22ee089fb0ed725130d16ad393047') -build() { +prepare(){ cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/allow_group_network.diff" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --bindir=/usr/bin \ + --sbindir=/usr/bin \ --with-systemdunitdir=/usr/lib/systemd/system \ --enable-threads \ --enable-openconnect \ @@ -39,5 +44,6 @@ build() { package(){ make -C "${srcdir}/${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install - install -Dm755 "$srcdir/$pkgname-$pkgver/client/${pkgname}ctl" "$pkgdir/usr/sbin/${pkgname}ctl" + install -Dm755 "$srcdir/$pkgname-$pkgver/client/${pkgname}ctl" "$pkgdir/usr/bin/${pkgname}ctl" + find "$pkgdir/usr" -name \*.service -exec sed -i 's/s\(bin\)/\1/' {} + } diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index f365c0205..8c39b47cc 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89888 2013-05-04 21:16:10Z giovanni $ +# $Id: PKGBUILD 90210 2013-05-08 19:56:22Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('15bf5783d3df2c0063b5c5b37d5c495c') +md5sums=('bf1d8055be76be704418df7fbc811a21') build() { cd "${srcdir}" diff --git a/community/critter/PKGBUILD b/community/critter/PKGBUILD index 261ae0239..31ed675b5 100644 --- a/community/critter/PKGBUILD +++ b/community/critter/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78732 2012-10-23 20:20:15Z lcarlier $ +# $Id: PKGBUILD 90012 2013-05-06 19:36:32Z foutrelis $ # Maintainer: Laurent Carlier <Lordheavym@gmail.com> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <griffithsdj@archlinux.us> @@ -6,7 +6,7 @@ pkgname=critter _origname=CriticalMass pkgver=1.0.2 -pkgrel=7 +pkgrel=8 pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/criticalmass" @@ -27,7 +27,7 @@ build() { patch -Np1 -i ../critter-gcc43.patch patch -Np0 -i ../criticalmass-1.0.2-libpng15.patch - sed -i 's|-lpng12|-lpng15|g' configure + sed -i 's|-lpng12|-lpng16|g' configure ./configure --prefix=/usr --mandir=/usr/share/man make diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 83f73824c..a4f646cad 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88866 2013-04-24 14:09:28Z spupykin $ +# $Id: PKGBUILD 90013 2013-05-06 19:36:35Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,7 +6,7 @@ pkgname=darktable pkgver=1.2 _pkgver=1.2 -pkgrel=3 +pkgrel=4 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD index e26f523c6..9edb3900b 100644 --- a/community/desmume/PKGBUILD +++ b/community/desmume/PKGBUILD @@ -1,6 +1,7 @@ -# $Id: PKGBUILD 89839 2013-05-03 06:49:03Z schuay $ -# Maintainer: Jonathan Conder <jonno dot conder at gmail dot com> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 89975 2013-05-06 15:32:51Z schuay $ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Jonathan Conder <jonno dot conder at gmail dot com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Nathan Jones <nathanj@insightbb.com> # Contributor: Javier "Phrodo_00" Aravena <phrodo.00 at gmail dot com> @@ -12,7 +13,7 @@ pkgname=desmume pkgver=0.9.9 -pkgrel=1 +pkgrel=2 pkgdesc="Nintendo DS emulator" arch=('i686' 'x86_64' 'mips64el') url="http://desmume.org/" @@ -26,6 +27,10 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") build() { cd "$srcdir/$pkgname-$pkgver" + # See https://bugs.archlinux.org/task/35086 and + # https://sourceforge.net/tracker/?func=detail&aid=3612768&group_id=164579&atid=832291 + sed -i 's/@GETTEXT_PACKAGE@/desmume/' po/Makefile.in.in + ./configure --prefix=/usr --enable-wifi make } diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index 33d1356bf..fb69dc325 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88610 2013-04-20 16:45:03Z heftig $ +# $Id: PKGBUILD 90014 2013-05-06 19:36:37Z foutrelis $ # Maintainer: Laurent Carlier <lordheavym@gmail.org> # Contributor: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=15 +pkgrel=16 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64' 'mips64el') url="http://openil.sourceforge.net/" diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index 2e50cfa1e..60a7381a6 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88862 2013-04-24 13:59:45Z spupykin $ +# $Id: PKGBUILD 90015 2013-05-06 19:36:39Z foutrelis $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,7 +6,7 @@ pkgname=dia pkgver=0.97.2 -pkgrel=4 +pkgrel=5 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD index c799039c3..788495885 100644 --- a/community/dillo/PKGBUILD +++ b/community/dillo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88466 2013-04-18 12:14:39Z spupykin $ +# $Id: PKGBUILD 90016 2013-05-06 19:36:40Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=dillo pkgver=3.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A small, fast graphical web browser built on FLTK" arch=(i686 x86_64 'mips64el') url="http://www.dillo.org" diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD index a3bf85632..91e856541 100644 --- a/community/directfb/PKGBUILD +++ b/community/directfb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83935 2013-02-07 05:11:49Z eric $ +# $Id: PKGBUILD 90017 2013-05-06 19:36:41Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=directfb pkgver=1.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device" arch=('i686' 'x86_64' 'mips64el') url="http://www.directfb.org" @@ -15,7 +15,7 @@ source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${ sha1sums=('0433c5999044ec9701481a92e50c0760cdb50c41') build() { - cd "${srcdir}/DirectFB-${pkgver}" + cd DirectFB-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --enable-static \ --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \ --enable-video4linux2 --enable-voodoo @@ -23,6 +23,6 @@ build() { } package() { - cd "${srcdir}/DirectFB-${pkgver}" + cd DirectFB-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD index cdb129304..26392438f 100644 --- a/community/dosbox/PKGBUILD +++ b/community/dosbox/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 63536 2012-02-05 11:54:23Z ibiru $ -# Maintainer : -# Contribute : Jelle van der Waa <jelle@vdwaa.nl> +# $Id: PKGBUILD 90018 2013-05-06 19:36:46Z foutrelis $ +# Maintainer: Jaroslav Lichtblau +# Contributor: Jelle van der Waa <jelle@vdwaa.nl> # Contributor: James Rayner <james@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=dosbox pkgver=0.74 -pkgrel=3 -pkgdesc="An emulator with builtin DOS for running DOS Games" +pkgrel=5 +pkgdesc="Emulator with builtin DOS for running DOS Games" arch=('i686' 'x86_64' 'mips64el') url="http://dosbox.sourceforge.net/" license=('GPL') -depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') -makedepends=('mesa') +depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs' 'glu') +makedepends=('mesa' 'gendesk') source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" - 'dosbox.png' 'dosbox.desktop' 'gcc46.patch') + 'dosbox.png' + 'gcc46.patch') +md5sums=('b9b240fa87104421962d14eee71351e8' + '2aac25fc06979e375953fcc36824dc5e' + '3fba2e3c7c43290319b2928f40ed30e5') build(){ - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir" + gendesk + + cd "${pkgname}-${pkgver}" patch -Np1 -i "$srcdir/gcc46.patch" sed -i 's/png_check_sig/png_sig_cmp/' configure ./configure --prefix=/usr \ @@ -39,7 +46,3 @@ package() { install -Dm644 "${srcdir}/${pkgname}.desktop" \ "${pkgdir}/usr/share/applications/${pkgname}.desktop" } -md5sums=('b9b240fa87104421962d14eee71351e8' - '2aac25fc06979e375953fcc36824dc5e' - '85169ca599028bee8e29e0b3b7b34dd8' - '3fba2e3c7c43290319b2928f40ed30e5') diff --git a/community/dosbox/dosbox.desktop b/community/dosbox/dosbox.desktop deleted file mode 100644 index dbaf05ced..000000000 --- a/community/dosbox/dosbox.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=dosbox Emulator -GenericName=Emulator -Comment=An emulator to run old DOS games -Icon=dosbox -Exec=dosbox -Terminal=false -Categories=Emulator;Application; diff --git a/community/e4rat/PKGBUILD b/community/e4rat/PKGBUILD deleted file mode 100644 index 3bc3a883b..000000000 --- a/community/e4rat/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 70306 2012-05-04 08:21:46Z mtorromeo $ -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> -# Contributor: graysky <graysky AT archlinux DOT us> - -pkgname=e4rat -pkgver=0.2.3 -pkgrel=1 -pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions." -arch=('i686' 'x86_64') -url="http://e4rat.sourceforge.net/" -license=('GPL') -depends=('e2fsprogs') -makedepends=('audit' 'boost' 'cmake') -options=(!strip) -backup=(etc/e4rat.conf) -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz) - -build() { - cd "$srcdir/$pkgname-$pkgver" - - unset LDFLAGS - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_CORE_LIBRARY_STATIC=true . - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -dm755 "$pkgdir/var/lib/$pkgname" -} - -md5sums=('e8e7db69018036f11d509b65c32d3ea4') -sha256sums=('f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0') diff --git a/community/e4rat/e4rat-static_core.patch b/community/e4rat/e4rat-static_core.patch deleted file mode 100644 index f9aac8208..000000000 --- a/community/e4rat/e4rat-static_core.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/CMakeLists.txt.orig 2012-04-16 13:52:10.993586393 +0200 -+++ src/CMakeLists.txt 2012-04-16 13:52:22.503586159 +0200 -@@ -5,11 +5,7 @@ - MESSAGE(FATAL_ERROR "Do not run cmake on subdirectories") - ENDIF() - --if(CMAKE_SIZEOF_VOID_P MATCHES 4) -- SET(BUILD_CORE_LIBRARY_STATIC 0) --else(CMAKE_SIZEOF_VOID_P MATCHES 4) -- SET(BUILD_CORE_LIBRARY_STATIC 1) --endif(CMAKE_SIZEOF_VOID_P MATCHES 4) -+SET(BUILD_CORE_LIBRARY_STATIC 1) - - #TODO permit link dependencies not static - #set(LINK_DEPENDENIES "static") diff --git a/community/ebtables/PKGBUILD b/community/ebtables/PKGBUILD index f62fd575c..139126aea 100644 --- a/community/ebtables/PKGBUILD +++ b/community/ebtables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83705 2013-02-04 14:45:58Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 90459 2013-05-12 18:54:00Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Michal Soltys <soltys@ziu.info> pkgname=ebtables pkgver=2.0.10_4 -pkgrel=3 +pkgrel=4 pkgdesc='Ethernet bridge filtering utilities' arch=('i686' 'x86_64' 'mips64el') url='http://ebtables.sourceforge.net/' @@ -32,12 +32,13 @@ package() { DESTDIR="$pkgdir" \ LIBDIR=/usr/lib \ MANDIR=/usr/share/man \ - BINDIR=/usr/sbin \ + BINDIR=/usr/bin \ INITDIR=/etc/rc.d \ SYSCONFIGDIR=/etc popd # rm package ebtables rc.d scripts rm "$pkgdir/etc/ebtables-config" + rm -r "$pkgdir/etc/rc.d" # systemd install -Dm 755 $pkgname.systemd \ "$pkgdir/usr/lib/systemd/scripts/$pkgname" diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index b045cc8d7..06df1afe6 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87408 2013-03-31 19:18:11Z stephane $ +# $Id: PKGBUILD 90019 2013-05-06 19:36:47Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b33 -pkgrel=7 +pkgrel=8 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64' 'mips64el') url="http://community.electricsheep.org/" @@ -34,13 +34,17 @@ mksource() { gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz } -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} sed -i 's/wx-config/wx-config-2.9/g' configure.ac sed -i -e 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac sed -i '12 i\ #include <cstdio>' Common/Singleton.h mkdir m4 +} + +build() { + cd ${pkgname}-${pkgver} ./autogen.sh CPPFLAGS+="-I/usr/include/lua5.1" ./configure --prefix=/usr sed -i 's|-I /usr/include/libavutil||' MSVC/SettingsGUI/Makefile @@ -48,7 +52,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 menu-entries/ElectricSheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop" install -D -m644 Runtime/logo.png "${pkgdir}/usr/share/icons/electricsheep.png" diff --git a/community/espeakup/PKGBUILD b/community/espeakup/PKGBUILD index 4eecb2342..1f434f458 100644 --- a/community/espeakup/PKGBUILD +++ b/community/espeakup/PKGBUILD @@ -4,33 +4,27 @@ pkgname=espeakup pkgver=0.71 -pkgrel=7 +pkgrel=8 pkgdesc='Allows the Speakup screen review system to use the ESpeak synthesizer.' arch=('i686' 'x86_64' 'mips64el') -url="http://github.com/williamh/espeakup" +url='http://github.com/williamh/espeakup' license=('GPL3') -#source=("ftp://linux-speakup.org/pub/linux/goodies/${pkgname}-${pkgver}.tar.bz2" -# temporary location -source=("http://the-brannons.com/espeakup-0.71.tar.bz2" - espeakup espeakup.conf.d espeakup.service espeakup.modules-load.d) -depends=(speakup-utils espeak) -backup=(etc/conf.d/espeakup) +source=(http://the-brannons.com/espeakup-0.71.tar.bz2 + espeakup.service espeakup.modules-load.d) +depends=('speakup-utils' 'espeak') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install - install -m755 -D "${srcdir}/espeakup" "${pkgdir}/etc/rc.d/espeakup" - install -m644 -D "${srcdir}/espeakup.conf.d" "${pkgdir}/etc/conf.d/espeakup" install -m644 -D "${srcdir}/espeakup.service" "${pkgdir}/usr/lib/systemd/system/espeakup.service" install -m644 -D "${srcdir}/espeakup.modules-load.d" "${pkgdir}/usr/lib/modules-load.d/espeakup.conf" } -md5sums=('03daa70b3db3f4f6fbb42c2ee428eda7' - '7cf0abd493710ed924b7bb7c8d279fb3' - '0f93974845b15efa12f5e7a74cc0eecd' - '2c80525983a700d3763d4c90c3ab79a8' - '75eb512d510d6701b6f63390475dd34f') + +sha256sums=('8307986998256db21e615c4edc1befedde28a6995971da258e9d513dd79bd3ab' + '0d17413611db3fc4d70e34e84c1e55e832d9eec29482ed7d8c3d737e4ba162b8' + '916abe0c03b843194705940ef062046809a68b51c5696f505d5444a73b45f214') diff --git a/community/espeakup/espeakup b/community/espeakup/espeakup deleted file mode 100644 index 94a71701a..000000000 --- a/community/espeakup/espeakup +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/espeakup -. /etc/rc.d/functions - -PID=`pidof espeakup` -PIDFILE=/var/run/espeakup.pid -case "$1" in - start) - stat_busy "Starting Espeakup" - if [ -z "$PID" ]; then - if [ -f $PIDFILE ]; then - rm $PIDFILE - fi - /usr/bin/espeakup $ESPEAKUP_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon espeakup - stat_done - fi - fi - ;; - stop) - stat_busy "Stopping Espeakup" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon espeakup - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index 1e44b1a1d..17ec70929 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 78961 2012-10-28 07:30:38Z bpiotrowski $ +# $Id: PKGBUILD 90378 2013-05-12 06:05:15Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=exim pkgver=4.80.1 -pkgrel=1 +pkgrel=2 pkgdesc="Message Transfer Agent" arch=('x86_64' 'i686' 'mips64el') url='http://www.exim.org/' license=('GPL') -backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim etc/conf.d/exim) +backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim) install=exim.install depends=('db' 'pcre' 'pam' 'openssl' 'libldap') provides=('smtp-server') @@ -18,9 +18,7 @@ conflicts=('smtp-server') options=('!makeflags') source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2" aliases - exim exim.logrotate - exim.conf.d exim.Makefile exim-submission@.service exim.service @@ -29,13 +27,11 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2 exim-submission.socket) sha256sums=('9565b10f06be224fd03adafae2e07e6fdbb479f8873e3894ddb13f98eeebe78f' '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a' - '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6' '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b' - '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01' - '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55' - '32def7387aaa040b994c0d399c6053dc42d9da4c8c8f0a34d33da653be27e324' - '99aaf3c960396fc08ec918fdca1cf73850960f6c519982d1a653f2e673754445' - '0436411932d6b6268db54a84e4ffc209bde0fa7567442d8e3d138557eeccbad4' + 'd33b8595e92ec812c9f6961f98e50b6a3986d5bd966ed4efec2c52c1fce47636' + '55719e8b823702b0054584326ca28349b7487e5be9e567ddc7a6e6259767e05b' + '652250d99479b58b7127ff60c29f28ca09ebac09cab7e54771d62ce38407012d' + 'faad96dadbb2750faa5652d830f10d5a14be487a42e8db1cec797164acf14b73' '3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26' 'd3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee') @@ -50,19 +46,17 @@ package() { cd "$srcdir/$pkgname-$pkgver" install -Dm0644 $srcdir/exim.logrotate "${pkgdir}/etc/logrotate.d/exim" - install -Dm0644 $srcdir/exim.conf.d "${pkgdir}/etc/conf.d/exim" install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8" - install -Dm0755 $srcdir/exim "${pkgdir}/etc/rc.d/exim" mkdir -p "${pkgdir}/var/spool/exim/db" "${pkgdir}/etc/mail" \ - "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,sbin} + "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,bin} chmod 770 "${pkgdir}/var/spool/exim" "${pkgdir}/var/spool/exim/db" "${pkgdir}/var/log/exim" cd build-Linux-* for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb exipick exiqsumm exigrep \ exim_dbmbuild exim exim_fixdb eximstats exinext exiqgrep exiwhat; do - install -m0755 "$i" "$pkgdir/usr/sbin" + install -m0755 "$i" "$pkgdir/usr/bin" done cd "$srcdir/exim-$pkgver/src" @@ -71,12 +65,12 @@ package() { cp "$srcdir/aliases" "$pkgdir/etc/mail" - cd "$pkgdir/usr/sbin" + cd "$pkgdir/usr/bin" for i in mailq rmail rsmtp runq sendmail; do ln -s exim "$i" done # fhs compliancy - ln -s ../sbin/exim ../lib/sendmail + ln -s ../bin/exim ../lib/sendmail install -Dm0644 "$srcdir/exim-submission@.service" \ "${pkgdir}/usr/lib/systemd/system/exim-submission@.service" diff --git a/community/exim/exim b/community/exim/exim deleted file mode 100644 index 8e9640b32..000000000 --- a/community/exim/exim +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/exim ] && . /etc/conf.d/exim - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/exim` - -case "$1" in - start) - stat_busy "Starting Exim" - [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon exim - stat_done - fi - ;; - stop) - stat_busy "Stopping Exim" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/exim.pid - rm_daemon exim - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/exim/exim-submission@.service b/community/exim/exim-submission@.service index 8b1d056a8..4f90cd83d 100644 --- a/community/exim/exim-submission@.service +++ b/community/exim/exim-submission@.service @@ -6,6 +6,6 @@ Description=Exim Mail Daemon per-connection server (message submission) [Service] -ExecStart=-/usr/sbin/exim -bs +ExecStart=-/usr/bin/exim -bs StandardInput=socket StandardError=syslog diff --git a/community/exim/exim.Makefile b/community/exim/exim.Makefile index a304ce829..2bf77f434 100644 --- a/community/exim/exim.Makefile +++ b/community/exim/exim.Makefile @@ -100,7 +100,7 @@ # /usr/local/sbin. The installation script will try to create this directory, # and any superior directories, if they do not exist. -BIN_DIRECTORY=/usr/sbin +BIN_DIRECTORY=/usr/bin #------------------------------------------------------------------------------ diff --git a/community/exim/exim.conf.d b/community/exim/exim.conf.d deleted file mode 100644 index b9bec4335..000000000 --- a/community/exim/exim.conf.d +++ /dev/null @@ -1 +0,0 @@ -EXIM_ARGS="-bd -q15m" diff --git a/community/exim/exim.install b/community/exim/exim.install index 8ed329559..d666be17f 100644 --- a/community/exim/exim.install +++ b/community/exim/exim.install @@ -9,7 +9,7 @@ post_install() { passwd -l exim > /dev/null chown root.exim /var/spool/exim /var/log/exim chown exim.exim /var/spool/exim/db - chmod u+s /usr/sbin/exim + chmod u+s /usr/bin/exim } # arg 1: the new package version diff --git a/community/exim/exim.service b/community/exim/exim.service index de52fd14f..dc48bd752 100644 --- a/community/exim/exim.service +++ b/community/exim/exim.service @@ -3,7 +3,7 @@ Description=Exim Mail Daemon [Service] PIDFile=/var/run/exim.pid -ExecStart=/usr/sbin/exim -bdf -q30m +ExecStart=/usr/bin/exim -bdf -q30m ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/community/exim/exim@.service b/community/exim/exim@.service index 120485b8b..19c07a51b 100644 --- a/community/exim/exim@.service +++ b/community/exim/exim@.service @@ -2,6 +2,6 @@ Description=Exim Mail Daemon per-connection server [Service] -ExecStart=-/usr/sbin/exim -bs +ExecStart=-/usr/bin/exim -bs StandardInput=socket StandardError=syslog diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD index 70c54b5ab..b3945e6e3 100644 --- a/community/extremetuxracer/PKGBUILD +++ b/community/extremetuxracer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81603 2012-12-25 00:34:08Z foutrelis $ +# $Id: PKGBUILD 90020 2013-05-06 19:36:49Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Eric Belanger <eric.archlinux.org> # Contributor: Fabio Scotoni <CCuleX.gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=extremetuxracer pkgver=0.4 -pkgrel=5.1 +pkgrel=6 pkgdesc="Downhill racing game starring Tux" arch=('i686' 'x86_64' 'mips64el') url="http://www.extremetuxracer.com" diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index 710522eb2..28eb735f7 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,6 +1,7 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> + pkgname=fb-client -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') @@ -9,8 +10,8 @@ license=('GPL3') depends=('curl') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig}) -md5sums=('0dc4cc4637b4503cb0c0cf1f1b09975a' - 'ff74200e97a0184109cd1eee9c0dc099') +md5sums=('6d05a1ebe50fa2c00c03fa41195bdf48' + 'SKIP') build() { cd "$srcdir/fb-$pkgver" diff --git a/community/fbgrab/PKGBUILD b/community/fbgrab/PKGBUILD index 088ba85e0..9621fa39e 100644 --- a/community/fbgrab/PKGBUILD +++ b/community/fbgrab/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83675 2013-02-04 11:04:55Z spupykin $ +# $Id: PKGBUILD 90021 2013-05-06 19:36:50Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=fbgrab pkgver=1.0 -pkgrel=6.1 +pkgrel=7 pkgdesc="A framebuffer screenshot grabber" arch=(i686 x86_64 'mips64el') url="http://hem.bredband.net/gmogmo/fbgrab/" diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD index bb408ed0b..9bcbf8f96 100644 --- a/community/fbv/PKGBUILD +++ b/community/fbv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63552 2012-02-05 11:55:32Z ibiru $ +# $Id: PKGBUILD 90022 2013-05-06 19:36:51Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aectann <aectann@infoline.su> pkgname=fbv pkgver=1.0b -pkgrel=5.1 +pkgrel=6 pkgdesc="FrameBuffer image viewer" arch=('i686' 'x86_64' 'mips64el') url="http://s-tech.elsat.net.pl/fbv/" @@ -19,6 +19,10 @@ build() { sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c make +} + +package() { + cd $srcdir/$pkgname-$pkgver mkdir -p $pkgdir/usr/bin mkdir -p $pkgdir/usr/share/man/man1 make DESTDIR=$pkgdir install diff --git a/community/fcitx-rime/PKGBUILD b/community/fcitx-rime/PKGBUILD index 9af9fdc38..ae50ee9ed 100644 --- a/community/fcitx-rime/PKGBUILD +++ b/community/fcitx-rime/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 82962 2013-01-26 06:52:40Z fyan $ +# $Id: PKGBUILD 90138 2013-05-07 05:26:33Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: lh <jason52lh@gmail.com> pkgname=fcitx-rime pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='Fcitx Wrapper for librime' arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') depends=('fcitx>=4.2.7' "librime" "brise") -makedepends=('cmake' 'intltool') +makedepends=('cmake') install=fcitx-rime.install source=( "http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz" diff --git a/community/fdupes/PKGBUILD b/community/fdupes/PKGBUILD index f458d9ad4..cbae5b25e 100644 --- a/community/fdupes/PKGBUILD +++ b/community/fdupes/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 67613 2012-03-13 14:16:46Z lcarlier $ +# $Id: PKGBUILD 90262 2013-05-10 16:06:17Z jelle $ # Maintainer: Daenyth <Daenyth+Arch at gmail dot com> # Contributor: Chris Winter <twidds at gmail dot com> pkgname=fdupes -pkgver=1.40 -pkgrel=6.1 +pkgver=1.51 +pkgrel=1 pkgdesc="a program for identifying or deleting duplicate files residing within specified directories" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fdupes/" license=('MIT') depends=(glibc) source=(http://fdupes.googlecode.com/files/$pkgname-$pkgver.tar.gz LICENSE) -md5sums=('11de9ab4466089b6acbb62816b30b189' '47f17890218f832f870bf7a02eaeb017') +md5sums=('47d0410c90c9e51e450933ba35a32b62' + '47f17890218f832f870bf7a02eaeb017') build() { cd $srcdir/$pkgname-$pkgver - make + make PREFIX=/usr } package(){ cd $srcdir/$pkgname-$pkgver install -d ${pkgdir}/usr/{share/man/man1,bin} - make INSTALLDIR=${pkgdir}/usr/bin MANPAGEDIR=${pkgdir}/usr/share/man install - install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + make PREFIX=$pkgdir/usr DESTDIR=${pkgdir}/usr/bin INSTALLDIR=${pkgdir}/usr/bin MAN_DIR=${pkgdir}/usr/share/man/man1 install + install -D -m644 $srcdir/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index dbafcc916..54f9011b7 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80712 2012-11-30 12:16:29Z bluewind $ +# $Id: PKGBUILD 90268 2013-05-10 20:25:25Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.6.0.2 +pkgver=3.7.0.1 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') @@ -31,4 +31,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('d56773feafb85c216813bbda87838db0') +md5sums=('cb07cf02ee4cc767e10e8a022ad0ce0d') diff --git a/community/flam3/PKGBUILD b/community/flam3/PKGBUILD index 803b72b9a..22a6d458f 100644 --- a/community/flam3/PKGBUILD +++ b/community/flam3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63556 2012-02-05 11:55:49Z ibiru $ +# $Id: PKGBUILD 90023 2013-05-06 19:36:52Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=flam3 pkgver=3.0.1 -pkgrel=2.1 +pkgrel=3 pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations" arch=('i686' 'x86_64' 'mips64el') url="http://flam3.com/" @@ -14,14 +14,18 @@ source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz flam3-3.0. sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9' '17ece6cc00899e5135dad2bc79f97dfbd73107a6') -build() { - cd "${srcdir}/${pkgname}-${pkgver}/src" +prepare() { + cd ${pkgname}-${pkgver}/src patch -p1 -i ../../flam3-3.0.1-libpng15.patch +} + +build() { + cd ${pkgname}-${pkgver}/src ./configure --prefix=/usr --enable-shared make } package() { - cd "${srcdir}/${pkgname}-${pkgver}/src" + cd ${pkgname}-${pkgver}/src make DESTDIR="${pkgdir}" install } diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index 0b4dfe25e..d029315a7 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84414 2013-02-18 20:13:35Z spupykin $ +# $Id: PKGBUILD 90024 2013-05-06 19:36:54Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=flightgear pkgver=2.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') diff --git a/community/fortune-mod/PKGBUILD b/community/fortune-mod/PKGBUILD index 427bdb8de..cf1c5310d 100644 --- a/community/fortune-mod/PKGBUILD +++ b/community/fortune-mod/PKGBUILD @@ -4,9 +4,9 @@ pkgname=fortune-mod pkgver=1.99.1 -pkgrel=5 +pkgrel=5.2 pkgdesc="The Fortune Cookie Program from BSD games" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.redellipse.net/code/fortune" license=('BSD') depends=('recode') diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index 04e4c51ed..7cccbb50d 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88311 2013-04-16 13:27:26Z spupykin $ +# $Id: PKGBUILD 90025 2013-05-06 19:36:56Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ben <ben@benmazer.net> pkgname=fox pkgver=1.6.49 -pkgrel=1 +pkgrel=2 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64' 'mips64el') url="http://www.fox-toolkit.org/" diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD index e792e1619..7d47d21b4 100644 --- a/community/freedroidrpg/PKGBUILD +++ b/community/freedroidrpg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77877 2012-10-15 10:55:20Z spupykin $ +# $Id: PKGBUILD 90026 2013-05-06 19:36:57Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: nut543 <kfs1@online.no> pkgname='freedroidrpg' pkgver=0.15.1 -pkgrel=3.1 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'glu') makedepends=('mesa') diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index 64feb6a07..d5154e31f 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 88678 2013-04-21 22:16:45Z heftig $ +# $Id: PKGBUILD 90027 2013-05-06 19:36:58Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl pkgver=1.22.13.1 _pkgver=1.22.13 -pkgrel=4 +pkgrel=5 pkgdesc="VRML viewer" arch=('i686' 'x86_64' 'mips64el') url="http://freewrl.sourceforge.net/" license=('GPL') depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' - 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js' 'glu') + 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js185' 'glu') makedepends=('java-environment' 'xulrunner' 'wget' 'mesa') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) diff --git a/community/fxdesktop/PKGBUILD b/community/fxdesktop/PKGBUILD index e75d296b8..695cda07e 100644 --- a/community/fxdesktop/PKGBUILD +++ b/community/fxdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77636 2012-10-13 11:42:37Z allan $ +# $Id: PKGBUILD 90029 2013-05-06 19:37:01Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=fxdesktop pkgver=0.1.12 -pkgrel=6 +pkgrel=7 pkgdesc="Lightweight Desktop Environment" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fxdesktop/" @@ -22,5 +22,9 @@ build() { [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64) # Compile ./gb --prefix=/usr +} + +package() { + cd $srcdir/$pkgname-$pkgver ./gb --package-root=$pkgdir/usr install } diff --git a/community/fxprocessview/PKGBUILD b/community/fxprocessview/PKGBUILD index d65db68df..e16a2c997 100644 --- a/community/fxprocessview/PKGBUILD +++ b/community/fxprocessview/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77637 2012-10-13 11:42:42Z allan $ +# $Id: PKGBUILD 90030 2013-05-06 19:37:02Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=fxprocessview pkgver=0.5.0 -pkgrel=5 +pkgrel=6 pkgdesc="Process Viewer" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -26,6 +26,10 @@ build() { ./gb # gb does not return valid error code [ -f src/fxprocessview ] +} + +package() { + cd $srcdir/$pkgname-$pkgver # make sure destination exists mkdir -p $pkgdir/usr/bin # Install diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 0bb0ac8ab..9aa8036d7 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88616 2013-04-20 16:45:10Z heftig $ +# $Id: PKGBUILD 90031 2013-05-06 19:37:10Z foutrelis $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -16,7 +16,7 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') pkgver=3.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index e28887768..32bf2ed50 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87003 2013-03-25 19:16:43Z bpiotrowski $ +# $Id: PKGBUILD 90032 2013-05-06 19:37:11Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gdal pkgver=1.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.gdal.org/" @@ -13,7 +13,7 @@ license=('custom') depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs') makedepends=('perl' 'swig' 'chrpath') optdepends=('postgresql: postgresql database support' - 'mariadb: mariab database support' + 'mariadb: mariadb database support' 'perl: perl binding support' 'swig: perl binding support') options=('!libtool') diff --git a/community/gdk-pixbuf/PKGBUILD b/community/gdk-pixbuf/PKGBUILD index a33ce9a07..0c5d850ab 100644 --- a/community/gdk-pixbuf/PKGBUILD +++ b/community/gdk-pixbuf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66703 2012-02-27 17:09:51Z ibiru $ +# $Id: PKGBUILD 90033 2013-05-06 19:37:14Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=gdk-pixbuf pkgver=0.22.0 -pkgrel=9.2 +pkgrel=11 pkgdesc="Image loading and manipulation library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -34,11 +34,18 @@ build() { patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch patch -Np1 -i ${srcdir}/libpng15.patch - sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e '/AM_PROG_CC_STDC/d' configure.in + sed -i \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|' \ + -e 's|AM_PROG_CC_STDC|AC_PROG_CC|' \ + configure.in libtoolize --force --copy --automake autoreconf --force --install ./configure --prefix=/usr --disable-gtk-doc make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/usr/share/gnome } diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index fd0692e96..9ad14990e 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86001 2013-03-10 22:54:56Z arodseth $ +# $Id: PKGBUILD 90241 2013-05-09 23:30:17Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera @@ -6,12 +6,12 @@ pkgname=geany-plugins pkgver=1.23 -pkgrel=1 +pkgrel=2 pkgdesc='Plugins for Geany' arch=('x86_64' 'i686' 'mips64el') url='http://plugins.geany.org/' license=('GPL') -depends=("geany=$pkgver" 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte' +depends=("geany=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache' 'lua51') makedepends=('intltool' 'vala' 'gdb' 'cppcheck') optdepends=('hspell: hebrew spell checker') @@ -23,7 +23,6 @@ sha256sums=('ff26860edd1cbaea88c73bd8c2bd02f9ba04046674f05d3696baf66582e2bf58') build() { cd "$srcdir/$pkgname-$pkgver" - # The geanylua plugin currently doesn't work with lua 5.2, only 5.1 ./configure --prefix=/usr --libexecdir=/usr/lib make } diff --git a/community/gemrb/PKGBUILD b/community/gemrb/PKGBUILD index 1a21ccf02..2361b6076 100644 --- a/community/gemrb/PKGBUILD +++ b/community/gemrb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 89424 2013-04-29 11:47:02Z bpiotrowski $ +# $Id: PKGBUILD 90034 2013-05-06 19:37:17Z foutrelis $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=gemrb pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="OSS implementation of Bioware's Infinity Engine which supports eg. Baldur's Gate" arch=('i686' 'x86_64' 'mips64el') url="http://www.gemrb.org/" diff --git a/community/ghemical/PKGBUILD b/community/ghemical/PKGBUILD deleted file mode 100644 index 718b4823a..000000000 --- a/community/ghemical/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Xyne <ac xunilhcra enyx, backwards> -# Contributor: Abhishek Dasgupta <abhidg@gmail.com> - -pkgname=ghemical -pkgver=3.0.0 -pkgrel=2 -pkgdesc="Computational chemistry package." -license=("GPL") -arch=(i686 x86_64 'mips64el') -url="http://bioinformatics.org/ghemical/ghemical/" -depends=('libghemical>=3.0' 'liboglappth>=1.0' 'libglade' 'gtkglext' 'openbabel') -makedepends=('pkgconfig' 'intltool>=0.40.0' 'gettext') -source=(http://bioinformatics.org/ghemical/download/release20111012/${pkgname}-${pkgver}.tar.gz ghemical.desktop) -md5sums=('becf98626f0eba73f7f042bc92aa60ac' - '7e8789d42d1318a427a30f3bf64cb5a6') - -build() { - cd -- "$srcdir/$pkgname-$pkgver/" - ./configure --prefix=/usr - # Some users have reported crashes due to the courier font. - sed -i 's/courier 12/monospace/g' ./src/*.cpp - make -} - -package() { - install -D -m644 "$srcdir"/ghemical.desktop "$pkgdir"/usr/share/applications/ghemical.desktop - cd -- "$srcdir/$pkgname-$pkgver/" - make DESTDIR="$pkgdir" install -} diff --git a/community/ghemical/ghemical.desktop b/community/ghemical/ghemical.desktop deleted file mode 100644 index eff450186..000000000 --- a/community/ghemical/ghemical.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Application -Version=3.0.0 -Name=Ghemical -GenericName=Computational chemistry package -GenericName[de]=Chemisches Berechnungsprogramm -Comment=3D molecule editor and computing program -Comment[de]=3D Moleküleditor und Berechnungsprogramm -Icon=/usr/share/ghemical/3.0.0/pixmaps/ghemical.png -Exec=/usr/bin/ghemical -Terminal=false -Categories=Science;Chemistry;Education; -StartupNotify=true diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD index 1ee55cbb8..0b73f0075 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87412 2013-03-31 19:18:16Z stephane $ +# $Id: PKGBUILD 90035 2013-05-06 19:37:22Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: fana-m <geminin@gmx.net> @@ -7,7 +7,7 @@ pkgname=gigi pkgver=0.8.0 -pkgrel=19 +pkgrel=20 _fixedrevision=5780 #5407 pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)' #url='http://gigi.sourceforge.net/' diff --git a/community/gimp-dbp/PKGBUILD b/community/gimp-dbp/PKGBUILD index d41ad9b66..fca196cbc 100644 --- a/community/gimp-dbp/PKGBUILD +++ b/community/gimp-dbp/PKGBUILD @@ -4,9 +4,9 @@ pkgname=gimp-dbp pkgver=1.1.9 -pkgrel=3 +pkgrel=3.2 pkgdesc="David's batch processor for the GIMP" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://members.ozemail.com.au/~hodsond/dbp.html" license=('GPL') depends=('gimp') diff --git a/community/gimp-plugin-mathmap/PKGBUILD b/community/gimp-plugin-mathmap/PKGBUILD index ab89aab6b..5dedd42f9 100644 --- a/community/gimp-plugin-mathmap/PKGBUILD +++ b/community/gimp-plugin-mathmap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63584 2012-02-05 11:58:06Z ibiru $ +# $Id: PKGBUILD 90036 2013-05-06 19:37:24Z foutrelis $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Serge Gielkens <gielkens.serge@mumeli.org> pkgname=gimp-plugin-mathmap pkgver=1.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae" arch=('i686' 'x86_64' 'mips64el') url="http://www.complang.tuwien.ac.at/schani/mathmap/" diff --git a/community/gimp-ufraw/PKGBUILD b/community/gimp-ufraw/PKGBUILD index d49c47cfa..5adf7b8b2 100644 --- a/community/gimp-ufraw/PKGBUILD +++ b/community/gimp-ufraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86296 2013-03-14 20:51:33Z arodseth $ +# $Id: PKGBUILD 90037 2013-05-06 19:37:26Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Martin Sugioarto <nakal@web.de> pkgname=gimp-ufraw pkgver=0.19 -pkgrel=1 +pkgrel=2 pkgdesc='Converter for raw files; utility and GIMP plugin' url='http://ufraw.sourceforge.net/' arch=('x86_64' 'i686') diff --git a/community/gliv/PKGBUILD b/community/gliv/PKGBUILD index d46a77e9e..be89c14c2 100644 --- a/community/gliv/PKGBUILD +++ b/community/gliv/PKGBUILD @@ -1,29 +1,32 @@ +# $Id: PKGBUILD 90233 2013-05-09 17:39:45Z arodseth $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com> +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=gliv pkgver=1.9.7 -pkgrel=2 -pkgdesc="OpenGL image viewer" -arch=('i686' 'x86_64' 'mips64el') -url="http://guichaz.free.fr/gliv/" +pkgrel=3 +pkgdesc='OpenGL image viewer' +arch=('x86_64' 'i686' 'mips64el') +url='http://guichaz.free.fr/gliv/' license=('GPL') depends=('gtkglext') -changelog=$pkgname.changelog -source=(http://guichaz.free.fr/gliv/files/${pkgname}-${pkgver}.tar.bz2) -md5sums=('5f0fafaf41651da8882e88b3df062d02') +changelog="$pkgname.changelog" +source=("http://guichaz.free.fr/gliv/files/$pkgname-$pkgver.tar.bz2") +sha256sums=('5be6d071927dcb371676a9e4e9e4c54e8b2f4842f04dd63727b9a5032ddbcb69') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --mandir=/usr/share/man - sed -i 's:pixmaps |:pixmaps $(datadir)/applications |:;s:vendor=gnome:vendor=gnome --dir=$(datadir)/applications:' Makefile make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 8d56c3831..2793070d7 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86093 2013-03-12 00:46:53Z cinelli $ +# $Id: PKGBUILD 90038 2013-05-06 19:37:29Z foutrelis $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=gmerlin diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index e9ef43fef..3ec328616 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88860 2013-04-24 13:40:06Z spupykin $ +# $Id: PKGBUILD 90039 2013-05-06 19:37:31Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -7,7 +7,7 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") pkgver=1.5.5.2 -pkgrel=1 +pkgrel=2 arch=("i686" "x86_64" "mips64el") url="http://gmic.sourceforge.net" license=("custom:CeCILL") diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 0eb992ba1..5d7eb3d42 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87415 2013-03-31 19:18:19Z stephane $ +# $Id: PKGBUILD 90040 2013-05-06 19:37:33Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.10 -pkgrel=7 +pkgrel=8 arch=(i686 x86_64 mips64el) url="http://www.gnu.org/software/gnash/" license=(GPL3) diff --git a/community/gnome-media/PKGBUILD b/community/gnome-media/PKGBUILD index 2b60a714d..f211ad6e4 100644 --- a/community/gnome-media/PKGBUILD +++ b/community/gnome-media/PKGBUILD @@ -6,7 +6,7 @@ pkgname=gnome-media pkgver=3.4.0 pkgrel=2 pkgdesc="Sound recorder and GStreamer 0.10 configuration tool for GNOME" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libgnome-media-profiles' 'gstreamer0.10-good-plugins' 'hicolor-icon-theme') makedepends=('intltool' 'gnome-doc-utils') diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index 66fb6f91d..80c9ff5ab 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88699 2013-04-21 22:24:06Z heftig $ +# $Id: PKGBUILD 90444 2013-05-12 12:57:54Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: uastasi <uastasi@archlinux.us> pkgname=gnote -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 pkgdesc="A note taking application." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'boost') options=('!libtool') install=gnote.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('603e2cc8782f910a5b4fdfd3588d955d59f0f4ddcd5685d1f2feadb955e0e9e6') +sha256sums=('35bb4c5c0fd94bb3e8e5b91dcfff7e376408dd95fb2468ce9e248f6738d036aa') build() { cd $pkgname-$pkgver diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD index dd375db38..f09db2909 100644 --- a/community/gnustep-back/PKGBUILD +++ b/community/gnustep-back/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 71960 2012-06-04 07:53:24Z spupykin $ +# $Id: PKGBUILD 90152 2013-05-07 13:33:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-back -pkgver=0.22.0 -pkgrel=3 +pkgver=0.23.0 +pkgrel=1 pkgdesc="The GNUstep GUI Backend" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" license=('LGPL') depends=(libgl libxmu gcc-libs freetype2 cairo) -makedepends=('gnustep-gui' 'libffi' 'gcc-objc') +makedepends=('gnustep-make' 'gnustep-base' 'gnustep-gui' 'libffi' 'gcc-objc') conflicts=('gnustep-back-svn') groups=('gnustep-core') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('6ea64404d78766f93d192ff467162f53') +md5sums=('bde6f222bc74a0ba02f57fa1908c200e') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD index a33628ea4..b537d6626 100644 --- a/community/gnustep-base/PKGBUILD +++ b/community/gnustep-base/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 70019 2012-04-28 09:24:11Z allan $ +# $Id: PKGBUILD 90154 2013-05-07 13:34:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-base -pkgver=1.24.0 -pkgrel=3.2 +pkgver=1.24.4 +pkgrel=1 pkgdesc="The GNUstep base package" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" license=("GPL" "LGPL") -depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make gnutls) +depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make gnutls icu) makedepends=(gcc-objc) conflicts=('gnustep-base-svn') groups=('gnustep-core') options=('!emptydirs' '!makeflags') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('53cd117e9f64729870e906b66d2314ba') +md5sums=('b300f3e6f9c27705226b741c8c018038') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index 0d17ce958..c9d2e18fc 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71962 2012-06-04 07:59:00Z spupykin $ +# $Id: PKGBUILD 90156 2013-05-07 13:34:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui -pkgver=0.22.0 -pkgrel=3 +pkgver=0.23.1 +pkgrel=1 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" @@ -16,13 +16,14 @@ conflicts=('gnustep-gui-svn') groups=('gnustep-core') options=('!makeflags') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('3aa3346071736206ca144ce1ce8f063f') +md5sums=('1771bdb42f27ee946b17bf60fef5eb2e') build() { cd $srcdir/$pkgname-$pkgver . /etc/profile.d/GNUstep.sh ./configure --prefix=/usr --sysconfdir=/etc/GNUstep sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h + sed -i 's|png_sizeof|sizeof|g' Source/NSBitmapImageRep+PNG.m make } diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index f2c3a085f..45d62ed28 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89827 2013-05-02 17:23:12Z arodseth $ +# $Id: PKGBUILD 90230 2013-05-09 17:13:58Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -7,8 +7,11 @@ # Contributor: Christian Himpel <chressie@gmail.com> # Contributor: Mike Rosset <mike.rosset@gmail.com> # Contributor: Daniel YC Lin <dlin.tw@gmail.com> + +# TODO: Create split packages for the crosscompilation versions as well + pkgname=go -pkgver=1.1rc1 +pkgver=1.1rc3 pkgrel=1 epoch=2 pkgdesc='Google Go compiler and tools' @@ -20,17 +23,17 @@ makedepends=('inetutils') options=('!strip') install="$pkgname.install" backup=('usr/lib/go/bin') -if [ "$CARCH" == 'x86_64' ]; then - source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" - "$pkgname.sh") - sha256sums=('fc76b716b031d8afba3f3e6bcaca410e8dbf5fb625db5def00fbaaaa960e108c' - 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') -else +#if [ "$CARCH" == 'x86_64' ]; then +# source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" +# "$pkgname.sh") +# sha256sums=('ed631dd172418488ee24f79b1aa64474b8eb959f8035c5f2ee77e6d2e467e61a' +# 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') +#else source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz" "$pkgname.sh") - sha256sums=('b4eb8d9b55ae4a78c86213fa968755163ab3a8efa3f5c9f3a472b182b9d9a52e' - 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') -fi + sha256sums=('c81fd6503ab49ad92a270a740581ad744062c195bec4df94ae9973a9f4001da9' + 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') +#fi build() { cd "$srcdir/$pkgname/src" @@ -42,12 +45,12 @@ build() { export GOARCH=arm bash make.bash - # Crosscompilation for other platforms too (including linux i686 and x86_64) - for os in linux; do # also possible: darwin freebsd windows + # Crosscompilation for various platforms (including linux) + for os in linux; do # darwin freebsd windows; do for arch in amd64 386; do - export GOOS=$os - export GOARCH=$arch - bash make.bash + export GOOS="$os" + export GOARCH="$arch" + bash make.bash --no-clean done done } @@ -55,14 +58,11 @@ build() { check() { cd "$srcdir/$pkgname" - # Only test for linux and the architecture we're on export GOOS=linux if [ "$CARCH" == 'x86_64' ]; then export GOARCH=amd64 elif [ "$CARCH" == 'i686' ]; then export GOARCH=386 - else - export GOARCH=arm fi export GOROOT="$srcdir/$pkgname" @@ -135,9 +135,6 @@ package() { rm -f $pkgdir/usr/share/go/doc/articles/wiki/get.bin install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION - - # Clean up - #rm -r "$pkgdir/usr/bin/linux_arm" } # vim:set ts=2 sw=2 et: diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index 7b8128956..6b896a69d 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,36 +1,43 @@ -#$Id: PKGBUILD 85352 2013-03-01 10:31:59Z andrea $ +#$Id: PKGBUILD 90350 2013-05-11 18:38:52Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=golangide -pkgver=17 -pkgrel=2 +pkgver=18.1 +pkgrel=1 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' license=('LGPL') arch=('x86_64' 'i686') url='https://github.com/visualfc/liteide' -depends=('go' 'libpng12' 'glib2' 'qt4' 'qjson') +depends=('go' 'libpng12' 'glib2' 'qt5-base' 'qt5-webkit') makedepends=('gendesk') options=('!strip') -_name=('Golang IDE') -# http://$pkgname.googlecode.com/files/liteidex$pkgver.linux-386-webkit.tar.bz2 -# http://$pkgname.googlecode.com/files/liteidex$pkgver.linux-amd64-webkit.tar.bz2 -source=("$pkgname.tgz::https://nodeload.github.com/visualfc/liteide/tar.gz/master" +source=("$pkgname.tgz::https://github.com/visualfc/liteide/archive/x$pkgver.zip" 'golangide.png' 'golangide.sh') -sha256sums=('88fae4a43a82ecb12739bfe6612d736fa963d8beaf30dccfb305c335929c3871' +sha256sums=('4ca6438099314789f4cd8fd3acc8016d8e32594634a6d0f130f5666dcb0a3d6c' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' - 'aa5ea27f9c3626431a9cb45e5267771a1eeff48b2e3927c0574eaef9302cfd74') + '93ef16d59054ef9b37f8781e90f7d0f83d726779d2029660dfd21e84d808bf04') +_name=('Golang IDE') -build() { +prepare() { cd "$srcdir" - msg2 'Generating .desktop file...' + gendesk -n - msg2 'Compiling...' - cd liteide-master/build + cd "$srcdir/liteide-x$pkgver/build" + head -n-3 build_linux.sh > build_linux_fixed.sh + mv build_linux_fixed.sh build_linux.sh + head -n-4 webkit_linux.sh > webkit_linux_fixed.sh + mv webkit_linux_fixed.sh webkit_linux.sh chmod +x build_linux.sh webkit_linux.sh +} + +build() { + cd "$srcdir/liteide-x$pkgver/build" + + msg2 'Compiling...' QTDIR=/usr ./build_linux.sh QTDIR=/usr ./webkit_linux.sh @@ -47,7 +54,7 @@ package() { mkdir -p "$pkgdir/usr/share/liteide" mkdir -p "$pkgdir/usr/share/doc/$pkgname" - cd "$srcdir/liteide-master/build/liteide" + cd "$srcdir/liteide-x$pkgver/build/liteide" msg2 'Packaging executables...' for binary in goastview goapi goexec godocview liteide; do @@ -55,7 +62,7 @@ package() { done install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" - cd "$srcdir/liteide-master/liteidex" + cd "$srcdir/liteide-x$pkgver/liteidex" msg2 'Packaging resources...' cp -r deploy/* "$pkgdir/usr/share/liteide" diff --git a/community/golangide/golangide.sh b/community/golangide/golangide.sh index 736727ed7..d7d0772b5 100644 --- a/community/golangide/golangide.sh +++ b/community/golangide/golangide.sh @@ -1,8 +1,7 @@ #!/bin/sh ELF=/usr/bin/liteide -# The libqjson issue has been reported upstream if [ ! -z $GOROOT -a -e $GOROOT ]; then - LD_PRELOAD=/usr/lib/libqjson.so $ELF $@ + $ELF $@ else - GOROOT=/usr/lib/go LD_PRELOAD=/usr/lib/libqjson.so $ELF $@ + GOROOT=/usr/lib/go $ELF $@ fi diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index 8c32bda92..34ef31589 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86125 2013-03-12 06:02:35Z eric $ +# $Id: PKGBUILD 90042 2013-05-06 19:37:40Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac pkgver=4288 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64' 'mips64el') url="http://gpac.sourceforge.net" @@ -36,12 +36,12 @@ mksource() { } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install-lib } diff --git a/community/gpointing-device-settings/PKGBUILD b/community/gpointing-device-settings/PKGBUILD index 65ef2fe48..7d7f27fdd 100644 --- a/community/gpointing-device-settings/PKGBUILD +++ b/community/gpointing-device-settings/PKGBUILD @@ -6,7 +6,7 @@ pkgname=gpointing-device-settings pkgver=1.5.1 pkgrel=4 pkgdesc="GUI tool for setting pointing device such as TrackPoint or Touchpad" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://live.gnome.org/GPointingDeviceSettings" depends=('gtk2' 'gconf') diff --git a/community/grace/PKGBUILD b/community/grace/PKGBUILD index 9298a82f0..d9c29ff80 100644 --- a/community/grace/PKGBUILD +++ b/community/grace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78616 2012-10-22 09:17:58Z spupykin $ +# $Id: PKGBUILD 90043 2013-05-06 19:37:42Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: damir <damir@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=grace pkgver=5.1.23 -pkgrel=1 +pkgrel=2 pkgdesc="2D plotting tool" arch=(i686 x86_64 'mips64el') url="http://plasma-gate.weizmann.ac.il/Grace/" diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD index 54107a1e3..cecd67df4 100644 --- a/community/grafx2/PKGBUILD +++ b/community/grafx2/PKGBUILD @@ -1,42 +1,42 @@ -# $Id: PKGBUILD 81107 2012-12-12 00:47:33Z eric $ +# $Id: PKGBUILD 90044 2013-05-06 19:37:44Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Simon Parzer <simon.parzer@gmail.com> - pkgname=grafx2 pkgver=2.4 -pkgrel=2 +pkgrel=3 _pkgrev=2035 pkgdesc='Pixelart-oriented painting program' -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url='http://code.google.com/p/grafx2/' license=('GPL2') install=grafx2.install depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils' 'gtk-update-icon-cache') -makedepends=('gendesk' 'setconf') +makedepends=('gendesk') options=('!emptydirs') source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.$_pkgrev-src.tgz") sha256sums=('5818caea63cd3cf3318baf01dd20f81ec61e4514443000c80a41b68ab3f17a6b') _name=('GrafX2') -_exec=('grafx2 %U') _genericname=('Drawing program') +_exec=('grafx2 %U') _mimetype=('image/bmp;image/gif;image/png;image/x-tga;image/tiff') +_categories=('Graphics;2DGraphics;RasterGraphics') build() { - cd $srcdir + cd "$srcdir" + gendesk -n - setconf $pkgname.desktop Categories 'Graphics;2DGraphics;RasterGraphics' - cd $pkgname/src + cd "$pkgname/src" make } package() { - cd $srcdir/$pkgname/src + cd "$srcdir/$pkgname/src" - make prefix=/usr DESTDIR=$pkgdir install - install -Dm644 $srcdir/$pkgname.desktop \ - $pkgdir/usr/share/applications/$pkgname.desktop - install -Dm644 $srcdir/$pkgname/doc/README.txt \ - $pkgdir/usr/share/doc/$pkgname/readme.txt + make prefix=/usr DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$srcdir/$pkgname/doc/README.txt" \ + "$pkgdir/usr/share/doc/$pkgname/readme.txt" } # vim:set ts=2 sw=2 et: diff --git a/community/gtkpod/PKGBUILD b/community/gtkpod/PKGBUILD index 795c9eeff..8727835f9 100644 --- a/community/gtkpod/PKGBUILD +++ b/community/gtkpod/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89564 2013-04-30 05:59:32Z cinelli $ +# $Id: PKGBUILD 90342 2013-05-11 16:17:24Z tomegun $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod pkgver=2.1.3 -pkgrel=3 +pkgrel=4 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD index f0da4e0fc..72eac8d2c 100644 --- a/community/guvcview/PKGBUILD +++ b/community/guvcview/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85669 2013-03-04 16:14:23Z giovanni $ +# $Id: PKGBUILD 90045 2013-05-06 19:37:46Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com> pkgname=guvcview pkgver=1.7.0 -pkgrel=1 -pkgdesc="A video viewer and capturer for the linux uvc driver" +pkgrel=2 +pkgdesc="A video viewer and capturer for the linux uvc driver" arch=('i686' 'x86_64' 'mips64el') url="http://guvcview.sourceforge.net/" license=('GPL') diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index 474997193..e1cf57db0 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 89287 2013-04-28 16:52:08Z td123 $ +# $Id: PKGBUILD 90316 2013-05-11 13:01:51Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haddock -pkgver=2.13.1 -pkgrel=4 +pkgver=2.13.2 +pkgrel=1 pkgdesc='Tool for generating documentation for Haskell libraries' url='http://hackage.haskell.org/package/haddock/' license=('custom:BSD3') arch=('x86_64' 'i686' 'mips64el') makedepends=('alex' 'happy') depends=('ghc=7.6.3-1' 'haskell-xhtml=3000.2.1' 'haskell-ghc-paths') -install=$pkgname.install +install="$pkgname.install" source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('6e5e2295cd191e43a046c12544f2f4e8b4260cfda8282d48b15a7a35d8a24e7f') +sha256sums=('25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/haskell-highlighting-kate/PKGBUILD b/community/haskell-highlighting-kate/PKGBUILD index b4050abd1..1a3c0b7d1 100644 --- a/community/haskell-highlighting-kate/PKGBUILD +++ b/community/haskell-highlighting-kate/PKGBUILD @@ -4,8 +4,8 @@ _hkgname=highlighting-kate pkgname=haskell-highlighting-kate -pkgver=0.5.3.8 -pkgrel=2 +pkgver=0.5.3.9 +pkgrel=1 pkgdesc="Syntax highlighting" url="http://hackage.haskell.org/package/$_hkgname" license=('GPL') @@ -14,10 +14,10 @@ makedepends=('ghc') depends=('haskell-blaze-html>=0.4.2' 'haskell-containers' 'haskell-filepath' 'haskell-mtl' 'haskell-parsec' 'haskell-pcre-light') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=$pkgname.install -md5sums=('c3fdfadddfdf198af6192b9bf437a422') +md5sums=('fa274eb5d1f7002b16a312693ad9eef0') build() { - cd "$srcdir/$_hkgname-$pkgver" + cd $_hkgname-$pkgver runhaskell Setup configure -O --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build @@ -28,7 +28,7 @@ build() { } package() { - cd "$srcdir/$_hkgname-$pkgver" + cd $_hkgname-$pkgver install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" diff --git a/community/haskell-pandoc/PKGBUILD b/community/haskell-pandoc/PKGBUILD index 31f7f6a59..6f8310913 100644 --- a/community/haskell-pandoc/PKGBUILD +++ b/community/haskell-pandoc/PKGBUILD @@ -5,7 +5,7 @@ _hkgname=pandoc pkgname=haskell-pandoc pkgver=1.11.1 -pkgrel=2 +pkgrel=5 pkgdesc="Conversion between markup formats" url="http://hackage.haskell.org/package/${_hkgname}" license=('GPL') @@ -17,21 +17,21 @@ install=$pkgname.install md5sums=('e895b22745affba37c0ba5e6e6d0f17c') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd $_hkgname-$pkgver + runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh - install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh - install -d -m755 $pkgdir/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/$pkgname/html $pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=$pkgdir + cd $_hkgname-$pkgver + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" + runhaskell Setup copy --destdir="$pkgdir" } diff --git a/community/haskell-texmath/PKGBUILD b/community/haskell-texmath/PKGBUILD index 50d844037..012e2345c 100644 --- a/community/haskell-texmath/PKGBUILD +++ b/community/haskell-texmath/PKGBUILD @@ -4,8 +4,8 @@ pkgname=haskell-texmath _hkgname=texmath -pkgver=0.6.1.3 -pkgrel=2 +pkgver=0.6.1.5 +pkgrel=1 pkgdesc="Conversion of LaTeX math formulas to MathML." url="https://github.com/jgm/texmath" license=("GPL") @@ -14,7 +14,7 @@ makedepends=('ghc') depends=(haskell-containers haskell-parsec haskell-syb haskell-xml) source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz") install=$pkgname.install -md5sums=('6737a06392f51886e8b1ca8aa6dc2168') +md5sums=('4600cec39f3592a65e5f665df97f56ac') build() { cd "$srcdir/$_hkgname-$pkgver" diff --git a/community/hatari/PKGBUILD b/community/hatari/PKGBUILD index 41f3358d0..68d56ef68 100644 --- a/community/hatari/PKGBUILD +++ b/community/hatari/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72892 2012-06-24 13:57:15Z lcarlier $ +# $Id: PKGBUILD 90046 2013-05-06 19:37:48Z foutrelis $ # Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=hatari pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc='An Atari ST and STE emulator' arch=('i686' 'x86_64' 'mips64el') url='http://hatari.sourceforge.net/' diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD index a0ebc3229..8992e61ee 100644 --- a/community/haveged/PKGBUILD +++ b/community/haveged/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86268 2013-03-14 14:36:13Z bpiotrowski $ +# $Id: PKGBUILD 90384 2013-05-12 06:27:41Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: kfgz <kfgz at interia dot pl> # Contributor: pootzko <pootzko at gmail dot com> @@ -6,26 +6,27 @@ pkgname=haveged pkgver=1.7.a _pkgver=${pkgver/.a/a} -pkgrel=1 +pkgrel=2 pkgdesc='Entropy harvesting daemon using CPU timings' arch=('i686' 'x86_64' 'mips64el') url='http://www.issihosts.com/haveged' license=('GPL') depends=('glibc') +options=('!libtool') source=($url/$pkgname-$_pkgver.tar.gz service) sha256sums=('8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051' - '85aed005b7d0d0bae74f7fc0ca70907a6f67ddbcb2df77ca004f9a919028564a') + 'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12') build() { - cd $srcdir/$pkgname-$_pkgver - ./configure --prefix=/usr + cd $pkgname-$_pkgver + ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin make } package() { - cd $srcdir/$pkgname-$_pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$_pkgver + make DESTDIR="$pkgdir" install rm -rf $pkgdir/etc/init.d install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/haveged.service diff --git a/community/haveged/haveged-1.7-build.patch b/community/haveged/haveged-1.7-build.patch deleted file mode 100644 index c32d1927e..000000000 --- a/community/haveged/haveged-1.7-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: haveged-1.7/src/Makefile.am -=================================================================== ---- haveged-1.7.orig/src/Makefile.am -+++ haveged-1.7/src/Makefile.am -@@ -27,7 +27,7 @@ pkginclude_HEADERS = havege.h - - haveged_SOURCES = haveged.c haveged.h - --haveged_LDADD = @HA_LDFLAGS@ $(top_builddir)/src/libhavege.la -+haveged_LDADD = @HA_LDFLAGS@ libhavege.la - ##libtool_end## - - MAINTAINERCLEANFILES = Makefile.in diff --git a/community/haveged/service b/community/haveged/service index 6803a0dec..676fb1893 100644 --- a/community/haveged/service +++ b/community/haveged/service @@ -4,7 +4,7 @@ Documentation=man:haveged(8) [Service] Type=forking -ExecStart=/usr/sbin/haveged -w 1024 -v 1 +ExecStart=/usr/bin/haveged -w 1024 -v 1 PIDFile=/var/run/haveged.pid [Install] diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 95316307e..0b3d9b433 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89332 2013-04-28 16:53:03Z td123 $ +# $Id: PKGBUILD 90047 2013-05-06 19:37:52Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.18 -pkgrel=7 +pkgrel=8 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index b7fd947a8..e77b1f51d 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81882 2013-01-03 03:41:12Z fyan $ +# $Id: PKGBUILD 90320 2013-05-11 14:52:54Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc='Japanese input method Anthy IMEngine for IBus Framework' arch=('i686' 'x86_64' 'mips64el') @@ -34,4 +34,4 @@ package() { make DESTDIR=$pkgdir/ install } -md5sums=('4ff000bec3c342f5cd5a6d9e05a4abdf') +sha512sums=('ba5456d4b16c168ff90945c948109bd3bb9d64c145ae746a471789ef74a1e657a9f891e198ecf64b733c03880f81a28cc9cd2c1fa82ad006eb0ac6e7e5c2c3a5') diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD index ef36434f7..982f52d35 100644 --- a/community/ibus-rime/PKGBUILD +++ b/community/ibus-rime/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 83942 2013-02-07 09:33:33Z fyan $ +# $Id: PKGBUILD 90137 2013-05-07 05:26:33Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=ibus-rime -pkgver=0.9.8 +pkgver=0.9.9 pkgrel=1 pkgdesc="Rime input method engine for ibus" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/rimeime/" license=('GPL3') -depends=('ibus' 'libnotify' 'librime>=0.9.8' 'brise') +depends=('ibus' 'libnotify' 'librime>=0.9.9' 'brise') makedepends=('cmake') install='ibus-rime.install' source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('813148d4ddc9b14fe099d12a99befe63') +sha512sums=('b18e6f3ba6c97e3b55900d9c4cb70d58f24b202bf2ae894ca861af10ddb028c193d9ac97e609f3b4f0f183b212b74180a02e5d823f235b4c799733933a48afb7') diff --git a/community/icoutils/PKGBUILD b/community/icoutils/PKGBUILD index 2ebfec26b..db000c6bf 100644 --- a/community/icoutils/PKGBUILD +++ b/community/icoutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76157 2012-09-12 10:41:13Z spupykin $ +# $Id: PKGBUILD 90048 2013-05-06 19:37:55Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: neodreams <yanbrodeur@videotron.ca> @@ -6,7 +6,7 @@ pkgname=icoutils pkgver=0.30.0 -pkgrel=1 +pkgrel=2 pkgdesc='Extracts and converts images in MS Windows(R) icon and cursor files.' arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD index ce3e41ec8..7f9a651de 100644 --- a/community/ifuse/PKGBUILD +++ b/community/ifuse/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86105 2013-03-12 01:35:28Z cinelli $ +# $Id: PKGBUILD 90343 2013-05-11 16:17:25Z tomegun $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=ifuse pkgver=1.1.2 -pkgrel=3 +pkgrel=4 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' url='http://libimobiledevice.org/' arch=('i686' 'x86_64' 'mips64el') diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index c4361a3da..148ec1a7d 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88370 2013-04-16 20:03:40Z seblu $ +# $Id: PKGBUILD 90287 2013-05-10 23:18:07Z seblu $ # Maintainer: Sébastien Luttringer pkgname=ipset -pkgver=6.18 +pkgver=6.19 pkgrel=1 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +12,9 @@ depends=('libmnl' 'bash') backup=("etc/$pkgname.conf") options=('!libtool') source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" - "$pkgname.systemd" "$pkgname.service") -md5sums=('776de6afe32ae386e6827a51c025464f' - '7daa4f163eef9db216cb4c428e0342a3' - 'b032241b96b5802975fe4321cc511c6b') +md5sums=('cabba1bd63a93f6e1c3db3fb22412b64' + 'f74642f7bb88056103c63a62a91c782c') build() { cd $pkgname-$pkgver @@ -34,8 +32,6 @@ package() { install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc" popd # systemd - install -Dm 755 $pkgname.systemd \ - "$pkgdir/usr/lib/systemd/scripts/$pkgname" install -Dm 644 $pkgname.service \ "$pkgdir/usr/lib/systemd/system/$pkgname.service" # default config file diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service index 8c4889d3c..1af453668 100644 --- a/community/ipset/ipset.service +++ b/community/ipset/ipset.service @@ -1,12 +1,12 @@ [Unit] -Description=IP Sets +Description=Loading IP Sets Before=iptables.service [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/lib/systemd/scripts/ipset start -ExecStop=/usr/lib/systemd/scripts/ipset stop +ExecStart=/usr/sbin/ipset -f /etc/ipset.conf restore +ExecStop=/usr/sbin/ipset destroy [Install] WantedBy=multi-user.target diff --git a/community/ipset/ipset.systemd b/community/ipset/ipset.systemd deleted file mode 100644 index c28086322..000000000 --- a/community/ipset/ipset.systemd +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -CONFIG_FILE='/etc/ipset.conf' - -case $1 in - start) - ipset restore < "$CONFIG_FILE" - ;; - stop) - ipset destroy - ;; - save) - ipset save > "$CONFIG_FILE" - ;; - *) - echo "usage: ${0##*/} {start|stop|save}" >&2 - exit 1 - ;; -esac - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/jbig2dec/PKGBUILD b/community/jbig2dec/PKGBUILD index 32432afb0..eb7a8b8e2 100644 --- a/community/jbig2dec/PKGBUILD +++ b/community/jbig2dec/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 73320 2012-07-06 13:34:39Z spupykin $ +# $Id: PKGBUILD 90049 2013-05-06 19:37:57Z foutrelis $ # Maintainer: Bartłomiej Piotrowski # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=jbig2dec pkgver=0.11 -pkgrel=5 +pkgrel=6 pkgdesc="decoder implementation of the JBIG2 image compression format" arch=('x86_64' 'i686' 'mips64el') url="http://jbig2dec.sourceforge.net/" license=('GPL3') depends=('glibc' 'libpng') -source=(http://ghostscript.com/~giles/jbig2/$pkgname/$pkgname-$pkgver.tar.gz +options=('!libtool') +source=(https://github.com/rillian/jbig2dec/archive/$pkgver.tar.gz $pkgname-$pkgver-libpng15.patch) -md5sums=('1f61e144852c86563fee6e5ddced63f1' - '6d80db1f3a5581a5e38234b9ed599b20') +sha256sums=('8af7b94b6026aff718d4b41ad990f2702f8fd4a348d565c4b48a695988ca0e9a' + 'ed871abd9419dbf35ba7f38d4835098d3838fd9400856ac4ec029e63bb42d859') +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i "$srcdir"/$pkgname-$pkgver-libpng15.patch + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac +} build() { - cd "$srcdir"/$pkgname-$pkgver - patch -Np0 -i "$srcdir"/$pkgname-$pkgver-libpng15.patch - autoreconf -fi - ./configure --prefix=/usr + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr make } package() { - cd "$srcdir"/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR="$pkgdir/" install } diff --git a/community/jwm/PKGBUILD b/community/jwm/PKGBUILD index 28e0c4aca..972707a20 100644 --- a/community/jwm/PKGBUILD +++ b/community/jwm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63634 2012-02-05 12:02:20Z ibiru $ +# $Id: PKGBUILD 90050 2013-05-06 19:37:59Z foutrelis $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=jwm pkgver=2.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A lightweight window manager for the X11 Window System" arch=('i686' 'x86_64' 'mips64el') url="http://joewing.net/programs/jwm/" diff --git a/community/kdbg/PKGBUILD b/community/kdbg/PKGBUILD index 3b75b9788..1aba9c568 100644 --- a/community/kdbg/PKGBUILD +++ b/community/kdbg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88516 2013-04-19 10:30:24Z spupykin $ +# $Id: PKGBUILD 89959 2013-05-06 10:40:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Jason Taylor <jftaylor21@gmail.com> @@ -6,13 +6,13 @@ pkgname=kdbg pkgver=2.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="A gdb GUI for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdbg.org" license=('GPL') depends=('kdebase-runtime' 'gdb') -makedepends=('automoc4' 'cmake') +makedepends=('automoc4' 'cmake' 'optipng') options=('!libtool') source=("http://downloads.sourceforge.net/project/kdbg/Source%20Code/$pkgver/kdbg-$pkgver.tar.gz") md5sums=('345183d07eb11a9c841d3dc34b734613') @@ -23,6 +23,7 @@ build() { cd build cmake ../${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr make + find -name '*.png' -exec optipng -quiet -force -fix {} \; } package() { diff --git a/community/kde-gtk-config/PKGBUILD b/community/kde-gtk-config/PKGBUILD index 88840a813..44e8fbd74 100644 --- a/community/kde-gtk-config/PKGBUILD +++ b/community/kde-gtk-config/PKGBUILD @@ -6,7 +6,7 @@ pkgname=kde-gtk-config pkgver=2.2.1 pkgrel=1 pkgdesc="GTK2 and GTK3 Configurator for KDE" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/kde-gtk-config" license=('GPL3') depends=('kdelibs') diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD index 61c8d359b..d51c05a25 100644 --- a/community/keepassx/PKGBUILD +++ b/community/keepassx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86727 2013-03-21 15:05:26Z spupykin $ +# $Id: PKGBUILD 89961 2013-05-06 10:41:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Greg Bouzakis <gregbouzakis@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,12 +6,13 @@ pkgname=keepassx pkgver=0.4.3 -pkgrel=4.1 +pkgrel=5 pkgdesc='Password manager' arch=('i686' 'x86_64' 'mips64el') url='http://www.keepassx.org' license=('GPL2') depends=('libxtst' 'qt4' 'shared-mime-info') +makedepends=('optipng') install=keepassx.install source=(http://downloads.sourceforge.net/keepassx/$pkgname-$pkgver.tar.gz) md5sums=('1df67bb22b2e08df49f09e61d156f508') @@ -21,6 +22,7 @@ build() { sed -i '1,1i#include <unistd.h>' src/lib/random.cpp qmake-qt4 make + find -name '*.png' -exec optipng -quiet -force -fix {} \; } package() { diff --git a/community/kovpn/PKGBUILD b/community/kovpn/PKGBUILD index 20b76bfc4..ddf9128d6 100644 --- a/community/kovpn/PKGBUILD +++ b/community/kovpn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63636 2012-02-05 12:02:32Z ibiru $ +# $Id: PKGBUILD 90051 2013-05-06 19:38:01Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> pkgname=kovpn pkgver=0.3pre7 _pkgver=0.3.pre7 -pkgrel=6 +pkgrel=7 pkgdesc="An OpenVPN client management interface for KDE" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=37043" @@ -26,14 +26,18 @@ build() { cd $srcdir/$pkgname-$_pkgver unset LDFLAGS - . /etc/profile.d/qt3.sh - export PATH=$QTDIR/bin:$PATH - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + export QTDIR=/usr + export QMAKESPEC=/usr/share/qt3/mkspecs/linux-g++ patch -Np1 -i ../kovpn-disable-dcop.patch - sed -i 's#automake\*1.10\*#automake*1.10* | automake*1.11*#' admin/cvs.sh + sed -i "s#automake\*1.10\*#automake*`pacman -Q automake | cut -f2 -d\ |cut -f1-2 -d.`*#" admin/cvs.sh + sed -i 's#AM_CONFIG_HEADER#AC_CONFIG_HEADER#g' admin/{cvs.sh,configure.in.min} make -f admin/Makefile.common cvs ./configure --prefix=/opt/kde --without-arts --with-qt-dir=/opt/qt make +} + +package() { + cd $srcdir/$pkgname-$_pkgver make prefix=$pkgdir/usr install } diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD index 2c532795a..382994257 100644 --- a/community/kvpnc/PKGBUILD +++ b/community/kvpnc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 65616 2012-02-21 09:46:17Z spupykin $ +# $Id: PKGBUILD 89963 2013-05-06 10:41:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Danial Olsen <do@meyl.fo> pkgname=kvpnc pkgver=0.9.6a -pkgrel=2 +pkgrel=3 pkgdesc="A KDE Desktop Environment frontend for various vpn clients" arch=(i686 x86_64 'mips64el') url="http://home.gna.org/kvpnc/" license=("GPL") depends=('kdelibs' 'hicolor-icon-theme') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'optipng') install=kvpnc.install source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2 kvpnc-0.9.6a-scriptsec.patch @@ -20,17 +20,17 @@ md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7' '9725f5a005dca1e3d1cba86a8e52360a') build() { - export LDFLAGS=-lX11 - cd $srcdir/$pkgname-$pkgver-kde4 - patch -Np1 -i ${srcdir}/kvpnc-0.9.6a-scriptsec.patch - patch -Np1 -i ${srcdir}/kvpnc-0.9.6a-gcc47.patch cd $srcdir + sed -i '1,1i#include <unistd.h>' ${pkgname}-${pkgver}-kde4/src/kvpnc.cpp + + export LDFLAGS=-lX11 mkdir build cd build cmake ../${pkgname}-${pkgver}-kde4 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make + find -name '*.png' -exec optipng -quiet -force -fix {} \; } package() { diff --git a/community/kyotocabinet/PKGBUILD b/community/kyotocabinet/PKGBUILD index 73d936f2e..bf2381288 100644 --- a/community/kyotocabinet/PKGBUILD +++ b/community/kyotocabinet/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 85954 2013-03-10 07:13:55Z fyan $ +# $Id: PKGBUILD 90164 2013-05-07 16:07:18Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Alexander Duscheleit <jinks@archlinux.us> # Contributor: Joaquim Pedro (osmano807) <osmano807@gmail.com> pkgname=kyotocabinet pkgver=1.2.76 -pkgrel=2 +pkgrel=3 pkgdesc="a modern implementation of DBM in C++" arch=('i686' 'x86_64' 'mips64el') url="http://fallabs.com/kyotocabinet" license=('LGPL3') -makedepends=('gcc>=3.1' 'make' 'pkgconfig' 'zlib') +makedepends=('gcc' 'make' 'pkgconfig' 'zlib') depends=('zlib' 'gcc-libs') source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz") build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-opt make } @@ -26,4 +26,5 @@ package() { make install DESTDIR="$pkgdir/" } + sha512sums=('278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a') diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD index 8c2dd5d96..28385b75b 100644 --- a/community/leptonica/PKGBUILD +++ b/community/leptonica/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87567 2013-04-03 09:46:00Z spupykin $ +# $Id: PKGBUILD 90052 2013-05-06 19:38:03Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christoph Drexler <chrdr at gmx dot at> pkgname=leptonica pkgver=1.69 -pkgrel=6 +pkgrel=7 pkgdesc="Software that is broadly useful for image processing and image analysis applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.leptonica.com/" diff --git a/community/libdom/PKGBUILD b/community/libdom/PKGBUILD index 0ee76677c..60ff3e123 100644 --- a/community/libdom/PKGBUILD +++ b/community/libdom/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libdom pkgver=0.0.1 pkgrel=1 pkgdesc='Implementation of the W3C DOM' -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url='http://www.netsurf-browser.org/projects/libdom/' license=('MIT') depends=('hubbub>=0.2.0' 'libwapcaplet>=0.2.0' 'expat') diff --git a/community/libghemical/PKGBUILD b/community/libghemical/PKGBUILD deleted file mode 100644 index c94b7e300..000000000 --- a/community/libghemical/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Xyne <ac xunilhcra enyx, backwards> -# Contributor: Abhishek Dasgupta <abhidg@gmail.com> - -pkgname=libghemical -pkgver=3.0.0 -pkgrel=1 -pkgdesc="Library containing computational chemistry facility of ghemical" -license=("GPL") -arch=(i686 x86_64 'mips64el') -url="http://bioinformatics.org/ghemical/libghemical/" -depends=('gcc-libs') -makedepends=('openbabel' 'intltool>=0.40.0') -options=(!libtool) -source=(http://bioinformatics.org/ghemical/download/release20111012/${pkgname}-${pkgver}.tar.gz) -md5sums=('1d5c9c19bb119470d2bb41a7e681eafd') - -build() { - cd -- "$srcdir/$pkgname-$pkgver/" - ./configure --prefix=/usr --enable-openbabel - make -} - -package() { - cd -- "$srcdir/$pkgname-$pkgver/" - make DESTDIR="$pkgdir" install -} diff --git a/community/libgnome-media-profiles/PKGBUILD b/community/libgnome-media-profiles/PKGBUILD index 6fc7c2a8f..ca269f05d 100644 --- a/community/libgnome-media-profiles/PKGBUILD +++ b/community/libgnome-media-profiles/PKGBUILD @@ -6,7 +6,7 @@ pkgname=libgnome-media-profiles pkgver=3.0.0 pkgrel=4 pkgdesc="Library for management of audio recording profiles" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://git.gnome.org/browse/libgnome-media-profiles" license=('GPL2') depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins') diff --git a/community/libharu/PKGBUILD b/community/libharu/PKGBUILD index 6100ef2aa..9f3105118 100644 --- a/community/libharu/PKGBUILD +++ b/community/libharu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66215 2012-02-23 03:29:40Z spupykin $ +# $Id: PKGBUILD 90053 2013-05-06 19:38:05Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : SpepS <dreamspepser at yahoo dot it> # Contributor: Auguste <auguste@gmail.com> @@ -6,7 +6,7 @@ pkgname=libharu pkgver=2.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="C/C++ library for generating PDF documents" url="http://libharu.org/wiki/Main_Page" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD index 2bb4f119a..587889d00 100644 --- a/community/libmatchbox/PKGBUILD +++ b/community/libmatchbox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88317 2013-04-16 13:28:36Z spupykin $ +# $Id: PKGBUILD 90054 2013-05-06 19:38:07Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> pkgname=libmatchbox pkgver=1.10 -pkgrel=1 +pkgrel=2 pkgdesc="Base library for Matchbox WM" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/community/libmusicbrainz4/PKGBUILD b/community/libmusicbrainz4/PKGBUILD index 5369830fe..56469a900 100644 --- a/community/libmusicbrainz4/PKGBUILD +++ b/community/libmusicbrainz4/PKGBUILD @@ -5,9 +5,9 @@ pkgname=libmusicbrainz4 pkgver=4.0.3 -pkgrel=1 +pkgrel=1.1 pkgdesc="Library That Provides Access to the MusicBrainz Server" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://musicbrainz.org/" license=('LGPL2.1') depends=('neon') diff --git a/community/liboglappth/PKGBUILD b/community/liboglappth/PKGBUILD deleted file mode 100644 index fd9809fb2..000000000 --- a/community/liboglappth/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Xyne <ac xunilhcra enyx, backwards> -# Contributor: Abhishek Dasgupta <abhidg@gmail.com> - -pkgname=liboglappth -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Library containing computational chemistry facility of ghemical" -license=("GPL") -arch=('i686' 'x86_64' 'mips64el') -url="http://bioinformatics.org/ghemical/libghemical/" -depends=('gcc-libs') -makedepends=('mesa') -options=(!libtool) -source=(http://bioinformatics.org/ghemical/download/release20111012/${pkgname}-${pkgver}.tar.gz) -md5sums=('48261e5f4cf99e113fb22e524f0b1eeb') - -build() { - cd -- "$srcdir/$pkgname-$pkgver/" - ./configure --prefix=/usr --enable-openbabel - make -} - -package() { - cd -- "$srcdir/$pkgname-$pkgver/" - make DESTDIR="$pkgdir" install -} diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD index 9e9f3822d..68f7eb69d 100644 --- a/community/librime/PKGBUILD +++ b/community/librime/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 87418 2013-03-31 19:18:22Z stephane $ +# $Id: PKGBUILD 90135 2013-05-07 05:26:30Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=librime -pkgver=0.9.8 +pkgver=0.9.9 pkgrel=2 pkgdesc="Rime input method engine" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/rimeime/" license=('GPL3') -depends=('boost' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp') +depends=('boost' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp>=0.5') optdepends=('brise: Rime schema repository') makedepends=('cmake') source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('2ef61458bd5b08652ae0ca190af072ba') +md5sums=('bd705cd3e4c7ab6e47d983b07044769f') diff --git a/community/libseccomp/PKGBUILD b/community/libseccomp/PKGBUILD new file mode 100644 index 000000000..9bdaee4fc --- /dev/null +++ b/community/libseccomp/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws> + +pkgname=libseccomp +pkgver=2.0.0 +pkgrel=2 +pkgdesc='Enhanced seccomp library' +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://sourceforge.net/projects/libseccomp/" +depends=('glibc') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('f988feac6a3425f2c918f32b28df1caa') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD new file mode 100755 index 000000000..9830537de --- /dev/null +++ b/community/lightdm-gtk2-greeter/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 90483 2013-05-12 21:57:46Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: Padfoot <padfoot@exemail.com.au> + +pkgname=lightdm-gtk2-greeter +pkgver=1.5.1 +pkgrel=2 +epoch=1 +pkgdesc="GTK+ greeter for LightDM" +arch=('i686' 'x86_64') +url="https://launchpad.net/lightdm-gtk-greeter" +license=('GPL3' 'LGPL3') +depends=('gtk2' 'lightdm') +makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool') +provides=("${pkgname/2/}") +backup=('etc/lightdm/lightdm-gtk-greeter.conf') +source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz") +sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621') + +build() { + cd "${srcdir}"/${pkgname/2/}-${pkgver} + + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static --with-gtk2 + make +} + +package() { + cd "${srcdir}"/${pkgname/2/}-${pkgver} + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD index 325e46415..caf7451c8 100755 --- a/community/lightdm-gtk3-greeter/PKGBUILD +++ b/community/lightdm-gtk3-greeter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86256 2013-03-14 11:39:30Z alucryd $ +# $Id: PKGBUILD 90482 2013-05-12 21:57:34Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk3-greeter -pkgver=1.3.1 -pkgrel=1 +pkgver=1.5.1 +pkgrel=2 epoch=1 pkgdesc="GTK+ greeter for LightDM" arch=('i686' 'x86_64' 'mips64el') @@ -14,21 +14,19 @@ depends=('gtk3' 'lightdm') makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool') provides=("${pkgname/3/}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') -source=("https://launchpad.net/${pkgname/3/}/1.4/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz") -sha256sums=('a384b6413a52e6c6aeaf3242b2420e857ad7e2e4e5bec47da663e67076c0ee87') +source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz") +sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621') build() { cd "${srcdir}"/${pkgname/3/}-${pkgver} -# Build - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static make } package() { cd "${srcdir}"/${pkgname/3/}-${pkgver} -# Install make DESTDIR="${pkgdir}" install } diff --git a/community/lightdm-kde-greeter/PKGBUILD b/community/lightdm-kde-greeter/PKGBUILD index 2922226ef..aea2722d5 100755 --- a/community/lightdm-kde-greeter/PKGBUILD +++ b/community/lightdm-kde-greeter/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88435 2013-04-17 15:31:11Z alucryd $ +# $Id: PKGBUILD 90484 2013-05-12 21:57:59Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Mladen Pejakovic <pejakm@gmail.com> @@ -6,12 +6,12 @@ pkgname=lightdm-kde-greeter pkgver=0.3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE greeter for LightDM" arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/projects/playground/base/lightdm" license=('GPL') -depends=('kdelibs' 'liblightdm-qt4') +depends=('kdebase-runtime' 'liblightdm-qt4') makedepends=('cmake' 'automoc4') backup=('etc/lightdm/lightdm-kde-greeter.conf' 'etc/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf') @@ -36,6 +36,7 @@ package() { cd "${srcdir}"/lightdm-${pkgver}/build make DESTDIR="${pkgdir}" install + mv "${pkgdir}"/usr/{sbin,bin} install -dm 755 "${pkgdir}"/etc/lightdm install -m 644 ../../lightdm-kde-greeter.conf "${pkgdir}"/etc/lightdm/lightdm-kde-greeter.conf } diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index cf3540412..d84b86994 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88301 2013-04-16 08:19:06Z alucryd $ +# $Id: PKGBUILD 90481 2013-05-12 21:56:51Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') pkgver=1.6.0 -pkgrel=1 +pkgrel=3 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgv 'lightdm-lock-screen-before-switch.patch' 'xsession') sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419' - '2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125' + '3daf2f7e1b751415eab9b2aa92d78d8e00c3447a77fa31f7e75863136286a86f' 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a' @@ -44,7 +44,7 @@ prepare() { build() { cd "${srcdir}"/${pkgbase}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${pkgbase} --with-greeter-user=lightdm --with-greeter-session=lightdm-gtk-greeter --disable-{static,tests} + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${pkgbase} --with-greeter-user=lightdm --with-greeter-session=lightdm-gtk-greeter --disable-{static,tests} make } diff --git a/community/lightdm/lightdm.service b/community/lightdm/lightdm.service index 7eb46ceba..a5556c7ca 100755 --- a/community/lightdm/lightdm.service +++ b/community/lightdm/lightdm.service @@ -4,7 +4,7 @@ Documentation=man:lightdm(1) After=systemd-user-sessions.service [Service] -ExecStart=/usr/sbin/lightdm +ExecStart=/usr/bin/lightdm StandardOutput=syslog Restart=always IgnoreSIGPIPE=no diff --git a/community/lksctp-tools/0001-Modernize-autotools.patch b/community/lksctp-tools/0001-Modernize-autotools.patch deleted file mode 100644 index 2fa0b23c6..000000000 --- a/community/lksctp-tools/0001-Modernize-autotools.patch +++ /dev/null @@ -1,257 +0,0 @@ -From 6812d5ed157869d466058ad7383e1a94c3ead65c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu@seblu.net> -Date: Thu, 24 Jan 2013 12:41:49 +0100 -Subject: [PATCH] Modernize autotools -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Allow compilation with last version of autotools -- libtool 2.4.2 -- m4 1.4.16 -- autoconf 2.69 -- automake 1.13.1 -- make 3.82 - -Signed-off-by: Sébastien Luttringer <seblu@seblu.net> ---- - Makefile.am | 2 ++ - configure.ac | 75 ++++++++++++++++++++++++++++++++++++++++++++++ - configure.in | 74 --------------------------------------------- - src/apps/Makefile.am | 2 +- - src/func_tests/Makefile.am | 2 +- - src/lib/Makefile.am | 2 +- - src/testlib/Makefile.am | 2 +- - 7 files changed, 81 insertions(+), 78 deletions(-) - create mode 100644 configure.ac - delete mode 100644 configure.in - -diff --git a/Makefile.am b/Makefile.am -index 109f01d..2c9c8c6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,6 +12,8 @@ EXTRA_DIST += ChangeLog AUTHORS COPYING COPYING.lib INSTALL \ - # bin or src products may be required to generate stuff in test/ - SUBDIRS = man bin src doc - -+ACLOCAL_AMFLAGS=-I m4 -+ - # Libtool support - LIBTOOL_DEPS = @LIBTOOL_DEPS@ - libtool: $(LIBTOOL_DEPS) -diff --git a/configure.ac b/configure.ac -new file mode 100644 -index 0000000..9af138b ---- /dev/null -+++ b/configure.ac -@@ -0,0 +1,75 @@ -+dnl -*-autoconf-*- -+ -+dnl lksctp-tools: Autoconf script -+dnl -+dnl $Id: configure.in,v 1.1.1.2 2002/08/06 23:55:45 inaky Exp $ -+ -+dnl (C) 2002 Intel Corporation -+dnl Iaky Prez-Gonzlez <inaky.perez-gonzalez@intel.com> -+dnl - Initial packaging -+ -+dnl Package info -+dnl (CONFIG_AUX_DIR is for putting stuff in $TOPSRCDIR/bin, so we -+dnl reduce clutter in the root; if we put it below AM_INIT_AUTOMAKE, -+dnl configure will fail ...) -+ -+AC_INIT([lksctp-tools], [1.0.13]) -+AC_CONFIG_AUX_DIR(bin) -+AC_CONFIG_SRCDIR([src/apps/sctp_darn.c]) -+AC_CONFIG_HEADERS([config.h]) -+AC_CONFIG_MACRO_DIR([m4]) -+AC_REVISION($Revision: 1.1.1.2 $) -+AM_INIT_AUTOMAKE -+AM_SILENT_RULES([yes]) -+ -+dnl Set defaults -+dnl CFLAGS="$CFLAGS -g -Wall" -+ -+dnl Checks for programs. -+AC_PROG_AWK -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+AC_ISC_POSIX -+ -+dnl Checks for libraries. -+AC_LIBTOOL_DLOPEN -+AC_PROG_LIBTOOL -+AC_SUBST(LIBTOOL_DEPS) -+ -+dnl Checks for header files. -+AC_HEADER_STDC -+AC_HEADER_SYS_WAIT -+AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h]) -+ -+dnl Checks for typedefs, structures, and compiler characteristics. -+AC_C_CONST -+AC_C_INLINE -+AC_TYPE_SIZE_T -+AC_HEADER_TIME -+AC_STRUCT_TM -+AC_C_VOLATILE -+ -+# Checks for library functions. -+AC_FUNC_MALLOC -+AC_FUNC_MEMCMP -+AC_FUNC_REALLOC -+AC_FUNC_SELECT_ARGTYPES -+AC_FUNC_SETVBUF_REVERSED -+AC_FUNC_VPRINTF -+AC_CHECK_FUNCS([bzero gethostbyname gettimeofday memmove memset select socket strchr strerror strtol strtoul]) -+ -+AC_CONFIG_FILES([lksctp-tools.spec -+ Makefile -+ bin/Makefile -+ man/Makefile -+ src/Makefile -+ src/apps/Makefile -+ src/func_tests/Makefile -+ src/include/Makefile -+ src/include/netinet/Makefile -+ src/lib/Makefile -+ src/testlib/Makefile -+ src/withsctp/Makefile -+ doc/Makefile]) -+AC_OUTPUT -diff --git a/configure.in b/configure.in -deleted file mode 100644 -index c43ed9d..0000000 ---- a/configure.in -+++ /dev/null -@@ -1,74 +0,0 @@ --dnl -*-autoconf-*- -- --dnl lksctp-tools: Autoconf script --dnl --dnl $Id: configure.in,v 1.1.1.2 2002/08/06 23:55:45 inaky Exp $ -- --dnl (C) 2002 Intel Corporation --dnl Iaky Prez-Gonzlez <inaky.perez-gonzalez@intel.com> --dnl - Initial packaging -- --dnl Package info --dnl (CONFIG_AUX_DIR is for putting stuff in $TOPSRCDIR/bin, so we --dnl reduce clutter in the root; if we put it below AM_INIT_AUTOMAKE, --dnl configure will fail ...) -- --AC_INIT([src/apps/sctp_darn.c]) --AC_CONFIG_AUX_DIR(bin) --AM_INIT_AUTOMAKE(lksctp-tools,1.0.13) --AC_CONFIG_SRCDIR([config.h.in]) --AM_CONFIG_HEADER([config.h]) --AC_REVISION($Revision: 1.1.1.2 $) --AM_SILENT_RULES([yes]) -- --dnl Set defaults --dnl CFLAGS="$CFLAGS -g -Wall" -- --dnl Checks for programs. --AC_PROG_AWK --AC_PROG_CC --AC_PROG_INSTALL --AC_PROG_LN_S --AC_ISC_POSIX -- --dnl Checks for libraries. --AC_LIBTOOL_DLOPEN --AC_PROG_LIBTOOL --AC_SUBST(LIBTOOL_DEPS) -- --dnl Checks for header files. --AC_HEADER_STDC --AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h]) -- --dnl Checks for typedefs, structures, and compiler characteristics. --AC_C_CONST --AC_C_INLINE --AC_TYPE_SIZE_T --AC_HEADER_TIME --AC_STRUCT_TM --AC_C_VOLATILE -- --# Checks for library functions. --AC_FUNC_MALLOC --AC_FUNC_MEMCMP --AC_FUNC_REALLOC --AC_FUNC_SELECT_ARGTYPES --AC_FUNC_SETVBUF_REVERSED --AC_FUNC_VPRINTF --AC_CHECK_FUNCS([bzero gethostbyname gettimeofday memmove memset select socket strchr strerror strtol strtoul]) -- --AC_CONFIG_FILES([lksctp-tools.spec -- Makefile -- bin/Makefile -- man/Makefile -- src/Makefile -- src/apps/Makefile -- src/func_tests/Makefile -- src/include/Makefile -- src/include/netinet/Makefile -- src/lib/Makefile -- src/testlib/Makefile -- src/withsctp/Makefile -- doc/Makefile]) --AC_OUTPUT -diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am -index c2e34e4..6d53e6d 100644 ---- a/src/apps/Makefile.am -+++ b/src/apps/Makefile.am -@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.rules - include $(top_srcdir)/Makefile.dirs - - # General compilation flags --INCLUDES = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib -+AM_CPPFLAGS = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib - AM_CFLAGS = -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes -Wimplicit-function-declaration - AM_LDFLAGS = - LDADD = $(top_builddir)/src/testlib/libsctputil.la \ -diff --git a/src/func_tests/Makefile.am b/src/func_tests/Makefile.am -index 9092ffb..b21e151 100644 ---- a/src/func_tests/Makefile.am -+++ b/src/func_tests/Makefile.am -@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.rules - include $(top_srcdir)/Makefile.dirs - - # General compilation flags --INCLUDES = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib -+AM_CPPFLAGS = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib - AM_CFLAGS = -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes -Wimplicit-function-declaration - AM_LDFLAGS = -lpthread - LDADD = $(top_builddir)/src/testlib/libsctputil.la \ -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index 81cc814..af8bb51 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.rules - include $(top_srcdir)/Makefile.dirs - - # General compilation flags --INCLUDES = -I$(top_srcdir)/src/include -+AM_CPPFLAGS = -I$(top_srcdir)/src/include - - lib_LTLIBRARIES = libsctp.la - libsctp_la_SOURCES = bindx.c connectx.c peeloff.c opt_info.c addrs.c sendmsg.c recvmsg.c Versions.map -diff --git a/src/testlib/Makefile.am b/src/testlib/Makefile.am -index 3d7fd49..fae6bbc 100644 ---- a/src/testlib/Makefile.am -+++ b/src/testlib/Makefile.am -@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.rules - include $(top_srcdir)/Makefile.dirs - - # General compilation flags --INCLUDES = -I$(top_srcdir)/src/include -+AM_CPPFLAGS = -I$(top_srcdir)/src/include - - noinst_LTLIBRARIES = libsctputil.la - libsctputil_la_SOURCES = sctputil.c sctputil.h --- -1.8.1.1 - diff --git a/community/lksctp-tools/PKGBUILD b/community/lksctp-tools/PKGBUILD index 20fd553c4..d5f3c6a01 100644 --- a/community/lksctp-tools/PKGBUILD +++ b/community/lksctp-tools/PKGBUILD @@ -3,7 +3,7 @@ # Contributer: Nicolas Martyanoff <khaelin@gmail.com> pkgname=lksctp-tools -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 pkgdesc='An implementation of the SCTP protocol' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL2' 'LGPL2.1') depends=('bash') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/lksctp/$pkgname-$pkgver.tar.gz") -md5sums=('12bc67f9b47ea631328a592ce7a53ca1') +md5sums=('d829677541fb41061e7f4d61f8413b07') build() { cd $pkgname-$pkgver diff --git a/community/lsscsi/PKGBUILD b/community/lsscsi/PKGBUILD index 556c01d4c..b6f628715 100644 --- a/community/lsscsi/PKGBUILD +++ b/community/lsscsi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65009 2012-02-19 19:48:16Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 90283 2013-05-10 22:36:28Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor : XAVeRY - los dot danielos at gmail dot com pkgname=lsscsi -pkgver=0.26 +pkgver=0.27 pkgrel=1 pkgdesc='A tool that lists devices connected via SCSI and its transports' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://sg.danny.cz/scsi/lsscsi.html" license=('GPL') depends=('sysfsutils') source=("http://sg.danny.cz/scsi/${pkgname}-${pkgver}.tgz") -md5sums=('624d705899ed08e872e164679ac56545') +md5sums=('33ab2927a9e567a47905e6a618c17859') build() { cd ${pkgname}-${pkgver} @@ -24,4 +24,4 @@ package() { make DESTDIR="${pkgdir}" install } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index f52844ac4..cf2303228 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88633 2013-04-20 18:17:17Z jlichtblau $ +# $Id: PKGBUILD 90056 2013-05-06 19:38:11Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64' 'mips64el') url='http://qtpfsgui.sourceforge.net/' diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index e5944628f..d480fae5f 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 87850 2013-04-08 09:23:47Z spupykin $ +# $Id: PKGBUILD 90274 2013-05-10 21:44:25Z thestinger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> +# Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> -# Maintainer: Jon Nordby <jononor@gmail.com> +# Contributor: Jon Nordby <jononor@gmail.com> pkgname=lxc pkgver=0.9.0 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc="Linux Containers" arch=('i686' 'x86_64' 'mips64el') url="http://lxc.sourceforge.net/" -depends=('bash' 'perl') +depends=('bash' 'perl' 'libseccomp') license=('LGPL') source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz") md5sums=('8552a4479090616f4bc04d8473765fc9') @@ -24,7 +25,8 @@ build() { --libexecdir=/usr/bin \ --sysconfdir=/etc \ --disable-apparmor \ - --disable-doc + --disable-doc \ + --enable-seccomp make } diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index ac04031fa..da8dd8dc9 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79125 2012-10-30 23:07:13Z heftig $ +# $Id: PKGBUILD 90434 2013-05-12 10:57:52Z dwallace $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=18 +pkgrel=21 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" @@ -18,52 +18,61 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz - glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch - greeter-session.patch pam-env-vars.patch industrial-greeterui.patch - rc.d lxdm-pam service) + lxdm.pam lxdm.service + lxdm-0.4.1-Xsession-source-profile.patch + lxdm-0.4.1-conf.patch + lxdm-0.4.1-event-check-bug.patch + lxdm-0.4.1-industrial-greeter-ui.patch + lxdm-0.4.1-modern-systems.patch + lxdm-0.4.1-nolang-show-sessions.patch + lxdm-0.4.1-pam-env-vars.patch) + +prepare(){ + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i $srcdir/lxdm-0.4.1-event-check-bug.patch + patch -Np1 -i $srcdir/lxdm-0.4.1-nolang-show-sessions.patch + patch -Np1 -i $srcdir/lxdm-0.4.1-pam-env-vars.patch +} build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/glib2-2.32.0.patch - patch -Np1 -i $srcdir/greeter-session.patch - patch -Np1 -i $srcdir/pam-env-vars.patch - ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm + ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm \ + --bindir=/usr/bin \ + --sbindir=/usr/bin make - patch -Np0 -i $srcdir/lxdm.patch - patch -Np0 -i $srcdir/lxdm.conf.patch - patch -Np0 -i $srcdir/Xsession.patch - patch -Np0 -i $srcdir/industrial-greeterui.patch + patch -Np0 -i $srcdir/lxdm-0.4.1-modern-systems.patch + patch -Np0 -i $srcdir/lxdm-0.4.1-conf.patch + patch -Np0 -i $srcdir/lxdm-0.4.1-Xsession-source-profile.patch + patch -Np0 -i $srcdir/lxdm-0.4.1-industrial-greeter-ui.patch } package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir sbindir=/usr/bin install - install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm - install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service + install -m644 $srcdir/lxdm.pam $pkgdir/etc/pam.d/lxdm + install -Dm644 $srcdir/lxdm.service $pkgdir/usr/lib/systemd/system/lxdm.service install -d $pkgdir/var/{lib,run}/lxdm # fix the greeter location sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf + sed -i 's:sbin:bin:' $pkgdir/usr/bin/lxdm # avoid conflict with filesystem>=2012.06 rm -r $pkgdir/var/run } md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' + '9cc734228696a3c6f06d91bba61b03c1' + 'b86317143ae44d7ed38c150fe4f25502' + 'd2e4a4a22ee2aa1a986be154c647b6c6' + 'c50dd01b715b0a236407d48066191601' 'a1e3c46a8bef691bc544028f5b6cfe22' + '2c4afdbe3532be4f90d8f6240d352766' 'baed9055e8825a5511712bc095197519' - 'c50dd01b715b0a236407d48066191601' - 'd2e4a4a22ee2aa1a986be154c647b6c6' '28475239d0c8b4fd778ec49f5ec72962' - '4c1d43e81e9a256e8d1ea7686c24b3d3' - '2c4afdbe3532be4f90d8f6240d352766' - '705f394052fdd0dec22e95321d170de0' - '9cc734228696a3c6f06d91bba61b03c1' - 'e8cc66eb1a2405d2d9d184a727cbd9d8') - + '4c1d43e81e9a256e8d1ea7686c24b3d3') diff --git a/community/lxdm/Xsession.patch b/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch index 035ff0383..035ff0383 100644 --- a/community/lxdm/Xsession.patch +++ b/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch diff --git a/community/lxdm/lxdm.conf.patch b/community/lxdm/lxdm-0.4.1-conf.patch index 1744e557e..1744e557e 100644 --- a/community/lxdm/lxdm.conf.patch +++ b/community/lxdm/lxdm-0.4.1-conf.patch diff --git a/community/lxdm/glib2-2.32.0.patch b/community/lxdm/lxdm-0.4.1-event-check-bug.patch index cebfc6133..cebfc6133 100644 --- a/community/lxdm/glib2-2.32.0.patch +++ b/community/lxdm/lxdm-0.4.1-event-check-bug.patch diff --git a/community/lxdm/industrial-greeterui.patch b/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch index a2a366809..a2a366809 100644 --- a/community/lxdm/industrial-greeterui.patch +++ b/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch diff --git a/community/lxdm/lxdm.patch b/community/lxdm/lxdm-0.4.1-modern-systems.patch index a703a386d..a703a386d 100644 --- a/community/lxdm/lxdm.patch +++ b/community/lxdm/lxdm-0.4.1-modern-systems.patch diff --git a/community/lxdm/greeter-session.patch b/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch index f3b94a57a..f3b94a57a 100644 --- a/community/lxdm/greeter-session.patch +++ b/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch diff --git a/community/lxdm/pam-env-vars.patch b/community/lxdm/lxdm-0.4.1-pam-env-vars.patch index ab8605ff1..ab8605ff1 100644 --- a/community/lxdm/pam-env-vars.patch +++ b/community/lxdm/lxdm-0.4.1-pam-env-vars.patch diff --git a/community/lxdm/lxdm-pam b/community/lxdm/lxdm.pam index 57f33b221..57f33b221 100644 --- a/community/lxdm/lxdm-pam +++ b/community/lxdm/lxdm.pam diff --git a/community/lxdm/service b/community/lxdm/lxdm.service index e1840476c..026d62b50 100644 --- a/community/lxdm/service +++ b/community/lxdm/lxdm.service @@ -3,7 +3,7 @@ Description=LXDE Display Manager After=systemd-user-sessions.service [Service] -ExecStart=/usr/sbin/lxdm +ExecStart=/usr/bin/lxdm [Install] Alias=display-manager.service diff --git a/community/lxdm/rc.d b/community/lxdm/rc.d deleted file mode 100644 index 68eb6225d..000000000 --- a/community/lxdm/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID `which lxdm-binary`) -case "$1" in - start) - stat_busy "Starting LXDM Display Manager" - [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lxdm - stat_done - fi - ;; - stop) - stat_busy "Stopping LXDM Display Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lxdm - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/lxnm/PKGBUILD b/community/lxnm/PKGBUILD index 93b03e616..4375e6249 100644 --- a/community/lxnm/PKGBUILD +++ b/community/lxnm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64694 2012-02-17 18:44:05Z bluewind $ +# $Id: PKGBUILD 90454 2013-05-12 16:50:48Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Cainã Costa <cainan.costa@gmail.com> pkgname=lxnm pkgver=0.2.2 -pkgrel=3.1 +pkgrel=4 pkgdesc="A Network Manager (Part of LXDE)" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -14,7 +14,7 @@ source=("http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}. build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } package() { diff --git a/community/mahjong/PKGBUILD b/community/mahjong/PKGBUILD index 465a41e07..5ca99343a 100644 --- a/community/mahjong/PKGBUILD +++ b/community/mahjong/PKGBUILD @@ -4,9 +4,9 @@ pkgname=mahjong pkgver=1.12.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="The classical game of Mah Jong (not the solitare version) with network support" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.stevens-bradfield.com/MahJong/" license=('GPL' 'custom') depends=('gtk2') diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 2d1d0983e..8c34a222f 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87421 2013-03-31 19:18:26Z stephane $ +# $Id: PKGBUILD 90058 2013-05-06 19:38:17Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=2.1.0 -pkgrel=9 +pkgrel=10 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index f6493bd0d..9e0adc01d 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') makedepends=('git') options=('docs') backup=('etc/mcelog/mcelog.conf') diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 930e27f90..bcff92743 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81124 2012-12-12 00:49:36Z eric $ +# $Id: PKGBUILD 90059 2013-05-06 19:38:20Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest pkgver=3.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/megaglest/" diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD index e9053918c..b35effbad 100644 --- a/community/metapixel/PKGBUILD +++ b/community/metapixel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63662 2012-02-05 12:04:18Z ibiru $ +# $Id: PKGBUILD 90060 2013-05-06 19:38:23Z foutrelis $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de> pkgname=metapixel pkgver=1.0.2 -pkgrel=3 +pkgrel=4 pkgdesc='A program for generating photomosaics.' arch=('i686' 'x86_64' 'mips64el') url='http://www.complang.tuwien.ac.at/schani/metapixel/' diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 87815fc98..2f4cc6259 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87825 2013-04-07 13:05:16Z arodseth $ +# $Id: PKGBUILD 90243 2013-05-09 23:40:12Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -8,13 +8,13 @@ pkgname=midori pkgver=0.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight web browser based on Gtk WebKit' arch=('x86_64' 'i686' 'mips64el') url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' license=('LGPL2.1') -install=midori.install -depends=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils') +install="$pkgname.install" +depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala' 'gcr') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' 'aria2: download utility') diff --git a/community/ming/PKGBUILD b/community/ming/PKGBUILD index ec36251a7..8473f04d3 100644 --- a/community/ming/PKGBUILD +++ b/community/ming/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ming pkgver=0.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="SWF output library" arch=('i686' 'x86_64' 'mips64el') url="http://www.libming.net/" diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index 3acfd055e..7ff1623f2 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89899 2013-05-05 12:20:12Z ttoepper $ +# $Id: PKGBUILD 89988 2013-05-06 18:29:21Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh pkgver=R46 -pkgrel=1 +pkgrel=2 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' license=('custom') @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/$pkgname" - install -D -m 755 mksh "$pkgdir/usr/bin/mksh" + install -D -m 755 mksh "$pkgdir/bin/mksh" install -D -m 644 mksh.1 "$pkgdir/usr/share/man/man1/mksh.1" install -D -m 644 dot.mkshrc "$pkgdir/etc/skel/.mkshrc" install -D -m 644 "$srcdir/TaC-mksh.txt" "$pkgdir/usr/share/licenses/mksh/TaC-mksh.txt" diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index d2235a39c..156dacde6 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 88818 2013-04-23 01:19:34Z eric $ +# $Id: PKGBUILD 90062 2013-05-06 19:38:27Z foutrelis $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 pkgver=20130309 -pkgrel=1 +pkgrel=2 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' arch=('i686' 'x86_64' 'mips64el') license=('GPL') -url="http://www.mplayer2.org/" +url='http://www.mplayer2.org/' install=$pkgname.install depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' @@ -30,11 +30,14 @@ source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz sha256sums=('03aeccbd82b3598e0656b54ae6ab60c79afdb78eabe1b2915e7912db7efbd343' 'SKIP') -build() { +prepare() { cd $pkgname-$pkgver - sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop find -type f -exec sed -e 's/python3/python/' -i {} \; +} + +build() { + cd $pkgname-$pkgver [ "$CARCH" != "mips64el" ] && extra="--enable-runtime-cpudetection" diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index e5cdbec00..da85c2b5c 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78951 2012-10-27 23:57:00Z ebelanger $ +# $Id: PKGBUILD 90064 2013-05-06 19:38:31Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> pkgname=mtpaint pkgver=3.40 -pkgrel=5 +pkgrel=6 pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork" arch=('i686' 'x86_64' 'mips64el') url="http://mtpaint.sourceforge.net/" diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 0aab45c6d..d16cb9972 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89864 2013-05-03 19:33:13Z faidoc $ +# $Id: PKGBUILD 90125 2013-05-06 21:32:15Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Adam Hani Schakaki <adam@schakaki.net> # Contributor: Ner0 pkgname=muffin -pkgver=1.7.5 +pkgver=1.8.0 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" "switch-applications.patch" "fix-dnd.patch") -sha256sums=('ef10c19353e5d2ff86d24c2fa40bd53ba3c7eeb03e9d3c8fbd3f4b56d16a2f07' +sha256sums=('4b3f872c0a0325d88d2d6ece4b67202b7b91b89634fb3c8ff93ebd5c6acfbd67' '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' '745dd3ef7eb8a496c68f5a728253205a849ac63851c0c0930c42442aec5af939') diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD index 40218b43d..2adc42368 100644 --- a/community/mypaint/PKGBUILD +++ b/community/mypaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81897 2013-01-03 10:04:06Z spupykin $ +# $Id: PKGBUILD 90066 2013-05-06 19:38:37Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=mypaint pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics" arch=('i686' 'x86_64' 'mips64el') url="http://mypaint.intilinux.com/" diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD index b5b065b6e..843da2902 100644 --- a/community/naev/PKGBUILD +++ b/community/naev/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 69406 2012-04-15 22:34:54Z svenstaro $ +# $Id: PKGBUILD 90067 2013-05-06 19:38:39Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Johan Rehnberg <cleanrock@gmail.com> pkgname=naev pkgver=0.5.3 -pkgrel=1 +pkgrel=2 pkgdesc='2D action/rpg space game' arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/naev/" license=('GPL3') -depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data') +depends=('glu' 'openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data') makedepends=('freeglut') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('bec719b3daa33ec190d785120a7b0159') diff --git a/community/ncdu/PKGBUILD b/community/ncdu/PKGBUILD index 398ab5ec2..251e231fc 100644 --- a/community/ncdu/PKGBUILD +++ b/community/ncdu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76727 2012-09-27 22:43:52Z bisson $ +# $Id: PKGBUILD 90258 2013-05-10 15:34:37Z jelle $ # Contributor: lp76 <l.peduto@gmail.com> # Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=ncdu -pkgver=1.9 +pkgver=1.10 pkgrel=1 pkgdesc='Disk usage analyzer with an ncurses interface' url='http://dev.yorhel.nl/ncdu/' @@ -13,7 +13,7 @@ license=('custom:MIT') depends=('ncurses') arch=('i686' 'x86_64' 'mips64el') source=("http://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('27cb5464b192db8ffdf0a894fe51d29985348eb0') +sha1sums=('cf3b5fbb5b69cbae5425bfff2660ac3d8224a605') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 77ac92c0c..511a19114 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 89588 2013-04-30 08:28:34Z arodseth $ +# $Id: PKGBUILD 90245 2013-05-09 23:52:58Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> pkgname=nemiver pkgver=0.9.4 -pkgrel=3 +pkgrel=4 pkgdesc='C/C++ debugger for GNOME' arch=('x86_64' 'i686' 'mips64el') license=('GPL') url='http://www.gnome.org/projects/nemiver/' install="$pkgname.install" -depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas') +depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gsettings-desktop-schemas') makedepends=('boost' 'intltool' 'itstool') source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") options=('!libtool' '!emptydirs') @@ -28,8 +28,8 @@ build() { --disable-scrollkeeper \ --enable-symsvis=yes \ --enable-memoryview=yes \ - --enable-gsettings=yes -# --disable-schemas-compile \ + --enable-gsettings=yes \ + --disable-schemas-compile make } diff --git a/community/nemo-fileroller/PKGBUILD b/community/nemo-fileroller/PKGBUILD index bb60a9a42..ee1311652 100644 --- a/community/nemo-fileroller/PKGBUILD +++ b/community/nemo-fileroller/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: twa022 <twa022 at gmail dot com> pkgname=nemo-fileroller -pkgver=1.7.1 +pkgver=1.8.0 pkgrel=1 pkgdesc="Nemo fileroller extension" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('nemo' 'file-roller') options=('!libtool' '!emptydirs') sha256sums=('3381a3421b2fd69746b610cfa3dfeb83d4795076ec692fcf28bcccf69bfe36d0' - 'b15f7cd536f595acd070cdff5b9c5c59df44bbc7bf91a1fd560702875b0f3669') + 'b89c4667b175ad6ad59b6938dab7e9b53c3bcdc25a5ac5177203662900aac2f5') build() { diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 804efe07b..f839ec21d 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 89860 2013-05-03 19:19:27Z faidoc $ +# $Id: PKGBUILD 90132 2013-05-06 22:22:04Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Ner0 pkgname=nemo -pkgver=1.7.6 +pkgver=1.8.0 pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://github.com/linuxmint/nemo" license=('GPL') depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2' @@ -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=('670faa09fff6b2919231bbe6c580363c4cd0a7c87fc5324570083ed8955db9c8' +sha256sums=('4812381bd2e926fa3cd4efcddc79585bab3ff1c226d1db69e7ce3802c783d18a' '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626' '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5') diff --git a/community/netsurf-buildsystem/PKGBUILD b/community/netsurf-buildsystem/PKGBUILD index 3787946b4..5ef63065d 100644 --- a/community/netsurf-buildsystem/PKGBUILD +++ b/community/netsurf-buildsystem/PKGBUILD @@ -5,7 +5,7 @@ pkgname=netsurf-buildsystem pkgver=1.0 pkgrel=1 pkgdesc='The Netsurf buildsystem' -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url='http://www.netsurf-browser.org/' license=('MIT') source=("http://download.netsurf-browser.org/libs/releases/buildsystem-$pkgver.tar.gz") diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD index 2f71a17cd..e3f7bf363 100644 --- a/community/netsurf/PKGBUILD +++ b/community/netsurf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89138 2013-04-27 07:58:18Z arodseth $ +# $Id: PKGBUILD 90068 2013-05-06 19:38:43Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Georgij Kondratjev <smpuj@bk.ru> @@ -6,7 +6,7 @@ pkgname=netsurf pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight and fast web browser' arch=('x86_64' 'i686' 'mips64el') url='http://www.netsurf-browser.org/' diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index ec2e6b079..db780e77d 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88940 2013-04-25 04:37:43Z bpiotrowski $ +# $Id: PKGBUILD 90389 2013-05-12 06:32:22Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -7,7 +7,7 @@ _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=2 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') @@ -29,8 +29,8 @@ backup=(${_cfgdir:1}/fastcgi.conf source=(http://nginx.org/download/nginx-$pkgver.tar.gz service logrotate) -sha256sums=('84aeb7a131fccff036dc80283dd98c989d2844eb84359cfe7c4863475de923a9' - '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' +sha256sums=('bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119' + '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b' '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16') build() { @@ -39,7 +39,7 @@ build() { ./configure \ --prefix=$_cfgdir \ --conf-path=$_cfgdir/nginx.conf \ - --sbin-path=/usr/sbin/nginx \ + --sbin-path=/usr/bin/nginx \ --pid-path=/var/run/nginx.pid \ --lock-path=/var/lock/nginx.lock \ --user=http --group=http \ diff --git a/community/nginx/service b/community/nginx/service index 8e28f0cde..29d3aa877 100644 --- a/community/nginx/service +++ b/community/nginx/service @@ -5,10 +5,10 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/run/nginx.pid -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit +ExecStartPre=/usr/bin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecReload=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload +ExecStop=/usr/bin/nginx -g 'pid /run/nginx.pid;' -s quit [Install] WantedBy=multi-user.target diff --git a/extra/notification-daemon/PKGBUILD b/community/notification-daemon/PKGBUILD index 8bba639c3..ae78b32cc 100644 --- a/extra/notification-daemon/PKGBUILD +++ b/community/notification-daemon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183449 2013-04-21 22:11:53Z heftig $ +# $Id: PKGBUILD 90252 2013-05-10 04:00:26Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> diff --git a/extra/notification-daemon/notification-daemon.install b/community/notification-daemon/notification-daemon.install index 8a1aa3433..8a1aa3433 100644 --- a/extra/notification-daemon/notification-daemon.install +++ b/community/notification-daemon/notification-daemon.install diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index a94cee35b..e4922e438 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -8,7 +8,7 @@ pkgver=20130422 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('custom:LGPL') depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm') optdepends=('libxinerama' 'libxrandr') diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD index e89d3ffe7..23a5ba397 100644 --- a/community/notmuch/PKGBUILD +++ b/community/notmuch/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86877 2013-03-23 23:10:36Z td123 $ +# $Id: PKGBUILD 90380 2013-05-12 06:14:15Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: fauno <fauno at kiwwwi.com.ar> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> @@ -7,7 +7,7 @@ pkgbase=notmuch pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime') pkgver=0.15.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://notmuchmail.org/" license=('GPL3') @@ -29,7 +29,6 @@ build() { cd bindings/ruby ruby extconf.rb - make cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2} @@ -50,7 +49,7 @@ package_notmuch-runtime(){ cd "$srcdir/${pkgname}-$pkgver" make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install - install -Dm644 notmuch "$pkgdir/usr/sbin/notmuch" + install -Dm644 notmuch "$pkgdir/usr/bin/notmuch" mkdir -p "$pkgdir"/usr/share/vim/vimfiles/{plugin,syntax} @@ -84,7 +83,7 @@ package_notmuch(){ # Install ruby bindings cd "$srcdir/${pkgname}-${pkgver}/bindings/ruby" sed -i -e 's,/site_ruby,,g' Makefile - make DESTDIR="$pkgdir" includedir=/usr/include install + make exec_prefix=$pkgdir/usr prefix=/usr install } diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD index 7fc8d3e93..ee1726eb2 100644 --- a/community/oolite/PKGBUILD +++ b/community/oolite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82164 2013-01-09 22:25:40Z svenstaro $ +# $Id: PKGBUILD 90332 2013-05-11 15:38:55Z alucryd $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lone_Wolf <lonewolf@xs4all.nl> pkgname=oolite pkgver=1.77 -pkgrel=1 +pkgrel=2 pkgdesc="A space-sim based on the classic Elite" arch=('i686' 'x86_64' 'mips64el') url="http://oolite-linux.berlios.de" @@ -21,6 +21,8 @@ build() { cp -r ${srcdir}/oolite-source-${pkgver} ${srcdir}/${pkgname}-build cd ${srcdir}/${pkgname}-build + unset CPPFLAGS + sed -i '/void png_error/d' src/Core/Materials/OOPNGTextureLoader.m sed -i "/ADDITIONAL_OBJCFLAGS/s/=/= -fobjc-exceptions/" GNUmakefile make -f libjs.make debug=no make -f Makefile release diff --git a/community/openclonk/PKGBUILD b/community/openclonk/PKGBUILD index c3aebc93c..f748da628 100644 --- a/community/openclonk/PKGBUILD +++ b/community/openclonk/PKGBUILD @@ -1,25 +1,22 @@ -$Id: PKGBUILD 80496 2012-11-22 21:30:12Z jsteel $ +# $Id: PKGBUILD 90070 2013-05-06 19:38:47Z foutrelis $ # Maintainer: Jonathan Steel <mail at jsteel dot org> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Wesley <rudirennsau at hotmail dot com> pkgname=openclonk -pkgver=5.3.2 +pkgver=5.3.3 pkgrel=1 pkgdesc="A multiplayer-action-tactic-skill game" arch=('i686' 'x86_64') url="http://openclonk.org" license=('custom') -conflicts=('openclonk-hg') depends=('gtk2' 'glew' 'sdl_mixer' 'libxpm' 'hicolor-icon-theme' 'libupnp') makedepends=('cmake' 'boost' 'imagemagick' 'mesa') install=$pkgname.install source=(http://hg.openclonk.org/$pkgname/archive/$pkgname-release-$pkgver-src.tar.gz) -md5sums=('0d43b03f10c8af7a9022f023b21bb1b3') +md5sums=('a61d8a7d7c41bcc8d85a647c25095658') build() { - cd "$srcdir"/$pkgname-release-$pkgver-src - [[ -d build ]] && rm -rf build mkdir build && cd build @@ -29,13 +26,11 @@ build() { } package() { - cd "$srcdir"/$pkgname-release-$pkgver-src/build + cd build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir"/ install install -Dm644 clonk.png "$pkgdir"/usr/share/pixmaps/clonk.png - - cd .. install -dm755 "$pkgdir"/usr/share/licenses/$pkgname - install -m644 licenses/*.txt "$pkgdir"/usr/share/licenses/$pkgname + install -m644 ../licenses/*.txt "$pkgdir"/usr/share/licenses/$pkgname } diff --git a/community/openclonk/openclonk.install b/community/openclonk/openclonk.install index f1aa7421c..b9bbaf706 100644 --- a/community/openclonk/openclonk.install +++ b/community/openclonk/openclonk.install @@ -1,5 +1,9 @@ post_install() { - gtk-update-icon-cache -qf /usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install } post_remove() { diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index 2505880c7..8bb5be989 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89826 2013-05-02 16:18:15Z svenstaro $ +# $Id: PKGBUILD 90071 2013-05-06 19:38:49Z foutrelis $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio pkgver=1.1.10 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) url="http://www.openimageio.org/" diff --git a/community/openmotif/PKGBUILD b/community/openmotif/PKGBUILD index a502f732d..53e19485f 100644 --- a/community/openmotif/PKGBUILD +++ b/community/openmotif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78895 2012-10-26 13:57:30Z spupykin $ +# $Id: PKGBUILD 90072 2013-05-06 19:38:52Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> pkgname=openmotif pkgver=2.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="Open Motif" arch=('i686' 'x86_64' 'mips64el') url="http://www.motifzone.org/" @@ -19,8 +19,16 @@ md5sums=('612bb8127d0d31da6e5474edf8a5c247') build() { cd $srcdir/motif-$pkgver export LDFLAGS="-lX11" + sed -i \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' \ + -e 's|AM_PROG_CC_STDC|AC_PROG_CC|g' \ + configure.ac [ -x configure ] || ./autogen.sh --prefix=/usr [ -f Makefile ] || ./configure --prefix=/usr make -j1 +} + +package() { + cd $srcdir/motif-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 8feb63055..3ef92191b 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85379 2013-03-01 10:36:28Z andrea $ +# $Id: PKGBUILD 90073 2013-05-06 19:38:55Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> @@ -6,7 +6,7 @@ pkgname=openscenegraph pkgver=3.0.1 -pkgrel=9 +pkgrel=10 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD index 09bb1b52b..26bda4541 100644 --- a/community/openssh-askpass/PKGBUILD +++ b/community/openssh-askpass/PKGBUILD @@ -4,7 +4,7 @@ pkgname=openssh-askpass pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc='A plasma-like passphrase dialog for ssh' arch=('i686' 'x86_64' 'mips64el') url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1' @@ -33,4 +33,4 @@ package() { } md5sums=('99b31e5bc2c12f91cc88869661ad92be' - '961738244318f3723ba99cdcaac91a21') + 'baec3f0499b851aca6705968fa9e0df7') diff --git a/community/openssh-askpass/openssh-askpass.sh b/community/openssh-askpass/openssh-askpass.sh index 552906c7e..6f2c2b221 100644 --- a/community/openssh-askpass/openssh-askpass.sh +++ b/community/openssh-askpass/openssh-askpass.sh @@ -1,3 +1 @@ -if [ -f /usr/lib/openssh/qt4-ssh-askpass ]; then - export SSH_ASKPASS=/usr/lib/openssh/qt4-ssh-askpass -fi +export SSH_ASKPASS=/usr/bin/qt4-ssh-askpass diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index f6bd2ec85..952a2ba78 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87676 2013-04-05 09:01:28Z lcarlier $ +# $Id: PKGBUILD 90074 2013-05-06 19:38:57Z foutrelis $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64' 'mips64el') url='http://www.openttd.org' diff --git a/community/ophcrack/PKGBUILD b/community/ophcrack/PKGBUILD new file mode 100644 index 000000000..f89079136 --- /dev/null +++ b/community/ophcrack/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> +# Contributor: Max Pray a.k.a. Synthead <synthead@gmail.com> +# Contributor: Kaos < gianlucaatlas at gmail dot com > +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> +# Contributor: Matthew Sharpe <matt.sharpe@gmail.com> + +pkgname=ophcrack +pkgver=3.5.0 +pkgrel=1 +pkgdesc="A free Windows password cracker based on rainbow tables" +arch=('i686' 'x86_64') +url="http://ophcrack.sourceforge.net" +license=('GPL') +depends=('qt4') +optdepends=('qwt: enable graph') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 + ophcrack.desktop) +md5sums=('1c61adde21c5dc226515cbd1dc654c60' + '664599c4fd7fd210e6c421459f60e20d') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./configure --prefix=/usr --enable-gui --enable-graph + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir"/ install + + install -Dm644 "$srcdir"/ophcrack.desktop "$pkgdir"/usr/share/applications/ophcrack.desktop + install -Dm644 src/gui/pixmaps/os.xpm "$pkgdir"/usr/share/$pkgname/pixmaps/os.xpm +} diff --git a/community/ophcrack/ophcrack.desktop b/community/ophcrack/ophcrack.desktop new file mode 100644 index 000000000..54d143fc8 --- /dev/null +++ b/community/ophcrack/ophcrack.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Ophcrack +Comment=LM and SAM hash cracker +Exec=ophcrack +Icon=/usr/share/ophcrack/pixmaps/os.xpm +Categories=Application;Utilities;System diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD index 4415534ff..c3bb58401 100644 --- a/community/partclone/PKGBUILD +++ b/community/partclone/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87807 2013-04-06 20:01:09Z jsteel $ +# $Id: PKGBUILD 90410 2013-05-12 09:03:51Z jsteel $ # Maintainer: Jonathan Steel <mail at jsteel dot org> # Contrinutor: Dan Serban # Contributor: Franz Burgmann @@ -7,7 +7,7 @@ pkgname=partclone pkgver=0.2.58 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities to save and restore used blocks on a partition" arch=('i686' 'x86_64' 'mips64el') url="http://partclone.org" @@ -20,7 +20,7 @@ build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr --enable-extfs --enable-reiserfs --enable-fat \ - --enable-hfsp --enable-btrfs --enable-ncursesw --enable-ntfs + --enable-hfsp --enable-btrfs --enable-ncursesw --enable-ntfs --sbindir=/usr/bin make } diff --git a/community/pdfedit/PKGBUILD b/community/pdfedit/PKGBUILD index b46eff23f..f4c5b49c8 100644 --- a/community/pdfedit/PKGBUILD +++ b/community/pdfedit/PKGBUILD @@ -6,7 +6,7 @@ pkgname=pdfedit pkgver=0.4.5 pkgrel=2 pkgdesc='Full featured editor for manipulating PDF documents' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://pdfedit.petricek.net/index_e.html' license=('GPL') depends=('qt3' 't1lib' 'gsfonts') diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD index d42718ede..8387ffd6f 100644 --- a/community/pdns/PKGBUILD +++ b/community/pdns/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87427 2013-03-31 19:18:34Z stephane $ +# $Id: PKGBUILD 90235 2013-05-09 18:41:57Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kevin Mihelich <kevin@archlinuxarm.org> pkgname=pdns pkgver=3.2 -pkgrel=5 +pkgrel=6 pkgdesc='Modern, advanced and high performance authoritative-only nameserver' arch=('x86_64' 'i686' 'mips64el') url='http://www.powerdns.com/' @@ -20,17 +20,20 @@ options=('!makeflags' '!libtool') backup=('etc/powerdns/pdns.conf') source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz" 'pdns.service' - 'pdns.rc' 'pdns.conf') sha256sums=('d1895aba065446dc68e5d7cc792d5303626c71759f61a455531ed65d59c06572' '2a60c4407bcfe19026ae77d3e3b7b477d5a0c6323c0bc78892e9d907003b442a' - '0457ffa2baa40518a03393e4f76964d9452c16aebbcb925582814f88367d62c2' - '91c8889f41fe9d6bc9478c3ad53a10f6725e36e10f05e8e9257f9d35c9e2bab6') + 'a1afcccb0d2fb6a6f7a5960de95f8d38ce1ac75ac5e3dcecf09e49f0de10166e') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" touch AUTHORS NEWS +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ --prefix=/usr \ --sysconfdir=/etc/powerdns \ @@ -48,9 +51,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -m755 -d "$pkgdir/etc/rc.d" install -m644 "$srcdir/pdns.conf" "$pkgdir/etc/powerdns/" - install -m755 "$srcdir/pdns.rc" "$pkgdir/etc/rc.d/pdns" install -Dm644 "$srcdir/pdns.service" \ "$pkgdir/usr/lib/systemd/system/pdns.service" rm "$pkgdir/etc/powerdns/pdns.conf-dist" diff --git a/community/pdns/pdns.conf b/community/pdns/pdns.conf index fba6617a6..e71d7155c 100644 --- a/community/pdns/pdns.conf +++ b/community/pdns/pdns.conf @@ -1,20 +1,15 @@ # Autogenerated configuration file template ################################# -# allow-axfr-ips If disabled, DO allow zonetransfers from these IP addresses +# allow-axfr-ips Allow zonetransfers only to these subnets # -# allow-axfr-ips= +# allow-axfr-ips=0.0.0.0/0,::/0 ################################# -# allow-recursion List of netmasks that are allowed to recurse +# allow-recursion List of subnets that are allowed to recurse # allow-recursion=127.0.0.1 ################################# -# allow-recursion-override Local data overrrides hosts on the internet -# -allow-recursion-override=yes - -################################# # cache-ttl Seconds to store packets in the PacketCache # cache-ttl=60 @@ -50,6 +45,11 @@ daemon=yes # default-soa-name=a.misconfigured.powerdns.server ################################# +# default-ttl Seconds a result is valid if not set otherwise +# +# default-ttl=3600 + +################################# # disable-axfr Disable zonetransfers but do allow TCP queries # # disable-axfr=no @@ -65,6 +65,41 @@ daemon=yes distributor-threads=3 ################################# +# do-ipv6-additional-processing Do AAAA additional processing +# +# do-ipv6-additional-processing=yes + +################################# +# edns-subnet-option-number EDNS option number to use +# +# edns-subnet-option-number=20730 + +################################# +# edns-subnet-processing If we should act on EDNS Subnet options +# +# edns-subnet-processing=no + +################################# +# entropy-source If set, read entropy from this file +# +# entropy-source=/dev/urandom + +################################# +# experimental-direct-dnskey EXPERIMENTAL: fetch DNSKEY RRs from backend during DNSKEY synthesis +# +# experimental-direct-dnskey=no + +################################# +# experimental-json-interface If the webserver should serve JSON data +# +# experimental-json-interface=no + +################################# +# experimental-logfile Filename of the log file for JSON parser +# +# experimental-logfile=/var/log/pdns.log + +################################# # fancy-records Process URL and MBOXFW records # # fancy-records=no @@ -77,12 +112,7 @@ guardian=yes ################################# # launch Which backends to launch and order to query them in # -#launch= - -################################# -# lazy-recursion Only recurse if question cannot be answered locally -# -lazy-recursion=yes +# launch= ################################# # load-modules Load this module - supply absolute or relative path @@ -90,7 +120,7 @@ lazy-recursion=yes # load-modules= ################################# -# local-address Local IP address to which we bind +# local-address Local IP addresses to which we bind # local-address=127.0.0.1 @@ -105,19 +135,19 @@ local-address=127.0.0.1 local-port=53 ################################# -# log-dns-details If PDNS should log failed update requests +# log-dns-details If PDNS should log DNS non-erroneous details # -#log-dns-details=off +# log-dns-details= ################################# -# log-failed-updates If PDNS should log failed update requests +# log-dns-queries If PDNS should log all incoming DNS queries # -#log-failed-updates=off +# log-dns-queries=no ################################# -# logfile Logfile to use +# log-failed-updates If PDNS should log failed update requests # -# logfile=pdns.log +# log-failed-updates= ################################# # logging-facility Log under a specific facility @@ -130,11 +160,26 @@ local-port=53 loglevel=3 ################################# +# lua-prequery-script Lua script with prequery handler +# +# lua-prequery-script= + +################################# # master Act as a master # # master=no ################################# +# max-cache-entries Maximum number of cache entries +# +# max-cache-entries=1000000 + +################################# +# max-ent-entries Maximum number of empty non-terminals in a zone +# +# max-ent-entries=100000 + +################################# # max-queue-length Maximum queuelength before considering situation lost # # max-queue-length=5000 @@ -150,26 +195,46 @@ loglevel=3 module-dir=/usr/lib/powerdns ################################# -# negquery-cache-ttl Seconds to store packets in the PacketCache +# negquery-cache-ttl Seconds to store negative query results in the QueryCache # negquery-cache-ttl=60 ################################# -# only-soa Make sure that no SOA serial is less than this number +# no-shuffle Set this to prevent random shuffling of answers - for regression testing # -# only-soa=org +# no-shuffle=off ################################# # out-of-zone-additional-processing Do out of zone additional processing # -# out-of-zone-additional-processing=no +# out-of-zone-additional-processing=yes + +################################# +# overload-queue-length Maximum queuelength moving to packetcache only +# +# overload-queue-length=0 + +################################# +# pipebackend-abi-version Version of the pipe backend ABI +# +# pipebackend-abi-version=1 ################################# -# query-cache-ttl Seconds to store packets in the PacketCache +# query-cache-ttl Seconds to store query results in the QueryCache # # query-cache-ttl=20 ################################# +# query-local-address Source IP address for sending queries +# +# query-local-address=0.0.0.0 + +################################# +# query-local-address6 Source IPv6 address for sending queries +# +# query-local-address6=:: + +################################# # query-logging Hint backends that queries should be logged # # query-logging=no @@ -180,19 +245,34 @@ negquery-cache-ttl=60 # queue-limit=1500 ################################# -# receiver-threads Number of receiver threads to launch +# receiver-threads Default number of Distributor (backend) threads to start # # receiver-threads=1 ################################# -# recursive-cache-ttl Seconds to store packets in the PacketCache +# recursive-cache-ttl Seconds to store packets for recursive queries in the PacketCache # # recursive-cache-ttl=10 ################################# # recursor If recursion is desired, IP address of a recursing nameserver # -#recursor= +# recursor=no + +################################# +# retrieval-threads Number of AXFR-retrieval threads for slave operation +# +# retrieval-threads=2 + +################################# +# send-root-referral Send out old-fashioned root-referral instead of ServFail in case of no authority +# +# send-root-referral=no + +################################# +# server-id Returned when queried for 'server.id' TXT or NSID, defaults to hostname +# +# server-id= ################################# # setgid If set, change group id to this gid for more security @@ -205,9 +285,9 @@ setgid=nobody setuid=nobody ################################# -# skip-cname Do not perform CNAME indirection for each query +# signing-threads Default number of signer threads to start # -# skip-cname=no +# signing-threads=3 ################################# # slave Act as a slave @@ -220,16 +300,36 @@ setuid=nobody # slave-cycle-interval=60 ################################# +# slave-renotify If we should send out notifications for slaved updates +# +# slave-renotify=no + +################################# # smtpredirector Our smtpredir MX host # # smtpredirector=a.misconfigured.powerdns.smtp.server ################################# -# soa-minimum-ttl Default SOA mininum ttl +# soa-expire-default Default SOA expire +# +# soa-expire-default=604800 + +################################# +# soa-minimum-ttl Default SOA minimum ttl # # soa-minimum-ttl=3600 ################################# +# soa-refresh-default Default SOA refresh +# +# soa-refresh-default=10800 + +################################# +# soa-retry-default Default SOA retry +# +# soa-retry-default=3600 + +################################# # soa-serial-offset Make sure that no SOA serial is less than this number # # soa-serial-offset=0 @@ -245,14 +345,44 @@ socket-dir=/var/run # strict-rfc-axfrs=no ################################# +# tcp-control-address If set, PowerDNS can be controlled over TCP on this address +# +# tcp-control-address= + +################################# +# tcp-control-port If set, PowerDNS can be controlled over TCP on this address +# +# tcp-control-port=53000 + +################################# +# tcp-control-range If set, remote control of PowerDNS is possible over these networks only +# +# tcp-control-range=127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12, ::1/128, fe80::/10 + +################################# +# tcp-control-secret If set, PowerDNS can be controlled over TCP after passing this secret +# +# tcp-control-secret= + +################################# +# traceback-handler Enable the traceback handler (Linux only) +# +# traceback-handler=yes + +################################# +# trusted-notification-proxy IP address of incoming notification proxy +# +# trusted-notification-proxy= + +################################# # urlredirector Where we send hosts to that need to be url redirected # # urlredirector=127.0.0.1 ################################# -# use-logfile Use a log file +# version-string PowerDNS version in packets - full, anonymous, powerdns or custom # -use-logfile=no +# version-string=full ################################# # webserver Start a webserver for monitoring @@ -279,3 +409,9 @@ webserver=no # # webserver-print-arguments=no +################################# +# wildcard-url Process URL and MBOXFW records +# +# wildcard-url=no + + diff --git a/community/pdns/pdns.rc b/community/pdns/pdns.rc deleted file mode 100644 index 2f143ddae..000000000 --- a/community/pdns/pdns.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting DNS" - ! /usr/sbin/pdns_control ping > /dev/null 2>&1 && /usr/sbin/pdns_server --daemon - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pdns - stat_done - fi - ;; - stop) - stat_busy "Stopping DNS" - pdns_control quit > /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pdns - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD index fbb861513..cf4e7607d 100644 --- a/community/pekwm/PKGBUILD +++ b/community/pekwm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89805 2013-05-02 12:32:13Z arodseth $ +# $Id: PKGBUILD 90217 2013-05-09 09:13:19Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Eddie Lozon <almostlucky@attbi.com> pkgname=pekwm pkgver=0.1.16 -pkgrel=4 +pkgrel=5 pkgdesc='Small, fast, functional, and flexible window manager' arch=('x86_64' 'i686' 'mips64el') license=('GPL') diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index cff8c664e..a7032ac70 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87428 2013-03-31 19:18:35Z stephane $ +# $Id: PKGBUILD 90076 2013-05-06 19:39:02Z foutrelis $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.7.0 -pkgrel=5 +pkgrel=6 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 18ea7a351..2df34ea5e 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88512 2013-04-19 08:19:36Z fyan $ +# $Id: PKGBUILD 90442 2013-05-12 11:52:36Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.1d -_pkgver=0.1-d -pkgrel=3 +pkgver=0.1e +_pkgver=0.1e +pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/xiehuc/pidgin-lwqq" @@ -14,13 +14,11 @@ optdepends=('pidgin: Multi-protocol instant messaging client' 'telepathy-haze: Empathy plugin support') makedepends=('git' 'cmake') install=$pkgname.install -source=("https://github.com/xiehuc/$pkgname/archive/${_pkgver}.tar.gz" - https://github.com/xiehuc/pidgin-lwqq/commit/afdefd3fb8ecce36f6387c5895339671f5833b4e.patch) +source=("https://github.com/xiehuc/$pkgname/archive/${_pkgver}.tar.gz") build() { cd "${srcdir}/$pkgname-${_pkgver}" - patch -Np1 -i ../afdefd3fb8ecce36f6387c5895339671f5833b4e.patch cmake -DCMAKE_INSTALL_PREFIX=/usr . make @@ -31,5 +29,5 @@ package() cd "$srcdir/$pkgname-${_pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('5ec83a5a3328dac2ded431bcd7c5c034' - '88eebc19df95001cbb4a00e4d0205b7f') + +sha512sums=('0e5c49dd5b0c9ba9f9eef90cb075c66839a6691aae93789da409a758a36916aef8fceea0d272ee9b67a5e6279bafea2907d2acba10c9d3858a94f4509f4b1f4b') diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 2977922a5..b5c6d6413 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87429 2013-03-31 19:18:38Z stephane $ +# $Id: PKGBUILD 90077 2013-05-06 19:39:04Z foutrelis $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus pkgver=0.7.6 -pkgrel=7 +pkgrel=8 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" diff --git a/community/png2ico/PKGBUILD b/community/png2ico/PKGBUILD index ff23e1556..b5e1f0df6 100644 --- a/community/png2ico/PKGBUILD +++ b/community/png2ico/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63710 2012-02-05 12:08:36Z ibiru $ +# $Id: PKGBUILD 90078 2013-05-06 19:39:06Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=png2ico pkgver=20021208 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Converts PNG files to Windows icon resource files" url="http://www.winterdrache.de/freeware/png2ico/" @@ -16,6 +16,7 @@ md5sums=('9b663df81c826cd564638cba2e6bc75b') build() { cd ${srcdir}/${pkgname} + sed -i '1,1i#include <string.h>' png2ico.cpp make } diff --git a/community/podofo/PKGBUILD b/community/podofo/PKGBUILD index 0892e0bff..081da95f2 100644 --- a/community/podofo/PKGBUILD +++ b/community/podofo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84752 2013-02-24 05:43:40Z giovanni $ +# $Id: PKGBUILD 90079 2013-05-06 19:39:08Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > # Contributor: Preecha Patumchareonpol <yumyai at gmail.com> pkgname=podofo pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ library to work with the PDF file format" arch=('i686' 'x86_64' 'mips64el') url="http://podofo.sourceforge.net" diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD index 47b7f460d..c4934c525 100644 --- a/community/polipo/PKGBUILD +++ b/community/polipo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80790 2012-12-03 18:01:33Z ttoepper $ +# $Id: PKGBUILD 90446 2013-05-12 13:12:12Z jelle $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Jelle van der Waa <jelle vdwaa nl> # Contributor: Thomas Holmquist <thomas@vorget.com> @@ -7,7 +7,7 @@ pkgname=polipo pkgver=1.0.4.1 -pkgrel=9 +pkgrel=10 pkgdesc="A small and fast caching web proxy." arch=('i686' 'x86_64' 'mips64el') url="http://www.pps.jussieu.fr/~jch/software/polipo/" @@ -16,9 +16,8 @@ depends=('bash') makedepends=('texinfo') install=polipo.install source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz" - "polipo.rc.d" "polipo.conf.d" "polipo.service") + "polipo.conf.d" "polipo.service") md5sums=('bfc5c85289519658280e093a270d6703' - '7406aad26807fb3a4e5f7b01ecb97a59' '685aa0c6070dee11c701932d23afcc6a' '143ef45db99dc745b6c3a606847be9fe') @@ -45,8 +44,7 @@ package() { # install license install -Dm644 COPYING $pkgdir/usr/share/licenses/polipo/LICENSE - # install daemon scripts / cron - install -Dm 755 $srcdir/polipo.rc.d $pkgdir/etc/rc.d/polipo + # install systemd service / cron install -Dm 644 $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service install -Dm 644 $srcdir/polipo.conf.d $pkgdir/etc/conf.d/polipo.conf } diff --git a/community/polipo/polipo.rc.d b/community/polipo/polipo.rc.d deleted file mode 100644 index 0333ded57..000000000 --- a/community/polipo/polipo.rc.d +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -daemon_name=polipo - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -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 /run/$daemon_name.pid ]] && - rm -f /run/$daemon_name.pid - # RUN - su -c "/usr/bin/$daemon_name ${POLIPO_ARGS}" -s /bin/sh - nobody - # - if [[ $? -gt 0 ]]; then - stat_fail - exit 1 - else - echo $(get_pid) > /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 - [[ -n $PID ]] && kill $PID &> /dev/null - # - if [[ $? -gt 0 ]]; then - stat_fail - exit 1 - else - rm -f /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 - -# vim:set ts=2 sw=2 et: diff --git a/extra/polkit-gnome/PKGBUILD b/community/polkit-gnome/PKGBUILD index 4d6f53310..0e351d88e 100644 --- a/extra/polkit-gnome/PKGBUILD +++ b/community/polkit-gnome/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141266 2011-10-27 16:27:38Z ibiru $ +# $Id: PKGBUILD 90254 2013-05-10 04:01:53Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: onestep_ua <onestep@ukr.net> diff --git a/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/community/polkit-gnome/polkit-gnome-authentication-agent-1.desktop index fc2acc28d..fc2acc28d 100644 --- a/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop +++ b/community/polkit-gnome/polkit-gnome-authentication-agent-1.desktop diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 4a5bfa66d..cd822c75c 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,39 +3,37 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9835 +pkgver=9838 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64' 'mips64el') url="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" license=('MIT') -makedepends=('pkgconfig') +makedepends=('pkgconfig' 'subversion') depends=('gtk2') -source=("http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz") +source=("svn://svn.tartarus.org/sgt/puzzles#revision=$pkgver") +md5sums=("SKIP") build() { - cd ${srcdir}/${pkgname}-r${pkgver} + cd ${srcdir}/${pkgname} ./mkfiles.pl - sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile + sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile - export CFLAGS="$CFLAGS -lm" - make prefix=/usr + make prefix=/usr } package() { - cd ${srcdir}/${pkgname}-r${pkgver} + cd ${srcdir}/${pkgname} - install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}} - install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/ + install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}} + install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/ - make prefix=/usr DESTDIR=${pkgdir} install + make prefix=/usr DESTDIR=${pkgdir} install - #fix FS#14600 - mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net - mv ${pkgdir}/usr/bin/cube ${pkgdir}/usr/bin/puzzles-cube - mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox + #fix FS#14600 + mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net + mv ${pkgdir}/usr/bin/cube ${pkgdir}/usr/bin/puzzles-cube + mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox } - -md5sums=('0db6e36f2ac04490f38ace15aabab555') diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD index 0806187e9..957276a32 100644 --- a/community/pyqt3/PKGBUILD +++ b/community/pyqt3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85290 2013-02-28 14:49:01Z spupykin $ +# $Id: PKGBUILD 90081 2013-05-06 19:39:12Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgname=pyqt3 pkgver=3.18.1 -pkgrel=12 +pkgrel=13 pkgdesc="A set of Python bindings for the Qt3 toolkit" arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/pyqt/intro" @@ -17,10 +17,12 @@ md5sums=('f1d120495d1aaf393819e988c0a7bb7e') build() { cd ${srcdir}/PyQt-x11-gpl-${pkgver} - . /etc/profile.d/qt3.sh + export QTDIR=/usr + export QMAKESPEC=/usr/share/qt3/mkspecs/linux-g++ echo yes | python2 configure.py -b /usr/bin \ -d /usr/lib/python2.7/site-packages \ - -v /usr/share/sip + -v /usr/share/sip \ + INCDIR_QT=/usr/include/qt3 make CXX="g++ -DANY=void" } diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index 79723cf2c..a9cc3ec67 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87092 2013-03-27 01:38:02Z stephane $ +# $Id: PKGBUILD 90082 2013-05-06 19:39:14Z foutrelis $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -7,7 +7,7 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64' 'mips64el') url='http://matplotlib.org' @@ -18,7 +18,7 @@ makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt' 'python-pytz' 'python 'pygtk' 'python-six' 'ghostscript' 'texlive-bin') optdepends=('pygtk: for use with the GTK or GTKAgg backend' 'tk: used by the TkAgg backend' - 'ghostscript: usetex dependencies' + 'ghostscript: usetex dependencies' 'texlive-bin: usetex dependencies') source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz") sha1sums=('82fc44d0047a713c1b0b1b4ea2503e6a41c57f98') diff --git a/community/python-numexpr/PKGBUILD b/community/python-numexpr/PKGBUILD new file mode 100644 index 000000000..ac6d8d3fa --- /dev/null +++ b/community/python-numexpr/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 90422 2013-05-12 09:41:18Z aginiewicz $ +# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> +# Contributor: Sebastien Binet <binet@lblbox> + +pkgbase=python-numexpr +pkgname=('python2-numexpr' 'python-numexpr') +pkgver=2.1 +pkgrel=1 +pkgdesc="A JIT compiler for Python expressions" +url="http://code.google.com/p/numexpr/" +arch=('i686' 'x86_64') +license=('MIT') +makedepends=('python2-distribute' 'python-distribute' 'python-numpy' 'python2-numpy') +source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz) +md5sums=('8c138e81fb4214d05453da0fc88bf0d5') + +build() { + cd "$srcdir" + cp -a numexpr-$pkgver numexpr-py2-$pkgver + + msg "Building Python2" + cd "$srcdir"/numexpr-py2-$pkgver + python2 setup.py build + + msg "Building Python3" + cd "$srcdir"/numexpr-$pkgver + python setup.py build +} + +package_python2-numexpr() { + depends=('python2-numpy') + + cd "$srcdir"/numexpr-py2-$pkgver + + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 + + sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/python2|" \ + $(find "${pkgdir}" -name '*.py') + + install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +package_python-numexpr() { + depends=('python-numpy') + + cd "$srcdir"/numexpr-$pkgver + + python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index df1a0ab2f..005068295 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 88178 2013-04-13 10:41:30Z seblu $ +# $Id: PKGBUILD 90289 2013-05-10 23:21:33Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') -pkgver=0.7.0 +pkgver=0.7.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('e19bd1c050786616dd81a3b200c61b8147eb9985') +sha1sums=('9c67e61ce00166d7831a4cdcbd2fe534708681a1') build() { cd psutil-$pkgver diff --git a/community/python2-numexpr/PKGBUILD b/community/python2-numexpr/PKGBUILD deleted file mode 100644 index a59c784ba..000000000 --- a/community/python2-numexpr/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 76243 2012-09-15 08:46:42Z aginiewicz $ -# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> -# Contributor: Sebastien Binet <binet@lblbox> - -pkgname=python2-numexpr -pkgver=2.0.1 -pkgrel=2 -pkgdesc="A JIT compiler for Python expressions" -url="http://code.google.com/p/numexpr/" -arch=('i686' 'x86_64' 'mips64el') -license=('MIT') -depends=('python2-numpy') -makedepends=('python2-distribute') -provides=('python-numexpr') # temporary compatibility because of rename -replaces=('python-numexpr') # (there is no python 3 version yet) -source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz) -md5sums=('5cdc05c2ef8761daeae8a3182e468ba4') - -build() { - cd "$srcdir"/numexpr-$pkgver - - python2 setup.py build -} - -package() { - cd "$srcdir"/numexpr-$pkgver - - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 - - sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/python2|" \ - $(find "${pkgdir}" -name '*.py') - - install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} - diff --git a/community/python2-xapian/PKGBUILD b/community/python2-xapian/PKGBUILD index d38cf43d5..cb50d1c38 100644 --- a/community/python2-xapian/PKGBUILD +++ b/community/python2-xapian/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 81458 2012-12-21 10:08:56Z fyan $ +# $Id: PKGBUILD 89984 2013-05-06 17:28:48Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: DonVla <donvla/users.sourceforge/net> # Contributor: Hervé Cauwelier <herve/oursours/net> pkgname=python2-xapian _realname=xapian-bindings -pkgver=1.2.12 +pkgver=1.2.15 pkgrel=1 pkgdesc="Python bindings for Xapian" arch=(i686 x86_64 mips64el) url="http://xapian.org/docs/bindings/python/" license=('GPL') -groups=(xapian) depends=('python2' 'xapian-core') source=("http://oligarchy.co.uk/xapian/${pkgver}/${_realname}-$pkgver.tar.gz") @@ -32,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: -md5sums=('9331d7885a68470184ba3d3e8c2b57d5') +sha512sums=('b3733308f0446fa041dcae677b3d3316bd8e775fcd1a1770ca2fab5b60e40463bbbce210cb1161161f6e9f1ff5e5473d38c2dab922b7f4f2705ac165d991c0ec') diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 21712eeef..8fae12b29 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88003 2013-04-09 21:45:04Z eric $ +# $Id: PKGBUILD 90083 2013-05-06 19:39:17Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> @@ -6,7 +6,7 @@ pkgname=qcad pkgver=2.0.5.0 -pkgrel=11 +pkgrel=12 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.ribbonsoft.com/qcad.html" diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD index 38f687b9f..78531b595 100644 --- a/community/qingy/PKGBUILD +++ b/community/qingy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80226 2012-11-18 01:50:13Z eric $ +# $Id: PKGBUILD 90406 2013-05-12 08:49:01Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qingy pkgver=1.0.0 -pkgrel=7 +pkgrel=8 pkgdesc="A DirectFB getty replacement" arch=('i686' 'x86_64' 'mips64el') url="http://qingy.sourceforge.net/" @@ -18,7 +18,7 @@ source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}. qingy.logrotate qingy@.service) sha1sums=('22ee505e935bf7ddcbd33e23f754a5a1ca082c81' '21676cf0b71334c666f7b3e4f3d8b4f319266c81' - '67f8fc1da5264cdaf79bd41a476451f4eef8f905') + '43a6f1cee03ffa598a77cb3c333cb1e8c63b4a2c') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -32,8 +32,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/sbin" - ln -s ../usr/bin/qingy "${pkgdir}/sbin/qingy" install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy" install -D -m644 "${srcdir}/qingy@.service" "${pkgdir}/usr/lib/systemd/system/qingy@.service" } diff --git a/community/qingy/qingy.install b/community/qingy/qingy.install index 5cf234b72..0defe31d8 100644 --- a/community/qingy/qingy.install +++ b/community/qingy/qingy.install @@ -2,6 +2,7 @@ infodir=usr/share/info filelist=(qingy.info.gz) post_install() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file $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 $infodir/dir 2> /dev/null done diff --git a/community/qingy/qingy@.service b/community/qingy/qingy@.service index ef9e7bfc2..537eb53fd 100644 --- a/community/qingy/qingy@.service +++ b/community/qingy/qingy@.service @@ -1,5 +1,5 @@ [Unit] -Description=Quingy on %I +Description=Qingy on %I Documentation=info:qingy After=systemd-user-sessions.service plymouth-quit-wait.service diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD index f48de07f5..7bb4da70a 100644 --- a/community/qpxtool/PKGBUILD +++ b/community/qpxtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85393 2013-03-01 10:38:26Z andrea $ +# $Id: PKGBUILD 90084 2013-05-06 19:39:19Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com> pkgname=qpxtool pkgver=0.7.2 -pkgrel=2 +pkgrel=3 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings." arch=('i686' 'x86_64' 'mips64el') url="http://qpxtool.sourceforge.net/" @@ -19,7 +19,10 @@ build() { cd $srcdir/$pkgname-$pkgver # Fix strict aliasing warnings export CFLAGS="$CFLAGS -fno-strict-aliasing" - sed -i 's|lib64|lib|' configure + sed -i \ + -e 's|lib64|lib|' \ + -e 's|lrelease|lrelease-qt4|' \ + configure patch -p1 <$srcdir/libpng15.patch ./configure --prefix=/usr make diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD index 5d14c5fa8..984dfe645 100644 --- a/community/qupzilla/PKGBUILD +++ b/community/qupzilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89115 2013-04-26 22:11:32Z speps $ +# $Id: PKGBUILD 90359 2013-05-11 23:23:44Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> _name=QupZilla pkgname=qupzilla -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc="Cross-platform QtWebKit browser" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ depends=('qtwebkit' 'hunspell') optdepends=('bash-completion: bash completion support') install="$pkgname.install" source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/v$pkgver") -md5sums=('e1989427fea976312ca4c0ec84ce41b2') +md5sums=('20187fcce11dbba876e1ee7dc5e32583') build() { cd "$srcdir/$_name-$pkgname-"* diff --git a/community/ratpoison/PKGBUILD b/community/ratpoison/PKGBUILD index b98d4f66f..dbfaaeac6 100644 --- a/community/ratpoison/PKGBUILD +++ b/community/ratpoison/PKGBUILD @@ -8,7 +8,7 @@ pkgname=ratpoison pkgver=1.4.6 pkgrel=1 pkgdesc="A simple keystroke-driven window manager" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libxinerama' 'readline' 'bash' 'perl' 'libxtst' 'libxft' 'texinfo') url="http://www.nongnu.org/ratpoison/" diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 4b7bbd45f..dca712682 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89596 2013-04-30 09:32:32Z bpiotrowski $ +# $Id: PKGBUILD 90085 2013-05-06 19:39:21Z foutrelis $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> @@ -6,7 +6,7 @@ pkgname=rawtherapee pkgver=4.0.10 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 6bd4b41b9..d35f348f8 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 89389 2013-04-29 06:54:51Z andrea $ +# $Id: PKGBUILD 90424 2013-05-12 10:14:44Z andrea $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq pkgver=2.3.0 -pkgrel=1 +pkgrel=2 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64' 'mips64el') url='http://rekonq.kde.org/' license=('GPL') depends=('kdebase-keditbookmarks' 'qoauth') makedepends=('cmake' 'automoc4') -optdepends=('qca-ossl: to use the sync handler') +optdepends=('kdebase-konqueror: search engines support' + 'qca-ossl: to use the sync handler') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") sha256sums=('f84fe975e79cbdcd218eb73d5371ee5ca0e11a2aea0d1d890ba9f24a505cf65c') diff --git a/community/rng-tools/PKGBUILD b/community/rng-tools/PKGBUILD index 830f2e8fa..2b5d8b91e 100644 --- a/community/rng-tools/PKGBUILD +++ b/community/rng-tools/PKGBUILD @@ -1,22 +1,23 @@ +# $Id: PKGBUILD 90470 2013-05-12 20:57:31Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Alasdair Haswell <ali at arhaswell dot co dot uk> pkgname=rng-tools pkgver=4 -pkgrel=1 +pkgrel=2 pkgdesc="Random number generator related utilities" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/gkernel/" license=('GPL') +depends=('glibc') backup=(etc/conf.d/rngd) source=(http://downloads.sourceforge.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz - rngd rngd.conf rngd.service) build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } @@ -24,11 +25,9 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -Dm0644 "$srcdir/rngd.service" "$pkgdir/usr/lib/systemd/system/rngd.service" - install -Dm0755 "$srcdir/rngd" "$pkgdir/etc/rc.d/rngd" install -Dm0644 "$srcdir/rngd.conf" "$pkgdir/etc/conf.d/rngd" } sha256sums=('b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195' - '45084eff83306c74e707a72b44b5b20d8b94777377af414e1c43f738c7a720ed' 'a4a19dbe5403b9dcb2bc6b3699dcaba7a47ff3e3ccf58aa3bdbfe14eb1d16003' - 'abf163089fc466e45955fd0da98a20a966b3b0b4c714c27b470d03fedfc04ca3') + 'd3e38ac1460e3072792def73281faf5f59dffe9ac43b00916252cc69f7c7d1b5') diff --git a/community/rng-tools/rngd b/community/rng-tools/rngd deleted file mode 100755 index bd6b8d62f..000000000 --- a/community/rng-tools/rngd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -rnd_device=/dev/random -rng_device=/dev/hw_random -timeout=0 - -[ -f /etc/conf.d/rngd ] && . /etc/conf.d/rngd -PID=$(pidof -o %PPID /usr/sbin/rngd) -case "$1" in - start) - stat_busy "Starting RNG" - [ -z "$PID" ] && /usr/sbin/rngd $RNGD_OPTS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon rngd - stat_done - fi - ;; - stop) - stat_busy "Stopping RNG" - [ ! -z "$PID" ] && kill -s SIGALRM $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon rngd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/rng-tools/rngd.service b/community/rng-tools/rngd.service index 87185bc32..33f6a6e38 100644 --- a/community/rng-tools/rngd.service +++ b/community/rng-tools/rngd.service @@ -3,7 +3,7 @@ Description=Hardware RNG Entropy Gatherer Daemon [Service] EnvironmentFile=/etc/conf.d/rngd -ExecStart=/usr/sbin/rngd -f $RNGD_OPTS +ExecStart=/usr/bin/rngd -f $RNGD_OPTS [Install] WantedBy=multi-user.target diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 7f0b6f99e..7fe16ed85 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88649 2013-04-21 07:40:40Z arodseth $ +# $Id: PKGBUILD 90322 2013-05-11 14:56:12Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -8,14 +8,14 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=1.2.6 +pkgver=2.0.0 pkgrel=1 arch=('x86_64' 'i686' 'mips64el') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('1b685d47b04f0a670a22db2af126cd145300bc664c38ee530f459c251ce7481f') +sha256sums=('6a36d2d4212e65f23d1c174b03006ea7fecaad1f3b82151dbfbe7ddf4268579f') prepare() { cd "$srcdir/ruby-gtk2-$pkgver" @@ -26,15 +26,14 @@ prepare() { "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ - "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ "$pkgdir/ruby-pango/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \ - "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" + "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \ + "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" } build() { cd "$srcdir/ruby-gtk2-$pkgver" - make } diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index fc150f002..792563d0a 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88651 2013-04-21 08:01:04Z arodseth $ +# $Id: PKGBUILD 90334 2013-05-11 15:51:15Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -6,16 +6,16 @@ # Contributor: kritoke <kritoke@nospam.gmail.com> pkgbase=ruby-gtk3 +pkgver=2.0.0 pkgname=('ruby-gtk3' 'ruby-gdk3') -depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-glib2' 'ruby-pango') -pkgver=1.2.6 +depends=("ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver" "ruby-glib2=$pkgver" "ruby-pango=$pkgver") pkgrel=1 arch=('x86_64' 'i686' 'mips64el') 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=('105395100bcbcfe8fa3fd5a2963ded64092303da64f31400887dbcd6a84d1e1a') +sha256sums=('f5e4cd605ece402ba9b8670058bb06c80ea9e21e4a1ff724d97394439091ff50') prepare() { cd "$srcdir/ruby-gtk3-$pkgver" @@ -25,7 +25,6 @@ prepare() { build() { cd "$srcdir/ruby-gtk3-$pkgver" - make } diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD index d2b60d9ac..a1a2f6071 100755 --- a/community/ruby-iconv/PKGBUILD +++ b/community/ruby-iconv/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ruby-iconv pkgver=1.0.3 pkgrel=2 pkgdesc="Wrapper library for iconv" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://github.com/nurse/iconv" license=('GPL3') depends=('ruby') diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD index 11a5af15f..7baa62a1a 100644 --- a/community/rust/PKGBUILD +++ b/community/rust/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 87747 2013-04-05 23:21:32Z thestinger $ +# $Id: PKGBUILD 90170 2013-05-07 22:11:28Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> pkgname=rust pkgver=0.6 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') pkgdesc='A safe, concurrent, practical language' url='http://www.rust-lang.org/' license=('MIT' 'Apache') -depends=(gcc-libs shared-mime-info) +depends=(gcc gcc-libs shared-mime-info) makedepends=(libffi perl python2 curl chrpath emacs) optdepends=('haskell-pandoc: documentation generator (rustdoc)') source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz") @@ -25,10 +25,10 @@ build() { make } -check() { - cd rust-$pkgver - make check -} +#check() { + #cd rust-$pkgver + #make check +#} package() { cd rust-$pkgver diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index eef80ac3c..a362b9f26 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87749 2013-04-06 00:49:20Z seblu $ +# $Id: PKGBUILD 90167 2013-05-07 19:14:34Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> @@ -6,12 +6,12 @@ pkgname=rxvt-unicode pkgver=9.18 -pkgrel=2 +pkgrel=3 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64' 'mips64el') url='http://software.schmorp.de/pkg/rxvt-unicode.html' license=('GPL') -depends=('libxft' 'gdk-pixbuf2' 'perl' 'startup-notification') +depends=('libxft' 'perl' 'startup-notification') optdepends=('gtk2-perl: to use the urxvt-tabbed') source=( "http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2" @@ -39,7 +39,6 @@ build() { --enable-mousewheel \ --enable-next-scroll \ --enable-perl \ - --enable-pixbuf \ --enable-pointer-blank \ --enable-rxvt-scroll \ --enable-selectionscrolling \ @@ -53,6 +52,7 @@ build() { --enable-xft \ --enable-xim \ --enable-xterm-scroll \ + --disable-pixbuf \ --disable-frills make } diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD index dcd7b0bee..95a7a0f85 100644 --- a/community/scantailor/PKGBUILD +++ b/community/scantailor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85409 2013-03-01 10:39:57Z andrea $ +# $Id: PKGBUILD 90086 2013-05-06 19:39:25Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com> pkgname=scantailor pkgver=0.9.11.1 -pkgrel=2 +pkgrel=3 pkgdesc="Interactive post-processing tool for scanned pages" arch=(i686 x86_64 'mips64el') url="http://scantailor.sourceforge.net" diff --git a/community/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD index eafb7c22f..0770354ba 100644 --- a/community/scorched3d/PKGBUILD +++ b/community/scorched3d/PKGBUILD @@ -5,7 +5,7 @@ pkgname=scorched3d pkgver=43.3.d _pkgver=43.3d -pkgrel=4 +pkgrel=5 pkgdesc="3D artillery combat game" arch=('i686' 'x86_64' 'mips64el') url="http://www.scorched3d.co.uk/" diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD index 4f235e5a5..736b5a9a5 100644 --- a/community/scummvm-tools/PKGBUILD +++ b/community/scummvm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63740 2012-02-05 12:10:55Z ibiru $ +# $Id: PKGBUILD 90088 2013-05-06 19:39:30Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jérémie Dimino <jeremie@dimino.org> # Contributor: Sebastian Hase <sebastian_hase@gmx.de> # Contributor: Joe Davison <joe@thosedamnpeanuts.com> pkgname=scummvm-tools pkgver=1.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="A set of tools that enable you to convert, compress and decode game datafiles for ScummVM" url="http://www.scummvm.org/" license=('GPL') @@ -17,8 +17,6 @@ md5sums=('43cbf9f5c4939876cf4149dd59e68044') build() { cd ${pkgname}-${pkgver} - install -d ${pkgdir}/usr/bin - ./configure --prefix=/usr make } @@ -26,6 +24,8 @@ build() { package() { cd ${pkgname}-${pkgver} + install -d ${pkgdir}/usr/bin + make DESTDIR=${pkgdir} install install -Dm 644 README ${pkgdir}/usr/share/doc/scummvm-tools/README diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index d95a12fc8..c073ec919 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,37 +1,28 @@ -# $Id: PKGBUILD 89870 2013-05-03 20:55:10Z arodseth $ +# $Id: PKGBUILD 89955 2013-05-06 09:59:45Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=setconf pkgver=0.5.3 -pkgrel=3 +pkgrel=4 pkgdesc='Utility to easily change settings in configuration files or Makefiles' arch=('x86_64' 'i686' 'mips64el') url='http://setconf.roboticoverlords.org/' license=('GPL2') depends=('pcre' 'gc') -if [ "$CARCH" == 'x86_64' ] || [ "$CARCH" == 'i686' ]; then - makedepends=('shedskin') -fi +makedepends=('shedskin') source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz") sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6') build() { cd "$srcdir/$pkgname-$pkgver" - if [ "$CARCH" == 'x86_64' ] || [ "$CARCH" == 'i686' ]; then - shedskin "$pkgname.py" && make - fi + 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 -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" } diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD index 76a74eca6..d08ab923b 100644 --- a/community/shapelib/PKGBUILD +++ b/community/shapelib/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 85552 2013-03-03 03:16:05Z cinelli $ -# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# $Id: PKGBUILD 90199 2013-05-08 13:40:53Z bpiotrowski $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Bob Finch <w9ya@arrl.net> pkgname=shapelib @@ -11,8 +10,8 @@ arch=('i686' 'x86_64' 'mips64el') url='http://shapelib.maptools.org/' license=('LGPL' 'MIT') options=('!libtool') -source=("http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz" - "LICENSE") +source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz + LICENSE) sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f' '67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789') @@ -25,7 +24,7 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd ${pkgname}-${pkgver} # The Makefile won't install it correctly, this is easier. install -D -m644 libshp.a "$pkgdir/usr/lib/libshp.a" diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD index 8739a9c19..a5b491226 100644 --- a/community/siege/PKGBUILD +++ b/community/siege/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80962 2012-12-07 23:56:44Z bluewind $ +# $Id: PKGBUILD 90182 2013-05-08 09:32:40Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Sven Kauber <celeon@gmail.com> pkgname=siege -pkgver=2.72 +pkgver=3.0.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -25,8 +25,8 @@ package() { install -d -m755 "$pkgdir/etc" install -d -m755 "$pkgdir/usr/share" - make DESTDIR="$pkgdir" sysconfdir="$pkgdir/etc" install + make DESTDIR="$pkgdir" install sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc" } -md5sums=('6bd0b1dca6b95717e23a6bade9a0a1f4') +md5sums=('e0ace61f7e01c6b545ac767fc499f817') diff --git a/community/silly/PKGBUILD b/community/silly/PKGBUILD index 75b9c4fa7..3cea28a3c 100644 --- a/community/silly/PKGBUILD +++ b/community/silly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63742 2012-02-05 12:11:01Z ibiru $ +# $Id: PKGBUILD 90090 2013-05-06 19:39:34Z foutrelis $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=silly pkgver=0.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="Simple Image Loading LibrarY, a part of the CEGUI project" arch=('i686' 'x86_64' 'mips64el') url="http://www.cegui.org.uk/wiki/index.php/SILLY" @@ -18,9 +18,17 @@ md5sums=('c3721547fced7792a36ffc9ce6ec23fd' build() { cd "${srcdir}/SILLY-${pkgver}" + patch -Np1 < $srcdir/silly-libpng1.5.patch + ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/SILLY-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/community/sloccount/PKGBUILD b/community/sloccount/PKGBUILD index e3358bc34..ee50e7253 100644 --- a/community/sloccount/PKGBUILD +++ b/community/sloccount/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 65665 2012-02-21 20:27:37Z cbrannon $ -# Maintainer: Chris Brannon <cmbrannon79@gmail.com> +# $Id: PKGBUILD 89970 2013-05-06 12:16:25Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Christof Musik <christof@senfdax.de> pkgname=sloccount pkgver=2.26 -pkgrel=6 -pkgdesc="Tools for counting physical source lines of code" -url="http://www.dwheeler.com/sloccount/" +pkgrel=7 +pkgdesc='Tools for counting physical source lines of code' +url='http://www.dwheeler.com/sloccount/' license=('GPL') depends=('perl') arch=('i686' 'x86_64' 'mips64el') -source=(http://www.dwheeler.com/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('09abd6e2a016ebaf7552068a1dba1249') +source=("http://www.dwheeler.com/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('fa7fa2bbf2f627dd2d0fdb958bd8ec4527231254c120a8b4322405d8a4e3d12b') package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -dm755 "${pkgdir}/usr/bin" - make PREFIX="${pkgdir}/usr" install - mv "${pkgdir}/usr/share/doc/sloccount-2.26-1" "${pkgdir}/usr/share/doc/sloccount" + cd "$srcdir/$pkgname-$pkgver" + + install -dm755 "$pkgdir/usr/bin" + make PREFIX="$pkgdir/usr" install + mv "$pkgdir/usr/share/doc/sloccount-2.26-1" "$pkgdir/usr/share/doc/sloccount" chmod 644 "$pkgdir/usr/share/doc/sloccount/"* } + +# vim:set ts=2 sw=2 et: diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD index c14281c8e..99a2f6b6d 100644 --- a/community/smc/PKGBUILD +++ b/community/smc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87438 2013-03-31 19:18:55Z stephane $ +# $Id: PKGBUILD 90091 2013-05-06 19:39:36Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=smc pkgver=1.9 -pkgrel=20 +pkgrel=21 pkgdesc="Secret Maryo Chronicles" arch=('i686' 'x86_64' 'mips64el') url="http://www.secretmaryo.org/" diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD index 2f01f1781..878c28a76 100644 --- a/community/speed-dreams/PKGBUILD +++ b/community/speed-dreams/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 71722 2012-06-01 18:48:00Z ebelanger $ +# $Id: PKGBUILD 90093 2013-05-06 19:39:40Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD) pkgname=speed-dreams pkgver=2.0.0 _pkgver=2.0.0-r4687 -pkgrel=2 +pkgrel=3 pkgdesc="A racing simulator with rich graphics and physics" arch=('i686' 'x86_64' 'mips64el') url="http://speed-dreams.sourceforge.net/" license=('GPL2') -depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data') -makedepends=('cmake' 'p7zip') +depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data' 'glu') +makedepends=('cmake' 'p7zip' 'mesa') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-base-${_pkgver}.tar.xz" "http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-unmaintained-${_pkgver}.tar.xz" "http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-wip-cars-and-tracks-${_pkgver}.tar.xz" diff --git a/community/sqlheavy/PKGBUILD b/community/sqlheavy/PKGBUILD index 43f08fc60..5803ede93 100755 --- a/community/sqlheavy/PKGBUILD +++ b/community/sqlheavy/PKGBUILD @@ -6,7 +6,7 @@ pkgname=sqlheavy pkgver=0.1.1 pkgrel=6 pkgdesc="GObject SQLite wrapper" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://code.google.com/p/sqlheavy/" license=('LGPL') conflicts=('sqlheavy-git') diff --git a/community/start-stop-daemon/PKGBUILD b/community/start-stop-daemon/PKGBUILD deleted file mode 100644 index 9971fdac6..000000000 --- a/community/start-stop-daemon/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 76825 2012-09-30 15:07:25Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: Soup <soup a.t soultrap d.o.t n.e.t> -# Contributor: Vladimir Koshelenko <koshelenko@rndavia.ru> - -pkgname=start-stop-daemon -pkgver=1.15.8.13 -pkgrel=1 -pkgdesc='Start and stop system daemon programs' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -url='http://packages.qa.debian.org/d/dpkg.html' -depends=('glibc') -source=("http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_$pkgver.tar.bz2") -md5sums=('7f6ea19838311a66fdacce17991eba85') - -build() { - cd dpkg-$pkgver - ./configure --without-dselect --without-update-alternatives --without-install-info - (cd lib && make) - cd utils && make -} - -package() { - cd dpkg-$pkgver - install -D -m 755 utils/start-stop-daemon "$pkgdir/usr/bin/start-stop-daemon" - install -D -m 644 man/start-stop-daemon.8 "$pkgdir/usr/share/man/man8/start-stop-daemon.8" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index 1a66faf0f..901855851 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88666 2013-04-21 13:40:47Z speps $ +# $Id: PKGBUILD 90361 2013-05-12 02:59:43Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: <farid at archlinux-br.org> _name=SuperCollider pkgname=supercollider -pkgver=3.6.4 +pkgver=3.6.5 pkgrel=1 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('emacs: emacs interface' 'ruby: vim support') install="$pkgname.install" source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2") -md5sums=('a6f0c1183f311ffcfbc143dce2332d74') +md5sums=('ac176ea512fc2b9a9be645322c5b20b4') build() { cd "$srcdir/$_name-Source" diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 4bd234999..c1e1c441d 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73486 2012-07-08 09:31:42Z ibiru $ +# $Id: PKGBUILD 90094 2013-05-06 19:39:42Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.63.05 -pkgrel=2 +pkgrel=3 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64 'mips64el') url="http://synfig.org" @@ -32,6 +32,7 @@ build() { [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv patch -p1 -i $srcdir/build-fix.patch patch -Np1 -i $srcdir/ffmpeg-0.8.patch + sed -i '1,1i#include <string.h>' src/modules/mod_png/trgt_png.cpp make } diff --git a/community/tmw/PKGBUILD b/community/tmw/PKGBUILD index a37f7dbc4..3fc5c5422 100644 --- a/community/tmw/PKGBUILD +++ b/community/tmw/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 75819 2012-09-01 20:39:38Z heftig $ +# $Id: PKGBUILD 90095 2013-05-06 19:39:43Z foutrelis $ # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=tmw pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." arch=('i686' 'x86_64' 'mips64el') url="http://themanaworld.org" license=('GPL') -depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' - 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf' 'glu') +depends=('glu' 'curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' + 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf') makedepends=('cmake' 'mesa') #source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2) source=($pkgname-$pkgver.tar.gz::https://github.com/mana/mana/tarball/v$pkgver) diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index 0d644cad8..6d70f0e29 100644 --- a/community/torcs/PKGBUILD +++ b/community/torcs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78671 2012-10-22 16:39:24Z spupykin $ +# $Id: PKGBUILD 90096 2013-05-06 19:39:45Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> pkgname=torcs pkgver=1.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD index 3b51c3188..4b5f98823 100644 --- a/community/tuxpaint/PKGBUILD +++ b/community/tuxpaint/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79380 2012-11-03 21:29:07Z arodseth $ +# $Id: PKGBUILD 90097 2013-05-06 19:39:46Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com> @@ -6,7 +6,7 @@ pkgname=tuxpaint pkgver=0.9.21 -pkgrel=7 +pkgrel=8 pkgdesc='Drawing program designed for young children' arch=('x86_64' 'i686' 'mips64el') url='http://www.tuxpaint.org/' @@ -24,12 +24,12 @@ sha256sums=('6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9' build() { cd "$srcdir/$pkgname-$pkgver" - + # python2 fix for f in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do sed -i '0,/on/s//on2/' $f done - + patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch sed -i 's:$(ARCH_LINKS):$(ARCH_LINKS) -lpng:' Makefile setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;' diff --git a/community/tvtime/PKGBUILD b/community/tvtime/PKGBUILD index 01b21ed4b..8286ddf67 100644 --- a/community/tvtime/PKGBUILD +++ b/community/tvtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80477 2012-11-22 15:02:49Z spupykin $ +# $Id: PKGBUILD 90098 2013-05-06 19:39:48Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:thefatprecious <marty@loomar.com> pkgname=tvtime pkgver=1.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="A high quality television application for use with video capture cards" arch=('i686' 'x86_64' 'mips64el') url='http://tvtime.sourceforge.net/' diff --git a/community/unionfs-fuse/PKGBUILD b/community/unionfs-fuse/PKGBUILD index bcb7c52d2..972acc31a 100644 --- a/community/unionfs-fuse/PKGBUILD +++ b/community/unionfs-fuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76241 2012-09-15 08:29:07Z aginiewicz $ +# $Id: PKGBUILD 90408 2013-05-12 09:00:26Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Smith Dhumbumroong <zodmaner at gmail dot com> pkgname=unionfs-fuse pkgver=0.26 -pkgrel=1 +pkgrel=2 pkgdesc="A user space unionfs implementation" arch=('i686' 'x86_64' 'mips64el') url="http://podgorny.cz/moin/UnionFsFuse" @@ -20,7 +20,7 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" PREFIX=/usr install + make SBINDIR="/bin" DESTDIR="$pkgdir" PREFIX=/usr install install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/usbview/PKGBUILD b/community/usbview/PKGBUILD index 8a0a59b05..9f5974388 100644 --- a/community/usbview/PKGBUILD +++ b/community/usbview/PKGBUILD @@ -6,7 +6,7 @@ pkgname=usbview pkgver=2.0 pkgrel=2 pkgdesc="Display the topology of devices on the USB bus" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.kroah.com/linux/usb/" license=('GPL') depends=('gtk3' 'desktop-file-utils') diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 08ca3d9d2..838f836fd 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89225 2013-04-28 06:44:11Z tpowa $ +# $Id: PKGBUILD 90419 2013-05-12 09:09:05Z thomas $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.12 -pkgrel=3 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -17,7 +17,7 @@ makedepends=('linux-headers' build() { _kernver=$(expac -Q '%v' linux-headers)-ARCH - + #_kernver=3.9.0-1-ARCH # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -31,8 +31,8 @@ build() { package_virtualbox-host-modules(){ _kernver=$(expac -Q '%v' linux-headers)-ARCH + #_kernver=3.9.0-1-ARCH _extraver=extramodules-${_kernver%.*}-ARCH - pkgdesc='Host kernel modules for VirtualBox' depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)") replaces=('virtualbox-modules') @@ -48,6 +48,7 @@ package_virtualbox-host-modules(){ package_virtualbox-guest-modules(){ _kernver=$(expac -Q '%v' linux-headers)-ARCH + #_kernver=3.9.0-1-ARCH _extraver=extramodules-${_kernver%.*}-ARCH pkgdesc='Guest kernel modules for VirtualBox' diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 3e61f3447..9084c05fd 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.8-ARCH' + EXTRAMODULES='extramodules-3.9-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.8-ARCH' + EXTRAMODULES='extramodules-3.9-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.8-ARCH' + EXTRAMODULES='extramodules-3.9-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index 378dab975..78791f71d 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -3,17 +3,17 @@ cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.8-ARCH' + EXTRAMODULES='extramodules-3.9-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.8-ARCH' + EXTRAMODULES='extramodules-3.9-ARCH' 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.8-ARCH' + EXTRAMODULES='extramodules-3.9-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/vlan/PKGBUILD b/community/vlan/PKGBUILD index 8cdaddd47..ca8374104 100644 --- a/community/vlan/PKGBUILD +++ b/community/vlan/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59555 2011-11-28 01:48:10Z seblu $ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 90479 2013-05-12 21:50:43Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=vlan pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc='Virtual LAN configuration utility' arch=('i686' 'x86_64') url='http://www.candelatech.com/~greear/vlan.html' @@ -13,15 +13,15 @@ source=("http://www.candelatech.com/~greear/vlan/vlan.${pkgver}.tar.gz") md5sums=('5f0c6060b33956fb16e11a15467dd394') build() { - cd vlan + cd $pkgname make clean all } package() { - cd vlan - install -D -m755 'vconfig' "$pkgdir/usr/sbin/vconfig" - install -D -m755 'macvlan_config' "$pkgdir/usr/sbin/macvlan_config" + cd $pkgname + install -D -m755 'vconfig' "$pkgdir/usr/bin/vconfig" + install -D -m755 'macvlan_config' "$pkgdir/usr/bin/macvlan_config" install -D -m644 'vconfig.8' "$pkgdir/usr/share/man/man8/vconfig.8" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/vor/PKGBUILD b/community/vor/PKGBUILD index f14b16d91..88efc9521 100644 --- a/community/vor/PKGBUILD +++ b/community/vor/PKGBUILD @@ -7,7 +7,7 @@ pkgname=vor pkgver=0.5.5 pkgrel=1 pkgdesc='Classic spaceship versus asteroid field arcade game' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://jasonwoof.org/vor?" license=('GPL') depends=('sdl_image' 'sdl_mixer') diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD index 43c26e6a0..59e3f6a1e 100644 --- a/community/vsftpd/PKGBUILD +++ b/community/vsftpd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76440 2012-09-18 15:37:11Z bpiotrowski $ +# $Id: PKGBUILD 90372 2013-05-12 05:50:20Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=vsftpd pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64' 'mips64el') url="https://security.appspot.com/vsftpd.html" @@ -14,21 +14,20 @@ depends=('openssl') backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') install=vsftpd.install source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc} - vsftpd.xinetd vsftpd.d vsftpd-ssl.socket vsftpd.socket + vsftpd.xinetd vsftpd-ssl.socket vsftpd.socket vsftpd.service vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service) -sha1sums=('f36976bb1c5df25ac236d8a29e965ba2b825ccd0' - '42c6055c1418ad93340bfa3b176b60f1e5b15e0a' - 'c87b4ce56dac15223694a6e86c01ea813b877596' - '24f268956c24e78be0c234c6d31f41487922eafe' - 'f81dab50243f7e82dc9722ca79b2b24de0882eb2' - '5b7a7a1e0c04acfcc2dba1346557f1193b9905ba' - 'cde3528825b073d3941c263e9e63b4c298a97c47' - '3a040a18893a5103a1d4a22e631ee247bde8c8d3' - '2b0a778d7b2329a6d4c01a64ef6c7d90144cd3ab' - 'e5bd183664008bb0cc0353d4efb2e8e92a365798') +sha256sums=('be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56' + 'SKIP' + '5909f9b95479429c236170a06879d27d07ddda52d9c4c5543c961500c4cac2e0' + 'd5185e48fffc6253499a55e0fe0f90a3424fc639640af11a9d38df33fb145afe' + '9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9' + '50c392f373f8ce37aa226a9af7a6b038a8683ee3e041ebbad1bb483e47e8a1f8' + 'd7b8e4827d4f6bafcbf52f9d2d7380958c7b08bb3f757806aa89d4bc06c9671c' + 'b88a50fc68b3bf746d13c9a777df77791cd3eac6eb7c2df655418071c2adf422' + '4a55c2468b08d858f71bacf1f4885847bec8e548b0e92088068d9bdd3884af84') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver # build-time config sed \ @@ -39,14 +38,13 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver - install -D -m755 vsftpd $pkgdir/usr/sbin/vsftpd + install -D -m755 vsftpd $pkgdir/usr/bin/vsftpd install -D -m644 vsftpd.conf $pkgdir/etc/vsftpd.conf install -D -m644 vsftpd.8 $pkgdir/usr/share/man/man8/vsftpd.8 install -D -m644 vsftpd.conf.5 $pkgdir/usr/share/man/man5/vsftpd.conf.5 install -D -m644 $srcdir/vsftpd.xinetd $pkgdir/etc/xinetd.d/vsftpd - install -D -m755 $srcdir/vsftpd.d $pkgdir/etc/rc.d/vsftpd install -D -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service install -D -m644 $srcdir/vsftpd@.service $pkgdir/usr/lib/systemd/system/vsftpd@.service diff --git a/community/vsftpd/vsftpd-ssl.service b/community/vsftpd/vsftpd-ssl.service index b5b84b3c3..3343bc920 100644 --- a/community/vsftpd/vsftpd-ssl.service +++ b/community/vsftpd/vsftpd-ssl.service @@ -2,7 +2,7 @@ Description=vsftpd daemon (legacy implicit SSL) [Service] -ExecStart=/usr/sbin/vsftpd -oimplicit_ssl=yes +ExecStart=/usr/bin/vsftpd -oimplicit_ssl=yes ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/community/vsftpd/vsftpd-ssl@.service b/community/vsftpd/vsftpd-ssl@.service index e53fad324..8bcf78e55 100644 --- a/community/vsftpd/vsftpd-ssl@.service +++ b/community/vsftpd/vsftpd-ssl@.service @@ -2,7 +2,7 @@ Description=vsftpd per-connection server (legacy implicit SSL) [Service] -ExecStart=-/usr/sbin/vsftpd -oimplicit_ssl=yes +ExecStart=-/usr/bin/vsftpd -oimplicit_ssl=yes ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket StandardOutput=socket diff --git a/community/vsftpd/vsftpd.d b/community/vsftpd/vsftpd.d deleted file mode 100644 index 27310855c..000000000 --- a/community/vsftpd/vsftpd.d +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -daemon_name=vsftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -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 & - # - 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/community/vsftpd/vsftpd.service b/community/vsftpd/vsftpd.service index cbd10d9d1..63876460c 100644 --- a/community/vsftpd/vsftpd.service +++ b/community/vsftpd/vsftpd.service @@ -2,7 +2,7 @@ Description=vsftpd daemon [Service] -ExecStart=/usr/sbin/vsftpd +ExecStart=/usr/bin/vsftpd ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/community/vsftpd/vsftpd.xinetd b/community/vsftpd/vsftpd.xinetd index eff2eb3db..2a6f38c80 100644 --- a/community/vsftpd/vsftpd.xinetd +++ b/community/vsftpd/vsftpd.xinetd @@ -3,7 +3,7 @@ service ftp socket_type = stream wait = no user = root - server = /usr/sbin/vsftpd + server = /usr/bin/vsftpd log_on_success += HOST DURATION log_on_failure += HOST disable = yes diff --git a/community/vsftpd/vsftpd@.service b/community/vsftpd/vsftpd@.service index 353f95f82..81e142990 100644 --- a/community/vsftpd/vsftpd@.service +++ b/community/vsftpd/vsftpd@.service @@ -2,7 +2,7 @@ Description=vsftpd per-connection server [Service] -ExecStart=-/usr/sbin/vsftpd +ExecStart=-/usr/bin/vsftpd ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket StandardError=syslog diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 592a5ecee..46db8282a 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87540 2013-04-02 19:06:45Z aginiewicz $ +# $Id: PKGBUILD 90101 2013-05-06 19:39:56Z foutrelis $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -12,7 +12,7 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=7 +pkgrel=8 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' diff --git a/community/w3cam/PKGBUILD b/community/w3cam/PKGBUILD index fa507841f..b1d710260 100644 --- a/community/w3cam/PKGBUILD +++ b/community/w3cam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63771 2012-02-05 12:13:37Z ibiru $ +# $Id: PKGBUILD 90102 2013-05-06 19:39:58Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Christian Schmidt <mucknert@gmx.net> pkgname=w3cam pkgver=0.7.2 -pkgrel=10 +pkgrel=11 pkgdesc="a small and fast CGI program to retrieve images from a video4linux device." arch=('i686' 'x86_64' 'mips64el') url="http://mpx.freeshell.net/" diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD index 65e5012a8..1e2330ba6 100644 --- a/community/warmux/PKGBUILD +++ b/community/warmux/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75821 2012-09-01 20:39:50Z heftig $ +# $Id: PKGBUILD 90103 2013-05-06 19:39:59Z foutrelis $ # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: pukyxd # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=warmux pkgver=11.04.1 -pkgrel=5 +pkgrel=6 pkgdesc="A clone of the worms game" arch=('i686' 'x86_64' 'mips64el') url="http://www.wormux.org/" diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 0eaddd8e8..81ffa3f17 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85425 2013-03-01 10:42:35Z andrea $ +# $Id: PKGBUILD 90105 2013-05-06 19:40:03Z foutrelis $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 pkgver=3.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD index 2a89d9d27..b78ea24fe 100644 --- a/community/wesnoth/PKGBUILD +++ b/community/wesnoth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87442 2013-03-31 19:19:03Z stephane $ +# $Id: PKGBUILD 90106 2013-05-06 19:40:04Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -7,7 +7,7 @@ pkgname=wesnoth pkgver=1.10.6 -pkgrel=2 +pkgrel=3 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index 0bae3a41b..7bfd83c35 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -1,16 +1,16 @@ +# $Id: PKGBUILD 90107 2013-05-06 19:40:06Z foutrelis $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=weston pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc='Reference implementation of a Wayland compositor' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://wayland.freedesktop.org' license=('MIT') options=(!libtool) -depends=('libxkbcommon' 'libunwind' 'wayland' 'mesa' 'cairo' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' - 'pango' 'xkeyboard-config') +depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") sha1sums=('0929afa86d795e0e970936623d86bdd950d48e8d') diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index 29a7bc55d..be6de20ac 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81133 2012-12-12 00:49:45Z eric $ +# $Id: PKGBUILD 90108 2013-05-06 19:40:08Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,12 +6,12 @@ pkgname=widelands pkgver=17 _realver=build17 -pkgrel=6 +pkgrel=7 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64' 'mips64el') url="http://widelands.org/" license=('GPL') -depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua51' 'glew' 'python2') +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua51' 'glew' 'python2' 'boost-libs') makedepends=('cmake' 'boost' 'mesa') source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2" $pkgname.desktop @@ -26,6 +26,7 @@ build() { cd $srcdir/$pkgname-$_realver-src sed -i "1 i #include <unistd.h>" src/main.cc + sed -i "/Boost_USE_STATIC_LIBS/d" CMakeLists.txt mkdir -p build/compile && cd build/compile diff --git a/community/wxgtk2.9/PKGBUILD b/community/wxgtk2.9/PKGBUILD index 2247e2511..a90bb4f4e 100644 --- a/community/wxgtk2.9/PKGBUILD +++ b/community/wxgtk2.9/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 74217 2012-07-23 03:07:35Z allan $ +# $Id: PKGBUILD 90109 2013-05-06 19:40:09Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk2.9 pkgver=2.9.4 -pkgrel=2 +pkgrel=3 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64' 'mips64el') url="http://wxwidgets.org" license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa') +depends=('gtk2' 'gstreamer0.10-base') +makedepends=('gstreamer0.10-base-plugins' 'gconf') source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 wxGTK-2.9.4-collision.patch) sha1sums=('5a34ddf19d37c741f74652ee847df9568a8b81e1' 'a76ccca4c2fad246c9aafbcc5a9697ebf35f33a3') -build() { - cd "${srcdir}/wxWidgets-${pkgver}" +prepare() { + cd wxWidgets-${pkgver} patch -p1 -i ../wxGTK-2.9.4-collision.patch +} + +build() { + cd wxWidgets-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ @@ -26,7 +30,7 @@ build() { } package() { - cd "${srcdir}/wxWidgets-${pkgver}" + cd wxWidgets-${pkgver} make DESTDIR="${pkgdir}" install rm "${pkgdir}/usr/share/locale/it/LC_MESSAGES/wxmsw.mo" install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/community/xautomation/PKGBUILD b/community/xautomation/PKGBUILD index b295b6e28..ed5f38416 100644 --- a/community/xautomation/PKGBUILD +++ b/community/xautomation/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63780 2012-02-05 12:14:20Z ibiru $ +# $Id: PKGBUILD 90110 2013-05-06 19:40:11Z foutrelis $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: raubkopierer <mail[dot]sensenmann[at]gmail[dot]com> pkgname=xautomation pkgver=1.05 -pkgrel=2 +pkgrel=3 pkgdesc='Controls X from the command line and does "visual scraping".' url='http://hoopajoo.net/projects/xautomation.html' arch=('i686' 'x86_64' 'mips64el') diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index 72adcc8cb..6616f3643 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87589 2013-04-03 13:31:16Z idevolder $ +# $Id: PKGBUILD 90148 2013-05-07 12:45:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -8,8 +8,8 @@ _prefix=/usr pkgname=xbmc -pkgver=12.1 -pkgrel=5 +pkgver=12.2 +pkgrel=1 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -34,7 +34,7 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' install="${pkgname}.install" source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" "xbmc.service") -md5sums=('8955473f84cb2a0513c0f3efd7e68843' +md5sums=('489f3877decae4e265ece54f9eaef0ba' '76fae229ebc3bcfaab7e7f27e4fb51f5') build() { @@ -42,6 +42,7 @@ build() { # fix lsb_release dependency sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp + sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp # Bootstrapping XBMC ./bootstrap diff --git a/community/xe-guest-utilities/PKGBUILD b/community/xe-guest-utilities/PKGBUILD index feafca99b..3fd142e5c 100644 --- a/community/xe-guest-utilities/PKGBUILD +++ b/community/xe-guest-utilities/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89210 2013-04-28 05:04:55Z dwallace $ +# $Id: PKGBUILD 90393 2013-05-12 07:10:12Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at code gtmanfred com> # Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gnu-tech.pl> @@ -6,15 +6,12 @@ pkgbase=xe-guest-utilities pkgname=('xe-guest-utilities' 'xenstore') pkgver=6.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="Citrix XenServer Tools" arch=('i686' 'x86_64') url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US" license=('GPL' 'LGPL') makedepends=(python2) -optdepends=('linux: DomU kernel for x86_64' - 'linux-xen: DomU kernel for i686' - 'kernel-lts-xen: DomU kernel for i686') source=("ftp://ftp.archlinux.org/other/community/$pkgbase/${pkgbase}_${pkgver}-1033.tar.gz" 'ip_address.patch' 'xe-linux-distribution.service' @@ -23,8 +20,8 @@ source=("ftp://ftp.archlinux.org/other/community/$pkgbase/${pkgbase}_${pkgver}-1 'tmpfile') md5sums=('26fd52ffc5ddeb7d3e510e6f272c2860' '9bd39e95384056069f7faa870a28413a' - 'abf49bd0925142e51ce2875cd5e5ad45' - '43264c6954c9c036b260521653ade41f' + '95064a7d8a32cd3aaca14e3b48c69599' + '173fed74c76817702b062ed653002db0' '3252fa21362fd55246f9d8b923070151' 'cadad1eb5b1fa6d5fe463a1a0fd82fff') @@ -52,7 +49,7 @@ package_xenstore() { fi for f in include libxc xenstore; do [[ ! -d "$srcdir"/uclibc-sources/tools/$f ]] && continue - make -C ""$srcdir"/uclibc-sources/tools/$f" DESTDIR="$pkgdir" install + make -C ""$srcdir"/uclibc-sources/tools/$f" DESTDIR="$pkgdir" SBINDIR=/usr/bin install done cd "$srcdir/$pkgbase-$pkgver" install -Dm644 "COPYING.LGPL" "$pkgdir/usr/share/licenses/$pkgname/COPYING.LGPL" @@ -65,9 +62,9 @@ package_xenstore() { package_xe-guest-utilities(){ cd "$srcdir/$pkgname-$pkgver" depends=('xenstore' 'bash') - install -Dm755 xe-linux-distribution "$pkgdir/usr/sbin/xe-linux-distribution" - install -Dm755 xe-update-guest-attrs "$pkgdir/usr/sbin/xe-update-guest-attrs" - install -Dm755 xe-daemon "$pkgdir/usr/sbin/xe-daemon" + install -Dm755 xe-linux-distribution "$pkgdir/usr/bin/xe-linux-distribution" + install -Dm755 xe-update-guest-attrs "$pkgdir/usr/bin/xe-update-guest-attrs" + install -Dm755 xe-daemon "$pkgdir/usr/bin/xe-daemon" install -Dm644 xen-vcpu-hotplug.rules "$pkgdir/usr/lib/udev/rules.d/10-xen-vcpu-hotplug.rules" install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -Dm644 $srcdir/xe-daemon.service "$pkgdir/usr/lib/systemd/system/xe-daemon.service" diff --git a/community/xe-guest-utilities/xe-daemon.service b/community/xe-guest-utilities/xe-daemon.service index 5245c702d..0a5a6ee92 100644 --- a/community/xe-guest-utilities/xe-daemon.service +++ b/community/xe-guest-utilities/xe-daemon.service @@ -5,8 +5,8 @@ Requires=proc-xen.mount [Service] PIDFile=/run/xe-daemon.pid -ExecStart=/usr/sbin/xe-daemon -p /run/xe-daemon.pid -ExecStop=/bin/pkill -TERM -F /run/xe-daemon.pid +ExecStart=/usr/bin/xe-daemon -p /run/xe-daemon.pid +ExecStop=/usr/bin/pkill -TERM -F /run/xe-daemon.pid [Install] WantedBy=multi-user.target diff --git a/community/xe-guest-utilities/xe-linux-distribution.service b/community/xe-guest-utilities/xe-linux-distribution.service index 5f3f91cc0..eb0b32ff4 100644 --- a/community/xe-guest-utilities/xe-linux-distribution.service +++ b/community/xe-guest-utilities/xe-linux-distribution.service @@ -5,7 +5,7 @@ Before=xend.service [Service] Type=simple RemainAfterExit=yes -ExecStart=/usr/sbin/xe-linux-distribution /var/cache/xe-linux-distribution +ExecStart=/usr/bin/xe-linux-distribution /var/cache/xe-linux-distribution [Install] WantedBy=multi-user.target diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD index 685e896b6..8db1d4fe3 100644 --- a/community/xemacs/PKGBUILD +++ b/community/xemacs/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82018 2013-01-05 17:22:28Z jlichtblau $ +# $Id: PKGBUILD 90112 2013-05-06 19:40:17Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: juergen <juergen@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=xemacs pkgver=21.5.33 -pkgrel=1 +pkgrel=2 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" arch=('i686' 'x86_64' 'mips64el') url="http://www.xemacs.org/" diff --git a/community/xloadimage/PKGBUILD b/community/xloadimage/PKGBUILD index 7917e5a8e..3d0602889 100644 --- a/community/xloadimage/PKGBUILD +++ b/community/xloadimage/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63786 2012-02-05 12:15:07Z ibiru $ +# $Id: PKGBUILD 90113 2013-05-06 19:40:18Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Link Dupont <link@subpop.net> pkgname=xloadimage pkgver=4.1 -pkgrel=12 +pkgrel=13 pkgdesc="An utility to view many different types of images under X11" arch=(i686 x86_64 'mips64el') #url="http://world.std.com/~jimf/xloadimage.html" @@ -29,6 +29,10 @@ build() { patch -p1 <$srcdir/png15-tiff4.patch xmkmf make +} + +package() { + cd $srcdir/$pkgname.$pkgver install -D -m755 xloadimage $pkgdir/usr/bin/xloadimage install -D -m755 uufilter $pkgdir/usr/bin/uufilter diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 1a6e973aa..fc660793d 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89333 2013-04-28 16:53:04Z td123 $ +# $Id: PKGBUILD 89949 2013-05-06 07:32:36Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=xmobar -pkgver=0.16 -pkgrel=6 +pkgver=0.17 +pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" license=('custom:BSD3') @@ -14,7 +14,6 @@ makedepends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'ha 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3') options=('strip') source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) -md5sums=('4742f1556a8e9b292f18df1176dcd378') build() { cd ${srcdir}/xmobar-$pkgver @@ -29,3 +28,4 @@ package() { install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } +md5sums=('d50287cd9f2284737c89e36de0eca107') diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD index 0c958c2bd..60c2f03f0 100644 --- a/community/xmoto/PKGBUILD +++ b/community/xmoto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81134 2012-12-12 00:49:46Z eric $ +# $Id: PKGBUILD 90114 2013-05-06 19:40:20Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Denis (dtonator@gmail.com) pkgname=xmoto pkgver=0.5.10 -pkgrel=3.1 +pkgrel=4 pkgdesc="A challenging 2D motocross platform game, where physics play an important role." arch=('i686' 'x86_64' 'mips64el') url="http://xmoto.tuxfamily.org" diff --git a/community/xnc/PKGBUILD b/community/xnc/PKGBUILD index 74b6a4f11..d0c50f8a5 100644 --- a/community/xnc/PKGBUILD +++ b/community/xnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63790 2012-02-05 12:15:33Z ibiru $ +# $Id: PKGBUILD 90115 2013-05-06 19:40:24Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xnc pkgver=5.0.4 -pkgrel=6 +pkgrel=7 pkgdesc="X nortern captain file manager" arch=(i686 x86_64 'mips64el') url="http://xnc.jinr.ru/" @@ -25,5 +25,9 @@ build() { patch -p1 <$srcdir/libpng15.patch ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD index 9222d0f85..cbb286493 100755 --- a/community/xnoise/PKGBUILD +++ b/community/xnoise/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87484 2013-04-01 12:09:37Z fyan $ +# $Id: PKGBUILD 90300 2013-05-11 05:30:04Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: archtux <antonio dot arias99999 at gmail dot com> pkgname=xnoise -pkgver=0.2.17 -pkgrel=3 +pkgver=0.2.18 +pkgrel=1 pkgdesc="Media player with a slick GUI, great speed and lots of features." arch=('i686' 'x86_64' 'mips64el') url="http://www.xnoise-media-player.com/" @@ -34,4 +34,4 @@ package() { # Remove obsolete files rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala" } -md5sums=('a72b0adf06667f682f972f9c38174f02') +sha512sums=('afe6d380f84c96d3612ed6a01a31b279b06d101252304a83be081eb25d4342e3487aa0f1955c3aa6b70297f8858d3c01be5f708a37c3741a1c2b6afd76127e9b') diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD index b9221c93e..ac2ff5123 100644 --- a/community/xplanet/PKGBUILD +++ b/community/xplanet/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70418 2012-05-05 19:10:15Z spupykin $ +# $Id: PKGBUILD 90116 2013-05-06 19:40:25Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=xplanet pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="An Xearth wannabe" arch=(i686 x86_64 'mips64el') url="http://xplanet.sourceforge.net/" @@ -18,5 +18,9 @@ build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --with-freetype make +} + +package() { + cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr install } diff --git a/community/yaml-cpp0.3/PKGBUILD b/community/yaml-cpp0.3/PKGBUILD deleted file mode 100644 index 302acb91b..000000000 --- a/community/yaml-cpp0.3/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 82852 2013-01-25 03:41:20Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Markus Martin <markus@archwyrm.net> -pkgname=yaml-cpp0.3 -_pkgname=yaml-cpp -pkgver=0.3.0 -pkgrel=2 -pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec" -url="http://code.google.com/p/yaml-cpp/" -arch=('i686' 'x86_64' 'mips64el') -license=('MIT') -conflicts=('yaml-cpp') -provides=('yaml-cpp=0.3') -makedepends=('cmake') -source=(http://yaml-cpp.googlecode.com/files/$_pkgname-$pkgver.tar.gz) -md5sums=('9aa519205a543f9372bf4179071c8ac6') - -build() { - cd $srcdir/$_pkgname - - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON - make -} - -package() { - cd $srcdir/$_pkgname - - make DESTDIR=$pkgdir install -} diff --git a/core/dirmngr/PKGBUILD b/core/dirmngr/PKGBUILD index 9d2215e8a..30240c121 100644 --- a/core/dirmngr/PKGBUILD +++ b/core/dirmngr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183488 2013-04-22 09:10:15Z tpowa $ +# $Id: PKGBUILD 184781 2013-05-08 13:18:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=dirmngr -pkgver=1.1.0 -pkgrel=5 +pkgver=1.1.1 +pkgrel=1 pkgdesc="A daemon to handle CRL and certificate requests" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -11,6 +11,7 @@ url="ftp://ftp.gnupg.org/gcrypt/dirmngr" depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth') source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) install=dirmngr.install +md5sums=('f5a40e93bcf07a94522579bfd58a2c96') build() { cd $srcdir/$pkgname-$pkgver @@ -27,4 +28,3 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } -md5sums=('f2570f0248f5947daac200e85291b328') diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD index 406e8e54d..b452839e3 100644 --- a/core/gpgme/PKGBUILD +++ b/core/gpgme/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183490 2013-04-22 09:10:17Z tpowa $ +# $Id: PKGBUILD 184779 2013-05-08 13:18:12Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=gpgme -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="A C wrapper library for GnuPG" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('libgpg-error' 'pth' 'gnupg>=2') install=${pkgname}.install options=('!libtool' '!emptydirs') source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('a0f93aba6d8a831ba14905085027f2f9' +md5sums=('07f1c0eb6596a94efa3ffb75e74bfbba' 'SKIP') build() { diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index 26f4be43c..cf06151aa 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180027 2013-03-14 20:45:46Z foutrelis $ +# $Id: PKGBUILD 184614 2013-05-07 16:15:47Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=3.8.0 +pkgver=3.9.0 pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64' 'mips64el') @@ -21,17 +21,23 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz iproute2-fhs.patch) -sha1sums=('6d40dd2b91aad9ae084c99973dcdfdbf6fb353fc' +sha1sums=('3f48a6d3019f1766f26cda6c4de5d3858837d92b' '35b8cf2dc94b73eccad427235c07596146cd6f6c') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver # set correct fhs structure patch -Np1 -i "$srcdir/iproute2-fhs.patch" - ./configure + # do not treat warnings as errors + sed -i 's/-Werror//' Makefile +} +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure make } diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index 967791d57..4037121b5 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179636 2013-03-08 23:40:39Z foutrelis $ +# $Id: PKGBUILD 185217 2013-05-12 09:08:11Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=iw -pkgver=3.8 -pkgrel=3 +pkgver=3.10 +pkgrel=1 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64" 'mips64el') url="http://wireless.kernel.org/en/users/Documentation/iw" @@ -11,7 +11,7 @@ license=("GPL") depends=("libnl") makedepends=("linux-api-headers") source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('50c07d5fcf38240b3912fb6950f6ec566b8d27c321cbdacc1de53fc3be96af9a') +sha256sums=('456ee212cfb728e292667caa508a7dff902666c78579814756a3012d68d64fe9') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD index bd3c7ca7b..d5a4a69c2 100644 --- a/core/libpcap/PKGBUILD +++ b/core/libpcap/PKGBUILD @@ -1,25 +1,21 @@ -# $Id: PKGBUILD 179638 2013-03-08 23:40:41Z foutrelis $ +# $Id: PKGBUILD 185218 2013-05-12 09:08:12Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libpcap -pkgver=1.3.0 -pkgrel=3 +pkgver=1.4.0 +pkgrel=1 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64' 'mips64el') url="http://www.tcpdump.org/" license=('BSD') depends=('glibc' 'libnl' 'sh' 'libusbx') makedepends=('flex') -source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig} - libnl32.patch) -sha256sums=('41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9' - 'a078cf1c0f36151cc84a0da7c25ad81fef87afa6bece58c990c62886a7beef99' - '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6') +source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig}) +sha256sums=('7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/libnl32.patch" - autoreconf -f -i ./configure --prefix=/usr --enable-ipv6 --with-libnl make } diff --git a/core/libpcap/libnl32.patch b/core/libpcap/libnl32.patch deleted file mode 100644 index 633fd003e..000000000 --- a/core/libpcap/libnl32.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in ---- libpcap-1.2.1/configure.in 2012-01-02 01:47:37.000000000 +0100 -+++ libpcap-1.2.1-libnl32/configure.in 2012-02-09 19:29:29.405603749 +0100 -@@ -433,12 +433,13 @@ - # - # Try libnl 2.x first. - # -- AC_CHECK_LIB(nl, nl_socket_alloc, -+ AC_CHECK_LIB(nl-3, nl_socket_alloc, - [ - # - # Yes, we have libnl 2.x. - # -- LIBS="-lnl-genl -lnl $LIBS" -+ LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS" -+ V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)" - AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) - AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x]) - ], diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD index 6691c7042..54583c02b 100644 --- a/core/libpipeline/PKGBUILD +++ b/core/libpipeline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166835 2012-09-19 19:45:26Z andyrtr $ +# $Id: PKGBUILD 184997 2013-05-09 19:48:45Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libpipeline -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" arch=('i686' 'x86_64' 'mips64el') @@ -10,8 +10,9 @@ url="http://libpipeline.nongnu.org/" license=('GPL') depends=('glibc') options=('!libtool') -source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz) -md5sums=('4367a3f598d171fd43dfa8620ed16d55') +source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('f4866aa3a84f2852c78f87ff619dfc60' + 'SKIP') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/libtirpc/PKGBUILD b/core/libtirpc/PKGBUILD index c6dcfadb8..fb70c3cc8 100644 --- a/core/libtirpc/PKGBUILD +++ b/core/libtirpc/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 170257 2012-11-06 12:56:18Z tomegun $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 185038 2013-05-10 16:21:42Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libtirpc -pkgver=0.2.2 -pkgrel=4 +pkgver=0.2.3 +pkgrel=1 pkgdesc="Transport Independent RPC library (SunRPC replacement)" arch=(i686 x86_64 mips64el) url="http://libtirpc.sourceforge.net/" @@ -12,31 +13,22 @@ depends=('libgssglue') backup=('etc/netconfig') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2 - libtirpc-0.2.1-fortify.patch - libtirpc-0.2.3rc1.patch - libtirpc-fix-segfault-0.2.2.patch) -md5sums=('74c41c15c2909f7d11d9c7bfa7db6273' - '2e5c067f1651469dfbbdc91d3c9c60e8' - 'ac2a1657b44f4a99c37d8265b05b9133' - '5a3ab55934cad4e8b38fc90c54756472') + libtirpc-build.patch) build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix http://bugs.gentoo.org/293593 - # https://bugs.archlinux.org/task/20082 - patch -Np1 -i ../libtirpc-0.2.1-fortify.patch - # add patches from fedora git to make nfs-utils compile again - patch -Np1 -i ../libtirpc-0.2.3rc1.patch - patch -Np1 -i ../libtirpc-fix-segfault-0.2.2.patch - sh autogen.sh - autoreconf -fisv - ./configure --prefix=/usr --enable-gss + + patch -p1 <"$srcdir/libtirpc-build.patch" + + ./configure --prefix=/usr --sysconf=/etc --enable-gss + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 doc/etc_netconfig "${pkgdir}"/etc/netconfig install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } +md5sums=('b70e6c12a369a91e69fcc3b9feb23d61' + 'd4c0eef2f0891abf06cd4146eb51ed36') diff --git a/core/libtirpc/libtirpc-0.2.1-fortify.patch b/core/libtirpc/libtirpc-0.2.1-fortify.patch deleted file mode 100644 index 7375bf83e..000000000 --- a/core/libtirpc/libtirpc-0.2.1-fortify.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: libtirpc-0.2.1/src/getrpcport.c -=================================================================== ---- libtirpc-0.2.1.orig/src/getrpcport.c -+++ libtirpc-0.2.1/src/getrpcport.c -@@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto - - if ((hp = gethostbyname(host)) == NULL) - return (0); -+ if (hp->h_length != sizeof(addr.sin_addr.s_addr)) -+ return (0); - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = 0; -- if (hp->h_length > sizeof(addr)) -- hp->h_length = sizeof(addr); - memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length); - /* Inconsistent interfaces need casts! :-( */ - return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, diff --git a/core/libtirpc/libtirpc-0.2.3rc1.patch b/core/libtirpc/libtirpc-0.2.3rc1.patch deleted file mode 100644 index d57a59e1f..000000000 --- a/core/libtirpc/libtirpc-0.2.3rc1.patch +++ /dev/null @@ -1,637 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 7ee8cbc..6731ff9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -50,7 +50,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ - rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ - svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c auth_des.c authdes_prot.c des_crypt.c -+ auth_time.c auth_des.c authdes_prot.c - - ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c -diff --git a/src/auth_des.c b/src/auth_des.c -index 37e7667..f0c8b8c 100644 ---- a/src/auth_des.c -+++ b/src/auth_des.c -@@ -223,6 +223,7 @@ authdes_pk_seccreate(const char *servername, netobj *pkey, u_int window, - goto failed; - } - ad->ad_nis_srvr = NULL; /* not needed any longer */ -+ auth_get(auth); /* Reference for caller */ - return (auth); - - failed: -@@ -472,6 +473,12 @@ authdes_destroy(AUTH *auth) - FREE(auth, sizeof(AUTH)); - } - -+static bool_t -+authdes_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authdes_ops(void) - { -@@ -487,6 +494,8 @@ authdes_ops(void) - ops.ah_validate = authdes_validate; - ops.ah_refresh = authdes_refresh; - ops.ah_destroy = authdes_destroy; -+ ops.ah_wrap = authdes_wrap; -+ ops.ah_unwrap = authdes_wrap; - } - mutex_unlock(&authdes_ops_lock); - return (&ops); -diff --git a/src/auth_gss.c b/src/auth_gss.c -index df3017a..a992049 100644 ---- a/src/auth_gss.c -+++ b/src/auth_gss.c -@@ -200,6 +200,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec) - - if (!authgss_refresh(auth)) - auth = NULL; -+ else -+ auth_get(auth); /* Reference for caller */ - - clnt->cl_auth = save_auth; - -@@ -555,9 +557,20 @@ authgss_destroy_context(AUTH *auth) - - if (gd->gc.gc_ctx.length != 0) { - if (gd->established) { -+ AUTH *save_auth = NULL; -+ -+ /* Make sure we use the right auth_ops */ -+ if (gd->clnt->cl_auth != auth) { -+ save_auth = gd->clnt->cl_auth; -+ gd->clnt->cl_auth = auth; -+ } -+ - gd->gc.gc_proc = RPCSEC_GSS_DESTROY; - clnt_call(gd->clnt, NULLPROC, (xdrproc_t)xdr_void, NULL, - (xdrproc_t)xdr_void, NULL, AUTH_TIMEOUT); -+ -+ if (save_auth != NULL) -+ gd->clnt->cl_auth = save_auth; - } - gss_release_buffer(&min_stat, &gd->gc.gc_ctx); - /* XXX ANDROS check size of context - should be 8 */ -diff --git a/src/auth_none.c b/src/auth_none.c -index a439ec6..008c589 100644 ---- a/src/auth_none.c -+++ b/src/auth_none.c -@@ -155,6 +155,12 @@ authnone_destroy(AUTH *client) - { - } - -+static bool_t -+authnone_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authnone_ops() - { -@@ -170,6 +176,8 @@ authnone_ops() - ops.ah_validate = authnone_validate; - ops.ah_refresh = authnone_refresh; - ops.ah_destroy = authnone_destroy; -+ ops.ah_wrap = authnone_wrap; -+ ops.ah_unwrap = authnone_wrap; - } - mutex_unlock(&ops_lock); - return (&ops); -diff --git a/src/auth_unix.c b/src/auth_unix.c -index c2469da..4b9b13f 100644 ---- a/src/auth_unix.c -+++ b/src/auth_unix.c -@@ -162,6 +162,7 @@ authunix_create(machname, uid, gid, len, aup_gids) - */ - auth->ah_cred = au->au_origcred; - marshal_new_auth(auth); -+ auth_get(auth); /* Reference for caller */ - return (auth); - #ifndef _KERNEL - cleanup_authunix_create: -@@ -396,6 +397,12 @@ marshal_new_auth(auth) - XDR_DESTROY(xdrs); - } - -+static bool_t -+authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authunix_ops() - { -@@ -411,6 +418,8 @@ authunix_ops() - ops.ah_validate = authunix_validate; - ops.ah_refresh = authunix_refresh; - ops.ah_destroy = authunix_destroy; -+ ops.ah_wrap = authunix_wrap; -+ ops.ah_unwrap = authunix_wrap; - } - mutex_unlock(&ops_lock); - return (&ops); -diff --git a/src/authgss_prot.c b/src/authgss_prot.c -index 9d7fa09..0168318 100644 ---- a/src/authgss_prot.c -+++ b/src/authgss_prot.c -@@ -161,6 +161,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - databuflen = end - start - 4; - XDR_SETPOS(xdrs, start + 4); - databuf.value = XDR_INLINE(xdrs, databuflen); -+ databuf.length = databuflen; - - xdr_stat = FALSE; - -@@ -169,7 +170,6 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - XDR_SETPOS(xdrs, start); - if (!xdr_u_int(xdrs, (u_int *)&databuflen)) - return (FALSE); -- databuf.length = databuflen; - - /* Checksum rpc_gss_data_t. */ - maj_stat = gss_get_mic(&min_stat, ctx, qop, -diff --git a/src/clnt_dg.c b/src/clnt_dg.c -index 79fed5d..4a1f60a 100644 ---- a/src/clnt_dg.c -+++ b/src/clnt_dg.c -@@ -366,7 +366,7 @@ call_again: - - if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || - (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || -- (! (*xargs)(xdrs, argsp))) { -+ (! AUTH_WRAP(cl->cl_auth, xdrs, xargs, argsp))) { - cu->cu_error.re_status = RPC_CANTENCODEARGS; - goto out; - } -@@ -400,8 +400,8 @@ get_reply: - * (We assume that this is actually only executed once.) - */ - reply_msg.acpted_rply.ar_verf = _null_auth; -- reply_msg.acpted_rply.ar_results.where = resultsp; -- reply_msg.acpted_rply.ar_results.proc = xresults; -+ reply_msg.acpted_rply.ar_results.where = NULL; -+ reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; - - fd.fd = cu->cu_fd; - fd.events = POLLIN; -@@ -512,6 +512,10 @@ get_reply: - &reply_msg.acpted_rply.ar_verf)) { - cu->cu_error.re_status = RPC_AUTHERROR; - cu->cu_error.re_why = AUTH_INVALIDRESP; -+ } else if (! AUTH_UNWRAP(cl->cl_auth, &reply_xdrs, -+ xresults, resultsp)) { -+ if (cu->cu_error.re_status == RPC_SUCCESS) -+ cu->cu_error.re_status = RPC_CANTDECODERES; - } - if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) { - xdrs->x_op = XDR_FREE; -diff --git a/src/clnt_vc.c b/src/clnt_vc.c -index 359063c..097cae8 100644 ---- a/src/clnt_vc.c -+++ b/src/clnt_vc.c -@@ -364,7 +364,7 @@ call_again: - if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) || - (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || - (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || -- (! (*xdr_args)(xdrs, args_ptr))) { -+ (! AUTH_WRAP(cl->cl_auth, xdrs, xdr_args, args_ptr))) { - if (ct->ct_error.re_status == RPC_SUCCESS) - ct->ct_error.re_status = RPC_CANTENCODEARGS; - (void)xdrrec_endofrecord(xdrs, TRUE); -@@ -420,7 +420,8 @@ call_again: - &reply_msg.acpted_rply.ar_verf)) { - ct->ct_error.re_status = RPC_AUTHERROR; - ct->ct_error.re_why = AUTH_INVALIDRESP; -- } else if (! (*xdr_results)(xdrs, results_ptr)) { -+ } else if (! AUTH_UNWRAP(cl->cl_auth, xdrs, -+ xdr_results, results_ptr)) { - if (ct->ct_error.re_status == RPC_SUCCESS) - ct->ct_error.re_status = RPC_CANTDECODERES; - } -diff --git a/src/svc.c b/src/svc.c -index b4a63d0..08cd6c9 100644 ---- a/src/svc.c -+++ b/src/svc.c -@@ -77,9 +77,6 @@ static struct svc_callout - - extern rwlock_t svc_lock; - extern rwlock_t svc_fd_lock; --#ifdef HAVE_LIBGSSAPI --extern struct svc_auth_ops svc_auth_gss_ops; --#endif - - static struct svc_callout *svc_find (rpcprog_t, rpcvers_t, - struct svc_callout **, char *); -@@ -717,11 +714,9 @@ svc_getreq_common (fd) - SVC_DESTROY (xprt); - break; - } -- else if ((xprt->xp_auth != NULL) --#ifdef HAVE_LIBGSSAPI -- && (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops) --#endif -- ) { -+ else if ((xprt->xp_auth != NULL) && -+ (xprt->xp_auth->svc_ah_private == NULL)) -+ { - xprt->xp_auth = NULL; - } - } -diff --git a/src/svc_auth.c b/src/svc_auth.c -index c6b3a0b..e80d5f9 100644 ---- a/src/svc_auth.c -+++ b/src/svc_auth.c -@@ -98,8 +98,8 @@ _authenticate(rqst, msg) - rqst->rq_xprt->xp_verf.oa_length = 0; - cred_flavor = rqst->rq_cred.oa_flavor; - switch (cred_flavor) { -- case AUTH_NULL: -- dummy = _svcauth_null(rqst, msg); -+ case AUTH_NONE: -+ dummy = _svcauth_none(rqst, msg); - return (dummy); - case AUTH_SYS: - dummy = _svcauth_unix(rqst, msg); -@@ -132,15 +132,6 @@ _authenticate(rqst, msg) - return (AUTH_REJECTEDCRED); - } - --/*ARGSUSED*/ --enum auth_stat --_svcauth_null(rqst, msg) -- struct svc_req *rqst; -- struct rpc_msg *msg; --{ -- return (AUTH_OK); --} -- - /* - * Allow the rpc service to register new authentication types that it is - * prepared to handle. When an authentication flavor is registered, -diff --git a/src/svc_auth_unix.c b/src/svc_auth_unix.c -index ce83859..9585069 100644 ---- a/src/svc_auth_unix.c -+++ b/src/svc_auth_unix.c -@@ -43,6 +43,8 @@ - - #include <rpc/rpc.h> - -+extern SVCAUTH svc_auth_none; -+ - /* - * Unix longhand authenticator - */ -@@ -67,6 +69,8 @@ _svcauth_unix(rqst, msg) - assert(rqst != NULL); - assert(msg != NULL); - -+ rqst->rq_xprt->xp_auth = &svc_auth_none; -+ - area = (struct area *) rqst->rq_clntcred; - aup = &area->area_aup; - aup->aup_machname = area->area_machname; -@@ -142,5 +146,6 @@ _svcauth_short(rqst, msg) - struct svc_req *rqst; - struct rpc_msg *msg; - { -+ rqst->rq_xprt->xp_auth = &svc_auth_none; - return (AUTH_REJECTEDCRED); - } -diff --git a/src/svc_dg.c b/src/svc_dg.c -index 66a56ee..5ef9df2 100644 ---- a/src/svc_dg.c -+++ b/src/svc_dg.c -@@ -134,6 +134,7 @@ svc_dg_create(fd, sendsize, recvsize) - su->su_cache = NULL; - xprt->xp_fd = fd; - xprt->xp_p2 = su; -+ xprt->xp_auth = NULL; - xprt->xp_verf.oa_base = su->su_verfbody; - svc_dg_ops(xprt); - xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage); -@@ -234,10 +235,27 @@ svc_dg_reply(xprt, msg) - bool_t stat = FALSE; - size_t slen; - -+ xdrproc_t xdr_results; -+ caddr_t xdr_location; -+ bool_t has_args; -+ -+ if (msg->rm_reply.rp_stat == MSG_ACCEPTED && -+ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) { -+ has_args = TRUE; -+ xdr_results = msg->acpted_rply.ar_results.proc; -+ xdr_location = msg->acpted_rply.ar_results.where; -+ -+ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; -+ msg->acpted_rply.ar_results.where = NULL; -+ } else -+ has_args = FALSE; -+ - xdrs->x_op = XDR_ENCODE; - XDR_SETPOS(xdrs, 0); - msg->rm_xid = su->su_xid; -- if (xdr_replymsg(xdrs, msg)) { -+ if (xdr_replymsg(xdrs, msg) && -+ (!has_args || -+ (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { - struct msghdr *msg = &su->su_msghdr; - struct iovec iov; - -@@ -264,7 +282,12 @@ svc_dg_getargs(xprt, xdr_args, args_ptr) - xdrproc_t xdr_args; - void *args_ptr; - { -- return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr); -+ if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs), -+ xdr_args, args_ptr)) { -+ (void)svc_freeargs(xprt, xdr_args, args_ptr); -+ return FALSE; -+ } -+ return TRUE; - } - - static bool_t -@@ -288,6 +311,10 @@ svc_dg_destroy(xprt) - xprt_unregister(xprt); - if (xprt->xp_fd != -1) - (void)close(xprt->xp_fd); -+ if (xprt->xp_auth != NULL) { -+ SVCAUTH_DESTROY(xprt->xp_auth); -+ xprt->xp_auth = NULL; -+ } - XDR_DESTROY(&(su->su_xdrs)); - (void) mem_free(rpc_buffer(xprt), su->su_iosz); - (void) mem_free(su, sizeof (*su)); -diff --git a/src/svc_vc.c b/src/svc_vc.c -index aaaf2d7..74632e2 100644 ---- a/src/svc_vc.c -+++ b/src/svc_vc.c -@@ -172,6 +172,7 @@ svc_vc_create(fd, sendsize, recvsize) - xprt->xp_p1 = r; - xprt->xp_p2 = NULL; - xprt->xp_p3 = NULL; -+ xprt->xp_auth = NULL; - xprt->xp_verf = _null_auth; - svc_vc_rendezvous_ops(xprt); - xprt->xp_port = (u_short)-1; /* It is the rendezvouser */ -@@ -283,6 +284,7 @@ makefd_xprt(fd, sendsize, recvsize) - xdrrec_create(&(cd->xdrs), sendsize, recvsize, - xprt, read_vc, write_vc); - xprt->xp_p1 = cd; -+ xprt->xp_auth = NULL; - xprt->xp_verf.oa_base = cd->verf_body; - svc_vc_ops(xprt); /* truely deals with calls */ - xprt->xp_port = 0; /* this is a connection, not a rendezvouser */ -@@ -412,6 +414,10 @@ __svc_vc_dodestroy(xprt) - XDR_DESTROY(&(cd->xdrs)); - mem_free(cd, sizeof(struct cf_conn)); - } -+ if (xprt->xp_auth != NULL) { -+ SVCAUTH_DESTROY(xprt->xp_auth); -+ xprt->xp_auth = NULL; -+ } - if (xprt->xp_rtaddr.buf) - mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); - if (xprt->xp_ltaddr.buf) -@@ -610,7 +616,11 @@ svc_vc_recv(xprt, msg) - } - - xdrs->x_op = XDR_DECODE; -- (void)xdrrec_skiprecord(xdrs); -+ /* -+ * No need skip records with nonblocking connections -+ */ -+ if (cd->nonblock == FALSE) -+ (void)xdrrec_skiprecord(xdrs); - if (xdr_callmsg(xdrs, msg)) { - cd->x_id = msg->rm_xid; - return (TRUE); -@@ -628,8 +638,13 @@ svc_vc_getargs(xprt, xdr_args, args_ptr) - - assert(xprt != NULL); - /* args_ptr may be NULL */ -- return ((*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs), -- args_ptr)); -+ -+ if (! SVCAUTH_UNWRAP(xprt->xp_auth, -+ &(((struct cf_conn *)(xprt->xp_p1))->xdrs), -+ xdr_args, args_ptr)) { -+ return FALSE; -+ } -+ return TRUE; - } - - static bool_t -@@ -658,15 +673,35 @@ svc_vc_reply(xprt, msg) - XDR *xdrs; - bool_t rstat; - -+ xdrproc_t xdr_results; -+ caddr_t xdr_location; -+ bool_t has_args; -+ - assert(xprt != NULL); - assert(msg != NULL); - - cd = (struct cf_conn *)(xprt->xp_p1); - xdrs = &(cd->xdrs); - -+ if (msg->rm_reply.rp_stat == MSG_ACCEPTED && -+ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) { -+ has_args = TRUE; -+ xdr_results = msg->acpted_rply.ar_results.proc; -+ xdr_location = msg->acpted_rply.ar_results.where; -+ -+ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; -+ msg->acpted_rply.ar_results.where = NULL; -+ } else -+ has_args = FALSE; -+ - xdrs->x_op = XDR_ENCODE; - msg->rm_xid = cd->x_id; -- rstat = xdr_replymsg(xdrs, msg); -+ rstat = FALSE; -+ if (xdr_replymsg(xdrs, msg) && -+ (!has_args || -+ (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { -+ rstat = TRUE; -+ } - (void)xdrrec_endofrecord(xdrs, TRUE); - return (rstat); - } -diff --git a/src/xdr_rec.c b/src/xdr_rec.c -index 4e815d7..2aca623 100644 ---- a/src/xdr_rec.c -+++ b/src/xdr_rec.c -@@ -64,7 +64,6 @@ - #include <rpc/clnt.h> - #include <stddef.h> - #include "rpc_com.h" --#include <unistd.h> - static bool_t xdrrec_getlong(XDR *, long *); - static bool_t xdrrec_putlong(XDR *, const long *); - static bool_t xdrrec_getbytes(XDR *, char *, u_int); -@@ -330,22 +329,22 @@ xdrrec_getpos(xdrs) - RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; - off_t pos; - -- pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1); -- if (pos != -1) -- switch (xdrs->x_op) { -+ switch (xdrs->x_op) { - -- case XDR_ENCODE: -- pos += rstrm->out_finger - rstrm->out_base; -- break; -+ case XDR_ENCODE: -+ pos = rstrm->out_finger - rstrm->out_base -+ - BYTES_PER_XDR_UNIT; -+ break; - -- case XDR_DECODE: -- pos -= rstrm->in_boundry - rstrm->in_finger; -- break; -+ case XDR_DECODE: -+ pos = rstrm->in_boundry - rstrm->in_finger -+ - BYTES_PER_XDR_UNIT; -+ break; - -- default: -- pos = (off_t) -1; -- break; -- } -+ default: -+ pos = (off_t) -1; -+ break; -+ } - return ((u_int) pos); - } - -diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h -index 734e6b9..5f66e67 100644 ---- a/tirpc/rpc/auth.h -+++ b/tirpc/rpc/auth.h -@@ -203,8 +203,22 @@ typedef struct __auth { - - } *ah_ops; - void *ah_private; -+ int ah_refcnt; - } AUTH; - -+static __inline int -+auth_get(AUTH *auth) -+{ -+ return __sync_add_and_fetch(&auth->ah_refcnt, 1); -+} -+ -+static __inline int -+auth_put(AUTH *auth) -+{ -+ return __sync_sub_and_fetch(&auth->ah_refcnt, 1); -+} -+ -+ - - /* - * Authentication ops. -@@ -234,10 +248,23 @@ typedef struct __auth { - #define auth_refresh(auth, msg) \ - ((*((auth)->ah_ops->ah_refresh))(auth, msg)) - --#define AUTH_DESTROY(auth) \ -- ((*((auth)->ah_ops->ah_destroy))(auth)) --#define auth_destroy(auth) \ -- ((*((auth)->ah_ops->ah_destroy))(auth)) -+#define AUTH_DESTROY(auth) \ -+ do { \ -+ int refs; \ -+ if ((refs = auth_put((auth))) == 0) \ -+ ((*((auth)->ah_ops->ah_destroy))(auth));\ -+ log_debug("%s: auth_put(), refs %d\n", \ -+ __func__, refs); \ -+ } while (0) -+ -+#define auth_destroy(auth) \ -+ do { \ -+ int refs; \ -+ if ((refs = auth_put((auth))) == 0) \ -+ ((*((auth)->ah_ops->ah_destroy))(auth));\ -+ log_debug("%s: auth_put(), refs %d\n", \ -+ __func__, refs); \ -+ } while (0) - - #define AUTH_WRAP(auth, xdrs, xfunc, xwhere) \ - ((*((auth)->ah_ops->ah_wrap))(auth, xdrs, \ -@@ -373,7 +400,7 @@ __END_DECLS - __BEGIN_DECLS - struct svc_req; - struct rpc_msg; --enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *); -+enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *); - enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *); - enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *); - __END_DECLS -diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h -index e3d6897..d2881ad 100644 ---- a/tirpc/rpc/des.h -+++ b/tirpc/rpc/des.h -@@ -33,6 +33,9 @@ - * Copyright (c) 1986 by Sun Microsystems, Inc. - */ - -+#ifndef _RPC_DES_H_ -+#define _RPC_DES_H_ -+ - #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ - #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ - -@@ -80,3 +83,5 @@ struct desparams { - * Software DES. - */ - extern int _des_crypt( char *, int, struct desparams * ); -+ -+#endif -diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h -index 659e90c..14269d1 100644 ---- a/tirpc/rpc/svc_auth.h -+++ b/tirpc/rpc/svc_auth.h -@@ -44,17 +44,23 @@ - /* - * Interface to server-side authentication flavors. - */ --typedef struct { -+typedef struct SVCAUTH { - struct svc_auth_ops { -- int (*svc_ah_wrap)(void); -- int (*svc_ah_unwrap)(void); -- int (*svc_ah_destroy)(void); -+ int (*svc_ah_wrap)(struct SVCAUTH *, XDR *, xdrproc_t, -+ caddr_t); -+ int (*svc_ah_unwrap)(struct SVCAUTH *, XDR *, xdrproc_t, -+ caddr_t); -+ int (*svc_ah_destroy)(struct SVCAUTH *); - } *svc_ah_ops; - caddr_t svc_ah_private; - } SVCAUTH; - --#define SVCAUTH_DESTROY(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)()) --#define svcauth_destroy(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)()) -+#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \ -+ ((*((auth)->svc_ah_ops->svc_ah_wrap))(auth, xdrs, xfunc, xwhere)) -+#define SVCAUTH_UNWRAP(auth, xdrs, xfunc, xwhere) \ -+ ((*((auth)->svc_ah_ops->svc_ah_unwrap))(auth, xdrs, xfunc, xwhere)) -+#define SVCAUTH_DESTROY(auth) \ -+ ((*((auth)->svc_ah_ops->svc_ah_destroy))(auth)) - - /* - * Server side authenticator diff --git a/core/libtirpc/libtirpc-0.2.3rc3.patch b/core/libtirpc/libtirpc-0.2.3rc3.patch deleted file mode 100644 index 14577186b..000000000 --- a/core/libtirpc/libtirpc-0.2.3rc3.patch +++ /dev/null @@ -1,1312 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 97c6f2c..7ff80a4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -23,6 +23,7 @@ AC_HEADER_DIRENT - AC_PREFIX_DEFAULT(/usr) - AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h]) - AC_CHECK_LIB([pthread], [pthread_create]) -+AC_CHECK_LIB([nsl], [yp_get_default_domain]) - - - AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) -diff --git a/doc/Makefile.am b/doc/Makefile.am -index cc4fa76..f8c88b5 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,5 +1,5 @@ - - install: install-am -- $(mkinstalldirs) $(DESTDIR)/etc -- cp -p ./etc_netconfig $(DESTDIR)/etc/netconfig -- chmod 0644 $(DESTDIR)/etc/netconfig -+ $(mkinstalldirs) $(DESTDIR)/$(sysconfdir) -+ cp -p ./etc_netconfig $(DESTDIR)/$(sysconfdir)/netconfig -+ chmod 0644 $(DESTDIR)/$(sysconfdir)/netconfig -diff --git a/src/Makefile.am b/src/Makefile.am -index 7ee8cbc..66350f5 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -40,7 +40,7 @@ lib_LTLIBRARIES = libtirpc.la - # release number of your package. This is an abuse that only fosters - # misunderstanding of the purpose of library versions." - # --libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 -+libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 - - libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ - clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ -@@ -48,17 +48,16 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln - getrpcport.c mt_misc.c pmap_clnt.c pmap_getmaps.c pmap_getport.c \ - pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \ - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ -- rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ -- svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c auth_des.c authdes_prot.c des_crypt.c -+ rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ -+ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -+ auth_time.c auth_des.c authdes_prot.c - - ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c - - ## Secure-RPC - if GSS -- libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c \ -- svc_auth_none.c -+ libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c - libtirpc_la_LDFLAGS += $(GSSGLUE_LIBS) - libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS) - endif -diff --git a/src/auth_des.c b/src/auth_des.c -index 37e7667..f0c8b8c 100644 ---- a/src/auth_des.c -+++ b/src/auth_des.c -@@ -223,6 +223,7 @@ authdes_pk_seccreate(const char *servername, netobj *pkey, u_int window, - goto failed; - } - ad->ad_nis_srvr = NULL; /* not needed any longer */ -+ auth_get(auth); /* Reference for caller */ - return (auth); - - failed: -@@ -472,6 +473,12 @@ authdes_destroy(AUTH *auth) - FREE(auth, sizeof(AUTH)); - } - -+static bool_t -+authdes_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authdes_ops(void) - { -@@ -487,6 +494,8 @@ authdes_ops(void) - ops.ah_validate = authdes_validate; - ops.ah_refresh = authdes_refresh; - ops.ah_destroy = authdes_destroy; -+ ops.ah_wrap = authdes_wrap; -+ ops.ah_unwrap = authdes_wrap; - } - mutex_unlock(&authdes_ops_lock); - return (&ops); -diff --git a/src/auth_gss.c b/src/auth_gss.c -index df3017a..539101e 100644 ---- a/src/auth_gss.c -+++ b/src/auth_gss.c -@@ -87,9 +87,9 @@ print_rpc_gss_sec(struct rpc_gss_sec *ptr) - int i; - char *p; - -- log_debug("rpc_gss_sec:"); -+ gss_log_debug("rpc_gss_sec:"); - if(ptr->mech == NULL) -- log_debug("NULL gss_OID mech"); -+ gss_log_debug("NULL gss_OID mech"); - else { - fprintf(stderr, " mechanism_OID: {"); - p = (char *)ptr->mech->elements; -@@ -151,7 +151,7 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec) - struct rpc_gss_data *gd; - OM_uint32 min_stat = 0; - -- log_debug("in authgss_create()"); -+ gss_log_debug("in authgss_create()"); - - memset(&rpc_createerr, 0, sizeof(rpc_createerr)); - -@@ -200,6 +200,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec) - - if (!authgss_refresh(auth)) - auth = NULL; -+ else -+ auth_get(auth); /* Reference for caller */ - - clnt->cl_auth = save_auth; - -@@ -214,7 +216,7 @@ authgss_create_default(CLIENT *clnt, char *service, struct rpc_gss_sec *sec) - gss_buffer_desc sname; - gss_name_t name = GSS_C_NO_NAME; - -- log_debug("in authgss_create_default()"); -+ gss_log_debug("in authgss_create_default()"); - - - sname.value = service; -@@ -225,7 +227,7 @@ authgss_create_default(CLIENT *clnt, char *service, struct rpc_gss_sec *sec) - &name); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_import_name", maj_stat, min_stat); -+ gss_log_status("gss_import_name", maj_stat, min_stat); - rpc_createerr.cf_stat = RPC_AUTHERROR; - return (NULL); - } -@@ -247,7 +249,7 @@ authgss_get_private_data(AUTH *auth, struct authgss_private_data *pd) - { - struct rpc_gss_data *gd; - -- log_debug("in authgss_get_private_data()"); -+ gss_log_debug("in authgss_get_private_data()"); - - if (!auth || !pd) - return (FALSE); -@@ -267,7 +269,7 @@ authgss_get_private_data(AUTH *auth, struct authgss_private_data *pd) - static void - authgss_nextverf(AUTH *auth) - { -- log_debug("in authgss_nextverf()"); -+ gss_log_debug("in authgss_nextverf()"); - /* no action necessary */ - } - -@@ -281,7 +283,7 @@ authgss_marshal(AUTH *auth, XDR *xdrs) - OM_uint32 maj_stat, min_stat; - bool_t xdr_stat; - -- log_debug("in authgss_marshal()"); -+ gss_log_debug("in authgss_marshal()"); - - gd = AUTH_PRIVATE(auth); - -@@ -316,7 +318,7 @@ authgss_marshal(AUTH *auth, XDR *xdrs) - &rpcbuf, &checksum); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_get_mic", maj_stat, min_stat); -+ gss_log_status("gss_get_mic", maj_stat, min_stat); - if (maj_stat == GSS_S_CONTEXT_EXPIRED) { - gd->established = FALSE; - authgss_destroy_context(auth); -@@ -341,7 +343,7 @@ authgss_validate(AUTH *auth, struct opaque_auth *verf) - gss_buffer_desc signbuf, checksum; - OM_uint32 maj_stat, min_stat; - -- log_debug("in authgss_validate()"); -+ gss_log_debug("in authgss_validate()"); - - gd = AUTH_PRIVATE(auth); - -@@ -377,7 +379,7 @@ authgss_validate(AUTH *auth, struct opaque_auth *verf) - maj_stat = gss_verify_mic(&min_stat, gd->ctx, &signbuf, - &checksum, &qop_state); - if (maj_stat != GSS_S_COMPLETE || qop_state != gd->sec.qop) { -- log_status("gss_verify_mic", maj_stat, min_stat); -+ gss_log_status("gss_verify_mic", maj_stat, min_stat); - if (maj_stat == GSS_S_CONTEXT_EXPIRED) { - gd->established = FALSE; - authgss_destroy_context(auth); -@@ -395,7 +397,7 @@ authgss_refresh(AUTH *auth) - gss_buffer_desc *recv_tokenp, send_token; - OM_uint32 maj_stat, min_stat, call_stat, ret_flags; - -- log_debug("in authgss_refresh()"); -+ gss_log_debug("in authgss_refresh()"); - - gd = AUTH_PRIVATE(auth); - -@@ -414,9 +416,9 @@ authgss_refresh(AUTH *auth) - #ifdef DEBUG - /* print the token we just received */ - if (recv_tokenp != GSS_C_NO_BUFFER) { -- log_debug("The token we just received (length %d):", -+ gss_log_debug("The token we just received (length %d):", - recv_tokenp->length); -- log_hexdump(recv_tokenp->value, recv_tokenp->length, 0); -+ gss_log_hexdump(recv_tokenp->value, recv_tokenp->length, 0); - } - #endif - maj_stat = gss_init_sec_context(&min_stat, -@@ -439,7 +441,7 @@ authgss_refresh(AUTH *auth) - } - if (maj_stat != GSS_S_COMPLETE && - maj_stat != GSS_S_CONTINUE_NEEDED) { -- log_status("gss_init_sec_context", maj_stat, min_stat); -+ gss_log_status("gss_init_sec_context", maj_stat, min_stat); - break; - } - if (send_token.length != 0) { -@@ -447,9 +449,9 @@ authgss_refresh(AUTH *auth) - - #ifdef DEBUG - /* print the token we are about to send */ -- log_debug("The token being sent (length %d):", -+ gss_log_debug("The token being sent (length %d):", - send_token.length); -- log_hexdump(send_token.value, send_token.length, 0); -+ gss_log_hexdump(send_token.value, send_token.length, 0); - #endif - - call_stat = clnt_call(gd->clnt, NULLPROC, -@@ -498,7 +500,7 @@ authgss_refresh(AUTH *auth) - - if (maj_stat != GSS_S_COMPLETE - || qop_state != gd->sec.qop) { -- log_status("gss_verify_mic", maj_stat, min_stat); -+ gss_log_status("gss_verify_mic", maj_stat, min_stat); - if (maj_stat == GSS_S_CONTEXT_EXPIRED) { - gd->established = FALSE; - authgss_destroy_context(auth); -@@ -531,7 +533,7 @@ authgss_service(AUTH *auth, int svc) - { - struct rpc_gss_data *gd; - -- log_debug("in authgss_service()"); -+ gss_log_debug("in authgss_service()"); - - if (!auth) - return(FALSE); -@@ -549,15 +551,26 @@ authgss_destroy_context(AUTH *auth) - struct rpc_gss_data *gd; - OM_uint32 min_stat; - -- log_debug("in authgss_destroy_context()"); -+ gss_log_debug("in authgss_destroy_context()"); - - gd = AUTH_PRIVATE(auth); - - if (gd->gc.gc_ctx.length != 0) { - if (gd->established) { -+ AUTH *save_auth = NULL; -+ -+ /* Make sure we use the right auth_ops */ -+ if (gd->clnt->cl_auth != auth) { -+ save_auth = gd->clnt->cl_auth; -+ gd->clnt->cl_auth = auth; -+ } -+ - gd->gc.gc_proc = RPCSEC_GSS_DESTROY; - clnt_call(gd->clnt, NULLPROC, (xdrproc_t)xdr_void, NULL, - (xdrproc_t)xdr_void, NULL, AUTH_TIMEOUT); -+ -+ if (save_auth != NULL) -+ gd->clnt->cl_auth = save_auth; - } - gss_release_buffer(&min_stat, &gd->gc.gc_ctx); - /* XXX ANDROS check size of context - should be 8 */ -@@ -582,7 +595,7 @@ authgss_destroy(AUTH *auth) - struct rpc_gss_data *gd; - OM_uint32 min_stat; - -- log_debug("in authgss_destroy()"); -+ gss_log_debug("in authgss_destroy()"); - - gd = AUTH_PRIVATE(auth); - -@@ -603,7 +616,7 @@ authgss_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr) - { - struct rpc_gss_data *gd; - -- log_debug("in authgss_wrap()"); -+ gss_log_debug("in authgss_wrap()"); - - gd = AUTH_PRIVATE(auth); - -@@ -620,7 +633,7 @@ authgss_unwrap(AUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr) - { - struct rpc_gss_data *gd; - -- log_debug("in authgss_unwrap()"); -+ gss_log_debug("in authgss_unwrap()"); - - gd = AUTH_PRIVATE(auth); - -diff --git a/src/auth_none.c b/src/auth_none.c -index a439ec6..008c589 100644 ---- a/src/auth_none.c -+++ b/src/auth_none.c -@@ -155,6 +155,12 @@ authnone_destroy(AUTH *client) - { - } - -+static bool_t -+authnone_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authnone_ops() - { -@@ -170,6 +176,8 @@ authnone_ops() - ops.ah_validate = authnone_validate; - ops.ah_refresh = authnone_refresh; - ops.ah_destroy = authnone_destroy; -+ ops.ah_wrap = authnone_wrap; -+ ops.ah_unwrap = authnone_wrap; - } - mutex_unlock(&ops_lock); - return (&ops); -diff --git a/src/auth_unix.c b/src/auth_unix.c -index c2469da..4b9b13f 100644 ---- a/src/auth_unix.c -+++ b/src/auth_unix.c -@@ -162,6 +162,7 @@ authunix_create(machname, uid, gid, len, aup_gids) - */ - auth->ah_cred = au->au_origcred; - marshal_new_auth(auth); -+ auth_get(auth); /* Reference for caller */ - return (auth); - #ifndef _KERNEL - cleanup_authunix_create: -@@ -396,6 +397,12 @@ marshal_new_auth(auth) - XDR_DESTROY(xdrs); - } - -+static bool_t -+authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authunix_ops() - { -@@ -411,6 +418,8 @@ authunix_ops() - ops.ah_validate = authunix_validate; - ops.ah_refresh = authunix_refresh; - ops.ah_destroy = authunix_destroy; -+ ops.ah_wrap = authunix_wrap; -+ ops.ah_unwrap = authunix_wrap; - } - mutex_unlock(&ops_lock); - return (&ops); -diff --git a/src/authgss_prot.c b/src/authgss_prot.c -index 9d7fa09..a3c93c9 100644 ---- a/src/authgss_prot.c -+++ b/src/authgss_prot.c -@@ -64,10 +64,10 @@ xdr_rpc_gss_buf(XDR *xdrs, gss_buffer_t buf, u_int maxsize) - if (xdr_stat && xdrs->x_op == XDR_DECODE) - buf->length = tmplen; - -- log_debug("xdr_rpc_gss_buf: %s %s (%p:%d)", -- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -- (xdr_stat == TRUE) ? "success" : "failure", -- buf->value, buf->length); -+ gss_log_debug("xdr_rpc_gss_buf: %s %s (%p:%d)", -+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -+ (xdr_stat == TRUE) ? "success" : "failure", -+ buf->value, buf->length); - - return xdr_stat; - } -@@ -83,12 +83,12 @@ xdr_rpc_gss_cred(XDR *xdrs, struct rpc_gss_cred *p) - xdr_enum(xdrs, (enum_t *)&p->gc_svc) && - xdr_rpc_gss_buf(xdrs, &p->gc_ctx, MAX_AUTH_BYTES)); - -- log_debug("xdr_rpc_gss_cred: %s %s " -- "(v %d, proc %d, seq %d, svc %d, ctx %p:%d)", -- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -- (xdr_stat == TRUE) ? "success" : "failure", -- p->gc_v, p->gc_proc, p->gc_seq, p->gc_svc, -- p->gc_ctx.value, p->gc_ctx.length); -+ gss_log_debug("xdr_rpc_gss_cred: %s %s " -+ "(v %d, proc %d, seq %d, svc %d, ctx %p:%d)", -+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -+ (xdr_stat == TRUE) ? "success" : "failure", -+ p->gc_v, p->gc_proc, p->gc_seq, p->gc_svc, -+ p->gc_ctx.value, p->gc_ctx.length); - - return (xdr_stat); - } -@@ -101,10 +101,10 @@ xdr_rpc_gss_init_args(XDR *xdrs, gss_buffer_desc *p) - - xdr_stat = xdr_rpc_gss_buf(xdrs, p, maxlen); - -- log_debug("xdr_rpc_gss_init_args: %s %s (token %p:%d)", -- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -- (xdr_stat == TRUE) ? "success" : "failure", -- p->value, p->length); -+ gss_log_debug("xdr_rpc_gss_init_args: %s %s (token %p:%d)", -+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -+ (xdr_stat == TRUE) ? "success" : "failure", -+ p->value, p->length); - - return (xdr_stat); - } -@@ -123,13 +123,13 @@ xdr_rpc_gss_init_res(XDR *xdrs, struct rpc_gss_init_res *p) - xdr_u_int(xdrs, &p->gr_win) && - xdr_rpc_gss_buf(xdrs, &p->gr_token, tok_maxlen)); - -- log_debug("xdr_rpc_gss_init_res %s %s " -- "(ctx %p:%d, maj %d, min %d, win %d, token %p:%d)", -- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -- (xdr_stat == TRUE) ? "success" : "failure", -- p->gr_ctx.value, p->gr_ctx.length, -- p->gr_major, p->gr_minor, p->gr_win, -- p->gr_token.value, p->gr_token.length); -+ gss_log_debug("xdr_rpc_gss_init_res %s %s " -+ "(ctx %p:%d, maj %d, min %d, win %d, token %p:%d)", -+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -+ (xdr_stat == TRUE) ? "success" : "failure", -+ p->gr_ctx.value, p->gr_ctx.length, -+ p->gr_major, p->gr_minor, p->gr_win, -+ p->gr_token.value, p->gr_token.length); - - return (xdr_stat); - } -@@ -161,6 +161,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - databuflen = end - start - 4; - XDR_SETPOS(xdrs, start + 4); - databuf.value = XDR_INLINE(xdrs, databuflen); -+ databuf.length = databuflen; - - xdr_stat = FALSE; - -@@ -169,13 +170,12 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - XDR_SETPOS(xdrs, start); - if (!xdr_u_int(xdrs, (u_int *)&databuflen)) - return (FALSE); -- databuf.length = databuflen; - - /* Checksum rpc_gss_data_t. */ - maj_stat = gss_get_mic(&min_stat, ctx, qop, - &databuf, &wrapbuf); - if (maj_stat != GSS_S_COMPLETE) { -- log_debug("gss_get_mic failed"); -+ gss_log_debug("gss_get_mic failed"); - return (FALSE); - } - /* Marshal checksum. */ -@@ -189,7 +189,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - maj_stat = gss_wrap(&min_stat, ctx, TRUE, qop, &databuf, - &conf_state, &wrapbuf); - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_wrap", maj_stat, min_stat); -+ gss_log_status("gss_wrap", maj_stat, min_stat); - return (FALSE); - } - /* Marshal databody_priv. */ -@@ -222,13 +222,13 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - if (svc == RPCSEC_GSS_SVC_INTEGRITY) { - /* Decode databody_integ. */ - if (!xdr_rpc_gss_buf(xdrs, &databuf, (u_int)-1)) { -- log_debug("xdr decode databody_integ failed"); -+ gss_log_debug("xdr decode databody_integ failed"); - return (FALSE); - } - /* Decode checksum. */ - if (!xdr_rpc_gss_buf(xdrs, &wrapbuf, (u_int)-1)) { - gss_release_buffer(&min_stat, &databuf); -- log_debug("xdr decode checksum failed"); -+ gss_log_debug("xdr decode checksum failed"); - return (FALSE); - } - /* Verify checksum and QOP. */ -@@ -238,14 +238,14 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - - if (maj_stat != GSS_S_COMPLETE || qop_state != qop) { - gss_release_buffer(&min_stat, &databuf); -- log_status("gss_verify_mic", maj_stat, min_stat); -+ gss_log_status("gss_verify_mic", maj_stat, min_stat); - return (FALSE); - } - } - else if (svc == RPCSEC_GSS_SVC_PRIVACY) { - /* Decode databody_priv. */ - if (!xdr_rpc_gss_buf(xdrs, &wrapbuf, (u_int)-1)) { -- log_debug("xdr decode databody_priv failed"); -+ gss_log_debug("xdr decode databody_priv failed"); - return (FALSE); - } - /* Decrypt databody. */ -@@ -258,7 +258,7 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - if (maj_stat != GSS_S_COMPLETE || qop_state != qop || - conf_state != TRUE) { - gss_release_buffer(&min_stat, &databuf); -- log_status("gss_unwrap", maj_stat, min_stat); -+ gss_log_status("gss_unwrap", maj_stat, min_stat); - return (FALSE); - } - } -@@ -271,7 +271,7 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - - /* Verify sequence number. */ - if (xdr_stat == TRUE && seq_num != seq) { -- log_debug("wrong sequence number in databody"); -+ gss_log_debug("wrong sequence number in databody"); - return (FALSE); - } - return (xdr_stat); -@@ -300,7 +300,7 @@ xdr_rpc_gss_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - #include <ctype.h> - - void --log_debug(const char *fmt, ...) -+gss_log_debug(const char *fmt, ...) - { - va_list ap; - -@@ -312,7 +312,7 @@ log_debug(const char *fmt, ...) - } - - void --log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat) -+gss_log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat) - { - OM_uint32 min; - gss_buffer_desc msg; -@@ -332,7 +332,7 @@ log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat) - } - - void --log_hexdump(const u_char *buf, int len, int offset) -+gss_log_hexdump(const u_char *buf, int len, int offset) - { - u_int i, j, jm; - int c; -@@ -367,17 +367,17 @@ log_hexdump(const u_char *buf, int len, int offset) - #else - - void --log_debug(const char *fmt, ...) -+gss_log_debug(const char *fmt, ...) - { - } - - void --log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat) -+gss_log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat) - { - } - - void --log_hexdump(const u_char *buf, int len, int offset) -+gss_log_hexdump(const u_char *buf, int len, int offset) - { - } - -diff --git a/src/clnt_dg.c b/src/clnt_dg.c -index 79fed5d..4a1f60a 100644 ---- a/src/clnt_dg.c -+++ b/src/clnt_dg.c -@@ -366,7 +366,7 @@ call_again: - - if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || - (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || -- (! (*xargs)(xdrs, argsp))) { -+ (! AUTH_WRAP(cl->cl_auth, xdrs, xargs, argsp))) { - cu->cu_error.re_status = RPC_CANTENCODEARGS; - goto out; - } -@@ -400,8 +400,8 @@ get_reply: - * (We assume that this is actually only executed once.) - */ - reply_msg.acpted_rply.ar_verf = _null_auth; -- reply_msg.acpted_rply.ar_results.where = resultsp; -- reply_msg.acpted_rply.ar_results.proc = xresults; -+ reply_msg.acpted_rply.ar_results.where = NULL; -+ reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; - - fd.fd = cu->cu_fd; - fd.events = POLLIN; -@@ -512,6 +512,10 @@ get_reply: - &reply_msg.acpted_rply.ar_verf)) { - cu->cu_error.re_status = RPC_AUTHERROR; - cu->cu_error.re_why = AUTH_INVALIDRESP; -+ } else if (! AUTH_UNWRAP(cl->cl_auth, &reply_xdrs, -+ xresults, resultsp)) { -+ if (cu->cu_error.re_status == RPC_SUCCESS) -+ cu->cu_error.re_status = RPC_CANTDECODERES; - } - if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) { - xdrs->x_op = XDR_FREE; -diff --git a/src/clnt_vc.c b/src/clnt_vc.c -index 359063c..097cae8 100644 ---- a/src/clnt_vc.c -+++ b/src/clnt_vc.c -@@ -364,7 +364,7 @@ call_again: - if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) || - (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || - (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || -- (! (*xdr_args)(xdrs, args_ptr))) { -+ (! AUTH_WRAP(cl->cl_auth, xdrs, xdr_args, args_ptr))) { - if (ct->ct_error.re_status == RPC_SUCCESS) - ct->ct_error.re_status = RPC_CANTENCODEARGS; - (void)xdrrec_endofrecord(xdrs, TRUE); -@@ -420,7 +420,8 @@ call_again: - &reply_msg.acpted_rply.ar_verf)) { - ct->ct_error.re_status = RPC_AUTHERROR; - ct->ct_error.re_why = AUTH_INVALIDRESP; -- } else if (! (*xdr_results)(xdrs, results_ptr)) { -+ } else if (! AUTH_UNWRAP(cl->cl_auth, xdrs, -+ xdr_results, results_ptr)) { - if (ct->ct_error.re_status == RPC_SUCCESS) - ct->ct_error.re_status = RPC_CANTDECODERES; - } -diff --git a/src/rpc_soc.c b/src/rpc_soc.c -index c678429..63d2197 100644 ---- a/src/rpc_soc.c -+++ b/src/rpc_soc.c -@@ -560,12 +560,10 @@ clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz) - u_int recvsz; - { - struct netbuf *svcaddr; -- struct netconfig *nconf; - CLIENT *cl; - int len; - - cl = NULL; -- nconf = NULL; - svcaddr = NULL; - if (((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) || - ((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) { -diff --git a/src/svc.c b/src/svc.c -index b4a63d0..08cd6c9 100644 ---- a/src/svc.c -+++ b/src/svc.c -@@ -77,9 +77,6 @@ static struct svc_callout - - extern rwlock_t svc_lock; - extern rwlock_t svc_fd_lock; --#ifdef HAVE_LIBGSSAPI --extern struct svc_auth_ops svc_auth_gss_ops; --#endif - - static struct svc_callout *svc_find (rpcprog_t, rpcvers_t, - struct svc_callout **, char *); -@@ -717,11 +714,9 @@ svc_getreq_common (fd) - SVC_DESTROY (xprt); - break; - } -- else if ((xprt->xp_auth != NULL) --#ifdef HAVE_LIBGSSAPI -- && (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops) --#endif -- ) { -+ else if ((xprt->xp_auth != NULL) && -+ (xprt->xp_auth->svc_ah_private == NULL)) -+ { - xprt->xp_auth = NULL; - } - } -diff --git a/src/svc_auth.c b/src/svc_auth.c -index c6b3a0b..e80d5f9 100644 ---- a/src/svc_auth.c -+++ b/src/svc_auth.c -@@ -98,8 +98,8 @@ _authenticate(rqst, msg) - rqst->rq_xprt->xp_verf.oa_length = 0; - cred_flavor = rqst->rq_cred.oa_flavor; - switch (cred_flavor) { -- case AUTH_NULL: -- dummy = _svcauth_null(rqst, msg); -+ case AUTH_NONE: -+ dummy = _svcauth_none(rqst, msg); - return (dummy); - case AUTH_SYS: - dummy = _svcauth_unix(rqst, msg); -@@ -132,15 +132,6 @@ _authenticate(rqst, msg) - return (AUTH_REJECTEDCRED); - } - --/*ARGSUSED*/ --enum auth_stat --_svcauth_null(rqst, msg) -- struct svc_req *rqst; -- struct rpc_msg *msg; --{ -- return (AUTH_OK); --} -- - /* - * Allow the rpc service to register new authentication types that it is - * prepared to handle. When an authentication flavor is registered, -diff --git a/src/svc_auth_gss.c b/src/svc_auth_gss.c -index 54b23b1..9c74313 100644 ---- a/src/svc_auth_gss.c -+++ b/src/svc_auth_gss.c -@@ -87,13 +87,13 @@ svcauth_gss_set_svc_name(gss_name_t name) - { - OM_uint32 maj_stat, min_stat; - -- log_debug("in svcauth_gss_set_svc_name()"); -+ gss_log_debug("in svcauth_gss_set_svc_name()"); - - if (_svcauth_gss_name != NULL) { - maj_stat = gss_release_name(&min_stat, &_svcauth_gss_name); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_release_name", maj_stat, min_stat); -+ gss_log_status("gss_release_name", maj_stat, min_stat); - return (FALSE); - } - _svcauth_gss_name = NULL; -@@ -101,7 +101,7 @@ svcauth_gss_set_svc_name(gss_name_t name) - maj_stat = gss_duplicate_name(&min_stat, name, &_svcauth_gss_name); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_duplicate_name", maj_stat, min_stat); -+ gss_log_status("gss_duplicate_name", maj_stat, min_stat); - return (FALSE); - } - -@@ -115,7 +115,7 @@ svcauth_gss_import_name(char *service) - gss_buffer_desc namebuf; - OM_uint32 maj_stat, min_stat; - -- log_debug("in svcauth_gss_import_name()"); -+ gss_log_debug("in svcauth_gss_import_name()"); - - namebuf.value = service; - namebuf.length = strlen(service); -@@ -124,7 +124,7 @@ svcauth_gss_import_name(char *service) - (gss_OID)GSS_C_NT_HOSTBASED_SERVICE, &name); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_import_name", maj_stat, min_stat); -+ gss_log_status("gss_import_name", maj_stat, min_stat); - return (FALSE); - } - if (svcauth_gss_set_svc_name(name) != TRUE) { -@@ -139,14 +139,14 @@ svcauth_gss_acquire_cred(void) - { - OM_uint32 maj_stat, min_stat; - -- log_debug("in svcauth_gss_acquire_cred()"); -+ gss_log_debug("in svcauth_gss_acquire_cred()"); - - maj_stat = gss_acquire_cred(&min_stat, _svcauth_gss_name, 0, - GSS_C_NULL_OID_SET, GSS_C_ACCEPT, - &_svcauth_gss_creds, NULL, NULL); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_acquire_cred", maj_stat, min_stat); -+ gss_log_status("gss_acquire_cred", maj_stat, min_stat); - return (FALSE); - } - return (TRUE); -@@ -157,12 +157,12 @@ svcauth_gss_release_cred(void) - { - OM_uint32 maj_stat, min_stat; - -- log_debug("in svcauth_gss_release_cred()"); -+ gss_log_debug("in svcauth_gss_release_cred()"); - - maj_stat = gss_release_cred(&min_stat, &_svcauth_gss_creds); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_release_cred", maj_stat, min_stat); -+ gss_log_status("gss_release_cred", maj_stat, min_stat); - return (FALSE); - } - -@@ -181,7 +181,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, - gss_OID mech; - OM_uint32 maj_stat = 0, min_stat = 0, ret_flags, seq; - -- log_debug("in svcauth_gss_accept_context()"); -+ gss_log_debug("in svcauth_gss_accept_context()"); - - gd = SVCAUTH_PRIVATE(rqst->rq_xprt->xp_auth); - gc = (struct rpc_gss_cred *)rqst->rq_clntcred; -@@ -208,7 +208,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, - - if (gr->gr_major != GSS_S_COMPLETE && - gr->gr_major != GSS_S_CONTINUE_NEEDED) { -- log_status("accept_sec_context", gr->gr_major, gr->gr_minor); -+ gss_log_status("accept_sec_context", gr->gr_major, gr->gr_minor); - gd->ctx = GSS_C_NO_CONTEXT; - gss_release_buffer(&min_stat, &gr->gr_token); - return (FALSE); -@@ -238,7 +238,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, - maj_stat = gss_display_name(&min_stat, gd->client_name, - &gd->cname, &gd->sec.mech); - if (maj_stat != GSS_S_COMPLETE) { -- log_status("display_name", maj_stat, min_stat); -+ gss_log_status("display_name", maj_stat, min_stat); - return (FALSE); - } - #ifdef DEBUG -@@ -248,19 +248,19 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, - - gss_oid_to_str(&min_stat, mech, &mechname); - -- log_debug("accepted context for %.*s with " -- "<mech %.*s, qop %d, svc %d>", -- gd->cname.length, (char *)gd->cname.value, -- mechname.length, (char *)mechname.value, -- gd->sec.qop, gd->sec.svc); -+ gss_log_debug("accepted context for %.*s with " -+ "<mech %.*s, qop %d, svc %d>", -+ gd->cname.length, (char *)gd->cname.value, -+ mechname.length, (char *)mechname.value, -+ gd->sec.qop, gd->sec.svc); - - gss_release_buffer(&min_stat, &mechname); - } - #elif HAVE_HEIMDAL -- log_debug("accepted context for %.*s with " -- "<mech {}, qop %d, svc %d>", -- gd->cname.length, (char *)gd->cname.value, -- gd->sec.qop, gd->sec.svc); -+ gss_log_debug("accepted context for %.*s with " -+ "<mech {}, qop %d, svc %d>", -+ gd->cname.length, (char *)gd->cname.value, -+ gd->sec.qop, gd->sec.svc); - #endif - #endif /* DEBUG */ - seq = htonl(gr->gr_win); -@@ -289,7 +289,7 @@ svcauth_gss_validate(struct svc_rpc_gss_data *gd, struct rpc_msg *msg) - u_char rpchdr[128]; - int32_t *buf; - -- log_debug("in svcauth_gss_validate()"); -+ gss_log_debug("in svcauth_gss_validate()"); - - memset(rpchdr, 0, sizeof(rpchdr)); - -@@ -326,7 +326,7 @@ svcauth_gss_validate(struct svc_rpc_gss_data *gd, struct rpc_msg *msg) - &qop_state); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_verify_mic", maj_stat, min_stat); -+ gss_log_status("gss_verify_mic", maj_stat, min_stat); - return (FALSE); - } - return (TRUE); -@@ -339,7 +339,7 @@ svcauth_gss_nextverf(struct svc_req *rqst, u_int num) - gss_buffer_desc signbuf, checksum; - OM_uint32 maj_stat, min_stat; - -- log_debug("in svcauth_gss_nextverf()"); -+ gss_log_debug("in svcauth_gss_nextverf()"); - - if (rqst->rq_xprt->xp_auth == NULL) - return (FALSE); -@@ -353,7 +353,7 @@ svcauth_gss_nextverf(struct svc_req *rqst, u_int num) - &signbuf, &checksum); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_get_mic", maj_stat, min_stat); -+ gss_log_status("gss_get_mic", maj_stat, min_stat); - return (FALSE); - } - rqst->rq_xprt->xp_verf.oa_flavor = RPCSEC_GSS; -@@ -373,7 +373,7 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch) - struct rpc_gss_init_res gr; - int call_stat, offset; - -- log_debug("in svcauth_gss()"); -+ gss_log_debug("in svcauth_gss()"); - - /* Initialize reply. */ - rqst->rq_xprt->xp_verf = _null_auth; -@@ -519,7 +519,7 @@ svcauth_gss_destroy(SVCAUTH *auth) - struct svc_rpc_gss_data *gd; - OM_uint32 min_stat; - -- log_debug("in svcauth_gss_destroy()"); -+ gss_log_debug("in svcauth_gss_destroy()"); - - gd = SVCAUTH_PRIVATE(auth); - -@@ -540,7 +540,7 @@ svcauth_gss_wrap(SVCAUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr) - { - struct svc_rpc_gss_data *gd; - -- log_debug("in svcauth_gss_wrap()"); -+ gss_log_debug("in svcauth_gss_wrap()"); - - gd = SVCAUTH_PRIVATE(auth); - -@@ -557,7 +557,7 @@ svcauth_gss_unwrap(SVCAUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr - { - struct svc_rpc_gss_data *gd; - -- log_debug("in svcauth_gss_unwrap()"); -+ gss_log_debug("in svcauth_gss_unwrap()"); - - gd = SVCAUTH_PRIVATE(auth); - -diff --git a/src/svc_auth_unix.c b/src/svc_auth_unix.c -index ce83859..9585069 100644 ---- a/src/svc_auth_unix.c -+++ b/src/svc_auth_unix.c -@@ -43,6 +43,8 @@ - - #include <rpc/rpc.h> - -+extern SVCAUTH svc_auth_none; -+ - /* - * Unix longhand authenticator - */ -@@ -67,6 +69,8 @@ _svcauth_unix(rqst, msg) - assert(rqst != NULL); - assert(msg != NULL); - -+ rqst->rq_xprt->xp_auth = &svc_auth_none; -+ - area = (struct area *) rqst->rq_clntcred; - aup = &area->area_aup; - aup->aup_machname = area->area_machname; -@@ -142,5 +146,6 @@ _svcauth_short(rqst, msg) - struct svc_req *rqst; - struct rpc_msg *msg; - { -+ rqst->rq_xprt->xp_auth = &svc_auth_none; - return (AUTH_REJECTEDCRED); - } -diff --git a/src/svc_dg.c b/src/svc_dg.c -index 66a56ee..081db61 100644 ---- a/src/svc_dg.c -+++ b/src/svc_dg.c -@@ -134,6 +134,7 @@ svc_dg_create(fd, sendsize, recvsize) - su->su_cache = NULL; - xprt->xp_fd = fd; - xprt->xp_p2 = su; -+ xprt->xp_auth = NULL; - xprt->xp_verf.oa_base = su->su_verfbody; - svc_dg_ops(xprt); - xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage); -@@ -234,10 +235,27 @@ svc_dg_reply(xprt, msg) - bool_t stat = FALSE; - size_t slen; - -+ xdrproc_t xdr_results; -+ caddr_t xdr_location; -+ bool_t has_args; -+ -+ if (msg->rm_reply.rp_stat == MSG_ACCEPTED && -+ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) { -+ has_args = TRUE; -+ xdr_results = msg->acpted_rply.ar_results.proc; -+ xdr_location = msg->acpted_rply.ar_results.where; -+ -+ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; -+ msg->acpted_rply.ar_results.where = NULL; -+ } else -+ has_args = FALSE; -+ - xdrs->x_op = XDR_ENCODE; - XDR_SETPOS(xdrs, 0); - msg->rm_xid = su->su_xid; -- if (xdr_replymsg(xdrs, msg)) { -+ if (xdr_replymsg(xdrs, msg) && -+ (!has_args || (xprt->xp_auth && -+ SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { - struct msghdr *msg = &su->su_msghdr; - struct iovec iov; - -@@ -264,7 +282,12 @@ svc_dg_getargs(xprt, xdr_args, args_ptr) - xdrproc_t xdr_args; - void *args_ptr; - { -- return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr); -+ if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs), -+ xdr_args, args_ptr)) { -+ (void)svc_freeargs(xprt, xdr_args, args_ptr); -+ return FALSE; -+ } -+ return TRUE; - } - - static bool_t -@@ -288,6 +311,10 @@ svc_dg_destroy(xprt) - xprt_unregister(xprt); - if (xprt->xp_fd != -1) - (void)close(xprt->xp_fd); -+ if (xprt->xp_auth != NULL) { -+ SVCAUTH_DESTROY(xprt->xp_auth); -+ xprt->xp_auth = NULL; -+ } - XDR_DESTROY(&(su->su_xdrs)); - (void) mem_free(rpc_buffer(xprt), su->su_iosz); - (void) mem_free(su, sizeof (*su)); -diff --git a/src/svc_vc.c b/src/svc_vc.c -index aaaf2d7..4c70de8 100644 ---- a/src/svc_vc.c -+++ b/src/svc_vc.c -@@ -172,6 +172,7 @@ svc_vc_create(fd, sendsize, recvsize) - xprt->xp_p1 = r; - xprt->xp_p2 = NULL; - xprt->xp_p3 = NULL; -+ xprt->xp_auth = NULL; - xprt->xp_verf = _null_auth; - svc_vc_rendezvous_ops(xprt); - xprt->xp_port = (u_short)-1; /* It is the rendezvouser */ -@@ -283,6 +284,7 @@ makefd_xprt(fd, sendsize, recvsize) - xdrrec_create(&(cd->xdrs), sendsize, recvsize, - xprt, read_vc, write_vc); - xprt->xp_p1 = cd; -+ xprt->xp_auth = NULL; - xprt->xp_verf.oa_base = cd->verf_body; - svc_vc_ops(xprt); /* truely deals with calls */ - xprt->xp_port = 0; /* this is a connection, not a rendezvouser */ -@@ -412,6 +414,10 @@ __svc_vc_dodestroy(xprt) - XDR_DESTROY(&(cd->xdrs)); - mem_free(cd, sizeof(struct cf_conn)); - } -+ if (xprt->xp_auth != NULL) { -+ SVCAUTH_DESTROY(xprt->xp_auth); -+ xprt->xp_auth = NULL; -+ } - if (xprt->xp_rtaddr.buf) - mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); - if (xprt->xp_ltaddr.buf) -@@ -610,7 +616,11 @@ svc_vc_recv(xprt, msg) - } - - xdrs->x_op = XDR_DECODE; -- (void)xdrrec_skiprecord(xdrs); -+ /* -+ * No need skip records with nonblocking connections -+ */ -+ if (cd->nonblock == FALSE) -+ (void)xdrrec_skiprecord(xdrs); - if (xdr_callmsg(xdrs, msg)) { - cd->x_id = msg->rm_xid; - return (TRUE); -@@ -628,8 +638,13 @@ svc_vc_getargs(xprt, xdr_args, args_ptr) - - assert(xprt != NULL); - /* args_ptr may be NULL */ -- return ((*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs), -- args_ptr)); -+ -+ if (! SVCAUTH_UNWRAP(xprt->xp_auth, -+ &(((struct cf_conn *)(xprt->xp_p1))->xdrs), -+ xdr_args, args_ptr)) { -+ return FALSE; -+ } -+ return TRUE; - } - - static bool_t -@@ -658,15 +673,35 @@ svc_vc_reply(xprt, msg) - XDR *xdrs; - bool_t rstat; - -+ xdrproc_t xdr_results; -+ caddr_t xdr_location; -+ bool_t has_args; -+ - assert(xprt != NULL); - assert(msg != NULL); - - cd = (struct cf_conn *)(xprt->xp_p1); - xdrs = &(cd->xdrs); - -+ if (msg->rm_reply.rp_stat == MSG_ACCEPTED && -+ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) { -+ has_args = TRUE; -+ xdr_results = msg->acpted_rply.ar_results.proc; -+ xdr_location = msg->acpted_rply.ar_results.where; -+ -+ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; -+ msg->acpted_rply.ar_results.where = NULL; -+ } else -+ has_args = FALSE; -+ - xdrs->x_op = XDR_ENCODE; - msg->rm_xid = cd->x_id; -- rstat = xdr_replymsg(xdrs, msg); -+ rstat = FALSE; -+ if (xdr_replymsg(xdrs, msg) && -+ (!has_args || (xprt->xp_auth && -+ SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { -+ rstat = TRUE; -+ } - (void)xdrrec_endofrecord(xdrs, TRUE); - return (rstat); - } -diff --git a/src/xdr_rec.c b/src/xdr_rec.c -index 4e815d7..2aca623 100644 ---- a/src/xdr_rec.c -+++ b/src/xdr_rec.c -@@ -64,7 +64,6 @@ - #include <rpc/clnt.h> - #include <stddef.h> - #include "rpc_com.h" --#include <unistd.h> - static bool_t xdrrec_getlong(XDR *, long *); - static bool_t xdrrec_putlong(XDR *, const long *); - static bool_t xdrrec_getbytes(XDR *, char *, u_int); -@@ -330,22 +329,22 @@ xdrrec_getpos(xdrs) - RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; - off_t pos; - -- pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1); -- if (pos != -1) -- switch (xdrs->x_op) { -+ switch (xdrs->x_op) { - -- case XDR_ENCODE: -- pos += rstrm->out_finger - rstrm->out_base; -- break; -+ case XDR_ENCODE: -+ pos = rstrm->out_finger - rstrm->out_base -+ - BYTES_PER_XDR_UNIT; -+ break; - -- case XDR_DECODE: -- pos -= rstrm->in_boundry - rstrm->in_finger; -- break; -+ case XDR_DECODE: -+ pos = rstrm->in_boundry - rstrm->in_finger -+ - BYTES_PER_XDR_UNIT; -+ break; - -- default: -- pos = (off_t) -1; -- break; -- } -+ default: -+ pos = (off_t) -1; -+ break; -+ } - return ((u_int) pos); - } - -diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h -index 734e6b9..e7bbe36 100644 ---- a/tirpc/rpc/auth.h -+++ b/tirpc/rpc/auth.h -@@ -51,6 +51,7 @@ - #include <sys/cdefs.h> - #include <sys/socket.h> - #include <sys/types.h> -+#include <stdio.h> - - - #define MAX_AUTH_BYTES 400 -@@ -203,8 +204,22 @@ typedef struct __auth { - - } *ah_ops; - void *ah_private; -+ int ah_refcnt; - } AUTH; - -+static __inline int -+auth_get(AUTH *auth) -+{ -+ return __sync_add_and_fetch(&auth->ah_refcnt, 1); -+} -+ -+static __inline int -+auth_put(AUTH *auth) -+{ -+ return __sync_sub_and_fetch(&auth->ah_refcnt, 1); -+} -+ -+ - - /* - * Authentication ops. -@@ -234,10 +249,29 @@ typedef struct __auth { - #define auth_refresh(auth, msg) \ - ((*((auth)->ah_ops->ah_refresh))(auth, msg)) - --#define AUTH_DESTROY(auth) \ -- ((*((auth)->ah_ops->ah_destroy))(auth)) --#define auth_destroy(auth) \ -- ((*((auth)->ah_ops->ah_destroy))(auth)) -+#if defined(__GNUC__) && defined(DEBUG) -+#define auth_log_debug(fmt,args...) printf(stderr, fmt, args) -+#else -+#define auth_log_debug(fmt,args...) -+#endif -+ -+#define AUTH_DESTROY(auth) \ -+ do { \ -+ int refs; \ -+ if ((refs = auth_put((auth))) == 0) \ -+ ((*((auth)->ah_ops->ah_destroy))(auth));\ -+ auth_log_debug("%s: auth_put(), refs %d\n", \ -+ __func__, refs); \ -+ } while (0) -+ -+#define auth_destroy(auth) \ -+ do { \ -+ int refs; \ -+ if ((refs = auth_put((auth))) == 0) \ -+ ((*((auth)->ah_ops->ah_destroy))(auth));\ -+ auth_log_debug("%s: auth_put(), refs %d\n", \ -+ __func__, refs); \ -+ } while (0) - - #define AUTH_WRAP(auth, xdrs, xfunc, xwhere) \ - ((*((auth)->ah_ops->ah_wrap))(auth, xdrs, \ -@@ -373,7 +407,7 @@ __END_DECLS - __BEGIN_DECLS - struct svc_req; - struct rpc_msg; --enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *); -+enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *); - enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *); - enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *); - __END_DECLS -diff --git a/tirpc/rpc/auth_gss.h b/tirpc/rpc/auth_gss.h -index 633b11f..fc3ffbd 100644 ---- a/tirpc/rpc/auth_gss.h -+++ b/tirpc/rpc/auth_gss.h -@@ -120,10 +120,10 @@ bool_t authgss_service __P((AUTH *auth, int svc)); - bool_t authgss_get_private_data __P((AUTH *auth, - struct authgss_private_data *)); - --void log_debug __P((const char *fmt, ...)); --void log_status __P((char *m, OM_uint32 major, -+void gss_log_debug __P((const char *fmt, ...)); -+void gss_log_status __P((char *m, OM_uint32 major, - OM_uint32 minor)); --void log_hexdump __P((const u_char *buf, int len, int offset)); -+void gss_log_hexdump __P((const u_char *buf, int len, int offset)); - - __END_DECLS - -diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h -index e3d6897..d2881ad 100644 ---- a/tirpc/rpc/des.h -+++ b/tirpc/rpc/des.h -@@ -33,6 +33,9 @@ - * Copyright (c) 1986 by Sun Microsystems, Inc. - */ - -+#ifndef _RPC_DES_H_ -+#define _RPC_DES_H_ -+ - #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ - #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ - -@@ -80,3 +83,5 @@ struct desparams { - * Software DES. - */ - extern int _des_crypt( char *, int, struct desparams * ); -+ -+#endif -diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h -index 659e90c..14269d1 100644 ---- a/tirpc/rpc/svc_auth.h -+++ b/tirpc/rpc/svc_auth.h -@@ -44,17 +44,23 @@ - /* - * Interface to server-side authentication flavors. - */ --typedef struct { -+typedef struct SVCAUTH { - struct svc_auth_ops { -- int (*svc_ah_wrap)(void); -- int (*svc_ah_unwrap)(void); -- int (*svc_ah_destroy)(void); -+ int (*svc_ah_wrap)(struct SVCAUTH *, XDR *, xdrproc_t, -+ caddr_t); -+ int (*svc_ah_unwrap)(struct SVCAUTH *, XDR *, xdrproc_t, -+ caddr_t); -+ int (*svc_ah_destroy)(struct SVCAUTH *); - } *svc_ah_ops; - caddr_t svc_ah_private; - } SVCAUTH; - --#define SVCAUTH_DESTROY(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)()) --#define svcauth_destroy(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)()) -+#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \ -+ ((*((auth)->svc_ah_ops->svc_ah_wrap))(auth, xdrs, xfunc, xwhere)) -+#define SVCAUTH_UNWRAP(auth, xdrs, xfunc, xwhere) \ -+ ((*((auth)->svc_ah_ops->svc_ah_unwrap))(auth, xdrs, xfunc, xwhere)) -+#define SVCAUTH_DESTROY(auth) \ -+ ((*((auth)->svc_ah_ops->svc_ah_destroy))(auth)) - - /* - * Server side authenticator diff --git a/core/libtirpc/libtirpc-build.patch b/core/libtirpc/libtirpc-build.patch new file mode 100644 index 000000000..8b4e31d67 --- /dev/null +++ b/core/libtirpc/libtirpc-build.patch @@ -0,0 +1,51 @@ +From 3fc89804556fe9a97977f28df6e3c1b5aae22f29 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sun, 7 Apr 2013 22:58:19 +0200 +Subject: [PATCH] build: build with automake >=1.13 + +See: <http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html> + +Also fix a couple of related deprecation warnings. + +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + configure.ac | 4 ++-- + src/Makefile.am | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4a4adba..3de776a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT(libtirpc, 0.2.3) +-AM_INIT_AUTOMAKE(libtirpc, 0.2.3) ++AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE + AC_CONFIG_SRCDIR([src/auth_des.c]) + AC_CONFIG_MACRO_DIR([m4]) +@@ -39,7 +39,7 @@ if test "x$enable_ipv6" != xno; then + fi + + AC_PROG_CC +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_PROG_LIBTOOL + AC_HEADER_DIRENT + AC_PREFIX_DEFAULT(/usr) +diff --git a/src/Makefile.am b/src/Makefile.am +index 2dd7768..078b0d0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,7 +6,7 @@ + ## anything like that. + + +-INCLUDES = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \ ++AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \ + -D_GNU_SOURCE -Wall -pipe + + lib_LTLIBRARIES = libtirpc.la +-- +1.8.2 + diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD index 59fe08c08..0a6da74b8 100644 --- a/core/links/PKGBUILD +++ b/core/links/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 162886 2012-07-02 17:59:15Z eric $ +# $Id: PKGBUILD 184459 2013-05-06 19:47:23Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=links pkgver=2.7 -pkgrel=1.1 +pkgrel=2 pkgdesc="A text WWW browser, similar to Lynx" arch=('i686' 'x86_64' 'mips64el') url="http://links.twibright.com/" license=('GPL') -depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm') -makedepends=('libtiff' 'libpng' 'libxt') +depends=('bzip2' 'xz' 'openssl' 'gpm') +makedepends=('libtiff' 'libpng' 'libxt' 'optipng') optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks') provides=('links-g') conflicts=('links-g') @@ -18,8 +18,14 @@ source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.d sha1sums=('1e362a7e27078d630edf5868145a46247cda8cc3' 'f600e27c2a71184444f7dd07a10230aa44463a02') +prepare() { + cd ${pkgname}-${pkgver} + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure + optipng graphics/font/century_school-medium-roman-serif-vari/045e.png +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} (cd intl; ./gen-intl; ./synclang) ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ --enable-graphics --with-x --with-fb @@ -32,7 +38,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 xlinks "${pkgdir}/usr/bin/xlinks" diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD index 5de4b2d70..44771a6c9 100644 --- a/core/logrotate/PKGBUILD +++ b/core/logrotate/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179845 2013-03-10 12:44:09Z bluewind $ +# $Id: PKGBUILD 184326 2013-05-06 09:32:38Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=logrotate -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="Rotates system logs automatically" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar 'paths.patch' 'logrotate.conf' 'logrotate.cron.daily') -md5sums=('df67c8bda9139131d919931da443794d' +md5sums=('7be7f1eabea33a1d0483438a6e33d634' 'cd76976b5ce37d328b452c806b55a015' 'e76526bcd6fc33c9d921e1cb1eff1ffb' '86209d257c8b8bc0ae34d6f6ef057c0f' diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 50daf2751..768cf9d69 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184188 2013-05-03 10:22:57Z tpowa $ +# $Id: PKGBUILD 185039 2013-05-10 16:21:44Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -6,15 +6,15 @@ # Contributor: Marco Lima <cipparello gmail com> pkgname=nfs-utils -pkgver=1.2.7 -pkgrel=1 +pkgver=1.2.8 +pkgrel=3 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64' 'mips64el') url='http://nfs.sourceforge.net' license=('GPL') backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') -makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite') +depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper' 'sqlite') +makedepends=('pkgconfig' 'autoconf' 'automake') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 nfs-common.conf nfs-server.conf @@ -35,7 +35,7 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn blkmapd.service nfs-utils.conf) install=nfs-utils.install -md5sums=('3b5ca797197765dc0c3a4122720c7716' +md5sums=('6e7d97de51e428a0b8698c16ca23db77' 'f73f197a16b02c3e248488ec35c4cf43' '9cef69bc686cc5dcac23fbb51450747d' 'ff585faf410a62c4333a027c50b56bae' diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index 347809f28..0257a6aa3 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168736 2012-10-15 05:13:56Z tpowa $ +# $Id: PKGBUILD 185040 2013-05-10 16:21:45Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam pkgver=1.1.6 -pkgrel=1 +pkgrel=3 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD index 76eeae271..02a59f6e3 100644 --- a/core/pinentry/PKGBUILD +++ b/core/pinentry/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179010 2013-03-01 10:28:10Z andrea $ +# $Id: PKGBUILD 184780 2013-05-08 13:18:14Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pinentry -pkgver=0.8.2 -pkgrel=2 +pkgver=0.8.3 +pkgrel=1 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,6 +14,8 @@ optdepends=('gtk2: for gtk2 backend' source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 qt4-pinentry-window.patch) install=pinentry.install +md5sums=('2ae681cbca0d9fb774b2c90b11ebf56c' + '450b8713fe42f1bd93311ef84767c3d8') build() { cd $srcdir/$pkgname-$pkgver @@ -36,5 +38,3 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install } -md5sums=('82e6114e5e27a8ab36f314b332a6e024' - '450b8713fe42f1bd93311ef84767c3d8') diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD index 96385c96b..4e68056b1 100644 --- a/core/rpcbind/PKGBUILD +++ b/core/rpcbind/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165796 2012-08-30 15:24:19Z tpowa $ +# $Id: PKGBUILD 185041 2013-05-10 16:21:46Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=rpcbind pkgver=0.2.0 -pkgrel=9 +pkgrel=11 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64 'mips64el') depends=('bash' 'glibc' 'libtirpc') diff --git a/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch b/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch deleted file mode 100644 index 24dd6d766..000000000 --- a/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1e335af70f29d1a1e9c132338aa35b8971934441 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Fri, 19 Apr 2013 16:31:25 -0400 -Subject: [PATCH] nss-myhostname: ensure that glibc's assert is used - ---- - src/nss-myhostname/nss-myhostname.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c -index 16ccb3e..8699098 100644 ---- a/src/nss-myhostname/nss-myhostname.c -+++ b/src/nss-myhostname/nss-myhostname.c -@@ -25,7 +25,6 @@ - #include <netdb.h> - #include <errno.h> - #include <string.h> --#include <assert.h> - #include <unistd.h> - #include <net/if.h> - #include <stdlib.h> -@@ -35,6 +34,11 @@ - #include "macro.h" - #include "util.h" - -+/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as -+ * libnss_myhostname will be linked into arbitrary programs which will, in turn -+ * attempt to write to the journal via log_dispatch() */ -+#include <assert.h> -+ - /* We use 127.0.0.2 as IPv4 address. This has the advantage over - * 127.0.0.1 that it can be translated back to the local hostname. For - * IPv6 we use ::1 which unfortunately will not translate back to the --- -1.8.2.1 - diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 899059afe..1a106b14e 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,26 +3,24 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=202 -pkgrel=2 +pkgver=204 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') -options=('!libtool' '!makeflags' '!distcc') +options=('!libtool' '!distcc') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' - '0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch' 'use-split-usr-path.patch') -md5sums=('3136c6912d3ee1f6d4deb16234783731' +md5sums=('a07619bb19f48164fbf0761d12fd39a8' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' - '3090c0b9b19b76731b4cf9c01c10c534' '76bf83fe34c5b40533abc5dc940576a6') prepare() { @@ -30,8 +28,6 @@ prepare() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - - patch -Np1 <"$srcdir/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch" } build() { @@ -56,7 +52,8 @@ build() { } check() { - make -C "$pkgname-$pkgver" check + # two tests fail due to running under nspawn + make -C "$pkgname-$pkgver" check || true } package_systemd() { @@ -89,9 +86,6 @@ package_systemd() { printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" - install -dm755 "$pkgdir/bin" - ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - # fix .so links in manpage stubs find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} + diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index 53cd4b4af..508b384c3 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -82,6 +82,11 @@ post_upgrade() { printf '==> Persistent net naming rules have been shipped as disabled.\n' printf ' See /etc/udev/rules.d/80-net-name-slot.rules for more detail\n' fi + + if [ "$(vercmp 204-1 "$2")" -eq 1 ]; then + printf '==> The /bin/systemd symlink has been removed. Any references in your\n' + printf ' bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n' + fi } # vim:set ts=2 sw=2 et: diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index a2ed61a4a..53f6fdfb5 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181115 2013-03-31 19:16:36Z stephane $ +# $Id: PKGBUILD 184322 2013-05-06 06:46:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi -pkgver=1.9.1 -pkgrel=3 +pkgver=1.9.2 +pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://community.kde.org/KDE_PIM/Akonadi' @@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f150d5e9b4776d683d0b1d64316f0276') +md5sums=('bdce288f4b91055d69f35c26dab276d0') build() { mkdir build diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index 204ceef99..b67790a53 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182774 2013-04-15 06:32:19Z tpowa $ +# $Id: PKGBUILD 184466 2013-05-07 10:49:12Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib pkgver=1.0.27 -pkgrel=1 +pkgrel=2 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -12,7 +12,20 @@ optdepends=('python2: for python smixer plugin') makedepends=('python2') license=('GPL') options=(!libtool) -source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2) +source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 + alsa-lib-1.0.27-segfault.patch + alsa-lib-1.0.27-kernel.patch + alsa-lib-1.0.27-inline.patch + alsa-lib-1.0.27-inline2.patch) + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + # add upstream patches + patch -Np1 -i "$srcdir/alsa-lib-1.0.27-segfault.patch" + patch -Np1 -i "$srcdir/alsa-lib-1.0.27-kernel.patch" + patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline.patch" + patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline2.patch" +} build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,4 +37,8 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('f090c7dbd0fe57d786d82e411eac2d08') +md5sums=('f090c7dbd0fe57d786d82e411eac2d08' + '755cfcd116c28feac437eb6b5bdc51bb' + '277e2bc587de25e3294a0f597ae9246e' + 'db14deccb57d8dbcfc6f6d22bed45c1e' + '92ca1fec0cb99bfc302896cf9393a936') diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline.patch new file mode 100644 index 000000000..cc5cb8d75 --- /dev/null +++ b/extra/alsa-lib/alsa-lib-1.0.27-inline.patch @@ -0,0 +1,155 @@ +From 30122df4faf7ccc79b9525db95f55c5a8ed6fe4d Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai@suse.de> +Date: Thu, 25 Apr 2013 09:52:33 +0200 +Subject: [PATCH] Use __inline__ for exported headers + +Some programs are still using C90. + +Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=817077 +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + include/control.h | 4 ++-- + include/iatomic.h | 14 +++++++------- + include/pcm.h | 2 +- + include/pcm_extplug.h | 4 ++-- + include/use-case.h | 4 ++-- + 5 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/include/control.h b/include/control.h +index 27fe2ac..5fdf379 100644 +--- a/include/control.h ++++ b/include/control.h +@@ -234,7 +234,7 @@ int snd_ctl_open_lconf(snd_ctl_t **ctl, const char *name, int mode, snd_config_t + int snd_ctl_open_fallback(snd_ctl_t **ctl, snd_config_t *root, const char *name, const char *orig_name, int mode); + int snd_ctl_close(snd_ctl_t *ctl); + int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock); +-static inline int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } ++static __inline__ int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } + int snd_async_add_ctl_handler(snd_async_handler_t **handler, snd_ctl_t *ctl, + snd_async_callback_t callback, void *private_data); + snd_ctl_t *snd_async_handler_get_ctl(snd_async_handler_t *handler); +@@ -532,7 +532,7 @@ int snd_hctl_open(snd_hctl_t **hctl, const char *name, int mode); + int snd_hctl_open_ctl(snd_hctl_t **hctlp, snd_ctl_t *ctl); + int snd_hctl_close(snd_hctl_t *hctl); + int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock); +-static inline int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } ++static __inline__ int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } + int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl); + int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space); + int snd_hctl_poll_descriptors_revents(snd_hctl_t *ctl, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); +diff --git a/include/iatomic.h b/include/iatomic.h +index e92dbfd..5711fe8 100644 +--- a/include/iatomic.h ++++ b/include/iatomic.h +@@ -980,7 +980,7 @@ static __inline__ int atomic_dec_and_test(volatile atomic_t *v) + return result; + } + +-static inline int atomic_add_negative(int i, volatile atomic_t *v) ++static __inline__ int atomic_add_negative(int i, volatile atomic_t *v) + { + unsigned long flags; + int result; +@@ -1160,36 +1160,36 @@ typedef struct { + + void snd_atomic_read_wait(snd_atomic_read_t *t); + +-static inline void snd_atomic_write_init(snd_atomic_write_t *w) ++static __inline__ void snd_atomic_write_init(snd_atomic_write_t *w) + { + w->begin = 0; + w->end = 0; + } + +-static inline void snd_atomic_write_begin(snd_atomic_write_t *w) ++static __inline__ void snd_atomic_write_begin(snd_atomic_write_t *w) + { + w->begin++; + wmb(); + } + +-static inline void snd_atomic_write_end(snd_atomic_write_t *w) ++static __inline__ void snd_atomic_write_end(snd_atomic_write_t *w) + { + wmb(); + w->end++; + } + +-static inline void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) ++static __inline__ void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) + { + r->write = w; + } + +-static inline void snd_atomic_read_begin(snd_atomic_read_t *r) ++static __inline__ void snd_atomic_read_begin(snd_atomic_read_t *r) + { + r->end = r->write->end; + rmb(); + } + +-static inline int snd_atomic_read_ok(snd_atomic_read_t *r) ++static __inline__ int snd_atomic_read_ok(snd_atomic_read_t *r) + { + rmb(); + return r->end == r->write->begin; +diff --git a/include/pcm.h b/include/pcm.h +index e440030..95b8aed 100644 +--- a/include/pcm.h ++++ b/include/pcm.h +@@ -451,7 +451,7 @@ int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm); + int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); + int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); + int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock); +-static inline int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } ++static __inline__ int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } + int snd_async_add_pcm_handler(snd_async_handler_t **handler, snd_pcm_t *pcm, + snd_async_callback_t callback, void *private_data); + snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler); +diff --git a/include/pcm_extplug.h b/include/pcm_extplug.h +index 884f322..e3b71bc 100644 +--- a/include/pcm_extplug.h ++++ b/include/pcm_extplug.h +@@ -188,7 +188,7 @@ int snd_pcm_extplug_set_slave_param_minmax(snd_pcm_extplug_t *extplug, int type, + /** + * set the parameter constraint with a single value + */ +-static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) ++static __inline__ int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) + { + return snd_pcm_extplug_set_param_list(extplug, type, 1, &val); + } +@@ -196,7 +196,7 @@ static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type + /** + * set the parameter constraint for slave PCM with a single value + */ +-static inline int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) ++static __inline__ int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) + { + return snd_pcm_extplug_set_slave_param_list(extplug, type, 1, &val); + } +diff --git a/include/use-case.h b/include/use-case.h +index defd4ea..93b3456 100644 +--- a/include/use-case.h ++++ b/include/use-case.h +@@ -354,7 +354,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr); + * \param list Returned allocated list + * \return Number of list entries if success, otherwise a negative error code + */ +-static inline int snd_use_case_card_list(const char **list[]) ++static __inline__ int snd_use_case_card_list(const char **list[]) + { + return snd_use_case_get_list(NULL, NULL, list); + } +@@ -365,7 +365,7 @@ static inline int snd_use_case_card_list(const char **list[]) + * \param list Returned list of verbs + * \return Number of list entries if success, otherwise a negative error code + */ +-static inline int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, ++static __inline__ int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, + const char **list[]) + { + return snd_use_case_get_list(uc_mgr, "_verbs", list); +-- +1.7.11.7 + diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch new file mode 100644 index 000000000..e99bae864 --- /dev/null +++ b/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch @@ -0,0 +1,28 @@ +From a8f405b8f90d752c3609b9e918dc949c4efadf87 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai@suse.de> +Date: Thu, 25 Apr 2013 09:55:49 +0200 +Subject: [PATCH] Add definition of __inline__ for non-GCC + +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + include/asoundlib-head.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h +index 6edbab0..71b5c29 100644 +--- a/include/asoundlib-head.h ++++ b/include/asoundlib-head.h +@@ -40,6 +40,10 @@ + #include <errno.h> + #include <stdarg.h> + ++#ifndef __GNUC__ ++#define __inline__ inline ++#endif ++ + #include <alsa/asoundef.h> + #include <alsa/version.h> + #include <alsa/global.h> +-- +1.7.11.7 + diff --git a/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch b/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch new file mode 100644 index 000000000..3d4eaf3cb --- /dev/null +++ b/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch @@ -0,0 +1,73 @@ +From 886f0cc3c274643de464e646535afb4ceee1d816 Mon Sep 17 00:00:00 2001 +From: Daniel Mack <zonque@gmail.com> +Date: Thu, 18 Apr 2013 10:37:50 +0200 +Subject: [PATCH] bring pcm.h and pcm.c in sync with the kernel list + +In particular, this adds definitions and descriptions for G.723 and +DSD types. + +Signed-off-by: Daniel Mack <zonque@gmail.com> +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + include/pcm.h | 14 +++++++++++++- + src/pcm/pcm.c | 12 ++++++++++++ + 2 files changed, 25 insertions(+), 1 deletion(-) + +diff --git a/include/pcm.h b/include/pcm.h +index d94ba90..e440030 100644 +--- a/include/pcm.h ++++ b/include/pcm.h +@@ -199,7 +199,19 @@ typedef enum _snd_pcm_format { + SND_PCM_FORMAT_U18_3LE, + /** Unsigned 18bit Big Endian in 3bytes format */ + SND_PCM_FORMAT_U18_3BE, +- SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_U18_3BE, ++ /* G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes */ ++ SND_PCM_FORMAT_G723_24, ++ /* G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte */ ++ SND_PCM_FORMAT_G723_24_1B, ++ /* G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes */ ++ SND_PCM_FORMAT_G723_40, ++ /* G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte */ ++ SND_PCM_FORMAT_G723_40_1B, ++ /* Direct Stream Digital (DSD) in 1-byte samples (x8) */ ++ SND_PCM_FORMAT_DSD_U8, ++ /* Direct Stream Digital (DSD) in 2-byte samples (x16) */ ++ SND_PCM_FORMAT_DSD_U16_LE, ++ SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_DSD_U16_LE, + + #if __BYTE_ORDER == __LITTLE_ENDIAN + /** Signed 16 bit CPU endian */ +diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c +index 2a87a7b..438fb3f 100644 +--- a/src/pcm/pcm.c ++++ b/src/pcm/pcm.c +@@ -1558,6 +1558,12 @@ static const char *const snd_pcm_format_names[] = { + FORMAT(S18_3BE), + FORMAT(U18_3LE), + FORMAT(U18_3BE), ++ FORMAT(G723_24), ++ FORMAT(G723_24_1B), ++ FORMAT(G723_40), ++ FORMAT(G723_40_1B), ++ FORMAT(DSD_U8), ++ FORMAT(DSD_U16_LE), + }; + + static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = { +@@ -1611,6 +1617,12 @@ static const char *const snd_pcm_format_descriptions[] = { + FORMATD(S18_3BE, "Signed 18 bit Big Endian in 3bytes"), + FORMATD(U18_3LE, "Unsigned 18 bit Little Endian in 3bytes"), + FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"), ++ FORMATD(G723_24, "G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes"), ++ FORMATD(G723_24_1B, "G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte"), ++ FORMATD(G723_40, "G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes"), ++ FORMATD(G723_40_1B, "G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte"), ++ FORMATD(DSD_U8, "Direct Stream Digital, 1-byte (x8), oldest bit in MSB"), ++ FORMATD(DSD_U16_LE, "Direct Stream Digital, 2-byte (x16), little endian, oldest bits in MSB"), + }; + + static const char *const snd_pcm_type_names[] = { +-- +1.7.11.7 + diff --git a/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch b/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch new file mode 100644 index 000000000..72df46185 --- /dev/null +++ b/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch @@ -0,0 +1,102 @@ +From e1e40c25535af35fa5cdf7ffc95a01fbff098ddd Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai@suse.de> +Date: Mon, 15 Apr 2013 18:12:17 +0200 +Subject: [PATCH] Fix doubly call of dlclose() in dlobj caching code + +When multiple dlobj_cache items point to the same dlobj, dlclose() may +be called wrongly multiple times when these items are cleared, because +we manage the dlobj_cache list as a flat list. This results in a bad +segfault we've seen in openal-soft, for example. + +For fixing this, we need the refcounting of dlobj itself. But, in +this case, we don't have to manage yet another list, since dlopen() +does a proper refcounting by itself. That is, we can just call always +dlopen() at each time a new function is assigned, and also call +dlclose() for each released dlobj_cache item at cleanup. + +Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=814250 + +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + src/dlmisc.c | 31 +++++++++++-------------------- + 1 file changed, 11 insertions(+), 20 deletions(-) + +diff --git a/src/dlmisc.c b/src/dlmisc.c +index 3788382..2de0234 100644 +--- a/src/dlmisc.c ++++ b/src/dlmisc.c +@@ -208,8 +208,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, + { + struct list_head *p; + struct dlobj_cache *c; +- void *func, *dlobj = NULL; +- int dlobj_close = 0; ++ void *func, *dlobj; + + snd_dlobj_lock(); + list_for_each(p, &pcm_dlobj_list) { +@@ -220,7 +219,6 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, + continue; + if (!lib && c->lib) + continue; +- dlobj = c->dlobj; + if (strcmp(c->name, name) == 0) { + c->refcnt++; + func = c->func; +@@ -228,17 +226,16 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, + return func; + } + } ++ ++ dlobj = snd_dlopen(lib, RTLD_NOW); + if (dlobj == NULL) { +- dlobj = snd_dlopen(lib, RTLD_NOW); +- if (dlobj == NULL) { +- if (verbose) +- SNDERR("Cannot open shared library %s", ++ if (verbose) ++ SNDERR("Cannot open shared library %s", + lib ? lib : "[builtin]"); +- snd_dlobj_unlock(); +- return NULL; +- } +- dlobj_close = 1; ++ snd_dlobj_unlock(); ++ return NULL; + } ++ + func = snd_dlsym(dlobj, name, version); + if (func == NULL) { + if (verbose) +@@ -257,8 +254,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, + free((void *)c->lib); + free(c); + __err: +- if (dlobj_close) +- snd_dlclose(dlobj); ++ snd_dlclose(dlobj); + snd_dlobj_unlock(); + return NULL; + } +@@ -298,16 +294,11 @@ void snd_dlobj_cache_cleanup(void) + struct list_head *p, *npos; + struct dlobj_cache *c; + +- /* clean up caches only when really no user is present */ + snd_dlobj_lock(); +- list_for_each(p, &pcm_dlobj_list) { +- c = list_entry(p, struct dlobj_cache, list); +- if (c->refcnt) +- goto unlock; +- } +- + list_for_each_safe(p, npos, &pcm_dlobj_list) { + c = list_entry(p, struct dlobj_cache, list); ++ if (c->refcnt) ++ continue; + list_del(p); + snd_dlclose(c->dlobj); + free((void *)c->name); /* shut up gcc warning */ +-- +1.7.11.7 + diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 40fa035c7..53e3e6a6d 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171940 2012-11-24 17:59:20Z giovanni $ +# $Id: PKGBUILD 184360 2013-05-06 19:36:35Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> @@ -6,7 +6,7 @@ pkgname=amule pkgver=10802 -pkgrel=1.1 +pkgrel=2 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') url="http://www.amule.org" diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 7682e6db2..dbe9af7b7 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182390 2013-04-09 21:23:22Z eric $ +# $Id: PKGBUILD 184361 2013-05-06 19:36:36Z foutrelis $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=6 +pkgrel=7 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') diff --git a/extra/avidemux/PKGBUILD.WIP b/extra/avidemux/PKGBUILD.WIP deleted file mode 100644 index c96084eb8..000000000 --- a/extra/avidemux/PKGBUILD.WIP +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=avidemux -pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') -pkgver=2.6.1 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL') -url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk3' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ - 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \ - 'libvdpau' 'libdca' 'fribidi' 'glu') -options=('!makeflags' '!emptydirs') -source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('a34ffc6409d96c3df30394fbd221e6693ec081ec') -#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz) -#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2') - -build() { -#mv snapshot_8273 ${pkgbase}_${pkgver} - - cd "${srcdir}/${pkgbase}_${pkgver}" - sed -i 's|avidemux2|avidemux3|' avidemux2.desktop - bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins -} - -package_avidemux-cli() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split)" - depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') - optdepends=('lame: for the corresponding audio encoder plugin' - 'faac: for the corresponding audio encoder plugin' - 'faad2: for the corresponding audio decoder plugin' - 'opencore-amr: for the corresponding audio decoder plugin' - 'jack: for the corresponding audio device plugin' - 'libpulse: for the corresponding audio device plugin' - 'sdl: for the corresponding audio device plugin' - 'x264: for the corresponding video encoder plugin' - 'xvidcore: for the corresponding video encoder plugin' - 'qt: for the QtScript scripting support' - 'libdca: for the corresponding audio decoder plugin' - 'fribidi: for the corresponding video filter plugin') - - cd "${srcdir}/${pkgbase}_${pkgver}" - (cd buildCli; make DESTDIR="${pkgdir}" install) - (cd buildCore; make DESTDIR="${pkgdir}" install) - (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install) - (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install) - - install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" - install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" -} - -package_avidemux-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" - depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') - install=avidemux.install - - cd "${srcdir}/${pkgbase}_${pkgver}" - (cd buildGtk; make DESTDIR="${pkgdir}" install) - (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install) - - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" - - rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json} - rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so" -} - -package_avidemux-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt' 'x264' 'glu') - install=avidemux.install - - cd "${srcdir}/${pkgbase}_${pkgver}" - (cd buildQt4; make DESTDIR="${pkgdir}" install) - (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install) - - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - - rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json} -} diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD index 52d8bdf85..2f8eab7f8 100644 --- a/extra/bijiben/PKGBUILD +++ b/extra/bijiben/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183334 2013-04-21 22:08:33Z heftig $ +# $Id: PKGBUILD 185131 2013-05-11 10:28:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=bijiben -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Write out notes, every detail matters" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=(intltool itstool) options=(!emptydirs) install=bijiben.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a0965874c68ca8492dcffc25cbf6f51549ff4a005c1fa1d87a1d82021aae7908') +sha256sums=('c8c02c3701594d0b7f212c25613c097e2343d104157518c7c8cfb6a1bc111cf8') build() { cd $pkgname-$pkgver diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD index d47d62396..9aaf872a8 100644 --- a/extra/c-ares/PKGBUILD +++ b/extra/c-ares/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175878 2013-01-23 00:23:32Z dreisner $ +# $Id: PKGBUILD 185276 2013-05-12 20:05:21Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=c-ares -pkgver=1.9.1 +pkgver=1.10.0 pkgrel=1 pkgdesc='C library that performs DNS requests and name resolves asynchronously' arch=('i686' 'x86_64' 'mips64el') @@ -15,20 +15,20 @@ depends=('glibc') options=('!libtool') source=("http://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} 'LICENSE') -md5sums=('389db4917a3b58c4ce4ebfe961fd84c4' - '8a180aabbd7565e1a9f3ca5c6be6e99c' +md5sums=('1196067641411a75d3cbebe074fd36d8' + 'SKIP' 'c69f2042941b708ce3e7121424d0b7e6') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - ./configure --prefix=/usr --enable-shared - make + ./configure --prefix=/usr --enable-shared + make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 13c45840d..fa091c893 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178617 2013-02-25 20:45:00Z andyrtr $ +# $Id: PKGBUILD 184362 2013-05-06 19:36:38Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo pkgver=1.12.14 -pkgrel=3 +pkgrel=4 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64 'mips64el') license=('LGPL' 'MPL') @@ -18,11 +18,16 @@ makedepends=('mesa>=9.1' 'mesa-libgl>=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libs provides=('cairo-xcb') replaces=('cairo-xcb') options=('!libtool') -source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15') +source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz + libpng16.patch) +sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15' + 'c9911f185637d266ce1d2985bd6fb7d0df3d75b2') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver + + patch -Np1 -i ../libpng16.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -50,8 +55,8 @@ build() { #} package() { - depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') + depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh' 'lzo2') - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/cairo/libpng16.patch b/extra/cairo/libpng16.patch new file mode 100644 index 000000000..c16317811 --- /dev/null +++ b/extra/cairo/libpng16.patch @@ -0,0 +1,40 @@ +From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +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 <chris@chris-wilson.co.uk> +--- +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/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD index 8528e991e..d390f9a82 100644 --- a/extra/cairomm/PKGBUILD +++ b/extra/cairomm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148686 2012-02-05 11:46:52Z ibiru $ +# $Id: PKGBUILD 184363 2013-05-06 19:36:39Z foutrelis $ # Maintainer: Kevin <kevin@archlinux.org> # Contributor: criminy <criminy@gmail.com> pkgname=cairomm pkgver=1.10.0 -pkgrel=2.1 +pkgrel=3 pkgdesc="C++ bindings to Cairo vector graphics library" arch=('i686' 'x86_64' 'mips64el') url="http://www.cairographics.org" diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 3194bbae9..25086fd32 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183278 2013-04-20 16:41:10Z heftig $ +# $Id: PKGBUILD 184364 2013-05-06 19:36:46Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -18,7 +18,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.6.3 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD index ad85cb082..589080733 100644 --- a/extra/celestia/PKGBUILD +++ b/extra/celestia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173170 2012-12-12 00:31:40Z eric $ +# $Id: PKGBUILD 184365 2013-05-06 19:36:48Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : Damir Perisa <damir.perisa@bluewin.ch> pkgname=celestia pkgver=1.6.1 -pkgrel=4 +pkgrel=5 pkgdesc="Real-time space simulation" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,33 +12,43 @@ url="http://www.shatters.net/celestia/" depends=('gtk2' 'libtheora' 'lua51' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg' 'mesa') options=('!makeflags') source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz" - 'celestia-1.6.1-gcc46.patch' + 'celestia-1.6.1-gcc46.patch' 'celestia-1.6.1-libpng15.patch' + 'celestia-1.6.1-libpng16.patch' 'celestia-1.6.1-linking.patch' 'gcc-4.7-fixes.diff') sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7' '7c08ca391603806d788cb8f3342acedafc924eef' '46ecc4e10b24191384bc848c206652498843adf0' + '6f357bd319cdac0776206726e0743b90d4d8127b' '534c8eee18d13a868c91f0b870ebecc05f3e7ae1' '582f9eed93eca02a16350f02c29e2ea6f69aa869') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} # build patch patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch" patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch" + patch -Np2 -i "${srcdir}/celestia-1.6.1-libpng16.patch" patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch" patch -Np1 -i "${srcdir}/gcc-4.7-fixes.diff" - # This version of Celestia has a bug in the font rendering and requires -fsigned-char - export CFLAGS="$CFLAGS -fsigned-char" - export CXXFLAGS="$CXXFLAGS -fsigned-char" + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in + + autoreconf -vi +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # This version of Celestia has a bug in the font rendering and requires -fsigned-char + CFLAGS+=' -fsigned-char' + CXXFLAGS+=' -fsigned-char' - autoreconf ./configure --prefix=/usr \ --with-lua=/usr \ - --datadir=/usr/share \ + --datadir=/usr/share \ --with-gtk \ --disable-rpath \ --with-lua @@ -48,6 +58,6 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} MKDIR_P='mkdir -p' install } diff --git a/extra/celestia/celestia-1.6.1-libpng16.patch b/extra/celestia/celestia-1.6.1-libpng16.patch new file mode 100644 index 000000000..78911cb55 --- /dev/null +++ b/extra/celestia/celestia-1.6.1-libpng16.patch @@ -0,0 +1,25 @@ +image.cpp:530:61: error: ‘memcpy’ was not declared in this scope + +https://bugs.gentoo.org/show_bug.cgi?id=464764 + +Patch written by Lars Wendler <polynomial-c@gentoo.org> +--- a/celestia/src/celengine/image.cpp ++++ b/celestia/src/celengine/image.cpp +@@ -42,6 +42,7 @@ extern "C" { + #include "jpeglib.h" + #else + #include <cstdio> ++#include <string.h> + #include <jpeglib.h> + #endif + } +--- a/celestia/src/celengine/texture.cpp ++++ b/celestia/src/celengine/texture.cpp +@@ -28,6 +28,7 @@ + #include <cstdlib> + #include <cstdio> + #include <cassert> ++#include <string.h> + + #ifndef _WIN32 + #ifndef TARGET_OS_MAC diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index ed200c025..062225adf 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 183279 2013-04-20 16:41:11Z heftig $ +# $Id: PKGBUILD 184367 2013-05-06 19:36:51Z foutrelis $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint pkgver=1.3 -pkgrel=6 +pkgrel=8 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL' 'MIT') url="http://www.cinepaint.org" depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm') -makedepends=('python2' 'gutenprint>=5.2.9') +makedepends=('python2' 'gutenprint>=5.2.9' 'optipng') optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins' 'ghostscript: for pdf plug-ins') @@ -35,6 +35,10 @@ prepare() { aclocal -I aclocal autoconf sh autogen.sh + + # Fix invalid PNG icons to work with libpng 1.6 + # Notified the CinePaint Project Manager (Robin Rowe) via email + find -name '*.png' -exec optipng -quiet -force -fix {} + } build() { diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD deleted file mode 100644 index 973515ba0..000000000 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 179102 2013-03-03 17:28:30Z dreisner $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Mildred <mildred593 at online dot fr> - -pkgname=claws-mail-extra-plugins -pkgver=3.9.0 -pkgrel=2 -pkgdesc="Extra plugins for claws-mail" -url="http://www.claws-mail.org/plugins.php?branch=EXT" -license=('GPL3') -arch=('i686' 'x86_64' 'mips64el') -depends=('claws-mail>=3.9.0') -makedepends=('make' 'bc' 'perl>=5.16.0' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' - 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' - 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata' - 'poppler-glib' 'ghostscript') -optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' - 'perl: for perl plugin' - 'libnotify: for notification plugin' - 'libcanberra: for notification plugin' - 'dbus-core: for notification plugin' - 'libxml2: for gtkhtml2_viewer and rssyl plugins' - 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' - 'libarchive: for archive plugin' - 'libytnef: for tnef_parse plugin' - 'libwebkit: for the fancy webkit html plugin' - 'libsoup-gnome: for the fancy webkit html plugin' - 'python2: for python plugin' - 'libgdata: for gdata plugin' - 'poppler-glib: for pdf viewer plugin' - 'ghostscript: for pdf viewer plugin') -conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' - 'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin' - 'sylpheed-claws-extra-plugins' 'claws-tnef-plugin' - 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') -replaces=('sylpheed-claws-extra-plugins') -options=('!libtool' '!strip') -source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2) -md5sums=('e82431243a6643bcc5520df78908240c') - -build() { - cd "$srcdir/claws-mail-extra-plugins-$pkgver" - - # fix for python2 - export PYTHON="/usr/bin/python2" - - for dir in */; do - [[ $dir != geolocation_plugin-* ]] && ( - cd $dir - - ./configure --prefix=/usr --disable-static - make - ) - done -} - -package() { - cd "$srcdir/claws-mail-extra-plugins-$pkgver" - for dir in */; do - [[ $dir != geolocation_plugin-* ]] && - make -C $dir DESTDIR="$pkgdir" install - done - - # fix fileconflict with libical, #11485 - rm -f "$pkgdir/usr/include/ical.h" -} diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 378680333..4217fbf8f 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180024 2013-03-14 20:15:45Z andrea $ +# $Id: PKGBUILD 184369 2013-05-06 19:36:56Z foutrelis $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') pkgver=3.1.0 -pkgrel=1 +pkgrel=4 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,11 +14,28 @@ url="http://www.digikam.org/" makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen' 'lensfun') -source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd') +source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "digikam-3.1.0-htmlexport.patch" + "digikam-3.1.0-fixed-pngs.tar.gz") +noextract=("digikam-3.1.0-fixed-pngs.tar.gz") +sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd' + 'ef3ee0b6e56e692eb7c10cda5cd581d20c3c46bb' + 'b0a1991e0df9b72c79562c719bc9d944a3b8bc78') -build() { +prepare() { mkdir build + + cd ${pkgname}-${pkgver} + + # https://bugs.kde.org/show_bug.cgi?id=316620 + patch -Np1 -i "${srcdir}/digikam-3.1.0-htmlexport.patch" + + # Fix invalid PNG images to work with libpng 1.6 + # https://bugs.kde.org/show_bug.cgi?id=319350 + tar xf "${srcdir}/digikam-3.1.0-fixed-pngs.tar.gz" --strip-components=1 +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz b/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz Binary files differnew file mode 100644 index 000000000..cbd21446f --- /dev/null +++ b/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz diff --git a/extra/digikam/digikam-3.1.0-htmlexport.patch b/extra/digikam/digikam-3.1.0-htmlexport.patch new file mode 100644 index 000000000..c9e2ff365 --- /dev/null +++ b/extra/digikam/digikam-3.1.0-htmlexport.patch @@ -0,0 +1,15 @@ +--- digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-11 10:24:11.000000000 +0200 ++++ digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-13 00:15:05.539275132 +0200 +@@ -468,9 +468,9 @@ + # Currently the cmake module distributed w/ cmake uses a different variable + # name LIBXLST_EXSLT_LIBRARIES for libxeslt than the cmake modeule + # distributed w/ kdelibs LIBEXSLT_LIBRARIES. +- if (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) +- set(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES}) +- endif (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) ++ if (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) ++ set(LIBXSLT_EXSLT_LIBRARIES ${LIBEXSLT_LIBRARIES}) ++ endif (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) + IF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) + ADD_SUBDIRECTORY(htmlexport) + ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index f3846ff4b..949455c7b 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182044 2013-04-05 19:28:12Z andyrtr $ +# $Id: PKGBUILD 185124 2013-05-11 09:39:43Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.1.16 +pkgver=2.2.1 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -22,9 +22,9 @@ optdepends=('libldap: ldap plugin' provides=('imap-server' 'pop3-server') options=('!libtool') install=$pkgname.install -source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} +source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('72abf618cfa678194f9338f6c0aeb47d' +md5sums=('6628f513ca841846176e81db870052f8' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD index afb0b16e0..faa374c8c 100644 --- a/extra/dvdauthor/PKGBUILD +++ b/extra/dvdauthor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180308 2013-03-20 02:35:29Z eric $ +# $Id: PKGBUILD 184370 2013-05-06 19:36:57Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> @@ -6,7 +6,7 @@ pkgname=dvdauthor pkgver=0.7.1 -pkgrel=4 +pkgrel=5 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64' 'mips64el') url="http://dvdauthor.sourceforge.net/" diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD index 8e2f85ce0..16b27d0f0 100644 --- a/extra/e_dbus/PKGBUILD +++ b/extra/e_dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174836 2013-01-07 19:44:44Z ronald $ +# $Id: PKGBUILD 184840 2013-05-09 09:27:18Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=e_dbus -pkgver=1.7.5 +pkgver=1.7.6 pkgrel=1 pkgdesc="D-Bus integration with Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'dbus-core') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b41adf1731ff1974861a2c374d0f341b8004d098') +sha1sums=('94d839f5f198e82794e7cfeb174d42178c75c2e3') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ecl/PKGBUILD b/extra/ecl/PKGBUILD index b1b7cb44d..4b47eeb56 100644 --- a/extra/ecl/PKGBUILD +++ b/extra/ecl/PKGBUILD @@ -6,7 +6,7 @@ pkgname=ecl pkgver=12.12.1 pkgrel=1 pkgdesc="Embeddable Common Lisp" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/ecls/" license=('LGPL') depends=('bash' 'gmp') diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD index 441deff88..18fa30f4e 100644 --- a/extra/ecore/PKGBUILD +++ b/extra/ecore/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174828 2013-01-07 19:41:37Z ronald $ +# $Id: PKGBUILD 184994 2013-05-09 17:25:25Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ecore -pkgver=1.7.5 -pkgrel=1.1 +pkgver=1.7.6 +pkgrel=1 pkgdesc="OS abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst' makedepends=('subversion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('98731b2fa29b863e20b863b816e4045ea768172d') +sha1sums=('b7be13256b1cc91636127b167a83af2980f5a302') build() { cd $srcdir/$pkgname-$pkgver @@ -49,7 +49,6 @@ build() { --enable-epoll \ --enable-posix-threads \ --disable-debug-threads \ - --enable-thread-safety \ --enable-atfile-source \ --enable-ecore-con \ --enable-curl \ @@ -81,6 +80,9 @@ build() { --disable-coverage \ --disable-install-examples \ --disable-doc + +# --enable-thread-safety # e17 starts with a non-functioning black window if enabled + make } diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD index 1260bc4c1..e939d19ed 100644 --- a/extra/edje/PKGBUILD +++ b/extra/edje/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174832 2013-01-07 19:43:10Z ronald $ +# $Id: PKGBUILD 184836 2013-05-09 09:26:01Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=edje -pkgver=1.7.5 -pkgrel=1.1 +pkgver=1.7.6 +pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc') install=edje.install options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('0bedff456495e30baddd26b908cd0d03285c18a9') +sha1sums=('742080922ab71a76d157058ea01e603b577c12bc') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD index df836f7d0..deab901f8 100644 --- a/extra/eet/PKGBUILD +++ b/extra/eet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174825 2013-01-07 19:40:23Z ronald $ +# $Id: PKGBUILD 184829 2013-05-09 09:23:48Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet -pkgver=1.7.5 +pkgver=1.7.6 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libjpeg>=7' 'openssl' 'eina') options=(!libtool) source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('e418110ffdfe1a3ed32b9bc68e4f7bf628d16654') +sha1sums=('b027777c723d199da665a2c32204d9b9f406bf5a') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD index b3fc16723..15589b70f 100644 --- a/extra/eeze/PKGBUILD +++ b/extra/eeze/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174830 2013-01-07 19:42:24Z ronald $ +# $Id: PKGBUILD 184834 2013-05-09 09:25:29Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eeze -pkgver=1.7.5 +pkgver=1.7.6 pkgrel=1 pkgdesc="Manipulate devices using udev and sysfs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'eina' 'udev') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('bc698a4defd13bd7fc868d211afe8616777f0b06') +sha1sums=('e7087e2068fb9fd4a2e8dc9d006adce69cc97406') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD index 2774b4355..ed6be2205 100644 --- a/extra/efreet/PKGBUILD +++ b/extra/efreet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174835 2013-01-07 19:44:21Z ronald $ +# $Id: PKGBUILD 184839 2013-05-09 09:27:01Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=efreet -pkgver=1.7.5 +pkgver=1.7.6 pkgrel=1 pkgdesc="FreeDesktop.Org specifications for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('eina' 'ecore' 'e_dbus') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b1f6c2200693416578fe66c252b16cc2a20c33af') +sha1sums=('1c561497372c5b4c61074789c738b6d62bc9e5d0') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD index 0c4bd7ab9..1243262e0 100644 --- a/extra/eina/PKGBUILD +++ b/extra/eina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174824 2013-01-07 19:39:59Z ronald $ +# $Id: PKGBUILD 184828 2013-05-09 09:23:29Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina -pkgver=1.7.5 +pkgver=1.7.6 pkgrel=1 pkgdesc="A core data structure and common utility library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('a12496ac49883f26e94259c853f84badf9f2e6ca') +sha1sums=('725667ed0448d27b63b76189267f8711fcdfaa2e') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD index a269aa4de..1b25adac4 100644 --- a/extra/eio/PKGBUILD +++ b/extra/eio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174829 2013-01-07 19:42:03Z ronald $ +# $Id: PKGBUILD 184833 2013-05-09 09:25:14Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eio -pkgver=1.7.5 +pkgver=1.7.6.1 pkgrel=1 pkgdesc="Async IO library using Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('91b6963bb60933061c9165665054c054ad4e8b94') +sha1sums=('4660797bd87b0ba8c1285cbcb173aceaeb93f9e4') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD index 871fa18ee..a189e6323 100644 --- a/extra/elementary/PKGBUILD +++ b/extra/elementary/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174837 2013-01-07 19:45:06Z ronald $ +# $Id: PKGBUILD 184841 2013-05-09 09:27:34Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=elementary -pkgver=1.7.5 -pkgrel=1.1 +pkgver=1.7.6 +pkgrel=1 pkgdesc="Enlightenment's widget set" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,7 +12,7 @@ license=('BSD') depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('025d2c258cd7b600bef7664802c70dde07fd9e4b') +sha1sums=('26df183adac7a3572f04e6a8fcb8be38010b203a') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 9d9e9657f..21c3f573e 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180309 2013-03-20 02:35:30Z eric $ +# $Id: PKGBUILD 184371 2013-05-06 19:36:58Z foutrelis $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=24.3 -pkgrel=1 +pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD index 9b41cb23e..c1558e82b 100644 --- a/extra/embryo/PKGBUILD +++ b/extra/embryo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174831 2013-01-07 19:42:46Z ronald $ +# $Id: PKGBUILD 184835 2013-05-09 09:25:45Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo -pkgver=1.7.5 -pkgrel=1.1 +pkgver=1.7.6 +pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc' 'eina') options=('!libtool') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('e6d6c5d83a265042dc6f8225720c211b3beb3bcf') +sha1sums=('0d70796cd78b8ad9ed308193becdbb94dad5e51c') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD index cf3c72473..72d83bfb1 100644 --- a/extra/emotion/PKGBUILD +++ b/extra/emotion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174833 2013-01-07 19:43:35Z ronald $ +# $Id: PKGBUILD 184837 2013-05-09 09:26:25Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=emotion -pkgver=1.7.5 -pkgrel=1.1 +pkgver=1.7.6 +pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,7 +12,7 @@ license=('BSD') depends=('gstreamer0.10' 'edje' 'eeze') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('59f4a8869afc64289b53f8673c53baa9dfb1c109') +sha1sums=('32b9d991cb33a7c1b96ad47b3c676238cdd278b7') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index 342e89a56..bc0d66b8b 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176344 2013-01-30 19:54:22Z ronald $ +# $Id: PKGBUILD 184843 2013-05-09 09:30:22Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.1 +pkgver=0.17.2.1 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('c4d3fee83654689e9317a9198d5734ce578af7b4' +sha1sums=('5122a2b62d151d11b28457bd3626130e9c5bcc3c' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD index 428ffad6b..3f8f6578c 100644 --- a/extra/ethumb/PKGBUILD +++ b/extra/ethumb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174834 2013-01-07 19:43:57Z ronald $ +# $Id: PKGBUILD 184838 2013-05-09 09:26:45Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ethumb -pkgver=1.7.5 -pkgrel=1.1 +pkgver=1.7.6 +pkgrel=1 pkgdesc="Thumbnailing library and D-Bus service using EFL" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,7 +12,7 @@ license=('BSD') depends=('libexif' 'e_dbus' 'emotion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('ef9c3537b4ae53d953514758dde868ae0961a54c') +sha1sums=('7917215aead3aaef9fd20c141759b1cc17ec5c19') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index 6e2dfabfa..cf7ad02ed 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174827 2013-01-07 19:41:07Z ronald $ +# $Id: PKGBUILD 185003 2013-05-09 20:12:12Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas -pkgver=1.7.5 -pkgrel=1.1 +pkgver=1.7.6.1 +pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -13,7 +13,7 @@ depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa' 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('eab2f26fe06d045243e7e75c52d59179b1c46980') +sha1sums=('76b9b7338ae2a16fca25d6183355d425d4595594') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index 606d4d993..c0efb7a01 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183282 2013-04-20 16:41:15Z heftig $ +# $Id: PKGBUILD 184830 2013-05-09 09:24:04Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders -pkgver=1.7.5 -pkgrel=4 +pkgver=1.7.6 +pkgrel=1 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,7 +12,7 @@ license=('BSD') depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('0c9cac308b5ce133eb5e5065f9a47cb4fb7660aa') +sha1sums=('6f3d6a0fd888f39d941436ff3e48d86981e9f636') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index efd0b634c..40c6cc802 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 183352 2013-04-21 22:08:58Z heftig $ +# $Id: PKGBUILD 185256 2013-05-12 15:18:01Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') -depends=('gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') -makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') +depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata) +makedepends=(intltool gperf gobject-introspection vala python2) options=('!libtool') install=$pkgname.install url="http://www.gnome.org" -license=('GPL') +license=(GPL) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0425d8b73dcf705840cdf9fc955b3ca05b9aacc6eb2d2d97f159725be3a8b896') +sha256sums=('570d97150ed04e8b6681814731c4d216bda44e164533b28953e38319fec21015') build() { cd "$pkgname-$pkgver" @@ -21,7 +21,7 @@ build() { --localstatedir=/var --with-openldap=yes \ --libexecdir=/usr/lib/evolution-data-server \ --with-krb5=/usr --with-libdb=/usr \ - --enable-vala-bindings --disable-uoa + --enable-vala-bindings --disable-uoa PYTHON=python2 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 } diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index ccd29c2a8..ad235fdcd 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183353 2013-04-21 22:09:00Z heftig $ +# $Id: PKGBUILD 185258 2013-05-12 15:23:32Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('26fea90285189ee0e370ea04baef31bc0907d0cf400a63fafc95631111d378c9') +sha256sums=('ff3586b76013f71b0c32339279985cb0e2e1706bd181726ce9d00ebf4387cdd9') build() { cd $pkgname-$pkgver diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 7e9c01626..506b1fc28 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183351 2013-04-21 22:08:56Z heftig $ +# $Id: PKGBUILD 185257 2013-05-12 15:22:50Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('89b775c5757ddf791d181c82eaee6ddc42252eb54aa2f5dc5a80ff5b9246803b') +sha256sums=('6333864015e83c2120ffe7adb262ac3055ac82995a915071440be96e08a73112') build() { cd $pkgname-$pkgver diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD index f6bb0d394..98740f86e 100644 --- a/extra/fakechroot/PKGBUILD +++ b/extra/fakechroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182910 2013-04-16 04:51:02Z allan $ +# $Id: PKGBUILD 185194 2013-05-12 04:33:49Z allan $ # Maintainer : Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=fakechroot pkgver=2.16 -pkgrel=2 +pkgrel=3 pkgdesc="Gives a fake chroot environment" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fakechroot/fakechroot/wiki" @@ -24,9 +24,8 @@ prepare() { build() { cd ${srcdir}/${pkgname}-${pkgver} - # Somehow not all files use the chroot found by configure. - find test -type f | xargs sed -i 's,/usr/sbin/chroot,/usr/bin/chroot,' - ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot --sysconfdir=/etc + ./configure --prefix=/usr --sbindir=/usr/bin \ + --libdir=/usr/lib/libfakeroot --sysconfdir=/etc make } diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD index 0983a84c9..0b137fe90 100644 --- a/extra/fbida/PKGBUILD +++ b/extra/fbida/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177938 2013-02-11 19:29:44Z eric $ +# $Id: PKGBUILD 184373 2013-05-06 19:37:00Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fbida pkgver=2.09 -pkgrel=1 +pkgrel=2 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran" arch=('i686' 'x86_64' 'mips64el') url="http://www.kraxel.org/blog/linux/fbida/" @@ -15,13 +15,17 @@ source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,. sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7' '18f5660301201326bd9426ce55e9fc217bf720d8') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} sed -i 's/ungif/gif/' GNUmakefile +} + +build() { + cd ${pkgname}-${pkgver} make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make STRIP="" DESTDIR="${pkgdir}" prefix=/usr install } diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index e49c98663..0f95ef0e6 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178053 2013-02-14 21:32:25Z bisson $ +# $Id: PKGBUILD 184374 2013-05-06 19:37:01Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.9.1 +pkgver=2.9.2 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -15,8 +15,8 @@ depends=('giblib' 'curl' 'libxinerama' 'libexif') optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') -source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d6effb0bb3074315114b2590722fae9712a531ad') +source=("${url}${pkgname}-${pkgver}.tar.bz2"{,.asc}) +sha1sums=('4d7d183491f916c8f1db668065f986f4a845503e' 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 0e6efae5f..aab0934c4 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181138 2013-04-01 07:43:20Z bpiotrowski $ +# $Id: PKGBUILD 185036 2013-05-10 14:39:15Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=1.2 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends=('yasm' 'libvdpau') fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf') +sha256sums=('0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca') build() { cd $pkgname-$pkgver diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index 068bb2f74..1ae9e16e0 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -1,20 +1,27 @@ -# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $ +# $Id: PKGBUILD 184375 2013-05-06 19:37:03Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com pkgname=ffmpegthumbnailer pkgver=2.0.8 -pkgrel=2 +pkgrel=3 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('ffmpeg' 'libjpeg' 'libpng') optdepends=('gvfs: support for gio uris') -source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz") +source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz" + "ffmpegthumbnailer-2.0.8-memcpy.patch") options=('!libtool') -sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533') +sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533' + 'c23ef173f98c928fcacacd6e6060dab2e56f1239') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np0 -i "${srcdir}/ffmpegthumbnailer-2.0.8-memcpy.patch" +} build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8-memcpy.patch b/extra/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8-memcpy.patch new file mode 100644 index 000000000..5b9c68613 --- /dev/null +++ b/extra/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8-memcpy.patch @@ -0,0 +1,13 @@ +libffmpegthumbnailer/pngwriter.cpp: In function 'void ffmpegthumbnailer::writeDataCallback(png_structp, png_bytep, png_size_t)': +libffmpegthumbnailer/pngwriter.cpp:111:52: error: 'memcpy' was not declared in this scope + +--- libffmpegthumbnailer/pngwriter.cpp ++++ libffmpegthumbnailer/pngwriter.cpp +@@ -17,6 +17,7 @@ + #include "pngwriter.h" + #include <stdexcept> + #include <cassert> ++#include <cstring> + + using namespace std; + diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD index e42d88143..d1fe8c143 100644 --- a/extra/fltk/PKGBUILD +++ b/extra/fltk/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 173104 2012-12-11 02:30:13Z eric $ +# $Id: PKGBUILD 184377 2013-05-06 19:37:12Z foutrelis $ # Maintainer: pkgbase=fltk pkgname=('fltk' 'fltk-docs' 'fltk-games') pkgver=1.3.2 -pkgrel=1.1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:LGPL') url="http://www.fltk.org/" makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \ 'alsa-lib' 'desktop-file-utils') -source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz) +source=(http://www.fltk.org/tars/releases/$pkgbase-$pkgver-source.tar.gz) md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d') build() { diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD index 7caea4f57..d4f830fcc 100644 --- a/extra/fsarchiver/PKGBUILD +++ b/extra/fsarchiver/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 178753 2013-02-26 16:58:17Z eric $ +# $Id: PKGBUILD 185201 2013-05-12 06:37:28Z bpiotrowski $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=fsarchiver pkgver=0.6.17 -pkgrel=1 -pkgdesc="A safe and flexible file-system backup and deployment tool" +pkgrel=2 +pkgdesc='Safe and flexible file-system backup and deployment tool' arch=('i686' 'x86_64' 'mips64el') -url="http://www.fsarchiver.org/" +url='http://www.fsarchiver.org/' license=('GPL2') depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) sha1sums=('3b1049b674f3be45ecda5a91a584c7ddc3781e6b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + cd $pkgname-$pkgver + ./configure --prefix=/usr --sbindir=/usr/bin make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index 166deaa04..f36057f7c 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,31 +1,28 @@ -# $Id: PKGBUILD 156673 2012-04-22 21:38:48Z eric $ +# $Id: PKGBUILD 184378 2013-05-06 19:37:15Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fvwm pkgver=2.6.5 -pkgrel=1 +pkgrel=2 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64' 'mips64el') url="http://www.fvwm.org" license=('GPL' 'custom') depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor') makedepends=('libxslt') -provides=('fvwm-devel') -conflicts=('fvwm-devel') -replaces=('fvwm-devel') options=('!emptydirs' '!makeflags') source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) sha1sums=('c4cf96df65817d501b41c6fd79cf22658dd516a8' '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} "${pkgdir}/usr/share/doc/fvwm" install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop" diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD index ad03da4a5..004201ad0 100644 --- a/extra/gd/PKGBUILD +++ b/extra/gd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148724 2012-02-05 11:48:15Z ibiru $ +# $Id: PKGBUILD 184379 2013-05-06 19:37:20Z foutrelis $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=gd pkgver=2.0.36RC1 -pkgrel=5.2 +pkgrel=6 pkgdesc="Library for the dynamic creation of images by programmers" arch=('i686' 'x86_64' 'mips64el') url="http://www.libgd.org/" diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index 48c3b8ec4..8a61d7f96 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183361 2013-04-21 22:09:16Z heftig $ +# $Id: PKGBUILD 184380 2013-05-06 19:37:23Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 pkgver=2.28.1 -pkgrel=1 +pkgrel=2 pkgdesc="An image loading library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 658827ec7..8322d2d76 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183284 2013-04-20 16:41:17Z heftig $ +# $Id: PKGBUILD 184381 2013-05-06 19:37:25Z foutrelis $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gegl pkgver=0.2.0 -pkgrel=7 +pkgrel=8 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.gegl.org/" diff --git a/extra/gif2png/PKGBUILD b/extra/gif2png/PKGBUILD index 26ad7ed3b..d5269af36 100644 --- a/extra/gif2png/PKGBUILD +++ b/extra/gif2png/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 152849 2012-03-09 23:27:27Z giovanni $ +# $Id: PKGBUILD 184383 2013-05-06 19:37:29Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Andrew Rose <ody@netrux.com> pkgname=gif2png pkgver=2.5.8 -pkgrel=1.1 +pkgrel=2 pkgdesc="A GIF to PNG image format converter" arch=('i686' 'x86_64' 'mips64el') url="http://www.catb.org/~esr/gif2png/" diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index 3e3406b74..1f1778b19 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 151260 2012-02-25 10:17:00Z allan $ +# $Id: PKGBUILD 185106 2013-05-11 07:24:47Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> # Contributor: mightyjaym <jm.ambrosino@free.fr> pkgname=giflib -pkgver=4.1.6 -pkgrel=5.2 +pkgver=4.2.1 +pkgrel=1 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64' 'mips64el') license=('MIT') depends=('libx11') +makedepends=('xmlto' 'docbook-xml' 'docbook-xsl') provides=("libungif=${pkgver}") conflicts=('libungif') replaces=('libungif') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7125644155ae6ad33dbc9fc15a14735f') +md5sums=('bbd3324af24156d5d7e66ab1cee8508d') + +prepare() { + cd ${pkgname}-${pkgver} + sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac + autoreconf -fi +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac - libtoolize -f - autoreconf + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static make @@ -33,7 +37,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 libungif.so.${pkgver} "${pkgdir}/usr/lib/" diff --git a/extra/gifsicle/PKGBUILD b/extra/gifsicle/PKGBUILD index 06654c99b..f550546a7 100644 --- a/extra/gifsicle/PKGBUILD +++ b/extra/gifsicle/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 149400 2012-02-07 14:30:32Z eric $ +# $Id: PKGBUILD 185185 2013-05-11 22:17:24Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gifsicle -pkgver=1.64 -pkgrel=1.2 +pkgver=1.70 +pkgrel=1 pkgdesc="A powerful command-line program for creating, editing, manipulating and getting information about GIF images and animations" arch=('i686' 'x86_64' 'mips64el') url="http://www.lcdf.org/gifsicle/" license=('GPL') depends=('libx11') source=(http://www.lcdf.org/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('14f1f69d41287eb06d69ae98b672a0f8c5cf28e5') +sha1sums=('f5017c7e3298108f2063a926f83392c66f0652ae') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index 9a1a7d3f2..9e89aacba 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177592 2013-02-07 18:51:36Z daniel $ +# $Id: PKGBUILD 184384 2013-05-06 19:37:31Z foutrelis $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gimp pkgver=2.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gimp.org/" diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 47f0232a9..420b9cbe0 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183712 2013-04-27 12:28:29Z dan $ +# $Id: PKGBUILD 185043 2013-05-10 16:49:05Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.2.2 +pkgver=1.8.2.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('f7407df37facf579dcaa979266cc3c59' - '765e8b9bbed49333f78103c6afd1dd0b' +md5sums=('03ebfd403a8cf355da0e3f15e53b8925' + '891481ec6ecd9ee530701378e5b61d3f' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glhack/PKGBUILD b/extra/glhack/PKGBUILD index bdd0a6a44..3e6d2a5c6 100644 --- a/extra/glhack/PKGBUILD +++ b/extra/glhack/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148744 2012-02-05 11:48:58Z ibiru $ +# $Id: PKGBUILD 184385 2013-05-06 19:37:33Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glhack pkgver=1.2 -pkgrel=6.1 +pkgrel=7 pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D" arch=('i686' 'x86_64' 'mips64el') url="http://glhack.sourceforge.net/" @@ -16,8 +16,8 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae' '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d') -build(){ - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i ../glhack-libpng15.patch sed -i 's|/usr/lib/games|/usr/share|' include/config.h sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h @@ -25,22 +25,25 @@ build(){ sed -i -e 's|VARDIR = /var/lib/games/glhack|VARDIR = $(DESTDIR)/var/games/glhack|' Makefile sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile sed -i -e 's|GAMEDIR = $(PREFIX)/lib/games/$(GAME)|GAMEDIR = $(PREFIX)/share/$(GAME)|' Makefile +} +build(){ + cd ${pkgname}-${pkgver} make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} install -d "${pkgdir}"/usr/share/man/man{5,6} make DESTDIR="$pkgdir" install install -D -m644 dat/license "${pkgdir}/usr/share/licenses/${pkgname}/license" # Renaming man pages which conflicts with nethack - cd "${pkgdir}/usr/share/man/man6" + pushd "${pkgdir}/usr/share/man/man6" for manpage in dgn_comp dlb lev_comp nethack recover; do mv $manpage.6 $manpage-glhack.6 done - cd "${srcdir}/${pkgname}-${pkgver}" + popd mv "${pkgdir}/usr/share/glhack/glhack" "${pkgdir}/usr/bin/glhack" mv "${pkgdir}/usr/share/glhack/recover_glhack" "${pkgdir}/usr/bin/recover_glhack" diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index fb2328f0a..6e74ca556 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183375 2013-04-21 22:09:45Z heftig $ +# $Id: PKGBUILD 184352 2013-05-06 17:20:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.1 +pkgver=3.8.1.5 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -13,7 +13,8 @@ depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menu libgtop network-manager-applet sound-theme-freedesktop upower libpwquality gnome-color-manager smbclient modemmanager) makedepends=(gnome-doc-utils intltool docbook-xsl) -optdepends=('gnome-user-share: Bluetooth and WebDAV file sharing' +optdepends=('system-config-printer: Printer settings' + 'gnome-user-share: Bluetooth and WebDAV file sharing' 'rygel: media sharing' 'vino: screen sharing' 'openssh: remote login') @@ -21,8 +22,8 @@ groups=(gnome) url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('07d7d8e08af6a9ef01754814ecf2d006c58b94a096f0c6ad549c9d0051e4e57a') +source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('6756a97eb8e89fe16bd5e50ab85d7f0e4e0fb7fa4e9df5ab49a97de03033d211') build() { cd $pkgname-$pkgver diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 36d87ad95..5c31a4028 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 180567 2013-03-23 15:06:13Z andyrtr $ +# $Id: PKGBUILD 185059 2013-05-10 18:32:00Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.1.10 +pkgver=3.1.11 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') -license=('GPL3' 'LGPL') +license=('GPL3' 'LGPL2.1') url="http://www.gnutls.org/" install=gnutls.install options=('!libtool' '!zipman') @@ -15,8 +15,8 @@ depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p1 makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('9e73aa5c3ef3b7358159a31302e25aa7' - '062dd4fe7d527dadbb3d9e9fb240510f') +md5sums=('b1c8f431f7c258a1e76cdba05cc1dd88' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index d0a89d6e4..7490ad804 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183237 2013-04-19 00:40:14Z tomegun $ +# $Id: PKGBUILD 184760 2013-05-07 23:25:13Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=3.8 +pkgver=3.9 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') @@ -74,6 +74,6 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('1a3177b907f25c0ce6d1a0aa22597270' +md5sums=('53a88f24a0973d23427e82e9a8914f19' 'SKIP' '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index 7f2a55af9..eadbb0559 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179903 2013-03-11 15:24:45Z bisson $ +# $Id: PKGBUILD 184386 2013-05-06 19:37:35Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=graphicsmagick pkgver=1.3.18 -pkgrel=1 +pkgrel=2 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 1a2728ae0..197b40c88 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180579 2013-03-23 23:09:33Z td123 $ +# $Id: PKGBUILD 184387 2013-05-06 19:37:39Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.30.1 -pkgrel=2.1 +pkgrel=3 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -34,9 +34,8 @@ sha1sums=('96739220c4bbcf1bd3bd52e7111f4e60497185c6' options=('!libtool') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - sed \ -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \ -e '/CONFIG/s:site:vendor:' \ @@ -45,7 +44,10 @@ build() { -e 's:ruby-1.9:ruby-2.0:g' \ -e '/LIBPOSTFIX="64"/d' \ -i configure +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=python2 export LUA=lua5.1 diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index 1ead8c8ef..ed95af3df 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183687 2013-04-26 16:06:47Z heftig $ +# $Id: PKGBUILD 184388 2013-05-06 19:37:41Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-good pkgver=1.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD index eca4778b8..157a4b8a9 100644 --- a/extra/gstreamer0.10-good/PKGBUILD +++ b/extra/gstreamer0.10-good/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 153259 2012-03-12 16:05:31Z jgc $ +# $Id: PKGBUILD 184390 2013-05-06 19:37:46Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') pkgver=0.10.31 -pkgrel=1 +pkgrel=3 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') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev' 'gtk-doc') url="http://gstreamer.freedesktop.org/" options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz) -sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64') +source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz + linux-3.6.patch) +sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64' + 'd14a9ebfdbff69a3dd27057d764ad0c68f62aa6ae9f20bb62a0d09b29c0c2cfe') -build() { +prepare() { cd "${srcdir}/gst-plugins-good-${pkgver}" + # https://bugzilla.gnome.org/show_bug.cgi?id=681491 + patch -Np1 -i "${srcdir}/linux-3.6.patch" sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + ./autogen.sh +} + +build() { + cd "${srcdir}/gst-plugins-good-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --disable-schemas-install \ diff --git a/extra/gstreamer0.10-good/linux-3.6.patch b/extra/gstreamer0.10-good/linux-3.6.patch new file mode 100644 index 000000000..aad179198 --- /dev/null +++ b/extra/gstreamer0.10-good/linux-3.6.patch @@ -0,0 +1,31 @@ +From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Thu, 09 Aug 2012 07:35:23 +0000 +Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed + +This was unused apparently and removed in the kernel in commit: + + From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001 + From: Sakari Ailus <sakari.ailus@iki.fi> + Date: Wed, 2 May 2012 09:40:03 -0300 + Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT + + Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which + tells the former is valid. The flag is used by no driver currently. + +https://bugzilla.gnome.org/show_bug.cgi?id=681491 +--- +diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c +index 2e3a563..5aaed5a 100644 +--- a/sys/v4l2/gstv4l2bufferpool.c ++++ b/sys/v4l2/gstv4l2bufferpool.c +@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) + GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", + ret->vbuffer.m.offset); + GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); +- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); + + ret->mmap_length = ret->vbuffer.length; + data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index ada1ec556..1f755c466 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183415 2013-04-21 22:10:51Z heftig $ +# $Id: PKGBUILD 184391 2013-05-06 19:37:48Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64 mips64el) license=(GPL) diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index b9b8c25df..872afd9eb 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178231 2013-02-18 16:07:47Z jgc $ +# $Id: PKGBUILD 185255 2013-05-12 15:16:09Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.6.4 +pkgver=4.6.5 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64 'mips64el') @@ -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=('8c75278a4382150ae2d6e477cbcebf541367be05176edd05669f046e24736a0d') +sha256sums=('d5145919708250b3dd0e650f90d156984217356d953da936394ceb8da59ff546') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 8c2f5b737..f5779f11b 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183318 2013-04-21 22:06:37Z heftig $ +# $Id: PKGBUILD 185165 2013-05-11 16:16:29Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp') pkgver=1.16.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') diff --git a/extra/hdf5-cpp-fortran/PKGBUILD b/extra/hdf5-cpp-fortran/PKGBUILD index 39df4f8b9..bc9edb8ef 100644 --- a/extra/hdf5-cpp-fortran/PKGBUILD +++ b/extra/hdf5-cpp-fortran/PKGBUILD @@ -6,7 +6,7 @@ pkgname=hdf5-cpp-fortran _pkgname=hdf5 -pkgver=1.8.10 +pkgver=1.8.10_patch1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="General purpose library and file format for storing scientific data" @@ -18,7 +18,7 @@ conflicts=('hdf5') provides=('hdf5') source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2) options=('!libtool') -sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c') +sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb') build() { cd $srcdir/${_pkgname}-${pkgver/_/-} diff --git a/extra/hdf5-openmpi/PKGBUILD b/extra/hdf5-openmpi/PKGBUILD index 772d20919..218b45fcf 100644 --- a/extra/hdf5-openmpi/PKGBUILD +++ b/extra/hdf5-openmpi/PKGBUILD @@ -8,7 +8,7 @@ pkgname=hdf5-openmpi _pkgname=hdf5 -pkgver=1.8.10 +pkgver=1.8.10_patch1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)" @@ -18,12 +18,18 @@ depends=('zlib' 'sh' 'openmpi') makedepends=('time') provides=('hdf5') conflicts=('hdf5') -source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2) +source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2 +mpi.patch) options=('!libtool') -sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c') +sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb' + '658d4a3e537c9c76da3200effa8f95b656a21936') build() { cd $srcdir/${_pkgname}-${pkgver/_/-} + + # FS#33343 + patch -Np1 -i ${srcdir}/mpi.patch + export CFLAGS="${CFLAGS/O2/O0}" export CXXFLAGS="${CFLAGS}" ./configure \ diff --git a/extra/hdf5-openmpi/mpi.patch b/extra/hdf5-openmpi/mpi.patch new file mode 100644 index 000000000..4fadc13e2 --- /dev/null +++ b/extra/hdf5-openmpi/mpi.patch @@ -0,0 +1,18 @@ +Prevent accidental inclusion of mpi c++ headers +when hdf5.h is included third party library + +https://bugs.gentoo.org/show_bug.cgi?id=420777 +https://bugs.archlinux.org/task/33343 + +--- a/src/H5public.h ++++ b/src/H5public.h +@@ -58,6 +58,8 @@ + # include <stddef.h> + #endif + #ifdef H5_HAVE_PARALLEL ++# define OMPI_SKIP_MPICXX /* Make sure that cxx specific headers are not included */ ++# define MPICH_SKIP_MPICXX + # include <mpi.h> + #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */ + # include <mpio.h> + diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD index 67f7f62b4..16b32c174 100644 --- a/extra/hdf5/PKGBUILD +++ b/extra/hdf5/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 174839 2013-01-07 19:58:29Z ronald $ +# $Id: PKGBUILD 185120 2013-05-11 09:31:27Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: damir <damir@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=hdf5 -pkgver=1.8.10 +pkgver=1.8.10_patch1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="General purpose library and file format for storing scientific data" @@ -15,10 +15,11 @@ depends=('zlib' 'sh') makedepends=('time') source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2) options=('!libtool') -sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c') +sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb') build() { cd $srcdir/${pkgname}-${pkgver/_/-} + export CFLAGS="${CFLAGS/O2/O0}" export CXXFLAGS="${CFLAGS}" ./configure --prefix=/usr --disable-static \ diff --git a/extra/hdf5/mpi.patch b/extra/hdf5/mpi.patch new file mode 100644 index 000000000..4fadc13e2 --- /dev/null +++ b/extra/hdf5/mpi.patch @@ -0,0 +1,18 @@ +Prevent accidental inclusion of mpi c++ headers +when hdf5.h is included third party library + +https://bugs.gentoo.org/show_bug.cgi?id=420777 +https://bugs.archlinux.org/task/33343 + +--- a/src/H5public.h ++++ b/src/H5public.h +@@ -58,6 +58,8 @@ + # include <stddef.h> + #endif + #ifdef H5_HAVE_PARALLEL ++# define OMPI_SKIP_MPICXX /* Make sure that cxx specific headers are not included */ ++# define MPICH_SKIP_MPICXX + # include <mpi.h> + #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */ + # include <mpio.h> + diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 5ad82dddc..7f91356de 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183285 2013-04-20 16:41:18Z heftig $ +# $Id: PKGBUILD 184392 2013-05-06 19:37:52Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -6,7 +6,7 @@ pkgname=hugin pkgver=2012.0.0 -pkgrel=5 +pkgrel=6 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD index eeeebe58b..aa7f79889 100644 --- a/extra/i8kutils/PKGBUILD +++ b/extra/i8kutils/PKGBUILD @@ -1,28 +1,42 @@ -# $Id: PKGBUILD 138168 2011-09-18 03:14:27Z eric $ +# $Id: PKGBUILD 185227 2013-05-12 10:04:52Z eric $ # Maintainer: Thayer Williams <thayer@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=i8kutils pkgver=1.33 -pkgrel=2.1 +pkgrel=3 pkgdesc="Dell Inspiron/Latitude kernel driver and utilities" arch=('i686' 'x86_64' 'mips64el') url="http://people.debian.org/~dz/i8k/" license=('GPL2') depends=('glibc') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}_${pkgver}.tar.gz) -md5sums=('1ab077b301dbb0f4be8ef52eb3b97628') +optdepends=('tk: for i8kmon deamon') +conflicts=('i8kmon') +provides=('i8kmon') +replaces=('i8kmon') +backup=('etc/i8kutils/i8kmon.conf') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}_${pkgver}.tar.gz + i8kmon.service) +md5sums=('1ab077b301dbb0f4be8ef52eb3b97628' + '32c159616f72ab65969db95b9e824ced') + +prepare() { + cd $pkgname-$pkgver + + # conform to Arch Linux guidelines + sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1 + sed -i 's|/etc/i8kmon.conf|/etc/i8kutils/i8kmon.conf|g' i8kmon +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make } package() { - cd "$srcdir/$pkgname-$pkgver" - install -D -m755 i8kctl "$pkgdir/usr/bin/i8kctl" - install -D -m755 i8kbuttons "$pkgdir/usr/bin/i8kbuttons" - install -D -m644 i8kbuttons.1 "$pkgdir/usr/share/man/man1/i8kbuttons.1" - install -D -m644 i8kctl.1 "$pkgdir/usr/share/man/man1/i8kctl.1" - ln -fs ./i8kctl "$pkgdir/usr/bin/i8kfan" + cd $pkgname-$pkgver + install -d "$pkgdir"/usr/{bin,share/man/man1} + make DESTDIR="$pkgdir" install install-man + install -D -m644 i8kmon.conf "$pkgdir/etc/i8kutils/i8kmon.conf" + install -D -m644 ../i8kmon.service "$pkgdir/usr/lib/systemd/system/i8kmon.service" } diff --git a/extra/i8kutils/i8kmon.service b/extra/i8kutils/i8kmon.service new file mode 100644 index 000000000..3b80f4633 --- /dev/null +++ b/extra/i8kutils/i8kmon.service @@ -0,0 +1,9 @@ +[Unit] +Description=Dell laptop thermal monitoring +ConditionPathExists=/proc/i8k + +[Service] +ExecStart=/usr/bin/i8kmon -d + +[Install] +WantedBy=multi-user.target diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index 64ad7fd10..eee6629cf 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.3.2 +pkgver=1.4 pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" @@ -11,7 +11,7 @@ license=('GPL2') 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) -md5sums=('94ce02c42c1e4d1411357fb3c1014f67') +sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 86f548a60..12adcd4be 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183287 2013-04-20 16:41:21Z heftig $ +# $Id: PKGBUILD 185248 2013-05-12 14:13:52Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.4.10 +pkgver=6.8.5.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -13,18 +13,18 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('8d5529f35f624b83ad925958c977a381ab30c0f7' +sha1sums=('3c932aa3febb1e992a780e9091925bdbc0d61613' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd ImageMagick-${pkgver%.*}-${pkgver##*.} sed '/AC_PATH_XTRA/d' -i configure.ac autoreconf --force --install patch -p0 -i "${srcdir}/perlmagick.rpath.patch" } build() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd ImageMagick-${pkgver%.*}-${pkgver##*.} ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ @@ -35,7 +35,7 @@ build() { } check() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd ImageMagick-${pkgver%.*}-${pkgver##*.} make check } @@ -64,7 +64,7 @@ package_imagemagick() { "etc/ImageMagick-${pkgver%%.*}/type-windows.xml") options=('!docs' 'libtool' '!emptydirs') - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd ImageMagick-${pkgver%.*}-${pkgver##*.} make -j1 DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" @@ -76,7 +76,7 @@ package_imagemagick() { package_imagemagick-doc() { pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd ImageMagick-${pkgver%.*}-${pkgver##*.} make DESTDIR="${pkgdir}" install-data-html install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" diff --git a/extra/imap/PKGBUILD b/extra/imap/PKGBUILD index 6b7a3509a..9b3e729b0 100644 --- a/extra/imap/PKGBUILD +++ b/extra/imap/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173922 2012-12-28 05:23:44Z pierre $ +# $Id: PKGBUILD 185244 2013-05-12 11:04:34Z pierre $ pkgname=imap pkgver=2007f -pkgrel=2 +pkgrel=3 pkgdesc="An IMAP/POP server" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') @@ -14,9 +14,9 @@ source=("ftp://ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.gz" 'imap' 'ipop2' 'ipop3') backup=(etc/xinetd.d/{imap,ipop2,ipop3} etc/ssl/certs/{imapd,ipop3d}.pem) md5sums=('2126fd125ea26b73b20f01fcd5940369' - 'e77dedb80c2fec9bf2ef784ed5f976fb' - 'cc3eba6453242aa0b1bc8881160b2136' - '0a5e27183a9b7e8ec5f6703125371e0a') + '3ae5b3b333bc8ea2da106f6a97d7bd8d' + '448f988dc5f9bdb2223dcea3abc4f5f1' + '1499b13015075f0aafba04324a6f523a') build() { sed \ @@ -58,10 +58,10 @@ EOF package() { cd $srcdir/$pkgname-$pkgver - install -d $pkgdir/usr/sbin - install -D -m755 imapd/imapd $pkgdir/usr/sbin/imapd - install -D -m755 ipopd/ipop2d $pkgdir/usr/sbin/ipop2d - install -D -m755 ipopd/ipop3d $pkgdir/usr/sbin/ipop3d + install -d $pkgdir/usr/bin + install -D -m755 imapd/imapd $pkgdir/usr/bin/imapd + install -D -m755 ipopd/ipop2d $pkgdir/usr/bin/ipop2d + install -D -m755 ipopd/ipop3d $pkgdir/usr/bin/ipop3d for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \ osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do install -D -m644 c-client/${i}.h $pkgdir/usr/include/imap/${i}.h diff --git a/extra/imap/imap b/extra/imap/imap index da45739d4..fc8309595 100644 --- a/extra/imap/imap +++ b/extra/imap/imap @@ -3,7 +3,7 @@ service imap2 socket_type = stream wait = no user = root - server = /usr/sbin/imapd + server = /usr/bin/imapd log_on_success += HOST DURATION log_on_failure += HOST disable = yes diff --git a/extra/imap/ipop2 b/extra/imap/ipop2 index bd74c8380..0eee38434 100644 --- a/extra/imap/ipop2 +++ b/extra/imap/ipop2 @@ -3,7 +3,7 @@ service pop2 socket_type = stream wait = no user = root - server = /usr/sbin/ipop2d + server = /usr/bin/ipop2d log_on_success += HOST DURATION log_on_failure += HOST disable = yes diff --git a/extra/imap/ipop3 b/extra/imap/ipop3 index 410a45a64..44565b0c1 100644 --- a/extra/imap/ipop3 +++ b/extra/imap/ipop3 @@ -3,7 +3,7 @@ service pop3 socket_type = stream wait = no user = root - server = /usr/sbin/ipop3d + server = /usr/bin/ipop3d log_on_success += HOST DURATION log_on_failure += HOST disable = yes diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD index 18f4c9140..d81c0360f 100644 --- a/extra/imlib/PKGBUILD +++ b/extra/imlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148786 2012-02-05 11:50:28Z ibiru $ +# $Id: PKGBUILD 184394 2013-05-06 19:37:57Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=imlib pkgver=1.9.15 -pkgrel=11.2 +pkgrel=12 pkgdesc="General image handling library for X11 and Gtk" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/imlib/" @@ -19,8 +19,8 @@ sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5' '33c3aaa43eb624f2a6ab0406285a8515903333e3') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/debian-bug448360.patch" patch -p1 -i "${srcdir}/CAN-2004-1026.patch" patch -p0 -i "${srcdir}/aclocal-fixes.patch" @@ -28,6 +28,10 @@ build() { sed '/AC_PATH_XTRA/d' -i configure.in libtoolize --force cp /usr/bin/libtool . +} + +build() { + cd ${pkgname}-${pkgver} autoreconf --force --install ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm --disable-static sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool @@ -35,6 +39,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD index dd77dbdac..f042719d0 100644 --- a/extra/imlib2/PKGBUILD +++ b/extra/imlib2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148788 2012-02-05 11:50:31Z ibiru $ +# $Id: PKGBUILD 184395 2013-05-06 19:37:59Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Arjan Timmerman <arjan.archlinux.org> # Contributor: Tom Newsom <Jeepster.gmx.co.uk> pkgname=imlib2 pkgver=1.4.5 -pkgrel=2.2 +pkgrel=4 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index fe21db8e1..7b2777482 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183288 2013-04-20 16:41:22Z heftig $ +# $Id: PKGBUILD 184396 2013-05-06 19:38:01Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=6 +pkgrel=7 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') @@ -20,38 +20,36 @@ optdepends=('pstoedit: latex formulas' 'pyxml: some extensions' 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') -source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - inkscape-0.48.4-spuriouscomma.patch) +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'spuriouscomma.patch') sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' '7d1d5a6d1d2b0926721a994d5889c52890fc57c1') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - - # fix FTBS, patch taken from FC - patch -Np0 -i ${srcdir}/inkscape-0.48.4-spuriouscomma.patch - + patch -p0 -i ../spuriouscomma.patch sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py sed -i 's|"python"|"python2"|g' src/main.cpp +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --with-python \ --with-perl \ --enable-lcms \ --enable-poppler-cairo \ - --disable-dependency-tracking \ - + --disable-dependency-tracking make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install } diff --git a/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch b/extra/inkscape/spuriouscomma.patch index bc538068f..bc538068f 100644 --- a/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch +++ b/extra/inkscape/spuriouscomma.patch diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index b73b5eedc..564bd8f5e 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183615 2013-04-25 15:56:01Z andyrtr $ +# $Id: PKGBUILD 184397 2013-05-06 19:38:04Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index c2073e40c..e6732f8db 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181874 2013-04-05 08:54:16Z svenstaro $ +# $Id: PKGBUILD 184849 2013-05-09 09:42:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('bde79ed3db93d5fa72e1081a6638c5cb777f495e') +sha1sums=('0c00782aea70ad1963e303b1eec55482265f0b37') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index fcfb80276..a5d2c3055 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181901 2013-04-05 08:54:45Z svenstaro $ +# $Id: PKGBUILD 184876 2013-05-09 09:42:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A text to speech application' @@ -13,13 +13,10 @@ depends=('kdebase-runtime' 'speech-dispatcher') makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz" - "jovie-speechd-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78588") -sha1sums=('3292fb9a1bbae4cfe2e37073b004f78e23936f6d' - 'f106707ec2c325719afe8e919d58ffa2574f6e45') +source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") +sha1sums=('ae73088307c31f53c9ac6c2a949b3a32ffad3b0b') build() { - patch -Np1 -d jovie-${pkgver} < ${srcdir}/jovie-speechd-fix.patch mkdir build cd build cmake ../jovie-${pkgver} \ @@ -30,6 +27,6 @@ build() { } package() { - cd $srcdir/build + cd build make DESTDIR=$pkgdir install } diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 5ee3c4ca1..05a1ba5ea 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181902 2013-04-05 08:54:46Z svenstaro $ +# $Id: PKGBUILD 184877 2013-05-09 09:42:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('453235676a1991e5f448497f8aa61d0e7ddd54f2') +sha1sums=('9db691a3a2571db88ae1ed94355797a4466928dc') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index f36140438..ede29daac 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181903 2013-04-05 08:54:47Z svenstaro $ +# $Id: PKGBUILD 184878 2013-05-09 09:42:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('4bcb0153663ab67eafba4cb450b62891133b4ab2') +sha1sums=('3976b199ed9ee1785c97920f2454bc988523dd8f') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index 987c79534..17267cba5 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181904 2013-04-05 08:54:49Z svenstaro $ +# $Id: PKGBUILD 184879 2013-05-09 09:42:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('d6778d9393b0a1cfa597565bc77771b78d98422f') +sha1sums=('8314f6913059a7f012896be80705893876d1eb37') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index d9ceb3629..d21feaff5 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181905 2013-04-05 08:54:50Z svenstaro $ +# $Id: PKGBUILD 184880 2013-05-09 09:42:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('3ed90ae8a113264ef9b8c176c905f3d365443766') +sha1sums=('3a9b2265592f45c3d07ae88e551aac0dceeded0e') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 8dd4f42cd..ae163dee6 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183526 2013-04-22 11:05:18Z andrea $ +# $Id: PKGBUILD 184881 2013-05-09 09:42:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdeadmin pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') @@ -14,7 +14,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdelibs' 'kdebase-runtime' 'kdepimlibs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('885f63b846e9e8d1485c9261544efb2ab0eea58e' +sha1sums=('fefba9f6dc817b6c569d76efc536a7ae0c1371df' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 0bcee92ba..c4c149fb2 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181907 2013-04-05 08:54:52Z svenstaro $ +# $Id: PKGBUILD 184882 2013-05-09 09:42:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdeartwork-colorschemes' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('000146f17a31d1257959e274f952e5a2f55f0a00') +sha1sums=('45baac5806471aa33e976e06652f828d989e6b67') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index d6189f849..faf8ddaf1 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181908 2013-04-05 08:54:53Z svenstaro $ +# $Id: PKGBUILD 184883 2013-05-09 09:42:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('171824f4d06c66a4373274da01cad84853bec821') +sha1sums=('fd5d00103c2d6f8c446286f997edd286a719e1e9') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index f31ea3cfc..0816713f8 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181887 2013-04-05 08:54:31Z svenstaro $ +# $Id: PKGBUILD 184862 2013-05-09 09:42:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ groups=('kde') # note on libxdamage: # not detected by namcap because libgl depends on it # but nvidia providing libgl does not depend on libxdamage -depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' - 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' +depends=("kdelibs>=${pkgver}" 'kdepim-runtime' 'lm_sensors' 'libraw1394' + 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' 'libqalculate' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'xorg-xrdb' 'libxres' 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font') @@ -27,7 +27,7 @@ backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('12b10e8bea44f3aafa0c8d776eadfee14d71c3f8' +sha1sums=('3fc316e34ba10db3adad8b1a4bee61aaf8b58840' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 5857aec70..3aad2172e 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181889 2013-04-05 08:54:33Z svenstaro $ +# $Id: PKGBUILD 184864 2013-05-09 09:42:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konq-plugins' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -19,7 +19,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('7f505292e95b35205cec3baa67e9e9b24f79b9b9') +sha1sums=('c9949ef6dafbc567bb3f088bf9e156c3a5a9ec08') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index d22555678..0200a90be 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181909 2013-04-05 08:54:54Z svenstaro $ +# $Id: PKGBUILD 184884 2013-05-09 09:42:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') optdepends=('kdepimlibs: akonadi bindings') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('b5ada2536a4f59b4016fc4e71d91da029ced8103') +sha1sums=('6fadbe971f4db404fc30cf62fed264e9b06d3cef') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 3500e07f3..311c13d3e 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181910 2013-04-05 08:54:55Z svenstaro $ +# $Id: PKGBUILD 184885 2013-05-09 09:42:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -17,7 +17,7 @@ optdepends=('kdegraphics-okular: okular bindings' conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" 'ruby19.patch') -sha1sums=('147bb8aacf8805ccde57f1d3d96e67633f317202' +sha1sums=('43d15e26ba9219874d8efc0140c5fb3eaac97792' 'c074f027bac3b9bffe70a2c2304a6a7be12be034') build() { diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 899fc6f82..8583105ba 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181911 2013-04-05 08:54:56Z svenstaro $ +# $Id: PKGBUILD 184886 2013-05-09 09:42:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('70726de496531b50010156b224bc807b72f85441') +sha1sums=('ce5075da229c52ba5aab1139c843686213d23bff') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index f178e7d9a..519c90f25 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181912 2013-04-05 08:54:57Z svenstaro $ +# $Id: PKGBUILD 184887 2013-05-09 09:43:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('b57da1f88e147ff8ec25527ab7ff0ccad64ca7db') +sha1sums=('7db692b0a06ba421caa870fc254f03c2e3bf4e79') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index db2bcb48a..65bf601b3 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181883 2013-04-05 08:54:26Z svenstaro $ +# $Id: PKGBUILD 184858 2013-05-09 09:42:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('808aa907b5953ad2c2abb4015da5ddc01d1e2afb') +sha1sums=('261e1c4d9a6a216d7b5b5e2962ba5266f0d62bdf') build() { cd "${srcdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index cf9c08f7c..7b69f6519 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181880 2013-04-05 08:54:23Z svenstaro $ +# $Id: PKGBUILD 184855 2013-05-09 09:42:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('a17d533fca8126970ec8886f55297f1005df3eb5') +sha1sums=('71dfb717cafc40331118b2b98c9b4075cd9b1c0d') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 14cc17fe5..8df530d9d 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181885 2013-04-05 08:54:28Z svenstaro $ +# $Id: PKGBUILD 184860 2013-05-09 09:42:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('5db91d696af4c9bcb784921ff7aa937bbc38ed01') +sha1sums=('78a6fce69f751e8c4542431484d5e7fcb6362263') build() { mkdir build diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 4504adaab..ef87a7a93 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181884 2013-04-05 08:54:27Z svenstaro $ +# $Id: PKGBUILD 184859 2013-05-09 09:42:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('eaeb11ace135a0c9daceaa03067f056255d77dc8') +sha1sums=('2fa451fddf1b05fde705f16bd24a0914aa3eb0de') build() { mkdir build diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index c0ab79396..e4c20aeee 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181877 2013-04-05 08:54:20Z svenstaro $ +# $Id: PKGBUILD 184852 2013-05-09 09:42:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('2593b298e9b0f4f504612f42a928a2144313b4b4') +sha1sums=('701e34f9dcc4e246e7361c472bfdb5a472ac31b2') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 8009bc25d..1c783c8cb 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181882 2013-04-05 08:54:25Z svenstaro $ +# $Id: PKGBUILD 184857 2013-05-09 09:42:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -18,7 +18,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('8f99c5a53634532f6d8d02dc5f7ec0ffba194f4a') +sha1sums=('459ce74e658f30799164aee291e57c6ad5800734') build() { mkdir build diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index b596ae297..559511ee9 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181878 2013-04-05 08:54:21Z svenstaro $ +# $Id: PKGBUILD 184853 2013-05-09 09:42:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4' 'mesa') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('6a5743917aec02e6044c711c63acd229c67eff7b') +sha1sums=('1e30ffc4747b6e01f24a487b31d1b07623afdfba') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index a2927a093..30a18b2d9 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181896 2013-04-05 08:54:41Z svenstaro $ +# $Id: PKGBUILD 184871 2013-05-09 09:42:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('e4acd6859140c3860eead695c2f20195b8df0a4a') +sha1sums=('d2b986516a5f9ecaa1ed4151afe9f0958b68c868') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index b22760123..f4569c01b 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181913 2013-04-05 08:54:57Z svenstaro $ +# $Id: PKGBUILD 184888 2013-05-09 09:43:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('884c9bd072325b3fc3e06da5c875516c6ee1f728') +sha1sums=('ff5e39fd1880dde2c11f6e3cbd89f7a8cead7154') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 41d6337f4..95240c5dc 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181914 2013-04-05 08:54:58Z svenstaro $ +# $Id: PKGBUILD 184889 2013-05-09 09:43:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('7611cb379889f87908931ba25a2de9072de75e22') +sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index e7fbd371e..caaf68b4d 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181915 2013-04-05 08:54:59Z svenstaro $ +# $Id: PKGBUILD 184890 2013-05-09 09:43:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('f029006b89aa75e6584836a90832f5130fff49b5') +sha1sums=('c3c237cdf891259b2bef399d2b5c75a420e21d55') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index bb35a302c..92a962bfe 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181916 2013-04-05 08:55:00Z svenstaro $ +# $Id: PKGBUILD 184891 2013-05-09 09:43:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('bf4c5b19905d83dede215b672d6b2911eb6d57cc') +sha1sums=('2711ee3b9914329d9813c24798cf57811dd7eadd') build() { mkdir build diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 2e53ef4fe..61d9a4f10 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181917 2013-04-05 08:55:01Z svenstaro $ +# $Id: PKGBUILD 184892 2013-05-09 09:43:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('2536db114e6be17baf1556293c95b70fe83aa609') +sha1sums=('8aa646830e3f09162d98c9dab1650321d92ef90f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index 2b18d08f2..2bba377b8 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181918 2013-04-05 08:55:02Z svenstaro $ +# $Id: PKGBUILD 184893 2013-05-09 09:43:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('2ba86ec27e9890734dc6a74528b6082f31caa8aa') +sha1sums=('c4effef0b1f6e54c5ca1dc4d3642398ccc180551') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index ac0f591de..a8c2db75c 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181919 2013-04-05 08:55:03Z svenstaro $ +# $Id: PKGBUILD 184894 2013-05-09 09:43:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('14cd9d3d788a9f0068af3e10f26f0375b5c7251a') +sha1sums=('92189b526e1cd6138e7e884d60f0a6f76bb9a7df') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index d085c2164..946610e90 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181920 2013-04-05 08:55:05Z svenstaro $ +# $Id: PKGBUILD 184895 2013-05-09 09:43:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('2795c1ada9898854fe3a8ffd8a92c8ad5cd3eb04') +sha1sums=('ee2071d89c65b47ace7fc38d0fb07c5b74883bab') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index e061351eb..79ae84063 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181921 2013-04-05 08:55:07Z svenstaro $ +# $Id: PKGBUILD 184896 2013-05-09 09:43:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('0066e645cd11d239678aa90ede938daf4dd0942d') +sha1sums=('aea9806a7e52f5381dc479cd72069b2bcd9e9cc2') build() { mkdir build diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index ef2084d3e..a5685e2c9 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181922 2013-04-05 08:55:08Z svenstaro $ +# $Id: PKGBUILD 184897 2013-05-09 09:43:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('7aa2d6889c932639ded77eac33b9ae09ed7bbc45') +sha1sums=('906db6f251621983dc7c737424af0484706a1bbf') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index 5586b694f..f1375ff2c 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181923 2013-04-05 08:55:10Z svenstaro $ +# $Id: PKGBUILD 184898 2013-05-09 09:43:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('101cd33b6e099174358d1ac754747cdf17cf6ba5') +sha1sums=('f40332da60528898909858b9271ab04a73ceba78') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 9d747bd0c..4722faccb 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181924 2013-04-05 08:55:11Z svenstaro $ +# $Id: PKGBUILD 184899 2013-05-09 09:43:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('938f0888702e3d294aba8084b4268d883fd7514e') +sha1sums=('0579eb13e5a764afc390e11acbb3da5ee40f63aa') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index d905f8177..97f471360 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181925 2013-04-05 08:55:13Z svenstaro $ +# $Id: PKGBUILD 184900 2013-05-09 09:43:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'wcslib' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('ce99c18862505eac3da729e666315d0b27daec1e') +sha1sums=('32490b846b468dc9a8393c0a70cb0d0e805163a8') build() { mkdir build diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index bc82e740d..2609bfcee 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181926 2013-04-05 08:55:14Z svenstaro $ +# $Id: PKGBUILD 184901 2013-05-09 09:43:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('7a7c44b1bf64fdc5109be9d1b6d1481db6a1848f') +sha1sums=('076345fadaf98bdc878cb4b9f99e759bb2642b2d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index ec4d03e9b..fd7a75440 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181927 2013-04-05 08:55:16Z svenstaro $ +# $Id: PKGBUILD 184902 2013-05-09 09:43:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('c14cb19822fc101100938e4fcde0d50b16216cff') +sha1sums=('8df184d9647dfbf342dcd3adcc674f2c9b50af39') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index b490bc1ef..d9e5a145e 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181928 2013-04-05 08:55:18Z svenstaro $ +# $Id: PKGBUILD 184903 2013-05-09 09:43:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('e21947d795f1025ee7766ac9c47bbe879b5d1a0e') +sha1sums=('0286f384cc3dfb9c6b7ca39badd50a18fa579f16') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index e693b1c14..995c35078 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181891 2013-04-05 08:54:35Z svenstaro $ +# $Id: PKGBUILD 184866 2013-05-09 09:42:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('e4ba6aaaa5f861f715a7c4881dd78ed1deb03a36') +sha1sums=('814fffa64d91bec647c3f7e5cb130a2027dd6815') build() { mkdir build diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index 2d493d971..dc1f74cf0 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181929 2013-04-05 08:55:19Z svenstaro $ +# $Id: PKGBUILD 184904 2013-05-09 09:43:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('24b556965b7cf11bdafb85706d8c4e3c1c3aad1e') +sha1sums=('7995139b4fc5604f6a71e5747f4db0de41bb666c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 84096fdd2..c55a6b542 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181930 2013-04-05 08:55:21Z svenstaro $ +# $Id: PKGBUILD 184905 2013-05-09 09:43:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdebindings-kross-python: scripting support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('1e9e568c2a4dce6a61a51164c43b3930efe99664') +sha1sums=('efcce4ba4c8a211d494c3537b1c0c2e421fa7586') build() { mkdir build diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index f7efcc4c9..847b5a5ca 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181931 2013-04-05 08:55:22Z svenstaro $ +# $Id: PKGBUILD 184906 2013-05-09 09:43:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('ab7e357732fec3a7ecccce586c6de51b829267ed') +sha1sums=('aeb9aaee1a2ec3faf410da4319d0f7a7f27c3630') build() { cd "${srcdir}" diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 41c16e5f4..f3331665e 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181932 2013-04-05 08:55:24Z svenstaro $ +# $Id: PKGBUILD 184907 2013-05-09 09:43:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('ff5fccd47113b598b688b87226b23072047bf990') +sha1sums=('85a85c09deb6f04bcf90279785d099aa31ce0262') build() { cd "${srcdir}" diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD index a39e7c4a9..3c2bc7c9b 100644 --- a/extra/kdegames-bomber/PKGBUILD +++ b/extra/kdegames-bomber/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181933 2013-04-05 08:55:25Z svenstaro $ +# $Id: PKGBUILD 184908 2013-05-09 09:43:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bomber -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A single player arcade game" url="http://kde.org/applications/games/bomber/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bomber-${pkgver}.tar.xz") -sha1sums=('7f5e955127da33c7589103628cac356e6ebe4141') +sha1sums=('b2cf0a81d282424811cdc527545a132ef5d73a3a') build() { mkdir build diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD index 4846be599..67c30edf4 100644 --- a/extra/kdegames-bovo/PKGBUILD +++ b/extra/kdegames-bovo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181934 2013-04-05 08:55:27Z svenstaro $ +# $Id: PKGBUILD 184909 2013-05-09 09:43:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bovo -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A Gomoku like game for two players" url="http://kde.org/applications/games/bovo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bovo-${pkgver}.tar.xz") -sha1sums=('9af42dbd99c552adcba59deeaa6407b2465bde87') +sha1sums=('53fa8f79b8a6d048a00da0cfc703f400c6ddd178') build() { mkdir build diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD index cc8a534c2..b1f04a297 100644 --- a/extra/kdegames-granatier/PKGBUILD +++ b/extra/kdegames-granatier/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181935 2013-04-05 08:55:29Z svenstaro $ +# $Id: PKGBUILD 184910 2013-05-09 09:43:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-granatier -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A clone of the classic Bomberman game" url="http://kde.org/applications/games/granatier/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/granatier-${pkgver}.tar.xz") -sha1sums=('36ac5fe97d2ea06038f0a2f7e58d0949a6d72cd8') +sha1sums=('4a135280da57cac2cadc2874c27b50fc7740bebf') build() { mkdir build diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD index d7a3cfd2c..91615d120 100644 --- a/extra/kdegames-kapman/PKGBUILD +++ b/extra/kdegames-kapman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181937 2013-04-05 08:55:31Z svenstaro $ +# $Id: PKGBUILD 184912 2013-05-09 09:43:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kapman -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A clone of the well known game Pac-Man" url="http://kde.org/applications/games/kapman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kapman-${pkgver}.tar.xz") -sha1sums=('b2a8122fbebc364dee64707ccc720e62eb1af66a') +sha1sums=('83fda18300857338a698fff899cb2569ec4539fb') build() { mkdir build diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD index 2e022d966..f6bc1c5d5 100644 --- a/extra/kdegames-katomic/PKGBUILD +++ b/extra/kdegames-katomic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181938 2013-04-05 08:55:33Z svenstaro $ +# $Id: PKGBUILD 184913 2013-05-09 09:43:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-katomic -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A fun and educational game built around molecular geometry" url="http://kde.org/applications/games/katomic/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/katomic-${pkgver}.tar.xz") -sha1sums=('c7d3fc2dc10ce90092d229f1a879a0081e26cd8b') +sha1sums=('69cf2cedad8575b32fbb685c1116bfd2c7090ebf') build() { mkdir build diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD index 54a3fcc66..eae2394df 100644 --- a/extra/kdegames-kblackbox/PKGBUILD +++ b/extra/kdegames-kblackbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181939 2013-04-05 08:55:34Z svenstaro $ +# $Id: PKGBUILD 184914 2013-05-09 09:43:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblackbox -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A game of hide and seek played on a grid of boxes" url="http://kde.org/applications/games/kblackbox/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblackbox-${pkgver}.tar.xz") -sha1sums=('3d29652827a4fba86615a424f5a5b0bcffc184b7') +sha1sums=('2953256d4659cca0a2a4b35d2c81fe1569bbb762') build() { mkdir build diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD index 8bfba5757..fdafd4881 100644 --- a/extra/kdegames-kblocks/PKGBUILD +++ b/extra/kdegames-kblocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181940 2013-04-05 08:55:36Z svenstaro $ +# $Id: PKGBUILD 184915 2013-05-09 09:43:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblocks -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="The classic falling blocks game" url="http://kde.org/applications/games/kblocks/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblocks-${pkgver}.tar.xz") -sha1sums=('be903b314547ccdc0eee335a34bac00bc769c3b7') +sha1sums=('2a43bd8f55474122b241c8993fe98cbd26d36b98') build() { mkdir build diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD index 168954593..39014c6f8 100644 --- a/extra/kdegames-kbounce/PKGBUILD +++ b/extra/kdegames-kbounce/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181941 2013-04-05 08:55:37Z svenstaro $ +# $Id: PKGBUILD 184916 2013-05-09 09:43:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbounce -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A single player arcade game with the elements of puzzle" url="http://kde.org/applications/games/kbounce/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbounce-${pkgver}.tar.xz") -sha1sums=('1f27198383237538791eccad15c7ca6da946826e') +sha1sums=('6c83f932c62d29432aef0403733998a4ae0ca7ad') build() { mkdir build diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD index d88fab1c1..7ec258b52 100644 --- a/extra/kdegames-kbreakout/PKGBUILD +++ b/extra/kdegames-kbreakout/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181942 2013-04-05 08:55:39Z svenstaro $ +# $Id: PKGBUILD 184917 2013-05-09 09:43:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbreakout -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A Breakout-like game" url="http://kde.org/applications/games/kbreakout/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbreakout-${pkgver}.tar.xz") -sha1sums=('3c93764ffcb0f1eb444b52ae7ef7c7134728178e') +sha1sums=('8d8508abde6eb2d0aaf75a66ffb253e2f7a67046') build() { mkdir build diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD index c1b9db498..ecd2c5a03 100644 --- a/extra/kdegames-kdiamond/PKGBUILD +++ b/extra/kdegames-kdiamond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181943 2013-04-05 08:55:40Z svenstaro $ +# $Id: PKGBUILD 184918 2013-05-09 09:43:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kdiamond -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A single player puzzle game" url="http://kde.org/applications/games/kdiamond/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdiamond-${pkgver}.tar.xz") -sha1sums=('57b6525cd17fa69e99d596441aa10c626766846b') +sha1sums=('ba11547157b1b5d7b789fd2c854aebb3ff5b1714') build() { mkdir build diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD index 8f9e2407f..e602a066e 100644 --- a/extra/kdegames-kfourinline/PKGBUILD +++ b/extra/kdegames-kfourinline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181944 2013-04-05 08:55:44Z svenstaro $ +# $Id: PKGBUILD 184919 2013-05-09 09:43:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kfourinline -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A four-in-a-row game" url="http://kde.org/applications/games/kfourinline/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfourinline-${pkgver}.tar.xz") -sha1sums=('b587f56bf5f095ec44da271e04b325f6dcc5c5f0') +sha1sums=('d49eff3bc2198c4ebb7d14a664ed7b2271e4ca32') build() { mkdir build diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD index b781284f9..3ef15549d 100644 --- a/extra/kdegames-kgoldrunner/PKGBUILD +++ b/extra/kdegames-kgoldrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181945 2013-04-05 08:55:47Z svenstaro $ +# $Id: PKGBUILD 184920 2013-05-09 09:43:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kgoldrunner -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A game of action and puzzle solving" url="http://kde.org/applications/games/kgoldrunner/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz") -sha1sums=('8c44b9992239d379d64c7979c1cd4ec56c5aa80f') +sha1sums=('3701237b7c3b15d4d4ffe17d78c8470231004d0a') build() { mkdir build diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD index 77ff440f8..5cce3d51c 100644 --- a/extra/kdegames-kigo/PKGBUILD +++ b/extra/kdegames-kigo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181946 2013-04-05 08:55:49Z svenstaro $ +# $Id: PKGBUILD 184921 2013-05-09 09:43:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kigo -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="An open-source implementation of the popular Go game" url="http://kde.org/applications/games/kigo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'gnugo') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kigo-${pkgver}.tar.xz") -sha1sums=('229b2631b89b31bb1661a10c6de2770842c48e85') +sha1sums=('370656ff032a8980579b5a478a7868598035c897') build() { mkdir build diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD index b90198d0f..b8c74c993 100644 --- a/extra/kdegames-killbots/PKGBUILD +++ b/extra/kdegames-killbots/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181947 2013-04-05 08:55:50Z svenstaro $ +# $Id: PKGBUILD 184922 2013-05-09 09:43:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-killbots -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A simple game of evading killer robots" url="http://kde.org/applications/games/killbots/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/killbots-${pkgver}.tar.xz") -sha1sums=('87100f1fcb1e3547939406d6d4a4b8b2582831c8') +sha1sums=('9b580830f82468351fb91306f30a085519432b10') build() { mkdir build diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD index 84f36f6db..e58006502 100644 --- a/extra/kdegames-kiriki/PKGBUILD +++ b/extra/kdegames-kiriki/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181948 2013-04-05 08:55:52Z svenstaro $ +# $Id: PKGBUILD 184923 2013-05-09 09:43:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kiriki -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="An addictive and fun dice game" url="http://kde.org/applications/games/kiriki/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiriki-${pkgver}.tar.xz") -sha1sums=('f3ec86d168cc21fe22adb610121df62a6280ff1d') +sha1sums=('9ec35954ba2eab34d6a760d17f3ab5ebfa193a61') build() { mkdir build diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD index 0ca441995..6e0cb1db2 100644 --- a/extra/kdegames-kjumpingcube/PKGBUILD +++ b/extra/kdegames-kjumpingcube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181949 2013-04-05 08:55:53Z svenstaro $ +# $Id: PKGBUILD 184924 2013-05-09 09:43:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kjumpingcube -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A simple tactical game" url="http://kde.org/applications/games/kjumpingcube/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz") -sha1sums=('c81585d2e46ec0783d58e6d0068b75fd82ddd382') +sha1sums=('9c46888572703e2f1d632e09ba5330e8434c51c1') build() { mkdir build diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD index 88055e0bc..bd02c3d26 100644 --- a/extra/kdegames-klickety/PKGBUILD +++ b/extra/kdegames-klickety/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181950 2013-04-05 08:55:55Z svenstaro $ +# $Id: PKGBUILD 184925 2013-05-09 09:43:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klickety -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="An adaptation of the Clickomania game" url="http://kde.org/applications/games/klickety/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klickety-${pkgver}.tar.xz") -sha1sums=('54548dd1ebad1481ecda5a50df7e72a43a6a8cbb') +sha1sums=('2ac5e9e52b3312bc54b9d02a5210caccc83f7f39') build() { mkdir build diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD index bbc7b1eb1..a02ae4ec3 100644 --- a/extra/kdegames-klines/PKGBUILD +++ b/extra/kdegames-klines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181951 2013-04-05 08:55:56Z svenstaro $ +# $Id: PKGBUILD 184926 2013-05-09 09:44:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klines -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A simple but highly addictive, one player game" url="http://kde.org/applications/games/klines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klines-${pkgver}.tar.xz") -sha1sums=('e8bb9a43ca3207f961bcae60312af37f226d7ec0') +sha1sums=('474bab91de2112f55c5286f754778cd638d0862c') build() { mkdir build diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD index 893cf1b5d..f630b6392 100644 --- a/extra/kdegames-kmahjongg/PKGBUILD +++ b/extra/kdegames-kmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181952 2013-04-05 08:55:57Z svenstaro $ +# $Id: PKGBUILD 184927 2013-05-09 09:44:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmahjongg -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A tile matching game for one or two players" url="http://kde.org/applications/games/kmahjongg/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz") -sha1sums=('c54467341866d975a25529b70033bb0f45920d11') +sha1sums=('8c1168da227c5be6775ae71adfaa7be39ce69a28') build() { mkdir build diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD index ceb877d7f..66abc5ec5 100644 --- a/extra/kdegames-kmines/PKGBUILD +++ b/extra/kdegames-kmines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181953 2013-04-05 08:55:59Z svenstaro $ +# $Id: PKGBUILD 184928 2013-05-09 09:44:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmines -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="The classic Minesweeper game" url="http://kde.org/applications/games/kmines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmines-${pkgver}.tar.xz") -sha1sums=('5b0775fb30fe59c017651d80658cc59f1358b7a4') +sha1sums=('9f0130c4ce1276bbc0b8d89880d5db73efdc3aef') build() { mkdir build diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD index dd864f225..96676a096 100644 --- a/extra/kdegames-knavalbattle/PKGBUILD +++ b/extra/kdegames-knavalbattle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181954 2013-04-05 08:56:04Z svenstaro $ +# $Id: PKGBUILD 184929 2013-05-09 09:44:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knavalbattle -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A ship sinking game" url="http://kde.org/applications/games/knavalbattle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz") -sha1sums=('668a3b98bd5d64ff1d35dc1f46ec2f4a5aa188fe') +sha1sums=('aa6e06896e93c5e33623a55c0b5d2c15cd49ea97') build() { mkdir build diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD index 37830a9c3..1423d4617 100644 --- a/extra/kdegames-knetwalk/PKGBUILD +++ b/extra/kdegames-knetwalk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181955 2013-04-05 08:56:05Z svenstaro $ +# $Id: PKGBUILD 184930 2013-05-09 09:44:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knetwalk -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Connect all the terminals to the server, in as few turns as possible" url="http://kde.org/applications/games/knetwalk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knetwalk-${pkgver}.tar.xz") -sha1sums=('6b5a992d5a6ca4ddb41561bdf9d2b83be0091962') +sha1sums=('13dfaa5039b53fc6b50e5c8e4998324b283806f0') build() { mkdir build diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD index a6b86bccb..7eda18ba8 100644 --- a/extra/kdegames-kolf/PKGBUILD +++ b/extra/kdegames-kolf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181956 2013-04-05 08:56:07Z svenstaro $ +# $Id: PKGBUILD 184931 2013-05-09 09:44:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kolf -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A miniature golf game with 2d top-down view" url="http://kde.org/applications/games/kolf/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolf-${pkgver}.tar.xz") -sha1sums=('148fe1a39763b97daaa3e4257b1f0e80e34cc723') +sha1sums=('f35c94f3e184e8b1bcaab50e519b424e580c5665') build() { mkdir build diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD index be8fcebae..96b12cf1c 100644 --- a/extra/kdegames-kollision/PKGBUILD +++ b/extra/kdegames-kollision/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181957 2013-04-05 08:56:08Z svenstaro $ +# $Id: PKGBUILD 184932 2013-05-09 09:44:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kollision -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A simple ball dodging game" url="http://kde.org/applications/games/kollision/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kollision-${pkgver}.tar.xz") -sha1sums=('19f085adcf6477e4b69f554721e5a82a3754d8de') +sha1sums=('196770d3b15a74c4399348549efea5f1b5f2808e') build() { mkdir build diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD index 344bb8545..904796aa1 100644 --- a/extra/kdegames-konquest/PKGBUILD +++ b/extra/kdegames-konquest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181958 2013-04-05 08:56:10Z svenstaro $ +# $Id: PKGBUILD 184933 2013-05-09 09:44:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-konquest -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="The KDE version of Gnu-Lactic" url="http://kde.org/applications/games/konquest/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/konquest-${pkgver}.tar.xz") -sha1sums=('acb21acfab00f8a5a03105fad6100cec513958ff') +sha1sums=('7034913a42475d21af4adb28257b088172e771da') build() { mkdir build diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD index 81bcb63aa..3f8b92166 100644 --- a/extra/kdegames-kpatience/PKGBUILD +++ b/extra/kdegames-kpatience/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181959 2013-04-05 08:56:12Z svenstaro $ +# $Id: PKGBUILD 184934 2013-05-09 09:44:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kpatience -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Offers a selection of solitaire card games" url="http://kde.org/applications/games/kpat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kpat-${pkgver}.tar.xz") -sha1sums=('9a4309cbadd8214cb2dd8ab1cd8bae4c20194cff') +sha1sums=('b2c9a9c65ab4a3760400cf51d055989f08464851') build() { mkdir build diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD index 7b06a93c8..cc45473ff 100644 --- a/extra/kdegames-kreversi/PKGBUILD +++ b/extra/kdegames-kreversi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181960 2013-04-05 08:56:14Z svenstaro $ +# $Id: PKGBUILD 184935 2013-05-09 09:44:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kreversi -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A simple one player strategy game played against the computer" url="http://kde.org/applications/games/kreversi/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kreversi-${pkgver}.tar.xz") -sha1sums=('a79e1b20849e419037c28febad0422a634a0585b') +sha1sums=('a2b35641a39706de0deda9ea4777ff0b2ebde367') build() { mkdir build diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD index b195f9205..8d11f38a5 100644 --- a/extra/kdegames-kshisen/PKGBUILD +++ b/extra/kdegames-kshisen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181961 2013-04-05 08:56:16Z svenstaro $ +# $Id: PKGBUILD 184936 2013-05-09 09:44:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kshisen -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles" url="http://kde.org/applications/games/kshisen/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kshisen-${pkgver}.tar.xz") -sha1sums=('df41aac7d3048ccfdbd55b62872643c7325b9722') +sha1sums=('36f8e99e64d9fd29e6b264c9c83fda38f5f09423') build() { mkdir build diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD index b1cae4943..05e95403c 100644 --- a/extra/kdegames-ksirk/PKGBUILD +++ b/extra/kdegames-ksirk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181962 2013-04-05 08:56:17Z svenstaro $ +# $Id: PKGBUILD 184937 2013-05-09 09:44:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksirk -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A computerized version of a well known strategy game" url="http://kde.org/applications/games/ksirk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksirk-${pkgver}.tar.xz") -sha1sums=('d64786e76fa87f8f99962a3676c82ae48f3e7841') +sha1sums=('69181f4ac4338e76295cd25926b23a38bbba36dd') build() { mkdir build diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD index ab5bab7ad..0f33ac599 100644 --- a/extra/kdegames-ksnakeduel/PKGBUILD +++ b/extra/kdegames-ksnakeduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181963 2013-04-05 08:56:19Z svenstaro $ +# $Id: PKGBUILD 184938 2013-05-09 09:44:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksnakeduel -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A simple snake duel game" url="http://kde.org/applications/games/ksnakeduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz") -sha1sums=('b359a1bfdcba0fdd872c27d0d94ddbd4e1726676') +sha1sums=('e492edb83f0c7c284934d6b7eec53c737cbe197a') build() { mkdir build diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD index 88908f240..cf575aca8 100644 --- a/extra/kdegames-kspaceduel/PKGBUILD +++ b/extra/kdegames-kspaceduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181964 2013-04-05 08:56:20Z svenstaro $ +# $Id: PKGBUILD 184939 2013-05-09 09:44:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kspaceduel -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun" url="http://kde.org/applications/games/kspaceduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz") -sha1sums=('2f1cbca7dea4e70d923bef72a2c57ad733712998') +sha1sums=('20fe3641363fc8a7a6d21bf8c2da810b4687bc76') build() { mkdir build diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD index 0e3b1a4e9..a19925138 100644 --- a/extra/kdegames-ksquares/PKGBUILD +++ b/extra/kdegames-ksquares/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181965 2013-04-05 08:56:22Z svenstaro $ +# $Id: PKGBUILD 184940 2013-05-09 09:44:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksquares -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes" url="http://kde.org/applications/games/ksquares/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksquares-${pkgver}.tar.xz") -sha1sums=('76651a698b03488cec1af125fb27bcf2d509c30a') +sha1sums=('1def07ebcfed0d2edc8771cb2c3c25de9ea9e0c5') build() { mkdir build diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD index 2a921fa49..c083d1644 100644 --- a/extra/kdegames-ksudoku/PKGBUILD +++ b/extra/kdegames-ksudoku/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181966 2013-04-05 08:56:23Z svenstaro $ +# $Id: PKGBUILD 184941 2013-05-09 09:44:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksudoku -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A logic-based symbol placement puzzle" url="http://kde.org/applications/games/ksudoku/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz") -sha1sums=('91fcb7a9daa58340a2e73131add8e78e3121ae9b') +sha1sums=('5421c4693119defc9001e59a044e5b197f1ebc91') build() { mkdir build diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD index 19df71454..6548e2ea1 100644 --- a/extra/kdegames-ktuberling/PKGBUILD +++ b/extra/kdegames-ktuberling/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181967 2013-04-05 08:56:25Z svenstaro $ +# $Id: PKGBUILD 184942 2013-05-09 09:44:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ktuberling -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A simple constructor game suitable for children and adults alike" url="http://kde.org/applications/games/ktuberling/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktuberling-${pkgver}.tar.xz") -sha1sums=('e2431b70470c37b9f46514fc62932ac7f225f6b7') +sha1sums=('223838a37bcdc0b1b45ef04140437a1a59b1c2a8') build() { mkdir build diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD index 1d16c112d..31400c8af 100644 --- a/extra/kdegames-kubrick/PKGBUILD +++ b/extra/kdegames-kubrick/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181968 2013-04-05 08:56:27Z svenstaro $ +# $Id: PKGBUILD 184943 2013-05-09 09:44:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kubrick -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Based on the famous Rubik's Cube" url="http://kde.org/applications/games/kubrick/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz") -sha1sums=('a112aa326c024e7bf224ecdcfe79122e9605d988') +sha1sums=('54680f556ff5678e5091fcd254c3576c11396a39') build() { mkdir build diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD index 5b5bd4531..eabcdb6b1 100644 --- a/extra/kdegames-lskat/PKGBUILD +++ b/extra/kdegames-lskat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181969 2013-04-05 08:56:28Z svenstaro $ +# $Id: PKGBUILD 184944 2013-05-09 09:44:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-lskat -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Lieutenant Skat is a fun and engaging card game for two players" url="http://kde.org/applications/games/lskat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/lskat-${pkgver}.tar.xz") -sha1sums=('a3f3450e446b365d7171552ddd00ab84f589b943') +sha1sums=('3223e7680c81d09e926d6c04b59f7b403e1b41b0') build() { mkdir build diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD index 5ead324a0..dfc7107ce 100644 --- a/extra/kdegames-palapeli/PKGBUILD +++ b/extra/kdegames-palapeli/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181970 2013-04-05 08:56:29Z svenstaro $ +# $Id: PKGBUILD 184945 2013-05-09 09:44:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-palapeli -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A single-player jigsaw puzzle game" url="http://kde.org/applications/games/palapeli/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz") -sha1sums=('df69d8a792aa1283c4842b2e26d24c37c284380a') +sha1sums=('251df2913548628f245516341a6c91a7edc1632c') build() { mkdir build diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD index 2630cfe8e..f1d7d6f2d 100644 --- a/extra/kdegames-picmi/PKGBUILD +++ b/extra/kdegames-picmi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181971 2013-04-05 08:56:31Z svenstaro $ +# $Id: PKGBUILD 184946 2013-05-09 09:44:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-picmi -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A nonogram logic game for KDE" url="http://kde.org/applications/games/picmi/" @@ -15,7 +15,7 @@ replaces=('picmi') conflicts=('picmi') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/picmi-${pkgver}.tar.xz") -sha1sums=('04a01a90bce152759c8f638b780df22fe6266c1c') +sha1sums=('af60a275f0b06a4ae2fe552cf7973a510e2a7f6b') build() { mkdir build diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index cf66051ce..8e5f6b71b 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181972 2013-04-05 08:56:32Z svenstaro $ +# $Id: PKGBUILD 184947 2013-05-09 09:44:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,10 +14,9 @@ makedepends=('cmake' 'automoc4' 'mesa') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('6872a50b2fda3bed717e0fc1b367b02ad80550dd') +sha1sums=('1b020d9689a3b401f254ae6f26bc0f1e2455e11e') build() { - cd "${srcdir}" mkdir build cd build cmake ../gwenview-${pkgver} \ @@ -28,6 +27,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 1045cc935..dc48d1ea3 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181973 2013-04-05 08:56:33Z svenstaro $ +# $Id: PKGBUILD 184948 2013-05-09 09:44:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libgphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('5ee6904705c1d323c7c0d780d0ecf65f93175981') +sha1sums=('72a724c99cada0ed81c18dde1ad2e93b4907631f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index b830f104a..7eddc4926 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181974 2013-04-05 08:56:35Z svenstaro $ +# $Id: PKGBUILD 184949 2013-05-09 09:44:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('71d7e8415c4583ef72598bb4a50d8b2c7c83a8e6') +sha1sums=('5d76ce1018f9852f0de2a5f8fa2affde8021c834') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index 70ded10d1..b2833dd41 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181975 2013-04-05 08:56:36Z svenstaro $ +# $Id: PKGBUILD 184950 2013-05-09 09:44:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('4f6e5269500800da897643246363b9c18ce36843') +sha1sums=('7e246704a1e639886925d794dcb4bfab7bb993ca') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index c0b634ac5..410a35c96 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181976 2013-04-05 08:56:38Z svenstaro $ +# $Id: PKGBUILD 184951 2013-05-09 09:44:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('54c0999d3ce68ff4a28c879ac3743d22c76b0937') +sha1sums=('8e1b458bd98c25bf5ab4a8dfaa883fd314ee4232') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 7806cdc65..25c0f49c3 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181977 2013-04-05 08:56:40Z svenstaro $ +# $Id: PKGBUILD 184952 2013-05-09 09:44:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('9424591fe16cd1930f0a6bf89fcf7b56c0560227') +sha1sums=('fba61042b5a5f9cfac5b078238cd350f6ffa0bdf') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 5ede0b711..7514a15e4 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181978 2013-04-05 08:56:41Z svenstaro $ +# $Id: PKGBUILD 184953 2013-05-09 09:44:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('076c7ed01024c91bc690fe07e495e37444dbcdd5') +sha1sums=('5620639393632a68a30c6e726aa8925f455c2f7a') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 89a304a93..c23d196ce 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181979 2013-04-05 08:56:43Z svenstaro $ +# $Id: PKGBUILD 184954 2013-05-09 09:44:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('4f3167a98d300a56abe91fb56785afc350439cbf') +sha1sums=('c0b2b72cd26b64a930d3a14c0508ab2685caed5a') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 73d531b60..339519ec4 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181980 2013-04-05 08:56:44Z svenstaro $ +# $Id: PKGBUILD 184955 2013-05-09 09:44:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" @@ -15,7 +15,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('657d912c5addd8b770309f125a16d6bd852141ac') +sha1sums=('fe06feea93d3f38196a29dc410ee1427cfefa382') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 0e277b544..e442a99f6 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181879 2013-04-05 08:54:22Z svenstaro $ +# $Id: PKGBUILD 184854 2013-05-09 09:42:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('fcd0c725300c50ea04ec8e05b7d7035bf26afc79') +sha1sums=('b9e7cd50a430b215b2d802e2f2bdd3a254bdd700') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index bf8a6e46d..8b67e1038 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181981 2013-04-05 08:56:46Z svenstaro $ +# $Id: PKGBUILD 184956 2013-05-09 09:44:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('3d09bd886eb8f94a0492748e2500af539b5aa339') +sha1sums=('6e71181e30e003641893bbdbcfca508d1fde41a4') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index e21186540..9fd230548 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181982 2013-04-05 08:56:47Z svenstaro $ +# $Id: PKGBUILD 184957 2013-05-09 09:44:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A KPart for viewing SVGs" url="https://projects.kde.org/projects/kde/kdegraphics/svgpart" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('a361a8361fb123cb4b6498dba3b2d88293d88344') +sha1sums=('61869d8bac977faa151356583475f324a29f9d68') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 7bb788f5d..3a6386469 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181983 2013-04-05 08:56:49Z svenstaro $ +# $Id: PKGBUILD 184958 2013-05-09 09:44:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('7a3688aa23050967927e569f2b8d8c6841bf2401') +sha1sums=('c128aef92f9bd61b18ca9f9db9a43e6652454313') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 1253e97a9..dd2f171fd 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181984 2013-04-05 08:56:50Z svenstaro $ +# $Id: PKGBUILD 184959 2013-05-09 09:44:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' @@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('83d5f79e60b2b867047fd36f7a33af70087581d5') +sha1sums=('5539c665dd3173493d0a45fb775c27a4a84a2b3d') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index c1ae97488..91ff2b4b7 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181985 2013-04-05 08:56:52Z svenstaro $ +# $Id: PKGBUILD 184960 2013-05-09 09:44:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" @@ -14,7 +14,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('e4abf7618516e25d8943700d4509212c43ef67a1') +sha1sums=('9ebb61b985a6054f690ff8f89e638ad8da6a483a') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 626e06d9e..6fcb30472 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181986 2013-04-05 08:56:53Z svenstaro $ +# $Id: PKGBUILD 184961 2013-05-09 09:45:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' @@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('acd089018480ae879d241968a3be1627fb2b3298') +sha1sums=('1b4508d3f1c74a8d1a6136f27ba233ae3fb84eda') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index ed1866155..d26c00cbe 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181987 2013-04-05 08:56:54Z svenstaro $ +# $Id: PKGBUILD 184962 2013-05-09 09:45:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('4ffb1275369dfd645a99449705ba1651e9bd3885') +sha1sums=('d889a49e4cafef2ed10879a7e314e1d14bb09dd5') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index 14e7df9c8..70ee10891 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181988 2013-04-05 08:56:56Z svenstaro $ +# $Id: PKGBUILD 184963 2013-05-09 09:45:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('26617eeac172e3375cd097c8350ebdb32412e9fa') +sha1sums=('09289c9bb6bd5e592d214f3f665078010e9a7dd2') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index cdf1f4e19..ba59de64a 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181989 2013-04-05 08:56:57Z svenstaro $ +# $Id: PKGBUILD 184964 2013-05-09 09:45:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('10b7d920fc70b4001e6f7d20e643eb2b09a42dfa') +sha1sums=('e2cbfef5d1cdfcc7145fae803971d799f8739c37') build() { mkdir build diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index 29ca294dd..82392b8a2 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181990 2013-04-05 08:56:58Z svenstaro $ +# $Id: PKGBUILD 184965 2013-05-09 09:45:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('80f35eb2e30382984cb3529c4226f911f5e2c30a') +sha1sums=('f6446375ff72ffa841c223252dea1f0f95d73939') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index d3b1a94a0..ef9b57c2b 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181991 2013-04-05 08:57:00Z svenstaro $ +# $Id: PKGBUILD 184966 2013-05-09 09:45:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -9,7 +9,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('972526be8275a8adcb6e4fa51188a5dad83a0b14' +sha1sums=('9c5e14b1ebc575777d1e6d09b593f62940a4fd1d' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') build() { diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 91f844737..c4ed90a22 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181876 2013-04-05 08:54:20Z svenstaro $ +# $Id: PKGBUILD 184851 2013-05-09 09:42:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('110715ca80a67b8fce7566379fe7a058fdca100d') +sha1sums=('43a9cf46818d1d7b26253e08e8cee99a554a736a') build() { mkdir build diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index e10c14e1f..42fce9c0d 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182386 2013-04-09 20:40:43Z andrea $ +# $Id: PKGBUILD 184967 2013-05-09 09:45:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,25 +20,18 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.10.2 -pkgrel=2 +pkgver=4.10.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent' 'nepomuk-widgets') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592" - 'fix-completion.patch') -sha1sums=('61b74cb3bf541040e09252d4dcfaea8a876a2859' - '61a7e31e7daee3358c442d3ac5f74171b45ae2c9' - '92a44c7b1697de519b09265a3b68e7d73d4c024e') + source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('78ca9b822f905355ec00142a7de6c08c38b97c08') build() { - patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/kleopatra-build-fix.patch - patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/fix-completion.patch - mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdepim/fix-completion.patch b/extra/kdepim/fix-completion.patch deleted file mode 100644 index c2edefe00..000000000 --- a/extra/kdepim/fix-completion.patch +++ /dev/null @@ -1,182 +0,0 @@ -commit 6a06c57f52a00018d607085efa7570deb91dc707 -Author: David Faure <faure@kde.org> -Date: Mon Apr 8 17:41:39 2013 +0200 - - Fix kmail autocompletion from akonadi. - - My commit 02f5f0214e made autocompletion from nepomuk work better, but broke - completion from akonadi. I kept the "keywords" based code, but now it's only - used for the special case of nickname-based search (because the nickname shouldn't - appear in the completion item). For everything else it really doesn't make sense - to have a search engine (akonadi/nepomuk) on top of a search engine - (the one inside KCompletion). - - This time I verified that: - * nepomuk search still works - * contacts from akonadi work again - * contact groups from akonadi work (after previous commit) - * nickname-search in akonadi still doesn't work, but it didn't before. More work - needed for that one. This is the only reason to keep KMailCompletion around btw, - everything else would work without it. - - BUG: 259949 - FIXED-IN: 4.10.3 - -diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp -index b7b11be..ec4caf9 100644 ---- a/libkdepim/addresseelineedit.cpp -+++ b/libkdepim/addresseelineedit.cpp -@@ -30,6 +30,8 @@ - #include "completionordereditor.h" - #endif - -+#include "kmailcompletion.h" -+ - #include <Akonadi/Contact/ContactSearchJob> - #include <Akonadi/Contact/ContactGroupSearchJob> - #include <Akonadi/CollectionFetchJob> -@@ -77,6 +79,10 @@ - - using namespace KPIM; - -+namespace KPIM { -+ typedef QMap< QString, QPair<int,int> > CompletionItemsMap; -+} -+ - class AddresseeLineEditStatic - { - public: -@@ -496,11 +502,9 @@ void AddresseeLineEdit::Private::addCompletionItem( const QString &string, int w - s_static->completionItemMap.insert( string, qMakePair( weight, completionItemSource ) ); - } - -- if ( keyWords == 0 ) { -- s_static->completion->addItem( string, weight ); -- } else { -- s_static->completion->addItemWithKeys( string, weight, keyWords ); -- } -+ s_static->completion->addItem(string, weight); -+ if (keyWords && !keyWords->isEmpty()) -+ s_static->completion->addItemWithKeys(string, weight, keyWords); // see kmailcompletion.cpp - } - - const QStringList KPIM::AddresseeLineEdit::Private::adjustedCompletionItems( bool fullSearch ) -@@ -1348,17 +1352,13 @@ void AddresseeLineEdit::addItem( const Akonadi::Item &item, int weight, int sour - void AddresseeLineEdit::addContactGroup( const KABC::ContactGroup &group, int weight, int source ) - { - d->addCompletionItem( group.name(), weight, source ); -- QStringList keyWords; -- keyWords.append( group.name() ); -- d->addCompletionItem( group.name(), weight, source, &keyWords ); - } - - void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int source ) - { - const QStringList emails = addr.emails(); - QStringList::ConstIterator it; -- const int prefEmailWeight = 1; //increment weight by prefEmailWeight -- int isPrefEmail = prefEmailWeight; //first in list is preferredEmail -+ int isPrefEmail = 1; //first in list is preferredEmail - QStringList::ConstIterator end( emails.constEnd() ); - for ( it = emails.constBegin(); it != end; ++it ) { - //TODO: highlight preferredEmail -@@ -1368,40 +1368,6 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int - const QString nickName = addr.nickName(); - QString fullEmail = addr.fullEmail( email ); - -- // Prepare keywords (for CompletionShell, CompletionPopup) -- QStringList keyWords; -- const QString realName = addr.realName(); -- -- if ( !givenName.isEmpty() && !familyName.isEmpty() ) { -- keyWords.append( givenName + QLatin1Char( ' ' ) + familyName ); -- keyWords.append( familyName + QLatin1Char( ' ' ) + givenName ); -- keyWords.append( familyName + QLatin1String( ", " ) + givenName ); -- } else if ( !givenName.isEmpty() ) { -- keyWords.append( givenName ); -- } else if ( !familyName.isEmpty() ) { -- keyWords.append( familyName ); -- } -- -- if ( !nickName.isEmpty() ) { -- keyWords.append( nickName ); -- } -- -- if ( !realName.isEmpty() ) { -- keyWords.append( realName ); -- } -- -- keyWords.append( email ); -- -- /* KMailCompletion does not have knowledge about identities, it stores emails and -- * keywords for each email. KMailCompletion::allMatches does a lookup on the -- * keywords and returns an ordered list of emails. In order to get the preferred -- * email before others for each identity we use this little trick. -- * We remove the <blank> in adjustedCompletionItems. -- */ -- if ( isPrefEmail == prefEmailWeight ) { -- fullEmail.replace( QLatin1String( " <" ), QLatin1String( " <" ) ); -- } -- - // Prepare "givenName" + ' ' + "familyName" - QString fullName = givenName; - if (!familyName.isEmpty()) { -@@ -1413,12 +1379,16 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int - // Finally, we can add the completion items - if (!fullName.isEmpty()) { - const QString address = KPIMUtils::normalizedAddress(fullName, email, QString()); -- d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords); -+ if (fullEmail != address) { -+ // This happens when fullEmail contains a middle name, while our own fullName+email only has "first last". -+ // Let's offer both, the fullEmail with 3 parts, looks a tad formal. -+ d->addCompletionItem(address, weight + isPrefEmail, source); -+ } - } - -- if ( !nickName.isEmpty() ) { -- const QString address = KPIMUtils::normalizedAddress(nickName, email, QString()); -- d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords); -+ QStringList keyWords; -+ if (!nickName.isEmpty()) { -+ keyWords.append(nickName); - } - - d->addCompletionItem( fullEmail, weight + isPrefEmail, source, &keyWords ); -diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h -index 4e6784b..b2af4a9 100644 ---- a/libkdepim/addresseelineedit.h -+++ b/libkdepim/addresseelineedit.h -@@ -27,7 +27,6 @@ - #ifndef KDEPIM_ADDRESSEELINEEDIT_H - #define KDEPIM_ADDRESSEELINEEDIT_H - --#include "kmailcompletion.h" - #include "kdepim_export.h" - - #include "ldap/ldapclient.h" -@@ -50,10 +49,6 @@ namespace KABC { - class ContactGroup; - } - --namespace KPIM { -- typedef QMap< QString, QPair<int,int> > CompletionItemsMap; --} -- - namespace Nepomuk2 { - namespace Query { - class Result; -diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h -index e8574cc..93771d3 100644 ---- a/libkdepim/kmailcompletion.h -+++ b/libkdepim/kmailcompletion.h -@@ -32,7 +32,9 @@ namespace KPIM { - - /** - * KMailCompletion allows lookup of email addresses by keyword. -- * Typically a keywods would be firstname, lastname, nickname or domain. -+ * This is used for lookup by nickname, since we don't want the nickname to appear in the final email. -+ * E.g. you have a nickname "idiot" for your boss, you want to type "idiot" but you want the completion -+ * to offer "Full Name <email@domain>", without the nickname being visible. - */ - class KMailCompletion : public KCompletion - { diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index c63165180..2c9ca9a62 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181872 2013-04-05 08:54:13Z svenstaro $ +# $Id: PKGBUILD 184847 2013-05-09 09:42:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ab163597d36b5457f9bcb0328f21c35777fffc34') +sha1sums=('7ede01b2f169c066c98f553606e99817d83f252b') build() { mkdir build diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 7e329405a..f58b37c9b 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181993 2013-04-05 08:57:05Z svenstaro $ +# $Id: PKGBUILD 184968 2013-05-09 09:45:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -77,7 +77,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-qmlwallpapers' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -86,7 +86,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('26c59eb5738f9efbb94c7109b108ec09d7008ba6') +sha1sums=('e1d2f452e4560c4c8d13573505cc4c3538f36e46') build() { mkdir build diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 43e615cbd..6245dee7b 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 181881 2013-04-05 08:54:24Z svenstaro $ +# $Id: PKGBUILD 184856 2013-05-09 09:42:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('117850ca1728c309310f23a5ac2d583cfdfd29c7' +sha1sums=('6fe0e8c0cee9a21df4c4271861e10e249896d873' 'dc70306c507083cf9b4bb1c536858742292fa1bf') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 608519fbc..a4933395f 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181994 2013-04-05 08:57:10Z svenstaro $ +# $Id: PKGBUILD 184969 2013-05-09 09:45:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -16,7 +16,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-poxml' 'kdesdk-strigi-analyzers' 'kdesdk-umbrello') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -26,7 +26,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('0cedb222c469f7e465486ac744806e52f762b413' +sha1sums=('84d16fb8ecea59118c4bbe273d1b8149c6739c0a' '07db42bbcae402c292eebf002e549b04162621c5') build() { @@ -151,7 +151,8 @@ package_kdesdk-okteta() { package_kdesdk-poxml() { pkgdesc='Translates DocBook XML files using gettext po files' url="https://projects.kde.org/projects/kde/kdesdk/poxml" - depends=('qt4' 'antlr2') + depends=('qt4') + optdepends=('antlr2: required for po2xml and swappo tool') cd $srcdir/build/poxml make DESTDIR=$pkgdir install } diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 3bb85591b..a471fdb12 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181995 2013-04-05 08:57:11Z svenstaro $ +# $Id: PKGBUILD 184970 2013-05-09 09:45:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('3fa4fc9b9ec04e9967b9a326d9dc26c3055b5e2b') +sha1sums=('1272b33ff3ef669ab309c8c230d3609d597c743b') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index ef475d26c..f9fc23194 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181997 2013-04-05 08:57:14Z svenstaro $ +# $Id: PKGBUILD 184972 2013-05-09 09:45:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('1047e985fead8655b9eac888315b007844b34a68') +sha1sums=('ebfa5a9cc39abf311208d6a9d058e5003cb4daf8') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index ffed0078f..b7bad19bb 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181998 2013-04-05 08:57:16Z svenstaro $ +# $Id: PKGBUILD 184973 2013-05-09 09:45:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('45f2a3eb557891e3c47a00dafb9ad3bd64bde4d8') +sha1sums=('c80f91c2f41a60cca670c8cb1b5e2c395e935fac') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index 56b5dc47d..52de8daba 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181999 2013-04-05 08:57:20Z svenstaro $ +# $Id: PKGBUILD 184974 2013-05-09 09:45:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('2e5b06c4be689097f3999ff772bc12373fa81e7c') +sha1sums=('15360b8b7d1878b146cc38030e8ab59d2fa76acc') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index beae8ecdf..b58775b06 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182000 2013-04-05 08:57:21Z svenstaro $ +# $Id: PKGBUILD 184975 2013-05-09 09:45:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('e7f230d14188c45c226513e110ee664a4ad89cb9') +sha1sums=('a88a393714a127a5629c2b50690ee6766c6ed484') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index bccbec104..3bb9765ac 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182001 2013-04-05 08:57:23Z svenstaro $ +# $Id: PKGBUILD 184976 2013-05-09 09:45:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('c79e9660ebea09aea2caffb8424e3621f30d3346') +sha1sums=('25ff13f6551542eb58384c7606837c05a452fb54') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index 50906c08e..1949395fe 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182002 2013-04-05 08:57:24Z svenstaro $ +# $Id: PKGBUILD 184977 2013-05-09 09:45:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('fbe8df63cbfbff616493267253b03e153e2bbc40') +sha1sums=('ba92c6edcf6ce857fec7969aab5a8b8afce2d43c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 7a5d53809..03445586e 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('e74d4724afef6fdfb5b4a95e35672b3e3d8e9b5c') +sha1sums=('5a3df78e08688647224c63418363940b222abe21') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index ed9c895d2..1b82fc623 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182004 2013-04-05 08:57:27Z svenstaro $ +# $Id: PKGBUILD 184979 2013-05-09 09:45:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('2348d09267f173201b1ce426f0831e444602545d') +sha1sums=('c39948abf291f0ddd9e07cdc6b9d48922f62b317') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index 4c97bbec9..7ebde17ed 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182005 2013-04-05 08:57:29Z svenstaro $ +# $Id: PKGBUILD 184980 2013-05-09 09:45:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('2a566c85aec79e8d08afe996224029714cd38b6e') +sha1sums=('41a32b861ea2dcf4892c0161bce90996e9c8bd3d') build() { cd "${srcdir}" diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD index 7d4f12592..bf3b026e5 100644 --- a/extra/kdeutils-print-manager/PKGBUILD +++ b/extra/kdeutils-print-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182006 2013-04-05 08:57:30Z svenstaro $ +# $Id: PKGBUILD 184981 2013-05-09 09:45:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-print-manager -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A tool for managing print jobs and printers" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-prin conflicts=('print-manager') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/print-manager-${pkgver}.tar.xz") -sha1sums=('67aaa15e157612e50547ce9cd35bcd06ce1fac22') +sha1sums=('91b98fd9827e61bc9b351fc7027df8212764f817') build() { mkdir build diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index 5e0548047..3c5cfc950 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182007 2013-04-05 08:57:32Z svenstaro $ +# $Id: PKGBUILD 184982 2013-05-09 09:45:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('5c701c7d95cef873fd0767726a6042d02844c0f2') +sha1sums=('b74241f3357a91149bbb1610ee7e944e053b25ff') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index b2c41eba7..f61c8d971 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182008 2013-04-05 08:57:33Z svenstaro $ +# $Id: PKGBUILD 184983 2013-05-09 09:45:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('b817768cbf7c47ba8d0f61c714849e9074cebc43') +sha1sums=('978f599562a6c9b2792fa7383f333d7048309ab6') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 05e032d0f..663bfa15e 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182009 2013-04-05 08:57:36Z svenstaro $ +# $Id: PKGBUILD 184984 2013-05-09 09:45:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('3ab68cf5fefbfe09826e659a097d21821771a5b9') +sha1sums=('ea30f3187bd40eb0b972f2a9a7275674d6cee286') build() { cd $srcdir diff --git a/extra/latex2rtf/PKGBUILD b/extra/latex2rtf/PKGBUILD index 52d9adb96..36e03da89 100644 --- a/extra/latex2rtf/PKGBUILD +++ b/extra/latex2rtf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171488 2012-11-18 03:22:38Z eric $ +# $Id: PKGBUILD 185175 2013-05-11 18:30:24Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=latex2rtf -pkgver=2.2.1c -pkgrel=2.1 +pkgver=2.3.3 +pkgrel=1 pkgdesc="LaTeX to RTF converter" arch=('i686' 'x86_64' 'mips64el') url="http://latex2rtf.sourceforge.net/" @@ -17,20 +17,20 @@ checkdepends=( ) install=latex2rtf.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('3fd5874de8988cf45f8862d2b3db8ed13a04caa4') +sha1sums=('85dd36e8595f92f41b0b173a6b42279333bbb1a9') build() { - cd "${srcdir}/${pkgname}-2.2.1" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=/usr } check() { - cd "${srcdir}/${pkgname}-2.2.1" + cd "${srcdir}/${pkgname}-${pkgver}" make check } package() { - cd "${srcdir}/${pkgname}-2.2.1" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/usr" install install-info sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' "${pkgdir}/usr/bin/latex2png" } diff --git a/extra/lbreakout2/PKGBUILD b/extra/lbreakout2/PKGBUILD index fef07448e..03144c063 100644 --- a/extra/lbreakout2/PKGBUILD +++ b/extra/lbreakout2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162793 2012-06-30 14:10:06Z giovanni $ +# $Id: PKGBUILD 184401 2013-05-06 19:38:14Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=lbreakout2 pkgver=2.6.4 -pkgrel=1.1 +pkgrel=2 pkgdesc="A breakout game with nice effects, graphics, and sounds" arch=('i686' 'x86_64' 'mips64el') url="http://lgames.sourceforge.net" diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD index 50688d4a1..8a6d1e1eb 100644 --- a/extra/libgdiplus/PKGBUILD +++ b/extra/libgdiplus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171478 2012-11-18 00:00:45Z eric $ +# $Id: PKGBUILD 184402 2013-05-06 19:38:19Z foutrelis $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=libgdiplus pkgver=2.10 -pkgrel=3.1 +pkgrel=4 pkgdesc="An Open Source Implementation of the GDI+ API" arch=(i686 x86_64 'mips64el') license=('MPL' 'LGPL') diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD index 9e258f208..7af0fbfc8 100644 --- a/extra/libgpod/PKGBUILD +++ b/extra/libgpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164367 2012-07-31 19:43:09Z eric $ +# $Id: PKGBUILD 185166 2013-05-11 16:16:30Z tomegun $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libgpod pkgver=0.8.2 -pkgrel=6.1 +pkgrel=7 pkgdesc="A shared library to access the contents of an iPod" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/libgxps/PKGBUILD b/extra/libgxps/PKGBUILD index bb661a5b8..9ef1a03ab 100644 --- a/extra/libgxps/PKGBUILD +++ b/extra/libgxps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179109 2013-03-03 17:28:36Z dreisner $ +# $Id: PKGBUILD 184403 2013-05-06 19:38:20Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libgxps pkgver=0.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="XPS Documents library" arch=(i686 x86_64 'mips64el') url="https://live.gnome.org/libgxps" diff --git a/extra/libimobiledevice/HOME-segfault.patch b/extra/libimobiledevice/HOME-segfault.patch deleted file mode 100644 index e48e6cb42..000000000 --- a/extra/libimobiledevice/HOME-segfault.patch +++ /dev/null @@ -1,14 +0,0 @@ -The patch fixes segfault when both $XDG_CONFIG_HOME and $HOME are unset -Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> ---- src/userpref.c.orig 2012-06-04 17:04:57.387303630 +0300 -+++ src/userpref.c 2012-06-04 17:06:05.741301627 +0300 -@@ -125,6 +125,9 @@ - const char *cdir = getenv("XDG_CONFIG_HOME"); - if (!cdir) { - cdir = getenv("HOME"); -+ if (!cdir) { -+ cdir="/root"; -+ } - strcpy(__config_dir, cdir); - strcat(__config_dir, DIR_SEP_S); - strcat(__config_dir, ".config"); diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD index aefb7c445..6a9235a71 100644 --- a/extra/libimobiledevice/PKGBUILD +++ b/extra/libimobiledevice/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 164735 2012-08-04 10:06:26Z tomegun $ +# $Id: PKGBUILD 185167 2013-05-11 16:16:32Z tomegun $ +# Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libimobiledevice -pkgver=1.1.4 -pkgrel=2 +pkgver=1.1.5 +pkgrel=1 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" url="http://libimobiledevice.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') depends=('usbmuxd' 'gnutls' 'libgcrypt') options=('!libtool') -source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2 - HOME-segfault.patch) +source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) build() { cd "$pkgname-$pkgver" - patch -p0 < "$srcdir/HOME-segfault.patch" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } @@ -27,5 +25,4 @@ package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('3f28cbc6a2e30d34685049c0abde5183' - '0de709dbf8e79d0b00cca06f5e61d57c') +md5sums=('d9debdcf71508dee2c85b60b28ccddd4') diff --git a/extra/libkate/PKGBUILD b/extra/libkate/PKGBUILD index 8212c746c..3e2f79409 100644 --- a/extra/libkate/PKGBUILD +++ b/extra/libkate/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151102 2012-02-24 21:57:31Z giovanni $ +# $Id: PKGBUILD 184404 2013-05-06 19:38:23Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: N30N <archlinux@alunamation.com> # Contributor: linkmauve <linkmauve@linkmauve.fr> @@ -6,7 +6,7 @@ pkgname=libkate pkgver=0.4.1 -pkgrel=3.2 +pkgrel=4 pkgdesc="A karaoke and text codec for embedding in ogg" url="http://libkate.googlecode.com/" license=('BSD') diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index 10f1067c8..e0654b595 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181897 2013-04-05 08:54:42Z svenstaro $ +# $Id: PKGBUILD 184872 2013-05-09 09:42:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('c9e8d93ecf9f238bf12d98d27fc20421af5ae240') +sha1sums=('1ca7e92544a1d3c49e5ddf3583c3c2b976a7990b') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index def39a721..d4c8b4b9d 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181898 2013-04-05 08:54:43Z svenstaro $ +# $Id: PKGBUILD 184873 2013-05-09 09:42:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('dcd95e3b197a871a21cd50f70edc5039b7835ef4') +sha1sums=('cc6ad902a6c94c68a1b8d27aabdbcac1df547cd8') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 3a6a38d8c..611e3870e 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183096 2013-04-17 14:16:08Z andrea $ +# $Id: PKGBUILD 184867 2013-05-09 09:42:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.10.2 -pkgrel=2 +pkgver=4.10.3 +pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('639bf3bf9a872cccbb39e5d16188dfa1d895463a') +sha1sums=('801770f6eefc85b0939304bc0c5acf399fa988ed') build() { mkdir build diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 7504f857e..7c020e14f 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181890 2013-04-05 08:54:34Z svenstaro $ +# $Id: PKGBUILD 184865 2013-05-09 09:42:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('2c0f6ebfc1e51919da0313b0a93d149dfd1d0be7') +sha1sums=('99e781b0c6ab8907e15f9d2dff6f3a778e40c331') build() { cd "${srcdir}" diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD index 3be84aa86..fd6f082cc 100644 --- a/extra/libkdegames/PKGBUILD +++ b/extra/libkdegames/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181899 2013-04-05 08:54:43Z svenstaro $ +# $Id: PKGBUILD 184874 2013-05-09 09:42:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdegames -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Common code and data for many KDE games" url="https://projects.kde.org/projects/kde/kdegames/libkdegames" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkdegames') conflicts=('kdegames-libkdegames') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('3a08bf0f98c00a02363da1a61beea61ad1e01b5b') +sha1sums=('1a6385ee9bbbfc1f8d992df6efd716727e9ba3a4') build() { mkdir build diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index 2613f5d4d..ac09d4206 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181893 2013-04-05 08:54:37Z svenstaro $ +# $Id: PKGBUILD 184868 2013-05-09 09:42:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('02dce6eaf48c14f134f220eeed494d74d41f7226') +sha1sums=('57f3d52c8ff6b58af55fb83d38d7479688bd681b') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 5870d56f7..fe054d4c5 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('3098759c56c8fa89bc087de60d8709c7f76dc7a6') +sha1sums=('5b8ac6703026cd0fe1bcc29f6f3dc1e6cf724b15') build() { cd "${srcdir}" diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD index 78fb97a6a..7961301f8 100644 --- a/extra/libkmahjongg/PKGBUILD +++ b/extra/libkmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181900 2013-04-05 08:54:44Z svenstaro $ +# $Id: PKGBUILD 184875 2013-05-09 09:42:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkmahjongg -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles" url="https://projects.kde.org/projects/kde/kdegames/libmahjongg" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkmahjongg') conflicts=('kdegames-libkmahjongg') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('58a8d3deb165cf9041c5b606a67275b3e276c428') +sha1sums=('d33446dcd5cbc455fdd2bf09406b5a4ce15d683b') build() { mkdir build diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 138a5b0e2..7df552562 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181895 2013-04-05 08:54:39Z svenstaro $ +# $Id: PKGBUILD 184870 2013-05-09 09:42:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="An image scanning library" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('3b9b83974dd2cdabe0cbe5fd3904ced1413a756b') +sha1sums=('1b9af8bf3b0ed24211115d16937f56414222738c') build() { cd "${srcdir}" diff --git a/extra/libnl1/PKGBUILD b/extra/libnl1/PKGBUILD index 57a4c8f5c..6d45c6c37 100644 --- a/extra/libnl1/PKGBUILD +++ b/extra/libnl1/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182913 2013-04-16 05:29:35Z eric $ +# $Id: PKGBUILD 185225 2013-05-12 09:29:56Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libnl1 -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets (Legacy version)" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('glibc') options=('!staticlibs') source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz") -md5sums=('4e4fa2197f4412b20c2952325d674b12') +md5sums=('580cb878be536804daca87fb75ae46cc') build() { cd libnl-${pkgver} diff --git a/extra/libpano13/PKGBUILD b/extra/libpano13/PKGBUILD index d716e70a2..e40504be1 100644 --- a/extra/libpano13/PKGBUILD +++ b/extra/libpano13/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 148830 2012-02-05 11:52:01Z ibiru $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 184405 2013-05-06 19:38:25Z foutrelis $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libpano13 pkgver=2.9.18 -pkgrel=2 -pkgdesc="Basic library to calculate panoramical pictures - core functions of the panotools" -arch=('i686' 'x86_64' 'mips64el') -url="http://panotools.sourceforge.net/" +pkgrel=3 +pkgdesc='Basic library to calculate panoramical pictures - core functions of the panotools' +url='http://panotools.sourceforge.net/' +arch=('i686' 'x86_64') license=('GPL2') depends=('libpng' 'libtiff') -makedepends=('openjdk6') +makedepends=('jdk7-openjdk') +source=("http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz") +sha1sums=('23849bdbdfc9176a2b53d157e58bd24aa0e7276e') + options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz) -md5sums=('9c3a4fce8b6f1d79e395896ce5d8776e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME} - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME} + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch b/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch new file mode 100644 index 000000000..e67728051 --- /dev/null +++ b/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch @@ -0,0 +1,106 @@ +From 56d6bc2e8855d25e03816509a0137c3a70410ae6 Mon Sep 17 00:00:00 2001 +From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net> +Date: Mon, 29 Apr 2013 08:57:14 -0500 +Subject: [PATCH 06/10] [libpng16] Avoid dereferencing NULL pointer possibly + returned from + +png_create_write_struct() (Andrew Church). +--- + ANNOUNCE | 6 ++++-- + CHANGES | 4 +++- + pngwrite.c | 65 +++++++++++++++++++++++++++++++------------------------------- + 3 files changed, 39 insertions(+), 36 deletions(-) + + (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.) + +diff --git a/pngwrite.c b/pngwrite.c +index 33924aa..b71a3d3 100644 +--- a/pngwrite.c ++++ b/pngwrite.c +@@ -494,51 +494,50 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr, + png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr, + error_fn, warn_fn, mem_ptr, malloc_fn, free_fn); + #endif /* PNG_USER_MEM_SUPPORTED */ ++ if (png_ptr != NULL) ++ { ++ /* Set the zlib control values to defaults; they can be overridden by the ++ * application after the struct has been created. ++ */ ++ png_ptr->zbuffer_size = PNG_ZBUF_SIZE; + +- /* Set the zlib control values to defaults; they can be overridden by the +- * application after the struct has been created. +- */ +- png_ptr->zbuffer_size = PNG_ZBUF_SIZE; +- +- /* The 'zlib_strategy' setting is irrelevant because png_default_claim in +- * pngwutil.c defaults it according to whether or not filters will be used, +- * and ignores this setting. +- */ +- png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY; +- png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION; +- png_ptr->zlib_mem_level = 8; +- png_ptr->zlib_window_bits = 15; +- png_ptr->zlib_method = 8; ++ /* The 'zlib_strategy' setting is irrelevant because png_default_claim in ++ * pngwutil.c defaults it according to whether or not filters will be ++ * used, and ignores this setting. ++ */ ++ png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY; ++ png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION; ++ png_ptr->zlib_mem_level = 8; ++ png_ptr->zlib_window_bits = 15; ++ png_ptr->zlib_method = 8; + + #ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED +- png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY; +- png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION; +- png_ptr->zlib_text_mem_level = 8; +- png_ptr->zlib_text_window_bits = 15; +- png_ptr->zlib_text_method = 8; ++ png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY; ++ png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION; ++ png_ptr->zlib_text_mem_level = 8; ++ png_ptr->zlib_text_window_bits = 15; ++ png_ptr->zlib_text_method = 8; + #endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */ + +- /* This is a highly dubious configuration option; by default it is off, but +- * it may be appropriate for private builds that are testing extensions not +- * conformant to the current specification, or of applications that must not +- * fail to write at all costs! +- */ +-# ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED ++ /* This is a highly dubious configuration option; by default it is off, ++ * but it may be appropriate for private builds that are testing ++ * extensions not conformant to the current specification, or of ++ * applications that must not fail to write at all costs! ++ */ ++#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED + png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN; + /* In stable builds only warn if an application error can be completely + * handled. + */ +-# endif ++#endif + +- /* App warnings are warnings in release (or release candidate) builds but +- * are errors during development. +- */ +-# if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC ++ /* App warnings are warnings in release (or release candidate) builds but ++ * are errors during development. ++ */ ++#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC + png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN; +-# endif ++#endif + +- if (png_ptr != NULL) +- { + /* TODO: delay this, it can be done in png_init_io() (if the app doesn't + * do it itself) avoiding setting the default function if it is not + * required. +-- +1.8.2.2 + diff --git a/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch b/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch new file mode 100644 index 000000000..0a305c150 --- /dev/null +++ b/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch @@ -0,0 +1,133 @@ +From 127b08a265f99ce517ea31ec7988a91fc17da4d9 Mon Sep 17 00:00:00 2001 +From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net> +Date: Sun, 5 May 2013 22:13:47 -0500 +Subject: [PATCH 09/10] [libpng16] Calculate our own zlib windowBits when + decoding rather than + +trusting the CMF bytes in the PNG datastream. +--- + ANNOUNCE | 6 +++-- + CHANGES | 5 +++- + pngrutil.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- + 3 files changed, 88 insertions(+), 10 deletions(-) + + (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.) + +diff --git a/pngrutil.c b/pngrutil.c +index 01c3679..9c10e26 100644 +--- a/pngrutil.c ++++ b/pngrutil.c +@@ -18,8 +18,6 @@ + + #ifdef PNG_READ_SUPPORTED + +-#define png_strtod(p,a,b) strtod(a,b) +- + png_uint_32 PNGAPI + png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf) + { +@@ -4165,6 +4163,75 @@ png_read_finish_row(png_structrp png_ptr) + } + #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ + ++#ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED ++/* This is the code to to select a windowBits value to match the smallest ++ * possible sliding window needed to contain the entire uncompressed image. ++ */ ++static unsigned int ++required_window_bits(png_alloc_size_t data_size) ++{ ++ unsigned int windowBits = 15; ++ if (data_size <= 16384) /* else windowBits must be 15 */ ++ { ++ unsigned int half_z_window_size = 1U << (windowBits-1); /* 16384 */ ++ ++ do ++ { ++ half_z_window_size >>= 1; ++ --windowBits; ++ } ++ while (windowBits > 8 && data_size <= half_z_window_size); ++ } ++ return windowBits; ++} ++/* This is used below to find the size of an image to pass to png_deflate_claim, ++ * so it only needs to be accurate if the size is less than 16384 bytes (the ++ * point at which a lower LZ window size can be used.) ++ * ++ * To do: merge this with png_image_size() in pngwutil.c and put the result ++ * in png.c as a PNG_INTERNAL_FUNCTION. ++ */ ++static png_alloc_size_t ++png_read_image_size(png_structrp png_ptr) ++{ ++ /* Only return sizes up to the maximum of a png_uint_32, do this by limiting ++ * the width and height used to 15 bits. ++ */ ++ png_uint_32 h = png_ptr->height; ++ ++ if (png_ptr->rowbytes < 32768 && h < 32768) ++ { ++ if (png_ptr->interlaced) ++ { ++ /* Interlacing makes the image larger because of the replication of ++ * both the filter byte and the padding to a byte boundary. ++ */ ++ png_uint_32 w = png_ptr->width; ++ unsigned int pd = png_ptr->pixel_depth; ++ png_alloc_size_t cb_base; ++ int pass; ++ ++ for (cb_base=0, pass=0; pass<=6; ++pass) ++ { ++ png_uint_32 pw = PNG_PASS_COLS(w, pass); ++ ++ if (pw > 0) ++ cb_base += (PNG_ROWBYTES(pd, pw)+1) * PNG_PASS_ROWS(h, pass); ++ } ++ ++ return cb_base; ++ } ++ ++ else ++ return (png_ptr->rowbytes+1) * h; ++ } ++ ++ else ++ return 0xffffffffU; ++} ++ ++#endif /* PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED */ ++ + void /* PRIVATE */ + png_read_start_row(png_structrp png_ptr) + { +@@ -4449,14 +4516,20 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) + png_free(png_ptr, buffer); + } + +- /* Finally claim the zstream for the inflate of the IDAT data, use the bits +- * value from the stream (note that this will result in a fatal error if the +- * IDAT stream has a bogus deflate header window_bits value, but this should +- * not be happening any longer!) ++ /* Finally claim the zstream for the inflate of the IDAT data, using the ++ * windowBts predicted from the uncompressed data size, not the value from ++ * the stream. If READ_OPTIMIZE_WINDOWBITS_SUPPORTED is not defined, then ++ * simply use a 32kbyte window (windowBits=15). + */ +- if (png_inflate_claim(png_ptr, png_IDAT, 0) != Z_OK) ++#ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED ++ if (png_inflate_claim(png_ptr, png_IDAT, ++ required_window_bits(png_read_image_size(png_ptr))) != Z_OK) ++#else ++ if (png_inflate_claim(png_ptr, png_IDAT, 15) != Z_OK) ++#endif + png_error(png_ptr, png_ptr->zstream.msg); + + png_ptr->flags |= PNG_FLAG_ROW_INIT; + } ++ + #endif /* PNG_READ_SUPPORTED */ +-- +1.8.2.2 + diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index 90581e839..bf803f20e 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 182372 2013-04-09 18:14:06Z ioni $ +# $Id: PKGBUILD 184406 2013-05-06 19:38:28Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.5.15 -_apngver=1.5.15 -pkgrel=1 +pkgver=1.6.2 +_apngver=1.6.2 +pkgrel=3 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64' 'mips64el') url="http://www.libpng.org/pub/png/libpng.html" @@ -15,16 +15,31 @@ license=('custom') depends=('zlib' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" - "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") -md5sums=('e3122e7b5b5c36c034a4624c65f8a9d8' - '3ae9ea7e4bd201f0b25e25cd6049b094') + "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz" + 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch + 0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch + adjust-apng-patch-for-libpng16-git-changes.patch) +md5sums=('9d838f6fca9948a9f360a0cc1b516d5f' + '7d0c9f4b9a7f45dd5d1088e54b623c98' + '59b83234f60a7d1d179d9b0b6a0ebc01' + 'b1f7922b6678305bdb7c23d5bd1763f3' + 'f87704c3fb6d29f09b52178e89a42e2e') -build() { +prepare() { cd $pkgname-$pkgver + # Add fixes from libpng16 branch + patch -Np1 -i ../0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch + patch -Np1 -i ../0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch + # Add animated PNG (apng) support # see http://sourceforge.net/projects/libpng-apng/ - patch -p1 -i ../libpng-$_apngver-apng.patch + patch -d .. -Np0 -i adjust-apng-patch-for-libpng16-git-changes.patch + patch -Np1 -i ../libpng-$_apngver-apng.patch +} + +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr make diff --git a/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch b/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch new file mode 100644 index 000000000..26ac1c1cf --- /dev/null +++ b/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch @@ -0,0 +1,19 @@ +--- libpng-1.6.2-apng.patch.orig 2013-05-06 12:09:16.000000000 +0300 ++++ libpng-1.6.2-apng.patch 2013-05-06 12:12:14.000000000 +0300 +@@ -1034,7 +1034,7 @@ diff -Naru libpng-1.6.2.org/pngrutil.c l + + if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) + png_chunk_benign_error(png_ptr, "Extra compressed data"); +-@@ -4459,4 +4671,80 @@ ++@@ -4459,5 +4671,81 @@ + + png_ptr->flags |= PNG_FLAG_ROW_INIT; + } +@@ -1114,6 +1114,7 @@ diff -Naru libpng-1.6.2.org/pngrutil.c l + +} + +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ + +#endif /* PNG_READ_APNG_SUPPORTED */ ++ + #endif /* PNG_READ_SUPPORTED */ + diff -Naru libpng-1.6.2.org/pngset.c libpng-1.6.2/pngset.c + --- libpng-1.6.2.org/pngset.c 2013-04-29 17:31:42.000000000 +0900 diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index e3be4a21c..ac39bf8cd 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183292 2013-04-20 16:41:28Z heftig $ +# $Id: PKGBUILD 185016 2013-05-10 07:10:14Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.2.2 -pkgver=4.0.2 -pkgrel=3 +_LOver=4.0.3.3 +pkgver=4.0.3 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -74,17 +74,11 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - ${_additional_source_url}/libcdr-0.0.11.tar.bz2 + ${_additional_source_url}/libcdr-0.0.12.tar.bz2 ${_additional_source_url}/libmspub-0.0.5.tar.bz2 - ${_additional_source_url}/libvisio-0.0.25.tar.bz2 + ${_additional_source_url}/libvisio-0.0.26.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - libreoffice-common.sh libreoffice-common.csh - gcc48_1.diff - gcc48_2.diff - remove_unused_vars.diff - gcc48_3.diff - gcc48_4.diff - gcc48_5.diff) + libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 @@ -114,12 +108,12 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libcdr-0.0.11.tar.bz2 + libcdr-0.0.12.tar.bz2 libmspub-0.0.5.tar.bz2 - libvisio-0.0.25.tar.bz2) -md5sums=('2c92879fa8c50d0071c4703afb7d10bf' - '22e99e58aa32417dd7c132f40ae7654b' - '8b61fbfa6bcd18213b5744f2b8a289b0' + libvisio-0.0.26.tar.bz2) +md5sums=('7bcde561375f3bbce08f6d05451c8ad7' + '994b1f3015668335c30b53ddd3d60dc8' + '05b9ba0e86181bda3afeadcaba9202a3' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -149,39 +143,21 @@ md5sums=('2c92879fa8c50d0071c4703afb7d10bf' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' - '107a3d18f637b342684b3c21eb0fcd7d' + '6db2c96a4ae5977da8b84893c1441038' '881c4628ec5f54d47f35d5d19e335662' - '92bde158f249b9b27f76f48cc65a0242' + '2f638cf6f92cec59c9205ac3cbf1702e' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' - 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' - '941aab11a42c8052cc1999434ae82bcd' - 'caf426e9eefb99108adba6cf231de348' - 'c367454b402720eea064280d0dfb291b' - '69aef9ea67856714e0ad3b5600b49bd7' - '424c346c52d1a3ee7b1008cdcf89ed82' - 'aed5397524af27a8cceced54a30edf23') + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') build() { -# unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH -# [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh -# [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - cd ${srcdir}/libreoffice-$_LOver # fix exttextcat build error # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] unset CPPFLAGS - # git commits from 2013-03-09 with "GCC" to fix gcc 4.8 issues -# patch -Np1 -i ${srcdir}/gcc48_1.diff -# patch -Np1 -i ${srcdir}/gcc48_2.diff -# patch -Np1 -i ${srcdir}/remove_unused_vars.diff -# patch -Np1 -i ${srcdir}/gcc48_3.diff -# patch -Np1 -i ${srcdir}/gcc48_4.diff -# patch -Np1 -i ${srcdir}/gcc48_5.diff - # move external sources into place mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources for source in "${noextract[@]}"; do diff --git a/extra/libreoffice/gcc48_1.diff b/extra/libreoffice/gcc48_1.diff deleted file mode 100644 index 7ee6bd249..000000000 --- a/extra/libreoffice/gcc48_1.diff +++ /dev/null @@ -1,52 +0,0 @@ -From 6bea5311d70f518444fe3218cf0b6f49bd93cc34 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 09:36:44 +0000 -Subject: Work around GCC 4.8 -Werror=unused-local-typedefs in boost - -Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856 ---- -diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk -index 2fcae8c..fde6fa6 100644 ---- a/boost/UnpackedTarball_boost.mk -+++ b/boost/UnpackedTarball_boost.mk -@@ -52,6 +52,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch - # in GCC-4.7 experimental": - boost_patches += boost_1_44_0-gthreads.patch - -+boost_patches += boost_1_44_0-gcc4.8.patch -+ - $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) - - $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) -diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch -new file mode 100644 -index 0000000..9fc603e ---- a/dev/null -+++ b/boost/boost_1_44_0-gcc4.8.patch -@@ -0,0 +1,24 @@ -+--- misc/boost_1_44_0/boost/bind/arg.hpp -++++ misc/build/boost_1_44_0/boost/bind/arg.hpp -+@@ -35,6 +35,8 @@ -+ { -+ // static assert I == is_placeholder<T>::value -+ typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ]; -++ T_must_be_placeholder dummy; (void) dummy; -++ // silence -Werror=unused-local-typedefs (GCC 4.8) -+ } -+ }; -+ -+--- misc/boost_1_44_0/boost/concept/detail/general.hpp -++++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp -+@@ -68,7 +68,9 @@ -+ # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \ -+ typedef ::boost::concepts::detail::instantiate< \ -+ &::boost::concepts::requirement_<ModelFnPtr>::failed> \ -+- BOOST_PP_CAT(boost_concept_check,__LINE__) -++ BOOST_PP_CAT(boost_concept_check,__LINE__); \ -++ BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)() -++ // silence -Werror=unused-local-typedefs (GCC 4.8) -+ -+ }} -+ --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_2.diff b/extra/libreoffice/gcc48_2.diff deleted file mode 100644 index 559adddfa..000000000 --- a/extra/libreoffice/gcc48_2.diff +++ /dev/null @@ -1,45 +0,0 @@ -From c6cfd44717643b0630b5f8fd3262c243fdaaf239 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 09:54:45 +0000 -Subject: Work around GCC 4.8 -Werror=format= in python3 - -...complainging that "‘PyArg_ParseTuple’ is an unrecognized format function -type." - -Change-Id: I125af6669010c4c9c1a18cc7c1a4895acc89338b ---- -diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk -index d8c0862..87adff0 100644 ---- a/python3/UnpackedTarball_python3.mk -+++ b/python3/UnpackedTarball_python3.mk -@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ - python3/python-3.3.0-ssl.patch.1 \ - python3/python-3.3.0-implicit-int.patch.1 \ - python3/python-3.3.0-ffi-clang.patch.1 \ -+ python3/python-3.3.0-gcc-4.8.patch.1 \ - )) - - ifneq ($(OS),WNT) -diff --git a/python3/python-3.3.0-gcc-4.8.patch.1 b/python3/python-3.3.0-gcc-4.8.patch.1 -new file mode 100644 -index 0000000..8fb7107 ---- a/dev/null -+++ b/python3/python-3.3.0-gcc-4.8.patch.1 -@@ -0,0 +1,15 @@ -+--- Python-3.3.0/Include/modsupport.h 2012-09-29 10:00:26.000000000 +0200 -++++ Python-3.3.0/Include/modsupport.h 2013-03-08 10:46:28.671938738 +0100 -+@@ -26,7 +26,11 @@ -+ /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */ -+ #if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 -+ PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); -+-PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3); -++PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) -++#ifdef PY_SSIZE_T_CLEAN -++ Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3) -++#endif -++ ; -+ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, -+ const char *, char **, ...); -+ PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_3.diff b/extra/libreoffice/gcc48_3.diff deleted file mode 100644 index 395fe7928..000000000 --- a/extra/libreoffice/gcc48_3.diff +++ /dev/null @@ -1,46 +0,0 @@ -From 52c5eb20fd96d63e17cb9cd18912030131bcc787 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 09:59:05 +0000 -Subject: -Werror=unused-local-typedefs (GCC 4.8) - -Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db ---- -diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx -index f8267c6..810470e 100644 ---- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx -+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx -@@ -608,7 +608,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( - putenv(strdup(osJavaHome.getStr())); - #endif - -- typedef jint JNICALL JNI_InitArgs_Type(void *); - typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *); - rtl::OUString sSymbolCreateJava( - RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM")); -diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx -index 8c4f129..2694218 100644 ---- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx -+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx -@@ -201,8 +201,6 @@ void ClientBox::DeleteRemoved() - - if ( ! m_vRemovedEntries.empty() ) - { -- typedef std::vector< TClientBoxEntry >::iterator ITER; -- - m_vRemovedEntries.clear(); - } - -diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -index cd7df65..1eb94c9 100644 ---- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -@@ -225,7 +225,6 @@ void MasterPageObserver::Implementation::AddEventListener ( - - // Tell the new listener about all the master pages that are - // currently in use. -- typedef ::std::vector<String> StringList; - MasterPageContainer::iterator aDocumentIterator; - for (aDocumentIterator=maUsedMasterPages.begin(); - aDocumentIterator!=maUsedMasterPages.end(); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_4.diff b/extra/libreoffice/gcc48_4.diff deleted file mode 100644 index 4dd92c7aa..000000000 --- a/extra/libreoffice/gcc48_4.diff +++ /dev/null @@ -1,223 +0,0 @@ -From 72c62e0e83598862e1c6e00e4264d7720aa94e41 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 10:45:35 +0000 -Subject: -Werror=unused-local-typedefs (GCC 4.8) - -Change-Id: I873813e30e44712d6793bad91938eb847b55a7bb ---- -diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch -index 9fc603e..2d2beeb 100644 ---- a/boost/boost_1_44_0-gcc4.8.patch -+++ b/boost/boost_1_44_0-gcc4.8.patch -@@ -1,3 +1,45 @@ -+--- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp -++++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp -+@@ -142,7 +142,6 @@ -+ ForwardIteratorT End, -+ std::forward_iterator_tag ) const -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ first_finder_type first_finder( -+@@ -263,7 +262,6 @@ -+ ForwardIteratorT End, -+ unsigned int N) const -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ // Sanity check -+@@ -298,7 +296,6 @@ -+ ForwardIteratorT End, -+ unsigned int N) const -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ // Sanity check -+@@ -362,7 +359,6 @@ -+ unsigned int N, -+ std::random_access_iterator_tag ) -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) ) -+@@ -436,7 +432,6 @@ -+ unsigned int N, -+ std::random_access_iterator_tag ) -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) ) - --- misc/boost_1_44_0/boost/bind/arg.hpp - +++ misc/build/boost_1_44_0/boost/bind/arg.hpp - @@ -35,6 +35,8 @@ -@@ -22,3 +64,163 @@ - - }} - -+--- misc/boost_1_44_0/boost/date_time/date_parsing.hpp -++++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp -+@@ -113,7 +113,6 @@ -+ spec_str = "mdy"; -+ } -+ -+- typedef typename date_type::year_type year_type; -+ typedef typename date_type::month_type month_type; -+ unsigned pos = 0; -+ unsigned short year(0), month(0), day(0); -+@@ -159,7 +158,7 @@ -+ parse_undelimited_date(const std::string& s) { -+ int offsets[] = {4,2,2}; -+ int pos = 0; -+- typedef typename date_type::year_type year_type; -++ //typedef typename date_type::year_type year_type; -+ //typename date_type::ymd_type ymd((year_type::min)(),1,1); -+ unsigned short y = 0, m = 0, d = 0; -+ -+--- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp -++++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp -+@@ -36,7 +36,6 @@ -+ boost::io::ios_flags_saver iflags(os); -+ typedef local_date_time time_type;//::utc_time_type typename -+ typedef date_time::time_facet<time_type, CharT> custom_time_facet; -+- typedef std::time_put<CharT> std_time_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ -+ if(std::has_facet<custom_time_facet>(os.getloc())) { -+@@ -123,7 +122,6 @@ -+ const boost::local_time::local_time_period& p) { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet; -+- typedef std::time_put<CharT> std_time_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_facet>(os.getloc())) { -+ std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p); -+--- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp -++++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp -+@@ -47,7 +47,6 @@ -+ const ptime& p) { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -+- typedef std::time_put<CharT> std_ptime_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_ptime_facet>(os.getloc())) -+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); -+@@ -114,7 +113,6 @@ -+ const boost::posix_time::time_period& p) { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -+- typedef std::time_put<CharT> std_time_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_ptime_facet>(os.getloc())) { -+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); -+@@ -180,7 +178,6 @@ -+ { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -+- typedef std::time_put<CharT> std_ptime_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_ptime_facet>(os.getloc())) -+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td); -+--- misc/boost_1_44_0/boost/date_time/string_convert.hpp -++++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp -+@@ -21,7 +21,6 @@ -+ inline -+ std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str) -+ { -+- typedef std::basic_string<InputT> input_type; -+ typedef std::basic_string<OutputT> output_type; -+ output_type result; -+ result.insert(result.begin(), inp_str.begin(), inp_str.end()); -+--- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp -++++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp -+@@ -35,7 +35,6 @@ -+ { -+ typedef std::basic_string<charT> string_type; -+ typedef std::vector<string_type> collection_type; -+- typedef std::basic_ostringstream<charT> ostream_type; -+ typedef std::ostreambuf_iterator<charT> ostream_iter_type; -+ typedef std::basic_ostringstream<charT> stringstream_type; -+ typedef std::time_put<charT> time_put_facet_type; -+@@ -85,7 +84,6 @@ -+ { -+ typedef std::basic_string<charT> string_type; -+ typedef std::vector<string_type> collection_type; -+- typedef std::basic_ostringstream<charT> ostream_type; -+ typedef std::ostreambuf_iterator<charT> ostream_iter_type; -+ typedef std::basic_ostringstream<charT> stringstream_type; -+ typedef std::time_put<charT> time_put_facet_type; -+--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp -++++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp -+@@ -39,8 +39,6 @@ -+ -+ template <typename Array, typename IdxGen, typename Call_Type> -+ static void call(Array& a, const IdxGen& idgen, Call_Type c) { -+- typedef typename Array::index_range index_range_; -+- typedef typename Array::index index_; -+ idgen_helper<N-1>::call(a,idgen[c],c); -+ } -+ }; -+@@ -50,8 +48,6 @@ -+ -+ template <typename Array, typename IdxGen, typename Call_Type> -+ static void call(Array& a, const IdxGen& idgen, Call_Type) { -+- typedef typename Array::index_range index_range_; -+- typedef typename Array::index index_; -+ a[ idgen ]; -+ } -+ }; -+--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp -+@@ -307,7 +307,6 @@ -+ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) -+ typedef impl::grammar_helper_base<GrammarT> helper_base_t; -+ typedef grammar_helper_list<GrammarT> helper_list_t; -+- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; -+ -+ helper_list_t& helpers = -+ # if !defined(__GNUC__) || (__GNUC__ > 2) -+@@ -318,6 +317,7 @@ -+ -+ # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \ -+ || defined(BOOST_INTEL_CXX_VERSION) -++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; -+ for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) -+ (*i)->undefine(self); -+ # else -+--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp -+@@ -47,7 +47,6 @@ -+ typename parser_result<self_t, ScannerT>::type -+ parse(ScannerT const& scan) const -+ { -+- typedef typename parser_result<self_t, ScannerT>::type result_t; -+ typedef typename ScannerT::value_t value_t; -+ typedef typename ScannerT::iterator_t iterator_t; -+ -+--- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp -+@@ -140,7 +140,6 @@ -+ parse(ScannerT const& scan) const -+ { -+ typedef typename parser_result<ParserT, ScannerT>::type result_t; -+- typedef typename ScannerT::iterator_t iterator_t; -+ -+ result_t hit = this->subject().parse(scan); -+ if (!hit) -+--- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp -+@@ -49,8 +49,6 @@ -+ typename parser_result<self_t, ScannerT>::type -+ parse(ScannerT const& scan) const -+ { -+- typedef typename parser_result<self_t, ScannerT>::type result_t; -+- typedef typename ScannerT::value_t value_t; -+ typedef typename ScannerT::iterator_t iterator_t; -+ -+ iterator_t const s(scan.first); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_5.diff b/extra/libreoffice/gcc48_5.diff deleted file mode 100644 index f63571039..000000000 --- a/extra/libreoffice/gcc48_5.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 157ce65588ec8ef4ff8f805f7b8a64fefdd9edec Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 11:07:11 +0000 -Subject: Work around GCC 4.8 -Werror=virtual-move-assign - -...complaining that "defaulted move assignment for ‘cppcanvas::SpriteCanvas’ -calls a non-trivial move assignment operator for virtual base -‘cppcanvas::BitmapCanvas’." - -Change-Id: I4dc92176dbec62f0ae4fa7d2842073077ecb8fc3 ---- -diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/cppcanvas/inc/cppcanvas/spritecanvas.hxx -index 59aa3da..6a606b3 100644 ---- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx -+++ b/cppcanvas/inc/cppcanvas/spritecanvas.hxx -@@ -24,6 +24,7 @@ - #include <osl/diagnose.h> - #include <basegfx/vector/b2dsize.hxx> - -+#include <boost/noncopyable.hpp> - #include <boost/shared_ptr.hpp> - - -@@ -48,7 +49,7 @@ namespace cppcanvas - - /** SpriteCanvas interface - */ -- class SpriteCanvas : public virtual BitmapCanvas -+ class SpriteCanvas : public virtual BitmapCanvas, private boost::noncopyable - { - public: - virtual bool updateScreen( bool bUpdateAll ) const = 0; --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/remove_unused_vars.diff b/extra/libreoffice/remove_unused_vars.diff deleted file mode 100644 index 7970b913c..000000000 --- a/extra/libreoffice/remove_unused_vars.diff +++ /dev/null @@ -1,26 +0,0 @@ -From 305bf19e390aebdf2d20ea052a92f782e8d1185c Mon Sep 17 00:00:00 2001 -From: Thomas Arnhold <thomas@arnhold.org> -Date: Sun, 24 Feb 2013 17:39:08 +0000 -Subject: loplugin: unused variables - -And some fallout. - -Change-Id: I8dfc12f3566e72d79d4f9930284c92577aa485a1 ---- -(limited to 'sd/source/ui/toolpanel/controls/MasterPageObserver.cxx') - -diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -index 1d27c9d..cd7df65 100644 ---- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -@@ -226,8 +226,6 @@ void MasterPageObserver::Implementation::AddEventListener ( - // Tell the new listener about all the master pages that are - // currently in use. - typedef ::std::vector<String> StringList; -- StringList aNewMasterPages; -- StringList aRemovedMasterPages; - MasterPageContainer::iterator aDocumentIterator; - for (aDocumentIterator=maUsedMasterPages.begin(); - aDocumentIterator!=maUsedMasterPages.end(); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 86a7df1e0..d0b9a8f08 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183436 2013-04-21 22:11:30Z heftig $ +# $Id: PKGBUILD 184408 2013-05-06 19:38:35Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg pkgver=2.37.0 -pkgrel=1 +pkgrel=2 pkgdesc="A SVG viewing library" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD index 7781d7219..5542ce890 100644 --- a/extra/libva/PKGBUILD +++ b/extra/libva/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libva pkgver=1.1.1 pkgrel=1 pkgdesc="Video Acceleration (VA) API for Linux" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://freedesktop.org/wiki/Software/vaapi" license=('MIT') depends=('libegl' 'libgl' 'libdrm' 'libxfixes') diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD index 6b4cbf122..4f2c6fd5d 100644 --- a/extra/libvpx/PKGBUILD +++ b/extra/libvpx/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 158895 2012-05-12 18:37:10Z ibiru $ +# $Id: PKGBUILD 185107 2013-05-11 07:24:48Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libvpx -pkgver=1.1.0 -pkgrel=1.1 +pkgver=1.2.0 +pkgrel=1 pkgdesc="The VP8 Codec SDK" arch=('i686' 'x86_64' 'mips64el') url="http://www.webmproject.org/" license=('BSD') depends=('glibc') -makedepends=('yasm') -source=(http://webm.googlecode.com/files/$pkgname-v$pkgver.tar.bz2 +[ "$CARCH" != "mips64el" ] && makedepends=('yasm') +source=(ftp://ftp.archlinux.org/other/libvpx/libvpx-$pkgver.tar.xz{,.sig} mips64el.patch) -sha1sums=('356af5f770c50cd021c60863203d8f30164f6021' - '4fd775826a4d737102f831c451235a58947f2cde') +sha1sums=('75cd953cf2db694412569272803fbdc73f2b599f' + 'SKIP' + '78ea367dc417f64ad3ce8e33fda210e56a083f4b') build() { - cd "$srcdir/$pkgname-v$pkgver" + cd "$pkgname-$pkgver" if [ "$CARCH" = "mips64el" ]; then extra="--target=mips64el-linux-gcc" @@ -33,7 +34,7 @@ build() { } package() { - cd "$pkgname-v$pkgver" + cd "$pkgname-$pkgver" make DIST_DIR="$pkgdir/usr" install install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/libvpx/mips64el.patch b/extra/libvpx/mips64el.patch index a0e84d5c2..075ee8119 100644 --- a/extra/libvpx/mips64el.patch +++ b/extra/libvpx/mips64el.patch @@ -1,26 +1,25 @@ -diff -uNar libvpx-v0.9.6.orig//build/make/configure.sh libvpx-v0.9.6/build/make/configure.sh ---- libvpx-v0.9.6.orig//build/make/configure.sh 2011-03-04 17:40:37.000000000 -0300 -+++ libvpx-v0.9.6/build/make/configure.sh 2011-03-27 12:31:49.263260789 -0300 -@@ -805,6 +805,15 @@ +diff -ru libvpx-1.2.0.orig/build/make/configure.sh libvpx-1.2.0/build/make/configure.sh +--- libvpx-1.2.0.orig/build/make/configure.sh 2013-05-12 15:15:57.130701452 +0200 ++++ libvpx-1.2.0/build/make/configure.sh 2013-05-12 15:17:30.904572335 +0200 +@@ -952,6 +952,14 @@ esac ;; + mips64*) -+ CROSS="" + link_with_cc=gcc + setup_gnu_toolchain + tune_cflags="-mtune=" + check_add_cflags -march=${tgt_isa} -+ check_add_asflags -march=${tgt_isa} -+ check_add_asflags -KPIC ++ check_add_asflags -march=${tgt_isa} ++ check_add_asflags -KPIC + ;; mips*) - CROSS=${CROSS:-mipsel-linux-uclibc-} link_with_cc=gcc -diff -uNar libvpx-v0.9.6.orig//configure libvpx-v0.9.6/configure ---- libvpx-v0.9.6.orig//configure 2011-03-04 17:40:37.000000000 -0300 -+++ libvpx-v0.9.6/configure 2011-03-27 12:31:05.571213054 -0300 -@@ -94,6 +94,7 @@ + setup_gnu_toolchain +diff -ru libvpx-1.2.0.orig/configure libvpx-1.2.0/configure +--- libvpx-1.2.0.orig/configure 2013-05-12 15:15:57.259672776 +0200 ++++ libvpx-1.2.0/configure 2013-05-12 15:17:56.198583024 +0200 +@@ -98,6 +98,7 @@ all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 all_platforms="${all_platforms} mips32-linux-gcc" @@ -28,11 +27,11 @@ diff -uNar libvpx-v0.9.6.orig//configure libvpx-v0.9.6/configure all_platforms="${all_platforms} ppc32-darwin8-gcc" all_platforms="${all_platforms} ppc32-darwin9-gcc" all_platforms="${all_platforms} ppc32-linux-gcc" -@@ -194,6 +195,7 @@ - iwmmxt2 +@@ -210,6 +211,7 @@ + neon mips32 + mips64 + dspr2 mmx - sse diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD index dfb345317..ae57ce964 100644 --- a/extra/libwebp/PKGBUILD +++ b/extra/libwebp/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 181251 2013-04-02 15:58:04Z heftig $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# $Id: PKGBUILD 184409 2013-05-06 19:38:39Z foutrelis $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=libwebp pkgver=0.3.0 -pkgrel=1 +pkgrel=3 pkgdesc="WebP library and conversion tools" arch=('x86_64' 'i686' 'mips64el') url="https://developers.google.com/speed/webp/" -license=('BSD') -depends=('libpng' 'libjpeg') +license=(BSD) +depends=(libpng libjpeg libtiff giflib) options=('!libtool') source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz") sha256sums=('8903fca40ece603b9cb20d32105168da7e2a33bebbd4d89001a3c8741ef03ddb') @@ -17,7 +18,13 @@ sha256sums=('8903fca40ece603b9cb20d32105168da7e2a33bebbd4d89001a3c8741ef03ddb') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --enable-swap-16bit-csp \ + --enable-experimental \ + --enable-libwebpmux \ + --enable-libwebpdemux \ + --enable-libwebpdecoder \ + --disable-static make } diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD index e191aa27f..59f1f85ba 100644 --- a/extra/libwmf/PKGBUILD +++ b/extra/libwmf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148846 2012-02-05 11:52:43Z ibiru $ +# $Id: PKGBUILD 184410 2013-05-06 19:38:42Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libwmf pkgver=0.2.8.4 -pkgrel=9.2 +pkgrel=10 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)" arch=('i686' 'x86_64' 'mips64el') url="http://wvware.sourceforge.net/libwmf.html" @@ -19,19 +19,23 @@ sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' '42aa4c2a82e4e14044c875a7f439baea732a355a' 'ea6d28880840e86c96f9079bfd591da54dcffa5c') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch" patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --with-gsfontdir=/usr/share/fonts/Type1 \ --with-fontdir=/usr/share/fonts/Type1 \ - --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS + --with-gsfontmap=/usr/share/ghostscript/9.07/Resource/Init/Fontmap.GS make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install #Remove fonts, these are in gsfonts rm -rf "${pkgdir}/usr/share/fonts" diff --git a/extra/libwmf/libwmf.install b/extra/libwmf/libwmf.install index 9c99a901b..e5b846fc7 100644 --- a/extra/libwmf/libwmf.install +++ b/extra/libwmf/libwmf.install @@ -1,5 +1,6 @@ post_install() { if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then + install -d etc/gtk-2.0 gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders fi } diff --git a/extra/libwpg/PKGBUILD b/extra/libwpg/PKGBUILD index 3f9194bbf..346ac50db 100644 --- a/extra/libwpg/PKGBUILD +++ b/extra/libwpg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150603 2012-02-18 22:38:56Z pierre $ +# $Id: PKGBUILD 185181 2013-05-11 20:24:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libwpg -pkgver=0.2.1 -pkgrel=1.2 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Library for importing and converting Corel WordPerfect(tm) Graphics images." arch=('i686' 'x86_64' 'mips64el') url="http://libwpg.sourceforge.net/" @@ -11,7 +11,7 @@ license=('LGPL') depends=('libwpd' 'perl') options=('!libtool') source=("http://downloads.sourceforge.net/libwpg/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9d283e02441d8cebdcd1e5d9df227d67') +md5sums=('b85436266b2ac91d351ab5684b181151') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD index b8a6dee86..c4144f1ab 100644 --- a/extra/libxfce4util/PKGBUILD +++ b/extra/libxfce4util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184282 2013-05-05 17:43:38Z foutrelis $ +# $Id: PKGBUILD 185207 2013-05-12 07:25:42Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=libxfce4util pkgver=4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Basic utility non-GUI functions for Xfce" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -21,6 +21,7 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --libexecdir=/usr/lib \ --localstatedir=/var \ --disable-static \ diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD index 935be7f2b..e288114dc 100644 --- a/extra/libxml2/PKGBUILD +++ b/extra/libxml2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165211 2012-08-13 09:09:13Z jgc $ +# $Id: PKGBUILD 185108 2013-05-11 07:24:50Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxml2 -pkgver=2.8.0 -pkgrel=1.1 +pkgver=2.9.1 +pkgrel=1 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64 'mips64el') license=('custom') @@ -13,9 +13,9 @@ makedepends=('python2') options=('!libtool') url="http://www.xmlsoft.org/" source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz - http://www.w3.org/XML/Test/xmlts20080205.tar.gz) -md5sums=('c62106f02ee00b6437f0fb9d370c1093' - 'b255be9a1c7f7021e52448e4ec8d7a0d') + http://www.w3.org/XML/Test/xmlts20080827.tar.gz) +md5sums=('9c0cfef285d5c4a5c80d00904ddab380' + 'ae3d1ebe000a3972afa104ca7f0e1b4a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD index e2795a53a..b441e2306 100644 --- a/extra/libxslt/PKGBUILD +++ b/extra/libxslt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149384 2012-02-07 12:34:45Z jgc $ +# $Id: PKGBUILD 184790 2013-05-08 14:12:44Z bpiotrowski $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxslt -pkgver=1.1.26 -pkgrel=3.2 +pkgver=1.1.28 +pkgrel=1 pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64' 'mips64el') url="http://xmlsoft.org/XSLT/" @@ -13,14 +13,11 @@ depends=('libxml2' 'libgcrypt') makedepends=('python2') checkdepends=('docbook-xml') options=('!libtool') -source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz - CVE-2011-1202.patch) -md5sums=('e61d0364a30146aaa3001296f853b2b9' - 'ce9744943575efaa6b5501668899b753') +source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz) +md5sums=('9667bf6f9310b957254fdcf6596600b7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/CVE-2011-1202.patch" sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py ./configure --prefix=/usr --with-python=/usr/bin/python2 make diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index acfdcb4cb..24ca572a3 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180683 2013-03-25 19:15:34Z bpiotrowski $ +# $Id: PKGBUILD 185242 2013-05-12 10:58:13Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.32 -pkgrel=4 +pkgrel=5 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64' 'mips64el') @@ -21,16 +21,17 @@ source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver} "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc" 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1' - '5456a90967df6774386010baa3fa67dba1c80c3b7058c70c80931d8dea5093e7' + 'SKIP' '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe' 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa' 'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871' - '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696') + '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --libdir=/usr/lib/lighttpd/ \ --sysconfdir=/etc/lighttpd \ --with-mysql \ diff --git a/extra/lighttpd/lighttpd.service b/extra/lighttpd/lighttpd.service index b80db7695..568948dda 100644 --- a/extra/lighttpd/lighttpd.service +++ b/extra/lighttpd/lighttpd.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] PrivateTmp=true -ExecStart=/usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf +ExecStart=/usr/bin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGINT diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 23ba10d9f..06f0fe0a9 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181375 2013-04-04 00:53:02Z eric $ +# $Id: PKGBUILD 185203 2013-05-12 06:52:48Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors pkgver=3.3.3 -pkgrel=2 +pkgrel=3 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64' 'mips64el') url="http://www.lm-sensors.org/" @@ -17,31 +17,35 @@ source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz healthd healthd.conf fancontrol.service sensord.service healthd.service \ linux_3.0.patch lm_sensors-fancontrol.patch) sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' - '035a721f20e4ad568f4fdde2d7c25d906c192458' - 'afaad558d2ad4732aa53b69afa23ccf37bc67ab1' + 'SKIP' + '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' - '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c' - 'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51' - 'a7a20eb3c799d70287e6c7968a7ab42165925293' + '73cd658f4a418197dc75f65d6d309701c72cfd81' + 'cea1ff07374a784cc4be1d28dc6c80641fcae99d' + 'd72ec328e9303acef86342483b6f8537de6117d9' '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c' 'd3e419b4019451fb039ae3d3b8e0ec55121b9f17') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service} sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service patch -p0 -i "${srcdir}/linux_3.0.patch" patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch" +} + +build() { + cd ${pkgname}-${pkgver} make PREFIX=/usr } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \ - PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install + PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service" - install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" + install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd" install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf" install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service" install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service" diff --git a/extra/lm_sensors/fancontrol.service b/extra/lm_sensors/fancontrol.service index c86b498f8..813dbd60d 100644 --- a/extra/lm_sensors/fancontrol.service +++ b/extra/lm_sensors/fancontrol.service @@ -3,7 +3,7 @@ Description=Fan control daemon [Service] PIDFile=/var/run/fancontrol.pid -ExecStart=/usr/sbin/fancontrol +ExecStart=/usr/bin/fancontrol [Install] WantedBy=multi-user.target diff --git a/extra/lm_sensors/healthd b/extra/lm_sensors/healthd index 5ffed5681..b1e2fd699 100644 --- a/extra/lm_sensors/healthd +++ b/extra/lm_sensors/healthd @@ -1,7 +1,7 @@ #!/bin/bash # -# /usr/sbin/healthd +# /usr/bin/healthd # . /etc/healthd.conf diff --git a/extra/lm_sensors/healthd.service b/extra/lm_sensors/healthd.service index 59d3270b0..1933192d3 100644 --- a/extra/lm_sensors/healthd.service +++ b/extra/lm_sensors/healthd.service @@ -3,7 +3,7 @@ Description=A daemon which can be used to alert you in the event of a hardware h [Service] Type=forking -ExecStart=/usr/sbin/healthd +ExecStart=/usr/bin/healthd [Install] WantedBy=multi-user.target diff --git a/extra/lm_sensors/sensord.service b/extra/lm_sensors/sensord.service index 6d272f1ef..1d62ab9e8 100644 --- a/extra/lm_sensors/sensord.service +++ b/extra/lm_sensors/sensord.service @@ -3,7 +3,7 @@ Description=Sensor information logging daemon [Service] PIDFile=/var/run/sensord.pid -ExecStart=/usr/sbin/sensord +ExecStart=/usr/bin/sensord [Install] WantedBy=multi-user.target diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index a1be32613..b997e25b3 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181126 2013-03-31 19:16:54Z stephane $ +# $Id: PKGBUILD 185005 2013-05-09 20:48:29Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx -pkgver=2.0.5.1 -pkgrel=3 +pkgver=2.0.6 +pkgrel=1 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" arch=('i686' 'x86_64' 'mips64el') url="http://www.lyx.org" @@ -18,7 +18,7 @@ install=lyx.install options=('emptydirs') source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz lyx.desktop lyxrc.dist) -sha1sums=('a822e99484c1652c4df5df717819dd7048fcff75' +sha1sums=('d73ba7a5e796acdf32282207be0b29d66411c5f8' 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad' '56416642cc3da2a13b87b84e6b87c1a239f3d09a') diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index cbbdfa233..007735319 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178301 2013-02-19 19:05:06Z ronald $ +# $Id: PKGBUILD 185029 2013-05-10 12:32:47Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima -pkgver=5.29.1 +pkgver=5.30.0 pkgrel=1 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.1.4' 'texinfo' 'sh') + depends=('sbcl=1.1.7' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') @@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/ options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -sha1sums=('9be04303d6a5472bc95576b7de7286fa4b8ff604' +sha1sums=('ae009d71524f55264b346b03dac8e504e3b18ac0' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { @@ -37,6 +37,9 @@ build() { fi ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \ --libexecdir=/usr/lib $lisp + + # help avoid (re)running makeinfo/tex + touch doc/info/maxima.info make } diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index d929a0d5c..451b72649 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,25 +1,20 @@ -# $Id: PKGBUILD 166159 2012-09-04 23:45:23Z dan $ +# $Id: PKGBUILD 185263 2013-05-12 16:29:01Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached pkgver=1.4.15 -pkgrel=1 +pkgrel=2 pkgdesc="A distributed memory object caching system" arch=(i686 x86_64 'mips64el') url="http://memcached.org/" license=('GPL') depends=('libevent') optdepends=('perl: for memcached-tool usage') -backup=('etc/conf.d/memcached') install=memcached.install source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz - memcached.conf - memcached.sh memcached.service) sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4' - '17f66873b77e96c6706dcf13ab0aa8ddff94b2851366c787fc23e614dfc11f47' - '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb' '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6') build() { @@ -32,7 +27,5 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool - install -D -m 644 ../memcached.conf "$pkgdir"/etc/conf.d/memcached - install -D -m 755 ../memcached.sh "$pkgdir"/etc/rc.d/memcached install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service } diff --git a/extra/memcached/memcached.sh b/extra/memcached/memcached.sh deleted file mode 100644 index 9c9727507..000000000 --- a/extra/memcached/memcached.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/memcached - -PIDFILE='/var/run/memcached.pid' - -getpid() { - local pid - pid=$(cat $PIDFILE 2>/dev/null) - # if the process is no longer valid, don't return it - if [ -n "$pid" ]; then - if ! ps -p $pid >/dev/null; then - rm -f $PIDFILE - pid="" - fi - fi - echo $pid -} - -PID="$(getpid)" - -case "$1" in - start) - stat_busy "Starting memcached" - # memcached is retarded and doesn't write to the pidfile - # before it drops permissions - if [ -n "$PID" ]; then - stat_fail - elif [ -z "$MEMCACHED_USER" ]; then - echo "MEMCACHED_USER must be defined in /etc/conf.d/memcached" - stat_fail - else - touch $PIDFILE && chown $MEMCACHED_USER $PIDFILE - /usr/bin/memcached -d -P $PIDFILE -u $MEMCACHED_USER $MEMCACHED_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon memcached - stat_done - fi - fi - ;; - stop) - stat_busy "Stopping memcached" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f $PIDFILE - rm_daemon memcached - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD index 2aa2477d9..f2a4f89ac 100644 --- a/extra/mjpegtools/PKGBUILD +++ b/extra/mjpegtools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148854 2012-02-05 11:52:58Z ibiru $ +# $Id: PKGBUILD 184411 2013-05-06 19:38:45Z foutrelis $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Maintainer: Roberto Carvajal <roberto@archlinux.org> pkgname=mjpegtools pkgver=2.0.0 -pkgrel=2.2 +pkgrel=3 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -15,20 +15,27 @@ optdepends=('gtk2: glav GUI') options=('!makeflags' '!libtool') install=mjpegtools.install source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz - mjpegtools-v4l-2.6.38.patch) + mjpegtools-v4l-2.6.38.patch + mjpegtools-2.0.0-gcc470.patch) md5sums=('903e1e3b967eebcc5fe5626d7517dc46' - '44006d6f844017fe57aa123aa43f4508') + '44006d6f844017fe57aa123aa43f4508' + '7c9b3d4a1f3a10e3263a6a110b0f55cc') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch" + patch -Np1 -i "${srcdir}/mjpegtools-2.0.0-gcc470.patch" sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --enable-largefile CXXFLAGS="$CXXFLAGS -fpermissive" make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/" } diff --git a/extra/mjpegtools/mjpegtools-2.0.0-gcc470.patch b/extra/mjpegtools/mjpegtools-2.0.0-gcc470.patch new file mode 100644 index 000000000..050b33feb --- /dev/null +++ b/extra/mjpegtools/mjpegtools-2.0.0-gcc470.patch @@ -0,0 +1,11 @@ +--- a/y4mdenoise/MotionSearcher.hh ++++ b/y4mdenoise/MotionSearcher.hh +@@ -2196,7 +2196,7 @@ + { + // This region is too small to be bothered with. + // Just get rid of it. +- DeleteRegion (a_pRegion); ++ this->DeleteRegion (a_pRegion); + } + else + { diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index de3dcfc85..4830eb61f 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168399 2012-10-10 22:19:40Z tomegun $ +# $Id: PKGBUILD 184799 2013-05-08 17:55:32Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=mono -pkgver=2.10.8 -pkgrel=2 +pkgver=2.10.9 +pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11') @@ -14,39 +14,39 @@ makedepends=('pkgconfig') options=('!libtool' '!makeflags') provides=('monodoc') conflicts=('monodoc') -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mono.binfmt.d) +md5sums=('bbbff9d3d0c36b904437ada36a27eb9e' + 'b9ef8a65fea497acf176cca16c1e2402') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} # build mono ./configure --prefix=/usr --sysconfdir=/etc \ --with-libgdiplus=installed - make || return 1 + make # build jay - cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay - make || return 1 + cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install # install jay - cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay - make DESTDIR=${pkgdir} prefix=/usr INSTALL=../../install-sh install - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay + make DESTDIR="${pkgdir}" prefix=/usr INSTALL=../../install-sh install + cd "${srcdir}"/${pkgname}-${pkgver} # install binfmt conf file and pathes - install -D -m644 ${srcdir}/mono.binfmt.d ${pkgdir}/usr/lib/binfmt.d/mono.conf + install -D -m644 "${srcdir}"/mono.binfmt.d "${pkgdir}"/usr/lib/binfmt.d/mono.conf #install license - mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 mcs/MIT.X11 ${pkgdir}/usr/share/licenses/${pkgname}/ + mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 mcs/MIT.X11 "${pkgdir}"/usr/share/licenses/${pkgname}/ #fix .pc file to be able to request mono on what it depends, fixes #go-oo build - sed -i -e "s:#Requires:Requires:" ${pkgdir}/usr/lib/pkgconfig/mono.pc + sed -i -e "s:#Requires:Requires:" "${pkgdir}"/usr/lib/pkgconfig/mono.pc } -md5sums=('411a2d9bcfc37a61eb9aedba88b40533' - 'b9ef8a65fea497acf176cca16c1e2402') diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index a0390f9d4..8df27fa48 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183544 2013-04-22 22:24:46Z eric $ +# $Id: PKGBUILD 185211 2013-05-12 07:33:11Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') pkgver=1.4.31 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://msmtp.sourceforge.net" @@ -46,7 +46,8 @@ package_msmtp-mta() { pkgdesc="A mini smtp client - the regular MTA" depends=('msmtp') provides=('smtp-forwarder') + conflicts=('smtp-forwarder') - install -d "${pkgdir}/usr/sbin" - ln -s /usr/bin/msmtp "${pkgdir}/usr/sbin/sendmail" + install -d "${pkgdir}/usr/bin" + ln -s msmtp "${pkgdir}/usr/bin/sendmail" } diff --git a/extra/muparser/PKGBUILD b/extra/muparser/PKGBUILD index 8f80cc463..43d2aa26f 100644 --- a/extra/muparser/PKGBUILD +++ b/extra/muparser/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 143909 2011-11-30 20:28:47Z andrea $ +# $Id: PKGBUILD 184801 2013-05-08 19:46:08Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir.archlinux.org> pkgname=muparser -pkgver=1.34 -pkgrel=2 +pkgver=2.2.3 +pkgrel=1 pkgdesc="A fast math parser library" arch=('i686' 'x86_64' 'mips64el') url="http://muparser.sourceforge.net/" depends=('gcc-libs') license=('custom') options=('!makeflags') -source=("http://downloads.sourceforge.net/$pkgname/${pkgname}_v134.tar.gz") -md5sums=('0c4f4bf86aa2a5a737adc0e08cb77737') +source=("http://downloads.sourceforge.net/$pkgname/${pkgname}_v${pkgver//./_}.zip") +md5sums=('9de40ec1dab5bd2787ee344fce5846ad') build() { - cd $srcdir/${pkgname}_v134 + cd $srcdir/${pkgname}_v${pkgver//./_} ./configure --prefix=/usr make } package() { - cd $srcdir/${pkgname}_v134 + cd $srcdir/${pkgname}_v${pkgver//./_} make DESTDIR=$pkgdir install # license diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index e438ddc5f..a2e14c4dd 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181871 2013-04-05 08:54:13Z svenstaro $ +# $Id: PKGBUILD 184846 2013-05-09 09:42:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('e17ca2b7eb3b1745806be7576d6340777f4ce0d0') +sha1sums=('205cb87512c3d24f41295a534770779e41051a29') build() { mkdir build diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD index f87972eed..f70b3fae9 100644 --- a/extra/nepomuk-widgets/PKGBUILD +++ b/extra/nepomuk-widgets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181888 2013-04-05 08:54:32Z svenstaro $ +# $Id: PKGBUILD 184863 2013-05-09 09:42:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-widgets -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="The Library containing the Nepomuk Widgets" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('2aa9eaf4709acc1f9a2acf6c6bb4b42fc0840549') +sha1sums=('19a02e2ea861f69da51eef24ae951fef449c3bfb') build() { mkdir build diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD index 8eca87d59..3b8897594 100644 --- a/extra/netpbm/PKGBUILD +++ b/extra/netpbm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178515 2013-02-24 21:47:43Z eric $ +# $Id: PKGBUILD 184413 2013-05-06 19:38:51Z foutrelis $ # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=netpbm pkgver=10.61.02 -pkgrel=1 +pkgrel=2 pkgdesc="A toolkit for manipulation of graphic images" arch=('i686' 'x86_64' 'mips64el') license=('custom' 'BSD' 'GPL' 'LGPL') @@ -33,8 +33,9 @@ mksource() { rm -r advanced } -build() { +prepare() { cd "${srcdir}/advanced" + patch -p1 < ../netpbm-CAN-2005-2471.patch patch -p1 < ../netpbm-security-code.patch patch -p1 < ../netpbm-security-scripts.patch @@ -48,10 +49,14 @@ build() { echo 'JPEGLIB = libjpeg.so' >> config.mk echo 'PNGLIB = libpng.so' >> config.mk echo 'ZLIB = libz.so' >> config.mk - + sed -i 's|misc|share/netpbm|' common.mk sed -i 's|/link|/lib|' lib/Makefile sed -i 's|install.manweb install.man|install.man|' GNUmakefile +} + +build() { + cd "${srcdir}/advanced" make diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD index a2c8d0df7..9c0612f0f 100644 --- a/extra/neverball/PKGBUILD +++ b/extra/neverball/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183160 2013-04-18 02:16:47Z eric $ +# $Id: PKGBUILD 184414 2013-05-06 19:38:55Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=neverball pkgver=1.5.4 -pkgrel=5 +pkgrel=6 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness" arch=('i686' 'x86_64' 'mips64el') url="http://neverball.org/" @@ -12,13 +12,16 @@ depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs' \ 'hicolor-icon-theme' 'xdg-utils') makedepends=('mesa') install=neverball.install -source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch) +source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz \ + neverball-1.5.4-underlink.patch neverball-1.5.4-libpng.patch) sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7' - 'f71982b7187d569c57b30c4c40fedd6c0e72baca') + 'f71982b7187d569c57b30c4c40fedd6c0e72baca' + '02e68c17e851e85414ce5649b6b77273846bdb67') prepare() { cd ${pkgname}-${pkgver} patch -p0 -i ../neverball-1.5.4-underlink.patch + patch -p1 -i ../neverball-1.5.4-libpng.patch } build() { diff --git a/extra/neverball/neverball-1.5.4-libpng.patch b/extra/neverball/neverball-1.5.4-libpng.patch new file mode 100644 index 000000000..d7b224673 --- /dev/null +++ b/extra/neverball/neverball-1.5.4-libpng.patch @@ -0,0 +1,21 @@ +Index: neverball-1.5.4/share/base_image.c +=================================================================== +--- neverball-1.5.4.orig/share/base_image.c ++++ neverball-1.5.4/share/base_image.c +@@ -15,6 +15,7 @@ + #include <png.h> + #include <jpeglib.h> + #include <stdlib.h> ++#include <string.h> + #include <assert.h> + + #include "glext.h" +@@ -94,7 +95,7 @@ static void *image_load_png(const char * + default: longjmp(png_jmpbuf(readp), -1); + } + +- if (!(bytep = png_malloc(readp, h * png_sizeof(png_bytep)))) ++ if (!(bytep = png_malloc(readp, h * sizeof(png_bytep)))) + longjmp(png_jmpbuf(readp), -1); + + /* Allocate the final pixel buffer and read pixels there. */ diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 0dd9b420b..235d2716a 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 178844 2013-02-27 16:21:24Z jgc $ +# $Id: PKGBUILD 185090 2013-05-10 21:54:30Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss pkgver=3.14.3 -pkgrel=2 +pkgrel=3 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9.5 +_nsprver=4.9.6 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip') diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index cfd784f4f..edaaa9464 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 173322 2012-12-18 22:53:36Z bisson $ +# $Id: PKGBUILD 184344 2013-05-06 10:28:53Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=13.1 +pkgrel=14 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') arch=('i686' 'x86_64' 'mips64el') -depends=('openssl' 'libcap') -optdepends=('libedit: ntpdc, ntpq') -makedepends=('perl-html-parser' 'libedit') +makedepends=('perl-html-parser') +depends=('openssl' 'libcap' 'libedit') backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" 'ntpd' @@ -39,6 +38,7 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --enable-linuxcaps \ + --enable-ntp-signd \ make } diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index b618238ab..ab2c5fb44 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180978 2013-03-29 10:06:34Z andyrtr $ +# $Id: PKGBUILD 184415 2013-05-06 19:38:57Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers') pkgver=3.5.0.20 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://wiki.x2go.org/" license=('GPL') diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 65bf06372..4d760971d 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183293 2013-04-20 16:41:29Z heftig $ +# $Id: PKGBUILD 184416 2013-05-06 19:39:00Z foutrelis $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV pkgver=2.4.5 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index f42151c26..17a5926d3 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183549 2013-04-23 00:30:16Z eric $ +# $Id: PKGBUILD 184417 2013-05-06 19:39:02Z foutrelis $ # Maintainer: # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Andries Radu <admiral0@live.it> pkgname=opengtl pkgver=0.9.18 -pkgrel=1 +pkgrel=2 pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" arch=('i686' 'x86_64' 'mips64el') @@ -13,13 +13,18 @@ license=('GPL') depends=('gcc-libs' 'llvm') makedepends=('cmake' 'libpng') optdepends=('libpng: for using the png extension') -source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2) -sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8') +source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2 + opengtl-0.9.18-memcpy.patch) +sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8' + '357cc2e538bbaaffe7d58956959d8a7fbae09741d4a87488a5a8c51ec645d23a') -build() { - cd "$srcdir" +prepare() { mkdir build - cd build + patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-memcpy.patch" +} + +build() { + cd "$srcdir/build" cmake ../OpenGTL-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/opengtl/opengtl-0.9.18-memcpy.patch b/extra/opengtl/opengtl-0.9.18-memcpy.patch new file mode 100644 index 000000000..3e6ecd557 --- /dev/null +++ b/extra/opengtl/opengtl-0.9.18-memcpy.patch @@ -0,0 +1,11 @@ +diff -r 99a2017746c0 Extensions/PngDC/PngDC.cpp +--- a/Extensions/PngDC/PngDC.cpp Wed Jan 30 05:28:12 2013 +1100 ++++ b/Extensions/PngDC/PngDC.cpp Tue Apr 16 01:59:10 2013 +1000 +@@ -20,6 +20,7 @@ + #include "PngDC.h" + + #include <png.h> ++#include <string.h> + + #include <config-endian.h> + diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD index d32fc971e..6f98310af 100644 --- a/extra/openjpeg/PKGBUILD +++ b/extra/openjpeg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156266 2012-04-16 14:12:28Z jgc $ +# $Id: PKGBUILD 184788 2013-05-08 13:56:11Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=openjpeg -pkgver=1.5.0 -pkgrel=1.1 +pkgver=1.5.1 +pkgrel=1 pkgdesc="An open source JPEG 2000 codec" arch=(i686 x86_64 'mips64el') license=('BSD') @@ -11,12 +11,12 @@ url="http://www.openjpeg.org" depends=('zlib') options=('!libtool') source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz) -sha1sums=('dce705ae45f137e4698a8cf39d1fbf22bc434fa8') +sha1sums=('1b0b74d1af4c297fd82806a9325bb544caf9bb8b') build() { cd "${srcdir}/${pkgname}-${pkgver}" # make sure we use system libs - rm -rf thirtparty + rm -rf thirdparty ./configure --prefix=/usr \ --disable-static --disable-silent-rules make diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 41e704775..7fabe3a9c 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160561 2012-06-02 10:28:31Z bluewind $ +# $Id: PKGBUILD 184418 2013-05-06 19:39:04Z foutrelis $ # Maintainer: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-tk _cpanname=Tk pkgver=804.030 -pkgrel=3 +pkgrel=4 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 990b706f0..384229473 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182657 2013-04-12 07:45:16Z pierre $ +# $Id: PKGBUILD 184818 2013-05-09 07:44:41Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.14 +pkgver=5.4.15 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('cfdc044be2c582991a1fe0967898fa38' +md5sums=('145ea5e845e910443ff1eddb3dbcf56a' '44c1bb1df346b3b9d3e092c7df9a37d0' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 6f2722cf7..ae6e6d545 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182109 2013-04-07 09:14:17Z andyrtr $ +# $Id: PKGBUILD 185125 2013-05-11 09:39:44Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,11 +7,11 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.16 +_dcpkgver=2.2.1 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.3.4 +pkgver=0.4.0 pkgrel=1 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64' 'mips64el') @@ -19,15 +19,15 @@ url="http://pigeonhole.dovecot.org/" license=('LGPL') depends=('dovecot='$_dcpkgver) conflicts=('dovecot-sieve' 'pigeonhole-hg') -source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig} +source=("http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-$pkgname-$pkgver.tar.gz"{,.sig} "dovecot.conf") options=('!libtool') -sha256sums=('34da8801c7695c397a53a13574fe8674b92aa9d936f91a1b6e6df787488a6d05' +sha256sums=('e630d0c73e9c60028c5d25780eb38eda556ca7a5983cc07b7c0ac8490c4a7fa5' 'SKIP' 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858') build() { - cd "$srcdir/dovecot-2.1-$pkgname-$pkgver" + cd "$srcdir/dovecot-2.2-$pkgname-$pkgver" ./configure --prefix=/usr \ --with-dovecot=/usr/lib/dovecot \ @@ -36,7 +36,7 @@ build() { } package() { - cd "$srcdir/dovecot-2.1-$pkgname-$pkgver" + cd "$srcdir/dovecot-2.2-$pkgname-$pkgver" make DESTDIR="$pkgdir/" install install -m 644 -D "$srcdir/dovecot.conf" "$pkgdir/etc/ld.so.conf.d/dovecot.conf" diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index 51e2f79fc..5655fca9b 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173251 2012-12-16 17:45:49Z andyrtr $ +# $Id: PKGBUILD 185126 2013-05-11 09:39:45Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=pixman -pkgver=0.29.2 +pkgver=0.30.0 pkgrel=1 pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c1367c28cfb6a1c79c39b5df2d1a05351f57c702') +sha1sums=('7ef2e8a355c2ac38bd4b3390ad220801433422dc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD index d70ad52e3..2ad9a9bc7 100644 --- a/extra/plotutils/PKGBUILD +++ b/extra/plotutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171506 2012-11-18 08:51:56Z eric $ +# $Id: PKGBUILD 184421 2013-05-06 19:39:11Z foutrelis $ # Maintainer: damir <damir@archlinux.org> # Packager: Maksim Sipos (maxsipos at gmail dot com) pkgname=plotutils pkgver=2.6 -pkgrel=3.1 +pkgrel=5 arch=('x86_64' 'i686' 'mips64el') pkgdesc="Set of utilities and libraries for plotting." url="http://directory.fsf.org/graphics/plotutils.html" diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 02121f66d..378e331cb 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183295 2013-04-20 16:41:31Z heftig $ +# $Id: PKGBUILD 184422 2013-05-06 19:39:13Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.22.3 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu') diff --git a/extra/python-pygame/PKGBUILD b/extra/python-pygame/PKGBUILD index be5f23b2e..14edd3999 100644 --- a/extra/python-pygame/PKGBUILD +++ b/extra/python-pygame/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167958 2012-10-04 06:29:37Z eric $ +# $Id: PKGBUILD 184423 2013-05-06 19:39:15Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=python-pygame pkgname=python2-pygame pkgver=1.9.1 -pkgrel=7 +pkgrel=8 pkgdesc="Python game library" arch=('i686' 'x86_64' 'mips64el') url="http://www.pygame.org/" @@ -17,14 +17,15 @@ sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa' '285815e28705d5a2aea53c9d952d35fddf10dd13' '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070') -build() { - cd "${srcdir}/pygame-${pkgver}release" - patch -Np0 -i "${srcdir}/config.patch" - patch -Np1 -i "${srcdir}/pygame-v4l.patch" +prepare() { + cd pygame-${pkgver}release + find . -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} + + patch -p0 -i "${srcdir}/config.patch" + patch -p1 -i "${srcdir}/pygame-v4l.patch" } package_python2-pygame() { - cd "${srcdir}/pygame-${pkgver}release" + cd pygame-${pkgver}release python2 config.py -auto python2 setup.py install --root="${pkgdir}" --prefix=/usr @@ -32,8 +33,6 @@ package_python2-pygame() { cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame" cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests" - find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} + - # Fixing permissions chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/* } diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index f915357f2..4c039e8f4 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182925 2013-04-16 07:40:13Z tpowa $ +# $Id: PKGBUILD 184424 2013-05-06 19:39:18Z foutrelis $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index 1b003445a..6e22ba1d6 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 178990 2013-03-01 10:24:41Z bluewind $ +# $Id: PKGBUILD 184425 2013-05-06 19:39:20Z foutrelis $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=qrencode pkgver=3.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64 mips64el) -depends=('libpng>=1.5.0') +depends=('libpng') makedepends=(sdl) url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index 835e5f3b8..cb1eee34b 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182387 2013-04-09 21:20:53Z eric $ +# $Id: PKGBUILD 184426 2013-05-06 19:39:25Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=qt3 pkgver=3.3.8b -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc="A cross-platform application and UI framework" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 62851cbea..430e0d077 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180689 2013-03-25 19:15:41Z bpiotrowski $ +# $Id: PKGBUILD 185057 2013-05-10 18:09:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.4 -pkgrel=16 +pkgrel=18 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -31,14 +31,16 @@ replaces=('qt<=4.8.4') conflicts=('qt') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" - 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' + 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' + 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch' 'declarative-fix-sigbus.patch') md5sums=('89c5ecba180cae74c66260ac732dc5cb' 'a16638f4781e56e7887ff8212a322ecc' - '4f0152ba6d645e81218b23ba8beeb42d' - '283a00ff7f662dca481b70d6daa826e0' - '027683880235708d4bc270a7ef961183' + '8a28b3f52dbeb685d4b69440b520a3e1' + '9727c406c240990870c905696a8c5bd1' + '0e384663d3dd32abe35f5331c4147569' + 'b859c5673e5098c39f72b2252947049e' 'c439c7731c25387352d8453ca7574971' 'aac963d05a9d5733e2bfce9e26607f51') @@ -100,10 +102,26 @@ package() { # install missing icons and desktop files install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ - "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png" + "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/qt4logo.png + install -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/assistant-qt4.png + install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/assistant-qt4.png + install -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/designer-qt4.png + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -D -m644 ${icon} \ + "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/linguist-qt4.png + done + install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \ + "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png + install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png + install -d "${pkgdir}"/usr/share/applications - install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}-qt4.desktop \ - "${pkgdir}/usr/share/applications/" + install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \ + "${pkgdir}"/usr/share/applications/ # Useful symlinks for cmake and configure scripts install -d "${pkgdir}"/usr/bin diff --git a/extra/qt4/assistant-qt4.desktop b/extra/qt4/assistant-qt4.desktop index d2904beb2..d874d612b 100644 --- a/extra/qt4/assistant-qt4.desktop +++ b/extra/qt4/assistant-qt4.desktop @@ -2,7 +2,7 @@ Name=Qt4 Assistant Comment=Shows Qt4 documentation and examples Exec=assistant-qt4 -Icon=assistant +Icon=assistant-qt4 Terminal=false Encoding=UTF-8 Type=Application diff --git a/extra/qt4/designer-qt4.desktop b/extra/qt4/designer-qt4.desktop index 514146e78..86ea4eda5 100644 --- a/extra/qt4/designer-qt4.desktop +++ b/extra/qt4/designer-qt4.desktop @@ -3,7 +3,7 @@ Name=Qt4 Designer GenericName=Interface Designer Comment=Design GUIs for Qt4 applications Exec=designer-qt4 -Icon=designer +Icon=designer-qt4 MimeType=application/x-designer; Terminal=false Encoding=UTF-8 diff --git a/extra/qt4/linguist-qt4.desktop b/extra/qt4/linguist-qt4.desktop index 61036b307..765c88275 100644 --- a/extra/qt4/linguist-qt4.desktop +++ b/extra/qt4/linguist-qt4.desktop @@ -2,7 +2,7 @@ Name=Qt4 Linguist Comment=Add translations to Qt4 applications Exec=linguist-qt4 -Icon=linguist +Icon=linguist-qt4 MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false Encoding=UTF-8 diff --git a/extra/qt4/qdbusviewer-qt4.desktop b/extra/qt4/qdbusviewer-qt4.desktop new file mode 100644 index 000000000..2d4218c9b --- /dev/null +++ b/extra/qt4/qdbusviewer-qt4.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt4 QDbusViewer +GenericName=D-Bus Debugger +Comment=Debug D-Bus applications +Exec=qdbusviewer-qt4 +Icon=qdbusviewer-qt4 +Terminal=false +Type=Application +Categories=Qt;Development;Debugger; + diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 67e7f8647..1de3bee15 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182619 2013-04-11 11:34:49Z andrea $ +# $Id: PKGBUILD 184428 2013-05-06 19:39:31Z foutrelis $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -18,7 +18,7 @@ pkgname=('qt5-base' 'qt5-tools' 'qt5-translations') pkgver=5.0.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -104,9 +104,9 @@ if [ "$CARCH" != "mips64el" ]; then for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ qtwebkit-examples-and-demos qtxmlpatterns; do cd ${m}/examples - ${QTDIR}/qmake + ${QTDIR}/qtbase/bin/qmake make - cd ../../ + cd ../../ done fi } diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD index 8dc4082fa..ea3c69e54 100644 --- a/extra/qtiplot/PKGBUILD +++ b/extra/qtiplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168610 2012-10-13 11:49:18Z andyrtr $ +# $Id: PKGBUILD 184803 2013-05-09 04:24:34Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir.archlinux.org> # Contributor: Gergely Imreh <imrehg@gmail.com> pkgname=qtiplot pkgver=0.9.8.9 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://soft.proindependent.com/qtiplot.html" pkgdesc="Data analysis and scientific plotting - free clone of Origin" @@ -57,14 +57,14 @@ build() { sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch" cd ./3rdparty/qwt - qmake + qmake-qt4 make # Make qwtplot3d cd ../qwtplot3d patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch" patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch" - qmake + qmake-qt4 make # Make qtiplot @@ -75,7 +75,7 @@ build() { sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp - qmake qtiplot.pro QMAKESPEC=linux-g++ + qmake-qt4 qtiplot.pro QMAKESPEC=linux-g++ make QTDIR=/usr/ QMAKESPEC=linux-g++ } diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 430b2aae0..f752b84cb 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183523 2013-04-22 10:48:39Z andrea $ +# $Id: PKGBUILD 184430 2013-05-06 19:39:36Z foutrelis $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit pkgver=2.3.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD index 530a9925c..5305f02fe 100644 --- a/extra/quota-tools/PKGBUILD +++ b/extra/quota-tools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167201 2012-09-27 19:22:41Z eric $ +# $Id: PKGBUILD 185213 2013-05-12 07:52:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=quota-tools pkgver=4.01 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Tools to manage kernel-level quotas in Linux" arch=('i686' 'x86_64' 'mips64el') @@ -16,14 +16,14 @@ source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}. sha1sums=('64d2ab8b039cfea1aa4bd9e77e8c373488a7f0bf') build() { - cd "${srcdir}/${pkgname}" + cd ${pkgname} ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "${srcdir}/${pkgname}" - make ROOTDIR="${pkgdir}" install + cd ${pkgname} + make ROOTDIR="${pkgdir}" sbindir=/usr/bin root_sbindir=/usr/bin STRIP="" install install -d "${pkgdir}/usr/share/licenses/${pkgname}" head -33 quota.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 68c6465d0..b6cb2551c 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180808 2013-03-26 11:49:39Z foutrelis $ +# $Id: PKGBUILD 184431 2013-05-06 19:39:38Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r -pkgver=2.15.3 +pkgver=3.0.0 pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') @@ -15,28 +15,28 @@ depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils') makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk') optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files') -backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') +backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf') options=('!makeflags' '!emptydirs') install=r.install -source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" +source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz" 'r.desktop' 'r.png' 'R.conf') -sha1sums=('a05b68f31b00d8038d9f0a8562cfc0c8e32d9621' +sha1sums=('0cb1d1b815af4ce640ceafd5402a2eb94924c945' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978' '43668da6cfd1b4455a99f23e79e2059294dddac9') -build() { - cd "${srcdir}/R-${pkgver}" - sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c - - # set texmf dir correctly in makefile - sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in - +prepare() { + cd R-${pkgver} +# set texmf dir correctly in makefile + sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in # fix for texinfo 5.X - sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure + sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure +} +build() { + cd R-${pkgver} ./configure --prefix=/usr \ --libdir=/usr/lib \ --sysconfdir=/etc/R \ @@ -58,7 +58,7 @@ build() { } package() { - cd "${srcdir}/R-${pkgver}" + cd R-${pkgver} make DESTDIR="${pkgdir}" install # install libRmath.so diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index da3dbc420..13a5ea30a 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183455 2013-04-21 22:12:04Z heftig $ +# $Id: PKGBUILD 185168 2013-05-11 16:16:33Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox pkgver=2.99.1 -pkgrel=1 +pkgrel=2 pkgdesc="An iTunes-like music playback and management application" arch=('i686' 'x86_64' 'mips64el') license=(GPL) diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 3a6655758..b28e1b2ed 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180584 2013-03-23 23:09:38Z td123 $ +# $Id: PKGBUILD 184432 2013-05-06 19:39:40Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.7 -pkgrel=5 +pkgrel=6 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64' 'mips64el') url="http://www.rrdtool.org" @@ -18,12 +18,14 @@ options=('!libtool' '!emptydirs' '!makeflags') source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - +prepare() { + cd ${pkgname}-${pkgver} # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in +} +build() { + cd ${pkgname}-${pkgver} PYTHON=python2 LUA=/usr/bin/lua5.1 \ LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \ ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ @@ -34,7 +36,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" includedir=/usr/include install install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index 8e4f3b160..5cc11d096 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 168629 2012-10-13 16:16:09Z thomas $ +# $Id: PKGBUILD 185234 2013-05-12 10:36:09Z pierre $ pkgname=rsync pkgver=3.0.9 -pkgrel=5 +pkgrel=6 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64' 'mips64el') url="http://samba.anu.edu.au/rsync/" @@ -10,13 +10,12 @@ license=('GPL3') depends=('perl') backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz" - 'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service' + 'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service' 'rsyncd.socket' 'rsyncd@.service') md5sums=('5ee72266fe2c1822333c407e1761b92b' 'bce64d122a8e0f86872a4a21a03bc7f3' - 'ba413da4ebca05c57860151fda21efbc' 'ea3e9277dc908bc51f9eddc0f6b935c1' - 'ec96f9089d71109557cdcaa3f0633ed6' + '084140868d38cf3e937a2db716d47c0f' 'ae4c381e0c02d6132c7f6ded3f473041' '53f94e613e0bc502d38dd61bd2cd7636') @@ -34,7 +33,6 @@ check() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm755 ../rsyncd "$pkgdir/etc/rc.d/rsyncd" install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf" install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync" install -Dm644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service" diff --git a/extra/rsync/rsyncd b/extra/rsync/rsyncd deleted file mode 100644 index 27836d5c4..000000000 --- a/extra/rsync/rsyncd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd - -case "$1" in - start) - stat_busy "Starting rsyncd" - [ ! -f /run/daemons/rsyncd ] && /usr/bin/rsync --daemon $RSYNCD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon rsyncd - stat_done - fi - ;; - stop) - stat_busy "Stopping rsyncd" - [ -f /run/rsyncd.pid ] && kill `cat /run/rsyncd.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon rsyncd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/rsync/rsyncd.service b/extra/rsync/rsyncd.service index ea2e32c68..8502c08cf 100644 --- a/extra/rsync/rsyncd.service +++ b/extra/rsync/rsyncd.service @@ -2,8 +2,7 @@ Description=A file transfer program to keep remote files in sync [Service] -EnvironmentFile=-/etc/conf.d/rsyncd -ExecStart=/usr/bin/rsync --daemon --no-detach ${RSYNCD_ARGS} +ExecStart=/usr/bin/rsync --daemon --no-detach RestartSec=1 [Install] diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 447980d9b..82d460c35 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -15,7 +15,7 @@ pkgver=4.0.5 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=4.0.5 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -26,6 +26,8 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate swat.xinetd samba.pam + samba.service + samba.conf.d smbd.service smbd.socket nmbd.service @@ -208,10 +210,12 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # install systemd files install -d -m755 ${pkgdir}/usr/lib/systemd/system - for i in smbd nmbd swat winbindd; do - install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/ - install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/ - done + #for i in smbd nmbd swat winbindd; do + install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/ + install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/ + install -d -m755 ${pkgdir}/etc/conf.d + install -m644 ${srcdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba + #done # create ephemeral dirs via tmpfiles rather than shipping them in package install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf # install sample smb.conf @@ -240,10 +244,13 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } + md5sums=('58ec2fec08872b72f8fd526f2da20a9e' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' + '5602ba59bc60502c99e6d5a5ae16aecf' + '6c447748a064d631435dbef0a3dcf32f' 'd0b18dd7f5fafc8d25cb3a7c37c6d920' 'a78b9aa93eb14b0ac445897395693225' '90845b89f2321cb19c0b13f385f1782a' diff --git a/extra/samba/samba.conf.d b/extra/samba/samba.conf.d index 8721f956a..760742648 100644 --- a/extra/samba/samba.conf.d +++ b/extra/samba/samba.conf.d @@ -1,7 +1,18 @@ -# -# Configuration for the samba init script -# - -# space separated list of daemons to launch -SAMBA_DAEMONS=(smbd nmbd) -#SAMBA_DAEMONS=(smbd nmbd winbindd) +## Path: Network/Samba +## Description: Samba process options +## Type: string +## Default: "" +## ServiceRestart: samba +SAMBAOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: smb +SMBDOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: nmb +NMBDOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: winbind +WINBINDOPTIONS="" diff --git a/extra/samba/samba.service b/extra/samba/samba.service new file mode 100644 index 000000000..e423a7d2d --- /dev/null +++ b/extra/samba/samba.service @@ -0,0 +1,14 @@ +[Unit] +Description=Samba AD Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/samba.pid +LimitNOFILE=16384 +EnvironmentFile=-/etc/conf.d/samba +ExecStart=/usr/sbin/samba $SAMBAOPTIONS +ExecReload=/usr/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/sbc/PKGBUILD b/extra/sbc/PKGBUILD index 76425d8ab..50403fd76 100644 --- a/extra/sbc/PKGBUILD +++ b/extra/sbc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166341 2012-09-06 18:04:29Z heftig $ +# $Id: PKGBUILD 185171 2013-05-11 17:18:56Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=sbc -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc="Bluetooth Subband Codec (SBC) library" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL' 'LGPL') depends=('glibc') options=(!libtool) source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.xz) -md5sums=('aa2bc39c4a09aade064efea4bbbc4b2d') +md5sums=('ecadadbfd4b1dfe7b98f446c69126b23') build() { cd $pkgname-$pkgver diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index d032d9d56..2d46784a0 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178213 2013-02-18 09:01:22Z juergen $ +# $Id: PKGBUILD 185032 2013-05-10 12:58:50Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.4 +pkgver=1.1.7 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -13,20 +13,39 @@ arch=('i686' 'x86_64' 'mips64el') license=('custom') depends=('glibc' 'zlib') provides=('common-lisp' 'cl-asdf') -makedepends=('sbcl' 'texinfo') +makedepends=('sbcl') [ "$CARCH" = "mips64el" ] && \ -makedepends=('clisp' 'texinfo') +makedepends=('clisp') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" - "arch-fixes.lisp") -md5sums=('9d82ec89abbaf265fbfc71a24445dd66' - '7ac0c1936547f4278198b8bf7725204d') + "arch-fixes.lisp" + "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz" + "texinfo-4.13a-data_types.patch") +md5sums=('ca3dd0ce2943e10a1c86ff5f40db3f85' + '7ac0c1936547f4278198b8bf7725204d' + '71ba711519209b5fb583fed2b3d86fcb' + 'd8574782ff7def1e2dc5c291dbeaec18') + + +# Temporary Texinfo legacy build +# See: http://sourceforge.net/mailarchive/message.php?msg_id=30747919 + +build-texinfo-legacy() { + cd ${srcdir}/texinfo-4.13 + patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch + mkdir -p $srcdir/texinfo-instroot + ./configure --prefix=$srcdir/texinfo-instroot + make install +} build() { + build-texinfo-legacy + export PATH=$srcdir/texinfo-instroot/bin:$PATH + cd "$srcdir/$pkgname-$pkgver" - export CFLAGS+=" -D_GNU_SOURCE -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" - export GNUMAKE="make -e" + export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl" + export GNUMAKE="make" # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS export LINKFLAGS="$LDFLAGS" @@ -43,9 +62,9 @@ build() { EOF if [ "$CARCH" = "mips64el" ]; then - sh make.sh clisp + sh make.sh clisp --prefix=/usr else - sh make.sh sbcl + sh make.sh sbcl --prefix=/usr fi make -C doc/manual info } @@ -53,7 +72,8 @@ EOF package() { cd "$srcdir/$pkgname-$pkgver" - INSTALL_ROOT="$pkgdir/usr" sh install.sh + # cannot have both SBCL_HOME and INSTALL_ROOT + SBCL_HOME="" INSTALL_ROOT="$pkgdir/usr" sh install.sh src/runtime/sbcl --core output/sbcl.core --script "${srcdir}/arch-fixes.lisp" mv sbcl-new.core "${pkgdir}/usr/lib/sbcl/sbcl.core" diff --git a/extra/sbcl/texinfo-4.13a-data_types.patch b/extra/sbcl/texinfo-4.13a-data_types.patch new file mode 100644 index 000000000..2a87c2146 --- /dev/null +++ b/extra/sbcl/texinfo-4.13a-data_types.patch @@ -0,0 +1,32 @@ +diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c +--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200 ++++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200 +@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st + const char *carried_over_ptr; + size_t carried_over_len, carried_over_count; + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + int replen; + int delim = 0; + int rc; +@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage) + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + + if (cur_len == 1) + { +@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line, + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); +- int replen; ++ size_t cur_len = mb_len (mbi_cur (iter)); ++ size_t replen; + + if (cur_ptr >= endp) + break; diff --git a/extra/sdl_image/PKGBUILD b/extra/sdl_image/PKGBUILD index 1c5aa97c8..0df38e920 100644 --- a/extra/sdl_image/PKGBUILD +++ b/extra/sdl_image/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148924 2012-02-05 11:56:07Z ibiru $ +# $Id: PKGBUILD 184433 2013-05-06 19:39:41Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_image pkgver=1.2.12 -pkgrel=2.1 +pkgrel=3 pkgdesc="A simple library to load images of various formats as SDL surfaces" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -16,13 +16,13 @@ source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.g md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb') build() { - cd "$srcdir/SDL_image-$pkgver" + cd SDL_image-$pkgver ./configure --prefix=/usr --disable-static make } package() { - cd "$srcdir/SDL_image-$pkgver" + cd SDL_image-$pkgver make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 48b0963aa..3303def70 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179969 2013-03-13 15:12:30Z foutrelis $ +# $Id: PKGBUILD 184434 2013-05-06 19:39:43Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -7,7 +7,7 @@ pkgname=slim pkgver=1.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="Desktop-independent graphical login manager for X11" arch=('i686' 'x86_64' 'mips64el') url="http://slim.berlios.de/" diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD index 395b5e20f..39cd4ba96 100644 --- a/extra/smplayer/PKGBUILD +++ b/extra/smplayer/PKGBUILD @@ -1,29 +1,20 @@ -# $Id: PKGBUILD 184186 2013-05-03 10:19:10Z foutrelis $ +# $Id: PKGBUILD 185252 2013-05-12 15:00:41Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: shamrok <szamrok@gmail.com> pkgname=smplayer -pkgver=0.8.4 -pkgrel=2 +pkgver=0.8.5 +pkgrel=1 pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64' 'mips64el') 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 {} + -} +md5sums=('deb781ecdc4dd9f0533ccce8f1772865') build() { cd "$pkgname-$pkgver" diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index aee8750a3..c78ff1934 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184138 2013-05-02 15:21:00Z andrea $ +# $Id: PKGBUILD 185050 2013-05-10 17:29:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano -pkgver=2.9.1 +pkgver=2.9.2 pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') makedepends=('cmake' 'doxygen') [ "$CARCH" != "mips64el" ] && makedepends+=('java-environment') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c7beb1bda475f363fa0afb58edc541fe') +md5sums=('60ce910cf3c8e4655c614b45d73f2b2a') build() { mkdir build diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index cfb0ab785..ae128ab19 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178141 2013-02-16 22:48:58Z ioni $ +# $Id: PKGBUILD 184435 2013-05-06 19:39:45Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64' 'mips64el') url="http://sox.sourceforge.net/" @@ -23,21 +23,25 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9' '2f92bcaebcaf300782396f106cdd27c72048a851') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/sox-ffmpeg0.11.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Parabola" make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make bindir=. installcheck } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD index 78fe4219f..daa7eeafb 100644 --- a/extra/spamassassin/PKGBUILD +++ b/extra/spamassassin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169317 2012-10-19 09:03:47Z bluewind $ +# $Id: PKGBUILD 185272 2013-05-12 17:03:55Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=spamassassin pkgver=3.3.2 -pkgrel=7 +pkgrel=8 pkgdesc="A mail filter to identify spam." arch=('i686' 'x86_64' 'mips64el') license=('APACHE') @@ -14,8 +14,7 @@ depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl' 'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay') makedepends=('razor' 'perl-dbi') optdepends=('razor: to identify collaborately-flagged spam') -backup=('etc/conf.d/spamd' - 'etc/mail/spamassassin/local.cf' +backup=('etc/mail/spamassassin/local.cf' 'etc/mail/spamassassin/init.pre' 'etc/mail/spamassassin/v310.pre' 'etc/mail/spamassassin/v312.pre' @@ -24,10 +23,8 @@ backup=('etc/conf.d/spamd' install="${pkgname}.install" options=('!emptydirs') source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz" - 'spamd.conf.d' 'spamd' 'spamassassin.service') + 'spamassassin.service') md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' - 'af501c6b0bb937a2775b747cc4b6d150' - '57545e6877503d897db21e9a2e8bd2b9' 'ded3e012a4d502df001f2d97c495cc4e') build() { @@ -55,7 +52,5 @@ package() { cd "${srcdir}/Mail-SpamAssassin-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd" - install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd" install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service" } diff --git a/extra/spamassassin/spamd b/extra/spamassassin/spamd deleted file mode 100644 index 3fb97566e..000000000 --- a/extra/spamassassin/spamd +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE=/var/run/spamd.pid -if [ -f $PIDFILE ]; then - PID=$(cat $PIDFILE) -else - PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat -fi - -case "$1" in - start) - stat_busy "Starting spamd" - [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon spamd - stat_done - fi - ;; - stop) - stat_busy "Stopping spamd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - # Some users report that a second attempt at stopping the process - # works. So, take a little nap and give it another whirl... - sleep 2 - kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon spamd - stat_done - fi - else - rm_daemon spamd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/spamassassin/spamd.conf.d b/extra/spamassassin/spamd.conf.d deleted file mode 100644 index 4295e0073..000000000 --- a/extra/spamassassin/spamd.conf.d +++ /dev/null @@ -1 +0,0 @@ -SPAMD_OPTS="-c" diff --git a/extra/suitesparse/PKGBUILD b/extra/suitesparse/PKGBUILD index 37a6d4867..81bc936a3 100644 --- a/extra/suitesparse/PKGBUILD +++ b/extra/suitesparse/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164773 2012-08-04 20:35:22Z ronald $ +# $Id: PKGBUILD 185110 2013-05-11 08:04:24Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=suitesparse -pkgver=4.0.2 +pkgver=4.2.1 pkgrel=1 pkgdesc="A collection of sparse matrix libraries" url="http://www.cise.ufl.edu/research/sparse/SuiteSparse/" @@ -14,7 +14,7 @@ depends=('blas' 'lapack') makedepends=('gcc-fortran') license=('GPL') source=(http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-$pkgver.tar.gz) -sha1sums=('46b24a28eef4b040ea5a02d2c43e82e28b7d6195') +sha1sums=('ea6688bd6f6adf81e2e5aacdc71d7dcf9a5d208d') build() { cd "$srcdir"/SuiteSparse diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 47da491d8..b16987670 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,37 +1,34 @@ -# $Id: PKGBUILD 178008 2013-02-13 13:30:36Z andrea $ +# $Id: PKGBUILD 185094 2013-05-11 04:02:37Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=system-config-printer -pkgver=1.3.12 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' - 'gnome-icon-theme' 'python2-notify') +depends=('systemd' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' + 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' 'gtk3') makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils') optdepends=('gnome-keyring: password management') replaces=('system-config-printer-common' 'system-config-printer-gnome') conflicts=('system-config-printer-common' 'system-config-printer-gnome') -source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig} - 'fix-typo-in-service.patch') -md5sums=('0775647e1c34ef25364de3c178a4ed36' - '1aa2246047b424e2d23473749368b8c6' - 'd30d14aeb6d2bfeac0679d28704473ec') +source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('3d794eb88c5813c3024b181677a602dd' + 'SKIP') -build() { +prepare() { cd ${pkgname}-${pkgver} - - # Fixed upstream - patch -p1 -i "${srcdir}"/fix-typo-in-service.patch - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer +} +build() { + cd ${pkgname}-${pkgver} PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc \ diff --git a/extra/system-config-printer/fix-typo-in-service.patch b/extra/system-config-printer/fix-typo-in-service.patch deleted file mode 100644 index 56f17dcec..000000000 --- a/extra/system-config-printer/fix-typo-in-service.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001 -From: Tim Waugh <twaugh@redhat.com> -Date: Tue, 23 Oct 2012 13:55:12 +0000 -Subject: Fixed typo in systemd config file. - ---- -diff --git a/udev/configure-printer@.service.in b/udev/configure-printer@.service.in -index 8a20967..5898c79 100644 ---- a/udev/configure-printer@.service.in -+++ b/udev/configure-printer@.service.in -@@ -4,4 +4,4 @@ Requires=cups.socket - After=cups.socket - - [Service] --ExecStart=@udevhelperdir@/configure-printer add "%i" -+ExecStart=@udevhelperdir@/udev-configure-printer add "%i" --- -cgit v0.9.1 diff --git a/extra/thunar-archive-plugin/PKGBUILD b/extra/thunar-archive-plugin/PKGBUILD index 0af18e822..140fb9772 100644 --- a/extra/thunar-archive-plugin/PKGBUILD +++ b/extra/thunar-archive-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149175 2012-02-06 06:27:04Z foutrelis $ +# $Id: PKGBUILD 185137 2013-05-11 13:25:59Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=thunar-archive-plugin -pkgver=0.3.0 -pkgrel=2.1 +pkgver=0.3.1 +pkgrel=1 pkgdesc="Create and deflate archives in thunar" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" @@ -15,7 +15,7 @@ makedepends=('intltool') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/thunar-plugins/$pkgname/0.3/$pkgname-$pkgver.tar.bz2) -sha256sums=('74be7c6e242ba240b9477e9cf4ccc9190769c2717c5b5bf26788d1847adaf896') +sha256sums=('9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/thunar-media-tags-plugin/PKGBUILD b/extra/thunar-media-tags-plugin/PKGBUILD index 4976756b0..b5637d05e 100644 --- a/extra/thunar-media-tags-plugin/PKGBUILD +++ b/extra/thunar-media-tags-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157831 2012-04-30 04:19:52Z foutrelis $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# $Id: PKGBUILD 185139 2013-05-11 13:34:39Z foutrelis $ +# Maintainer: # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar-media-tags-plugin -pkgver=0.2.0 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="Adds special features for media files to the Thunar File Manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,16 +14,18 @@ depends=('taglib' 'thunar') makedepends=('intltool') options=('!libtool') source=(http://archive.xfce.org/src/thunar-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('1111b4dae10156ab91adb4eadb26586593b1b023') +sha256sums=('056d012a10403ee3e2e55b6ff2faecb796821de9ebee000315589b95d95ed253') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 358071391..22f32357e 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 183324 2013-04-21 22:06:43Z heftig $ +# $Id: PKGBUILD 184438 2013-05-06 19:39:53Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.16.0 +pkgver=0.16.1 _tver=${pkgver%.*} -pkgrel=4 +pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" arch=(i686 x86_64 mips64el) license=(GPL) @@ -19,7 +19,7 @@ makedepends=(libgee libsecret upower libexif exempi url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('299c6a180370522d1d794c184aaef8d8222d3f737d564b8e5ca25b8751470c4f') +sha256sums=('fbb94144826b00da0b427dc6f37d2679bd8dfec1dc992e857a47a0b453f0b771') build() { cd $pkgbase-$pkgver diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 171ed5edf..6082f4cf4 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180315 2013-03-20 02:35:36Z eric $ +# $Id: PKGBUILD 184439 2013-05-06 19:39:55Z foutrelis $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=8 +pkgrel=9 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" diff --git a/extra/transfig/PKGBUILD b/extra/transfig/PKGBUILD index 50dde5722..5aec31a4a 100644 --- a/extra/transfig/PKGBUILD +++ b/extra/transfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148944 2012-02-05 11:57:10Z ibiru $ +# $Id: PKGBUILD 184440 2013-05-06 19:39:57Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=transfig pkgver=3.2.5d -pkgrel=1 +pkgrel=2 pkgdesc="Format conversion utility that can be used with xfig" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfig.org" @@ -16,20 +16,22 @@ sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc' 'b8b712871615308b8b6add92f86d218437d652f2' '9f9f332b0b31e58e59542bc1568df9617b71710a') -build() { - cd "${srcdir}/${pkgname}.${pkgver}" +prepare() { + cd ${pkgname}.${pkgver} sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch +} +build() { + cd ${pkgname}.${pkgver} xmkmf make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig } package() { - cd "${srcdir}/${pkgname}.${pkgver}" - + cd ${pkgname}.${pkgver} make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \ FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \ install install.man diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index e2f69c635..2567af35f 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175134 2013-01-15 01:39:25Z foutrelis $ +# $Id: PKGBUILD 184441 2013-05-06 19:39:59Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler -pkgver=0.1.27 -pkgrel=2 +pkgver=0.1.29 +pkgrel=1 pkgdesc="D-Bus service for applications to request thumbnails" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -21,7 +21,7 @@ optdepends=('ffmpegthumbnailer: for video thumbnails' 'freetype2: for font thumbnails') options=('!libtool') source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) -sha256sums=('4c60b3b92877257fcc54d18acbbe4ad73c84a7ff7608a430ad5a05b452923869') +sha256sums=('c3bac4ee609e22be6c7f01a4fdf6086bc6b57940d82f99570a2d9d547a32fc93') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/tuxpuck/PKGBUILD b/extra/tuxpuck/PKGBUILD index f9b7fc1c8..edbcbe3b4 100644 --- a/extra/tuxpuck/PKGBUILD +++ b/extra/tuxpuck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148948 2012-02-05 11:57:19Z ibiru $ +# $Id: PKGBUILD 184442 2013-05-06 19:40:00Z foutrelis $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=tuxpuck pkgver=0.8.2 -pkgrel=5 +pkgrel=6 pkgdesc="Airhockey with tux" arch=('i686' 'x86_64' 'mips64el') url="http://home.no.net/munsuun/tuxpuck/" diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index d4f257971..a2d47808f 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184150 2013-05-02 19:39:51Z eric $ +# $Id: PKGBUILD 184356 2013-05-06 19:20:44Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ucommon -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=1 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" arch=('i686' 'x86_64' 'mips64el') @@ -10,9 +10,8 @@ url="http://www.gnutelephony.org/index.php/GNU_uCommon_C++" license=('GPL3' 'LGPL3') depends=('openssl') options=('!libtool') -#source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) -source=("http://www.gnutelephony.org/dist/tarballs/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('c6025b339417e817b6d5ac21b5334823' +source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('b20a43a8cba901c2145778b3d653eef6' 'SKIP') build() { diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index b127cfcf3..5daa68aa3 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180239 2013-03-18 19:28:47Z jgc $ +# $Id: PKGBUILD 185169 2013-05-11 16:16:34Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower pkgver=0.9.20 -pkgrel=1 +pkgrel=2 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64' 'mips64el') url="http://upower.freedesktop.org" @@ -18,6 +18,7 @@ build() { cd "$pkgname-$pkgver" # put udev files in /usr/lib + # should be dropped as of 0.9.21!! sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD index 2789c8cfa..4b23230fe 100644 --- a/extra/vice/PKGBUILD +++ b/extra/vice/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170377 2012-11-06 19:33:54Z giovanni $ +# $Id: PKGBUILD 184443 2013-05-06 19:40:02Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vice pkgver=2.4 -pkgrel=2.1 +pkgrel=3 pkgdesc="The Versatile Commodore 8-bit Emulator" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -24,7 +24,7 @@ md5sums=('b017647a0c159bbe43cdb81762d1c577' '877f93db1550ea81386aae7c3b578442' '9d9f62f05a967a5926df496e86404148') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch" @@ -34,7 +34,12 @@ build() { sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in - autoreconf + autoreconf -vi +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ --enable-ethernet \ --with-alsa \ diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index f4ebc938b..2a0673dad 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181129 2013-03-31 19:16:58Z stephane $ +# $Id: PKGBUILD 184444 2013-05-06 19:40:04Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.9.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') @@ -22,8 +22,7 @@ build() { cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DWITH_VIGRANUMPY=1 \ - -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \ - -DDOCINSTALL=share/doc + -DDOCINSTALL=share/doc make } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index a8ab46e88..0b5a3ed0e 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182353 2013-04-08 21:34:41Z giovanni $ +# $Id: PKGBUILD 184445 2013-05-06 19:40:05Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -70,6 +70,8 @@ build() { sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc" + + CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ ./configure --prefix=/usr \ --sysconfdir=/etc \ --disable-rpath \ diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD index f9660f6d6..8f522c943 100644 --- a/extra/w3m/PKGBUILD +++ b/extra/w3m/PKGBUILD @@ -4,7 +4,7 @@ pkgname=w3m pkgver=0.5.3 -pkgrel=4 +pkgrel=4.1 pkgdesc='Text-based Web browser, as well as pager' url='http://w3m.sourceforge.net/' license=('custom') diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index 6e907c355..aaf6b12e2 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183326 2013-04-21 22:06:45Z heftig $ +# $Id: PKGBUILD 184446 2013-05-06 19:40:06Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=webkitgtk pkgname=('webkitgtk3') pkgver=2.0.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://webkitgtk.org/" license=('custom') diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD index c62f1250c..035ad7e92 100644 --- a/extra/webkitgtk2/PKGBUILD +++ b/extra/webkitgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183468 2013-04-21 22:12:24Z heftig $ +# $Id: PKGBUILD 184447 2013-05-06 19:40:08Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=webkitgtk2 pkgver=1.10.2 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') url="http://webkitgtk.org/" license=('custom') diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index a10335240..a2e21d979 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183246 2013-04-19 14:14:54Z giovanni $ +# $Id: PKGBUILD 185261 2013-05-12 16:27:13Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.0.24 +pkgver=5.0.25 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") -md5sums=('34c45f9beaafa5ae58d7d8b366c7c262') +md5sums=('8f873c1c51592ee419b2a46b0a3c8432') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index 42e4bb5e9..e694e615c 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175070 2013-01-12 14:16:01Z daniel $ +# $Id: PKGBUILD 184448 2013-05-06 19:40:10Z foutrelis $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker pkgver=0.95.4 -pkgrel=1 +pkgrel=2 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64 'mips64el') url="http://www.windowmaker.org/" diff --git a/extra/wv/PKGBUILD b/extra/wv/PKGBUILD index 455e8033a..bcee31fbb 100644 --- a/extra/wv/PKGBUILD +++ b/extra/wv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148964 2012-02-05 11:58:08Z ibiru $ +# $Id: PKGBUILD 184449 2013-05-06 19:40:11Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=wv pkgver=1.2.9 -pkgrel=1.1 +pkgrel=2 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/wvware" @@ -15,7 +15,7 @@ source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pk md5sums=('dbccf2e9f747e50c913b7e3d126b73f7') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --mandir=/usr/share/man @@ -23,7 +23,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD index 322e9315f..741d5601c 100644 --- a/extra/wxgtk/PKGBUILD +++ b/extra/wxgtk/PKGBUILD @@ -1,37 +1,33 @@ -# $Id: PKGBUILD 171304 2012-11-17 03:08:29Z eric $ +# $Id: PKGBUILD 184450 2013-05-06 19:40:13Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk pkgver=2.8.12.1 -pkgrel=4.1 +pkgrel=5 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64' 'mips64el') url="http://wxwidgets.org" license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm' 'sdl') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa' 'glu' 'libxt') +depends=('gtk2' 'gstreamer0.10-base' 'sdl') +makedepends=('gstreamer0.10-base-plugins' 'gconf') #source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2) source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') build() { - cd "${srcdir}/wxPython-src-${pkgver}" -# cd "${srcdir}/wxGTK-${pkgver}" + cd wx*-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=builtin \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ --with-sdl --disable-precomp-headers make make -C locale allmo - cd contrib/src - make + make -C contrib/src } package() { - cd "${srcdir}/wxPython-src-${pkgver}" -# cd "${srcdir}/wxGTK-${pkgver}" - make DESTDIR="${pkgdir}" install - cd contrib/src + cd wx*-${pkgver} make DESTDIR="${pkgdir}" install - install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + make -C contrib/src DESTDIR="${pkgdir}" install + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD index 057088ba5..f964132bf 100644 --- a/extra/xaos/PKGBUILD +++ b/extra/xaos/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148968 2012-02-05 11:58:17Z ibiru $ +# $Id: PKGBUILD 184451 2013-05-06 19:40:17Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xaos pkgver=3.5 -pkgrel=5.2 +pkgrel=6 pkgdesc="A fast portable real-time interactive fractal zoomer" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/xaos/" @@ -11,18 +11,27 @@ license=('GPL') depends=('gsl' 'libpng' 'aalib') options=('!makeflags') install=xaos.install -source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz xaos-3.5-libpng15.patch) +source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz \ + xaos-3.5-libpng15.patch xaos-3.5-build-fix-i686.patch) sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801' - '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33') + '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33' + 'd2ea8f0460c79c47fb289a4c2f87fe5c44057f9d') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i ../xaos-3.5-libpng15.patch + if [[ $CARCH == "i686" ]]; then + patch -p1 -i ../xaos-3.5-build-fix-i686.patch + fi +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-gsl --with-aa-driver make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/xaos/xaos-3.5-build-fix-i686.patch b/extra/xaos/xaos-3.5-build-fix-i686.patch new file mode 100644 index 000000000..4736dd389 --- /dev/null +++ b/extra/xaos/xaos-3.5-build-fix-i686.patch @@ -0,0 +1,20 @@ +--- xaos-3.5/src/engine/zoomd.c.orig 2009-07-18 00:50:31.000000000 +0100 ++++ xaos-3.5/src/engine/zoomd.c 2012-05-20 19:04:55.891065437 +0100 +@@ -280,6 +280,7 @@ dosymetry2(void /*@unused@ */ *data, str + #endif + #undef bpp1 + ++REGISTERS(0) + static INLINE void fillline(int line) + { + register unsigned char *RESTRICT vbuff = cimage.currlines[line]; +--- xaos-3.5/src/engine/zoom.c.fix-build 2009-07-18 00:50:31.000000000 +0100 ++++ xaos-3.5/src/engine/zoom.c 2012-05-20 19:11:53.625083113 +0100 +@@ -933,6 +933,7 @@ static /*INLINE */ void preparemoveoldpo + } + + #ifndef USE_i386ASM ++REGISTERS(0) + static /*INLINE */ void + moveoldpoints(void /*@unused@ */ *data1, + struct taskinfo /*@unused@ */ *task, diff --git a/extra/xawtv/PKGBUILD b/extra/xawtv/PKGBUILD index e0f28c26d..d7a039cc0 100644 --- a/extra/xawtv/PKGBUILD +++ b/extra/xawtv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148970 2012-02-05 11:58:22Z ibiru $ +# $Id: PKGBUILD 184452 2013-05-06 19:40:18Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Jason Chu <jason@archlinux.org> pkgname=xawtv -pkgver=3.101 -pkgrel=2 +pkgver=3.103 +pkgrel=1 pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux" arch=('i686' 'x86_64' 'mips64el') url="http://git.linuxtv.org/xawtv3.git" @@ -14,12 +14,10 @@ depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' ' [ "$CARCH" != "mips64el" ] && depends+=('lirc-utils') makedepends=('mesa') source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2) -md5sums=('330ce1789595e370be34ad4cae3dc3fa') - +md5sums=('18822bb3660540fa9ea8b643a5b30d6b') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - autoconf - autoheader ./configure --prefix=/usr --disable-motif --disable-quicktime make } diff --git a/extra/xerces-c/PKGBUILD b/extra/xerces-c/PKGBUILD index 85a3e1222..1038744a1 100644 --- a/extra/xerces-c/PKGBUILD +++ b/extra/xerces-c/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179593 2013-03-07 13:22:22Z andrea $ +# $Id: PKGBUILD 184762 2013-05-08 07:12:02Z andrea $ # Maintainer: # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> @@ -6,7 +6,7 @@ pkgname=xerces-c pkgver=3.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="A validating XML parser written in a portable subset of C++" arch=('i686' 'x86_64' 'mips64el') url="http://xerces.apache.org/xerces-c/" @@ -18,8 +18,11 @@ md5sums=('6a8ec45d83c8cfb1584c5a5345cb51ae') build() { cd ${pkgname}-${pkgver} + + [[ "${CARCH}" = "i686" ]] && SSE2="--disable-sse2" + ./configure --prefix=/usr \ - --sysconfdir=/etc + --sysconfdir=/etc ${SSE2} make } diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD index f0f415c59..1f14b08c1 100644 --- a/extra/xfce4-mixer/PKGBUILD +++ b/extra/xfce4-mixer/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 168699 2012-10-14 15:01:42Z eric $ +# $Id: PKGBUILD 184824 2013-05-09 08:12:58Z foutrelis $ # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-mixer pkgver=4.10.0 -pkgrel=1.1 +pkgrel=2 pkgdesc="The volume control plugin for the Xfce panel" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" license=('GPL2') groups=('xfce4') depends=('xfce4-panel' 'gstreamer0.10-base-plugins' 'libunique') +optdepends=('gstreamer0.10-good-plugins: for OSS and PulseAudio support') makedepends=('intltool') options=('!libtool') install=$pkgname.install diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD index 17ca807bb..1119b7cef 100644 --- a/extra/xfce4-notifyd/PKGBUILD +++ b/extra/xfce4-notifyd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183310 2013-04-21 17:16:07Z foutrelis $ +# $Id: PKGBUILD 184796 2013-05-08 16:11:31Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-notifyd -pkgver=0.2.3 +pkgver=0.2.4 pkgrel=1 pkgdesc="Notification daemon for the Xfce desktop" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ provides=('notification-daemon') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2) -sha256sums=('dd40f64c9db22b0b971e81e8e74a4ab6afe6d0bb819ab5d0badee89e13faa63b') +sha256sums=('8c7ed62f9496816d1391281f77d1b32216f9bf6fd22fbe4f6f3f4e07a6bbced0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD index 50f038d89..5427203e4 100644 --- a/extra/xfce4-power-manager/PKGBUILD +++ b/extra/xfce4-power-manager/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 160263 2012-05-31 17:40:20Z foutrelis $ +# $Id: PKGBUILD 185209 2013-05-12 07:30:46Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-power-manager pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="Power manager for Xfce desktop" arch=('i686' 'x86_64' 'mips64el') -url="http://xfce-goodies.berlios.de/" +url="http://www.xfce.org/" license=('GPL2') groups=('xfce4') depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme') @@ -30,6 +30,7 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --libexecdir=/usr/lib \ --localstatedir=/var \ --disable-network-manager \ diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD index cfbb4d3b2..cf25f6713 100644 --- a/extra/xfig/PKGBUILD +++ b/extra/xfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155348 2012-04-02 00:26:21Z eric $ +# $Id: PKGBUILD 184453 2013-05-06 19:40:21Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xfig pkgver=3.2.5b -pkgrel=8 +pkgrel=9 pkgdesc="An interactive drawing tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfig.org/userman/" @@ -31,8 +31,8 @@ sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542' '31edf4cfab708820ea3f114d095dfef5aa88e5aa' '9011b8fa6143e37525b28cc9800a3bf2d6b008d2') -build() { - cd "${srcdir}/${pkgname}.${pkgver}" +prepare() { + cd ${pkgname}.${pkgver} patch -p1 < ../xfig-3.2.4-redhat.patch patch -p1 < ../xfig-3.2.5-fhs.patch patch -p1 < ../xfig.3.2.5-modularX.patch @@ -43,13 +43,16 @@ build() { patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile chmod 755 Libraries +} +build() { + cd ${pkgname}.${pkgver} xmkmf make DOCDIR=/usr/share/doc } package() { - cd "${srcdir}/${pkgname}.${pkgver}" + cd ${pkgname}.${pkgver} make DESTDIR="${pkgdir}" DOCDIR=/usr/share/doc install.all rm "${pkgdir}/usr/lib/X11/app-defaults" diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD index db9587850..e63309034 100644 --- a/extra/xine-ui/PKGBUILD +++ b/extra/xine-ui/PKGBUILD @@ -1,30 +1,28 @@ -# $Id: PKGBUILD 161816 2012-06-15 02:09:04Z eric $ +# $Id: PKGBUILD 184454 2013-05-06 19:40:24Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-ui pkgver=0.99.7 -pkgrel=1 +pkgrel=2 pkgdesc="A free video player for Unix" arch=('i686' 'x86_64') license=('GPL') url="http://www.xine-project.org" -depends=('xine-lib' 'curl' 'libpng' 'libjpeg' 'libxft' 'libxxf86vm' - 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme' - 'desktop-file-utils' 'lirc-utils') -makedepends=('libxt') +depends=('xine-lib' 'curl' 'libpng' 'libxft' 'xdg-utils' 'shared-mime-info' + 'hicolor-icon-theme' 'desktop-file-utils' 'lirc-utils') options=('!strip') install=xine-ui.install source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz) sha1sums=('ca82e09cf8245d038813bc4dbd8384ba79cbf197') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man \ --with-x --enable-lirc --without-aalib --enable-debug make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" desktopdir=/usr/share/applications install } diff --git a/extra/xorg-xcursorgen/PKGBUILD b/extra/xorg-xcursorgen/PKGBUILD index 89ed2e4dc..b08bd5fc5 100644 --- a/extra/xorg-xcursorgen/PKGBUILD +++ b/extra/xorg-xcursorgen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154152 2012-03-23 19:18:20Z andyrtr $ +# $Id: PKGBUILD 184455 2013-05-06 19:40:25Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xcursorgen pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="Create an X cursor file from PNG images" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD index cad28724a..7f8e8f99b 100644 --- a/extra/xsane/PKGBUILD +++ b/extra/xsane/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148984 2012-02-05 11:58:59Z ibiru $ +# $Id: PKGBUILD 184456 2013-05-06 19:40:28Z foutrelis $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgbase=xsane pkgname=('xsane' 'xsane-gimp') pkgver=0.998 -pkgrel=2 +pkgrel=4 arch=(i686 x86_64 mips64el) url="http://www.xsane.org" license=('GPL2') @@ -21,7 +21,9 @@ build() { patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch" sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c - ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-gimp make mv src/xsane src/xsane-gimp diff --git a/extra/xsane/xsane.install b/extra/xsane/xsane.install index aa3e3b8f8..7e376517f 100644 --- a/extra/xsane/xsane.install +++ b/extra/xsane/xsane.install @@ -9,6 +9,7 @@ post_install() { echo "" echo " \$ rm -rf ~/.sane/xsane" echo "" + echo "Xsane only supports creation of pdf files in 8bit colour depth!" } post_upgrade() { diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index e68d8b5ed..ea101c1b6 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182413 2013-04-10 13:01:03Z foutrelis $ +# $Id: PKGBUILD 184457 2013-05-06 19:40:30Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner pkgver=20.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD index e21ddf8d5..c07603a1c 100644 --- a/extra/zvbi/PKGBUILD +++ b/extra/zvbi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148988 2012-02-05 11:59:13Z ibiru $ +# $Id: PKGBUILD 184458 2013-05-06 19:40:33Z foutrelis $ # Maintainer: # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=zvbi pkgver=0.2.33 -pkgrel=4.2 +pkgrel=5 pkgdesc="VBI capture and decoding library" url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" arch=('i686' 'x86_64' 'mips64el') diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD index 88960ddba..4974e0dad 100644 --- a/libre-testing/libretools/PKGBUILD +++ b/libre-testing/libretools/PKGBUILD @@ -8,17 +8,18 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3+' 'GPL2') -pkgver=20130503 -_libretools_commit=0db5eebebe64db0d8c3b29b629b066a3909aa61d +pkgver=20130507 +_libretools_commit=4ce4e426012375a9b44df012a143139645880c0d _devtools_commit=a1a79ff77bb19166bd5631953a71e3d3222e5f1c -pkgrel=1 -arch=('any') - _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2) +pkgrel=1 +arch=('any') +makedepends=(emacs) # emacs --batch is used during the build to process text + build() { cd "$srcdir" ln -sf devtools-par-$_devtools_commit devtools-par @@ -30,6 +31,7 @@ package_libretools() { backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) install=libretools.install groups=(base-devel) + replaces=(chroottools) depends=( arch-install-scripts # `archroot` uses `pacstrap` @@ -41,7 +43,6 @@ package_libretools() { wget # `aur` and `pkgbuild-check-nonfree` ) optdepends=('namcap: to check package files') - makedepends=(emacs) # emacs --batch is used during the build to process text cd "$srcdir/$pkgbase-$_libretools_commit" make install-libretools install-doc DESTDIR="$pkgdir" @@ -56,5 +57,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('dabae9bb6040431e8e2b84871a027237' +md5sums=('84fc56b35cca1a05a434d31218dbb891' 'c5cd04723119762701db766cb8f6e5ef') diff --git a/libre-testing/linux-libre-firmware/PKGBUILD b/libre-testing/linux-libre-firmware/PKGBUILD deleted file mode 100644 index 99c54a1b2..000000000 --- a/libre-testing/linux-libre-firmware/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer: André Silva <emulatorman@lavabit.com> -# Contributor: Márcio Silva <coadde@lavabit.com> - -pkgname=linux-libre-firmware -pkgver=3.9 -pkgrel=1 -pkgdesc='Free firmware files for Linux-libre' -arch=('any') -url='http://linux-libre.fsfla.org/' -license=('GPL2') -provides=('linux-firmware' - 'kernel26-firmware=2.6.34.99') -conflicts=('linux-firmware' - 'linux-firmware-git' - 'kernel26-firmware' - 'ar9170-fw' - 'iwlwifi-1000-ucode' - 'iwlwifi-3945-ucode' - 'iwlwifi-4965-ucode' - 'iwlwifi-5000-ucode' - 'iwlwifi-5150-ucode' - 'iwlwifi-6000-ucode' - 'rt2870usb-fw' - 'rt2x00-rt61-fw' - 'rt2x00-rt71w-fw') -replaces=('linux-firmware' - 'kernel26-firmware' - 'ar9170-fw' - 'iwlwifi-1000-ucode' - 'iwlwifi-3945-ucode' - 'iwlwifi-4965-ucode' - 'iwlwifi-5000-ucode' - 'iwlwifi-5150-ucode' - 'iwlwifi-6000-ucode' - 'rt2870usb-fw' - 'rt2x00-rt61-fw' - 'rt2x00-rt71w-fw') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz") -md5sums=('120df29f88622dabf7015a22c7cc8e25') - -package() { - cd $srcdir/linux-$pkgver - - make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install - - # move WHENCE file to linux-firmware license folder - install -d -m755 $pkgdir/usr/share/licenses/$pkgname - mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname -} diff --git a/libre-testing/linux-libre-kmod-alx/PKGBUILD b/libre-testing/linux-libre-kmod-alx/PKGBUILD deleted file mode 100644 index 093f42909..000000000 --- a/libre-testing/linux-libre-kmod-alx/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: André Silva <emulatorman@lavabit.com> - -_kernver=3.9 -_kernrel=2 -pkgname=('linux-libre-kmod-alx') -_version=v3.9-rc4 -_pkgver=3.9-rc4-2-su -pkgver=3.9rc4.2 -pkgrel=1 -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-$_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') -conflicts=('alx' 'alx-driver' 'dkms-alx') -source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) - -md5sums=('a00e82e212fe7533c9059e5b78cc3c1c') - - -package() { - # current extramodules version - _extraver=extramodules-3.9-LIBRE - - cd $srcdir/compat-drivers-$_pkgver - - # replacing to specific linux-libre kernel version - sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/3.9.0-$_kernrel-LIBRE/" Makefile - - ./scripts/driver-select alx - make - cd $srcdir/compat-drivers-$_pkgver/compat - gzip -9 compat.ko - install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz - cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx - gzip -9 alx.ko - install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz -} diff --git a/libre-testing/linux-libre-kmod-alx/linux-libre-kmod-alx.install b/libre-testing/linux-libre-kmod-alx/linux-libre-kmod-alx.install deleted file mode 100644 index 069348192..000000000 --- a/libre-testing/linux-libre-kmod-alx/linux-libre-kmod-alx.install +++ /dev/null @@ -1,32 +0,0 @@ -generic() { - echo " > Running depmod now..." - depmod -a -} - -unload() { - lsmod | grep alx > /dev/null - if [ "$?" = "0" ]; then - rmmod alx - fi -} - -post_install() { - generic - echo " > Reloading alx module..." - echo " Please note that you may REBOOT your system to get it works!" - unload - sleep 0.5 - modprobe alx -} - -post_upgrade() { - post_install -} - -post_remove() { - generic - echo " > Unloading memory resident module..." - unload - rmmod compat - echo " Module unloaded!." -} diff --git a/libre-testing/linux-libre/ChangeLog b/libre-testing/linux-libre/ChangeLog deleted file mode 100644 index 12f517b4f..000000000 --- a/libre-testing/linux-libre/ChangeLog +++ /dev/null @@ -1,35 +0,0 @@ -2012-04-30 André Silva <emulatorman@lavabit.com> - - * linux-libre-3.9-2 - * Removed CONFIG_STUB_POULSBO module from config files - - -2012-12-19 André Silva <emulatorman@lavabit.com> - - * linux-libre-3.7.1-1 - * Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" - -2012-06-23 André Silva <emulatorman@lavabit.com> - - * linux-libre-3.4.4-1 - * Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com. - -2012-05-26 André Silva <emulatorman@lavabit.com> - - * linux-libre-3.4-1.2 - * Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116 - -2012-04-24 André Silva <emulatorman@lavabit.com> - - * linux-libre-3.3.3-1 - * Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 - -2012-04-08 André Silva <emulatorman@lavabit.com> - - * linux-libre-3.3.1-1.1 - * Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47 - -2012-03-03 André Silva <emulatorman@lavabit.com> - - * linux-libre-2.3.9-2 - * Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14 diff --git a/libre-testing/linux-libre/Kbuild b/libre-testing/linux-libre/Kbuild deleted file mode 100644 index 8a9d7dceb..000000000 --- a/libre-testing/linux-libre/Kbuild +++ /dev/null @@ -1,19 +0,0 @@ -# Fail on warnings - also for files referenced in subdirs -# -Werror can be disabled for specific files using: -# CFLAGS_<file.o> := -Wno-error -subdir-ccflags-y := -Wno-error - -# platform specific definitions -include arch/mips/Kbuild.platforms -obj-y := $(platform-y) - -# make clean traverses $(obj-) without having included .config, so -# everything ends up here -obj- := $(platform-) - -# mips object files -# The object files are linked as core-y files would be linked - -obj-y += kernel/ -obj-y += mm/ -obj-y += math-emu/ diff --git a/libre-testing/linux-libre/Kbuild.platforms b/libre-testing/linux-libre/Kbuild.platforms deleted file mode 100644 index 90a226888..000000000 --- a/libre-testing/linux-libre/Kbuild.platforms +++ /dev/null @@ -1,6 +0,0 @@ -# All platforms listed in alphabetic order - -platforms += loongson - -# include the platform specific files -include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms)) diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD deleted file mode 100644 index 20a2c797f..000000000 --- a/libre-testing/linux-libre/PKGBUILD +++ /dev/null @@ -1,409 +0,0 @@ -# $Id: PKGBUILD 183980 2013-04-30 07:21:06Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Baechler <thomas@archlinux.org> -# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> -# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -pkgbase=linux-libre # Build stock -LIBRE kernel -#pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.9 -#_sublevel=10 -#pkgver=${_basekernel}.${_sublevel} -pkgver=${_basekernel} -pkgrel=2 -#_lxopkgver=${_basekernel}.9 # 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" - # the main kernel config files - 'config.i686' 'config.x86_64' - # standard config files for mkinitcpio ramdisk - "${pkgbase}.preset" - 'Kbuild' - '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=('120df29f88622dabf7015a22c7cc8e25' - #'fd9713a31ee671a9dec8ad0e65996c84' - '800a05fd0073ffefe4ac90f0e7f3b195' - '05f671feaa31746483e57b9893dd30fb' - 'e49ac236dfeef709f91a3d993ea7b62c' - '2967cecc3af9f954ccc822fd63dca6ff' - '8267264d9a8966e57fdacd1fa1fc65c4' - '04b21c79df0a952c22d681dd4f4562df' - 'f3def2cefdcbb954c21d8505d23cc83c') - #'259774469ac9b2b1f41cf2f978743055') -#if [ "$CARCH" != "mips64el" ]; then -# # Don't use the Loongson-specific patches on non-mips64el arches. -# unset source[${#source[@]}-1] -# unset md5sums[${#md5sums[@]}-1] -#fi - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE - -prepare() { - cd "${srcdir}/linux-${_basekernel}" - - if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" - fi - - # Add freedo as boot logo - patch -Np1 -i "${srcdir}/boot-logo.patch" - - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) - # remove this when a Kconfig knob is made available by upstream - # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) - patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - - if [ "$CARCH" == "mips64el" ]; then - sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile - sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ - < "${srcdir}/lxo-config.patch" > lxo-config.patch - msg2 "Adding loongson-community patches" - patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch - patch -Np0 -i lxo-config.patch - -# ensure N32, add localversion, remove uevent helper as per -# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README -# and make USB storage support builtin (e.g. for booting from USB -# disks without slowly loading an initramfs) - sed -ri \ - -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ - -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ - -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \ - -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \ - ./.config - else - cat "${srcdir}/config.${CARCH}" > ./.config # simpler - fi - - if [ "${_kernelname}" != "" ]; then - sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config - sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config - fi - - # set extraversion to pkgrel - sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile - - # 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 - - # load configuration - # Configure the kernel. Replace the line below with one of your choice. - #make menuconfig # CLI menu for configuration - #make nconfig # new CLI menu for configuration - #make xconfig # X-based configuration - #make oldconfig # using old config from previous kernel version - # ... or manually edit .config - - # rewrite configuration - yes "" | make config >/dev/null - - # save configuration for later reuse - if [ "${CARCH}" = "x86_64" ]; then - cat .config > "${startdir}/config.x86_64.last" - else - cat .config > "${startdir}/config.i686.last" - fi - - #################### - # stop here - # this is useful to configure the kernel - #msg "Stopping build"; return 1 - #################### - - # build! - if [ "$CARCH" == "mips64el" ]; then - # The build system passes it directly to linker, disable to avoid - # having unknown -Wl,... options. - export LDFLAGS="" - # bzImage is arch-specific and not supported on mips; vmlinux is - # useful for oprofile. - make ${MAKEFLAGS} LOCALVERSION= vmlinux vmlinuz modules - else - make ${MAKEFLAGS} LOCALVERSION= bzImage modules - fi -} - -_package() { - pkgdesc="The ${pkgbase} kernel and modules" - [ "${pkgbase}" = "linux-libre" ] && groups=('base') - depends=('coreutils' 'linux-libre-firmware' 'kmod') - optdepends=('crda: to set the correct wireless channels of your country') - provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") - conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") - replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") - backup=("etc/mkinitcpio.d/${pkgbase}.preset") - install=${pkgbase}.install - if [ "$CARCH" = "mips64el" ]; then - optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)') - conflicts+=('mkinitcpio<0.7') - else - depends+=('mkinitcpio>=0.7') - fi - - cd "${srcdir}/linux-${_basekernel}" - - KARCH=x86 - [ $CARCH = "mips64el" ] && KARCH=mips - - # get kernel version - _kernver="$(make LOCALVERSION= kernelrelease)" - _basekernel=${_kernver%%-*} - _basekernel=${_basekernel%.*} - - mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} - make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install - - if [ "$CARCH" == "mips64el" ]; then - cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}" - cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}" - else - cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}" - fi - - # add vmlinux - install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" - - # install fallback mkinitcpio.conf file and preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # set correct depmod command for install - sed \ - -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ - -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${pkgbase}.install" - sed \ - -e "1s|'linux*.*'|'${pkgbase}'|" \ - -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ - -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \ - -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ - -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - -# mkinitcpio 0.7 relies on bzImage to find the kernel version - if [ "$CARCH" == "mips64el" ]; then - sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \ - -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - fi - - # 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}${_localversionname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules" - # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version" - - # Now we call depmod... - depmod -b "$pkgdir" -F System.map "$_kernver" - - # move module tree /lib -> /usr/lib - mv "$pkgdir/lib" "$pkgdir/usr" -} - -_package-headers() { - pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel" - provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}") - conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers") - replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers") - - KARCH=x86 - [ $CARCH = "mips64el" ] && KARCH=mips - -# In case of repackaging this is empty - if [ -z "${_kernver}" ]; then - cd "${srcdir}/linux-${_basekernel}" - _kernver="$(make LOCALVERSION= kernelrelease)" - fi - - install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" - - cd "${pkgdir}/usr/lib/modules/${_kernver}" - ln -sf ../../../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 config crypto drm generated keys linux math-emu \ - media net pcmcia scsi sound trace uapi video xen; 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/${KARCH}" - cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - - # copy files necessary for later builds - cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}" - cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" - - if [ "$CARCH" = "mips64el" ]; then - cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" - fi - - # 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 - # pci - for i in bt8xx cx88 saa7134; do - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" - cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" - done - # usb - for i in cpia2 em28xx pwc sn9c102; do - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" - cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" - done - # i2c - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c" - cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" - for i in cx25840; do - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" - cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${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-core" - cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/" - # and... - # 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/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" - - # add dvb headers - # in reference to: - # http://bugs.archlinux.org/task/20402 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb" - cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/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/tuners" - cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/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 - - 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,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} - if [ "$CARCH" = "mips64el" ]; then - rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 - else - rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips - fi -} - -_package-docs() { - pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel" - provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}") - conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") - replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") - - cd "${srcdir}/linux-${_basekernel}" - - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}" - cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}" - find "${pkgdir}" -type f -exec chmod 444 {} \; - find "${pkgdir}" -type d -exec chmod 755 {} \; - - # remove a file already in linux package - rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" -} - -pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") -for _p in ${pkgname[@]}; do - eval "package_${_p}() { - _package${_p#${pkgbase}} - }" -done - -# vim:set ts=8 sts=2 sw=2 et: diff --git a/libre-testing/linux-libre/boot-logo.patch b/libre-testing/linux-libre/boot-logo.patch deleted file mode 100644 index c392928a5..000000000 --- a/libre-testing/linux-libre/boot-logo.patch +++ /dev/null @@ -1,23163 +0,0 @@ -diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm ---- linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm 2011-06-02 21:34:20.000000000 -0300 -+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm 2011-06-22 13:42:06.000000000 -0300 -@@ -1,1604 +1,861 @@ - P3 --# Standard 224-color Linux logo --80 80 -+80 78 - 255 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 6 6 6 10 10 10 10 10 10 -- 10 10 10 6 6 6 6 6 6 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 10 10 10 14 14 14 -- 22 22 22 26 26 26 30 30 30 34 34 34 -- 30 30 30 30 30 30 26 26 26 18 18 18 -- 14 14 14 10 10 10 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 14 14 14 26 26 26 42 42 42 -- 54 54 54 66 66 66 78 78 78 78 78 78 -- 78 78 78 74 74 74 66 66 66 54 54 54 -- 42 42 42 26 26 26 18 18 18 10 10 10 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 22 22 22 42 42 42 66 66 66 86 86 86 -- 66 66 66 38 38 38 38 38 38 22 22 22 -- 26 26 26 34 34 34 54 54 54 66 66 66 -- 86 86 86 70 70 70 46 46 46 26 26 26 -- 14 14 14 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 10 10 10 26 26 26 -- 50 50 50 82 82 82 58 58 58 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 6 6 6 54 54 54 86 86 86 66 66 66 -- 38 38 38 18 18 18 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 22 22 22 50 50 50 -- 78 78 78 34 34 34 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 6 6 6 70 70 70 -- 78 78 78 46 46 46 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 18 18 18 42 42 42 82 82 82 -- 26 26 26 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 14 14 14 -- 46 46 46 34 34 34 6 6 6 2 2 6 -- 42 42 42 78 78 78 42 42 42 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 0 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 10 10 10 30 30 30 66 66 66 58 58 58 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 26 26 26 -- 86 86 86 101 101 101 46 46 46 10 10 10 -- 2 2 6 58 58 58 70 70 70 34 34 34 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 14 14 14 42 42 42 86 86 86 10 10 10 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 30 30 30 -- 94 94 94 94 94 94 58 58 58 26 26 26 -- 2 2 6 6 6 6 78 78 78 54 54 54 -- 22 22 22 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 22 22 22 62 62 62 62 62 62 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 26 26 26 -- 54 54 54 38 38 38 18 18 18 10 10 10 -- 2 2 6 2 2 6 34 34 34 82 82 82 -- 38 38 38 14 14 14 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 30 30 30 78 78 78 30 30 30 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 10 10 10 -- 10 10 10 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 78 78 78 -- 50 50 50 18 18 18 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 38 38 38 86 86 86 14 14 14 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 54 54 54 -- 66 66 66 26 26 26 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 42 42 42 82 82 82 2 2 6 2 2 6 -- 2 2 6 6 6 6 10 10 10 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 6 6 6 -- 14 14 14 10 10 10 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 18 18 18 -- 82 82 82 34 34 34 10 10 10 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 46 46 46 86 86 86 2 2 6 2 2 6 -- 6 6 6 6 6 6 22 22 22 34 34 34 -- 6 6 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 18 18 18 34 34 34 -- 10 10 10 50 50 50 22 22 22 2 2 6 -- 2 2 6 2 2 6 2 2 6 10 10 10 -- 86 86 86 42 42 42 14 14 14 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 46 46 46 86 86 86 2 2 6 2 2 6 -- 38 38 38 116 116 116 94 94 94 22 22 22 -- 22 22 22 2 2 6 2 2 6 2 2 6 -- 14 14 14 86 86 86 138 138 138 162 162 162 --154 154 154 38 38 38 26 26 26 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 86 86 86 46 46 46 14 14 14 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 46 46 46 86 86 86 2 2 6 14 14 14 --134 134 134 198 198 198 195 195 195 116 116 116 -- 10 10 10 2 2 6 2 2 6 6 6 6 --101 98 89 187 187 187 210 210 210 218 218 218 --214 214 214 134 134 134 14 14 14 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 86 86 86 50 50 50 18 18 18 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 1 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 46 46 46 86 86 86 2 2 6 54 54 54 --218 218 218 195 195 195 226 226 226 246 246 246 -- 58 58 58 2 2 6 2 2 6 30 30 30 --210 210 210 253 253 253 174 174 174 123 123 123 --221 221 221 234 234 234 74 74 74 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 70 70 70 58 58 58 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 46 46 46 82 82 82 2 2 6 106 106 106 --170 170 170 26 26 26 86 86 86 226 226 226 --123 123 123 10 10 10 14 14 14 46 46 46 --231 231 231 190 190 190 6 6 6 70 70 70 -- 90 90 90 238 238 238 158 158 158 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 70 70 70 58 58 58 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 1 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 42 42 42 86 86 86 6 6 6 116 116 116 --106 106 106 6 6 6 70 70 70 149 149 149 --128 128 128 18 18 18 38 38 38 54 54 54 --221 221 221 106 106 106 2 2 6 14 14 14 -- 46 46 46 190 190 190 198 198 198 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 74 74 74 62 62 62 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 1 0 0 0 -- 0 0 1 0 0 0 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 42 42 42 94 94 94 14 14 14 101 101 101 --128 128 128 2 2 6 18 18 18 116 116 116 --118 98 46 121 92 8 121 92 8 98 78 10 --162 162 162 106 106 106 2 2 6 2 2 6 -- 2 2 6 195 195 195 195 195 195 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 74 74 74 62 62 62 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 1 0 0 1 -- 0 0 1 0 0 0 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 38 38 38 90 90 90 14 14 14 58 58 58 --210 210 210 26 26 26 54 38 6 154 114 10 --226 170 11 236 186 11 225 175 15 184 144 12 --215 174 15 175 146 61 37 26 9 2 2 6 -- 70 70 70 246 246 246 138 138 138 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 70 70 70 66 66 66 26 26 26 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 38 38 38 86 86 86 14 14 14 10 10 10 --195 195 195 188 164 115 192 133 9 225 175 15 --239 182 13 234 190 10 232 195 16 232 200 30 --245 207 45 241 208 19 232 195 16 184 144 12 --218 194 134 211 206 186 42 42 42 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 50 50 50 74 74 74 30 30 30 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 34 34 34 86 86 86 14 14 14 2 2 6 --121 87 25 192 133 9 219 162 10 239 182 13 --236 186 11 232 195 16 241 208 19 244 214 54 --246 218 60 246 218 38 246 215 20 241 208 19 --241 208 19 226 184 13 121 87 25 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 50 50 50 82 82 82 34 34 34 10 10 10 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 34 34 34 82 82 82 30 30 30 61 42 6 --180 123 7 206 145 10 230 174 11 239 182 13 --234 190 10 238 202 15 241 208 19 246 218 74 --246 218 38 246 215 20 246 215 20 246 215 20 --226 184 13 215 174 15 184 144 12 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 26 26 26 94 94 94 42 42 42 14 14 14 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 78 78 78 50 50 50 104 69 6 --192 133 9 216 158 10 236 178 12 236 186 11 --232 195 16 241 208 19 244 214 54 245 215 43 --246 215 20 246 215 20 241 208 19 198 155 10 --200 144 11 216 158 10 156 118 10 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 6 6 6 90 90 90 54 54 54 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 78 78 78 46 46 46 22 22 22 --137 92 6 210 162 10 239 182 13 238 190 10 --238 202 15 241 208 19 246 215 20 246 215 20 --241 208 19 203 166 17 185 133 11 210 150 10 --216 158 10 210 150 10 102 78 10 2 2 6 -- 6 6 6 54 54 54 14 14 14 2 2 6 -- 2 2 6 62 62 62 74 74 74 30 30 30 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 34 34 34 78 78 78 50 50 50 6 6 6 -- 94 70 30 139 102 15 190 146 13 226 184 13 --232 200 30 232 195 16 215 174 15 190 146 13 --168 122 10 192 133 9 210 150 10 213 154 11 --202 150 34 182 157 106 101 98 89 2 2 6 -- 2 2 6 78 78 78 116 116 116 58 58 58 -- 2 2 6 22 22 22 90 90 90 46 46 46 -- 18 18 18 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 38 38 38 86 86 86 50 50 50 6 6 6 --128 128 128 174 154 114 156 107 11 168 122 10 --198 155 10 184 144 12 197 138 11 200 144 11 --206 145 10 206 145 10 197 138 11 188 164 115 --195 195 195 198 198 198 174 174 174 14 14 14 -- 2 2 6 22 22 22 116 116 116 116 116 116 -- 22 22 22 2 2 6 74 74 74 70 70 70 -- 30 30 30 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 50 50 50 101 101 101 26 26 26 10 10 10 --138 138 138 190 190 190 174 154 114 156 107 11 --197 138 11 200 144 11 197 138 11 192 133 9 --180 123 7 190 142 34 190 178 144 187 187 187 --202 202 202 221 221 221 214 214 214 66 66 66 -- 2 2 6 2 2 6 50 50 50 62 62 62 -- 6 6 6 2 2 6 10 10 10 90 90 90 -- 50 50 50 18 18 18 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 10 10 10 34 34 34 -- 74 74 74 74 74 74 2 2 6 6 6 6 --144 144 144 198 198 198 190 190 190 178 166 146 --154 121 60 156 107 11 156 107 11 168 124 44 --174 154 114 187 187 187 190 190 190 210 210 210 --246 246 246 253 253 253 253 253 253 182 182 182 -- 6 6 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 62 62 62 -- 74 74 74 34 34 34 14 14 14 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 10 10 10 22 22 22 54 54 54 -- 94 94 94 18 18 18 2 2 6 46 46 46 --234 234 234 221 221 221 190 190 190 190 190 190 --190 190 190 187 187 187 187 187 187 190 190 190 --190 190 190 195 195 195 214 214 214 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 -- 82 82 82 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 14 14 14 -- 86 86 86 54 54 54 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 18 18 18 46 46 46 90 90 90 -- 46 46 46 18 18 18 6 6 6 182 182 182 --253 253 253 246 246 246 206 206 206 190 190 190 --190 190 190 190 190 190 190 190 190 190 190 190 --206 206 206 231 231 231 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --202 202 202 14 14 14 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 42 42 42 86 86 86 42 42 42 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 14 14 14 38 38 38 74 74 74 66 66 66 -- 2 2 6 6 6 6 90 90 90 250 250 250 --253 253 253 253 253 253 238 238 238 198 198 198 --190 190 190 190 190 190 195 195 195 221 221 221 --246 246 246 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 82 82 82 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 78 78 78 70 70 70 34 34 34 -- 14 14 14 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 34 34 34 66 66 66 78 78 78 6 6 6 -- 2 2 6 18 18 18 218 218 218 253 253 253 --253 253 253 253 253 253 253 253 253 246 246 246 --226 226 226 231 231 231 246 246 246 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 178 178 178 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 18 18 18 90 90 90 62 62 62 -- 30 30 30 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 10 10 10 26 26 26 -- 58 58 58 90 90 90 18 18 18 2 2 6 -- 2 2 6 110 110 110 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 231 231 231 18 18 18 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 18 18 18 94 94 94 -- 54 54 54 26 26 26 10 10 10 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 22 22 22 50 50 50 -- 90 90 90 26 26 26 2 2 6 2 2 6 -- 14 14 14 195 195 195 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 242 242 242 54 54 54 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 38 38 38 -- 86 86 86 50 50 50 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 14 14 14 38 38 38 82 82 82 -- 34 34 34 2 2 6 2 2 6 2 2 6 -- 42 42 42 195 195 195 246 246 246 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 --242 242 242 242 242 242 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 250 250 250 246 246 246 238 238 238 --226 226 226 231 231 231 101 101 101 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 38 38 38 82 82 82 42 42 42 14 14 14 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 10 10 10 26 26 26 62 62 62 66 66 66 -- 2 2 6 2 2 6 2 2 6 6 6 6 -- 70 70 70 170 170 170 206 206 206 234 234 234 --246 246 246 250 250 250 250 250 250 238 238 238 --226 226 226 231 231 231 238 238 238 250 250 250 --250 250 250 250 250 250 246 246 246 231 231 231 --214 214 214 206 206 206 202 202 202 202 202 202 --198 198 198 202 202 202 182 182 182 18 18 18 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 62 62 62 66 66 66 30 30 30 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 14 14 14 42 42 42 82 82 82 18 18 18 -- 2 2 6 2 2 6 2 2 6 10 10 10 -- 94 94 94 182 182 182 218 218 218 242 242 242 --250 250 250 253 253 253 253 253 253 250 250 250 --234 234 234 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 246 246 246 --238 238 238 226 226 226 210 210 210 202 202 202 --195 195 195 195 195 195 210 210 210 158 158 158 -- 6 6 6 14 14 14 50 50 50 14 14 14 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 6 6 6 86 86 86 46 46 46 -- 18 18 18 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 22 22 22 54 54 54 70 70 70 2 2 6 -- 2 2 6 10 10 10 2 2 6 22 22 22 --166 166 166 231 231 231 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 --242 242 242 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 246 246 246 --231 231 231 206 206 206 198 198 198 226 226 226 -- 94 94 94 2 2 6 6 6 6 38 38 38 -- 30 30 30 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 62 62 62 66 66 66 -- 26 26 26 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 74 74 74 50 50 50 2 2 6 -- 26 26 26 26 26 26 2 2 6 106 106 106 --238 238 238 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 246 246 246 218 218 218 202 202 202 --210 210 210 14 14 14 2 2 6 2 2 6 -- 30 30 30 22 22 22 2 2 6 2 2 6 -- 2 2 6 2 2 6 18 18 18 86 86 86 -- 42 42 42 14 14 14 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 42 42 42 90 90 90 22 22 22 2 2 6 -- 42 42 42 2 2 6 18 18 18 218 218 218 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 250 250 250 221 221 221 --218 218 218 101 101 101 2 2 6 14 14 14 -- 18 18 18 38 38 38 10 10 10 2 2 6 -- 2 2 6 2 2 6 2 2 6 78 78 78 -- 58 58 58 22 22 22 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 54 54 54 82 82 82 2 2 6 26 26 26 -- 22 22 22 2 2 6 123 123 123 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 --238 238 238 198 198 198 6 6 6 38 38 38 -- 58 58 58 26 26 26 38 38 38 2 2 6 -- 2 2 6 2 2 6 2 2 6 46 46 46 -- 78 78 78 30 30 30 10 10 10 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 10 10 10 30 30 30 -- 74 74 74 58 58 58 2 2 6 42 42 42 -- 2 2 6 22 22 22 231 231 231 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 246 246 246 46 46 46 38 38 38 -- 42 42 42 14 14 14 38 38 38 14 14 14 -- 2 2 6 2 2 6 2 2 6 6 6 6 -- 86 86 86 46 46 46 14 14 14 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 14 14 14 42 42 42 -- 90 90 90 18 18 18 18 18 18 26 26 26 -- 2 2 6 116 116 116 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 250 250 250 238 238 238 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 94 94 94 6 6 6 -- 2 2 6 2 2 6 10 10 10 34 34 34 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 74 74 74 58 58 58 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 10 10 10 26 26 26 66 66 66 -- 82 82 82 2 2 6 38 38 38 6 6 6 -- 14 14 14 210 210 210 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 246 246 246 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 144 144 144 2 2 6 -- 2 2 6 2 2 6 2 2 6 46 46 46 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 42 42 42 74 74 74 30 30 30 10 10 10 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 14 14 14 42 42 42 90 90 90 -- 26 26 26 6 6 6 42 42 42 2 2 6 -- 74 74 74 250 250 250 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 242 242 242 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 182 182 182 2 2 6 -- 2 2 6 2 2 6 2 2 6 46 46 46 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 10 10 10 86 86 86 38 38 38 10 10 10 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 10 10 10 26 26 26 66 66 66 82 82 82 -- 2 2 6 22 22 22 18 18 18 2 2 6 --149 149 149 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 206 206 206 2 2 6 -- 2 2 6 2 2 6 2 2 6 38 38 38 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 6 6 6 86 86 86 46 46 46 14 14 14 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 18 18 18 46 46 46 86 86 86 18 18 18 -- 2 2 6 34 34 34 10 10 10 6 6 6 --210 210 210 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 221 221 221 6 6 6 -- 2 2 6 2 2 6 6 6 6 30 30 30 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 82 82 82 54 54 54 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 26 26 26 66 66 66 62 62 62 2 2 6 -- 2 2 6 38 38 38 10 10 10 26 26 26 --238 238 238 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 238 238 238 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 6 6 6 -- 2 2 6 2 2 6 10 10 10 30 30 30 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 66 66 66 58 58 58 22 22 22 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 38 38 38 78 78 78 6 6 6 2 2 6 -- 2 2 6 46 46 46 14 14 14 42 42 42 --246 246 246 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 10 10 10 -- 2 2 6 2 2 6 22 22 22 14 14 14 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 66 66 66 62 62 62 22 22 22 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 50 50 50 74 74 74 2 2 6 2 2 6 -- 14 14 14 70 70 70 34 34 34 62 62 62 --250 250 250 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 14 14 14 -- 2 2 6 2 2 6 30 30 30 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 66 66 66 62 62 62 22 22 22 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 54 54 54 62 62 62 2 2 6 2 2 6 -- 2 2 6 30 30 30 46 46 46 70 70 70 --250 250 250 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 226 226 226 10 10 10 -- 2 2 6 6 6 6 30 30 30 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 66 66 66 58 58 58 22 22 22 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 22 22 22 -- 58 58 58 62 62 62 2 2 6 2 2 6 -- 2 2 6 2 2 6 30 30 30 78 78 78 --250 250 250 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 206 206 206 2 2 6 -- 22 22 22 34 34 34 18 14 6 22 22 22 -- 26 26 26 18 18 18 6 6 6 2 2 6 -- 2 2 6 82 82 82 54 54 54 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 26 26 26 -- 62 62 62 106 106 106 74 54 14 185 133 11 --210 162 10 121 92 8 6 6 6 62 62 62 --238 238 238 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 158 158 158 18 18 18 -- 14 14 14 2 2 6 2 2 6 2 2 6 -- 6 6 6 18 18 18 66 66 66 38 38 38 -- 6 6 6 94 94 94 50 50 50 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 10 10 10 10 10 10 18 18 18 38 38 38 -- 78 78 78 142 134 106 216 158 10 242 186 14 --246 190 14 246 190 14 156 118 10 10 10 10 -- 90 90 90 238 238 238 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 250 250 250 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 246 230 190 --238 204 91 238 204 91 181 142 44 37 26 9 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 38 38 38 46 46 46 -- 26 26 26 106 106 106 54 54 54 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 14 14 14 22 22 22 -- 30 30 30 38 38 38 50 50 50 70 70 70 --106 106 106 190 142 34 226 170 11 242 186 14 --246 190 14 246 190 14 246 190 14 154 114 10 -- 6 6 6 74 74 74 226 226 226 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 250 250 250 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 228 184 62 --241 196 14 241 208 19 232 195 16 38 30 10 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 6 6 6 30 30 30 26 26 26 --203 166 17 154 142 90 66 66 66 26 26 26 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 18 18 18 38 38 38 58 58 58 -- 78 78 78 86 86 86 101 101 101 123 123 123 --175 146 61 210 150 10 234 174 13 246 186 14 --246 190 14 246 190 14 246 190 14 238 190 10 --102 78 10 2 2 6 46 46 46 198 198 198 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 224 178 62 --242 186 14 241 196 14 210 166 10 22 18 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 6 6 6 121 92 8 --238 202 15 232 195 16 82 82 82 34 34 34 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 14 14 14 38 38 38 70 70 70 154 122 46 --190 142 34 200 144 11 197 138 11 197 138 11 --213 154 11 226 170 11 242 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --225 175 15 46 32 6 2 2 6 22 22 22 --158 158 158 250 250 250 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 250 250 250 242 242 242 224 178 62 --239 182 13 236 186 11 213 154 11 46 32 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 61 42 6 225 175 15 --238 190 10 236 186 11 112 100 78 42 42 42 -- 14 14 14 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 22 22 22 54 54 54 154 122 46 213 154 11 --226 170 11 230 174 11 226 170 11 226 170 11 --236 178 12 242 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --241 196 14 184 144 12 10 10 10 2 2 6 -- 6 6 6 116 116 116 242 242 242 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 231 231 231 198 198 198 214 170 54 --236 178 12 236 178 12 210 150 10 137 92 6 -- 18 14 6 2 2 6 2 2 6 2 2 6 -- 6 6 6 70 47 6 200 144 11 236 178 12 --239 182 13 239 182 13 124 112 88 58 58 58 -- 22 22 22 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 70 70 70 180 133 36 226 170 11 --239 182 13 242 186 14 242 186 14 246 186 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 232 195 16 98 70 6 2 2 6 -- 2 2 6 2 2 6 66 66 66 221 221 221 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 206 206 206 198 198 198 214 166 58 --230 174 11 230 174 11 216 158 10 192 133 9 --163 110 8 116 81 8 102 78 10 116 81 8 --167 114 7 197 138 11 226 170 11 239 182 13 --242 186 14 242 186 14 162 146 94 78 78 78 -- 34 34 34 14 14 14 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 30 30 30 78 78 78 190 142 34 226 170 11 --239 182 13 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 241 196 14 203 166 17 22 18 6 -- 2 2 6 2 2 6 2 2 6 38 38 38 --218 218 218 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 206 206 206 198 198 198 202 162 69 --226 170 11 236 178 12 224 166 10 210 150 10 --200 144 11 197 138 11 192 133 9 197 138 11 --210 150 10 226 170 11 242 186 14 246 190 14 --246 190 14 246 186 14 225 175 15 124 112 88 -- 62 62 62 30 30 30 14 14 14 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 78 78 78 174 135 50 224 166 10 --239 182 13 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 241 196 14 139 102 15 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 78 78 78 250 250 250 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 214 214 214 198 198 198 190 150 46 --219 162 10 236 178 12 234 174 13 224 166 10 --216 158 10 213 154 11 213 154 11 216 158 10 --226 170 11 239 182 13 246 190 14 246 190 14 --246 190 14 246 190 14 242 186 14 206 162 42 --101 101 101 58 58 58 30 30 30 14 14 14 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 74 74 74 174 135 50 216 158 10 --236 178 12 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 241 196 14 226 184 13 -- 61 42 6 2 2 6 2 2 6 2 2 6 -- 22 22 22 238 238 238 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 226 226 226 187 187 187 180 133 36 --216 158 10 236 178 12 239 182 13 236 178 12 --230 174 11 226 170 11 226 170 11 230 174 11 --236 178 12 242 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 186 14 239 182 13 --206 162 42 106 106 106 66 66 66 34 34 34 -- 14 14 14 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 26 26 26 70 70 70 163 133 67 213 154 11 --236 178 12 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 241 196 14 --190 146 13 18 14 6 2 2 6 2 2 6 -- 46 46 46 246 246 246 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 221 221 221 86 86 86 156 107 11 --216 158 10 236 178 12 242 186 14 246 186 14 --242 186 14 239 182 13 239 182 13 242 186 14 --242 186 14 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --242 186 14 225 175 15 142 122 72 66 66 66 -- 30 30 30 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 26 26 26 70 70 70 163 133 67 210 150 10 --236 178 12 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --232 195 16 121 92 8 34 34 34 106 106 106 --221 221 221 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --242 242 242 82 82 82 18 14 6 163 110 8 --216 158 10 236 178 12 242 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 242 186 14 163 133 67 -- 46 46 46 18 18 18 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 78 78 78 163 133 67 210 150 10 --236 178 12 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --241 196 14 215 174 15 190 178 144 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 218 218 218 -- 58 58 58 2 2 6 22 18 6 167 114 7 --216 158 10 236 178 12 246 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 186 14 242 186 14 190 150 46 -- 54 54 54 22 22 22 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 38 38 38 86 86 86 180 133 36 213 154 11 --236 178 12 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 232 195 16 190 146 13 214 214 214 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 250 250 250 170 170 170 26 26 26 -- 2 2 6 2 2 6 37 26 9 163 110 8 --219 162 10 239 182 13 246 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 186 14 236 178 12 224 166 10 142 122 72 -- 46 46 46 18 18 18 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 50 50 50 109 106 95 192 133 9 224 166 10 --242 186 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --242 186 14 226 184 13 210 162 10 142 110 46 --226 226 226 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --198 198 198 66 66 66 2 2 6 2 2 6 -- 2 2 6 2 2 6 50 34 6 156 107 11 --219 162 10 239 182 13 246 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 242 186 14 --234 174 13 213 154 11 154 122 46 66 66 66 -- 30 30 30 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 22 22 22 -- 58 58 58 154 121 60 206 145 10 234 174 13 --242 186 14 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 186 14 236 178 12 210 162 10 163 110 8 -- 61 42 6 138 138 138 218 218 218 250 250 250 --253 253 253 253 253 253 253 253 253 250 250 250 --242 242 242 210 210 210 144 144 144 66 66 66 -- 6 6 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 61 42 6 163 110 8 --216 158 10 236 178 12 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 239 182 13 230 174 11 216 158 10 --190 142 34 124 112 88 70 70 70 38 38 38 -- 18 18 18 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 22 22 22 -- 62 62 62 168 124 44 206 145 10 224 166 10 --236 178 12 239 182 13 242 186 14 242 186 14 --246 186 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 236 178 12 216 158 10 175 118 6 -- 80 54 7 2 2 6 6 6 6 30 30 30 -- 54 54 54 62 62 62 50 50 50 38 38 38 -- 14 14 14 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 6 6 6 80 54 7 167 114 7 --213 154 11 236 178 12 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 242 186 14 239 182 13 239 182 13 --230 174 11 210 150 10 174 135 50 124 112 88 -- 82 82 82 54 54 54 34 34 34 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 50 50 50 158 118 36 192 133 9 200 144 11 --216 158 10 219 162 10 224 166 10 226 170 11 --230 174 11 236 178 12 239 182 13 239 182 13 --242 186 14 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 186 14 230 174 11 210 150 10 163 110 8 --104 69 6 10 10 10 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 6 6 6 91 60 6 167 114 7 --206 145 10 230 174 11 242 186 14 246 190 14 --246 190 14 246 190 14 246 186 14 242 186 14 --239 182 13 230 174 11 224 166 10 213 154 11 --180 133 36 124 112 88 86 86 86 58 58 58 -- 38 38 38 22 22 22 10 10 10 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 34 34 34 70 70 70 138 110 50 158 118 36 --167 114 7 180 123 7 192 133 9 197 138 11 --200 144 11 206 145 10 213 154 11 219 162 10 --224 166 10 230 174 11 239 182 13 242 186 14 --246 186 14 246 186 14 246 186 14 246 186 14 --239 182 13 216 158 10 185 133 11 152 99 6 --104 69 6 18 14 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 6 6 6 80 54 7 152 99 6 --192 133 9 219 162 10 236 178 12 239 182 13 --246 186 14 242 186 14 239 182 13 236 178 12 --224 166 10 206 145 10 192 133 9 154 121 60 -- 94 94 94 62 62 62 42 42 42 22 22 22 -- 14 14 14 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 18 18 18 34 34 34 58 58 58 78 78 78 --101 98 89 124 112 88 142 110 46 156 107 11 --163 110 8 167 114 7 175 118 6 180 123 7 --185 133 11 197 138 11 210 150 10 219 162 10 --226 170 11 236 178 12 236 178 12 234 174 13 --219 162 10 197 138 11 163 110 8 130 83 6 -- 91 60 6 10 10 10 2 2 6 2 2 6 -- 18 18 18 38 38 38 38 38 38 38 38 38 -- 38 38 38 38 38 38 38 38 38 38 38 38 -- 38 38 38 38 38 38 26 26 26 2 2 6 -- 2 2 6 6 6 6 70 47 6 137 92 6 --175 118 6 200 144 11 219 162 10 230 174 11 --234 174 13 230 174 11 219 162 10 210 150 10 --192 133 9 163 110 8 124 112 88 82 82 82 -- 50 50 50 30 30 30 14 14 14 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 14 14 14 22 22 22 34 34 34 -- 42 42 42 58 58 58 74 74 74 86 86 86 --101 98 89 122 102 70 130 98 46 121 87 25 --137 92 6 152 99 6 163 110 8 180 123 7 --185 133 11 197 138 11 206 145 10 200 144 11 --180 123 7 156 107 11 130 83 6 104 69 6 -- 50 34 6 54 54 54 110 110 110 101 98 89 -- 86 86 86 82 82 82 78 78 78 78 78 78 -- 78 78 78 78 78 78 78 78 78 78 78 78 -- 78 78 78 82 82 82 86 86 86 94 94 94 --106 106 106 101 101 101 86 66 34 124 80 6 --156 107 11 180 123 7 192 133 9 200 144 11 --206 145 10 200 144 11 192 133 9 175 118 6 --139 102 15 109 106 95 70 70 70 42 42 42 -- 22 22 22 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 10 10 10 -- 14 14 14 22 22 22 30 30 30 38 38 38 -- 50 50 50 62 62 62 74 74 74 90 90 90 --101 98 89 112 100 78 121 87 25 124 80 6 --137 92 6 152 99 6 152 99 6 152 99 6 --138 86 6 124 80 6 98 70 6 86 66 30 --101 98 89 82 82 82 58 58 58 46 46 46 -- 38 38 38 34 34 34 34 34 34 34 34 34 -- 34 34 34 34 34 34 34 34 34 34 34 34 -- 34 34 34 34 34 34 38 38 38 42 42 42 -- 54 54 54 82 82 82 94 86 76 91 60 6 --134 86 6 156 107 11 167 114 7 175 118 6 --175 118 6 167 114 7 152 99 6 121 87 25 --101 98 89 62 62 62 34 34 34 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 6 6 6 10 10 10 -- 18 18 18 22 22 22 30 30 30 42 42 42 -- 50 50 50 66 66 66 86 86 86 101 98 89 --106 86 58 98 70 6 104 69 6 104 69 6 --104 69 6 91 60 6 82 62 34 90 90 90 -- 62 62 62 38 38 38 22 22 22 14 14 14 -- 10 10 10 10 10 10 10 10 10 10 10 10 -- 10 10 10 10 10 10 6 6 6 10 10 10 -- 10 10 10 10 10 10 10 10 10 14 14 14 -- 22 22 22 42 42 42 70 70 70 89 81 66 -- 80 54 7 104 69 6 124 80 6 137 92 6 --134 86 6 116 81 8 100 82 52 86 86 86 -- 58 58 58 30 30 30 14 14 14 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 10 10 10 14 14 14 -- 18 18 18 26 26 26 38 38 38 54 54 54 -- 70 70 70 86 86 86 94 86 76 89 81 66 -- 89 81 66 86 86 86 74 74 74 50 50 50 -- 30 30 30 14 14 14 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 18 18 18 34 34 34 58 58 58 -- 82 82 82 89 81 66 89 81 66 89 81 66 -- 94 86 66 94 86 76 74 74 74 50 50 50 -- 26 26 26 14 14 14 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 6 6 6 14 14 14 18 18 18 -- 30 30 30 38 38 38 46 46 46 54 54 54 -- 50 50 50 42 42 42 30 30 30 18 18 18 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 14 14 14 26 26 26 -- 38 38 38 50 50 50 58 58 58 58 58 58 -- 54 54 54 42 42 42 30 30 30 18 18 18 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 6 6 6 10 10 10 14 14 14 18 18 18 -- 18 18 18 14 14 14 10 10 10 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 14 14 14 18 18 18 22 22 22 22 22 22 -- 18 18 18 14 14 14 10 10 10 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 6 9 23 30 36 44 54 65 57 72 88 44 54 65 6 12 15 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 31 41 52 -+103 134 161 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 -+82 108 129 8 14 16 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 17 24 30 126 162 196 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 161 203 243 92 119 140 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 154 195 235 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 138 174 208 21 27 33 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 70 96 117 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 49 59 70 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 3 6 52 62 74 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 -+82 108 129 149 191 231 170 212 252 170 212 252 170 212 252 129 165 199 82 108 129 149 191 231 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 37 48 59 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 21 13 4 31 23 12 0 2 0 0 2 0 105 75 32 155 111 43 23 15 7 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 6 9 3 10 13 146 188 228 170 212 252 170 212 252 170 212 252 157 198 239 0 6 9 -+0 2 0 52 62 74 170 212 252 170 212 252 154 195 235 0 6 9 0 2 0 55 66 77 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 151 193 233 17 24 30 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+10 12 8 23 15 7 139 99 44 206 148 61 67 49 21 0 2 0 125 92 35 206 148 61 -+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 96 127 154 170 212 252 170 212 252 170 212 252 170 212 252 92 119 140 21 22 20 -+10 12 8 53 68 84 170 212 252 170 212 252 92 119 140 10 12 8 7 10 5 53 68 84 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 -+0 6 9 0 3 6 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 22 20 -+62 64 61 38 40 37 0 2 0 34 26 8 212 153 66 64 46 18 0 2 0 170 124 49 -+180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 65 87 102 115 117 114 -+43 44 42 88 115 136 170 212 252 170 212 252 68 83 99 108 110 107 60 62 59 88 115 136 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+80 98 121 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 10 12 8 56 58 55 95 96 94 178 180 177 215 217 214 198 200 197 -+158 160 156 138 140 137 82 83 81 0 2 0 64 46 18 228 167 73 23 15 7 41 31 10 -+250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 -+0 2 0 126 162 196 170 212 252 170 212 252 57 72 88 0 2 0 0 2 0 126 162 196 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+157 198 239 8 14 16 0 6 9 0 2 0 45 47 44 195 197 194 192 194 191 38 40 37 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 192 194 191 234 236 233 176 178 175 118 120 117 143 145 142 176 178 175 -+215 217 214 234 236 233 234 236 233 104 106 103 0 2 0 142 101 40 134 100 43 0 2 0 -+164 119 51 170 124 49 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 115 152 185 8 14 16 -+49 59 70 166 207 248 170 212 252 170 212 252 119 150 178 8 14 16 55 66 77 166 207 248 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 92 119 140 0 2 0 0 2 0 200 202 199 254 255 252 254 255 252 244 246 243 -+40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 38 40 37 234 236 233 234 236 233 234 236 233 135 137 134 215 217 214 171 173 170 -+141 142 139 138 140 137 138 140 137 135 137 134 31 32 30 3 6 2 212 153 66 15 9 7 -+78 58 25 248 178 79 41 31 10 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 3 6 21 27 33 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 154 195 235 0 6 9 82 83 81 254 255 252 254 255 252 254 255 252 254 255 252 -+188 190 187 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 62 64 61 234 236 233 234 236 233 234 236 233 198 200 197 131 133 130 198 200 197 -+232 234 231 234 236 233 234 236 233 234 236 233 152 154 151 0 2 0 147 105 44 67 49 21 -+23 15 7 250 179 73 158 114 46 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 61 76 92 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 154 195 235 103 134 161 80 98 121 -+52 62 74 18 22 24 0 2 0 3 10 13 38 45 51 80 98 121 151 193 233 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 109 141 168 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 -+226 228 225 65 66 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 43 44 42 234 236 233 234 236 233 234 236 233 234 236 233 131 133 130 192 194 191 -+152 154 151 141 142 139 141 142 139 141 142 139 158 160 156 3 6 2 82 62 28 129 95 39 -+0 2 0 206 148 61 248 178 79 21 13 4 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 96 115 138 -+170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 18 22 24 0 2 0 0 2 0 -+34 26 8 75 55 22 114 83 33 95 68 30 55 39 17 7 0 0 0 6 9 84 103 125 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 84 103 125 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 171 173 170 -+0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 18 20 17 234 236 233 234 236 233 234 236 233 234 236 233 138 140 137 178 180 177 -+226 228 225 234 236 233 234 236 233 234 236 233 231 233 230 45 47 44 23 15 7 190 136 56 -+0 2 0 147 105 44 250 179 73 64 46 18 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 122 159 192 -+170 212 252 170 212 252 170 212 252 126 162 196 0 2 0 26 20 13 190 136 56 245 175 76 -+250 179 73 161 117 49 164 119 51 245 175 76 250 179 73 206 148 61 75 55 22 0 2 0 -+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 68 83 99 0 2 0 252 254 250 254 255 252 254 255 252 254 255 252 71 73 70 -+8 14 16 88 115 136 17 24 30 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 232 234 231 234 236 233 234 236 233 234 236 233 215 217 214 148 150 147 -+183 185 181 141 142 139 135 137 134 135 137 134 141 142 139 87 89 86 0 2 0 202 145 58 -+3 6 2 88 66 26 250 179 73 109 79 35 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 157 198 239 -+170 212 252 170 212 252 166 207 248 26 33 39 26 20 13 224 163 69 250 179 73 250 179 73 -+250 179 73 197 142 62 202 145 58 250 179 73 250 179 73 250 179 73 234 172 70 21 13 4 -+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 52 62 74 21 22 20 254 255 252 254 255 252 254 255 252 254 255 252 21 22 20 -+49 59 70 170 212 252 166 207 248 91 123 149 8 14 16 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 215 217 214 234 236 233 234 236 233 234 236 233 234 236 233 123 125 122 -+188 190 187 229 231 228 234 236 233 234 236 233 222 224 221 118 120 117 0 2 0 168 123 54 -+34 26 8 67 49 21 250 179 73 134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 34 41 47 170 212 252 -+170 212 252 170 212 252 85 112 133 0 2 0 164 119 51 250 179 73 250 179 73 250 179 73 -+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 129 95 39 -+0 2 0 138 174 208 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 34 44 55 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 24 22 25 -+52 62 74 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 178 180 177 234 236 233 234 236 233 234 236 233 234 236 233 141 142 139 -+198 200 197 148 150 147 135 137 134 135 137 134 148 150 147 123 125 122 0 2 0 190 136 56 -+21 13 4 78 58 25 250 179 73 129 95 39 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 82 108 129 170 212 252 -+170 212 252 170 212 252 23 30 36 58 42 19 250 179 73 250 179 73 250 179 73 250 179 73 -+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 147 105 44 -+0 2 0 139 181 221 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 34 41 47 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 -+25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 6 9 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 91 93 90 234 236 233 234 236 233 234 236 233 234 236 233 126 127 125 -+169 171 168 222 224 221 234 236 233 229 231 228 178 180 177 71 73 70 0 2 0 212 153 66 -+0 2 0 95 68 30 250 179 73 119 87 37 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 138 174 208 170 212 252 -+170 212 252 154 195 235 0 2 0 125 92 35 250 179 73 250 179 73 250 179 73 250 179 73 -+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 119 87 37 -+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 57 72 88 7 10 5 252 254 250 254 255 252 254 255 252 254 255 252 95 96 94 -+0 6 9 166 207 248 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 8 14 16 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 7 10 5 222 224 221 234 236 233 234 236 233 234 236 233 141 142 139 -+183 185 181 138 140 137 131 133 130 141 142 139 192 194 191 102 104 101 0 2 0 224 163 69 -+0 2 0 105 75 32 250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 27 33 170 212 252 170 212 252 -+170 212 252 115 152 185 0 2 0 180 132 57 250 179 73 250 179 73 250 179 73 250 179 73 -+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 10 12 8 -+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 82 108 129 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 158 160 156 -+0 2 0 92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 141 142 139 234 236 233 234 236 233 234 236 233 131 133 130 -+185 187 183 231 233 230 222 224 221 158 160 156 138 140 137 48 50 48 3 6 2 250 179 73 -+134 100 43 206 148 61 218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 75 94 116 170 212 252 170 212 252 -+170 212 252 92 119 140 0 2 0 224 163 69 250 179 73 250 179 73 250 179 73 250 179 73 -+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 87 61 23 7 0 0 -+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 109 141 168 0 2 0 178 180 177 254 255 252 254 255 252 254 255 252 252 254 250 -+39 43 45 10 16 18 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+88 115 136 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 45 47 44 234 236 233 234 236 233 234 236 233 131 133 130 -+148 150 147 138 140 137 148 150 147 210 212 209 152 154 151 26 27 25 29 21 8 250 179 73 -+250 179 73 234 172 70 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 170 212 252 -+170 212 252 103 134 161 0 2 0 202 145 58 250 179 73 250 179 73 250 179 73 250 179 73 -+250 179 73 250 179 73 250 179 73 250 179 73 238 175 73 75 55 22 0 2 0 75 102 123 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 140 177 211 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 -+183 185 181 0 2 0 75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 57 72 88 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 162 164 161 234 236 233 234 236 233 135 137 134 -+226 228 225 198 200 197 104 106 103 15 17 14 0 2 0 15 9 7 147 105 44 250 179 73 -+248 178 79 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 6 9 21 27 33 170 212 252 170 212 252 170 212 252 -+170 212 252 122 159 192 0 2 0 175 129 54 250 179 73 250 179 73 250 179 73 250 179 73 -+250 179 73 250 179 73 250 179 73 202 145 58 55 39 17 0 2 0 82 108 129 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 12 17 20 60 62 59 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 69 71 68 0 6 9 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 159 201 241 26 33 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 162 164 161 215 217 214 95 96 94 -+56 58 55 0 2 0 0 2 0 0 2 0 61 44 16 238 175 73 250 179 73 250 179 73 -+218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 88 115 136 170 212 252 170 212 252 170 212 252 -+170 212 252 143 185 225 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 -+250 179 73 212 153 66 95 68 30 0 2 0 8 14 16 103 134 161 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 68 83 99 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 -+254 255 252 210 212 209 0 6 9 53 68 84 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 126 162 196 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 7 0 0 23 15 7 250 179 73 250 179 73 250 179 73 -+250 179 73 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 6 9 154 195 235 170 212 252 170 212 252 170 212 252 -+170 212 252 166 207 248 0 2 0 52 36 13 158 114 46 180 132 57 161 117 49 119 87 37 -+41 31 10 0 2 0 0 2 0 72 87 103 154 195 235 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 115 152 185 0 2 0 152 154 151 254 255 252 238 241 237 85 87 84 -+229 231 228 254 255 252 99 101 98 0 2 0 126 162 196 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 -+250 179 73 105 75 32 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 32 39 45 0 2 0 57 72 88 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 85 112 133 12 17 20 0 2 0 0 2 0 0 2 0 0 2 0 -+34 41 47 92 110 133 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 166 207 248 6 12 15 71 73 70 254 255 252 229 231 228 0 2 0 -+141 142 139 254 255 252 231 233 230 10 12 8 34 44 55 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 154 195 235 6 12 15 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 125 92 35 250 179 73 250 179 73 -+250 179 73 180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 68 83 99 -+129 165 199 85 112 133 0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 126 162 196 119 156 189 134 170 204 149 191 231 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 57 72 88 3 6 2 242 244 240 254 255 252 35 37 34 -+78 80 77 254 255 252 254 255 252 128 130 127 0 2 0 105 137 164 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 91 123 149 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 55 39 17 250 179 73 250 179 73 -+250 179 73 245 175 76 7 10 5 0 2 0 44 54 65 103 134 161 161 203 243 170 212 252 -+170 212 252 21 27 33 25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 61 76 92 0 2 0 242 244 240 254 255 252 102 104 101 -+10 12 8 231 233 230 254 255 252 244 246 243 26 27 25 21 27 33 159 201 241 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 32 39 45 0 6 9 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 218 158 64 250 179 73 -+250 179 73 250 179 73 75 55 22 0 2 0 161 203 243 170 212 252 170 212 252 170 212 252 -+115 147 174 0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 159 201 241 146 188 228 -+140 177 211 134 170 204 146 188 228 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 17 24 30 62 64 61 254 255 252 254 255 252 215 217 214 -+0 2 0 102 104 101 254 255 252 254 255 252 166 168 165 0 2 0 72 87 103 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 75 32 250 179 73 -+250 179 73 250 179 73 150 108 46 0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 -+49 59 70 3 10 13 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 166 207 248 109 141 168 65 87 102 28 35 41 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 6 9 28 35 41 70 96 117 138 174 208 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 0 2 0 102 104 101 254 255 252 254 255 252 254 255 252 -+102 104 101 0 2 0 192 194 191 254 255 252 254 255 252 78 80 77 0 2 0 122 159 192 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 34 44 55 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 61 76 92 154 195 235 0 6 9 29 21 8 250 179 73 -+250 179 73 250 179 73 224 163 69 0 2 0 68 83 99 170 212 252 170 212 252 143 179 213 -+0 2 0 72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+161 203 243 96 115 138 17 24 30 0 2 0 0 2 0 45 47 44 102 104 101 123 125 122 -+138 140 137 143 145 142 115 117 114 82 83 81 43 44 42 0 2 0 0 2 0 32 39 45 -+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 0 2 0 85 87 84 254 255 252 254 255 252 254 255 252 -+242 244 240 27 29 27 35 37 34 254 255 252 254 255 252 231 233 230 10 12 8 21 27 33 -+159 201 241 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 6 9 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 6 9 44 54 65 170 212 252 170 212 252 34 44 55 0 2 0 82 62 28 -+109 79 35 224 163 69 250 179 73 52 36 13 15 20 22 170 212 252 170 212 252 75 89 106 -+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 -+25 32 38 0 2 0 40 41 39 155 157 153 238 241 237 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 115 117 114 18 20 17 -+0 2 0 68 83 99 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 52 62 74 7 10 5 234 236 233 254 255 252 254 255 252 -+254 255 252 195 197 194 102 104 101 254 255 252 254 255 252 254 255 252 162 164 161 0 2 0 -+72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 119 156 189 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 115 147 174 170 212 252 91 123 149 0 2 0 0 2 0 6 12 15 -+0 2 0 15 9 7 197 142 62 125 92 35 0 2 0 115 152 185 113 145 172 3 6 2 -+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 113 145 172 0 6 9 -+10 12 8 155 157 153 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 232 234 231 -+87 89 86 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 115 152 185 0 2 0 138 140 137 254 255 252 254 255 252 -+254 255 252 254 255 252 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 65 66 64 -+0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 154 195 235 170 212 252 143 179 213 88 115 136 149 191 231 170 212 252 -+126 162 196 3 6 2 64 46 18 202 145 58 0 2 0 0 2 0 0 2 0 0 2 0 -+92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 143 179 213 3 10 13 27 29 27 -+215 217 214 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 155 157 153 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 23 30 36 27 29 27 249 251 248 254 255 252 -+254 255 252 188 190 187 7 10 5 226 228 225 254 255 252 254 255 252 254 255 252 231 233 230 -+7 10 5 21 27 33 159 201 241 170 212 252 103 134 161 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 55 66 77 11 4 3 250 179 73 24 17 10 0 2 0 0 2 0 0 2 0 -+143 185 225 170 212 252 170 212 252 170 212 252 159 201 241 28 35 41 7 10 5 200 202 199 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 155 157 153 0 2 0 55 66 77 170 212 252 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 96 127 154 0 2 0 158 160 156 254 255 252 -+254 255 252 192 194 191 0 2 0 176 178 175 254 255 252 254 255 252 254 255 252 254 255 252 -+141 142 139 0 2 0 72 87 103 129 165 199 0 6 9 0 6 9 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 6 9 12 17 20 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 -+138 174 208 17 24 30 29 21 8 250 179 73 101 72 28 0 2 0 0 2 0 32 39 45 -+170 212 252 170 212 252 170 212 252 170 212 252 57 72 88 0 2 0 152 154 151 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 108 110 107 0 2 0 115 152 185 170 212 252 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 18 22 24 40 41 39 254 255 252 -+254 255 252 232 234 231 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 10 12 8 0 2 0 8 14 16 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 6 9 41 51 62 61 76 92 34 44 55 3 10 13 -+0 2 0 11 4 3 164 119 51 250 179 73 175 129 54 0 2 0 0 2 0 82 108 129 -+170 212 252 170 212 252 170 212 252 98 129 156 0 2 0 95 96 94 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 238 241 237 18 20 17 25 32 38 166 207 248 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 85 112 133 0 2 0 188 190 187 -+254 255 252 254 255 252 198 200 197 242 244 240 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 120 122 119 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 6 9 7 0 0 -+31 23 12 202 145 58 250 179 73 250 179 73 238 175 73 0 2 0 0 2 0 122 159 192 -+170 212 252 170 212 252 170 212 252 28 35 41 31 32 30 244 246 243 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 85 112 133 170 212 252 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 0 2 0 148 150 147 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 222 224 221 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+7 0 0 234 172 70 250 179 73 250 179 73 250 179 73 34 26 8 0 2 0 149 191 231 -+170 212 252 170 212 252 129 165 199 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 48 50 48 3 10 13 146 188 228 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 0 2 0 118 120 117 -+254 255 252 254 255 252 254 255 252 169 171 168 231 233 230 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 170 124 49 250 179 73 250 179 73 250 179 73 48 33 15 6 12 15 170 212 252 -+170 212 252 170 212 252 65 87 102 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 195 197 194 0 2 0 84 103 125 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 3 10 13 85 87 84 -+254 255 252 254 255 252 234 236 233 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 99 101 98 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 95 68 30 250 179 73 250 179 73 250 179 73 34 26 8 34 44 55 170 212 252 -+170 212 252 163 205 246 8 14 16 62 64 61 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 35 37 34 34 44 55 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 26 33 39 60 62 59 -+254 255 252 254 255 252 238 241 237 0 2 0 108 110 107 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 158 160 156 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 23 15 7 248 178 79 250 179 73 245 175 76 0 2 0 63 78 94 170 212 252 -+170 212 252 109 141 168 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 104 106 103 0 2 0 -+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 69 71 68 -+254 255 252 254 255 252 244 246 243 0 2 0 91 93 90 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 215 217 214 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 197 142 62 250 179 73 212 153 66 0 2 0 92 110 133 170 212 252 -+170 212 252 80 98 121 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 176 178 175 0 2 0 -+105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 8 14 16 87 89 86 -+254 255 252 254 255 252 254 255 252 40 41 39 21 22 20 252 254 250 254 255 252 254 255 252 -+254 255 252 254 255 252 252 254 250 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 125 92 35 250 179 73 170 124 49 0 2 0 113 145 172 170 212 252 -+170 212 252 53 68 84 15 17 14 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 242 244 240 0 2 0 -+63 78 94 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 0 2 0 104 106 103 -+254 255 252 254 255 252 254 255 252 123 125 122 0 2 0 166 168 165 254 255 252 254 255 252 -+254 255 252 254 255 252 234 236 233 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 7 0 0 52 36 13 250 179 73 129 95 39 0 2 0 143 179 213 170 212 252 -+170 212 252 32 39 45 48 50 48 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 60 62 59 -+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 2 0 102 104 101 -+254 255 252 254 255 252 254 255 252 226 228 225 15 17 14 10 12 8 215 217 214 254 255 252 -+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 88 66 26 29 21 8 0 2 0 166 207 248 170 212 252 -+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 123 125 122 -+0 2 0 149 191 231 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 56 58 55 -+254 255 252 254 255 252 254 255 252 254 255 252 178 180 177 0 2 0 38 40 37 238 241 237 -+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 7 0 0 7 0 0 0 2 0 161 203 243 170 212 252 -+149 191 231 0 2 0 123 125 122 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 141 142 139 -+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 -+210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 120 122 119 0 2 0 21 22 20 -+143 145 142 244 246 243 219 221 218 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 149 191 231 170 212 252 -+129 165 199 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 155 157 153 -+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 0 6 9 -+69 71 68 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 71 73 70 0 2 0 -+0 2 0 0 2 0 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 170 212 252 -+129 165 199 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 169 171 168 -+0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 75 94 116 -+0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 134 170 204 170 212 252 -+134 170 204 0 2 0 152 154 151 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 -+0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 -+44 54 65 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 35 37 34 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 -+138 174 208 0 2 0 143 145 142 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 198 200 197 -+0 2 0 103 134 161 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+157 198 239 28 35 41 0 2 0 188 190 187 254 255 252 252 254 250 3 6 2 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 115 152 185 170 212 252 -+143 179 213 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 -+0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 146 188 228 0 6 9 26 27 25 242 244 240 176 178 175 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 170 212 252 -+143 185 225 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 185 187 183 -+0 2 0 105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 163 205 246 0 2 0 0 2 0 102 104 101 60 62 59 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 80 98 121 170 212 252 -+149 191 231 0 2 0 118 120 117 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 143 145 142 -+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 143 179 213 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 170 212 252 -+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 108 110 107 -+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 115 152 185 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 170 212 252 -+170 212 252 34 44 55 43 44 42 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 -+15 20 22 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+170 212 252 75 94 116 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 -+170 212 252 63 78 94 3 6 2 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 31 32 30 -+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+161 203 243 6 12 15 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 -+170 212 252 88 115 136 0 2 0 210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 249 251 248 0 2 0 -+68 83 99 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+96 127 154 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 61 76 92 -+170 212 252 119 150 178 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 0 2 0 -+91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 -+28 35 41 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 -+146 188 228 143 185 225 0 2 0 126 127 125 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 85 87 84 0 6 9 -+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 98 129 156 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+72 90 112 170 212 252 18 22 24 56 58 55 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 238 241 237 7 10 5 55 66 77 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 0 6 9 -+0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 122 159 192 72 87 103 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 113 145 172 -+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 139 181 221 8 14 16 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 18 22 24 109 141 168 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 12 17 20 166 207 248 -+170 212 252 170 212 252 170 212 252 170 212 252 146 188 228 23 30 36 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 101 72 28 202 145 58 -+180 132 57 0 2 0 38 45 51 3 10 13 69 71 68 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 200 202 199 0 2 0 75 89 106 170 212 252 -+170 212 252 170 212 252 170 212 252 109 141 168 8 14 16 0 2 0 21 13 4 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 7 0 0 0 2 0 101 72 28 218 158 64 250 179 73 250 179 73 -+250 179 73 139 99 44 0 2 0 8 14 16 0 2 0 238 241 237 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 244 246 243 38 40 37 3 10 13 139 181 221 170 212 252 -+170 212 252 161 203 243 66 80 97 0 2 0 31 23 12 191 142 60 248 183 74 180 132 57 -+44 34 15 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 23 15 7 190 136 56 250 179 73 250 179 73 250 179 73 250 179 73 -+250 179 73 250 179 73 150 108 46 0 2 0 0 2 0 82 83 81 222 224 221 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 102 104 101 0 2 0 98 129 156 170 212 252 163 205 246 -+98 129 156 23 30 36 0 2 0 82 62 28 234 172 70 248 183 74 248 183 74 248 183 74 -+248 183 74 158 114 46 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 64 46 18 109 79 35 150 108 46 224 163 69 250 179 73 -+250 179 73 250 179 73 250 179 73 158 114 46 0 2 0 0 2 0 3 6 2 115 117 114 -+234 236 233 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 176 178 175 0 2 0 57 72 88 146 188 228 80 98 121 8 14 16 -+0 2 0 24 17 10 158 114 46 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 -+248 183 74 248 183 74 242 178 77 58 42 19 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 0 2 0 67 49 21 250 179 73 -+250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 95 68 30 0 2 0 0 2 0 -+0 2 0 52 54 51 108 110 107 162 164 161 219 221 218 254 255 252 254 255 252 254 255 252 -+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 -+219 221 218 178 180 177 18 20 17 6 12 15 26 33 39 0 2 0 0 2 0 52 36 13 -+164 119 51 242 178 77 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 242 178 77 -+187 138 56 175 129 54 158 114 46 82 62 28 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 78 58 25 250 179 73 -+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 234 172 70 142 101 40 -+44 34 15 10 12 8 0 2 0 0 2 0 0 2 0 18 20 17 60 62 59 71 73 70 -+82 83 81 95 96 94 104 106 103 118 120 117 115 117 114 78 80 77 40 41 39 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 44 34 15 105 75 32 191 142 60 248 183 74 -+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 105 75 32 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 187 138 56 250 179 73 -+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 -+250 179 73 250 179 73 142 101 40 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 206 148 61 248 183 74 248 183 74 248 183 74 -+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 161 117 49 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 228 167 73 250 179 73 -+238 175 73 190 136 56 158 114 46 234 172 70 250 179 73 250 179 73 250 179 73 250 179 73 -+250 179 73 147 105 44 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 67 49 21 248 183 74 248 183 74 248 183 74 -+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 -+31 23 12 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 21 13 4 -+0 2 0 0 2 0 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 -+134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 155 111 43 248 183 74 248 183 74 -+248 183 74 248 183 74 224 163 69 55 39 17 64 46 18 164 119 51 242 178 77 248 183 74 -+75 55 22 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 228 167 73 88 66 26 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 168 123 54 248 183 74 -+248 183 74 248 183 74 158 114 46 0 2 0 7 0 0 0 2 0 10 12 8 44 34 15 -+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 29 21 8 250 179 73 250 179 73 158 114 46 15 14 3 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 175 129 54 -+248 183 74 248 183 74 114 83 33 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 29 21 8 147 105 44 58 42 19 0 2 0 7 0 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+105 75 32 218 158 64 23 15 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 -+ -diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm ---- linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm 2011-06-02 21:34:20.000000000 -0300 -+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm 2011-06-22 13:42:06.000000000 -0300 -@@ -1,203 +1,159 @@ --P1 --# Standard black and white Linux logo --80 80 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 0 0 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 --1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 --1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 --1 0 0 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 1 1 --1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 --0 1 1 0 0 1 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 1 1 1 0 1 1 1 1 0 0 1 --1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 --1 1 1 1 0 1 1 1 0 1 1 1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 --1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 --0 1 1 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 1 1 1 --1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1 --1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 --1 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 1 1 --1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 --1 1 1 1 1 1 1 1 0 0 0 0 1 1 0 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1 --1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 --0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 --1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 --0 0 0 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 0 1 1 1 1 1 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 1 --1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 --0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 --1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 --1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 --0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 --1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 --0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 --1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 --0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1 --1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 1 0 1 1 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 0 0 0 1 1 1 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 1 0 0 0 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1 1 1 1 0 --0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 1 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1 1 0 0 0 --0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 --1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 --1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 --1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --1 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 --1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 --1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 --1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -+P2 -+80 78 -+255 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 255 255 255 255 255 0 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 -+255 0 0 0 0 0 0 0 0 0 -+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 -+255 255 0 0 0 0 0 0 0 0 -+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 -+255 255 0 0 0 0 0 0 0 0 -+0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 -+255 255 255 0 0 0 0 0 0 0 -+0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 -+255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 255 255 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 -+255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 0 255 255 0 0 255 255 -+255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 255 255 255 0 0 255 -+255 255 255 255 255 255 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 255 -+255 255 255 255 255 255 255 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 0 -+255 255 255 255 255 255 255 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 -+0 255 255 255 255 255 255 255 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 -+0 255 255 255 255 255 255 255 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 -+0 0 255 255 255 255 255 255 0 0 -+0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 255 255 255 -+255 0 0 255 255 255 255 255 0 0 -+0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 255 0 0 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 -+255 0 0 255 255 255 255 0 0 0 -+0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 0 0 255 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 255 255 255 -+255 255 0 0 255 255 255 0 0 0 -+0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 255 255 255 255 0 255 255 255 -+255 255 255 0 0 255 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 0 255 255 255 -+255 255 255 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 -+255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 -+255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 -+255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 255 255 -+255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 -+255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 -+255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 -+255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 255 -+255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 0 -+255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 0 -+0 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 255 -+0 0 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 255 255 255 255 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 255 255 255 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 255 255 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 255 255 255 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -+0 0 0 0 0 0 0 0 0 0 -diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm ---- linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm 2011-06-02 21:34:20.000000000 -0300 -+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm 2011-06-22 13:42:06.000000000 -0300 -@@ -1,1604 +1,18724 @@ - P3 --# Standard 16-color Linux logo --80 80 -+# CREATOR: GIMP PNM Filter Version 1.1 -+80 78 - 255 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 85 85 85 85 85 85 85 85 85 -- 85 85 85 85 85 85 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 85 85 85 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 85 85 85 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 170 170 170 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 --170 170 170 170 170 170 85 85 85 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 85 85 85 170 170 170 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 170 170 170 170 170 170 --170 170 170 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 85 85 85 170 170 170 170 170 170 170 170 170 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 170 170 170 255 255 255 255 255 255 --255 255 255 170 170 170 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 85 85 85 --170 170 170 170 170 170 255 255 255 255 255 255 -- 0 0 0 0 0 0 0 0 0 0 0 0 --170 170 170 255 255 255 170 170 170 170 170 170 --255 255 255 170 170 170 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 85 85 85 --170 170 170 0 0 0 0 0 0 255 255 255 -- 85 85 85 0 0 0 0 0 0 0 0 0 --255 255 255 170 170 170 0 0 0 85 85 85 --170 170 170 255 255 255 170 170 170 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 85 85 85 -- 85 85 85 0 0 0 0 0 0 170 170 170 -- 85 85 85 0 0 0 0 0 0 0 0 0 --255 255 255 85 85 85 0 0 0 0 0 0 -- 85 85 85 255 255 255 170 170 170 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 85 85 85 --170 170 170 0 0 0 0 0 0 170 170 170 -- 85 85 85 85 85 85 85 85 85 85 85 85 --255 255 255 85 85 85 0 0 0 0 0 0 -- 85 85 85 255 255 255 170 170 170 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 --255 255 255 0 0 0 0 0 0 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 0 0 0 0 0 0 -- 85 85 85 255 255 255 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 --170 170 170 170 170 170 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 170 170 170 170 170 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 85 85 85 0 0 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 170 85 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 85 85 85 0 0 0 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 170 85 0 --170 85 0 170 85 0 85 85 85 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 85 85 85 0 0 0 -- 85 85 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 --170 85 0 170 85 0 85 85 85 0 0 0 -- 0 0 0 85 85 85 170 170 170 85 85 85 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 85 85 85 0 0 0 -- 85 85 85 170 85 0 170 85 0 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 --170 170 170 170 170 170 170 170 170 0 0 0 -- 0 0 0 0 0 0 170 170 170 170 170 170 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 85 85 85 170 170 170 170 85 0 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 --170 85 0 170 85 0 170 170 170 170 170 170 --170 170 170 170 170 170 170 170 170 85 85 85 -- 0 0 0 0 0 0 85 85 85 85 85 85 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 85 85 85 170 170 170 170 170 170 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 --170 170 170 170 170 170 170 170 170 170 170 170 --255 255 255 255 255 255 255 255 255 170 170 170 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 85 85 85 --255 255 255 255 255 255 170 170 170 170 170 170 --170 170 170 170 170 170 170 170 170 170 170 170 --170 170 170 170 170 170 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 170 170 170 --255 255 255 255 255 255 170 170 170 170 170 170 --170 170 170 170 170 170 170 170 170 170 170 170 --170 170 170 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --170 170 170 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 85 85 85 255 255 255 --255 255 255 255 255 255 255 255 255 170 170 170 --170 170 170 170 170 170 170 170 170 170 170 170 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 85 85 85 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 85 85 85 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 170 170 170 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 85 85 85 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 85 85 85 170 170 170 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 170 170 170 170 170 170 170 170 170 --255 255 255 255 255 255 255 255 255 170 170 170 --170 170 170 170 170 170 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --170 170 170 170 170 170 170 170 170 170 170 170 --170 170 170 170 170 170 170 170 170 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 --170 170 170 170 170 170 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --170 170 170 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 170 170 170 --170 170 170 170 170 170 170 170 170 85 85 85 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 --170 170 170 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 170 170 170 170 170 170 170 170 170 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 85 85 85 0 0 0 0 0 0 85 85 85 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 170 170 170 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 170 170 170 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --170 170 170 85 85 85 0 0 0 0 0 0 -- 0 0 0 85 85 85 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 85 85 85 -- 0 0 0 0 0 0 85 85 85 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 170 170 170 0 0 0 85 85 85 -- 85 85 85 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 85 85 85 -- 0 0 0 85 85 85 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 170 170 170 0 0 0 85 85 85 -- 85 85 85 0 0 0 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 85 85 85 -- 0 0 0 170 170 170 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 85 85 85 0 0 0 -- 0 0 0 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 85 85 85 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 85 85 85 0 0 0 0 0 0 --170 170 170 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 85 85 85 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 85 85 85 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 85 85 85 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 0 0 0 -- 85 85 85 85 85 85 85 85 85 85 85 85 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 0 0 0 170 85 0 --255 255 85 170 85 0 0 0 0 0 0 0 -- 85 85 85 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 85 85 85 85 85 85 0 0 0 -- 0 0 0 85 85 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 0 0 0 -- 0 0 0 85 85 85 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 85 170 85 0 255 255 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 85 85 85 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 -- 0 0 0 0 0 0 85 85 85 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 85 --170 85 0 255 255 85 170 85 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 --170 85 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 0 0 0 0 0 0 85 85 85 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 170 85 0 --255 255 85 170 85 0 255 255 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 170 85 0 --255 255 85 170 85 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 0 0 0 0 0 0 0 0 0 -- 85 85 85 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 85 --170 85 0 255 255 85 170 85 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 255 255 85 --170 85 0 255 255 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 0 0 0 0 0 0 -- 0 0 0 85 85 85 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 255 255 85 170 85 0 --255 255 85 170 85 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 0 0 0 -- 0 0 0 0 0 0 85 85 85 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 170 170 170 170 170 170 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 170 170 170 170 170 170 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 170 170 170 170 170 170 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 170 170 170 170 170 170 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 0 0 0 0 0 0 0 0 0 -- 85 85 85 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 170 170 170 85 85 85 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 85 85 85 85 85 85 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --170 170 170 85 85 85 85 85 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 170 170 170 -- 85 85 85 0 0 0 0 0 0 170 85 0 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 85 85 85 -- 0 0 0 0 0 0 0 0 0 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --170 170 170 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --170 170 170 85 85 85 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 170 85 0 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 170 85 0 --170 85 0 170 170 170 255 255 255 255 255 255 --255 255 255 255 255 255 255 255 255 255 255 255 --255 255 255 255 255 255 170 170 170 85 85 85 -- 85 85 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --170 85 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 170 85 0 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 170 85 0 170 85 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 170 85 0 --170 85 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --170 85 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --170 85 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 85 85 85 170 85 0 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 170 85 0 170 85 0 170 85 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 170 85 0 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 170 85 0 --170 85 0 0 0 0 0 0 0 0 0 0 -- 85 85 85 85 85 85 85 85 85 85 85 85 -- 85 85 85 85 85 85 85 85 85 85 85 85 -- 85 85 85 85 85 85 85 85 85 0 0 0 -- 0 0 0 0 0 0 0 0 0 170 85 0 --170 85 0 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 255 255 85 170 85 0 --170 85 0 170 85 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 170 85 0 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 --170 85 0 170 85 0 255 255 85 170 85 0 --255 255 85 170 85 0 170 85 0 170 85 0 -- 85 85 85 85 85 85 85 85 85 85 85 85 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 85 85 85 -- 85 85 85 85 85 85 85 85 85 170 85 0 --170 85 0 170 85 0 170 85 0 255 255 85 --170 85 0 255 255 85 170 85 0 170 85 0 --170 85 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 --170 85 0 170 85 0 170 85 0 170 85 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 170 85 0 170 85 0 170 85 0 --170 85 0 170 85 0 170 85 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 --170 85 0 170 85 0 170 85 0 170 85 0 --170 85 0 170 85 0 170 85 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+85 -+85 -+170 -+170 -+170 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+170 -+170 -+170 -+170 -+170 -+170 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+170 -+170 -+170 -+85 -+85 -+85 -+170 -+170 -+170 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+255 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+170 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+255 -+255 -+255 -+170 -+170 -+170 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+85 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+170 -+170 -+170 -+170 -+170 -+170 -+85 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+85 -+85 -+255 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+170 -+170 -+170 -+0 -+0 -+0 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+255 -+255 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+85 -+85 -+170 -+170 -+170 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+255 -+170 -+170 -+170 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+85 -+85 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+85 -+85 -+85 -+255 -+255 -+85 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 -+0 diff --git a/libre-testing/linux-libre/change-default-console-loglevel.patch b/libre-testing/linux-libre/change-default-console-loglevel.patch deleted file mode 100644 index 2685d4d23..000000000 --- a/libre-testing/linux-libre/change-default-console-loglevel.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c ---- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300 -+++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300 -@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea - - /* 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_WARNING */ - - DECLARE_WAIT_QUEUE_HEAD(log_wait); - diff --git a/libre-testing/linux-libre/config.i686 b/libre-testing/linux-libre/config.i686 deleted file mode 100644 index cf5adcd74..000000000 --- a/libre-testing/linux-libre/config.i686 +++ /dev/null @@ -1,6255 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.0 Kernel Configuration -# -# CONFIG_64BIT is not set -CONFIG_X86_32=y -CONFIG_X86=y -CONFIG_INSTRUCTION_DECODER=y -CONFIG_OUTPUT_FORMAT="elf32-i386" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_MMU=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_GPIO=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_CPU_AUTOPROBE=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_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -# CONFIG_ZONE_DMA32 is not set -# CONFIG_AUDIT_ARCH is not set -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_HAVE_INTEL_TXT=y -CONFIG_X86_32_SMP=y -CONFIG_X86_HT=y -CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" -CONFIG_ARCH_CPU_PROBE_RELEASE=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="-LIBRE" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_XZ is not set -# CONFIG_KERNEL_LZO is not set -CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y -CONFIG_AUDIT_LOGINUID_IMMUTABLE=y -CONFIG_HAVE_GENERIC_HARDIRQS=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_IRQ_DOMAIN=y -# CONFIG_IRQ_DOMAIN_DEBUG is not set -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y -CONFIG_KTIME_SCALAR=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y -CONFIG_GENERIC_CMOS_UPDATE=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set -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 - -# -# RCU Subsystem -# -CONFIG_TREE_PREEMPT_RCU=y -CONFIG_PREEMPT_RCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RCU_FANOUT=32 -CONFIG_RCU_FANOUT_LEAF=16 -# CONFIG_RCU_FANOUT_EXACT is not set -CONFIG_RCU_FAST_NO_HZ=y -# CONFIG_TREE_RCU_TRACE is not set -# CONFIG_RCU_BOOST is not set -CONFIG_RCU_NOCB_CPU=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=19 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y -CONFIG_CGROUPS=y -# CONFIG_CGROUP_DEBUG is not set -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_MEMCG=y -CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_MEMCG_KMEM=y -# CONFIG_CGROUP_HUGETLB is not set -# CONFIG_CGROUP_PERF is not set -CONFIG_CGROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_CFS_BANDWIDTH=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_CGROUP=y -# CONFIG_DEBUG_BLK_CGROUP is not set -# CONFIG_CHECKPOINT_RESTORE is not set -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y -# CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -# CONFIG_EXPERT is not set -CONFIG_HAVE_UID16=y -CONFIG_UID16=y -# CONFIG_SYSCTL_SYSCALL is not set -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_HAVE_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_EMBEDDED is not set -CONFIG_HAVE_PERF_EVENTS=y - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=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_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_OPROFILE=m -# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set -CONFIG_HAVE_OPROFILE=y -CONFIG_OPROFILE_NMI_TIMER=y -CONFIG_KPROBES=y -CONFIG_JUMP_LABEL=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_UPROBES=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_KRETPROBES=y -CONFIG_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_KPROBES_ON_FTRACE=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_USE_GENERIC_SMP_HELPERS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y -CONFIG_HAVE_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_PERF_EVENTS_NMI=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y -CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y -CONFIG_HAVE_CMPXCHG_LOCAL=y -CONFIG_HAVE_CMPXCHG_DOUBLE=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OLD_SIGACTION=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL 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_MODULE_SIG is not set -CONFIG_STOP_MACHINE=y -CONFIG_BLOCK=y -CONFIG_LBDAF=y -CONFIG_BLK_DEV_BSG=y -CONFIG_BLK_DEV_BSGLIB=y -# CONFIG_BLK_DEV_INTEGRITY is not set -CONFIG_BLK_DEV_THROTTLING=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 - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_CFQ_GROUP_IOSCHED=y -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_PREEMPT_NOTIFIERS=y -CONFIG_PADATA=y -CONFIG_ASN1=m -CONFIG_UNINLINE_SPIN_UNLOCK=y -CONFIG_FREEZER=y - -# -# Processor type and features -# -CONFIG_ZONE_DMA=y -CONFIG_SMP=y -CONFIG_X86_MPPARSE=y -# CONFIG_X86_BIGSMP is not set -# CONFIG_X86_EXTENDED_PLATFORM is not set -# CONFIG_X86_GOLDFISH is not set -# CONFIG_X86_INTEL_LPSS is not set -CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -CONFIG_X86_32_IRIS=m -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_PARAVIRT_GUEST=y -CONFIG_PARAVIRT_TIME_ACCOUNTING=y -# CONFIG_XEN_PRIVILEGED_GUEST is not set -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_NO_BOOTMEM=y -# CONFIG_MEMTEST 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_MELAN 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_MCORE2 is not set -# CONFIG_MATOM is not set -CONFIG_X86_GENERIC=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -CONFIG_X86_L1_CACHE_SHIFT=6 -# CONFIG_X86_PPRO_FENCE is not set -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_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -CONFIG_CPU_SUP_TRANSMETA_32=y -CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_DMI=y -CONFIG_NR_CPUS=8 -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -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 is not set -# CONFIG_MICROCODE_AMD is not set -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_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_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_SPARSEMEM_STATIC=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_MEMORY_ISOLATION=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_BALLOON_COMPACTION=y -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -# CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y -CONFIG_VIRT_TO_BUS=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_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_CLEANCACHE=y -CONFIG_FRONTSWAP=y -# CONFIG_HIGHPTE is not set -CONFIG_X86_CHECK_BIOS_CORRUPTION=y -CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -CONFIG_X86_RESERVE_LOW=64 -# 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_ARCH_RANDOM=y -CONFIG_X86_SMAP=y -CONFIG_EFI=y -CONFIG_EFI_STUB=y -CONFIG_SECCOMP=y -CONFIG_CC_STACKPROTECTOR=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -CONFIG_HZ_300=y -# CONFIG_HZ_1000 is not set -CONFIG_HZ=300 -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=y -CONFIG_X86_NEED_RELOCS=y -CONFIG_PHYSICAL_ALIGN=0x100000 -CONFIG_HOTPLUG_CPU=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# CONFIG_COMPAT_VDSO is not set -# CONFIG_CMDLINE_BOOL is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y - -# -# Power management and ACPI options -# -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -CONFIG_PM_AUTOSLEEP=y -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=100 -CONFIG_PM_WAKELOCKS_GC=y -CONFIG_PM_RUNTIME=y -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_ADVANCED_DEBUG=y -# CONFIG_PM_TEST_SUSPEND is not set -CONFIG_PM_SLEEP_DEBUG=y -CONFIG_PM_TRACE=y -CONFIG_PM_TRACE_RTC=y -CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y -# CONFIG_ACPI_PROCFS is not set -# CONFIG_ACPI_PROCFS_POWER is not set -CONFIG_ACPI_EC_DEBUGFS=m -# CONFIG_ACPI_PROC_EVENT is not set -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_I2C=m -CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_IPMI=m -CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m -# CONFIG_ACPI_CUSTOM_DSDT is not set -CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y -CONFIG_ACPI_BLACKLIST_YEAR=0 -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=y -CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=y -CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=y -CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_GHES=y -CONFIG_ACPI_APEI_PCIEAER=y -CONFIG_ACPI_APEI_MEMORY_FAILURE=y -CONFIG_ACPI_APEI_EINJ=m -CONFIG_ACPI_APEI_ERST_DEBUG=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=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_STAT_DETAILS=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -# 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=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - -# -# x86 CPU frequency scaling drivers -# -CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=m -CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_ACPI_CPUFREQ_CPB=y -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_MULTIPLE_DRIVERS is not set -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y -# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set -CONFIG_INTEL_IDLE=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_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_PCIEASPM_DEFAULT=y -# CONFIG_PCIEASPM_POWERSAVE is not set -# CONFIG_PCIEASPM_PERFORMANCE is not set -CONFIG_PCIE_PME=y -CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_PCI_MSI=y -# CONFIG_PCI_DEBUG is not set -CONFIG_PCI_REALLOC_ENABLE_AUTO=y -CONFIG_PCI_STUB=m -CONFIG_HT_IRQ=y -CONFIG_PCI_ATS=y -CONFIG_PCI_IOV=y -CONFIG_PCI_PRI=y -CONFIG_PCI_PASID=y -CONFIG_PCI_IOAPIC=y -CONFIG_PCI_LABEL=y -CONFIG_ISA_DMA_API=y -CONFIG_ISA=y -# CONFIG_EISA is not set -# CONFIG_SCx200 is not set -CONFIG_OLPC=y -CONFIG_OLPC_XO1_PM=y -CONFIG_OLPC_XO1_RTC=y -CONFIG_OLPC_XO1_SCI=y -CONFIG_OLPC_XO15_SCI=y -# CONFIG_ALIX is not set -# CONFIG_NET5501 is not set -# CONFIG_GEOS is not set -CONFIG_AMD_NB=y -CONFIG_PCCARD=m -CONFIG_PCMCIA=m -CONFIG_PCMCIA_LOAD_CIS=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=y -CONFIG_HOTPLUG_PCI=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 -CONFIG_RAPIDIO=y -CONFIG_RAPIDIO_TSI721=y -CONFIG_RAPIDIO_DISC_TIMEOUT=30 -# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set -CONFIG_RAPIDIO_DMA_ENGINE=y -CONFIG_RAPIDIO_DEBUG=y -CONFIG_RAPIDIO_TSI57X=y -CONFIG_RAPIDIO_CPS_XX=y -CONFIG_RAPIDIO_TSI568=y -CONFIG_RAPIDIO_CPS_GEN2=y -CONFIG_RAPIDIO_TSI500=y - -# -# Executable file formats / Emulations -# -CONFIG_BINFMT_ELF=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=y -CONFIG_COREDUMP=y -CONFIG_HAVE_ATOMIC_IOMAP=y -CONFIG_HAVE_TEXT_POKE_SMP=y -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=m -CONFIG_UNIX=y -CONFIG_UNIX_DIAG=m -CONFIG_XFRM=y -CONFIG_XFRM_ALGO=m -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_IP_FIB_TRIE_STATS=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_ROUTE_CLASSID=y -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IPGRE=m -# CONFIG_NET_IPGRE_BROADCAST is not set -CONFIG_IP_MROUTE=y -# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y -CONFIG_SYN_COOKIES=y -CONFIG_NET_IPVTI=m -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_INET_UDP_DIAG=m -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_CUBIC=y -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -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_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_GRE=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -# CONFIG_IPV6_MROUTE is not set -CONFIG_NETLABEL=y -CONFIG_NETWORK_SECMARK=y -CONFIG_NETWORK_PHY_TIMESTAMPING=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_ACCT=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_ZONES=y -CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_TIMEOUT=y -CONFIG_NF_CONNTRACK_TIMESTAMP=y -CONFIG_NF_CONNTRACK_LABELS=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_BROADCAST=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=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_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_NETLINK_HELPER=m -CONFIG_NETFILTER_NETLINK_QUEUE_CT=y -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_NAT_PROTO_DCCP=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_SIP=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NETFILTER_TPROXY=m -CONFIG_NETFILTER_XTABLES=m - -# -# Xtables combined modules -# -CONFIG_NETFILTER_XT_MARK=m -CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m - -# -# Xtables targets -# -CONFIG_NETFILTER_XT_TARGET_AUDIT=m -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_HMARK=m -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NETMAP=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_REDIRECT=m -CONFIG_NETFILTER_XT_TARGET_TEE=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 - -# -# Xtables matches -# -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ECN=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_IPVS=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_NFACCT=m -CONFIG_NETFILTER_XT_MATCH_OSF=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_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_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=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 -CONFIG_IP_VS_PROTO_SCTP=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 SH scheduler -# -CONFIG_IP_VS_SH_TAB_BITS=8 - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m -CONFIG_IP_VS_NFCT=y -CONFIG_IP_VS_PE_SIP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT_IPV4=m -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_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=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_DEFRAG_IPV6=m -CONFIG_NF_CONNTRACK_IPV6=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_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=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_NF_NAT_IPV6=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=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 -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -CONFIG_IP_DCCP_CCID3=y -# CONFIG_IP_DCCP_CCID3_DEBUG is not set -CONFIG_IP_DCCP_TFRC_LIB=y - -# -# DCCP Kernel Hacking -# -# CONFIG_IP_DCCP_DEBUG is not set -CONFIG_NET_DCCPPROBE=m -CONFIG_IP_SCTP=m -CONFIG_NET_SCTPPROBE=m -# CONFIG_SCTP_DBG_MSG is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set -CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set -CONFIG_SCTP_COOKIE_HMAC_MD5=y -CONFIG_SCTP_COOKIE_HMAC_SHA1=y -# 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_L2TP=m -# CONFIG_L2TP_DEBUGFS is not set -CONFIG_L2TP_V3=y -CONFIG_L2TP_IP=m -CONFIG_L2TP_ETH=m -CONFIG_STP=m -CONFIG_MRP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_NET_DSA=m -CONFIG_NET_DSA_TAG_DSA=y -CONFIG_NET_DSA_TAG_EDSA=y -CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set -CONFIG_VLAN_8021Q_MVRP=y -# 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_PHONET=m -CONFIG_IEEE802154=m -CONFIG_IEEE802154_6LOWPAN=m -CONFIG_MAC802154=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_SFB=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_MQPRIO=m -CONFIG_NET_SCH_CHOKE=m -CONFIG_NET_SCH_QFQ=m -CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_SCH_PLUG=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -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_ACT_CSUM=m -CONFIG_NET_CLS_IND=y -CONFIG_NET_SCH_FIFO=y -# CONFIG_DCB is not set -CONFIG_DNS_RESOLVER=y -CONFIG_BATMAN_ADV=m -CONFIG_BATMAN_ADV_BLA=y -CONFIG_BATMAN_ADV_DAT=y -# CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_OPENVSWITCH=m -CONFIG_VSOCKETS=m -CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y -CONFIG_NETPRIO_CGROUP=m -CONFIG_BQL=y - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -CONFIG_NET_TCPPROBE=m -CONFIG_NET_DROP_MONITOR=y -CONFIG_HAMRADIO=y - -# -# Packet Radio protocols -# -CONFIG_AX25=m -CONFIG_AX25_DAMA_SLAVE=y -CONFIG_NETROM=m -CONFIG_ROSE=m - -# -# AX.25 network device drivers -# -CONFIG_MKISS=m -CONFIG_6PACK=m -CONFIG_BPQETHER=m -CONFIG_SCC=m -# CONFIG_SCC_DELAY is not set -# CONFIG_SCC_TRXECHO is not set -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_BAYCOM_PAR=m -CONFIG_BAYCOM_EPP=m -CONFIG_YAM=m -# 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_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_ATH3K=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIUART_3WIRE=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_BT_ATH3K=m -CONFIG_BT_WILINK=m -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=m -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=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_DEBUGFS is not set -# CONFIG_CFG80211_INTERNAL_REGDB is not set -CONFIG_CFG80211_WEXT=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_MINSTREL_HT=y -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_MESSAGE_TRACING 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 -CONFIG_CAIF=m -# CONFIG_CAIF_DEBUG is not set -CONFIG_CAIF_NETDEV=m -CONFIG_CAIF_USB=m -CONFIG_CEPH_LIB=m -# CONFIG_CEPH_LIB_PRETTYDEBUG is not set -# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set -CONFIG_NFC=m -CONFIG_NFC_NCI=m -CONFIG_NFC_HCI=m -# CONFIG_NFC_SHDLC is not set -# CONFIG_NFC_LLCP is not set - -# -# Near Field Communication (NFC) devices -# -CONFIG_NFC_PN533=m -CONFIG_NFC_WILINK=m -CONFIG_NFC_PN544=m -CONFIG_NFC_MICROREAD=m - -# -# 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_FW_LOADER_USER_HELPER is not set -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -# CONFIG_SYS_HYPERVISOR is not set -# CONFIG_GENERIC_CPU_DEVICES is not set -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_MMIO=m -CONFIG_REGMAP_IRQ=y -CONFIG_DMA_SHARED_BUFFER=y -# CONFIG_CMA is not set - -# -# Bus devices -# -CONFIG_CONNECTOR=y -CONFIG_PROC_EVENTS=y -CONFIG_MTD=m -CONFIG_MTD_TESTS=m -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set -CONFIG_MTD_CMDLINE_PARTS=m -CONFIG_MTD_OF_PARTS=m -CONFIG_MTD_AR7_PARTS=m - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -CONFIG_FTL=m -CONFIG_NFTL=m -CONFIG_NFTL_RW=y -CONFIG_INFTL=m -CONFIG_RFD_FTL=m -CONFIG_SSFDC=m -# CONFIG_SM_FTL is not set -CONFIG_MTD_OOPS=m -CONFIG_MTD_SWAP=m - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS 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_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m -CONFIG_MTD_RAM=m -CONFIG_MTD_ROM=m -CONFIG_MTD_ABSENT=m - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -# CONFIG_MTD_PHYSMAP is not set -CONFIG_MTD_PHYSMAP_OF=m -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m -CONFIG_MTD_TS5500=m -# CONFIG_MTD_SBC_GXX is not set -# CONFIG_MTD_AMD76XROM is not set -# CONFIG_MTD_ICHXROM is not set -# CONFIG_MTD_ESB2ROM is not set -# CONFIG_MTD_CK804XROM is not set -CONFIG_MTD_SCB2_FLASH=m -# CONFIG_MTD_NETtel is not set -# CONFIG_MTD_L440GX is not set -CONFIG_MTD_PCI=m -# CONFIG_MTD_PCMCIA is not set -# CONFIG_MTD_GPIO_ADDR is not set -# CONFIG_MTD_INTEL_VR_NOR is not set -CONFIG_MTD_PLATRAM=m -# CONFIG_MTD_LATCH_ADDR is not set - -# -# Self-contained MTD device drivers -# -CONFIG_MTD_PMC551=m -# CONFIG_MTD_PMC551_BUGFIX is not set -# CONFIG_MTD_PMC551_DEBUG is not set -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -# CONFIG_MTD_SST25L is not set -# CONFIG_MTD_SLRAM is not set -CONFIG_MTD_PHRAM=m -CONFIG_MTD_MTDRAM=m -CONFIG_MTDRAM_TOTAL_SIZE=4096 -CONFIG_MTDRAM_ERASE_SIZE=128 -CONFIG_MTD_BLOCK2MTD=m - -# -# 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_DOCG3=m -CONFIG_BCH_CONST_M=14 -CONFIG_BCH_CONST_T=4 -CONFIG_MTD_NAND_ECC=m -CONFIG_MTD_NAND_ECC_SMC=y -CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_ECC_BCH is not set -CONFIG_MTD_SM_COMMON=m -# CONFIG_MTD_NAND_MUSEUM_IDS is not set -# CONFIG_MTD_NAND_DENALI is not set -CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_RICOH=m -CONFIG_MTD_NAND_DISKONCHIP=m -# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 -# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set -CONFIG_MTD_NAND_DOCG4=m -# CONFIG_MTD_NAND_CAFE is not set -CONFIG_MTD_NAND_CS553X=m -CONFIG_MTD_NAND_NANDSIM=m -# CONFIG_MTD_NAND_PLATFORM is not set -CONFIG_MTD_ALAUDA=m -# CONFIG_MTD_ONENAND is not set - -# -# LPDDR flash memory drivers -# -CONFIG_MTD_LPDDR=m -CONFIG_MTD_QINFO_PROBE=m -CONFIG_MTD_UBI=m -CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_LIMIT=20 -# CONFIG_MTD_UBI_FASTMAP is not set -# CONFIG_MTD_UBI_GLUEBI is not set -CONFIG_OF=y - -# -# Device Tree and Open Firmware support -# -CONFIG_PROC_DEVICETREE=y -# CONFIG_OF_SELFTEST is not set -CONFIG_OF_PROMTREE=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_IRQ=y -CONFIG_OF_DEVICE=y -CONFIG_OF_I2C=m -CONFIG_OF_NET=y -CONFIG_OF_MDIO=m -CONFIG_OF_PCI=y -CONFIG_OF_PCI_IRQ=y -CONFIG_OF_MTD=y -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_PARIDE is not set -CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m -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_LOOP_MIN_COUNT=8 -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_DRBD=m -# CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_NVME=m -CONFIG_BLK_DEV_OSD=m -CONFIG_BLK_DEV_SX8=m -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_BLK_DEV_RBD=m -CONFIG_BLK_DEV_RSXX=m - -# -# Misc devices -# -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_AD525X_DPOT=m -CONFIG_AD525X_DPOT_I2C=m -# CONFIG_AD525X_DPOT_SPI is not set -# CONFIG_IBM_ASM is not set -CONFIG_PHANTOM=m -CONFIG_INTEL_MID_PTI=m -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -# CONFIG_ATMEL_SSC is not set -CONFIG_ENCLOSURE_SERVICES=m -CONFIG_CS5535_MFGPT=m -CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 -CONFIG_CS5535_CLOCK_EVENT_SRC=m -CONFIG_HP_ILO=m -CONFIG_APDS9802ALS=m -CONFIG_ISL29003=m -CONFIG_ISL29020=m -CONFIG_SENSORS_TSL2550=m -CONFIG_SENSORS_BH1780=m -CONFIG_SENSORS_BH1770=m -CONFIG_SENSORS_APDS990X=m -CONFIG_HMC6352=m -CONFIG_DS1682=m -# CONFIG_TI_DAC7512 is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y -CONFIG_BMP085_I2C=m -# CONFIG_BMP085_SPI is not set -# CONFIG_PCH_PHUB is not set -CONFIG_USB_SWITCH_FSA9480=m -# CONFIG_LATTICE_ECP3_CONFIG is not set -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -# CONFIG_EEPROM_AT25 is not set -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -# CONFIG_EEPROM_93XX46 is not set -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set -CONFIG_CB710_DEBUG_ASSUMPTIONS=y - -# -# Texas Instruments shared transport line discipline -# -CONFIG_TI_ST=m -CONFIG_SENSORS_LIS3_I2C=m - -# -# Altera FPGA firmware download module -# -CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=y -CONFIG_VMWARE_VMCI=m -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI_MOD=m -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 - -# -# 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_SRP_ATTRS=m -CONFIG_SCSI_SRP_TGT_ATTRS=y -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_CXGB4_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m -CONFIG_SCSI_BNX2X_FCOE=m -CONFIG_BE2ISCSI=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_HPSA=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_3W_SAS=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_MVSAS_TASKLET=y -CONFIG_SCSI_MVUMI=m -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_IN2000=m -CONFIG_SCSI_ARCMSR=m -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_MPT3SAS=m -CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -CONFIG_SCSI_MPT3SAS_LOGGING=y -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PCI=m -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_BUSLOGIC=m -# CONFIG_SCSI_FLASHPOINT is not set -CONFIG_VMWARE_PVSCSI=m -CONFIG_HYPERV_STORAGE=m -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_ISCI=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_TCM_QLA2XXX=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_PM8001=m -CONFIG_SCSI_SRP=m -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_CHELSIO_FCOE=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_ZPODD=y -CONFIG_SATA_PMP=y - -# -# Controllers with non-SFF native interface -# -CONFIG_SATA_AHCI=m -CONFIG_SATA_AHCI_PLATFORM=m -CONFIG_SATA_INIC162X=m -CONFIG_SATA_ACARD_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y - -# -# SFF controllers with custom DMA interface -# -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_SX4=m -CONFIG_ATA_BMDMA=y - -# -# SATA SFF controllers with BMDMA -# -CONFIG_ATA_PIIX=m -CONFIG_SATA_HIGHBANK=m -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_SVW=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m - -# -# PATA SFF controllers with BMDMA -# -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARASAN_CF=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_ATP867X=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_PATA_HPT366=m -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=m -CONFIG_PATA_HPT3X3=m -# CONFIG_PATA_HPT3X3_DMA is not set -CONFIG_PATA_IT8213=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_MARVELL=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NINJA32=m -CONFIG_PATA_NS87415=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_OPTIDMA=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_RADISYS=m -CONFIG_PATA_RDC=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SCH=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=m -CONFIG_PATA_TOSHIBA=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m - -# -# PIO-only SFF controllers -# -CONFIG_PATA_CMD640_PCI=m -CONFIG_PATA_ISAPNP=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_PCMCIA=m -CONFIG_PATA_QDI=m -CONFIG_PATA_RZ1000=m -CONFIG_PATA_WINBOND_VLB=m - -# -# Generic fallback / legacy drivers -# -CONFIG_PATA_ACPI=m -CONFIG_ATA_GENERIC=m -CONFIG_PATA_LEGACY=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_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_BUFIO=m -CONFIG_DM_BIO_PRISON=m -CONFIG_DM_PERSISTENT_DATA=m -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_THIN_PROVISIONING=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set -CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_MQ=m -CONFIG_DM_CACHE_CLEANER=m -CONFIG_DM_MIRROR=m -CONFIG_DM_RAID=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_DM_FLAKEY=m -CONFIG_DM_VERITY=m -CONFIG_TARGET_CORE=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_LOOPBACK_TARGET=m -CONFIG_TCM_FC=m -CONFIG_ISCSI_TARGET=m -CONFIG_SBP_TARGET=m -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 -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_SBP2=m -CONFIG_FIREWIRE_NET=m -CONFIG_FIREWIRE_NOSY=m -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_NET_CORE=y -CONFIG_BONDING=m -CONFIG_DUMMY=m -CONFIG_EQUALIZER=m -# CONFIG_NET_FC is not set -CONFIG_MII=m -CONFIG_IFB=m -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_MACVLAN=m -CONFIG_MACVTAP=m -CONFIG_VXLAN=m -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_RIONET=m -CONFIG_RIONET_TX_SIZE=128 -CONFIG_RIONET_RX_SIZE=128 -CONFIG_TUN=m -CONFIG_VETH=m -CONFIG_VIRTIO_NET=m -CONFIG_SUNGEM_PHY=m -# CONFIG_ARCNET 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 - -# -# CAIF transport drivers -# -CONFIG_CAIF_TTY=m -CONFIG_CAIF_SPI_SLAVE=m -CONFIG_CAIF_SPI_SYNC=y -CONFIG_CAIF_HSI=m - -# -# Distributed Switch Architecture drivers -# -CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6060=m -CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y -CONFIG_NET_DSA_MV88E6131=m -CONFIG_NET_DSA_MV88E6123_61_65=m -CONFIG_ETHERNET=y -CONFIG_MDIO=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_EL3=m -CONFIG_3C515=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_3C589=m -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_NET_VENDOR_ADAPTEC=y -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_NET_VENDOR_ALTEON=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_NET_VENDOR_AMD=y -CONFIG_AMD8111_ETH=m -CONFIG_LANCE=m -CONFIG_PCNET32=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_NI65=m -CONFIG_NET_VENDOR_ATHEROS=y -CONFIG_ATL2=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_NET_CADENCE=y -CONFIG_ARM_AT91_ETHER=m -CONFIG_MACB=m -CONFIG_NET_VENDOR_BROADCOM=y -CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_TIGON3=m -CONFIG_BNX2X=m -CONFIG_BNX2X_SRIOV=y -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m -CONFIG_NET_CALXEDA_XGMAC=m -CONFIG_NET_VENDOR_CHELSIO=y -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4VF=m -CONFIG_NET_VENDOR_CIRRUS=y -CONFIG_CS89x0=m -# CONFIG_CS89x0_PLATFORM is not set -CONFIG_NET_VENDOR_CISCO=y -CONFIG_ENIC=m -CONFIG_DNET=m -CONFIG_NET_VENDOR_DEC=y -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_NET_VENDOR_DLINK=y -CONFIG_DL2K=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_NET_VENDOR_EMULEX=y -CONFIG_BE2NET=m -CONFIG_NET_VENDOR_EXAR=y -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_NET_VENDOR_HP=y -CONFIG_HP100=m -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=m -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_IGB=m -CONFIG_IGB_HWMON=y -CONFIG_IGB_DCA=y -CONFIG_IGBVF=m -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCA=y -CONFIG_IXGBEVF=m -CONFIG_NET_VENDOR_I825XX=y -CONFIG_IP1000=m -CONFIG_JME=m -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_MVMDIO=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -CONFIG_SKGE_GENESIS=y -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_NET_VENDOR_MICREL=y -CONFIG_KS8842=m -# CONFIG_KS8851 is not set -CONFIG_KS8851_MLL=m -CONFIG_KSZ884X_PCI=m -CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set -CONFIG_NET_VENDOR_MYRI=y -CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y -CONFIG_FEALNX=m -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NATSEMI=m -CONFIG_NS83820=m -CONFIG_NET_VENDOR_8390=y -CONFIG_PCMCIA_AXNET=m -CONFIG_NE2000=m -CONFIG_NE2K_PCI=m -CONFIG_PCMCIA_PCNET=m -CONFIG_ULTRA=m -CONFIG_WD80x3=m -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=m -CONFIG_NET_VENDOR_OKI=y -CONFIG_PCH_GBE=m -CONFIG_ETHOC=m -CONFIG_NET_PACKET_ENGINE=y -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_NET_VENDOR_QLOGIC=y -CONFIG_QLA3XXX=m -CONFIG_QLCNIC=m -CONFIG_QLGE=m -CONFIG_NETXEN_NIC=m -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_ATP=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_R8169=m -CONFIG_NET_VENDOR_RDC=y -CONFIG_R6040=m -CONFIG_NET_VENDOR_SEEQ=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_SFC_MCDI_MON=y -CONFIG_SFC_SRIOV=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_SMC9194=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_EPIC100=m -CONFIG_SMSC9420=m -CONFIG_NET_VENDOR_STMICRO=y -CONFIG_STMMAC_ETH=m -# CONFIG_STMMAC_PLATFORM is not set -CONFIG_STMMAC_PCI=y -# CONFIG_STMMAC_DEBUG_FS is not set -# CONFIG_STMMAC_DA is not set -CONFIG_STMMAC_RING=y -# CONFIG_STMMAC_CHAINED is not set -CONFIG_NET_VENDOR_SUN=y -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NIU=m -CONFIG_NET_VENDOR_TEHUTI=y -CONFIG_TEHUTI=m -CONFIG_NET_VENDOR_TI=y -CONFIG_TLAN=m -CONFIG_NET_VENDOR_VIA=y -CONFIG_VIA_RHINE=m -# CONFIG_VIA_RHINE_MMIO is not set -CONFIG_VIA_VELOCITY=m -CONFIG_NET_VENDOR_WIZNET=y -CONFIG_WIZNET_W5100=m -CONFIG_WIZNET_W5300=m -# CONFIG_WIZNET_BUS_DIRECT is not set -# CONFIG_WIZNET_BUS_INDIRECT is not set -CONFIG_WIZNET_BUS_ANY=y -CONFIG_NET_VENDOR_XIRCOM=y -CONFIG_PCMCIA_XIRC2PS=m -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_NET_SB1000=m -CONFIG_PHYLIB=m - -# -# MII PHY device drivers -# -CONFIG_AT803X_PHY=m -CONFIG_AMD_PHY=m -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_BCM87XX_PHY=m -CONFIG_ICPLUS_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_STE10XP=m -CONFIG_LSI_ET1011C_PHY=m -CONFIG_MICREL_PHY=m -# CONFIG_MDIO_BITBANG is not set -CONFIG_MDIO_BUS_MUX=m -CONFIG_MDIO_BUS_MUX_GPIO=m -CONFIG_MDIO_BUS_MUX_MMIOREG=m -# CONFIG_MICREL_KS8995MA is not set -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPPOATM=m -CONFIG_PPPOE=m -CONFIG_PPTP=m -CONFIG_PPPOL2TP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_SLIP=m -CONFIG_SLHC=m -# CONFIG_SLIP_COMPRESSED is not set -# CONFIG_SLIP_SMART is not set -# CONFIG_SLIP_MODE_SLIP6 is not set - -# -# 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_AX88179_178A=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_CDC_MBIM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SMSC75XX=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_NET_CX82310_ETH=m -CONFIG_USB_NET_KALMIA=m -CONFIG_USB_NET_QMI_WWAN=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_USB_IPHETH=m -CONFIG_USB_SIERRA_NET=m -CONFIG_USB_VL600=m -CONFIG_WLAN=y -CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS_THINFIRM=m -# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set -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_ATH_COMMON=m -CONFIG_ATH_CARDS=m -# CONFIG_ATH_DEBUG is not set -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -# CONFIG_ATH5K_TRACER is not set -CONFIG_ATH5K_PCI=y -CONFIG_ATH9K_HW=m -CONFIG_ATH9K_COMMON=m -CONFIG_ATH9K_BTCOEX_SUPPORT=y -CONFIG_ATH9K=m -CONFIG_ATH9K_PCI=y -CONFIG_ATH9K_AHB=y -# CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y -CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set -CONFIG_CARL9170=m -CONFIG_CARL9170_LEDS=y -CONFIG_CARL9170_WPC=y -# CONFIG_CARL9170_HWRNG is not set -CONFIG_ATH6KL=m -CONFIG_ATH6KL_SDIO=m -CONFIG_ATH6KL_USB=m -# CONFIG_ATH6KL_DEBUG is not set -CONFIG_AR5523=m -CONFIG_WIL6210=m -CONFIG_WIL6210_ISR_COR=y -CONFIG_B43=m -CONFIG_B43_BCMA=y -# CONFIG_B43_BCMA_EXTRA is not set -CONFIG_B43_SSB=y -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_N=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_PHY_HT=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_BRCMUTIL=m -CONFIG_BRCMSMAC=m -CONFIG_BRCMFMAC=m -CONFIG_BRCMFMAC_SDIO=y -# CONFIG_BRCMFMAC_SDIO_OOB is not set -CONFIG_BRCMFMAC_USB=y -# CONFIG_BRCM_TRACING is not set -# CONFIG_BRCMDBG is not set -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_IPW2100 is not set -# CONFIG_IPW2200 is not set -CONFIG_IWLWIFI=m -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m - -# -# Debugging Options -# -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLWIFI_DEVICE_TRACING=y -# CONFIG_IWLWIFI_P2P is not set -CONFIG_IWLEGACY=m -CONFIG_IWL4965=m -CONFIG_IWL3945=m - -# -# iwl3945 / iwl4965 Debugging Options -# -# CONFIG_IWLEGACY_DEBUG is not set -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_SPI is not set -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_MESH=y -CONFIG_HERMES=m -CONFIG_HERMES_PRISM=y -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_ORINOCO_USB=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -# CONFIG_P54_SPI is not set -CONFIG_P54_LEDS=y -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2800PCI=m -CONFIG_RT2800PCI_RT33XX=y -CONFIG_RT2800PCI_RT35XX=y -CONFIG_RT2800PCI_RT53XX=y -CONFIG_RT2800PCI_RT3290=y -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2X00_LIB_MMIO=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8192CU=m -CONFIG_RTL8192C_COMMON=m -CONFIG_WL_TI=y -CONFIG_WL1251=m -# CONFIG_WL1251_SPI is not set -CONFIG_WL1251_SDIO=m -CONFIG_WL12XX=m -CONFIG_WL18XX=m -CONFIG_WLCORE=m -# CONFIG_WLCORE_SPI is not set -CONFIG_WLCORE_SDIO=m -CONFIG_WILINK_PLATFORM_DATA=y -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m -CONFIG_MWIFIEX_PCIE=m -CONFIG_MWIFIEX_USB=m - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 -# CONFIG_WAN is not set -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m -CONFIG_IEEE802154_AT86RF230=m -# CONFIG_IEEE802154_MRF24J40 is not set -CONFIG_VMXNET3=m -CONFIG_HYPERV_NET=m -CONFIG_ISDN=y -CONFIG_ISDN_I4L=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_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_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_CAPI=y -# CONFIG_GIGASET_I4L is not set -# CONFIG_GIGASET_DUMMYLL is not set -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_M105=m -CONFIG_GIGASET_M101=m -# CONFIG_GIGASET_DEBUG is not set -CONFIG_HYSDN=m -CONFIG_HYSDN_CAPI=y -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_HDLC=m - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m -CONFIG_INPUT_SPARSEKMAP=m -CONFIG_INPUT_MATRIXKMAP=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_ADP5589=m -CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_QT1070=m -CONFIG_KEYBOARD_QT2160=m -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KEYBOARD_GPIO_POLLED is not set -CONFIG_KEYBOARD_TCA6416=m -CONFIG_KEYBOARD_TCA8418=m -CONFIG_KEYBOARD_MATRIX=m -# CONFIG_KEYBOARD_LM8323 is not set -CONFIG_KEYBOARD_LM8333=m -# CONFIG_KEYBOARD_MAX7359 is not set -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -# 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_CYPRESS=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_CYAPA=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 is not set -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_SYNAPTICS_USB=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_AS5011=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_HANWANG=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_WACOM=m -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set -# CONFIG_TOUCHSCREEN_AD7877 is not set -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -# CONFIG_TOUCHSCREEN_AD7879_SPI is not set -CONFIG_TOUCHSCREEN_ATMEL_MXT=m -CONFIG_TOUCHSCREEN_AUO_PIXCIR=m -CONFIG_TOUCHSCREEN_BU21013=m -CONFIG_TOUCHSCREEN_CY8CTMG110=m -CONFIG_TOUCHSCREEN_CYTTSP_CORE=m -CONFIG_TOUCHSCREEN_CYTTSP_I2C=m -# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set -CONFIG_TOUCHSCREEN_DYNAPRO=m -CONFIG_TOUCHSCREEN_HAMPSHIRE=m -CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_EGALAX=m -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_ILI210X=m -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -CONFIG_TOUCHSCREEN_WACOM_I2C=m -CONFIG_TOUCHSCREEN_MAX11801=m -CONFIG_TOUCHSCREEN_MCS5000=m -CONFIG_TOUCHSCREEN_MMS114=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_HTCPEN=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_EDT_FT5X06=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m -CONFIG_TOUCHSCREEN_UCB1400=m -CONFIG_TOUCHSCREEN_PIXCIR=m -CONFIG_TOUCHSCREEN_WM97XX=m -CONFIG_TOUCHSCREEN_WM9705=y -CONFIG_TOUCHSCREEN_WM9712=y -CONFIG_TOUCHSCREEN_WM9713=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_MC13783=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_ELO=y -CONFIG_TOUCHSCREEN_USB_E2I=y -CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y -CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y -CONFIG_TOUCHSCREEN_USB_NEXIO=y -CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC_SERIO=m -# CONFIG_TOUCHSCREEN_TSC2005 is not set -CONFIG_TOUCHSCREEN_TSC2007=m -CONFIG_TOUCHSCREEN_ST1232=m -CONFIG_TOUCHSCREEN_TPS6507X=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_AD714X=m -CONFIG_INPUT_AD714X_I2C=m -CONFIG_INPUT_AD714X_SPI=m -CONFIG_INPUT_BMA150=m -CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_MC13783_PWRBUTTON=m -CONFIG_INPUT_MMA8450=m -CONFIG_INPUT_MPU3050=m -CONFIG_INPUT_APANEL=m -CONFIG_INPUT_GP2A=m -# CONFIG_INPUT_GPIO_TILT_POLLED is not set -CONFIG_INPUT_WISTRON_BTNS=m -CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_KXTJ9=m -# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_RETU_PWRBUTTON=m -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_PCF50633_PMU=m -CONFIG_INPUT_PCF8574=m -CONFIG_INPUT_PWM_BEEPER=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_ADXL34X=m -CONFIG_INPUT_ADXL34X_I2C=m -CONFIG_INPUT_ADXL34X_SPI=m -CONFIG_INPUT_CMA3000=m -CONFIG_INPUT_CMA3000_I2C=m - -# -# 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_SERIO_ALTERA_PS2=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_ARC_PS2=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_TTY=y -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_UNIX98_PTYS=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -# CONFIG_MOXA_INTELLIO is not set -# CONFIG_MOXA_SMARTIO is not set -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -# CONFIG_SYNCLINK_GT is not set -CONFIG_NOZOMI=m -# CONFIG_ISI is not set -CONFIG_N_HDLC=m -CONFIG_N_GSM=m -CONFIG_TRACE_ROUTER=m -CONFIG_TRACE_SINK=m -# CONFIG_DEVKMEM is not set -# CONFIG_STALDRV is not set - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=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 -CONFIG_SERIAL_8250_DW=m - -# -# Non-8250 serial port support -# -# CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX310X is not set -CONFIG_SERIAL_MFD_HSU=m -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_OF_PLATFORM=m -CONFIG_SERIAL_SCCNXP=m -# CONFIG_SERIAL_TIMBERDALE is not set -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m -CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 -CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 -# CONFIG_SERIAL_IFX6X60 is not set -CONFIG_SERIAL_PCH_UART=m -CONFIG_SERIAL_XILINX_PS_UART=m -CONFIG_SERIAL_ARC=m -CONFIG_SERIAL_ARC_NR_PORTS=1 -CONFIG_SERIAL_RP2=m -CONFIG_SERIAL_RP2_NR_UARTS=32 -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_HW_RANDOM_TPM=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_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_TIS_I2C_INFINEON=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TCG_ST33_I2C=m -CONFIG_TELCLOCK=m -CONFIG_DEVPORT=y -CONFIG_I2C=m -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_SMBUS=m -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_ISMT=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_CBUS_GPIO is not set -CONFIG_I2C_DESIGNWARE_CORE=m -CONFIG_I2C_DESIGNWARE_PCI=m -CONFIG_I2C_EG20T=m -# CONFIG_I2C_GPIO is not set -CONFIG_I2C_INTEL_MID=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PCA_PLATFORM=m -CONFIG_I2C_PXA=m -CONFIG_I2C_PXA_PCI=y -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_XILINX=m - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_VIPERBOARD=m - -# -# Other I2C/SMBus bus drivers -# -CONFIG_I2C_PCA_ISA=m -CONFIG_SCx200_ACB=m -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_BUTTERFLY is not set -# CONFIG_SPI_GPIO is not set -# CONFIG_SPI_LM70_LLP is not set -# CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_PXA2XX is not set -# CONFIG_SPI_PXA2XX_PCI is not set -# CONFIG_SPI_SC18IS602 is not set -# CONFIG_SPI_TOPCLIFF_PCH is not set -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_DESIGNWARE is not set - -# -# SPI Protocol Masters -# -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set -# CONFIG_HSI is not set - -# -# PPS support -# -CONFIG_PPS=m -# CONFIG_PPS_DEBUG is not set - -# -# PPS clients support -# -CONFIG_PPS_CLIENT_KTIMER=m -CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m -CONFIG_PPS_CLIENT_GPIO=m - -# -# PPS generators support -# - -# -# PTP clock support -# -CONFIG_PTP_1588_CLOCK=m -CONFIG_DP83640_PHY=m -CONFIG_PTP_1588_CLOCK_PCH=m -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIOLIB=y -CONFIG_OF_GPIO=y -CONFIG_GPIO_ACPI=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y - -# -# Memory mapped GPIO drivers: -# -# CONFIG_GPIO_GENERIC_PLATFORM is not set -# CONFIG_GPIO_IT8761E is not set -# CONFIG_GPIO_TS5500 is not set -CONFIG_GPIO_SCH=m -CONFIG_GPIO_ICH=m -# CONFIG_GPIO_VX855 is not set -# CONFIG_GPIO_LYNXPOINT is not set - -# -# I2C GPIO expanders: -# -CONFIG_GPIO_ARIZONA=m -# CONFIG_GPIO_MAX7300 is not set -# CONFIG_GPIO_MAX732X is not set -# CONFIG_GPIO_PCA953X is not set -# CONFIG_GPIO_PCF857X is not set -# CONFIG_GPIO_ADP5588 is not set -# CONFIG_GPIO_ADNP is not set - -# -# PCI GPIO expanders: -# -CONFIG_GPIO_CS5535=y -CONFIG_GPIO_AMD8111=m -# CONFIG_GPIO_LANGWELL is not set -# CONFIG_GPIO_PCH is not set -# CONFIG_GPIO_ML_IOH is not set -# CONFIG_GPIO_SODAVILLE is not set -# CONFIG_GPIO_RDC321X is not set - -# -# SPI GPIO expanders: -# -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set -# CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_74X164 is not set - -# -# AC97 GPIO expanders: -# -CONFIG_GPIO_UCB1400=y - -# -# MODULbus GPIO expanders: -# - -# -# USB GPIO expanders: -# -CONFIG_GPIO_VIPERBOARD=m -# CONFIG_W1 is not set -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -CONFIG_PDA_POWER=m -CONFIG_TEST_POWER=m -# CONFIG_BATTERY_DS2780 is not set -# CONFIG_BATTERY_DS2781 is not set -# CONFIG_BATTERY_DS2782 is not set -CONFIG_BATTERY_OLPC=m -# CONFIG_BATTERY_SBS is not set -# CONFIG_BATTERY_BQ27x00 is not set -# CONFIG_BATTERY_MAX17040 is not set -# CONFIG_BATTERY_MAX17042 is not set -# CONFIG_CHARGER_PCF50633 is not set -# CONFIG_CHARGER_ISP1704 is not set -# CONFIG_CHARGER_MAX8903 is not set -# CONFIG_CHARGER_LP8727 is not set -# CONFIG_CHARGER_GPIO is not set -# CONFIG_CHARGER_BQ2415X is not set -# CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GOLDFISH is not set -CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_GPIO=y -CONFIG_POWER_AVS=y -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_AD7314 is not set -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -# CONFIG_SENSORS_ADCXX is not set -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_ADT7410=m -CONFIG_SENSORS_ADT7411=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_ASC7621=m -CONFIG_SENSORS_K8TEMP=m -CONFIG_SENSORS_K10TEMP=m -CONFIG_SENSORS_FAM15H_POWER=m -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS620=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_GPIO_FAN is not set -CONFIG_SENSORS_HIH6130=m -CONFIG_SENSORS_CORETEMP=m -CONFIG_SENSORS_IBMAEM=m -CONFIG_SENSORS_IBMPEX=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_JC42=m -CONFIG_SENSORS_LINEAGE=m -CONFIG_SENSORS_LM63=m -# CONFIG_SENSORS_LM70 is not set -CONFIG_SENSORS_LM73=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_LTC4151=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LTC4261=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_LM95245=m -# CONFIG_SENSORS_MAX1111 is not set -CONFIG_SENSORS_MAX16065=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX1668=m -CONFIG_SENSORS_MAX197=m -CONFIG_SENSORS_MAX6639=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_PCF8591=m -CONFIG_PMBUS=m -CONFIG_SENSORS_PMBUS=m -CONFIG_SENSORS_ADM1275=m -CONFIG_SENSORS_LM25066=m -CONFIG_SENSORS_LTC2978=m -CONFIG_SENSORS_MAX16064=m -CONFIG_SENSORS_MAX34440=m -CONFIG_SENSORS_MAX8688=m -CONFIG_SENSORS_UCD9000=m -CONFIG_SENSORS_UCD9200=m -CONFIG_SENSORS_ZL6100=m -CONFIG_SENSORS_SHT15=m -CONFIG_SENSORS_SHT21=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_SMM665=m -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_EMC1403=m -CONFIG_SENSORS_EMC2103=m -CONFIG_SENSORS_EMC6W201=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47M192=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_SCH56XX_COMMON=m -CONFIG_SENSORS_SCH5627=m -CONFIG_SENSORS_SCH5636=m -CONFIG_SENSORS_ADS1015=m -CONFIG_SENSORS_ADS7828=m -# CONFIG_SENSORS_ADS7871 is not set -CONFIG_SENSORS_AMC6821=m -CONFIG_SENSORS_INA209=m -CONFIG_SENSORS_INA2XX=m -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_TMP102=m -CONFIG_SENSORS_TMP401=m -CONFIG_SENSORS_TMP421=m -CONFIG_SENSORS_VIA_CPUTEMP=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_W83795=m -# CONFIG_SENSORS_W83795_FANCTRL is not set -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83L786NG=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_APPLESMC=m -CONFIG_SENSORS_MC13783_ADC=m - -# -# ACPI drivers -# -CONFIG_SENSORS_ACPI_POWER=m -CONFIG_SENSORS_ATK0110=m -CONFIG_THERMAL=y -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -CONFIG_THERMAL_GOV_FAIR_SHARE=y -CONFIG_THERMAL_GOV_STEP_WISE=y -# CONFIG_THERMAL_GOV_USER_SPACE is not set -# CONFIG_CPU_THERMAL is not set -# CONFIG_THERMAL_EMULATION is not set -CONFIG_INTEL_POWERCLAMP=m -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_RETU_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_F71808E_WDT=m -CONFIG_SP5100_TCO=m -CONFIG_GEODE_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_IE6XX_WDT=m -CONFIG_ITCO_WDT=m -CONFIG_ITCO_VENDOR_SUPPORT=y -CONFIG_IT8712F_WDT=m -CONFIG_IT87_WDT=m -CONFIG_HP_WATCHDOG=m -CONFIG_HPWDT_NMI_DECODING=y -CONFIG_SC1200_WDT=m -CONFIG_PC87413_WDT=m -CONFIG_NV_TCO=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_VIA_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 -CONFIG_SSB_DRIVER_GPIO=y -CONFIG_BCMA_POSSIBLE=y - -# -# Broadcom specific AMBA -# -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -CONFIG_BCMA_DRIVER_GMAC_CMN=y -CONFIG_BCMA_DRIVER_GPIO=y -# CONFIG_BCMA_DEBUG is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y -CONFIG_MFD_RTSX_PCI=m -CONFIG_MFD_TI_AM335X_TSCADC=m -CONFIG_HTC_PASIC3=m -CONFIG_UCB1400_CORE=m -CONFIG_MFD_LM3533=m -# CONFIG_TPS6105X is not set -CONFIG_TPS65010=m -CONFIG_TPS6507X=m -CONFIG_MFD_TPS65217=m -# CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_TMIO is not set -# CONFIG_MFD_DA9052_SPI is not set -CONFIG_MFD_ARIZONA=y -CONFIG_MFD_ARIZONA_I2C=m -# CONFIG_MFD_ARIZONA_SPI is not set -CONFIG_MFD_WM5102=y -CONFIG_MFD_WM5110=y -# CONFIG_MFD_WM831X_SPI is not set -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m -# CONFIG_MFD_MC13XXX_SPI is not set -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_ABX500_CORE=y -# CONFIG_EZX_PCAP is not set -CONFIG_MFD_CS5535=m -# CONFIG_MFD_TIMBERDALE is not set -CONFIG_LPC_SCH=m -CONFIG_LPC_ICH=m -CONFIG_MFD_RDC321X=m -# CONFIG_MFD_JANZ_CMODIO is not set -CONFIG_MFD_VX855=m -CONFIG_MFD_WL1273_CORE=m -# CONFIG_MFD_SYSCON is not set -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m -# CONFIG_REGULATOR is not set -CONFIG_MEDIA_SUPPORT=m - -# -# Multimedia core support -# -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_MEDIA_RC_SUPPORT=y -CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -# CONFIG_VIDEO_V4L2_INT_DEVICE is not set -CONFIG_DVB_CORE=m -CONFIG_DVB_NET=y -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set - -# -# Media drivers -# -CONFIG_RC_CORE=m -CONFIG_RC_MAP=m -CONFIG_RC_DECODERS=y -CONFIG_LIRC=m -CONFIG_IR_LIRC_CODEC=m -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_RC5_SZ_DECODER=m -CONFIG_IR_SANYO_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m -CONFIG_IR_ENE=m -CONFIG_IR_IMON=m -CONFIG_IR_MCEUSB=m -CONFIG_IR_ITE_CIR=m -CONFIG_IR_FINTEK=m -CONFIG_IR_NUVOTON=m -CONFIG_IR_REDRAT3=m -CONFIG_IR_STREAMZAP=m -CONFIG_IR_WINBOND_CIR=m -CONFIG_IR_IGUANA=m -CONFIG_IR_TTUSBIR=m -CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_USB_SUPPORT=y - -# -# Webcam devices -# -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_BENQ=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_CPIA1=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_JL2005BCD=m -CONFIG_USB_GSPCA_KINECT=m -CONFIG_USB_GSPCA_KONICA=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_NW80X=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_OV534_9=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7302=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SE401=m -CONFIG_USB_GSPCA_SN9C2028=m -CONFIG_USB_GSPCA_SN9C20X=m -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_SPCA1528=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_SQ930X=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_STV0680=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TOPRO=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_VICAM=m -CONFIG_USB_GSPCA_XIRLINK_CIT=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_USB_SN9C102=m - -# -# Analog TV USB devices -# -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_TLG2300=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_STK1160_AC97=y - -# -# Analog/digital TV USB devices -# -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_AU0828_V4L2=y -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m - -# -# Digital TV USB devices -# -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_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_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_V2=m -CONFIG_DVB_USB_CYPRESS_FIRMWARE=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set - -# -# Webcam, TV (analog/digital) USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m -CONFIG_MEDIA_PCI_SUPPORT=y - -# -# Media capture support -# -CONFIG_VIDEO_MEYE=m - -# -# Media capture/analog TV support -# -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_IVTV_ALSA=m -CONFIG_VIDEO_FB_IVTV=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_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_MXB=m - -# -# Media capture/analog/hybrid TV support -# -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m -CONFIG_VIDEO_CX23885=m -CONFIG_MEDIA_ALTERA_CI=m -CONFIG_VIDEO_CX25821=m -CONFIG_VIDEO_CX25821_ALSA=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_RC=y -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_SAA7164=m - -# -# Media digital TV PCI Adapters -# -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 -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m -CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m -CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -# CONFIG_V4L_PLATFORM_DRIVERS is not set -CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m -CONFIG_VIDEO_SH_VEU=m -# CONFIG_V4L_TEST_DRIVERS is not set - -# -# Supported MMC/SDIO adapters -# -CONFIG_SMS_SDIO_DRV=m -CONFIG_MEDIA_PARPORT_SUPPORT=y -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_PMS=m -CONFIG_VIDEO_W9966=m -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_SI470X=y -CONFIG_USB_SI470X=m -CONFIG_I2C_SI470X=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI4713=m -CONFIG_USB_KEENE=m -CONFIG_USB_MA901=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_WL1273=m - -# -# Texas Instruments WL128x FM driver (ST based) -# -CONFIG_RADIO_WL128X=m -# CONFIG_V4L_RADIO_ISA_DRIVERS is not set - -# -# Supported FireWire (IEEE 1394) Adapters -# -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y - -# -# Media ancillary drivers (tuners, sensors, i2c, frontends) -# -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_VIDEO_IR_I2C=m - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_MT9V011=m - -# -# Flash devices -# - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_M52790=m - -# -# Sensors used on soc_camera driver -# -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -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_MT2063=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_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_TUA9001=m - -# -# Multistandard (satellite) frontends -# -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_STV090x=m -CONFIG_DVB_STV6110x=m - -# -# Multistandard (cable + terrestrial) frontends -# -CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m - -# -# DVB-S (satellite) frontends -# -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_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_DRXD=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_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_RTL2830=m -CONFIG_DVB_RTL2832=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -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_LG2160=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m -CONFIG_DVB_S5H1411=m - -# -# ISDB-T (terrestrial) frontends -# -CONFIG_DVB_S921=m -CONFIG_DVB_DIB8000=m -CONFIG_DVB_MB86A20S=m - -# -# Digital terrestrial only tuners/PLL -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_TUNER_DIB0090=m - -# -# SEC control devices for DVB-S -# -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m -CONFIG_DVB_IX2505V=m -CONFIG_DVB_IT913X_FE=m -CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m - -# -# Tools to develop new frontends -# -# CONFIG_DVB_DUMMY_FE is not set - -# -# 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_VGA_ARB_MAX_GPUS=16 -CONFIG_VGA_SWITCHEROO=y -CONFIG_DRM=m -CONFIG_DRM_USB=m -CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_LOAD_EDID_FIRMWARE=y -CONFIG_DRM_TTM=m - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -# CONFIG_DRM_RADEON_UMS is not set -CONFIG_DRM_NOUVEAU=m -CONFIG_NOUVEAU_DEBUG=5 -CONFIG_NOUVEAU_DEBUG_DEFAULT=3 -CONFIG_DRM_NOUVEAU_BACKLIGHT=y -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_DRM_VMWGFX=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_GMA500=m -CONFIG_DRM_GMA600=y -CONFIG_DRM_GMA3600=y -CONFIG_DRM_UDL=m -CONFIG_DRM_AST=m -CONFIG_DRM_MGAG200=m -CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -# CONFIG_OF_DISPLAY_TIMING is not set -# CONFIG_OF_VIDEOMODE is not set -CONFIG_HDMI=y -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_WMT_GE_ROPS is not set -CONFIG_FB_DEFERRED_IO=y -# CONFIG_FB_SVGALIB is not set -# 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 is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m -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 is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_I740 is not set -CONFIG_FB_I810=m -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -# CONFIG_FB_LE80578 is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_S3 is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -CONFIG_FB_VIA=m -CONFIG_FB_VIA_DIRECT_PROCFS=y -CONFIG_FB_VIA_X_COMPATIBILITY=y -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -# CONFIG_FB_TRIDENT is not set -# 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_SMSCUFX is not set -CONFIG_FB_UDL=m -# CONFIG_FB_GOLDFISH is not set -CONFIG_FB_VIRTUAL=m -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX is not set -# CONFIG_FB_BROADSHEET is not set -# CONFIG_FB_AUO_K190X is not set -# CONFIG_EXYNOS_VIDEO is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -# CONFIG_LCD_L4F00242T03 is not set -# CONFIG_LCD_LMS283GF05 is not set -# CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_ILI9320 is not set -# CONFIG_LCD_TDO24M is not set -# CONFIG_LCD_VGG2432A4 is not set -CONFIG_LCD_PLATFORM=m -# CONFIG_LCD_S6E63M0 is not set -# CONFIG_LCD_LD9040 is not set -# CONFIG_LCD_AMS369FG06 is not set -# CONFIG_LCD_LMS501KF03 is not set -# CONFIG_LCD_HX8357 is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PWM=m -CONFIG_BACKLIGHT_APPLE=m -# CONFIG_BACKLIGHT_SAHARA is not set -# CONFIG_BACKLIGHT_ADP8860 is not set -# CONFIG_BACKLIGHT_ADP8870 is not set -CONFIG_BACKLIGHT_PCF50633=m -# CONFIG_BACKLIGHT_LM3630 is not set -# CONFIG_BACKLIGHT_LM3639 is not set -# CONFIG_BACKLIGHT_LP855X is not set -# CONFIG_BACKLIGHT_OT200 is not set -# CONFIG_BACKLIGHT_TPS65217 is not set - -# -# 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=y -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_FONT_AUTOSELECT=y -# CONFIG_LOGO is not set -CONFIG_FB_SSD1307=m -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set -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_KCTL_JACK=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_ALOOP=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_AZT1605=m -CONFIG_SND_AZT2316=m -CONFIG_SND_AZT2320=m -CONFIG_SND_CMI8328=m -CONFIG_SND_CMI8330=m -CONFIG_SND_CS4231=m -CONFIG_SND_CS4236=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_JAZZ16=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_SSCAPE=m -CONFIG_SND_WAVEFRONT=m -CONFIG_SND_MSND_PINNACLE=m -CONFIG_SND_MSND_CLASSIC=m -CONFIG_SND_TEA575X=m -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ASIHPI=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_ES1968_INPUT=y -CONFIG_SND_ES1968_RADIO=y -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_DSP_LOADER=y -CONFIG_SND_HDA_PREALLOC_SIZE=4096 -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_BEEP_MODE=1 -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_HDMI=y -CONFIG_SND_HDA_CODEC_CIRRUS=y -CONFIG_SND_HDA_CODEC_CONEXANT=y -CONFIG_SND_HDA_CODEC_CA0110=y -CONFIG_SND_HDA_CODEC_CA0132=y -CONFIG_SND_HDA_CODEC_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=y -CONFIG_SND_HDA_CODEC_SI3054=y -CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_LOLA=m -CONFIG_SND_LX6464ES=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MAESTRO3_INPUT=y -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_UA101=m -CONFIG_SND_USB_USX2Y=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_US122L=m -CONFIG_SND_USB_6FIRE=m -CONFIG_SND_FIREWIRE=y -CONFIG_SND_FIREWIRE_LIB=m -CONFIG_SND_FIREWIRE_SPEAKERS=m -CONFIG_SND_ISIGHT=m -CONFIG_SND_SCS1X=m -CONFIG_SND_PCMCIA=y -CONFIG_SND_VXPOCKET=m -CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=m - -# -# HID support -# -CONFIG_HID=m -CONFIG_HIDRAW=y -CONFIG_UHID=m -CONFIG_HID_GENERIC=m - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=m -CONFIG_HID_AUREAL=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_PRODIKEYS=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EMS_FF=m -CONFIG_HID_ELECOM=m -CONFIG_HID_EZKEY=m -CONFIG_HID_HOLTEK=m -CONFIG_HOLTEK_FF=y -CONFIG_HID_KEYTOUCH=m -CONFIG_HID_KYE=m -CONFIG_HID_UCLOGIC=m -CONFIG_HID_WALTOP=m -CONFIG_HID_GYRATION=m -CONFIG_HID_ICADE=m -CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LCPOWER=m -CONFIG_HID_LENOVO_TPKBD=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_LOGITECH_DJ=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGIG940_FF=y -CONFIG_LOGIWHEELS_FF=y -CONFIG_HID_MAGICMOUSE=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_MULTITOUCH=m -CONFIG_HID_NTRIG=m -CONFIG_HID_ORTEK=m -CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y -CONFIG_HID_PETALYNX=m -CONFIG_HID_PICOLCD=m -CONFIG_HID_PICOLCD_FB=y -CONFIG_HID_PICOLCD_BACKLIGHT=y -CONFIG_HID_PICOLCD_LCD=y -CONFIG_HID_PICOLCD_LEDS=y -CONFIG_HID_PICOLCD_CIR=y -CONFIG_HID_PRIMAX=m -CONFIG_HID_PS3REMOTE=m -CONFIG_HID_ROCCAT=m -CONFIG_HID_SAITEK=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SPEEDLINK=m -CONFIG_HID_STEELSERIES=m -CONFIG_HID_SUNPLUS=m -CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y -CONFIG_HID_HYPERV_MOUSE=m -CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_HID_TIVO=m -CONFIG_HID_TOPSEED=m -CONFIG_HID_THINGM=m -CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y -CONFIG_HID_WACOM=m -CONFIG_HID_WIIMOTE=m -CONFIG_HID_WIIMOTE_EXT=y -CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -CONFIG_HID_ZYDACRON=m -CONFIG_HID_SENSOR_HUB=m - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# I2C HID support -# -CONFIG_I2C_HID=m -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB_ARCH_HAS_XHCI=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=m -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=m -# CONFIG_USB_DEBUG is not set -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_SUSPEND=y -# CONFIG_USB_OTG is not set -# CONFIG_USB_DWC3 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_EHCI_PCI=m -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_HCD_PLATFORM is not set -# CONFIG_USB_EHCI_HCD_PLATFORM 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_HCD_ISO is not set -CONFIG_USB_SL811_CS=m -CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_RENESAS_USBHS_HCD=m -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m -# CONFIG_USB_HCD_BCMA is not set -# CONFIG_USB_HCD_SSB is not set -CONFIG_USB_MUSB_HDRC=m -CONFIG_USB_MUSB_TUSB6010=m -CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set -CONFIG_USB_RENESAS_USBHS=m - -# -# 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_REALTEK=m -CONFIG_REALTEK_AUTOPM=y -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_STORAGE_ENE_UB6250=m - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -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_F81232=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_METRO=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7715_PARPORT=y -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_QCAUX=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_WWAN=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m -CONFIG_USB_SERIAL_XSENS_MT=m -CONFIG_USB_SERIAL_ZIO=m -CONFIG_USB_SERIAL_ZTE=m -CONFIG_USB_SERIAL_SSU100=m -CONFIG_USB_SERIAL_QT2=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_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_YUREX=m -CONFIG_USB_EZUSB_FX2=m -CONFIG_USB_HSIC_USB3503=m - -# -# USB Physical Layer drivers -# -# CONFIG_OMAP_USB3 is not set -# CONFIG_OMAP_CONTROL_USB is not set -CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=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_STORAGE_NUM_BUFFERS=2 - -# -# USB Peripheral Controller -# -CONFIG_USB_FUSB300=m -CONFIG_USB_R8A66597=m -CONFIG_USB_RENESAS_USBHS_UDC=m -CONFIG_USB_MV_UDC=m -CONFIG_USB_GADGET_MUSB_HDRC=m -CONFIG_USB_M66592=m -CONFIG_USB_AMD5536UDC=m -CONFIG_USB_NET2272=m -CONFIG_USB_NET2272_DMA=y -CONFIG_USB_NET2280=m -CONFIG_USB_GOKU=m -CONFIG_USB_EG20T=m -CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_U_SERIAL=m -# CONFIG_USB_ZERO is not set -CONFIG_USB_AUDIO=m -# CONFIG_GADGET_UAC1 is not set -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_ETH_EEM is not set -CONFIG_USB_G_NCM=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FUNCTIONFS=m -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_GADGET_TARGET=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -CONFIG_USB_G_PRINTER=m -# CONFIG_USB_CDC_COMPOSITE is not set -# CONFIG_USB_G_NOKIA is not set -# CONFIG_USB_G_ACM_MS is not set -# CONFIG_USB_G_MULTI is not set -CONFIG_USB_G_HID=m -CONFIG_USB_G_DBGP=m -# CONFIG_USB_G_DBGP_PRINTK is not set -CONFIG_USB_G_DBGP_SERIAL=y -CONFIG_USB_G_WEBCAM=m - -# -# OTG and related infrastructure -# -CONFIG_USB_OTG_UTILS=y -# CONFIG_USB_GPIO_VBUS is not set -CONFIG_NOP_USB_XCEIV=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_I1480U=m -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set -# CONFIG_MMC_CLKGATE is not set - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 -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=y -CONFIG_MMC_SDHCI_ACPI=m -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_WBSD=m -CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_SDRICOH_CS=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MMC_VUB300=m -CONFIG_MMC_USHC=m -CONFIG_MMC_REALTEK_PCI=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_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y - -# -# LED drivers -# -CONFIG_LEDS_LM3530=m -CONFIG_LEDS_LM3533=m -CONFIG_LEDS_LM3642=m -CONFIG_LEDS_PCA9532=m -# CONFIG_LEDS_PCA9532_GPIO is not set -# CONFIG_LEDS_GPIO is not set -CONFIG_LEDS_LP3944=m -CONFIG_LEDS_LP55XX_COMMON=m -CONFIG_LEDS_LP5521=m -CONFIG_LEDS_LP5523=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_PCA9633=m -# CONFIG_LEDS_DAC124S085 is not set -# CONFIG_LEDS_PWM is not set -CONFIG_LEDS_BD2802=m -CONFIG_LEDS_INTEL_SS4200=m -CONFIG_LEDS_LT3593=m -CONFIG_LEDS_DELL_NETBOOKS=m -CONFIG_LEDS_MC13783=m -CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM355x=m -CONFIG_LEDS_OT200=m -CONFIG_LEDS_BLINKM=m -CONFIG_LEDS_TRIGGERS=y - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_ONESHOT=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -# CONFIG_LEDS_TRIGGER_CPU is not set -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_ACCESSIBILITY=y -CONFIG_A11Y_BRAILLE_CONSOLE=y -# CONFIG_INFINIBAND is not set -CONFIG_EDAC=y -CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_DEBUG is not set -CONFIG_EDAC_DECODE_MCE=m -CONFIG_EDAC_MCE_INJ=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_I7CORE=m -CONFIG_EDAC_I82860=m -CONFIG_EDAC_R82600=m -CONFIG_EDAC_I5000=m -CONFIG_EDAC_I5100=m -CONFIG_EDAC_I7300=m -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -# 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_DS3232=m -CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_ISL12022=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_PCF8523=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_BQ32K=m -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_FM3130=m -CONFIG_RTC_DRV_RX8581=m -CONFIG_RTC_DRV_RX8025=m -CONFIG_RTC_DRV_EM3027=m -CONFIG_RTC_DRV_RV3029C2=m - -# -# SPI RTC drivers -# -# CONFIG_RTC_DRV_M41T93 is not set -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_DS3234 is not set -# CONFIG_RTC_DRV_PCF2123 is not set -# CONFIG_RTC_DRV_RX4581 is not set - -# -# 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_MSM6242=m -CONFIG_RTC_DRV_BQ4802=m -CONFIG_RTC_DRV_RP5C01=m -CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_DS2404=m -CONFIG_RTC_DRV_PCF50633=m - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_MC13XXX=m -CONFIG_RTC_DRV_SNVS=m - -# -# HID Sensor RTC drivers -# -# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_INTEL_MID_DMAC=m -CONFIG_INTEL_IOATDMA=m -CONFIG_DW_DMAC=m -# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set -CONFIG_TIMB_DMA=m -CONFIG_PCH_DMA=m -CONFIG_DMA_ENGINE=y -CONFIG_DMA_OF=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_DMEM_GENIRQ is not set -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m -CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set -CONFIG_VIRTIO=y - -# -# Virtio drivers -# -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_MMIO=m -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y - -# -# Microsoft Hyper-V guest support -# -CONFIG_HYPERV=m -CONFIG_HYPERV_UTILS=m -CONFIG_HYPERV_BALLOON=m -CONFIG_STAGING=y -CONFIG_ET131X=m -CONFIG_SLICOSS=m -CONFIG_USBIP_CORE=m -CONFIG_USBIP_VHCI_HCD=m -CONFIG_USBIP_HOST=m -# CONFIG_USBIP_DEBUG is not set -CONFIG_W35UND=m -CONFIG_PRISM2_USB=m -CONFIG_ECHO=m -CONFIG_COMEDI=m -# CONFIG_COMEDI_DEBUG is not set -CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 -CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 -CONFIG_COMEDI_MISC_DRIVERS=y -CONFIG_COMEDI_KCOMEDILIB=m -CONFIG_COMEDI_BOND=m -CONFIG_COMEDI_TEST=m -CONFIG_COMEDI_PARPORT=m -CONFIG_COMEDI_SERIAL2002=m -CONFIG_COMEDI_SKEL=m -CONFIG_COMEDI_ISA_DRIVERS=y -CONFIG_COMEDI_ACL7225B=m -CONFIG_COMEDI_PCL711=m -CONFIG_COMEDI_PCL724=m -CONFIG_COMEDI_PCL725=m -CONFIG_COMEDI_PCL726=m -CONFIG_COMEDI_PCL730=m -CONFIG_COMEDI_PCL812=m -CONFIG_COMEDI_PCL816=m -CONFIG_COMEDI_PCL818=m -CONFIG_COMEDI_PCM3724=m -CONFIG_COMEDI_PCM3730=m -CONFIG_COMEDI_AMPLC_DIO200_ISA=m -CONFIG_COMEDI_AMPLC_PC236_ISA=m -CONFIG_COMEDI_AMPLC_PC263_ISA=m -CONFIG_COMEDI_RTI800=m -CONFIG_COMEDI_RTI802=m -CONFIG_COMEDI_DAS16M1=m -CONFIG_COMEDI_DAS08_ISA=m -CONFIG_COMEDI_DAS16=m -CONFIG_COMEDI_DAS800=m -CONFIG_COMEDI_DAS1800=m -CONFIG_COMEDI_DAS6402=m -CONFIG_COMEDI_DT2801=m -CONFIG_COMEDI_DT2811=m -CONFIG_COMEDI_DT2814=m -CONFIG_COMEDI_DT2815=m -CONFIG_COMEDI_DT2817=m -CONFIG_COMEDI_DT282X=m -CONFIG_COMEDI_DMM32AT=m -CONFIG_COMEDI_FL512=m -CONFIG_COMEDI_AIO_AIO12_8=m -CONFIG_COMEDI_AIO_IIRO_16=m -CONFIG_COMEDI_C6XDIGIO=m -CONFIG_COMEDI_MPC624=m -CONFIG_COMEDI_ADQ12B=m -CONFIG_COMEDI_NI_AT_A2150=m -CONFIG_COMEDI_NI_AT_AO=m -CONFIG_COMEDI_NI_ATMIO=m -CONFIG_COMEDI_NI_ATMIO16D=m -CONFIG_COMEDI_PCMAD=m -CONFIG_COMEDI_PCMDA12=m -CONFIG_COMEDI_PCMMIO=m -CONFIG_COMEDI_PCMUIO=m -CONFIG_COMEDI_MULTIQ3=m -CONFIG_COMEDI_POC=m -CONFIG_COMEDI_PCI_DRIVERS=y -CONFIG_COMEDI_8255_PCI=m -CONFIG_COMEDI_ADDI_WATCHDOG=m -CONFIG_COMEDI_ADDI_APCI_035=m -CONFIG_COMEDI_ADDI_APCI_1032=m -CONFIG_COMEDI_ADDI_APCI_1500=m -CONFIG_COMEDI_ADDI_APCI_1516=m -CONFIG_COMEDI_ADDI_APCI_1564=m -CONFIG_COMEDI_ADDI_APCI_16XX=m -CONFIG_COMEDI_ADDI_APCI_2032=m -CONFIG_COMEDI_ADDI_APCI_2200=m -CONFIG_COMEDI_ADDI_APCI_3120=m -CONFIG_COMEDI_ADDI_APCI_3501=m -CONFIG_COMEDI_ADDI_APCI_3XXX=m -CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7X3X=m -CONFIG_COMEDI_ADL_PCI8164=m -CONFIG_COMEDI_ADL_PCI9111=m -CONFIG_COMEDI_ADL_PCI9118=m -CONFIG_COMEDI_ADV_PCI1710=m -CONFIG_COMEDI_ADV_PCI1723=m -CONFIG_COMEDI_ADV_PCI_DIO=m -CONFIG_COMEDI_AMPLC_DIO200_PCI=m -CONFIG_COMEDI_AMPLC_PC236_PCI=m -CONFIG_COMEDI_AMPLC_PC263_PCI=m -CONFIG_COMEDI_AMPLC_PCI224=m -CONFIG_COMEDI_AMPLC_PCI230=m -CONFIG_COMEDI_CONTEC_PCI_DIO=m -CONFIG_COMEDI_DAS08_PCI=m -CONFIG_COMEDI_DT3000=m -CONFIG_COMEDI_DYNA_PCI10XX=m -CONFIG_COMEDI_UNIOXX5=m -CONFIG_COMEDI_GSC_HPDI=m -CONFIG_COMEDI_ICP_MULTI=m -CONFIG_COMEDI_II_PCI20KC=m -CONFIG_COMEDI_DAQBOARD2000=m -CONFIG_COMEDI_JR3_PCI=m -CONFIG_COMEDI_KE_COUNTER=m -CONFIG_COMEDI_CB_PCIDAS64=m -CONFIG_COMEDI_CB_PCIDAS=m -CONFIG_COMEDI_CB_PCIDDA=m -# CONFIG_COMEDI_CB_PCIMDAS is not set -CONFIG_COMEDI_CB_PCIMDDA=m -CONFIG_COMEDI_ME4000=m -CONFIG_COMEDI_ME_DAQ=m -CONFIG_COMEDI_NI_6527=m -CONFIG_COMEDI_NI_65XX=m -CONFIG_COMEDI_NI_660X=m -CONFIG_COMEDI_NI_670X=m -CONFIG_COMEDI_NI_LABPC=m -CONFIG_COMEDI_NI_PCIDIO=m -CONFIG_COMEDI_NI_PCIMIO=m -CONFIG_COMEDI_RTD520=m -CONFIG_COMEDI_S526=m -CONFIG_COMEDI_S626=m -CONFIG_COMEDI_SSV_DNP=m -CONFIG_COMEDI_MITE=m -CONFIG_COMEDI_NI_TIOCMD=m -CONFIG_COMEDI_PCMCIA_DRIVERS=y -CONFIG_COMEDI_CB_DAS16_CS=m -CONFIG_COMEDI_DAS08_CS=m -CONFIG_COMEDI_NI_DAQ_700_CS=m -CONFIG_COMEDI_NI_DAQ_DIO24_CS=m -CONFIG_COMEDI_NI_LABPC_CS=m -CONFIG_COMEDI_NI_MIO_CS=m -CONFIG_COMEDI_QUATECH_DAQP_CS=m -CONFIG_COMEDI_USB_DRIVERS=y -CONFIG_COMEDI_DT9812=m -CONFIG_COMEDI_USBDUX=m -CONFIG_COMEDI_USBDUXFAST=m -CONFIG_COMEDI_USBDUXSIGMA=m -CONFIG_COMEDI_VMK80XX=m -CONFIG_COMEDI_8255=m -CONFIG_COMEDI_FC=m -CONFIG_COMEDI_AMPLC_DIO200=m -CONFIG_COMEDI_AMPLC_PC236=m -CONFIG_COMEDI_AMPLC_PC263=m -CONFIG_COMEDI_DAS08=m -CONFIG_COMEDI_NI_TIO=m -# CONFIG_FB_OLPC_DCON is not set -CONFIG_ASUS_OLED=m -# CONFIG_PANEL is not set -CONFIG_R8187SE=m -CONFIG_RTL8192U=m -CONFIG_RTLLIB=m -CONFIG_RTLLIB_CRYPTO_CCMP=m -CONFIG_RTLLIB_CRYPTO_TKIP=m -CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set -# CONFIG_TRANZPORT is not set -CONFIG_IDE_PHISON=m -CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set -CONFIG_USB_SERIAL_QUATECH2=m -CONFIG_VT6655=m -CONFIG_VT6656=m -CONFIG_DX_SEP=m -CONFIG_ZRAM=m -# CONFIG_ZRAM_DEBUG is not set -CONFIG_ZSMALLOC=y -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m -CONFIG_FB_SM7XX=m -CONFIG_CRYSTALHD=m -CONFIG_FB_XGI=m -CONFIG_ACPI_QUICKSTART=m -CONFIG_USB_ENESTORAGE=m -CONFIG_BCM_WIMAX=m -CONFIG_FT1000=m -CONFIG_FT1000_USB=m -CONFIG_FT1000_PCMCIA=m - -# -# Speakup console speech -# -CONFIG_SPEAKUP=m -CONFIG_SPEAKUP_SYNTH_ACNTSA=m -CONFIG_SPEAKUP_SYNTH_ACNTPC=m -CONFIG_SPEAKUP_SYNTH_APOLLO=m -CONFIG_SPEAKUP_SYNTH_AUDPTR=m -CONFIG_SPEAKUP_SYNTH_BNS=m -CONFIG_SPEAKUP_SYNTH_DECTLK=m -CONFIG_SPEAKUP_SYNTH_DECEXT=m -CONFIG_SPEAKUP_SYNTH_DECPC=m -CONFIG_SPEAKUP_SYNTH_DTLK=m -CONFIG_SPEAKUP_SYNTH_KEYPC=m -CONFIG_SPEAKUP_SYNTH_LTLK=m -CONFIG_SPEAKUP_SYNTH_SOFT=m -CONFIG_SPEAKUP_SYNTH_SPKOUT=m -CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m -CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m -CONFIG_STAGING_MEDIA=y -CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m -CONFIG_VIDEO_DT3155=m -CONFIG_DT3155_CCIR=y -CONFIG_DT3155_STREAMING=y -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_SOLO6X10=m -CONFIG_LIRC_STAGING=y -CONFIG_LIRC_BT829=m -CONFIG_LIRC_IGORPLUGUSB=m -CONFIG_LIRC_IMON=m -CONFIG_LIRC_PARALLEL=m -CONFIG_LIRC_SASEM=m -CONFIG_LIRC_SERIAL=m -CONFIG_LIRC_SERIAL_TRANSMITTER=y -CONFIG_LIRC_SIR=m -CONFIG_LIRC_ZILOG=m - -# -# Android -# -# CONFIG_ANDROID is not set -CONFIG_USB_WPAN_HCD=m -CONFIG_WIMAX_GDM72XX=m -CONFIG_WIMAX_GDM72XX_QOS=y -CONFIG_WIMAX_GDM72XX_K_MODE=y -CONFIG_WIMAX_GDM72XX_WIMAX2=y -CONFIG_WIMAX_GDM72XX_USB=y -# CONFIG_WIMAX_GDM72XX_SDIO is not set -CONFIG_WIMAX_GDM72XX_USB_PM=y -CONFIG_CSR_WIFI=m -CONFIG_NET_VENDOR_SILICOM=y -CONFIG_SBYPASS=m -CONFIG_BPCTL=m -CONFIG_CED1401=m -CONFIG_DGRP=m -CONFIG_FIREWIRE_SERIAL=m -CONFIG_ZCACHE=y -CONFIG_RAMSTER=y -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ACERHDF=m -CONFIG_ASUS_LAPTOP=m -CONFIG_CHROMEOS_LAPTOP=m -CONFIG_DELL_LAPTOP=m -CONFIG_DELL_WMI=m -CONFIG_DELL_WMI_AIO=m -CONFIG_FUJITSU_LAPTOP=m -# CONFIG_FUJITSU_LAPTOP_DEBUG is not set -CONFIG_FUJITSU_TABLET=m -CONFIG_AMILO_RFKILL=m -CONFIG_TC1100_WMI=m -CONFIG_HP_ACCEL=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_IDEAPAD_LAPTOP=m -CONFIG_THINKPAD_ACPI=m -CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y -# 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_SENSORS_HDAPS=m -CONFIG_INTEL_MENLOW=m -CONFIG_EEEPC_LAPTOP=m -CONFIG_ASUS_WMI=m -CONFIG_ASUS_NB_WMI=m -CONFIG_EEEPC_WMI=m -CONFIG_ACPI_WMI=m -CONFIG_MSI_WMI=m -CONFIG_TOPSTAR_LAPTOP=m -CONFIG_ACPI_TOSHIBA=m -CONFIG_TOSHIBA_BT_RFKILL=m -CONFIG_ACPI_CMPC=m -CONFIG_INTEL_IPS=m -CONFIG_IBM_RTL=m -CONFIG_XO1_RFKILL=m -CONFIG_XO15_EBOOK=m -CONFIG_SAMSUNG_LAPTOP=m -CONFIG_MXM_WMI=m -CONFIG_INTEL_OAKTRAIL=m -CONFIG_SAMSUNG_Q10=m -CONFIG_APPLE_GMUX=m - -# -# Hardware Spinlock drivers -# -CONFIG_CLKSRC_I8253=y -CONFIG_CLKEVT_I8253=y -CONFIG_I8253_LOCK=y -CONFIG_CLKBLD_I8253=y -# CONFIG_MAILBOX is not set -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y -CONFIG_OF_IOMMU=y -CONFIG_DMAR_TABLE=y -CONFIG_INTEL_IOMMU=y -# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set -CONFIG_INTEL_IOMMU_FLOPPY_WA=y - -# -# Remoteproc drivers -# -CONFIG_REMOTEPROC=m -CONFIG_STE_MODEM_RPROC=m - -# -# Rpmsg drivers -# -CONFIG_VIRT_DRIVERS=y -# CONFIG_PM_DEVFREQ is not set -CONFIG_EXTCON=m - -# -# Extcon Device Drivers -# -CONFIG_EXTCON_GPIO=m -CONFIG_MEMORY=y -# CONFIG_IIO is not set -# CONFIG_VME_BUS is not set -CONFIG_PWM=y -CONFIG_IRQCHIP=y -CONFIG_IPACK_BUS=m -CONFIG_BOARD_TPCI200=m -CONFIG_SERIAL_IPOCTAL=m - -# -# Firmware Drivers -# -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 -CONFIG_DMI_SYSFS=m -CONFIG_ISCSI_IBFT_FIND=y -CONFIG_ISCSI_IBFT=m -# CONFIG_GOOGLE_FIRMWARE is not set - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=y -# CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=m -CONFIG_EXT4_USE_FOR_EXT23=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_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_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_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set -CONFIG_NILFS2_FS=m -CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=y -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -# CONFIG_QUOTA_DEBUG is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=y -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_TMPFS_XATTR=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y -CONFIG_CONFIGFS_FS=y -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ADFS_FS is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m -# CONFIG_ECRYPT_FS_MESSAGING is not set -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_UBIFS_FS=m -# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set -CONFIG_UBIFS_FS_LZO=y -CONFIG_UBIFS_FS_ZLIB=y -CONFIG_LOGFS=m -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# 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_QNX6FS_FS is not set -# CONFIG_ROMFS_FS is not set -CONFIG_PSTORE=y -# CONFIG_PSTORE_CONSOLE is not set -# CONFIG_PSTORE_FTRACE is not set -CONFIG_PSTORE_RAM=m -# 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_F2FS_FS=m -CONFIG_F2FS_STAT_FS=y -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_ORE=m -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V2=m -CONFIG_NFS_V3=m -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=m -# CONFIG_NFS_SWAP is not set -CONFIG_NFS_V4_1=y -CONFIG_PNFS_FILE_LAYOUT=m -CONFIG_PNFS_BLOCK=m -CONFIG_PNFS_OBJLAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" -CONFIG_NFS_FSCACHE=y -# CONFIG_NFS_USE_LEGACY_DNS is not set -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -# CONFIG_NFSD_FAULT_INJECTION is not set -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_SUNRPC_BACKCHANNEL=y -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y -CONFIG_CEPH_FS=m -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_ACL=y -# CONFIG_CIFS_DEBUG is not set -CONFIG_CIFS_DFS_UPCALL=y -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y -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 -CONFIG_9P_FS_POSIX_ACL=y -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_MAC_ROMAN=m -CONFIG_NLS_MAC_CELTIC=m -CONFIG_NLS_MAC_CENTEURO=m -CONFIG_NLS_MAC_CROATIAN=m -CONFIG_NLS_MAC_CYRILLIC=m -CONFIG_NLS_MAC_GAELIC=m -CONFIG_NLS_MAC_GREEK=m -CONFIG_NLS_MAC_ICELAND=m -CONFIG_NLS_MAC_INUIT=m -CONFIG_NLS_MAC_ROMANIAN=m -CONFIG_NLS_MAC_TURKISH=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_DEFAULT_MESSAGE_LOGLEVEL=4 -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_READABLE_ASM is not set -CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_SHIRQ is not set -CONFIG_LOCKUP_DETECTOR=y -CONFIG_HARDLOCKUP_DETECTOR=y -# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -CONFIG_SCHED_DEBUG=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_PREEMPT 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_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -CONFIG_STACKTRACE=y -# CONFIG_DEBUG_STACK_USAGE is not set -# 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_TEST_LIST_SORT 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 - -# -# RCU Debugging -# -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_CPU_STALL_VERBOSE is not set -# CONFIG_RCU_CPU_STALL_INFO is not set -# CONFIG_RCU_TRACE is not set -# CONFIG_KPROBES_SANITY_TEST 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_DEBUG_PER_CPU_MAPS is not set -CONFIG_LKDTM=m -# CONFIG_NOTIFIER_ERROR_INJECTION is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -# CONFIG_DEBUG_PAGEALLOC is not set -CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=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_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACER_MAX_TRACE=y -CONFIG_TRACE_CLOCK=y -CONFIG_RING_BUFFER=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_PREEMPT_TRACER is not set -CONFIG_SCHED_TRACER=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_TRACER_SNAPSHOT=y -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -CONFIG_STACK_TRACER=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_KPROBE_EVENT=y -CONFIG_UPROBE_EVENT=y -CONFIG_PROBE_EVENTS=y -CONFIG_DYNAMIC_FTRACE=y -CONFIG_DYNAMIC_FTRACE_WITH_REGS=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_RBTREE_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -CONFIG_DYNAMIC_DEBUG=y -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_ATOMIC64_SELFTEST is not set -CONFIG_ASYNC_RAID6_TEST=m -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -CONFIG_HAVE_ARCH_KMEMCHECK=y -CONFIG_TEST_KSTRTOX=m -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_X86_PTDUMP is not set -CONFIG_DEBUG_RODATA=y -# CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set -# CONFIG_DEBUG_NX_TEST is not set -CONFIG_DOUBLEFAULT=y -# CONFIG_IOMMU_STRESS is not set -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -# CONFIG_X86_DECODER_SELFTEST is not set -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 -# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set -# CONFIG_DEBUG_NMI_SELFTEST is not set - -# -# Security options -# -CONFIG_KEYS=y -CONFIG_TRUSTED_KEYS=m -CONFIG_ENCRYPTED_KEYS=m -# CONFIG_KEYS_DEBUG_PROC_KEYS is not set -# CONFIG_SECURITY_DMESG_RESTRICT 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_INTEL_TXT is not set -# CONFIG_SECURITY_SELINUX is not set -# CONFIG_SECURITY_SMACK is not set -CONFIG_SECURITY_TOMOYO=y -CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 -CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 -# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_YAMA is not set -# CONFIG_IMA is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set -CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_DEFAULT_SECURITY="" -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_ALGAPI=y -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=m -CONFIG_CRYPTO_PCOMP2=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_USER=m -CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ABLK_HELPER_X86=m -CONFIG_CRYPTO_GLUE_HELPER_X86=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_CRC32=m -CONFIG_CRYPTO_CRC32_PCLMUL=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=y -CONFIG_CRYPTO_AES_586=m -CONFIG_CRYPTO_AES_NI_INTEL=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_BLOWFISH_COMMON=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAST_COMMON=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_SERPENT_SSE2_586=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=y - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=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_ASYMMETRIC_KEY_TYPE=m -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m -CONFIG_PUBLIC_KEY_ALGO_RSA=m -CONFIG_X509_CERTIFICATE_PARSER=m -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_APIC_ARCHITECTURE=y -CONFIG_KVM_MMIO=y -CONFIG_KVM_ASYNC_PF=y -CONFIG_HAVE_KVM_MSI=y -CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -CONFIG_KVM_MMU_AUDIT=y -CONFIG_VHOST_NET=m -CONFIG_TCM_VHOST=m -CONFIG_LGUEST=m -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_RAID6_PQ=m -CONFIG_BITREVERSE=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_IO=y -CONFIG_PERCPU_RWSEM=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC_T10DIF=m -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -# CONFIG_CRC32_SELFTEST is not set -CONFIG_CRC32_SLICEBY8=y -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SARWATE is not set -# CONFIG_CRC32_BIT is not set -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_CRC8=m -CONFIG_AUDIT_GENERIC=y -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_XZ_DEC=y -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_ARMTHUMB=y -CONFIG_XZ_DEC_SPARC=y -CONFIG_XZ_DEC_BCJ=y -# CONFIG_XZ_DEC_TEST is not set -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_REED_SOLOMON=m -CONFIG_REED_SOLOMON_ENC8=y -CONFIG_REED_SOLOMON_DEC8=y -CONFIG_REED_SOLOMON_DEC16=y -CONFIG_BCH=m -CONFIG_BCH_CONST_PARAMS=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_BTREE=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_CPU_RMAP=y -CONFIG_DQL=y -CONFIG_NLATTR=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_LRU_CACHE=m -CONFIG_AVERAGE=y -CONFIG_CLZ_TAB=y -CONFIG_CORDIC=m -CONFIG_DDR=y -CONFIG_MPILIB=m -CONFIG_OID_REGISTRY=m -CONFIG_UCS2_STRING=y diff --git a/libre-testing/linux-libre/config.x86_64 b/libre-testing/linux-libre/config.x86_64 deleted file mode 100644 index 2e7cd8ec0..000000000 --- a/libre-testing/linux-libre/config.x86_64 +++ /dev/null @@ -1,6051 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.0-2 Kernel Configuration -# -CONFIG_64BIT=y -CONFIG_X86_64=y -CONFIG_X86=y -CONFIG_INSTRUCTION_DECODER=y -CONFIG_OUTPUT_FORMAT="elf64-x86-64" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_MMU=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_GENERIC_ISA_DMA=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_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_CPU_AUTOPROBE=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_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ZONE_DMA32=y -CONFIG_AUDIT_ARCH=y -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_HAVE_INTEL_TXT=y -CONFIG_X86_64_SMP=y -CONFIG_X86_HT=y -CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" -CONFIG_ARCH_CPU_PROBE_RELEASE=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="-LIBRE" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_XZ is not set -# CONFIG_KERNEL_LZO is not set -CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y -CONFIG_AUDIT_LOGINUID_IMMUTABLE=y -CONFIG_HAVE_GENERIC_HARDIRQS=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_IRQ_DOMAIN=y -# CONFIG_IRQ_DOMAIN_DEBUG is not set -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y -CONFIG_GENERIC_CMOS_UPDATE=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -# CONFIG_IRQ_TIME_ACCOUNTING is not set -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 - -# -# RCU Subsystem -# -CONFIG_TREE_PREEMPT_RCU=y -CONFIG_PREEMPT_RCU=y -CONFIG_RCU_STALL_COMMON=y -# CONFIG_RCU_USER_QS is not set -CONFIG_RCU_FANOUT=64 -CONFIG_RCU_FANOUT_LEAF=16 -# CONFIG_RCU_FANOUT_EXACT is not set -CONFIG_RCU_FAST_NO_HZ=y -# CONFIG_TREE_RCU_TRACE is not set -# CONFIG_RCU_BOOST is not set -CONFIG_RCU_NOCB_CPU=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=19 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y -CONFIG_ARCH_USES_NUMA_PROT_NONE=y -CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y -CONFIG_NUMA_BALANCING=y -CONFIG_CGROUPS=y -# CONFIG_CGROUP_DEBUG is not set -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_MEMCG=y -CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_MEMCG_KMEM=y -# CONFIG_CGROUP_HUGETLB is not set -# CONFIG_CGROUP_PERF is not set -CONFIG_CGROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_CFS_BANDWIDTH=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_CGROUP=y -# CONFIG_DEBUG_BLK_CGROUP is not set -# CONFIG_CHECKPOINT_RESTORE is not set -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y -# CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -# CONFIG_EXPERT is not set -CONFIG_HAVE_UID16=y -CONFIG_UID16=y -# CONFIG_SYSCTL_SYSCALL is not set -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_HAVE_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_EMBEDDED is not set -CONFIG_HAVE_PERF_EVENTS=y - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=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_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_OPROFILE=m -# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set -CONFIG_HAVE_OPROFILE=y -CONFIG_OPROFILE_NMI_TIMER=y -CONFIG_KPROBES=y -CONFIG_JUMP_LABEL=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_UPROBES=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_KRETPROBES=y -CONFIG_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_KPROBES_ON_FTRACE=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_USE_GENERIC_SMP_HELPERS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y -CONFIG_HAVE_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_PERF_EVENTS_NMI=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y -CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y -CONFIG_HAVE_CMPXCHG_LOCAL=y -CONFIG_HAVE_CMPXCHG_DOUBLE=y -CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_COMPAT_OLD_SIGACTION=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL 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_MODULE_SIG is not set -CONFIG_STOP_MACHINE=y -CONFIG_BLOCK=y -CONFIG_BLK_DEV_BSG=y -CONFIG_BLK_DEV_BSGLIB=y -# CONFIG_BLK_DEV_INTEGRITY is not set -CONFIG_BLK_DEV_THROTTLING=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_BLOCK_COMPAT=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_CFQ_GROUP_IOSCHED=y -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_PREEMPT_NOTIFIERS=y -CONFIG_PADATA=y -CONFIG_ASN1=m -CONFIG_UNINLINE_SPIN_UNLOCK=y -CONFIG_FREEZER=y - -# -# Processor type and features -# -CONFIG_ZONE_DMA=y -CONFIG_SMP=y -CONFIG_X86_X2APIC=y -CONFIG_X86_MPPARSE=y -# CONFIG_X86_EXTENDED_PLATFORM is not set -# CONFIG_X86_INTEL_LPSS is not set -CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_PARAVIRT_GUEST=y -CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_XEN=y -CONFIG_XEN_DOM0=y -CONFIG_XEN_PRIVILEGED_GUEST=y -CONFIG_XEN_PVHVM=y -CONFIG_XEN_MAX_DOMAIN_MEMORY=500 -CONFIG_XEN_SAVE_RESTORE=y -# CONFIG_XEN_DEBUG_FS is not set -CONFIG_KVM_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set -CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set -CONFIG_NO_BOOTMEM=y -# CONFIG_MEMTEST is not set -# CONFIG_MK8 is not set -# CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set -# CONFIG_MATOM is not set -CONFIG_GENERIC_CPU=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -CONFIG_X86_L1_CACHE_SHIFT=6 -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_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_SWIOTLB=y -CONFIG_IOMMU_HELPER=y -# CONFIG_MAXSMP is not set -CONFIG_NR_CPUS=64 -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -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 is not set -# CONFIG_MICROCODE_AMD is not set -CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_X86_MSR=m -CONFIG_X86_CPUID=m -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_DIRECT_GBPAGES=y -CONFIG_NUMA=y -CONFIG_AMD_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_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_MEMORY_PROBE=y -CONFIG_ARCH_PROC_KCORE_TEXT=y -CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -CONFIG_SELECT_MEMORY_MODEL=y -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_ALLOC_MEM_MAP_TOGETHER=y -CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_MEMORY_ISOLATION=y -# CONFIG_MOVABLE_NODE is not set -CONFIG_HAVE_BOOTMEM_INFO_NODE=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTPLUG_SPARSE=y -CONFIG_MEMORY_HOTREMOVE=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_BALLOON_COMPACTION=y -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y -CONFIG_VIRT_TO_BUS=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_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_CLEANCACHE=y -CONFIG_FRONTSWAP=y -CONFIG_X86_CHECK_BIOS_CORRUPTION=y -CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -CONFIG_X86_RESERVE_LOW=64 -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_ARCH_RANDOM=y -CONFIG_X86_SMAP=y -CONFIG_EFI=y -CONFIG_EFI_STUB=y -CONFIG_SECCOMP=y -CONFIG_CC_STACKPROTECTOR=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -CONFIG_HZ_300=y -# CONFIG_HZ_1000 is not set -CONFIG_HZ=300 -CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y -# CONFIG_CRASH_DUMP is not set -CONFIG_KEXEC_JUMP=y -CONFIG_PHYSICAL_START=0x1000000 -CONFIG_RELOCATABLE=y -CONFIG_PHYSICAL_ALIGN=0x1000000 -CONFIG_HOTPLUG_CPU=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# 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_USE_PERCPU_NUMA_NODE_ID=y - -# -# Power management and ACPI options -# -CONFIG_ARCH_HIBERNATION_HEADER=y -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -CONFIG_PM_AUTOSLEEP=y -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=100 -CONFIG_PM_WAKELOCKS_GC=y -CONFIG_PM_RUNTIME=y -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_ADVANCED_DEBUG=y -# CONFIG_PM_TEST_SUSPEND is not set -CONFIG_PM_SLEEP_DEBUG=y -CONFIG_PM_TRACE=y -CONFIG_PM_TRACE_RTC=y -CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y -# CONFIG_ACPI_PROCFS is not set -# CONFIG_ACPI_PROCFS_POWER is not set -CONFIG_ACPI_EC_DEBUGFS=m -# CONFIG_ACPI_PROC_EVENT is not set -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_I2C=m -CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_IPMI=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_INITRD_TABLE_OVERRIDE=y -CONFIG_ACPI_BLACKLIST_YEAR=0 -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=y -CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_HOTPLUG_MEMORY=m -CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=y -CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=y -CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_GHES=y -CONFIG_ACPI_APEI_PCIEAER=y -CONFIG_ACPI_APEI_MEMORY_FAILURE=y -CONFIG_ACPI_APEI_EINJ=m -CONFIG_ACPI_APEI_ERST_DEBUG=m -CONFIG_SFI=y - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_STAT_DETAILS=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -# 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=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - -# -# x86 CPU frequency scaling drivers -# -CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=m -CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_ACPI_CPUFREQ_CPB=y -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_MULTIPLE_DRIVERS is not set -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y -# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set -CONFIG_INTEL_IDLE=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_XEN=y -CONFIG_PCI_DOMAINS=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_PCIEASPM_DEFAULT=y -# CONFIG_PCIEASPM_POWERSAVE is not set -# CONFIG_PCIEASPM_PERFORMANCE is not set -CONFIG_PCIE_PME=y -CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_PCI_MSI=y -# CONFIG_PCI_DEBUG is not set -CONFIG_PCI_REALLOC_ENABLE_AUTO=y -CONFIG_PCI_STUB=m -CONFIG_XEN_PCIDEV_FRONTEND=m -CONFIG_HT_IRQ=y -CONFIG_PCI_ATS=y -CONFIG_PCI_IOV=y -CONFIG_PCI_PRI=y -CONFIG_PCI_PASID=y -CONFIG_PCI_IOAPIC=y -CONFIG_PCI_LABEL=y -CONFIG_ISA_DMA_API=y -CONFIG_AMD_NB=y -CONFIG_PCCARD=m -CONFIG_PCMCIA=m -CONFIG_PCMCIA_LOAD_CIS=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=y -CONFIG_HOTPLUG_PCI=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 -CONFIG_RAPIDIO=y -CONFIG_RAPIDIO_TSI721=y -CONFIG_RAPIDIO_DISC_TIMEOUT=30 -# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set -CONFIG_RAPIDIO_DMA_ENGINE=y -CONFIG_RAPIDIO_DEBUG=y -CONFIG_RAPIDIO_TSI57X=y -CONFIG_RAPIDIO_CPS_XX=y -CONFIG_RAPIDIO_TSI568=y -CONFIG_RAPIDIO_CPS_GEN2=y -CONFIG_RAPIDIO_TSI500=y - -# -# Executable file formats / Emulations -# -CONFIG_BINFMT_ELF=y -CONFIG_COMPAT_BINFMT_ELF=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -# CONFIG_HAVE_AOUT is not set -CONFIG_BINFMT_MISC=y -CONFIG_COREDUMP=y -CONFIG_IA32_EMULATION=y -CONFIG_IA32_AOUT=m -CONFIG_X86_X32=y -CONFIG_COMPAT=y -CONFIG_COMPAT_FOR_U64_ALIGNMENT=y -CONFIG_SYSVIPC_COMPAT=y -CONFIG_KEYS_COMPAT=y -CONFIG_HAVE_TEXT_POKE_SMP=y -CONFIG_X86_DEV_DMA_OPS=y -CONFIG_NET=y -CONFIG_COMPAT_NETLINK_MESSAGES=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=m -CONFIG_UNIX=y -CONFIG_UNIX_DIAG=m -CONFIG_XFRM=y -CONFIG_XFRM_ALGO=m -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_IP_FIB_TRIE_STATS=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_ROUTE_CLASSID=y -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IPGRE=m -# CONFIG_NET_IPGRE_BROADCAST is not set -CONFIG_IP_MROUTE=y -# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y -CONFIG_SYN_COOKIES=y -CONFIG_NET_IPVTI=m -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_INET_UDP_DIAG=m -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_CUBIC=y -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -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_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_GRE=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -# CONFIG_IPV6_MROUTE is not set -CONFIG_NETLABEL=y -CONFIG_NETWORK_SECMARK=y -CONFIG_NETWORK_PHY_TIMESTAMPING=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_ACCT=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_ZONES=y -CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_TIMEOUT=y -CONFIG_NF_CONNTRACK_TIMESTAMP=y -CONFIG_NF_CONNTRACK_LABELS=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_BROADCAST=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=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_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_NETLINK_HELPER=m -CONFIG_NETFILTER_NETLINK_QUEUE_CT=y -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_NAT_PROTO_DCCP=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_SIP=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NETFILTER_TPROXY=m -CONFIG_NETFILTER_XTABLES=m - -# -# Xtables combined modules -# -CONFIG_NETFILTER_XT_MARK=m -CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m - -# -# Xtables targets -# -CONFIG_NETFILTER_XT_TARGET_AUDIT=m -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_HMARK=m -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NETMAP=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_REDIRECT=m -CONFIG_NETFILTER_XT_TARGET_TEE=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 - -# -# Xtables matches -# -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ECN=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_IPVS=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_NFACCT=m -CONFIG_NETFILTER_XT_MATCH_OSF=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_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_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=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 -CONFIG_IP_VS_PROTO_SCTP=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 SH scheduler -# -CONFIG_IP_VS_SH_TAB_BITS=8 - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m -CONFIG_IP_VS_NFCT=y -CONFIG_IP_VS_PE_SIP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT_IPV4=m -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_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=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_DEFRAG_IPV6=m -CONFIG_NF_CONNTRACK_IPV6=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_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=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_NF_NAT_IPV6=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=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 -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -CONFIG_IP_DCCP_CCID3=y -# CONFIG_IP_DCCP_CCID3_DEBUG is not set -CONFIG_IP_DCCP_TFRC_LIB=y - -# -# DCCP Kernel Hacking -# -# CONFIG_IP_DCCP_DEBUG is not set -CONFIG_NET_DCCPPROBE=m -CONFIG_IP_SCTP=m -CONFIG_NET_SCTPPROBE=m -# CONFIG_SCTP_DBG_MSG is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set -CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set -CONFIG_SCTP_COOKIE_HMAC_MD5=y -CONFIG_SCTP_COOKIE_HMAC_SHA1=y -# 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_L2TP=m -# CONFIG_L2TP_DEBUGFS is not set -CONFIG_L2TP_V3=y -CONFIG_L2TP_IP=m -CONFIG_L2TP_ETH=m -CONFIG_STP=m -CONFIG_MRP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_NET_DSA=m -CONFIG_NET_DSA_TAG_DSA=y -CONFIG_NET_DSA_TAG_EDSA=y -CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set -CONFIG_VLAN_8021Q_MVRP=y -# 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_PHONET=m -CONFIG_IEEE802154=m -CONFIG_IEEE802154_6LOWPAN=m -CONFIG_MAC802154=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_SFB=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_MQPRIO=m -CONFIG_NET_SCH_CHOKE=m -CONFIG_NET_SCH_QFQ=m -CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_SCH_PLUG=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -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_ACT_CSUM=m -CONFIG_NET_CLS_IND=y -CONFIG_NET_SCH_FIFO=y -# CONFIG_DCB is not set -CONFIG_DNS_RESOLVER=y -CONFIG_BATMAN_ADV=m -CONFIG_BATMAN_ADV_BLA=y -CONFIG_BATMAN_ADV_DAT=y -# CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_OPENVSWITCH=m -CONFIG_VSOCKETS=m -CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y -CONFIG_NETPRIO_CGROUP=m -CONFIG_BQL=y -CONFIG_BPF_JIT=y - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -CONFIG_NET_TCPPROBE=m -CONFIG_NET_DROP_MONITOR=y -CONFIG_HAMRADIO=y - -# -# Packet Radio protocols -# -CONFIG_AX25=m -CONFIG_AX25_DAMA_SLAVE=y -CONFIG_NETROM=m -CONFIG_ROSE=m - -# -# AX.25 network device drivers -# -CONFIG_MKISS=m -CONFIG_6PACK=m -CONFIG_BPQETHER=m -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_BAYCOM_PAR=m -CONFIG_YAM=m -# 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_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_ATH3K=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIUART_3WIRE=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_BT_ATH3K=m -CONFIG_BT_WILINK=m -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=m -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=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_DEBUGFS is not set -# CONFIG_CFG80211_INTERNAL_REGDB is not set -CONFIG_CFG80211_WEXT=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_MINSTREL_HT=y -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_MESSAGE_TRACING 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 -CONFIG_CAIF=m -# CONFIG_CAIF_DEBUG is not set -CONFIG_CAIF_NETDEV=m -CONFIG_CAIF_USB=m -CONFIG_CEPH_LIB=m -# CONFIG_CEPH_LIB_PRETTYDEBUG is not set -# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set -CONFIG_NFC=m -CONFIG_NFC_NCI=m -CONFIG_NFC_HCI=m -# CONFIG_NFC_SHDLC is not set -# CONFIG_NFC_LLCP is not set - -# -# Near Field Communication (NFC) devices -# -CONFIG_NFC_PN533=m -CONFIG_NFC_WILINK=m -CONFIG_NFC_PN544=m -CONFIG_NFC_MICROREAD=m -CONFIG_HAVE_BPF_JIT=y - -# -# 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_FW_LOADER_USER_HELPER is not set -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -CONFIG_SYS_HYPERVISOR=y -# CONFIG_GENERIC_CPU_DEVICES is not set -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_MMIO=m -CONFIG_REGMAP_IRQ=y -CONFIG_DMA_SHARED_BUFFER=y - -# -# Bus devices -# -CONFIG_CONNECTOR=y -CONFIG_PROC_EVENTS=y -CONFIG_MTD=m -CONFIG_MTD_TESTS=m -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set -CONFIG_MTD_CMDLINE_PARTS=m -CONFIG_MTD_AR7_PARTS=m - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -CONFIG_FTL=m -CONFIG_NFTL=m -CONFIG_NFTL_RW=y -CONFIG_INFTL=m -CONFIG_RFD_FTL=m -CONFIG_SSFDC=m -# CONFIG_SM_FTL is not set -CONFIG_MTD_OOPS=m -CONFIG_MTD_SWAP=m - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS 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_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m -CONFIG_MTD_RAM=m -CONFIG_MTD_ROM=m -CONFIG_MTD_ABSENT=m - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -# CONFIG_MTD_PHYSMAP is not set -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m -CONFIG_MTD_TS5500=m -# CONFIG_MTD_SBC_GXX is not set -# CONFIG_MTD_AMD76XROM is not set -# CONFIG_MTD_ICHXROM is not set -# CONFIG_MTD_ESB2ROM is not set -# CONFIG_MTD_CK804XROM is not set -CONFIG_MTD_SCB2_FLASH=m -# CONFIG_MTD_NETtel is not set -# CONFIG_MTD_L440GX is not set -CONFIG_MTD_PCI=m -# CONFIG_MTD_PCMCIA is not set -# CONFIG_MTD_GPIO_ADDR is not set -# CONFIG_MTD_INTEL_VR_NOR is not set -CONFIG_MTD_PLATRAM=m -# CONFIG_MTD_LATCH_ADDR is not set - -# -# Self-contained MTD device drivers -# -CONFIG_MTD_PMC551=m -# CONFIG_MTD_PMC551_BUGFIX is not set -# CONFIG_MTD_PMC551_DEBUG is not set -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -# CONFIG_MTD_SST25L is not set -# CONFIG_MTD_SLRAM is not set -CONFIG_MTD_PHRAM=m -CONFIG_MTD_MTDRAM=m -CONFIG_MTDRAM_TOTAL_SIZE=4096 -CONFIG_MTDRAM_ERASE_SIZE=128 -CONFIG_MTD_BLOCK2MTD=m - -# -# 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_DOCG3=m -CONFIG_BCH_CONST_M=14 -CONFIG_BCH_CONST_T=4 -CONFIG_MTD_NAND_ECC=m -CONFIG_MTD_NAND_ECC_SMC=y -CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_ECC_BCH is not set -CONFIG_MTD_SM_COMMON=m -# CONFIG_MTD_NAND_MUSEUM_IDS is not set -# CONFIG_MTD_NAND_DENALI is not set -CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_RICOH=m -CONFIG_MTD_NAND_DISKONCHIP=m -# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 -# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set -CONFIG_MTD_NAND_DOCG4=m -# CONFIG_MTD_NAND_CAFE is not set -CONFIG_MTD_NAND_NANDSIM=m -# CONFIG_MTD_NAND_PLATFORM is not set -CONFIG_MTD_ALAUDA=m -# CONFIG_MTD_ONENAND is not set - -# -# LPDDR flash memory drivers -# -CONFIG_MTD_LPDDR=m -CONFIG_MTD_QINFO_PROBE=m -CONFIG_MTD_UBI=m -CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_LIMIT=20 -# CONFIG_MTD_UBI_FASTMAP is not set -# CONFIG_MTD_UBI_GLUEBI 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_DEV_PCIESSD_MTIP32XX=m -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_LOOP_MIN_COUNT=8 -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_DRBD=m -# CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_NVME=m -CONFIG_BLK_DEV_OSD=m -CONFIG_BLK_DEV_SX8=m -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_XEN_BLKDEV_BACKEND=m -CONFIG_VIRTIO_BLK=m -# CONFIG_BLK_DEV_HD is not set -CONFIG_BLK_DEV_RBD=m -CONFIG_BLK_DEV_RSXX=m - -# -# Misc devices -# -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_AD525X_DPOT=m -CONFIG_AD525X_DPOT_I2C=m -# CONFIG_AD525X_DPOT_SPI is not set -# CONFIG_IBM_ASM is not set -CONFIG_PHANTOM=m -CONFIG_INTEL_MID_PTI=m -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -# CONFIG_ATMEL_SSC is not set -CONFIG_ENCLOSURE_SERVICES=m -CONFIG_CS5535_MFGPT=m -CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 -CONFIG_CS5535_CLOCK_EVENT_SRC=m -CONFIG_HP_ILO=m -CONFIG_APDS9802ALS=m -CONFIG_ISL29003=m -CONFIG_ISL29020=m -CONFIG_SENSORS_TSL2550=m -CONFIG_SENSORS_BH1780=m -CONFIG_SENSORS_BH1770=m -CONFIG_SENSORS_APDS990X=m -CONFIG_HMC6352=m -CONFIG_DS1682=m -# CONFIG_TI_DAC7512 is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y -CONFIG_BMP085_I2C=m -# CONFIG_BMP085_SPI is not set -CONFIG_PCH_PHUB=m -CONFIG_USB_SWITCH_FSA9480=m -# CONFIG_LATTICE_ECP3_CONFIG is not set -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -# CONFIG_EEPROM_AT25 is not set -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -# CONFIG_EEPROM_93XX46 is not set -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set -CONFIG_CB710_DEBUG_ASSUMPTIONS=y - -# -# Texas Instruments shared transport line discipline -# -CONFIG_TI_ST=m -CONFIG_SENSORS_LIS3_I2C=m - -# -# Altera FPGA firmware download module -# -CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=y -CONFIG_VMWARE_VMCI=m -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI_MOD=m -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 - -# -# 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_SRP_ATTRS=m -CONFIG_SCSI_SRP_TGT_ATTRS=y -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_CXGB4_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m -CONFIG_SCSI_BNX2X_FCOE=m -CONFIG_BE2ISCSI=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_HPSA=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_3W_SAS=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_MVSAS_TASKLET=y -CONFIG_SCSI_MVUMI=m -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_ARCMSR=m -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_MPT3SAS=m -CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -CONFIG_SCSI_MPT3SAS_LOGGING=y -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PCI=m -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_BUSLOGIC=m -CONFIG_VMWARE_PVSCSI=m -CONFIG_HYPERV_STORAGE=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_ISCI=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_TCM_QLA2XXX=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_PM8001=m -CONFIG_SCSI_SRP=m -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_CHELSIO_FCOE=m -CONFIG_SCSI_LOWLEVEL_PCMCIA=y -CONFIG_PCMCIA_AHA152X=m -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_ZPODD=y -CONFIG_SATA_PMP=y - -# -# Controllers with non-SFF native interface -# -CONFIG_SATA_AHCI=m -CONFIG_SATA_AHCI_PLATFORM=m -CONFIG_SATA_INIC162X=m -CONFIG_SATA_ACARD_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y - -# -# SFF controllers with custom DMA interface -# -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_SX4=m -CONFIG_ATA_BMDMA=y - -# -# SATA SFF controllers with BMDMA -# -CONFIG_ATA_PIIX=m -CONFIG_SATA_HIGHBANK=m -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_SVW=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m - -# -# PATA SFF controllers with BMDMA -# -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARASAN_CF=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_ATP867X=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -CONFIG_PATA_CS5536=m -CONFIG_PATA_CYPRESS=m -CONFIG_PATA_EFAR=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_IT8213=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_MARVELL=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NINJA32=m -CONFIG_PATA_NS87415=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_OPTIDMA=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_RADISYS=m -CONFIG_PATA_RDC=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SCH=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=m -CONFIG_PATA_TOSHIBA=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m - -# -# PIO-only SFF controllers -# -CONFIG_PATA_CMD640_PCI=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_PCMCIA=m -CONFIG_PATA_RZ1000=m - -# -# Generic fallback / legacy drivers -# -CONFIG_PATA_ACPI=m -CONFIG_ATA_GENERIC=m -CONFIG_PATA_LEGACY=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_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_BUFIO=m -CONFIG_DM_BIO_PRISON=m -CONFIG_DM_PERSISTENT_DATA=m -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_THIN_PROVISIONING=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set -CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_MQ=m -CONFIG_DM_CACHE_CLEANER=m -CONFIG_DM_MIRROR=m -CONFIG_DM_RAID=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_DM_FLAKEY=m -CONFIG_DM_VERITY=m -CONFIG_TARGET_CORE=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_LOOPBACK_TARGET=m -CONFIG_TCM_FC=m -CONFIG_ISCSI_TARGET=m -CONFIG_SBP_TARGET=m -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 -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_SBP2=m -CONFIG_FIREWIRE_NET=m -CONFIG_FIREWIRE_NOSY=m -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_NET_CORE=y -CONFIG_BONDING=m -CONFIG_DUMMY=m -CONFIG_EQUALIZER=m -# CONFIG_NET_FC is not set -CONFIG_MII=m -CONFIG_IFB=m -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_MACVLAN=m -CONFIG_MACVTAP=m -CONFIG_VXLAN=m -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_RIONET=m -CONFIG_RIONET_TX_SIZE=128 -CONFIG_RIONET_RX_SIZE=128 -CONFIG_TUN=m -CONFIG_VETH=m -CONFIG_VIRTIO_NET=m -CONFIG_SUNGEM_PHY=m -# CONFIG_ARCNET 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 - -# -# CAIF transport drivers -# -CONFIG_CAIF_TTY=m -CONFIG_CAIF_SPI_SLAVE=m -CONFIG_CAIF_SPI_SYNC=y -CONFIG_CAIF_HSI=m - -# -# Distributed Switch Architecture drivers -# -CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6060=m -CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y -CONFIG_NET_DSA_MV88E6131=m -CONFIG_NET_DSA_MV88E6123_61_65=m -CONFIG_ETHERNET=y -CONFIG_MDIO=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_3C589=m -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_NET_VENDOR_ADAPTEC=y -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_NET_VENDOR_ALTEON=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_NET_VENDOR_AMD=y -CONFIG_AMD8111_ETH=m -CONFIG_PCNET32=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_NET_VENDOR_ATHEROS=y -CONFIG_ATL2=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_NET_CADENCE=y -CONFIG_ARM_AT91_ETHER=m -CONFIG_MACB=m -CONFIG_NET_VENDOR_BROADCOM=y -CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_TIGON3=m -CONFIG_BNX2X=m -CONFIG_BNX2X_SRIOV=y -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m -CONFIG_NET_CALXEDA_XGMAC=m -CONFIG_NET_VENDOR_CHELSIO=y -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4VF=m -CONFIG_NET_VENDOR_CISCO=y -CONFIG_ENIC=m -CONFIG_DNET=m -CONFIG_NET_VENDOR_DEC=y -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_NET_VENDOR_DLINK=y -CONFIG_DL2K=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_NET_VENDOR_EMULEX=y -CONFIG_BE2NET=m -CONFIG_NET_VENDOR_EXAR=y -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_NET_VENDOR_HP=y -CONFIG_HP100=m -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=m -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_IGB=m -CONFIG_IGB_HWMON=y -CONFIG_IGB_DCA=y -CONFIG_IGBVF=m -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCA=y -CONFIG_IXGBEVF=m -CONFIG_NET_VENDOR_I825XX=y -CONFIG_IP1000=m -CONFIG_JME=m -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_MVMDIO=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -CONFIG_SKGE_GENESIS=y -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_NET_VENDOR_MICREL=y -CONFIG_KS8842=m -# CONFIG_KS8851 is not set -CONFIG_KS8851_MLL=m -CONFIG_KSZ884X_PCI=m -CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set -CONFIG_NET_VENDOR_MYRI=y -CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y -CONFIG_FEALNX=m -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NATSEMI=m -CONFIG_NS83820=m -CONFIG_NET_VENDOR_8390=y -CONFIG_PCMCIA_AXNET=m -CONFIG_NE2K_PCI=m -CONFIG_PCMCIA_PCNET=m -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=m -CONFIG_NET_VENDOR_OKI=y -CONFIG_PCH_GBE=m -CONFIG_ETHOC=m -CONFIG_NET_PACKET_ENGINE=y -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_NET_VENDOR_QLOGIC=y -CONFIG_QLA3XXX=m -CONFIG_QLCNIC=m -CONFIG_QLGE=m -CONFIG_NETXEN_NIC=m -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_ATP=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_R8169=m -CONFIG_NET_VENDOR_RDC=y -CONFIG_R6040=m -CONFIG_NET_VENDOR_SEEQ=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_SFC_MCDI_MON=y -CONFIG_SFC_SRIOV=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_PCMCIA_SMC91C92=m -CONFIG_EPIC100=m -CONFIG_SMSC9420=m -CONFIG_NET_VENDOR_STMICRO=y -CONFIG_STMMAC_ETH=m -# CONFIG_STMMAC_PLATFORM is not set -CONFIG_STMMAC_PCI=y -# CONFIG_STMMAC_DEBUG_FS is not set -# CONFIG_STMMAC_DA is not set -CONFIG_STMMAC_RING=y -# CONFIG_STMMAC_CHAINED is not set -CONFIG_NET_VENDOR_SUN=y -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NIU=m -CONFIG_NET_VENDOR_TEHUTI=y -CONFIG_TEHUTI=m -CONFIG_NET_VENDOR_TI=y -CONFIG_TLAN=m -CONFIG_NET_VENDOR_VIA=y -CONFIG_VIA_RHINE=m -# CONFIG_VIA_RHINE_MMIO is not set -CONFIG_VIA_VELOCITY=m -CONFIG_NET_VENDOR_WIZNET=y -CONFIG_WIZNET_W5100=m -CONFIG_WIZNET_W5300=m -# CONFIG_WIZNET_BUS_DIRECT is not set -# CONFIG_WIZNET_BUS_INDIRECT is not set -CONFIG_WIZNET_BUS_ANY=y -CONFIG_NET_VENDOR_XIRCOM=y -CONFIG_PCMCIA_XIRC2PS=m -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_NET_SB1000=m -CONFIG_PHYLIB=m - -# -# MII PHY device drivers -# -CONFIG_AT803X_PHY=m -CONFIG_AMD_PHY=m -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_BCM87XX_PHY=m -CONFIG_ICPLUS_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_STE10XP=m -CONFIG_LSI_ET1011C_PHY=m -CONFIG_MICREL_PHY=m -# CONFIG_MDIO_BITBANG is not set -# CONFIG_MICREL_KS8995MA is not set -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPPOATM=m -CONFIG_PPPOE=m -CONFIG_PPTP=m -CONFIG_PPPOL2TP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_SLIP=m -CONFIG_SLHC=m -# CONFIG_SLIP_COMPRESSED is not set -# CONFIG_SLIP_SMART is not set -# CONFIG_SLIP_MODE_SLIP6 is not set - -# -# 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_AX88179_178A=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_CDC_MBIM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SMSC75XX=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_NET_CX82310_ETH=m -CONFIG_USB_NET_KALMIA=m -CONFIG_USB_NET_QMI_WWAN=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_USB_IPHETH=m -CONFIG_USB_SIERRA_NET=m -CONFIG_USB_VL600=m -CONFIG_WLAN=y -CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS_THINFIRM=m -# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set -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_ATH_COMMON=m -CONFIG_ATH_CARDS=m -# CONFIG_ATH_DEBUG is not set -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -# CONFIG_ATH5K_TRACER is not set -CONFIG_ATH5K_PCI=y -CONFIG_ATH9K_HW=m -CONFIG_ATH9K_COMMON=m -CONFIG_ATH9K_BTCOEX_SUPPORT=y -CONFIG_ATH9K=m -CONFIG_ATH9K_PCI=y -CONFIG_ATH9K_AHB=y -# CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y -CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set -CONFIG_CARL9170=m -CONFIG_CARL9170_LEDS=y -CONFIG_CARL9170_WPC=y -# CONFIG_CARL9170_HWRNG is not set -CONFIG_ATH6KL=m -CONFIG_ATH6KL_SDIO=m -CONFIG_ATH6KL_USB=m -# CONFIG_ATH6KL_DEBUG is not set -CONFIG_AR5523=m -CONFIG_WIL6210=m -CONFIG_WIL6210_ISR_COR=y -CONFIG_B43=m -CONFIG_B43_BCMA=y -# CONFIG_B43_BCMA_EXTRA is not set -CONFIG_B43_SSB=y -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_N=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_PHY_HT=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_BRCMUTIL=m -CONFIG_BRCMSMAC=m -CONFIG_BRCMFMAC=m -CONFIG_BRCMFMAC_SDIO=y -# CONFIG_BRCMFMAC_SDIO_OOB is not set -CONFIG_BRCMFMAC_USB=y -# CONFIG_BRCM_TRACING is not set -# CONFIG_BRCMDBG is not set -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_IPW2100 is not set -# CONFIG_IPW2200 is not set -CONFIG_IWLWIFI=m -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m - -# -# Debugging Options -# -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLWIFI_DEVICE_TRACING=y -# CONFIG_IWLWIFI_P2P is not set -CONFIG_IWLEGACY=m -CONFIG_IWL4965=m -CONFIG_IWL3945=m - -# -# iwl3945 / iwl4965 Debugging Options -# -# CONFIG_IWLEGACY_DEBUG is not set -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_SPI is not set -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_MESH=y -CONFIG_HERMES=m -CONFIG_HERMES_PRISM=y -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_ORINOCO_USB=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -# CONFIG_P54_SPI is not set -CONFIG_P54_LEDS=y -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2800PCI=m -CONFIG_RT2800PCI_RT33XX=y -CONFIG_RT2800PCI_RT35XX=y -CONFIG_RT2800PCI_RT53XX=y -CONFIG_RT2800PCI_RT3290=y -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2X00_LIB_MMIO=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8192CU=m -CONFIG_RTL8192C_COMMON=m -CONFIG_WL_TI=y -CONFIG_WL1251=m -# CONFIG_WL1251_SPI is not set -CONFIG_WL1251_SDIO=m -CONFIG_WL12XX=m -CONFIG_WL18XX=m -CONFIG_WLCORE=m -# CONFIG_WLCORE_SPI is not set -CONFIG_WLCORE_SDIO=m -CONFIG_WILINK_PLATFORM_DATA=y -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m -CONFIG_MWIFIEX_PCIE=m -CONFIG_MWIFIEX_USB=m - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 -# CONFIG_WAN is not set -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m -CONFIG_IEEE802154_AT86RF230=m -# CONFIG_IEEE802154_MRF24J40 is not set -CONFIG_XEN_NETDEV_FRONTEND=m -CONFIG_XEN_NETDEV_BACKEND=m -CONFIG_VMXNET3=m -CONFIG_HYPERV_NET=m -CONFIG_ISDN=y -CONFIG_ISDN_I4L=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_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_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_CAPI=y -# CONFIG_GIGASET_I4L is not set -# CONFIG_GIGASET_DUMMYLL is not set -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_M105=m -CONFIG_GIGASET_M101=m -# CONFIG_GIGASET_DEBUG is not set -CONFIG_HYSDN=m -CONFIG_HYSDN_CAPI=y -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_HDLC=m - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m -CONFIG_INPUT_SPARSEKMAP=m -CONFIG_INPUT_MATRIXKMAP=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_ADP5589=m -CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_QT1070=m -CONFIG_KEYBOARD_QT2160=m -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KEYBOARD_GPIO_POLLED is not set -CONFIG_KEYBOARD_TCA6416=m -CONFIG_KEYBOARD_TCA8418=m -CONFIG_KEYBOARD_MATRIX=m -# CONFIG_KEYBOARD_LM8323 is not set -CONFIG_KEYBOARD_LM8333=m -# CONFIG_KEYBOARD_MAX7359 is not set -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -# 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_CYPRESS=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_CYAPA=m -CONFIG_MOUSE_VSXXXAA=m -# CONFIG_MOUSE_GPIO is not set -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_SYNAPTICS_USB=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_AS5011=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_HANWANG=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_WACOM=m -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set -# CONFIG_TOUCHSCREEN_AD7877 is not set -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -# CONFIG_TOUCHSCREEN_AD7879_SPI is not set -CONFIG_TOUCHSCREEN_ATMEL_MXT=m -CONFIG_TOUCHSCREEN_AUO_PIXCIR=m -CONFIG_TOUCHSCREEN_BU21013=m -CONFIG_TOUCHSCREEN_CY8CTMG110=m -CONFIG_TOUCHSCREEN_CYTTSP_CORE=m -CONFIG_TOUCHSCREEN_CYTTSP_I2C=m -# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set -CONFIG_TOUCHSCREEN_DYNAPRO=m -CONFIG_TOUCHSCREEN_HAMPSHIRE=m -CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_ILI210X=m -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -CONFIG_TOUCHSCREEN_WACOM_I2C=m -CONFIG_TOUCHSCREEN_MAX11801=m -CONFIG_TOUCHSCREEN_MCS5000=m -CONFIG_TOUCHSCREEN_MMS114=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_EDT_FT5X06=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m -CONFIG_TOUCHSCREEN_UCB1400=m -CONFIG_TOUCHSCREEN_PIXCIR=m -CONFIG_TOUCHSCREEN_WM97XX=m -CONFIG_TOUCHSCREEN_WM9705=y -CONFIG_TOUCHSCREEN_WM9712=y -CONFIG_TOUCHSCREEN_WM9713=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_MC13783=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_ELO=y -CONFIG_TOUCHSCREEN_USB_E2I=y -CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y -CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y -CONFIG_TOUCHSCREEN_USB_NEXIO=y -CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC_SERIO=m -# CONFIG_TOUCHSCREEN_TSC2005 is not set -CONFIG_TOUCHSCREEN_TSC2007=m -CONFIG_TOUCHSCREEN_ST1232=m -CONFIG_TOUCHSCREEN_TPS6507X=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_AD714X=m -CONFIG_INPUT_AD714X_I2C=m -CONFIG_INPUT_AD714X_SPI=m -CONFIG_INPUT_BMA150=m -CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_MC13783_PWRBUTTON=m -CONFIG_INPUT_MMA8450=m -CONFIG_INPUT_MPU3050=m -CONFIG_INPUT_APANEL=m -CONFIG_INPUT_GP2A=m -# CONFIG_INPUT_GPIO_TILT_POLLED is not set -CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_KXTJ9=m -# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_RETU_PWRBUTTON=m -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_PCF50633_PMU=m -CONFIG_INPUT_PCF8574=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_ADXL34X=m -CONFIG_INPUT_ADXL34X_I2C=m -CONFIG_INPUT_ADXL34X_SPI=m -CONFIG_INPUT_CMA3000=m -CONFIG_INPUT_CMA3000_I2C=m -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m - -# -# 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_SERIO_ALTERA_PS2=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_ARC_PS2=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_TTY=y -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_UNIX98_PTYS=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -# CONFIG_MOXA_INTELLIO is not set -# CONFIG_MOXA_SMARTIO is not set -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -# CONFIG_SYNCLINK_GT is not set -CONFIG_NOZOMI=m -# CONFIG_ISI is not set -CONFIG_N_HDLC=m -CONFIG_N_GSM=m -CONFIG_TRACE_ROUTER=m -CONFIG_TRACE_SINK=m -# CONFIG_DEVKMEM is not set -# CONFIG_STALDRV is not set - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=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 -CONFIG_SERIAL_8250_DW=m - -# -# Non-8250 serial port support -# -# CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX310X is not set -CONFIG_SERIAL_MFD_HSU=m -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_SCCNXP=m -# CONFIG_SERIAL_TIMBERDALE is not set -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m -CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 -CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 -# CONFIG_SERIAL_IFX6X60 is not set -CONFIG_SERIAL_PCH_UART=m -CONFIG_SERIAL_ARC=m -CONFIG_SERIAL_ARC_NR_PORTS=1 -CONFIG_SERIAL_RP2=m -CONFIG_SERIAL_RP2_NR_UARTS=32 -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_HVC_XEN_FRONTEND=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_HW_RANDOM_TPM=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_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_TIS_I2C_INFINEON=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TCG_ST33_I2C=m -CONFIG_TELCLOCK=m -CONFIG_DEVPORT=y -CONFIG_I2C=m -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_SMBUS=m -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_ISMT=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_CBUS_GPIO is not set -CONFIG_I2C_DESIGNWARE_CORE=m -CONFIG_I2C_DESIGNWARE_PCI=m -CONFIG_I2C_EG20T=m -# CONFIG_I2C_GPIO is not set -CONFIG_I2C_INTEL_MID=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PCA_PLATFORM=m -# CONFIG_I2C_PXA_PCI is not set -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_XILINX=m - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_VIPERBOARD=m - -# -# Other I2C/SMBus bus drivers -# -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_BUTTERFLY is not set -# CONFIG_SPI_GPIO is not set -# CONFIG_SPI_LM70_LLP is not set -# CONFIG_SPI_OC_TINY is not set -CONFIG_SPI_PXA2XX_DMA=y -CONFIG_SPI_PXA2XX=m -CONFIG_SPI_PXA2XX_PCI=m -# CONFIG_SPI_SC18IS602 is not set -# CONFIG_SPI_TOPCLIFF_PCH is not set -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_DESIGNWARE is not set - -# -# SPI Protocol Masters -# -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set -# CONFIG_HSI is not set - -# -# PPS support -# -CONFIG_PPS=m -# CONFIG_PPS_DEBUG is not set - -# -# PPS clients support -# -CONFIG_PPS_CLIENT_KTIMER=m -CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m -CONFIG_PPS_CLIENT_GPIO=m - -# -# PPS generators support -# - -# -# PTP clock support -# -CONFIG_PTP_1588_CLOCK=m -CONFIG_DP83640_PHY=m -CONFIG_PTP_1588_CLOCK_PCH=m -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_ACPI=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y - -# -# Memory mapped GPIO drivers: -# -# CONFIG_GPIO_GENERIC_PLATFORM is not set -# CONFIG_GPIO_IT8761E is not set -# CONFIG_GPIO_TS5500 is not set -CONFIG_GPIO_SCH=m -CONFIG_GPIO_ICH=m -# CONFIG_GPIO_VX855 is not set -# CONFIG_GPIO_LYNXPOINT is not set - -# -# I2C GPIO expanders: -# -CONFIG_GPIO_ARIZONA=m -# CONFIG_GPIO_MAX7300 is not set -# CONFIG_GPIO_MAX732X is not set -# CONFIG_GPIO_PCA953X is not set -# CONFIG_GPIO_PCF857X is not set -# CONFIG_GPIO_ADP5588 is not set - -# -# PCI GPIO expanders: -# -CONFIG_GPIO_CS5535=m -CONFIG_GPIO_AMD8111=m -CONFIG_GPIO_LANGWELL=y -# CONFIG_GPIO_PCH is not set -# CONFIG_GPIO_ML_IOH is not set -# CONFIG_GPIO_RDC321X is not set - -# -# SPI GPIO expanders: -# -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set -# CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_74X164 is not set - -# -# AC97 GPIO expanders: -# -CONFIG_GPIO_UCB1400=y - -# -# MODULbus GPIO expanders: -# - -# -# USB GPIO expanders: -# -CONFIG_GPIO_VIPERBOARD=m -# CONFIG_W1 is not set -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -CONFIG_PDA_POWER=m -CONFIG_TEST_POWER=m -# CONFIG_BATTERY_DS2780 is not set -# CONFIG_BATTERY_DS2781 is not set -# CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_SBS is not set -# CONFIG_BATTERY_BQ27x00 is not set -# CONFIG_BATTERY_MAX17040 is not set -# CONFIG_BATTERY_MAX17042 is not set -# CONFIG_CHARGER_PCF50633 is not set -# CONFIG_CHARGER_ISP1704 is not set -# CONFIG_CHARGER_MAX8903 is not set -# CONFIG_CHARGER_LP8727 is not set -# CONFIG_CHARGER_GPIO is not set -# CONFIG_CHARGER_BQ2415X is not set -# CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GOLDFISH is not set -CONFIG_POWER_RESET=y -CONFIG_POWER_AVS=y -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_AD7314 is not set -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -# CONFIG_SENSORS_ADCXX is not set -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_ADT7410=m -CONFIG_SENSORS_ADT7411=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_ASC7621=m -CONFIG_SENSORS_K8TEMP=m -CONFIG_SENSORS_K10TEMP=m -CONFIG_SENSORS_FAM15H_POWER=m -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS620=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_GPIO_FAN is not set -CONFIG_SENSORS_HIH6130=m -CONFIG_SENSORS_CORETEMP=m -CONFIG_SENSORS_IBMAEM=m -CONFIG_SENSORS_IBMPEX=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_JC42=m -CONFIG_SENSORS_LINEAGE=m -CONFIG_SENSORS_LM63=m -# CONFIG_SENSORS_LM70 is not set -CONFIG_SENSORS_LM73=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_LTC4151=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LTC4261=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_LM95245=m -# CONFIG_SENSORS_MAX1111 is not set -CONFIG_SENSORS_MAX16065=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX1668=m -CONFIG_SENSORS_MAX197=m -CONFIG_SENSORS_MAX6639=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_PCF8591=m -CONFIG_PMBUS=m -CONFIG_SENSORS_PMBUS=m -CONFIG_SENSORS_ADM1275=m -CONFIG_SENSORS_LM25066=m -CONFIG_SENSORS_LTC2978=m -CONFIG_SENSORS_MAX16064=m -CONFIG_SENSORS_MAX34440=m -CONFIG_SENSORS_MAX8688=m -CONFIG_SENSORS_UCD9000=m -CONFIG_SENSORS_UCD9200=m -CONFIG_SENSORS_ZL6100=m -CONFIG_SENSORS_SHT15=m -CONFIG_SENSORS_SHT21=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_SMM665=m -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_EMC1403=m -CONFIG_SENSORS_EMC2103=m -CONFIG_SENSORS_EMC6W201=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47M192=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_SCH56XX_COMMON=m -CONFIG_SENSORS_SCH5627=m -CONFIG_SENSORS_SCH5636=m -CONFIG_SENSORS_ADS1015=m -CONFIG_SENSORS_ADS7828=m -# CONFIG_SENSORS_ADS7871 is not set -CONFIG_SENSORS_AMC6821=m -CONFIG_SENSORS_INA209=m -CONFIG_SENSORS_INA2XX=m -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_TMP102=m -CONFIG_SENSORS_TMP401=m -CONFIG_SENSORS_TMP421=m -CONFIG_SENSORS_VIA_CPUTEMP=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_W83795=m -# CONFIG_SENSORS_W83795_FANCTRL is not set -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83L786NG=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_APPLESMC=m -CONFIG_SENSORS_MC13783_ADC=m - -# -# ACPI drivers -# -CONFIG_SENSORS_ACPI_POWER=m -CONFIG_SENSORS_ATK0110=m -CONFIG_THERMAL=y -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -CONFIG_THERMAL_GOV_FAIR_SHARE=y -CONFIG_THERMAL_GOV_STEP_WISE=y -# CONFIG_THERMAL_GOV_USER_SPACE is not set -# CONFIG_CPU_THERMAL is not set -# CONFIG_THERMAL_EMULATION is not set -CONFIG_INTEL_POWERCLAMP=m -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_RETU_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_F71808E_WDT=m -CONFIG_SP5100_TCO=m -CONFIG_GEODE_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_IE6XX_WDT=m -CONFIG_ITCO_WDT=m -CONFIG_ITCO_VENDOR_SUPPORT=y -CONFIG_IT8712F_WDT=m -CONFIG_IT87_WDT=m -CONFIG_HP_WATCHDOG=m -CONFIG_HPWDT_NMI_DECODING=y -CONFIG_SC1200_WDT=m -CONFIG_PC87413_WDT=m -CONFIG_NV_TCO=m -CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m -CONFIG_CPU5_WDT=m -CONFIG_SMSC_SCH311X_WDT=m -CONFIG_SMSC37B787_WDT=m -CONFIG_VIA_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 -CONFIG_XEN_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 -CONFIG_SSB_DRIVER_GPIO=y -CONFIG_BCMA_POSSIBLE=y - -# -# Broadcom specific AMBA -# -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -CONFIG_BCMA_DRIVER_GMAC_CMN=y -CONFIG_BCMA_DRIVER_GPIO=y -# CONFIG_BCMA_DEBUG is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y -CONFIG_MFD_RTSX_PCI=m -CONFIG_MFD_TI_AM335X_TSCADC=m -CONFIG_HTC_PASIC3=m -CONFIG_UCB1400_CORE=m -CONFIG_MFD_LM3533=m -# CONFIG_TPS6105X is not set -CONFIG_TPS65010=m -CONFIG_TPS6507X=m -CONFIG_MFD_TPS65217=m -# CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_TMIO is not set -# CONFIG_MFD_DA9052_SPI is not set -CONFIG_MFD_ARIZONA=y -CONFIG_MFD_ARIZONA_I2C=m -# CONFIG_MFD_ARIZONA_SPI is not set -CONFIG_MFD_WM5102=y -CONFIG_MFD_WM5110=y -# CONFIG_MFD_WM831X_SPI is not set -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m -# CONFIG_MFD_MC13XXX_SPI is not set -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_ABX500_CORE=y -# CONFIG_EZX_PCAP is not set -CONFIG_MFD_CS5535=m -# CONFIG_MFD_TIMBERDALE is not set -CONFIG_LPC_SCH=m -CONFIG_LPC_ICH=m -CONFIG_MFD_RDC321X=m -# CONFIG_MFD_JANZ_CMODIO is not set -CONFIG_MFD_VX855=m -CONFIG_MFD_WL1273_CORE=m -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m -# CONFIG_REGULATOR is not set -CONFIG_MEDIA_SUPPORT=m - -# -# Multimedia core support -# -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_MEDIA_RC_SUPPORT=y -CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -# CONFIG_VIDEO_V4L2_INT_DEVICE is not set -CONFIG_DVB_CORE=m -CONFIG_DVB_NET=y -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set - -# -# Media drivers -# -CONFIG_RC_CORE=m -CONFIG_RC_MAP=m -CONFIG_RC_DECODERS=y -CONFIG_LIRC=m -CONFIG_IR_LIRC_CODEC=m -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_RC5_SZ_DECODER=m -CONFIG_IR_SANYO_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m -CONFIG_IR_ENE=m -CONFIG_IR_IMON=m -CONFIG_IR_MCEUSB=m -CONFIG_IR_ITE_CIR=m -CONFIG_IR_FINTEK=m -CONFIG_IR_NUVOTON=m -CONFIG_IR_REDRAT3=m -CONFIG_IR_STREAMZAP=m -CONFIG_IR_WINBOND_CIR=m -CONFIG_IR_IGUANA=m -CONFIG_IR_TTUSBIR=m -CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_USB_SUPPORT=y - -# -# Webcam devices -# -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_BENQ=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_CPIA1=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_JL2005BCD=m -CONFIG_USB_GSPCA_KINECT=m -CONFIG_USB_GSPCA_KONICA=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_NW80X=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_OV534_9=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7302=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SE401=m -CONFIG_USB_GSPCA_SN9C2028=m -CONFIG_USB_GSPCA_SN9C20X=m -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_SPCA1528=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_SQ930X=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_STV0680=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TOPRO=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_VICAM=m -CONFIG_USB_GSPCA_XIRLINK_CIT=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_USB_SN9C102=m - -# -# Analog TV USB devices -# -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_TLG2300=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_STK1160_AC97=y - -# -# Analog/digital TV USB devices -# -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_AU0828_V4L2=y -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m - -# -# Digital TV USB devices -# -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_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_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_V2=m -CONFIG_DVB_USB_CYPRESS_FIRMWARE=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set - -# -# Webcam, TV (analog/digital) USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m -CONFIG_MEDIA_PCI_SUPPORT=y - -# -# Media capture support -# -CONFIG_VIDEO_MEYE=m - -# -# Media capture/analog TV support -# -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_IVTV_ALSA=m -CONFIG_VIDEO_FB_IVTV=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_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_MXB=m - -# -# Media capture/analog/hybrid TV support -# -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m -CONFIG_VIDEO_CX23885=m -CONFIG_MEDIA_ALTERA_CI=m -CONFIG_VIDEO_CX25821=m -CONFIG_VIDEO_CX25821_ALSA=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_RC=y -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_SAA7164=m - -# -# Media digital TV PCI Adapters -# -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 -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m -CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m -CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -# CONFIG_V4L_PLATFORM_DRIVERS is not set -CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m -CONFIG_VIDEO_SH_VEU=m -# CONFIG_V4L_TEST_DRIVERS is not set - -# -# Supported MMC/SDIO adapters -# -CONFIG_SMS_SDIO_DRV=m -CONFIG_MEDIA_PARPORT_SUPPORT=y -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_W9966=m -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_SI470X=y -CONFIG_USB_SI470X=m -CONFIG_I2C_SI470X=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI4713=m -CONFIG_USB_KEENE=m -CONFIG_USB_MA901=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_WL1273=m - -# -# Texas Instruments WL128x FM driver (ST based) -# -CONFIG_RADIO_WL128X=m - -# -# Supported FireWire (IEEE 1394) Adapters -# -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y - -# -# Media ancillary drivers (tuners, sensors, i2c, frontends) -# -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_VIDEO_IR_I2C=m - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_MT9V011=m - -# -# Flash devices -# - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_M52790=m - -# -# Sensors used on soc_camera driver -# -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -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_MT2063=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_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_TUA9001=m - -# -# Multistandard (satellite) frontends -# -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_STV090x=m -CONFIG_DVB_STV6110x=m - -# -# Multistandard (cable + terrestrial) frontends -# -CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m - -# -# DVB-S (satellite) frontends -# -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_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_DRXD=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_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_RTL2830=m -CONFIG_DVB_RTL2832=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -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_LG2160=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m -CONFIG_DVB_S5H1411=m - -# -# ISDB-T (terrestrial) frontends -# -CONFIG_DVB_S921=m -CONFIG_DVB_DIB8000=m -CONFIG_DVB_MB86A20S=m - -# -# Digital terrestrial only tuners/PLL -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_TUNER_DIB0090=m - -# -# SEC control devices for DVB-S -# -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m -CONFIG_DVB_IX2505V=m -CONFIG_DVB_IT913X_FE=m -CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m - -# -# Tools to develop new frontends -# -# CONFIG_DVB_DUMMY_FE is not set - -# -# 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_VGA_ARB_MAX_GPUS=16 -CONFIG_VGA_SWITCHEROO=y -CONFIG_DRM=m -CONFIG_DRM_USB=m -CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_LOAD_EDID_FIRMWARE=y -CONFIG_DRM_TTM=m - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -# CONFIG_DRM_RADEON_UMS is not set -CONFIG_DRM_NOUVEAU=m -CONFIG_NOUVEAU_DEBUG=5 -CONFIG_NOUVEAU_DEBUG_DEFAULT=3 -CONFIG_DRM_NOUVEAU_BACKLIGHT=y -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_DRM_VMWGFX=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_GMA500=m -CONFIG_DRM_GMA600=y -CONFIG_DRM_GMA3600=y -CONFIG_DRM_UDL=m -CONFIG_DRM_AST=m -CONFIG_DRM_MGAG200=m -CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_HDMI=y -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -# CONFIG_FB_DDC is not set -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_WMT_GE_ROPS is not set -CONFIG_FB_DEFERRED_IO=y -# CONFIG_FB_SVGALIB is not set -# 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 is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m -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 is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_I740 is not set -# CONFIG_FB_LE80578 is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_S3 is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -CONFIG_FB_VIA=m -CONFIG_FB_VIA_DIRECT_PROCFS=y -CONFIG_FB_VIA_X_COMPATIBILITY=y -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -# CONFIG_FB_TRIDENT is not set -# 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_SMSCUFX is not set -CONFIG_FB_UDL=m -# CONFIG_FB_GOLDFISH is not set -CONFIG_FB_VIRTUAL=m -CONFIG_XEN_FBDEV_FRONTEND=m -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX is not set -# CONFIG_FB_BROADSHEET is not set -# CONFIG_FB_AUO_K190X is not set -# CONFIG_EXYNOS_VIDEO is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -# CONFIG_LCD_L4F00242T03 is not set -# CONFIG_LCD_LMS283GF05 is not set -# CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_ILI9320 is not set -# CONFIG_LCD_TDO24M is not set -# CONFIG_LCD_VGG2432A4 is not set -CONFIG_LCD_PLATFORM=m -# CONFIG_LCD_S6E63M0 is not set -# CONFIG_LCD_LD9040 is not set -# CONFIG_LCD_AMS369FG06 is not set -# CONFIG_LCD_LMS501KF03 is not set -# CONFIG_LCD_HX8357 is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_APPLE=m -# CONFIG_BACKLIGHT_SAHARA is not set -# CONFIG_BACKLIGHT_ADP8860 is not set -# CONFIG_BACKLIGHT_ADP8870 is not set -CONFIG_BACKLIGHT_PCF50633=m -# CONFIG_BACKLIGHT_LM3630 is not set -# CONFIG_BACKLIGHT_LM3639 is not set -# CONFIG_BACKLIGHT_LP855X is not set -# CONFIG_BACKLIGHT_OT200 is not set -# CONFIG_BACKLIGHT_TPS65217 is not set - -# -# 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=y -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_FONT_AUTOSELECT=y -# CONFIG_LOGO is not set -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set -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_KCTL_JACK=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_ALOOP=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_TEA575X=m -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ASIHPI=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_ES1968_INPUT=y -CONFIG_SND_ES1968_RADIO=y -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_DSP_LOADER=y -CONFIG_SND_HDA_PREALLOC_SIZE=4096 -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_BEEP_MODE=1 -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_HDMI=y -CONFIG_SND_HDA_CODEC_CIRRUS=y -CONFIG_SND_HDA_CODEC_CONEXANT=y -CONFIG_SND_HDA_CODEC_CA0110=y -CONFIG_SND_HDA_CODEC_CA0132=y -CONFIG_SND_HDA_CODEC_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=y -CONFIG_SND_HDA_CODEC_SI3054=y -CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_LOLA=m -CONFIG_SND_LX6464ES=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MAESTRO3_INPUT=y -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_UA101=m -CONFIG_SND_USB_USX2Y=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_US122L=m -CONFIG_SND_USB_6FIRE=m -CONFIG_SND_FIREWIRE=y -CONFIG_SND_FIREWIRE_LIB=m -CONFIG_SND_FIREWIRE_SPEAKERS=m -CONFIG_SND_ISIGHT=m -CONFIG_SND_SCS1X=m -CONFIG_SND_PCMCIA=y -CONFIG_SND_VXPOCKET=m -CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=m - -# -# HID support -# -CONFIG_HID=m -CONFIG_HIDRAW=y -CONFIG_UHID=m -CONFIG_HID_GENERIC=m - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=m -CONFIG_HID_AUREAL=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_PRODIKEYS=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EMS_FF=m -CONFIG_HID_ELECOM=m -CONFIG_HID_EZKEY=m -CONFIG_HID_HOLTEK=m -CONFIG_HOLTEK_FF=y -CONFIG_HID_KEYTOUCH=m -CONFIG_HID_KYE=m -CONFIG_HID_UCLOGIC=m -CONFIG_HID_WALTOP=m -CONFIG_HID_GYRATION=m -CONFIG_HID_ICADE=m -CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LCPOWER=m -CONFIG_HID_LENOVO_TPKBD=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_LOGITECH_DJ=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGIG940_FF=y -CONFIG_LOGIWHEELS_FF=y -CONFIG_HID_MAGICMOUSE=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_MULTITOUCH=m -CONFIG_HID_NTRIG=m -CONFIG_HID_ORTEK=m -CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y -CONFIG_HID_PETALYNX=m -CONFIG_HID_PICOLCD=m -CONFIG_HID_PICOLCD_FB=y -CONFIG_HID_PICOLCD_BACKLIGHT=y -CONFIG_HID_PICOLCD_LCD=y -CONFIG_HID_PICOLCD_LEDS=y -CONFIG_HID_PICOLCD_CIR=y -CONFIG_HID_PRIMAX=m -CONFIG_HID_PS3REMOTE=m -CONFIG_HID_ROCCAT=m -CONFIG_HID_SAITEK=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SPEEDLINK=m -CONFIG_HID_STEELSERIES=m -CONFIG_HID_SUNPLUS=m -CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y -CONFIG_HID_HYPERV_MOUSE=m -CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_HID_TIVO=m -CONFIG_HID_TOPSEED=m -CONFIG_HID_THINGM=m -CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y -CONFIG_HID_WACOM=m -CONFIG_HID_WIIMOTE=m -CONFIG_HID_WIIMOTE_EXT=y -CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -CONFIG_HID_ZYDACRON=m -CONFIG_HID_SENSOR_HUB=m - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# I2C HID support -# -CONFIG_I2C_HID=m -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB_ARCH_HAS_XHCI=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=m -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=m -# CONFIG_USB_DEBUG is not set -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_SUSPEND=y -# CONFIG_USB_OTG is not set -# CONFIG_USB_DWC3 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_EHCI_PCI=m -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_HCD_PLATFORM is not set -# CONFIG_USB_EHCI_HCD_PLATFORM 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_HCD_ISO is not set -CONFIG_USB_SL811_CS=m -CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_RENESAS_USBHS_HCD=m -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m -# CONFIG_USB_HCD_BCMA is not set -# CONFIG_USB_HCD_SSB is not set -CONFIG_USB_MUSB_HDRC=m -CONFIG_USB_MUSB_TUSB6010=m -CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set -CONFIG_USB_RENESAS_USBHS=m - -# -# 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_REALTEK=m -CONFIG_REALTEK_AUTOPM=y -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_STORAGE_ENE_UB6250=m - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -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_F81232=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_METRO=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7715_PARPORT=y -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_QCAUX=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_WWAN=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m -CONFIG_USB_SERIAL_XSENS_MT=m -CONFIG_USB_SERIAL_ZIO=m -CONFIG_USB_SERIAL_ZTE=m -CONFIG_USB_SERIAL_SSU100=m -CONFIG_USB_SERIAL_QT2=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_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_YUREX=m -CONFIG_USB_EZUSB_FX2=m -CONFIG_USB_HSIC_USB3503=m - -# -# USB Physical Layer drivers -# -# CONFIG_OMAP_USB3 is not set -# CONFIG_OMAP_CONTROL_USB is not set -CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=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_STORAGE_NUM_BUFFERS=2 - -# -# USB Peripheral Controller -# -CONFIG_USB_R8A66597=m -CONFIG_USB_RENESAS_USBHS_UDC=m -CONFIG_USB_MV_UDC=m -CONFIG_USB_GADGET_MUSB_HDRC=m -CONFIG_USB_M66592=m -CONFIG_USB_AMD5536UDC=m -CONFIG_USB_NET2272=m -CONFIG_USB_NET2272_DMA=y -CONFIG_USB_NET2280=m -CONFIG_USB_GOKU=m -CONFIG_USB_EG20T=m -CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_U_SERIAL=m -# CONFIG_USB_ZERO is not set -CONFIG_USB_AUDIO=m -# CONFIG_GADGET_UAC1 is not set -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_ETH_EEM is not set -CONFIG_USB_G_NCM=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FUNCTIONFS=m -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_GADGET_TARGET=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -CONFIG_USB_G_PRINTER=m -# CONFIG_USB_CDC_COMPOSITE is not set -# CONFIG_USB_G_NOKIA is not set -# CONFIG_USB_G_ACM_MS is not set -# CONFIG_USB_G_MULTI is not set -CONFIG_USB_G_HID=m -CONFIG_USB_G_DBGP=m -# CONFIG_USB_G_DBGP_PRINTK is not set -CONFIG_USB_G_DBGP_SERIAL=y -CONFIG_USB_G_WEBCAM=m - -# -# OTG and related infrastructure -# -CONFIG_USB_OTG_UTILS=y -# CONFIG_USB_GPIO_VBUS is not set -CONFIG_NOP_USB_XCEIV=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_I1480U=m -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set -# CONFIG_MMC_CLKGATE is not set - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 -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=y -CONFIG_MMC_SDHCI_ACPI=m -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_WBSD=m -CONFIG_MMC_TIFM_SD=m -# CONFIG_MMC_SPI is not set -CONFIG_MMC_SDRICOH_CS=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MMC_VUB300=m -CONFIG_MMC_USHC=m -CONFIG_MMC_REALTEK_PCI=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_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y - -# -# LED drivers -# -CONFIG_LEDS_LM3530=m -CONFIG_LEDS_LM3533=m -CONFIG_LEDS_LM3642=m -CONFIG_LEDS_PCA9532=m -# CONFIG_LEDS_PCA9532_GPIO is not set -# CONFIG_LEDS_GPIO is not set -CONFIG_LEDS_LP3944=m -CONFIG_LEDS_LP55XX_COMMON=m -CONFIG_LEDS_LP5521=m -CONFIG_LEDS_LP5523=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_PCA9633=m -# CONFIG_LEDS_DAC124S085 is not set -CONFIG_LEDS_BD2802=m -CONFIG_LEDS_INTEL_SS4200=m -CONFIG_LEDS_LT3593=m -CONFIG_LEDS_DELL_NETBOOKS=m -CONFIG_LEDS_MC13783=m -CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM355x=m -CONFIG_LEDS_OT200=m -CONFIG_LEDS_BLINKM=m -CONFIG_LEDS_TRIGGERS=y - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_ONESHOT=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -# CONFIG_LEDS_TRIGGER_CPU is not set -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_ACCESSIBILITY=y -CONFIG_A11Y_BRAILLE_CONSOLE=y -# CONFIG_INFINIBAND is not set -CONFIG_EDAC=y -CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_DEBUG is not set -CONFIG_EDAC_DECODE_MCE=m -CONFIG_EDAC_MCE_INJ=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_I7CORE=m -CONFIG_EDAC_I5000=m -CONFIG_EDAC_I5100=m -CONFIG_EDAC_I7300=m -CONFIG_EDAC_SBRIDGE=m -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -# 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_DS3232=m -CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_ISL12022=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_PCF8523=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_BQ32K=m -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_FM3130=m -CONFIG_RTC_DRV_RX8581=m -CONFIG_RTC_DRV_RX8025=m -CONFIG_RTC_DRV_EM3027=m -CONFIG_RTC_DRV_RV3029C2=m - -# -# SPI RTC drivers -# -# CONFIG_RTC_DRV_M41T93 is not set -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_DS3234 is not set -# CONFIG_RTC_DRV_PCF2123 is not set -# CONFIG_RTC_DRV_RX4581 is not set - -# -# 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_MSM6242=m -CONFIG_RTC_DRV_BQ4802=m -CONFIG_RTC_DRV_RP5C01=m -CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_DS2404=m -CONFIG_RTC_DRV_PCF50633=m - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_MC13XXX=m - -# -# HID Sensor RTC drivers -# -# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_INTEL_MID_DMAC=m -CONFIG_INTEL_IOATDMA=m -CONFIG_DW_DMAC=m -# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set -CONFIG_TIMB_DMA=m -CONFIG_PCH_DMA=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_DMEM_GENIRQ is not set -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m -CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set -CONFIG_VIRTIO=m - -# -# Virtio drivers -# -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_MMIO=m -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y - -# -# Microsoft Hyper-V guest support -# -CONFIG_HYPERV=m -CONFIG_HYPERV_UTILS=m -CONFIG_HYPERV_BALLOON=m - -# -# Xen driver support -# -CONFIG_XEN_BALLOON=y -# CONFIG_XEN_SELFBALLOONING is not set -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=m -CONFIG_XEN_BACKEND=y -CONFIG_XENFS=m -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XEN_GNTDEV=m -CONFIG_XEN_GRANT_DEV_ALLOC=m -CONFIG_SWIOTLB_XEN=y -CONFIG_XEN_TMEM=y -CONFIG_XEN_PCIDEV_BACKEND=m -CONFIG_XEN_PRIVCMD=m -CONFIG_XEN_ACPI_PROCESSOR=m -# CONFIG_XEN_MCE_LOG is not set -CONFIG_XEN_HAVE_PVMMU=y -CONFIG_STAGING=y -CONFIG_ET131X=m -CONFIG_SLICOSS=m -CONFIG_USBIP_CORE=m -CONFIG_USBIP_VHCI_HCD=m -CONFIG_USBIP_HOST=m -# CONFIG_USBIP_DEBUG is not set -CONFIG_W35UND=m -CONFIG_PRISM2_USB=m -CONFIG_ECHO=m -CONFIG_COMEDI=m -# CONFIG_COMEDI_DEBUG is not set -CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 -CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 -CONFIG_COMEDI_MISC_DRIVERS=y -CONFIG_COMEDI_KCOMEDILIB=m -CONFIG_COMEDI_BOND=m -CONFIG_COMEDI_TEST=m -CONFIG_COMEDI_PARPORT=m -CONFIG_COMEDI_SERIAL2002=m -CONFIG_COMEDI_SKEL=m -CONFIG_COMEDI_PCI_DRIVERS=y -CONFIG_COMEDI_8255_PCI=m -CONFIG_COMEDI_ADDI_WATCHDOG=m -CONFIG_COMEDI_ADDI_APCI_035=m -CONFIG_COMEDI_ADDI_APCI_1032=m -CONFIG_COMEDI_ADDI_APCI_1500=m -CONFIG_COMEDI_ADDI_APCI_1516=m -CONFIG_COMEDI_ADDI_APCI_1564=m -CONFIG_COMEDI_ADDI_APCI_16XX=m -CONFIG_COMEDI_ADDI_APCI_2032=m -CONFIG_COMEDI_ADDI_APCI_2200=m -CONFIG_COMEDI_ADDI_APCI_3120=m -CONFIG_COMEDI_ADDI_APCI_3501=m -CONFIG_COMEDI_ADDI_APCI_3XXX=m -CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7X3X=m -CONFIG_COMEDI_ADL_PCI8164=m -CONFIG_COMEDI_ADL_PCI9111=m -CONFIG_COMEDI_ADL_PCI9118=m -CONFIG_COMEDI_ADV_PCI1710=m -CONFIG_COMEDI_ADV_PCI1723=m -CONFIG_COMEDI_ADV_PCI_DIO=m -CONFIG_COMEDI_AMPLC_DIO200_PCI=m -CONFIG_COMEDI_AMPLC_PC236_PCI=m -CONFIG_COMEDI_AMPLC_PC263_PCI=m -CONFIG_COMEDI_AMPLC_PCI224=m -CONFIG_COMEDI_AMPLC_PCI230=m -CONFIG_COMEDI_CONTEC_PCI_DIO=m -CONFIG_COMEDI_DAS08_PCI=m -CONFIG_COMEDI_DT3000=m -CONFIG_COMEDI_DYNA_PCI10XX=m -CONFIG_COMEDI_UNIOXX5=m -CONFIG_COMEDI_GSC_HPDI=m -CONFIG_COMEDI_ICP_MULTI=m -CONFIG_COMEDI_II_PCI20KC=m -CONFIG_COMEDI_DAQBOARD2000=m -CONFIG_COMEDI_JR3_PCI=m -CONFIG_COMEDI_KE_COUNTER=m -CONFIG_COMEDI_CB_PCIDAS64=m -CONFIG_COMEDI_CB_PCIDAS=m -CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIMDAS=m -CONFIG_COMEDI_CB_PCIMDDA=m -CONFIG_COMEDI_ME4000=m -CONFIG_COMEDI_ME_DAQ=m -CONFIG_COMEDI_NI_6527=m -CONFIG_COMEDI_NI_65XX=m -CONFIG_COMEDI_NI_660X=m -CONFIG_COMEDI_NI_670X=m -CONFIG_COMEDI_NI_LABPC=m -CONFIG_COMEDI_NI_PCIDIO=m -CONFIG_COMEDI_NI_PCIMIO=m -CONFIG_COMEDI_RTD520=m -CONFIG_COMEDI_S526=m -CONFIG_COMEDI_S626=m -CONFIG_COMEDI_SSV_DNP=m -CONFIG_COMEDI_MITE=m -CONFIG_COMEDI_NI_TIOCMD=m -CONFIG_COMEDI_PCMCIA_DRIVERS=y -CONFIG_COMEDI_CB_DAS16_CS=m -CONFIG_COMEDI_DAS08_CS=m -CONFIG_COMEDI_NI_DAQ_700_CS=m -CONFIG_COMEDI_NI_DAQ_DIO24_CS=m -CONFIG_COMEDI_NI_LABPC_CS=m -CONFIG_COMEDI_NI_MIO_CS=m -CONFIG_COMEDI_QUATECH_DAQP_CS=m -CONFIG_COMEDI_USB_DRIVERS=y -CONFIG_COMEDI_DT9812=m -CONFIG_COMEDI_USBDUX=m -CONFIG_COMEDI_USBDUXFAST=m -CONFIG_COMEDI_USBDUXSIGMA=m -CONFIG_COMEDI_VMK80XX=m -CONFIG_COMEDI_8255=m -CONFIG_COMEDI_FC=m -CONFIG_COMEDI_AMPLC_DIO200=m -CONFIG_COMEDI_AMPLC_PC236=m -CONFIG_COMEDI_AMPLC_PC263=m -CONFIG_COMEDI_DAS08=m -CONFIG_COMEDI_NI_TIO=m -CONFIG_ASUS_OLED=m -# CONFIG_PANEL is not set -CONFIG_R8187SE=m -CONFIG_RTL8192U=m -CONFIG_RTLLIB=m -CONFIG_RTLLIB_CRYPTO_CCMP=m -CONFIG_RTLLIB_CRYPTO_TKIP=m -CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set -# CONFIG_TRANZPORT is not set -CONFIG_IDE_PHISON=m -CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set -CONFIG_USB_SERIAL_QUATECH2=m -CONFIG_VT6655=m -CONFIG_VT6656=m -CONFIG_DX_SEP=m -CONFIG_ZRAM=m -# CONFIG_ZRAM_DEBUG is not set -CONFIG_ZSMALLOC=y -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m -CONFIG_FB_SM7XX=m -CONFIG_CRYSTALHD=m -CONFIG_FB_XGI=m -CONFIG_ACPI_QUICKSTART=m -CONFIG_USB_ENESTORAGE=m -CONFIG_BCM_WIMAX=m -CONFIG_FT1000=m -CONFIG_FT1000_USB=m -CONFIG_FT1000_PCMCIA=m - -# -# Speakup console speech -# -CONFIG_SPEAKUP=m -CONFIG_SPEAKUP_SYNTH_ACNTSA=m -CONFIG_SPEAKUP_SYNTH_ACNTPC=m -CONFIG_SPEAKUP_SYNTH_APOLLO=m -CONFIG_SPEAKUP_SYNTH_AUDPTR=m -CONFIG_SPEAKUP_SYNTH_BNS=m -CONFIG_SPEAKUP_SYNTH_DECTLK=m -CONFIG_SPEAKUP_SYNTH_DECEXT=m -CONFIG_SPEAKUP_SYNTH_DECPC=m -CONFIG_SPEAKUP_SYNTH_DTLK=m -CONFIG_SPEAKUP_SYNTH_KEYPC=m -CONFIG_SPEAKUP_SYNTH_LTLK=m -CONFIG_SPEAKUP_SYNTH_SOFT=m -CONFIG_SPEAKUP_SYNTH_SPKOUT=m -CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m -CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m -CONFIG_STAGING_MEDIA=y -CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m -CONFIG_VIDEO_DT3155=m -CONFIG_DT3155_CCIR=y -CONFIG_DT3155_STREAMING=y -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_SOLO6X10=m -CONFIG_LIRC_STAGING=y -CONFIG_LIRC_BT829=m -CONFIG_LIRC_IGORPLUGUSB=m -CONFIG_LIRC_IMON=m -CONFIG_LIRC_PARALLEL=m -CONFIG_LIRC_SASEM=m -CONFIG_LIRC_SERIAL=m -CONFIG_LIRC_SERIAL_TRANSMITTER=y -CONFIG_LIRC_SIR=m -CONFIG_LIRC_ZILOG=m - -# -# Android -# -# CONFIG_ANDROID is not set -CONFIG_USB_WPAN_HCD=m -CONFIG_WIMAX_GDM72XX=m -CONFIG_WIMAX_GDM72XX_QOS=y -CONFIG_WIMAX_GDM72XX_K_MODE=y -CONFIG_WIMAX_GDM72XX_WIMAX2=y -CONFIG_WIMAX_GDM72XX_USB=y -# CONFIG_WIMAX_GDM72XX_SDIO is not set -CONFIG_WIMAX_GDM72XX_USB_PM=y -CONFIG_CSR_WIFI=m -CONFIG_NET_VENDOR_SILICOM=y -CONFIG_SBYPASS=m -CONFIG_BPCTL=m -CONFIG_CED1401=m -CONFIG_DGRP=m -CONFIG_FIREWIRE_SERIAL=m -CONFIG_ZCACHE=y -CONFIG_RAMSTER=y -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ACERHDF=m -CONFIG_ASUS_LAPTOP=m -CONFIG_CHROMEOS_LAPTOP=m -CONFIG_DELL_LAPTOP=m -CONFIG_DELL_WMI=m -CONFIG_DELL_WMI_AIO=m -CONFIG_FUJITSU_LAPTOP=m -# CONFIG_FUJITSU_LAPTOP_DEBUG is not set -CONFIG_FUJITSU_TABLET=m -CONFIG_AMILO_RFKILL=m -CONFIG_HP_ACCEL=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_IDEAPAD_LAPTOP=m -CONFIG_THINKPAD_ACPI=m -CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y -# 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_SENSORS_HDAPS=m -CONFIG_INTEL_MENLOW=m -CONFIG_EEEPC_LAPTOP=m -CONFIG_ASUS_WMI=m -CONFIG_ASUS_NB_WMI=m -CONFIG_EEEPC_WMI=m -CONFIG_ACPI_WMI=m -CONFIG_MSI_WMI=m -CONFIG_TOPSTAR_LAPTOP=m -CONFIG_ACPI_TOSHIBA=m -CONFIG_TOSHIBA_BT_RFKILL=m -CONFIG_ACPI_CMPC=m -CONFIG_INTEL_IPS=m -CONFIG_IBM_RTL=m -CONFIG_XO15_EBOOK=m -CONFIG_SAMSUNG_LAPTOP=m -CONFIG_MXM_WMI=m -CONFIG_INTEL_OAKTRAIL=m -CONFIG_SAMSUNG_Q10=m -CONFIG_APPLE_GMUX=m - -# -# Hardware Spinlock drivers -# -CONFIG_CLKEVT_I8253=y -CONFIG_I8253_LOCK=y -CONFIG_CLKBLD_I8253=y -# CONFIG_MAILBOX is not set -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y -CONFIG_AMD_IOMMU=y -# CONFIG_AMD_IOMMU_STATS is not set -CONFIG_AMD_IOMMU_V2=m -CONFIG_DMAR_TABLE=y -CONFIG_INTEL_IOMMU=y -# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set -CONFIG_INTEL_IOMMU_FLOPPY_WA=y -CONFIG_IRQ_REMAP=y - -# -# Remoteproc drivers -# -CONFIG_REMOTEPROC=m -CONFIG_STE_MODEM_RPROC=m - -# -# Rpmsg drivers -# -CONFIG_VIRT_DRIVERS=y -# CONFIG_PM_DEVFREQ is not set -CONFIG_EXTCON=m - -# -# Extcon Device Drivers -# -CONFIG_EXTCON_GPIO=m -CONFIG_MEMORY=y -# CONFIG_IIO is not set -# CONFIG_NTB is not set -# CONFIG_VME_BUS is not set -# CONFIG_PWM is not set -CONFIG_IPACK_BUS=m -CONFIG_BOARD_TPCI200=m -CONFIG_SERIAL_IPOCTAL=m - -# -# Firmware Drivers -# -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 -CONFIG_DMI_SYSFS=m -CONFIG_ISCSI_IBFT_FIND=y -CONFIG_ISCSI_IBFT=m -# CONFIG_GOOGLE_FIRMWARE is not set - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=y -# CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=m -CONFIG_EXT4_USE_FOR_EXT23=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_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_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_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set -CONFIG_NILFS2_FS=m -CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=y -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -# CONFIG_QUOTA_DEBUG is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_QUOTACTL_COMPAT=y -CONFIG_AUTOFS4_FS=y -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_TMPFS_XATTR=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y -CONFIG_CONFIGFS_FS=y -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ADFS_FS is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m -# CONFIG_ECRYPT_FS_MESSAGING is not set -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_UBIFS_FS=m -# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set -CONFIG_UBIFS_FS_LZO=y -CONFIG_UBIFS_FS_ZLIB=y -CONFIG_LOGFS=m -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# 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_QNX6FS_FS is not set -# CONFIG_ROMFS_FS is not set -CONFIG_PSTORE=y -# CONFIG_PSTORE_CONSOLE is not set -# CONFIG_PSTORE_FTRACE is not set -CONFIG_PSTORE_RAM=m -# 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_F2FS_FS=m -CONFIG_F2FS_STAT_FS=y -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_ORE=m -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V2=m -CONFIG_NFS_V3=m -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=m -# CONFIG_NFS_SWAP is not set -CONFIG_NFS_V4_1=y -CONFIG_PNFS_FILE_LAYOUT=m -CONFIG_PNFS_BLOCK=m -CONFIG_PNFS_OBJLAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" -CONFIG_NFS_FSCACHE=y -# CONFIG_NFS_USE_LEGACY_DNS is not set -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -# CONFIG_NFSD_FAULT_INJECTION is not set -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_SUNRPC_BACKCHANNEL=y -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y -CONFIG_CEPH_FS=m -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_ACL=y -# CONFIG_CIFS_DEBUG is not set -CONFIG_CIFS_DFS_UPCALL=y -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y -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 -CONFIG_9P_FS_POSIX_ACL=y -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_MAC_ROMAN=m -CONFIG_NLS_MAC_CELTIC=m -CONFIG_NLS_MAC_CENTEURO=m -CONFIG_NLS_MAC_CROATIAN=m -CONFIG_NLS_MAC_CYRILLIC=m -CONFIG_NLS_MAC_GAELIC=m -CONFIG_NLS_MAC_GREEK=m -CONFIG_NLS_MAC_ICELAND=m -CONFIG_NLS_MAC_INUIT=m -CONFIG_NLS_MAC_ROMANIAN=m -CONFIG_NLS_MAC_TURKISH=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_DEFAULT_MESSAGE_LOGLEVEL=4 -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_READABLE_ASM is not set -CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_SHIRQ is not set -CONFIG_LOCKUP_DETECTOR=y -CONFIG_HARDLOCKUP_DETECTOR=y -# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -CONFIG_SCHED_DEBUG=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_PREEMPT 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_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -CONFIG_STACKTRACE=y -# CONFIG_DEBUG_STACK_USAGE is not set -# 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_TEST_LIST_SORT 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 - -# -# RCU Debugging -# -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_CPU_STALL_VERBOSE is not set -# CONFIG_RCU_CPU_STALL_INFO is not set -# CONFIG_RCU_TRACE is not set -# CONFIG_KPROBES_SANITY_TEST 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_DEBUG_PER_CPU_MAPS is not set -CONFIG_LKDTM=m -# CONFIG_NOTIFIER_ERROR_INJECTION is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -# CONFIG_DEBUG_PAGEALLOC is not set -CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=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_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_FENTRY=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACER_MAX_TRACE=y -CONFIG_TRACE_CLOCK=y -CONFIG_RING_BUFFER=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_PREEMPT_TRACER is not set -CONFIG_SCHED_TRACER=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_TRACER_SNAPSHOT=y -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -CONFIG_STACK_TRACER=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_KPROBE_EVENT=y -CONFIG_UPROBE_EVENT=y -CONFIG_PROBE_EVENTS=y -CONFIG_DYNAMIC_FTRACE=y -CONFIG_DYNAMIC_FTRACE_WITH_REGS=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_RBTREE_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -CONFIG_DYNAMIC_DEBUG=y -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_ATOMIC64_SELFTEST is not set -CONFIG_ASYNC_RAID6_TEST=m -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -CONFIG_HAVE_ARCH_KMEMCHECK=y -CONFIG_TEST_KSTRTOX=m -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_X86_PTDUMP is not set -CONFIG_DEBUG_RODATA=y -# CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set -# CONFIG_DEBUG_NX_TEST is not set -# CONFIG_DEBUG_TLBFLUSH is not set -# CONFIG_IOMMU_DEBUG is not set -# CONFIG_IOMMU_STRESS is not set -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -# CONFIG_X86_DECODER_SELFTEST is not set -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 -# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set -# CONFIG_DEBUG_NMI_SELFTEST is not set - -# -# Security options -# -CONFIG_KEYS=y -CONFIG_TRUSTED_KEYS=m -CONFIG_ENCRYPTED_KEYS=m -# CONFIG_KEYS_DEBUG_PROC_KEYS is not set -# CONFIG_SECURITY_DMESG_RESTRICT 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_INTEL_TXT is not set -# CONFIG_SECURITY_SELINUX is not set -# CONFIG_SECURITY_SMACK is not set -CONFIG_SECURITY_TOMOYO=y -CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 -CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 -# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_YAMA is not set -# CONFIG_IMA is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set -CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_DEFAULT_SECURITY="" -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_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_PCOMP=m -CONFIG_CRYPTO_PCOMP2=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_USER=m -CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ABLK_HELPER_X86=m -CONFIG_CRYPTO_GLUE_HELPER_X86=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_X86_64=y -CONFIG_CRYPTO_CRC32C_INTEL=m -CONFIG_CRYPTO_CRC32=m -CONFIG_CRYPTO_CRC32_PCLMUL=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_SHA1_SSSE3=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -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_BLOWFISH_COMMON=m -CONFIG_CRYPTO_BLOWFISH_X86_64=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAMELLIA_X86_64=m -CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m -CONFIG_CRYPTO_CAST_COMMON=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST5_AVX_X86_64=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_CAST6_AVX_X86_64=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_SERPENT_SSE2_X86_64=m -CONFIG_CRYPTO_SERPENT_AVX_X86_64=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_TWOFISH_X86_64=m -CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m -CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_ZLIB=m -CONFIG_CRYPTO_LZO=y - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_ASYMMETRIC_KEY_TYPE=m -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m -CONFIG_PUBLIC_KEY_ALGO_RSA=m -CONFIG_X509_CERTIFICATE_PARSER=m -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_APIC_ARCHITECTURE=y -CONFIG_KVM_MMIO=y -CONFIG_KVM_ASYNC_PF=y -CONFIG_HAVE_KVM_MSI=y -CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -CONFIG_KVM_MMU_AUDIT=y -CONFIG_VHOST_NET=m -CONFIG_TCM_VHOST=m -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_RAID6_PQ=m -CONFIG_BITREVERSE=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_IO=y -CONFIG_PERCPU_RWSEM=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC_T10DIF=m -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -# CONFIG_CRC32_SELFTEST is not set -CONFIG_CRC32_SLICEBY8=y -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SARWATE is not set -# CONFIG_CRC32_BIT is not set -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_CRC8=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_XZ_DEC=y -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_ARMTHUMB=y -CONFIG_XZ_DEC_SPARC=y -CONFIG_XZ_DEC_BCJ=y -# CONFIG_XZ_DEC_TEST is not set -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_REED_SOLOMON=m -CONFIG_REED_SOLOMON_ENC8=y -CONFIG_REED_SOLOMON_DEC8=y -CONFIG_REED_SOLOMON_DEC16=y -CONFIG_BCH=m -CONFIG_BCH_CONST_PARAMS=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_BTREE=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_CPU_RMAP=y -CONFIG_DQL=y -CONFIG_NLATTR=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_LRU_CACHE=m -CONFIG_AVERAGE=y -CONFIG_CLZ_TAB=y -CONFIG_CORDIC=m -CONFIG_DDR=y -CONFIG_MPILIB=m -CONFIG_OID_REGISTRY=m -CONFIG_UCS2_STRING=y diff --git a/libre-testing/linux-libre/linux-libre.install b/libre-testing/linux-libre/linux-libre.install deleted file mode 100644 index 2cde0a227..000000000 --- a/libre-testing/linux-libre/linux-libre.install +++ /dev/null @@ -1,69 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -KERNEL_NAME= -KERNEL_VERSION=3.9.0-2-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' - -post_install () { - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} - if command -v mkinitcpio 2>&1 > /dev/null; then - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} - fi - - # compat symlinks for the official kernels only - if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then - loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)" - [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" - if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then - # add compat symlinks for the initramfs images - ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img - ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \ - boot/kernel26${KERNEL_NAME}-fallback.img - ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} - fi - fi -} - -post_upgrade() { - pacman -Q grub &>/dev/null - hasgrub=$? - pacman -Q grub-common &>/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 findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then - echo "WARNING: /boot appears to be a separate partition but is not mounted." - fi - - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} - if command -v mkinitcpio 2>&1 > /dev/null; then - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} - fi -} - -post_remove() { - # also remove the compat symlinks - rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img - rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img -} diff --git a/libre-testing/linux-libre/linux-libre.preset b/libre-testing/linux-libre/linux-libre.preset deleted file mode 100644 index 0ac59eb14..000000000 --- a/libre-testing/linux-libre/linux-libre.preset +++ /dev/null @@ -1,14 +0,0 @@ -# mkinitcpio preset file for the 'linux-libre' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-libre" - -PRESETS=('default' 'fallback') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux-libre.img" -#default_options="" - -#fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/initramfs-linux-libre-fallback.img" -fallback_options="-S autodetect" diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index 1d2b3eb62..18122256a 100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173824 2012-12-24 15:08:34Z jgc $ +# $Id: PKGBUILD 183900 2013-04-29 15:40:28Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Maël Lavault <moimael@neuf.fr> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,7 +7,7 @@ _pkgbase=abiword pkgbase=abiword-libre pkgname=('abiword-libre' 'abiword-libre-plugins') pkgver=2.8.6 -pkgrel=8.1 +pkgrel=9 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.abisource.com" @@ -61,7 +61,7 @@ build() { } package_abiword-libre() { - pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts" + pkgdesc="A fully-featured word processor that doesn't recommend nonfree fonts" depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils') install=$pkgname.install optdepends=('abiword-libre-plugins') diff --git a/libre/audex-libre/PKGBUILD b/libre/audex-libre/PKGBUILD index 413c11461..22ded032f 100644 --- a/libre/audex-libre/PKGBUILD +++ b/libre/audex-libre/PKGBUILD @@ -10,7 +10,7 @@ pkgname=audex-libre pkgver=0.77b1 pkgrel=1 pkgdesc="A CDDA extraction tool with a ftp upload function for KDE (without nonfree faac recommendation)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php?content=77125" license=('GPL') depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia') diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 9a39c7a8f..31997eb35 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -6,14 +6,14 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.6 -_extramodules=extramodules-3.8-LIBRE # Don't forget to update bbswitch.install -pkgrel=5 +_extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install +pkgrel=7 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") license=('GPL') -depends=('linux-libre>=3.8' 'linux-libre<3.9') -makedepends=('linux-libre-headers>=3.8' 'linux-libre-headers<3.9') +depends=('linux-libre>=3.9' 'linux-libre<3.10') +makedepends=('linux-libre-headers>=3.9' 'linux-libre-headers<3.10') replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver diff --git a/libre/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install index ed6f7348d..e25d40b44 100644 --- a/libre/bbswitch-libre/bbswitch.install +++ b/libre/bbswitch-libre/bbswitch.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-3.8-LIBRE' + EXTRAMODULES='extramodules-3.9-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 97a1b4f12..6637e134c 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -3,12 +3,12 @@ pkgname=blender-addon-luxrender _pkgname=${pkgname:14:3}${pkgname::5}25 _srcver=c9deae0646d0 -pkgver=1.2.1.v2.66 +pkgver=1.2.1.v2.67 _pkgver=${pkgver::5} _reqname=${pkgname::7} _reqver=${pkgver:7} -_reqep=7 -pkgrel=2 +_reqep=8 +pkgrel=1 pkgdesc="$_pkgname: A addon for the ${_reqname^} which allows render and export with LuxRender (built for the $_reqname-libre package)" arch=any url=http://www.${pkgname:14}.net/ diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index e303d8d2b..077b09949 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -11,9 +11,9 @@ else _spndesc='' fi epoch=7 -pkgver=2.66a +pkgver=2.67 _pyver=3.3 -pkgrel=4 +pkgrel=2 pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc" arch=( i686 @@ -24,27 +24,24 @@ license=GPL url=http://www.${_pkgname%-$_pkgflag}.org depends=( desktop-file-utils - 'ffmpeg=1:1.2' - fftw #3.3.3 - freetype2 #2.4.11 + ffmpeg + fftw + freetype2 hicolor-icon-theme - 'ilmbase=2.0.0' jack - libpng #1.5.15 - libtiff #4.0.3 - openal #1.15.1 - 'openexr=2.0.0' - openimageio #1.1.9 - 'opencollada=20130305' - opencolorio #1.0.8 - openshadinglanguage #1.3.0 + libpng + libtiff + openal + openexr + openimageio + 'opencollada=20130413' + opencolorio + openshadinglanguage shared-mime-info xdg-utils ) if [ $_spacenav == true ]; then - depends+=( - libspnav - ) + depends+=(libspnav) fi optdepends=( 'bullet: for Rigid Bodies and Physics Simulation' @@ -61,7 +58,7 @@ conflicts=${_pkgname%-$_pkgflag} replaces=${_pkgname%-$_pkgflag} install=$_pkgname.install source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz -sha512sums=ea5def031daa220991f6165950234b311e8ae3baa6785d6226efefa90b64e1b83e8635f71f9a7fc7ae23923ce313d5ae48ffa0c54cf7ff794a4fb2dacbe8714f +sha512sums=678ff15b4c7aa5695ac31189c2532d959867dfd003d101a52fc8e294b2d7bc5a4699844db9fa6cc6f5e825aa5ba2da37cec0dc56bfd2686957eca075bf935f44 prepare() { mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build @@ -88,7 +85,7 @@ build() { -DWITH_CYCLES_OSL=ON\ -DWITH_FFTW3=ON\ -DWITH_GAMEENGINE=ON\ - -DWITH_IMAGE_REDCODE=ON\ + -DWITH_IMAGE_REDCODE=OFF\ -DWITH_INSTALL_PORTABLE=OFF\ -DWITH_JACK=ON\ -DWITH_MOD_OCEANSIM=ON\ diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD index a7b9ad140..b88e9d544 100644 --- a/libre/bumblebee-libre/PKGBUILD +++ b/libre/bumblebee-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgname=bumblebee-libre pkgver=3.2.1 pkgrel=1 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') depends=('virtualgl' 'glib2' 'mesa-libgl') makedepends=('help2man') optdepends=('xf86-video-nouveau: nouveau driver' diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index baa7db081..d5128f90f 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90259 2013-05-10 15:53:35Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.28 +pkgver=0.9.30 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('c2825950cb3c94f5d3fe3c00de2c57e5' +md5sums=('4b0e4aeb0ebac5d5319a97cbd5163deb' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 86ff43820..f2138e86a 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90185 2013-05-08 10:46:15Z tpowa $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,13 +6,13 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -_extramodules=extramodules-3.8-LIBRE # Don't forget to update cdfs.install -pkgrel=42 +_extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install +pkgrel=44 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/" license=('GPL') -depends=('linux-libre>=3.8' 'linux-libre<3.9') +depends=('linux-libre>=3.9' 'linux-libre<3.10') makedepends=('linux-libre-headers') replaces=$_pkgname conflicts=$_pkgname diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install index 1e587cf72..14b056a11 100644 --- a/libre/cdfs-libre/cdfs.install +++ b/libre/cdfs-libre/cdfs.install @@ -1,14 +1,14 @@ post_install() { - EXTRAMODULES='extramodules-3.8-LIBRE' + EXTRAMODULES='extramodules-3.9-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.8-LIBRE' + EXTRAMODULES='extramodules-3.9-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.8-LIBRE' + EXTRAMODULES='extramodules-3.9-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 5f7c62ca2..1a132ff27 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90344 2013-05-11 16:51:20Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -sha512sums=('486163017b722bb38cb42dfa5c72b57ac4c96ff0584da630f985d2f22c75418284af420a325aa82419b59dca29646b66f8c678eba7a0f36dc044207ac18c9b6c' +sha512sums=('f95db6ab14fe35ed19c1af152c6eb979787e966afad250252053bf11abe8293dfe857a7a2abfd9e33b60a190b310193a03151eb67a9db255a2a929660278ad62' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') diff --git a/libre/chroottools/PKGBUILD b/libre/chroottools/PKGBUILD deleted file mode 100644 index 55a7e165f..000000000 --- a/libre/chroottools/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=chroottools -pkgver=20121202 -pkgdesc='Chroot tools for Arch and Parabola package maintainers' -url='https://projects.parabolagnulinux.org/packages/chroottools.git/' -license=('GPL') - -pkgrel=2 -arch=('any') -conflicts=(devtools) -depends=( - 'arch-install-scripts' # for pacstrap, used to make chroots - 'curl' # used by checkpkg -) -source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr DESTDIR=${pkgdir} install -} - -md5sums=('68bb7fb792c55031ad68a970b65ab793') diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 3a3037e1d..89591f416 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90335 2013-05-11 16:04:01Z tomegun $ #Maintainer: Stéphane Gaudreault <stephane@archlinux.org> #Contributor: BlackEagle <ike.devolder@gmail.com> #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> @@ -9,15 +9,15 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=7 -pkgdesc="A music player and library organizer, without spotify support" +pkgrel=8 +pkgdesc="A music player and library organizer, without nonfree artwork and spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'projectm' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' + 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' 'chromaprint' 'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs') -makedepends=('cmake' 'boost' 'mesa-libgl') +makedepends=('cmake' 'boost' 'mesa') optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' 'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries' @@ -26,30 +26,39 @@ replaces=('clementine') conflicts=('clementine') provides=("clementine=$pkgver") source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz - remove-and-disable-spotify.patch) -sha1sums=('f8d3e9c8f54ac488323ab5a629c9accbe256378e' - '4d336b6a42100a268e4d905b9596453f396fb649') + 'clementine-1.1.1-libimobiledevice-fix.patch' + 'remove-nonfree-artwork-and-spotify.patch' + 'moognu.png') install=clementine.install build() { cd "${srcdir}/${_pkgname}-${pkgver}" - # Remove nonfree spotify references on files - patch -Np1 -i ../remove-and-disable-spotify.patch + patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch + + # Remove nonfree nonfree artwork and spotify references on files + patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch # Remove nonfree spotifyblob folders rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob} # Remove nonfree spotify files rm -v cmake/SpotifyVersion.cmake + rm -v data/spotify-core-logo-128x128.png rm -v data/icons/svg/spotify.svg rm -v data/schema/schema-30.sql rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} + ## Remove nonfree nyancat.png + rm -v data/nyancat.png + + ## Put moognu.png to the source code + cp -v ../moognu.png data + # Create a blank file due that is a dependency for clementine touch data/schema/schema-30.sql - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 make } @@ -57,3 +66,7 @@ package() { cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } +md5sums=('28e4afb822388bd337a761db8f86febf' + '736df6cd828a3172701f63c8dc978cb9' + '5cc8f800dd4df7bd5548196009ab68e0' + '59a8c0d7659898c457b95f877718cf1c') diff --git a/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch b/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch new file mode 100644 index 000000000..da7722fcb --- /dev/null +++ b/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch @@ -0,0 +1,12 @@ +diff -up clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix clementine-1.1.1/src/devices/imobiledeviceconnection.h +--- clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix 2013-04-23 14:44:56.932661018 -0400 ++++ clementine-1.1.1/src/devices/imobiledeviceconnection.h 2013-04-23 14:46:44.033657190 -0400 +@@ -51,7 +51,7 @@ private: + idevice_t device_; + afc_client_t afc_; + +- uint16_t afc_port_; ++ lockdownd_service_descriptor_t afc_port_; + }; + + #endif // IMOBILEDEVICECONNECTION_H diff --git a/libre/clementine-libre/moognu.png b/libre/clementine-libre/moognu.png Binary files differnew file mode 100644 index 000000000..177041886 --- /dev/null +++ b/libre/clementine-libre/moognu.png diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch index a9352b275..6008b2d28 100644 --- a/libre/clementine-libre/remove-and-disable-spotify.patch +++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch @@ -86,9 +86,9 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt if(HAVE_MOODBAR) add_subdirectory(gst/moodbar) endif() -diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc ---- clementine-1.1.0/data/data.qrc 2012-10-22 04:24:28.000000000 -0200 -+++ clementine-libre-1.1.0/data/data.qrc 2012-10-26 01:59:52.333078474 -0200 +diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc +--- clementine-1.1.1/data/data.qrc 2012-11-18 06:51:26.000000000 -0200 ++++ clementine-libre-1.1.1/data/data.qrc 2013-05-13 02:55:19.579440533 -0300 @@ -1,7 +1,6 @@ <RCC> <qresource prefix="/"> @@ -121,7 +121,19 @@ diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc <file>icons/48x48/view-choose.png</file> <file>icons/48x48/view-fullscreen.png</file> <file>icons/48x48/view-media-equalizer.png</file> -@@ -339,7 +334,6 @@ +@@ -261,10 +257,10 @@ + <file>lumberjacksong.txt</file> + <file>lyrics/ultimate_providers.xml</file> + <file>mainwindow.css</file> ++ <file>moognu.png</file> + <file>nocover.png</file> + <file>nomusic.png</file> + <file>now_playing_tooltip.txt</file> +- <file>nyancat.png</file> + <file>osd_background.png</file> + <file>osd_shadow_corner.png</file> + <file>osd_shadow_edge.png</file> +@@ -339,7 +335,6 @@ <file>smartplaylistsearchterm.css</file> <file>songinfo.css</file> <file>spinner.gif</file> @@ -526,10 +538,14 @@ diff -rauN clementine-1.1.0/src/internet/internetmodel.cpp clementine-libre-1.1. } void InternetModel::AddService(InternetService *service) { -diff -rauN clementine-1.0.1/src/ui/about.cpp clementine-libre-1.0.1/src/ui/about.cpp ---- clementine-1.0.1/src/ui/about.cpp 2012-01-22 10:43:26.000000000 -0200 -+++ clementine-libre-1.0.1/src/ui/about.cpp 2012-05-28 19:44:38.760244927 -0300 -@@ -79,12 +79,6 @@ +diff -rauN clementine-1.1.1/src/ui/about.cpp clementine-libre-1.1.1/src/ui/about.cpp +--- clementine-1.1.1/src/ui/about.cpp 2012-10-11 09:16:40.000000000 -0200 ++++ clementine-libre-1.1.1/src/ui/about.cpp 2013-05-13 02:19:40.262472593 -0300 +@@ -75,16 +75,9 @@ + + ret += QString("<br />%1</p>").arg(tr("...and all the Amarok contributors")); + ret += QString("<p><b>%1</b>").arg(tr("And:")); +- ret += QString("<br /><a href=\"http://rainymood.com\">Rainy Mood</a>"); ret += QString("<br /><a href=\"http://www.smitelli.com/?page=blog&p=54\">Scott Smitelli</a>"); ret += QString("<br /><a href=\"http://hyperboleandahalf.blogspot.com\">Allie Brosh</a></p>"); @@ -621,3 +637,34 @@ diff -rauN clementine-1.0.1/src/core/timeconstants.h clementine-libre-1.0.1/src/ #ifndef TIMECONSTANTS_H #define TIMECONSTANTS_H +diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1.1/src/core/backgroundstreams.cpp +--- clementine-1.1.1/src/core/backgroundstreams.cpp 2012-10-11 09:16:39.000000000 -0200 ++++ clementine-libre-1.1.1/src/core/backgroundstreams.cpp 2013-05-13 02:20:21.506864034 -0300 +@@ -9,7 +9,6 @@ + + const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams"; + const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///"; +-const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood"; + const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///"; + + BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent) +@@ -28,7 +27,6 @@ + int version = s.value("version", 0).toInt(); + if (version < 1) { + AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl)); +- AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl)); + } + + if (version < kVersion) { +diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp +--- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp 2012-10-16 08:17:37.000000000 -0200 ++++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-05-13 03:56:04.732771832 -0300 +@@ -29,7 +29,7 @@ + + NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent) + : Analyzer::Base(parent, 9), +- cat_(":/nyancat.png"), ++ cat_(":/moognu.png"), + timer_id_(startTimer(kFrameIntervalMs)), + frame_(0), + current_buffer_(0), diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 22d799801..fc3ed3b1f 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182682 2013-04-12 14:56:52Z andyrtr $ +# $Id: PKGBUILD 183882 2013-04-29 10:46:59Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters pkgver=1.0.34 -pkgrel=2 +pkgrel=3 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD index 30cbbc641..fb47a8fad 100644 --- a/libre/ecasound-libre/PKGBUILD +++ b/libre/ecasound-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgname=ecasound-libre pkgver=2.9.0 pkgrel=2.1 pkgdesc="A software package designed for multitrack audio processing (without nonfree faac recommendation)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.eca.cx/ecasound/" license=('GPL' 'LGPL') depends=('audiofile' 'liblo' diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index cf00963b8..9aceaadd1 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178158 2013-02-17 10:57:03Z andyrtr $ +# $Id: PKGBUILD 183802 2013-04-28 00:51:13Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer (Parabola): Joshua Haase <hahj87@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ _pkgname=ghostscript pkgname=ghostscript-libre pkgver=9.07 -pkgrel=1 # rebuild for mips64el -march -pkgdesc="An interpreter for the PostScript language without non-free files" +pkgrel=2 +pkgdesc="An interpreter for the PostScript language without nonfree files" arch=('i686' 'x86_64' 'mips64el') license=('AGPL') #non free files removed depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' @@ -24,7 +24,7 @@ options=('!libtool') md5sums=('eea27befc1e85bef6d4768202f6b03a5') build() { - cd ${srcdir}/ghostscript-${pkgver} + cd ghostscript-${pkgver} # delete non-free packages grep -l "are not altered" Resource/CMap/* | xargs rm -fv @@ -51,7 +51,7 @@ build() { make # Build IJS - cd ${srcdir}/ghostscript-${pkgver}/ijs + cd ijs sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac ./autogen.sh ./configure --prefix=/usr --enable-shared --disable-static @@ -59,21 +59,20 @@ build() { } package() { - cd ${srcdir}/ghostscript-${pkgver} - make -j1 DESTDIR=${pkgdir} \ - cups_serverroot=${pkgdir}/etc/cups \ - cups_serverbin=${pkgdir}/usr/lib/cups install soinstall + cd ghostscript-${pkgver} + make -j1 DESTDIR="${pkgdir}" \ + cups_serverroot="${pkgdir}"/etc/cups \ + cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall # install missing doc files # http://bugs.archlinux.org/task/18023 - install -m 644 ${srcdir}/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$pkgver/doc/ + install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/ - mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname} - install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/ + install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE # remove unwanted localized man-pages - rm -rf $pkgdir/usr/share/man/[^man1]* + rm -rf "$pkgdir"/usr/share/man/[^man1]* # install IJS - cd ${srcdir}/ghostscript-${pkgver}/ijs - make -j1 DESTDIR=${pkgdir} install + cd ijs + make -j1 DESTDIR="${pkgdir}" install } diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD index 18d64ea9c..827222b39 100644 --- a/libre/gnu-ghostscript/PKGBUILD +++ b/libre/gnu-ghostscript/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gnu-ghostscript _gspkgver=9.07 # ghostscript package version _pkgver=9.06 pkgver=9.06.0 -pkgrel=2 +pkgrel=3 pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 1fddeb016..686f41e06 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168313 2012-10-08 14:04:19Z heftig $ +# $Id: PKGBUILD 183943 2013-04-29 17:33:53Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -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.2 +pkgrel=4 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') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index aeb4d528f..22ad1541b 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=6 +pkgrel=8 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -35,7 +35,7 @@ md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - 'e6e4a2b5b5976404d7d54c21f9d1c2c3') + '14e2f08fb1b98ff287e74de54baf44fe') prepare() { export DEBIAN_BUILD="comm-release" diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index 860fd0d82..6473412e4 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -248,9 +248,9 @@ - <DT><A HREF="http://www.mozilla.org/">@mozilla_org@</A> - <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A> - <DT><A HREF="http://www.mozdev.org/">@mozdev@</A> -+ <DT><A HREF="https://parabolagnulinux.org/" ICON="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%3D%3D">Parabola GNU/Linux-libre</a> ++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> + <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A> -+ <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A> ++ <DT><A HREF="http://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A> </DL><p> - <DT><H3>@seamonkey_and_mozilla@</H3> + <DT><H3>GNUzilla</H3> diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index d32a96d52..43126e355 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -10,15 +10,15 @@ # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> -_pgo=true +_pgo=false pkgname=icecat pkgver=17.0.1 -pkgrel=7 +pkgrel=10 pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.' arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base wireless_tools hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 unzip zip) options=(!emptydirs) if $_pgo; then @@ -42,14 +42,14 @@ source=( ) md5sums=( c88a29aa92fc41a07e777a0e63ac5f7e - 855f11c20d38133d107cc3c6f48162a8 + 5154141da7cf38102927e3addb49ccac 383e8e2a97a8b13fe56d153adb6878b6 3009b176cc5f9b1e416b1bf7c45b064b - 1dec37a964098fb3bc46bc767a5c0587 + 0c358e8357e3629de6982246ace629ea b41f82994fa056ffa5f8e6d99570e27a b30ba2b5562558d510fdd09d626d0faa 64826fcf48816b13090042eefddbaa58 - e7b54d4bd68b2af4cfdef074e3ed08a2 + 2c48d9feffb909df35b552f9c5c555d5 #c8552d030494443218d88792f4dbbd0f ) @@ -86,6 +86,9 @@ prepare() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + # disable necko-wifi and wireless_tools in IceCat + #echo 'ac_add_options --disable-necko-wifi' >> .mozconfig + chmod +x build/unix/run-icecat.sh # fix bug for bad file permition # Fix PRE_RELEASE_SUFFIX @@ -99,8 +102,7 @@ prepare() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 - # TODO: re-enable when we're building with GCC >= 4.8 again - #sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure } build() { diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 38b9fca01..c5c9a6ade 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -90,12 +90,12 @@ diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in --- a/browser/locales/generic/profile/bookmarks.html.in +++ b/browser/locales/generic/profile/bookmarks.html.in -@@ -11,13 +11,20 @@ +@@ -11,13 +11,21 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ <DL><p> - <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> -+ <DT><A HREF="https://parabolagnulinux.org/" ICON="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%3D%3D" ID="rdf:#$GvPhC3">Parabola GNU/Linux-libre</A> ++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> </DL><p> - <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> + <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3> @@ -104,16 +104,17 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/ - <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> - <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> - <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> -+ <DT><A HREF="https://parabolagnulinux.org/" ICON="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%3D%3D">Parabola GNU/Linux-libre</A> -+ <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="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%3D%3D">Parabola GNU/Linux-libre Packages</A> -+ <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="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%3D%3D">Parabola GNU/Linux-libre Wiki</A> -+ <DT><A HREF="https://labs.parabola.nu/" ICON="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%3D%3D">Parabola GNU/Linux-libre Labs</A> ++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> ++ <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A> ++ <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A> ++ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA/klEQVQ4jWP4TyFgGAYGLN25iDID+pd0UGbAxMUTUQT+fP36/9+/f2A2jMZrwKyNEC/8+P71/6/ijP9/fv/+/23Hzv+fly/9/7m7+//XkuL/7yvL/j+PCf3/qrn+/+ed2/7/evocZPr/b3fu/Ge4cuf6/2/fPv5PnaD9f720wP9lyir/F0kI/V8myv9/jbjA/w3i/P+XC/H8n8Uv8H+6kOj/JZIS/2eqaP2/umPP/88/fv5nADnz+cuX/x0S9f8n6Kv/jxGQ+R8vJPu/x9D+/2wrz//9hnb/mzVM/5fKav4vMbL835OZ+//ty9dw7zFcuPuYKL/iDAOydY4aAAcA33O6tzziloYAAAAASUVORK5CYII=">Parabola GNU/Linux-libre Labs</A> ++ <DT><A HREF="https://identi.ca/group/parabola" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAHElEQVQ4jWNgGFTgVwLLf2LwqAGjBgxyA4YmAABB5QQG+m9VWQAAAABJRU5ErkJggg==" LAST_CHARSET="UTF-8">Parabola GNU/Linux-libre (parabola) group - Identi.ca</A> + </DL><p> + <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3> + <DL><p> + <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A> -+ <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A> ++ <DT><A HREF="http://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A> + <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A> -+ <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A> ++ <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 75b61828a..d1fd0e3f8 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -27,7 +27,7 @@ ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification -#ac_add_options --enable-gstreamer +ac_add_options --enable-gstreamer ac_add_options --disable-crashreporter ac_add_options --disable-updater diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js index 3fbf3d7b7..151140b8f 100644 --- a/libre/icecat/vendor.js +++ b/libre/icecat/vendor.js @@ -11,3 +11,6 @@ pref("extensions.shownSelectionUI", true); // Make sure that safebrowsing is disabled pref("browser.safebrowsing.enabled", false); pref("browser.safebrowsing.malware.enabled", false); + +// Enable gstreamer support +pref("media.gstreamer.enabled", true); diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index b16e32620..c1fb0c776 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=3 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -36,7 +36,7 @@ options=(!emptydirs) md5sums=('0c68298c17757257da79b6bb39e3fd10' 'eb2a5e1877d87a16e10388f533c081a6' '5cf95ea94f69cdd36604890cfbf7b954' - 'a8fc4658d45b6bf9350023e5c3f34e56' + '3bf8aefb861095caa45649c118163454' '4eecc4fc5aafaf0da651a09eadc90bee' 'c4ed43e85945e180a89cce03e45ec62c' '126b1446212396c33220936c01d9592d' @@ -73,13 +73,13 @@ prepare() { patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version # Replace common URLs - sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do + sed '/^#/d' ../replace-urls.txt | while read -r moz_url free_url; do if [[ -n $moz_url ]]; then - printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" + printf 'liberating: %s -> %s\n' "$moz_url" "$free_url" grep -Erl "${moz_url}" \ --exclude='*.'{patch,orig,rej} \ --exclude-dir={.pc,test,tests,testing} \ - | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" + | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${free_url}<g" fi done diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt index fc13e32fb..32c94b018 100644 --- a/libre/icedove-libre/replace-urls.txt +++ b/libre/icedove-libre/replace-urls.txt @@ -2,24 +2,24 @@ # These are whitespace-separated EREs, comments are lines starting with '#' https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell- -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/ -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html" -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://trisquel.info/browser-plain -https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html +https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/ +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://trisquel.info/browser-plain -https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php +https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE% #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php -"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html" +"https?://addons\.mozilla\.org/" "https://trisquel.info/browser-plain" # hack: these aren't URLs, per se -(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html +(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1trisquel.info/browser-plain diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 314d5ca6d..c35b83600 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,12 +22,12 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=5 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') options=(!emptydirs) @@ -54,14 +54,14 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('22daa24b6490c654f131550cbf20fad3' '0c70ab52f35701558081df3d360361a2' - '01f56b3ccbead0f665ed82fae0b8f290' + 'a65f285d20e11e650f7220b9c7f2bbf2' '383e8e2a97a8b13fe56d153adb6878b6' - '5addd418bf32b673fdfe80c8fefbea1a' + 'ea7fec9c58670aae945c0f472471cdff' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' - '6dd547c72bb875a3101135a1c32d4783' + '0c26941504d3f2abed759221e9bb5de1' '52e52f840a49eb1d14be1c0065b03a93' - 'a8fc4658d45b6bf9350023e5c3f34e56' + '3bf8aefb861095caa45649c118163454' 'd0e1f2625cd9f7234abdeb55aee00529') prepare() { @@ -87,13 +87,13 @@ prepare() { patch -Np1 -i "$srcdir/shared-libs.patch" # Replace common URLs - sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do + sed '/^#/d' ../replace-urls.txt | while read -r moz_url free_url; do if [[ -n $moz_url ]]; then - printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" + printf 'liberating: %s -> %s\n' "$moz_url" "$free_url" grep -Erl "${moz_url}" \ --exclude='*.'{patch,orig,rej} \ --exclude-dir={.pc,test,tests,testing} \ - | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" + | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${free_url}<g" fi done diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 9d2aa7c05..6862f2c0e 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -231,14 +231,14 @@ diff -ruN mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/la remote="true"/> </window> diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in ---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300 -+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300 -@@ -11,13 +11,20 @@ +--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in +@@ -11,13 +11,21 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ <DL><p> - <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> -+ <DT><A HREF="https://parabolagnulinux.org/" ICON="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%3D%3D" ID="rdf:#$GvPhC3">Parabola GNU/Linux-libre</A> ++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> </DL><p> - <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> + <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3> @@ -247,16 +247,17 @@ diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in - <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> - <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> - <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> -+ <DT><A HREF="https://parabolagnulinux.org/" ICON="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%3D%3D">Parabola GNU/Linux-libre</A> -+ <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="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%3D%3D">Parabola GNU/Linux-libre Packages</A> -+ <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="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%3D%3D">Parabola GNU/Linux-libre Wiki</A> -+ <DT><A HREF="https://labs.parabola.nu/" ICON="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%3D%3D">Parabola GNU/Linux-libre Labs</A> ++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> ++ <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A> ++ <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A> ++ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA/klEQVQ4jWP4TyFgGAYGLN25iDID+pd0UGbAxMUTUQT+fP36/9+/f2A2jMZrwKyNEC/8+P71/6/ijP9/fv/+/23Hzv+fly/9/7m7+//XkuL/7yvL/j+PCf3/qrn+/+ed2/7/evocZPr/b3fu/Ge4cuf6/2/fPv5PnaD9f720wP9lyir/F0kI/V8myv9/jbjA/w3i/P+XC/H8n8Uv8H+6kOj/JZIS/2eqaP2/umPP/88/fv5nADnz+cuX/x0S9f8n6Kv/jxGQ+R8vJPu/x9D+/2wrz//9hnb/mzVM/5fKav4vMbL835OZ+//ty9dw7zFcuPuYKL/iDAOydY4aAAcA33O6tzziloYAAAAASUVORK5CYII=">Parabola GNU/Linux-libre Labs</A> ++ <DT><A HREF="https://identi.ca/group/parabola" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAHElEQVQ4jWNgGFTgVwLLf2LwqAGjBgxyA4YmAABB5QQG+m9VWQAAAABJRU5ErkJggg==" LAST_CHARSET="UTF-8">Parabola GNU/Linux-libre (parabola) group - Identi.ca</A> + </DL><p> + <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3> + <DL><p> + <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A> -+ <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A> ++ <DT><A HREF="http://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A> + <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A> -+ <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A> ++ <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index d7961bf41..8fa6a5da1 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -13,9 +13,7 @@ ac_add_options --with-system-nss ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 -# Build with bundled libpng to avoid flickering tab loading icon -# https://bugzilla.mozilla.org/show_bug.cgi?id=841734 -#ac_add_options --with-system-png +ac_add_options --with-system-png ac_add_options --with-system-libevent ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell @@ -27,7 +25,7 @@ ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification -#ac_add_options --enable-gstreamer +ac_add_options --enable-gstreamer ac_add_options --disable-crashreporter ac_add_options --disable-updater diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt index fc13e32fb..32c94b018 100644 --- a/libre/iceweasel-libre/replace-urls.txt +++ b/libre/iceweasel-libre/replace-urls.txt @@ -2,24 +2,24 @@ # These are whitespace-separated EREs, comments are lines starting with '#' https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell- -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/ -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html" -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://trisquel.info/browser-plain -https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html +https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/ +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://trisquel.info/browser-plain -https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php +https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE% #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php -"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html" +"https?://addons\.mozilla\.org/" "https://trisquel.info/browser-plain" # hack: these aren't URLs, per se -(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html +(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1trisquel.info/browser-plain diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js index 865bfaec7..bd8bcb148 100644 --- a/libre/iceweasel-libre/vendor.js +++ b/libre/iceweasel-libre/vendor.js @@ -16,3 +16,6 @@ pref("keyword.URL", ""); pref("app.update.enabled", false); pref("app.update.auto", false); pref("dom.storage.enabled", false); + +// Enable gstreamer support +pref("media.gstreamer.enabled", true); diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index c133cedd5..62bca0307 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181442 2013-04-04 03:57:32Z svenstaro $ +# $Id: PKGBUILD 184487 2013-05-07 13:27:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('7f505292e95b35205cec3baa67e9e9b24f79b9b9' +sha1sums=('c9949ef6dafbc567bb3f088bf9e156c3a5a9ec08' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index ec3bc1365..6d3291252 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id$ +# $Id: PKGBUILD 184473 2013-05-07 13:26:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.10.2 -pkgrel=3 +pkgver=4.10.3 +pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('b7f3c3907b8f19dcd975b1724b8ae01c4cae638b' +sha1sums=('22869b2ee7eb4b5b341a6d596dd904c0b0b812d1' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 86d209821..96c8530a3 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183303 2013-04-21 09:43:18Z andrea $ +# $Id: PKGBUILD 185044 2013-05-10 17:08:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -22,10 +22,14 @@ replaces=('kdelibs') conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff') -sha1sums=('2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85' + 'kde-applications-menu.patch' 'qt4.patch' + 'security-fix.patch' 'fix-xfreepixmap-call.patch' + 'khtml-fsdg.diff') +sha1sums=('aa154998e227121be82f5b04442e908e7dece01b' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' + '506562009a667f18481be0d2c5035b181fce38bb' + '556c5473219d8208ec920f46c08bf61fda5b60d9' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -37,6 +41,11 @@ build() { # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff + # KDEBUG#319428 + patch -p1 -i "${srcdir}"/security-fix.patch + # KDEBUG#319137 + patch -p1 -i "${srcdir}"/fix-xfreepixmap-call.patch + cd ../ mkdir build diff --git a/libre/kdelibs-libre/fix-xfreepixmap-call.patch b/libre/kdelibs-libre/fix-xfreepixmap-call.patch new file mode 100644 index 000000000..5f5354633 --- /dev/null +++ b/libre/kdelibs-libre/fix-xfreepixmap-call.patch @@ -0,0 +1,24 @@ +commit 9323adac35d40da69e3cb18504340e984c4afd05 +Author: Anne-Marie Mahfouf <annma@kde.org> +Date: Fri May 10 17:12:33 2013 +0200 + + Fix crash when quitting apps + + Backport to 4.10 branch + + CCBUG: 319137 + +diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp +index b54fb1a..1925670 100644 +--- a/plasma/private/dialogshadows.cpp ++++ b/plasma/private/dialogshadows.cpp +@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps() + { + #ifdef Q_WS_X11 + foreach (const QPixmap &pixmap, m_shadowPixmaps) { ++ if (!QX11Info::display()) { ++ return; ++ } + if (!pixmap.isNull()) { + XFreePixmap(QX11Info::display(), pixmap.handle()); + } diff --git a/libre/kdelibs-libre/security-fix.patch b/libre/kdelibs-libre/security-fix.patch new file mode 100644 index 000000000..3d98a47ae --- /dev/null +++ b/libre/kdelibs-libre/security-fix.patch @@ -0,0 +1,32 @@ +commit 65d736dab592bced4410ccfa4699de89f78c96ca +Author: Grégory Oestreicher <greg@kamago.net> +Date: Wed May 8 23:16:00 2013 +0200 + + Don't show passwords contained in HTTP URLs in error messages + BUG: 319428 + +diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp +index 2d139a9..129fc7b 100644 +--- a/kioslave/http/http.cpp ++++ b/kioslave/http/http.cpp +@@ -3056,7 +3056,7 @@ try_again: + ; // Ignore error + } else { + if (!sendErrorPageNotification()) { +- error(ERR_INTERNAL_SERVER, m_request.url.url()); ++ error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl()); + return false; + } + } +@@ -3072,9 +3072,9 @@ try_again: + // Tell that we will only get an error page here. + if (!sendErrorPageNotification()) { + if (m_request.responseCode == 403) +- error(ERR_ACCESS_DENIED, m_request.url.url()); ++ error(ERR_ACCESS_DENIED, m_request.url.prettyUrl()); + else +- error(ERR_DOES_NOT_EXIST, m_request.url.url()); ++ error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl()); + return false; + } + } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) { diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index d670eb278..463f69c88 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181646 2013-04-04 04:27:59Z svenstaro $ +# $Id: PKGBUILD 184589 2013-05-07 13:30:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('972526be8275a8adcb6e4fa51188a5dad83a0b14' +sha1sums=('9c5e14b1ebc575777d1e6d09b593f62940a4fd1d' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') build() { diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 07fa48b1a..256211d8c 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 184590 2013-05-07 13:30:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -22,25 +22,18 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktimetracker-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') -pkgver=4.10.2 -pkgrel=2 +pkgver=4.10.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim-libre') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent' 'nepomuk-widgets') -source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz" - "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592" - 'fix-completion.patch') -sha1sums=('61b74cb3bf541040e09252d4dcfaea8a876a2859' - '61a7e31e7daee3358c442d3ac5f74171b45ae2c9' - '92a44c7b1697de519b09265a3b68e7d73d4c024e') + source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") +sha1sums=('78ca9b822f905355ec00142a7de6c08c38b97c08') build() { - patch -Np1 -d ${_pkgbase}-${pkgver} < ${srcdir}/kleopatra-build-fix.patch - patch -Np1 -d ${_pkgbase}-${pkgver} < ${srcdir}/fix-completion.patch - mkdir build cd build cmake ../${_pkgbase}-${pkgver} \ @@ -301,7 +294,7 @@ package_kdepim-libkdepim-libre() { conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') + 'kdepim-strigi-analyzer' 'kdepim-akonadi') provides=("kdepim-libkdepim=${pkgver}") for i in akonadi_next calendarsupport incidenceeditor-ng \ kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index c6ddcabfa..90921bb7d 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181656 2013-04-04 04:31:29Z svenstaro $ +# $Id: PKGBUILD 184594 2013-05-07 13:30:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -20,7 +20,7 @@ replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('3927eec73d2f1d1c9cd7b0d8888047df0bfb04ff' +sha1sums=('26437751ddf6f466a948a402f253f66bfc19660e' 'a0a836950f185d9b2245204579f969203036fdec') build() { diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 9014b1723..99c54a1b2 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Márcio Silva <coadde@lavabit.com> pkgname=linux-libre-firmware -pkgver=3.8 +pkgver=3.9 pkgrel=1 pkgdesc='Free firmware files for Linux-libre' arch=('any') @@ -36,7 +36,7 @@ replaces=('linux-firmware' 'rt2x00-rt61-fw' 'rt2x00-rt71w-fw') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz") -md5sums=('84c2a77910932ffc7d958744ac9cf2f5') +md5sums=('120df29f88622dabf7015a22c7cc8e25') package() { cd $srcdir/linux-$pkgver diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 75bcfdc6a..4c1daea62 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.8.11 +_kernver=3.9.2 _kernrel=1 pkgname=('linux-libre-kmod-alx') -_version=v3.8-rc7 -_pkgver=3.8-rc7-1-u -pkgver=3.8rc7.1 -pkgrel=16 +_version=v3.9-rc4 +_pkgver=3.9-rc4-2-su +pkgver=3.9rc4.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' @@ -19,12 +19,12 @@ 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=('3a1c7f870ff2fb96534b0d69245a4dab') +md5sums=('a00e82e212fe7533c9059e5b78cc3c1c') package() { # current extramodules version - _extraver=extramodules-3.8-LIBRE + _extraver=extramodules-3.9-LIBRE cd $srcdir/compat-drivers-$_pkgver diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index c8c40e338..58662b78b 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.76 +_kernver=3.0.77 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') -_version=v3.8-rc7 -_pkgver=3.8-rc7-1-u -pkgver=3.8rc7.1 -pkgrel=14 +_version=v3.9-rc4 +_pkgver=3.9-rc4-2-su +pkgver=3.9rc4.2 +pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts 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=('3a1c7f870ff2fb96534b0d69245a4dab') +md5sums=('a00e82e212fe7533c9059e5b78cc3c1c') package() { diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index bb72f209f..61bbef162 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184141 2013-05-02 15:29:52Z tpowa $ +# $Id: PKGBUILD 184766 2013-05-08 09:12:14Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -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=76 +_sublevel=77 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.76 # 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}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - 'e405de6581d02d44c2c06a81a1d93f93' + '8b2ca0f6a92462ba9e544f02fc450c03' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -387,7 +387,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,um,unicore32,v850,xtensa} if [ "$CARCH" = "mips64el" ]; then rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 else diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index d4fbc8398..0030c7ce2 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.76-1-LIBRE-LTS +KERNEL_VERSION=3.0.77-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/ChangeLog b/libre/linux-libre/ChangeLog index a4a67ef14..12f517b4f 100644 --- a/libre/linux-libre/ChangeLog +++ b/libre/linux-libre/ChangeLog @@ -1,3 +1,9 @@ +2012-04-30 André Silva <emulatorman@lavabit.com> + + * linux-libre-3.9-2 + * Removed CONFIG_STUB_POULSBO module from config files + + 2012-12-19 André Silva <emulatorman@lavabit.com> * linux-libre-3.7.1-1 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 4fc1e8cab..465e17b00 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $ +# $Id: PKGBUILD 185176 2013-05-11 19:40:40Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -9,18 +9,18 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.8 -_sublevel=11 +_basekernel=3.9 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.11 # 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') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -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" +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" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -29,17 +29,17 @@ 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}-gnu1_0loongsonlibre_mipsel.tar.bz2") -md5sums=('5c7787be882c343e41fb49136ff60aec' - 'c0ccd5624a61eaae1a00a349e90b5a26' - '9b425f069f920cdd6798b3adab79d3af' - '9316ebdb21ea9948ae5c83795a3dcf61' + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") +md5sums=('120df29f88622dabf7015a22c7cc8e25' + '1a5e653d2c281cccef9b44340a94a866' + '9684934c48eb2c7bb7179b7e5b2c245f' + 'd9ff747f6c2bd3a6e4a94a2abc4af9ca' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '8c00187e43a678a1db821974a1c0a39c') + '2cc468726d0b215d45cbd28be6dee198') 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}-gnu1-${pkgver}-gnu1" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi # Add freedo as boot logo @@ -375,7 +375,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} if [ "$CARCH" = "mips64el" ]; then rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 else diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index f6c197448..ed48ff54b 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.5-1 Kernel Configuration +# Linux/x86 3.9.0 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -41,14 +41,12 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # -CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-LIBRE" @@ -89,6 +87,7 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -120,6 +119,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_FANOUT=32 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set @@ -216,14 +216,18 @@ CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_KPROBES_ON_FTRACE=y CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y @@ -248,8 +252,9 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_REL=y -CONFIG_GENERIC_SIGALTSTACK=y CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y # # GCOV-based kernel profiling @@ -322,6 +327,8 @@ CONFIG_SMP=y CONFIG_X86_MPPARSE=y # CONFIG_X86_BIGSMP is not set # CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_LPSS is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y @@ -424,6 +431,7 @@ CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_BALLOON_COMPACTION=y @@ -526,9 +534,9 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=m +CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m @@ -569,6 +577,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 CPU frequency scaling drivers # +CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -815,6 +824,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -887,9 +897,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # Xtables matches # CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m @@ -987,7 +999,6 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -1064,7 +1075,7 @@ CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m # -# DCCP CCIDs Configuration (EXPERIMENTAL) +# DCCP CCIDs Configuration # # CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=y @@ -1100,8 +1111,10 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m CONFIG_NET_DSA_TAG_DSA=y @@ -1109,6 +1122,7 @@ CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m @@ -1125,7 +1139,6 @@ CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_DECAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_WAN_ROUTER is not set CONFIG_PHONET=m CONFIG_IEEE802154=m CONFIG_IEEE802154_6LOWPAN=m @@ -1194,6 +1207,8 @@ CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1380,6 +1395,8 @@ CONFIG_NFC_HCI=m # CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_PN544=m +CONFIG_NFC_MICROREAD=m # # Device Drivers @@ -1396,6 +1413,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set @@ -1418,6 +1436,7 @@ CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_OF_PARTS=m CONFIG_MTD_AR7_PARTS=m @@ -1581,7 +1600,6 @@ CONFIG_ISAPNP=y 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_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_CPQ_DA=m @@ -1610,6 +1628,7 @@ CONFIG_ATA_OVER_ETH=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m # # Misc devices @@ -1625,6 +1644,7 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m +# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -1646,6 +1666,7 @@ CONFIG_BMP085_I2C=m # CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m +# CONFIG_LATTICE_ECP3_CONFIG is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1673,6 +1694,8 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=y +CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1768,6 +1791,7 @@ CONFIG_SCSI_MPT3SAS=m CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_FLASHPOINT is not set @@ -1850,6 +1874,7 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y CONFIG_SATA_PMP=y # @@ -1955,7 +1980,6 @@ CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m -# CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m @@ -1967,6 +1991,9 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -2092,7 +2119,6 @@ CONFIG_NET_DSA_MV88E6123_61_65=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m CONFIG_EL3=m CONFIG_3C515=m CONFIG_PCMCIA_3C574=m @@ -2108,7 +2134,6 @@ CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_LANCE=m CONFIG_PCNET32=m -CONFIG_DEPCA=m CONFIG_PCMCIA_NMCLAN=m CONFIG_NI65=m CONFIG_NET_VENDOR_ATHEROS=y @@ -2128,6 +2153,7 @@ CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_CALXEDA_XGMAC=m @@ -2144,7 +2170,6 @@ CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y -CONFIG_EWRK3=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_DE2104X_DSL=0 @@ -2158,8 +2183,6 @@ CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m CONFIG_NET_VENDOR_DLINK=y -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DL2K=m CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set @@ -2170,9 +2193,7 @@ CONFIG_S2IO=m CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_AT1700=m CONFIG_PCMCIA_FMVJ18X=m -CONFIG_ETH16I=m CONFIG_NET_VENDOR_HP=y CONFIG_HP100=m CONFIG_NET_VENDOR_INTEL=y @@ -2180,6 +2201,7 @@ CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y CONFIG_IGBVF=m CONFIG_IXGB=m @@ -2188,14 +2210,6 @@ CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m CONFIG_NET_VENDOR_I825XX=y -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_APRICOT=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_LP486E=m -CONFIG_NI52=m -CONFIG_ZNET=m CONFIG_IP1000=m CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y @@ -2224,12 +2238,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m CONFIG_NET_VENDOR_8390=y -CONFIG_EL2=m -CONFIG_AC3200=m CONFIG_PCMCIA_AXNET=m -CONFIG_E2100=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m CONFIG_NE2000=m CONFIG_NE2K_PCI=m CONFIG_PCMCIA_PCNET=m @@ -2248,7 +2257,6 @@ CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLGE=m CONFIG_NETXEN_NIC=m -CONFIG_NET_VENDOR_RACAL=y CONFIG_NET_VENDOR_REALTEK=y CONFIG_ATP=m CONFIG_8139CP=m @@ -2261,7 +2269,6 @@ CONFIG_R8169=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m CONFIG_NET_VENDOR_SEEQ=y -CONFIG_SEEQ8005=m CONFIG_NET_VENDOR_SILAN=y CONFIG_SC92031=m CONFIG_NET_VENDOR_SIS=y @@ -2363,6 +2370,7 @@ CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m @@ -2486,6 +2494,7 @@ CONFIG_HOSTAP_CS=m # CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m CONFIG_IWLDVM=m +CONFIG_IWLMVM=m # # Debugging Options @@ -2540,6 +2549,7 @@ CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_RT53XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_MMIO=m CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_USB=m CONFIG_RT2X00_LIB=m @@ -2547,13 +2557,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m @@ -2564,7 +2574,7 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m # CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m -CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_WILINK_PLATFORM_DATA=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=m @@ -2783,6 +2793,7 @@ CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -2792,6 +2803,7 @@ CONFIG_MOUSE_PS2_OLPC=y CONFIG_MOUSE_SERIAL=y CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m CONFIG_MOUSE_INPORT=m # CONFIG_MOUSE_ATIXL is not set CONFIG_MOUSE_LOGIBM=m @@ -2961,6 +2973,7 @@ CONFIG_GAMEPORT_FM801=m # # Character devices # +CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y @@ -2992,9 +3005,11 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 @@ -3023,6 +3038,8 @@ CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -3068,6 +3085,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m +CONFIG_TCG_ST33_I2C=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_I2C=m @@ -3095,6 +3113,7 @@ CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m CONFIG_I2C_PIIX4=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m @@ -3197,6 +3216,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIO_DEVRES=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y @@ -3212,6 +3232,7 @@ CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_LYNXPOINT is not set # # I2C GPIO expanders: @@ -3276,6 +3297,7 @@ CONFIG_BATTERY_OLPC=m # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GOLDFISH is not set CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_AVS=y @@ -3354,6 +3376,7 @@ CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m @@ -3388,6 +3411,7 @@ CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m # CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m @@ -3420,10 +3444,12 @@ CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -CONFIG_FAIR_SHARE=y -CONFIG_STEP_WISE=y -# CONFIG_USER_SPACE is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_USER_SPACE is not set # CONFIG_CPU_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3432,6 +3458,7 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m @@ -3592,8 +3619,10 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m +# CONFIG_VIDEO_V4L2_INT_DEVICE is not set CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set @@ -3694,7 +3723,6 @@ CONFIG_USB_SN9C102=m # # Analog TV USB devices # -CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y @@ -3708,6 +3736,8 @@ CONFIG_VIDEO_STK1160_AC97=y # # Analog/digital TV USB devices # +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3824,7 +3854,6 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_TTPCI_EEPROM=m CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m @@ -3845,6 +3874,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m # CONFIG_V4L_TEST_DRIVERS is not set # @@ -3868,6 +3898,7 @@ CONFIG_RADIO_SHARK2=m CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m @@ -3889,18 +3920,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y # # common driver options # +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # # Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_VIDEO_IR_I2C=m # @@ -3942,11 +3974,6 @@ CONFIG_VIDEO_SAA717X=m CONFIG_VIDEO_CX25840=m # -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# # Video encoders # CONFIG_VIDEO_SAA7127=m @@ -4046,6 +4073,7 @@ CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m CONFIG_DVB_MB86A16=m CONFIG_DVB_TDA10071=m @@ -4157,20 +4185,21 @@ CONFIG_DRM_USB=m CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_UMS is not set CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -4186,9 +4215,11 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m -# CONFIG_STUB_POULSBO is not set CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m +# CONFIG_OF_DISPLAY_TIMING is not set +# CONFIG_OF_VIDEOMODE is not set +CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m @@ -4257,6 +4288,7 @@ CONFIG_FB_VT8623=m # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m +# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -4275,6 +4307,8 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_LD9040 is not set # CONFIG_LCD_AMS369FG06 is not set +# CONFIG_LCD_LMS501KF03 is not set +# CONFIG_LCD_HX8357 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -4451,6 +4485,7 @@ CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y @@ -4467,6 +4502,7 @@ CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CA0132_DSP=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y @@ -4584,6 +4620,7 @@ CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y @@ -4592,6 +4629,7 @@ CONFIG_HID_SMARTJOYPLUS=m CONFIG_SMARTJOYPLUS_FF=y CONFIG_HID_TIVO=m CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_WACOM=m @@ -4782,6 +4820,7 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m @@ -4813,10 +4852,13 @@ CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HSIC_USB3503=m # # USB Physical Layer drivers # +# CONFIG_OMAP_USB3 is not set +# CONFIG_OMAP_CONTROL_USB is not set CONFIG_USB_ISP1301=m CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m @@ -4848,6 +4890,8 @@ CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4860,7 +4904,7 @@ CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y -# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_GADGET_TARGET=m CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m @@ -4944,12 +4988,14 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m # CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_PWM is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -5002,8 +5048,6 @@ CONFIG_EDAC_I5100=m CONFIG_EDAC_I7300=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -5052,6 +5096,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_RX4581 is not set # # Platform RTC drivers @@ -5077,6 +5122,11 @@ CONFIG_RTC_DRV_PCF50633=m # CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_SNVS=m + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -5085,9 +5135,12 @@ CONFIG_DMADEVICES=y # CONFIG_INTEL_MID_DMAC=m CONFIG_INTEL_IOATDMA=m +CONFIG_DW_DMAC=m +# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y # # DMA Clients @@ -5197,6 +5250,7 @@ CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m CONFIG_COMEDI_PCI_DRIVERS=y CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5289,7 +5343,6 @@ CONFIG_RTS5139=m # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_DUMP_PCM is not set # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m @@ -5297,7 +5350,6 @@ CONFIG_VT6656=m CONFIG_DX_SEP=m CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -# CONFIG_ZCACHE is not set CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m @@ -5373,18 +5425,19 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m -CONFIG_ZCACHE2=y CONFIG_NET_VENDOR_SILICOM=y CONFIG_SBYPASS=m CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m -CONFIG_SB105X=m CONFIG_FIREWIRE_SERIAL=m +CONFIG_ZCACHE=y +CONFIG_RAMSTER=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m +CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m @@ -5437,6 +5490,7 @@ CONFIG_CLKSRC_I8253=y CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y +# CONFIG_MAILBOX is not set CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y CONFIG_OF_IOMMU=y @@ -5446,13 +5500,13 @@ CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y # -# Remoteproc drivers (EXPERIMENTAL) +# Remoteproc drivers # CONFIG_REMOTEPROC=m CONFIG_STE_MODEM_RPROC=m # -# Rpmsg drivers (EXPERIMENTAL) +# Rpmsg drivers # CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set @@ -5462,11 +5516,11 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m -CONFIG_EXTCON_ARIZONA=m CONFIG_MEMORY=y # CONFIG_IIO is not set # CONFIG_VME_BUS is not set CONFIG_PWM=y +CONFIG_IRQCHIP=y CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m @@ -5537,7 +5591,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -5602,6 +5656,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m @@ -5661,7 +5716,7 @@ CONFIG_NFS_V2=m CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m -# CONFIG_NFS_SWAP is not set +CONFIG_NFS_SWAP=y CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m @@ -5684,7 +5739,7 @@ CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_SUNRPC_DEBUG is not set +CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y @@ -5813,8 +5868,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set @@ -5836,6 +5889,12 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU_DELAY is not set +# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set @@ -5858,6 +5917,7 @@ 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_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y @@ -5865,7 +5925,6 @@ CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y -CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y @@ -5878,6 +5937,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -5887,6 +5947,7 @@ CONFIG_KPROBE_EVENT=y CONFIG_UPROBE_EVENT=y CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set @@ -6034,6 +6095,8 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -6189,3 +6252,4 @@ CONFIG_CORDIC=m CONFIG_DDR=y CONFIG_MPILIB=m CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index e032b072a..faee36762 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.5-1 Kernel Configuration +# Linux/x86 3.9.0-2 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -42,14 +42,12 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx - CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # -CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-LIBRE" @@ -91,6 +89,7 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -109,6 +108,7 @@ CONFIG_HIGH_RES_TIMERS=y # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y @@ -122,6 +122,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +CONFIG_RCU_STALL_COMMON=y # CONFIG_RCU_USER_QS is not set CONFIG_RCU_FANOUT=64 CONFIG_RCU_FANOUT_LEAF=16 @@ -222,14 +223,18 @@ CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_KPROBES_ON_FTRACE=y CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_USE_GENERIC_SMP_HELPERS=y @@ -255,7 +260,8 @@ CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_GENERIC_SIGALTSTACK=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y # # GCOV-based kernel profiling @@ -328,6 +334,7 @@ CONFIG_SMP=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_X86_INTEL_LPSS is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y @@ -422,6 +429,7 @@ CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y # CONFIG_MOVABLE_NODE is not set +CONFIG_HAVE_BOOTMEM_INFO_NODE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_MEMORY_HOTREMOVE=y @@ -528,9 +536,9 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=m +CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_MEMORY=m CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y @@ -565,6 +573,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 CPU frequency scaling drivers # +CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -792,6 +801,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -864,9 +874,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # Xtables matches # CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m @@ -964,7 +976,6 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -1041,7 +1052,7 @@ CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m # -# DCCP CCIDs Configuration (EXPERIMENTAL) +# DCCP CCIDs Configuration # # CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=y @@ -1077,8 +1088,10 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m CONFIG_NET_DSA_TAG_DSA=y @@ -1086,6 +1099,7 @@ CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m @@ -1098,7 +1112,6 @@ CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_DECAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_WAN_ROUTER is not set CONFIG_PHONET=m CONFIG_IEEE802154=m CONFIG_IEEE802154_6LOWPAN=m @@ -1167,6 +1180,8 @@ CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1349,6 +1364,8 @@ CONFIG_NFC_HCI=m # CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_PN544=m +CONFIG_NFC_MICROREAD=m CONFIG_HAVE_BPF_JIT=y # @@ -1366,6 +1383,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y @@ -1387,6 +1405,7 @@ CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_AR7_PARTS=m # @@ -1558,6 +1577,7 @@ CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m # # Misc devices @@ -1573,6 +1593,7 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m +# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -1594,6 +1615,7 @@ CONFIG_BMP085_I2C=m # CONFIG_BMP085_SPI is not set CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m +# CONFIG_LATTICE_ECP3_CONFIG is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1621,6 +1643,8 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=y +CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1712,6 +1736,7 @@ CONFIG_SCSI_MPT3SAS=m CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m CONFIG_VMWARE_PVSCSI=m @@ -1777,6 +1802,7 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y CONFIG_SATA_PMP=y # @@ -1878,7 +1904,6 @@ CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m -# CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m @@ -1890,6 +1915,9 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -2046,6 +2074,7 @@ CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_CALXEDA_XGMAC=m @@ -2072,8 +2101,6 @@ CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m CONFIG_NET_VENDOR_DLINK=y -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DL2K=m CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set @@ -2092,6 +2119,7 @@ CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y CONFIG_IGBVF=m CONFIG_IXGB=m @@ -2100,7 +2128,6 @@ CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m CONFIG_NET_VENDOR_I825XX=y -CONFIG_ZNET=m CONFIG_IP1000=m CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y @@ -2157,7 +2184,6 @@ CONFIG_R8169=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m CONFIG_NET_VENDOR_SEEQ=y -CONFIG_SEEQ8005=m CONFIG_NET_VENDOR_SILAN=y CONFIG_SC92031=m CONFIG_NET_VENDOR_SIS=y @@ -2255,6 +2281,7 @@ CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m @@ -2378,6 +2405,7 @@ CONFIG_HOSTAP_CS=m # CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m CONFIG_IWLDVM=m +CONFIG_IWLMVM=m # # Debugging Options @@ -2432,6 +2460,7 @@ CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_RT53XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_MMIO=m CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_USB=m CONFIG_RT2X00_LIB=m @@ -2439,13 +2468,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m @@ -2456,7 +2485,7 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m # CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m -CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_WILINK_PLATFORM_DATA=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=m @@ -2661,6 +2690,7 @@ CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -2669,6 +2699,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y CONFIG_MOUSE_SERIAL=y CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m CONFIG_MOUSE_VSXXXAA=m # CONFIG_MOUSE_GPIO is not set CONFIG_MOUSE_SYNAPTICS_I2C=m @@ -2831,6 +2862,7 @@ CONFIG_GAMEPORT_FM801=m # # Character devices # +CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y @@ -2862,14 +2894,17 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=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 +CONFIG_SERIAL_8250_DW=m # # Non-8250 serial port support @@ -2890,6 +2925,8 @@ CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -2933,6 +2970,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m +CONFIG_TCG_ST33_I2C=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_I2C=m @@ -2960,6 +2998,7 @@ CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m CONFIG_I2C_PIIX4=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m @@ -3019,7 +3058,9 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set # CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_PXA2XX_PCI is not set +CONFIG_SPI_PXA2XX_DMA=y +CONFIG_SPI_PXA2XX=m +CONFIG_SPI_PXA2XX_PCI=m # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_TOPCLIFF_PCH is not set # CONFIG_SPI_XCOMM is not set @@ -3058,6 +3099,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIO_DEVRES=y CONFIG_GPIOLIB=y CONFIG_GPIO_ACPI=y # CONFIG_DEBUG_GPIO is not set @@ -3072,6 +3114,7 @@ CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_LYNXPOINT is not set # # I2C GPIO expanders: @@ -3133,6 +3176,7 @@ CONFIG_TEST_POWER=m # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GOLDFISH is not set CONFIG_POWER_RESET=y CONFIG_POWER_AVS=y CONFIG_HWMON=y @@ -3210,6 +3254,7 @@ CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m @@ -3244,6 +3289,7 @@ CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m # CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m @@ -3276,10 +3322,12 @@ CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -CONFIG_FAIR_SHARE=y -CONFIG_STEP_WISE=y -# CONFIG_USER_SPACE is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_USER_SPACE is not set # CONFIG_CPU_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3288,6 +3336,7 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m @@ -3440,8 +3489,10 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m +# CONFIG_VIDEO_V4L2_INT_DEVICE is not set CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set @@ -3542,7 +3593,6 @@ CONFIG_USB_SN9C102=m # # Analog TV USB devices # -CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y @@ -3556,6 +3606,8 @@ CONFIG_VIDEO_STK1160_AC97=y # # Analog/digital TV USB devices # +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3672,7 +3724,6 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_TTPCI_EEPROM=m CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m @@ -3693,6 +3744,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m # CONFIG_V4L_TEST_DRIVERS is not set # @@ -3715,6 +3767,7 @@ CONFIG_RADIO_SHARK2=m CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m @@ -3735,18 +3788,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y # # common driver options # +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # # Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_VIDEO_IR_I2C=m # @@ -3788,11 +3842,6 @@ CONFIG_VIDEO_SAA717X=m CONFIG_VIDEO_CX25840=m # -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# # Video encoders # CONFIG_VIDEO_SAA7127=m @@ -3892,6 +3941,7 @@ CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m CONFIG_DVB_MB86A16=m CONFIG_DVB_TDA10071=m @@ -3997,20 +4047,21 @@ CONFIG_DRM_USB=m CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_UMS is not set CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -4026,9 +4077,9 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m -# CONFIG_STUB_POULSBO is not set CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set @@ -4094,6 +4145,7 @@ CONFIG_FB_VT8623=m # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m +# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set @@ -4113,6 +4165,8 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_LD9040 is not set # CONFIG_LCD_AMS369FG06 is not set +# CONFIG_LCD_LMS501KF03 is not set +# CONFIG_LCD_HX8357 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -4249,6 +4303,7 @@ CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y @@ -4265,6 +4320,7 @@ CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CA0132_DSP=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y @@ -4381,6 +4437,7 @@ CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y @@ -4389,6 +4446,7 @@ CONFIG_HID_SMARTJOYPLUS=m CONFIG_SMARTJOYPLUS_FF=y CONFIG_HID_TIVO=m CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_WACOM=m @@ -4579,6 +4637,7 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m @@ -4610,10 +4669,13 @@ CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HSIC_USB3503=m # # USB Physical Layer drivers # +# CONFIG_OMAP_USB3 is not set +# CONFIG_OMAP_CONTROL_USB is not set CONFIG_USB_ISP1301=m CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m @@ -4644,6 +4706,8 @@ CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4656,7 +4720,7 @@ CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y -# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_GADGET_TARGET=m CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m @@ -4741,6 +4805,7 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m @@ -4797,8 +4862,6 @@ CONFIG_EDAC_I7300=m CONFIG_EDAC_SBRIDGE=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -4847,6 +4910,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_RX4581 is not set # # Platform RTC drivers @@ -4871,6 +4935,11 @@ CONFIG_RTC_DRV_PCF50633=m # on-CPU RTC drivers # CONFIG_RTC_DRV_MC13XXX=m + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -4879,6 +4948,8 @@ CONFIG_DMADEVICES=y # CONFIG_INTEL_MID_DMAC=m CONFIG_INTEL_IOATDMA=m +CONFIG_DW_DMAC=m +# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y @@ -4968,6 +5039,7 @@ CONFIG_COMEDI_SERIAL2002=m CONFIG_COMEDI_SKEL=m CONFIG_COMEDI_PCI_DRIVERS=y CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5059,7 +5131,6 @@ CONFIG_RTS5139=m # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_DUMP_PCM is not set # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m @@ -5067,7 +5138,6 @@ CONFIG_VT6656=m CONFIG_DX_SEP=m CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -# CONFIG_ZCACHE is not set CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m @@ -5143,19 +5213,19 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m -CONFIG_ZCACHE2=y -CONFIG_RAMSTER=y CONFIG_NET_VENDOR_SILICOM=y CONFIG_SBYPASS=m CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m -CONFIG_SB105X=m CONFIG_FIREWIRE_SERIAL=m +CONFIG_ZCACHE=y +CONFIG_RAMSTER=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m +CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m @@ -5205,6 +5275,7 @@ CONFIG_APPLE_GMUX=m CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y +# CONFIG_MAILBOX is not set CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y CONFIG_AMD_IOMMU=y @@ -5217,13 +5288,13 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_IRQ_REMAP=y # -# Remoteproc drivers (EXPERIMENTAL) +# Remoteproc drivers # CONFIG_REMOTEPROC=m CONFIG_STE_MODEM_RPROC=m # -# Rpmsg drivers (EXPERIMENTAL) +# Rpmsg drivers # CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set @@ -5233,9 +5304,9 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m -CONFIG_EXTCON_ARIZONA=m CONFIG_MEMORY=y # CONFIG_IIO is not set +# CONFIG_NTB is not set # CONFIG_VME_BUS is not set # CONFIG_PWM is not set CONFIG_IPACK_BUS=m @@ -5308,7 +5379,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -5374,6 +5445,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m @@ -5433,7 +5505,7 @@ CONFIG_NFS_V2=m CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m -# CONFIG_NFS_SWAP is not set +CONFIG_NFS_SWAP=y CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m @@ -5456,7 +5528,7 @@ CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_SUNRPC_DEBUG is not set +CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y @@ -5585,8 +5657,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set @@ -5607,6 +5677,12 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU_DELAY is not set +# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set @@ -5629,6 +5705,7 @@ 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_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_FENTRY=y @@ -5637,7 +5714,6 @@ CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y -CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y @@ -5650,6 +5726,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -5659,6 +5736,7 @@ CONFIG_KPROBE_EVENT=y CONFIG_UPROBE_EVENT=y CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set @@ -5808,6 +5886,8 @@ CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C_X86_64=y CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -5968,3 +6048,4 @@ CONFIG_CORDIC=m CONFIG_DDR=y CONFIG_MPILIB=m CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index e34d8347f..f849635c1 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.11-1-LIBRE +KERNEL_VERSION=3.9.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/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 07abf931b..cd55468eb 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183118 2013-04-17 16:51:39Z tpowa $ +# $Id: PKGBUILD 184774 2013-05-08 10:43:50Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,14 +6,14 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=43 +pkgrel=45 epoch=1 -_extramodules=extramodules-3.8-LIBRE +_extramodules=extramodules-3.9-LIBRE arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre-headers>=3.8' 'linux-libre-headers<3.9' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -59,7 +59,7 @@ build() { package_lirc-libre() { pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)" - depends=('lirc-utils-libre' 'linux-libre>=3.8' 'linux-libre<3.9') + depends=('lirc-utils-libre' 'linux-libre>=3.9' 'linux-libre<3.10') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') provides=("lirc=$pkgver") diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index 49a9dc601..cd4a57231 100644 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.8-LIBRE +EXTRAMODULES=extramodules-3.9-LIBRE post_install() { # updating module dependencies diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 3e9ae0e9e..2e3126da7 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -7,13 +7,13 @@ pkgname=luxrender-libre _pkgflag=libre pkgver=1.2.1 _pkgver=3066b2161439 -pkgrel=2 +pkgrel=3 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.${pkgname%-$_pkgflag}.net/" license=('GPL') depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl') -optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \ +optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=${pkgver::3}" 'python' 'opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index e5023f3cb..5ad383873 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178232 2013-02-18 16:28:11Z ioni $ +# $Id: PKGBUILD 183981 2013-04-30 09:11:10Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=35920 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' @@ -49,7 +49,7 @@ build() { } package_mplayer-libre() { - pkgdesc="A movie player for GNU/Linux (without unfree faac support)" + pkgdesc="A movie player for GNU/Linux, without nonfree faac support" install=mplayer.install backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' @@ -72,7 +72,7 @@ package_mplayer-libre() { } package_mencoder-libre() { - pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)" + pkgdesc="Free command line video decoding, encoding and filtering tool, without nonfree faac support" depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis') provides=("mencoder=$pkgver") diff --git a/libre/opencollada/PKGBUILD b/libre/opencollada/PKGBUILD index 2cf700e1f..d6ec1b979 100644 --- a/libre/opencollada/PKGBUILD +++ b/libre/opencollada/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=opencollada -pkgver=20130305 +pkgver=20130413 pkgrel=1 pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender-libre package)" arch=( @@ -26,7 +26,7 @@ prepare() { cd $srcdir/OpenCOLLADA # adapt source to last blender release - git reset --hard da9f1c3d5da28d475f35ff1175d60cb74fa0f661 # Tue Mar 5 11:30:27 2013 +0100 + git reset --hard 9665d1614b027ffd7815dc745c4fab4d69eb3321 # Sat Apr 13 01:27:39 2013 -0700 [[ -d build ]] && rm -r build mkdir build @@ -49,4 +49,3 @@ package() { } # vim:set ts=2 sw=2 et: - diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 6bc77a345..614c1156e 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 181860 2013-04-04 22:54:14Z allan $ +# $Id: PKGBUILD 184462 2013-05-07 03:37:44Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pacman -pkgver=4.1.0 -pkgrel=2.1 +pkgver=4.1.1 +pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -26,12 +26,12 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} pacman.conf.x86_64 pacman.conf.mips64el makepkg.conf) -md5sums=('a0f2b3148bee4784f21cf373cf59a0bc' - '4959b8d00056398195f4e549e7bdd346' +md5sums=('72a1688ff73c1c0b79d8f87b3793d446' + 'SKIP' '688feb0a552f42643a76f72e7198bfe4' '765858b55d2112d948932fc645ea538b' '9e0c64937ef751ae4273fa4d73381484' - '5a94cdf966ad72284ee1aa148202857b') + '7984963d89784d26b5c50218e2138467') build() { cd $srcdir/$pkgname-$pkgver diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf index f1ce20fcb..a4e7ceada 100644 --- a/libre/pacman/makepkg.conf +++ b/libre/pacman/makepkg.conf @@ -109,6 +109,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) #SRCDEST=/home/sources #-- Source packages: specify a fixed directory where all src packages will be placed #SRCPKGDEST=/home/srcpackages +#-- Log files: specify a fixed directory where all log files will be placed +#LOGDEST=/home/makepkglogs #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john@doe.com>" #-- Specify a key to use for package signing diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD index b37ef217c..a5c04bec4 100644 --- a/libre/soundkonverter-libre/PKGBUILD +++ b/libre/soundkonverter-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90159 2013-05-07 13:40:35Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,7 +7,7 @@ _pkgname=soundkonverter pkgname=soundkonverter-libre -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" arch=('i686' 'x86_64') @@ -36,7 +36,7 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver install=$_pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz") -md5sums=('d4f039003954c5279e56113237f608ca') +md5sums=('08076f9d8c017d8c31f18b94bc9e6878') build() { cd "$srcdir"/$_pkgname-$pkgver diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 5cad17d7b..e6c202136 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183235 2013-04-18 23:55:16Z remy $ +# $Id: PKGBUILD 183993 2013-04-30 14:22:00Z foutrelis $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ pkgname=texlive-bin-libre pkgver=2012.0 -pkgrel=10 +pkgrel=11 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)" license=('GPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 92e66fc6a..a3d48d0f3 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90191 2013-05-08 10:50:10Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,13 +12,13 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=19 +pkgrel=21 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' license=('GPL') -depends=('linux-libre>=3.8' 'linux-libre<3.9') -makedepends=('linux-libre-headers>=3.8' 'linux-libre-headers<3.9') +depends=('linux-libre>=3.9' 'linux-libre<3.10') +makedepends=('linux-libre-headers>=3.9' 'linux-libre-headers<3.10') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install index 5474faf8e..49d1bf656 100644 --- a/libre/tp_smapi-libre/tp_smapi.install +++ b/libre/tp_smapi-libre/tp_smapi.install @@ -1,4 +1,4 @@ -extramodules=/usr/lib/modules/extramodules-3.8-LIBRE +extramodules=/usr/lib/modules/extramodules-3.9-LIBRE post_install() { depmod -v $(< "$extramodules/version") &>/dev/null diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 3ba9ec1aa..95f94c9b4 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90193 2013-05-08 10:51:01Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -7,13 +7,13 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 -_extramodules=extramodules-3.8-LIBRE -pkgrel=22 +_extramodules=extramodules-3.9-LIBRE +pkgrel=24 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('linux-libre>=3.8' 'linux-libre<3.9') +depends=('linux-libre>=3.9' 'linux-libre<3.10') makedepends=('linux-libre-headers') options=(!makeflags) install=$_pkgname.install diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install index 3e26e5438..88b96f7b4 100644 --- a/libre/vhba-module-libre/vhba-module.install +++ b/libre/vhba-module-libre/vhba-module.install @@ -1,6 +1,6 @@ _updatemod() { echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.8-LIBRE' + EXTRAMODULES='extramodules-3.9-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 713c61158..9077a0ac4 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90212 2013-05-09 00:26:24Z seblu $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> @@ -7,20 +7,21 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 -_extramodules=extramodules-3.8-LIBRE -pkgrel=3 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux-libre-headers' +makedepends=('linux-libre' + 'linux-libre-headers' "virtualbox-libre-host-dkms>=$pkgver" "virtualbox-libre-guest-dkms>=$pkgver" 'expac' + 'sed' 'bc') build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - + _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version) # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -33,38 +34,40 @@ build() { } package_virtualbox-libre-host-modules(){ - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - + _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version) pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' - depends=('linux-libre>=3.8' 'linux-libre<3.9') + #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)") + depends=('linux-libre>=3.9' 'linux-libre<3.10') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') install=virtualbox-libre-host-modules.install - install -dm755 "$pkgdir/usr/lib/modules/$_extramodules" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extramodules" + install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/" + install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-host-modules.install" + sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-host-modules.install" } package_virtualbox-libre-guest-modules(){ - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - + _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version) pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') - depends=('linux-libre>=3.8' 'linux-libre<3.9') + #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)") + depends=('linux-libre>=3.9' 'linux-libre<3.10') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') install=virtualbox-libre-guest-modules.install - install -dm755 "$pkgdir/usr/lib/modules/$_extramodules" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extramodules" + install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/" + install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-guest-modules.install" + sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-guest-modules.install" } # vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index 3a8199ff8..82bda9855 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -1,17 +1,18 @@ +VERSION='' + post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.8-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } post_upgrade() { - EXTRAMODULES='extramodules-3.8-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } post_remove() { - EXTRAMODULES='extramodules-3.8-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } + +# vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index 0a6d187e5..6c1a57d3a 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -1,19 +1,20 @@ +VERSION='' + post_install() { cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.8-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } post_upgrade() { - 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.' + depmod $VERSION + echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.8-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } + +# vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 709edc49e..4cf483641 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,10 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 89632 2013-04-30 16:22:22Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> -# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Contributor (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> +# Contributor (Parabola): Jorge López <jorginho@lavabit.com> +# Contributor (Parabola): Esteban Carnevale <alfplayer@mailoo.org> pkgbase=virtualbox-libre pkgname=('virtualbox-libre' @@ -13,7 +14,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') pkgver=4.2.12 -pkgrel=1 +pkgrel=2.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -107,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '919277147baae235810f1858200038c0' + '7c5eca076af3d0601f5321f99b815b9c' '50387fba578646a9d29de3f917a199d2') prepare() { @@ -167,7 +168,7 @@ build() { } package_virtualbox-libre() { - pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets included and nonfree Oracle VM VirtualBox Extension Pack support removed)' + pkgdesc='Powerful x86 virtualization for enterprise as well as home use, with free distros presets (nonfree Extension Pack and Guest Additions ISO image support removed)' depends=('curl' 'libpng' 'libxcursor' diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index a696f9a0d..c3e2e4ad4 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ ---- VirtualBox-4.2.6.orig/Config.kmk 2012-12-19 16:24:34.000000000 -0200 -+++ VirtualBox-4.2.6/Config.kmk 2012-12-27 14:28:22.897125304 -0200 +--- VirtualBox-4.2.12.orig/Config.kmk 2013-04-12 07:33:55.000000000 -0300 ++++ VirtualBox-4.2.12/Config.kmk 2013-05-10 15:03:20.817944799 -0300 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -45,7 +45,7 @@ # Enable the ISCSI feature. VBOX_WITH_ISCSI = 1 # Enable INIP support in the ISCSI feature. -@@ -439,9 +429,6 @@ +@@ -441,9 +431,6 @@ ifdef VBOX_WITH_USB VBOX_WITH_VUSB = 1 endif @@ -55,7 +55,7 @@ ifdef VBOX_WITH_PCI_PASSTHROUGH VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1 endif -@@ -580,8 +567,6 @@ +@@ -584,8 +571,6 @@ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win) VBOX_WITH_CROGL = 1 endif @@ -64,7 +64,7 @@ # Enable S3 support (requires libcurl) VBOX_WITH_S3 = 1 # Enable Host=>Guest Drag'n'Drop -@@ -621,17 +606,6 @@ +@@ -625,17 +610,6 @@ endif ## @} @@ -82,7 +82,7 @@ ## @name Misc ## @{ # Enable Seamless mode -@@ -822,14 +796,6 @@ +@@ -826,14 +800,6 @@ # Skip stuff. # @@ -97,7 +97,7 @@ # VBOX_QUICK can be used by core developers to speed to the build ifdef VBOX_QUICK # undefine variables by assigning blank. -@@ -884,7 +850,6 @@ +@@ -888,7 +854,6 @@ VBOX_WITH_TESTSUITE= VBOX_WITH_QTGUI= VBOX_WITH_USB= @@ -105,7 +105,7 @@ VBOX_WITH_DOCS= VBOX_WITH_PDM_ASYNC_COMPLETION= VBOX_WITH_KCHMVIEWER= -@@ -906,7 +871,6 @@ +@@ -910,7 +875,6 @@ VBOX_WITH_CROGL= VBOX_WITH_DEBUGGER= VBOX_WITH_DOCS= @@ -113,7 +113,7 @@ VBOX_WITH_HARDENING= VBOX_WITH_HEADLESS= VBOX_WITH_HGCM= -@@ -979,7 +943,7 @@ +@@ -983,7 +947,7 @@ # # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set. # @@ -122,7 +122,7 @@ , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x)))) if $(words $(VBOX_ONLY_BUILD)) > 1 $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD)) -@@ -997,9 +961,6 @@ +@@ -1001,9 +965,6 @@ # ifdef VBOX_OSE VBOX_WITH_VRDP= @@ -132,7 +132,7 @@ VBOX_WITH_PCI_PASSTHROUGH_IMPL= VBOX_WITH_OS2_ADDITIONS_BIN= VBOX_WITH_SECURELABEL= -@@ -1130,10 +1091,6 @@ +@@ -1135,10 +1096,6 @@ VBOX_WITH_KCHMVIEWER= endif @@ -143,7 +143,7 @@ # # Mark OSE builds clearly, helps figuring out limitations more easily. # -@@ -1738,9 +1695,6 @@ +@@ -1743,9 +1700,6 @@ # bin2c (convert binary files into C arrays) VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) @@ -153,7 +153,7 @@ # VBoxCmp (simple /bin/cmp with more sensible output) VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE) -@@ -2632,13 +2586,6 @@ +@@ -2633,13 +2587,6 @@ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE) endif @@ -167,7 +167,7 @@ SDK_VBOX_BLD_OPENSSL = . SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ -@@ -4099,99 +4046,6 @@ +@@ -4100,99 +4047,6 @@ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin)) @@ -392,9 +392,9 @@ # success! echo echo "Successfully generated '$CNF' and '$ENV'." ---- VirtualBox-4.2.0.orig/Makefile.kmk 2012-08-29 11:13:46.000000000 -0300 -+++ VirtualBox-4.2.0/Makefile.kmk 2012-09-18 23:43:54.750454776 -0300 -@@ -378,7 +378,6 @@ +--- VirtualBox-4.2.12.orig/Makefile.kmk 2013-04-12 07:33:55.000000000 -0300 ++++ VirtualBox-4.2.12/Makefile.kmk 2013-05-10 15:04:21.967970195 -0300 +@@ -388,7 +388,6 @@ include/VBox \ include/VBox/vmm \ include/VBox/com \ @@ -402,7 +402,7 @@ include/VBox/HostServices \ include/VBox/GuestHost \ include/VBox/HGSMI \ -@@ -990,200 +989,6 @@ +@@ -1010,200 +1009,6 @@ # @@ -1001,3 +1001,374 @@ else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS # +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp 2013-04-12 07:37:59.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp 2013-05-10 16:26:44.137679260 -0300 +@@ -1829,166 +1829,12 @@ + "available on this virtual machine, and shared folders " + "cannot be used without them. To use shared folders inside " + "the virtual machine, please install the Guest Additions " +- "if they are not installed, or re-install them if they are " +- "not working correctly, by selecting <b>Install Guest Additions</b> " +- "from the <b>Devices</b> menu. " ++ "if they are not installed." + "If they are installed but the machine is not yet fully started " + "then shared folders will be available once it is.</p>"), + "remindAboutGuestAdditionsAreNotActive"); + } + +-bool UIMessageCenter::cannotFindGuestAdditions() +-{ +- return messageYesNo(mainMachineWindowShown(), Question, +- tr("<p>Could not find the VirtualBox Guest Additions " +- "CD image file.</nobr></p><p>Do you wish to " +- "download this CD image from the Internet?</p>")); +-} +- +-void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) +-{ +- message(mainMachineWindowShown(), Error, +- tr("<p>Could not insert the VirtualBox Guest Additions " +- "installer CD image into the virtual machine <b>%1</b>, as the machine " +- "has no CD/DVD-ROM drives. Please add a drive using the " +- "storage page of the virtual machine settings dialog.</p>") +- .arg(strMachineName)); +-} +- +-bool UIMessageCenter::confirmDownloadAdditions(const QString &strUrl, qulonglong uSize) +-{ +- QLocale loc(VBoxGlobal::languageId()); +- return messageOkCancel(networkManagerOrMainMachineWindowShown(), Question, +- tr("<p>Are you sure you want to download the VirtualBox " +- "Guest Additions CD image from " +- "<nobr><a href=\"%1\">%2</a></nobr> " +- "(size %3 bytes)?</p>").arg(strUrl).arg(strUrl).arg(loc.toString(uSize)), +- 0, /* pcszAutoConfirmId */ +- tr("Download", "additions")); +-} +- +-bool UIMessageCenter::confirmMountAdditions(const QString &strUrl, const QString &strSrc) +-{ +- return messageOkCancel(networkManagerOrMainMachineWindowShown(), Question, +- tr("<p>The VirtualBox Guest Additions CD image has been " +- "successfully downloaded from " +- "<nobr><a href=\"%1\">%2</a></nobr> " +- "and saved locally as <nobr><b>%3</b>.</nobr></p>" +- "<p>Do you wish to register this CD image and mount it " +- "on the virtual CD/DVD drive?</p>") +- .arg(strUrl).arg(strUrl).arg(strSrc), +- 0, /* pcszAutoConfirmId */ +- tr("Mount", "additions")); +-} +- +-void UIMessageCenter::warnAboutAdditionsCantBeSaved(const QString &strTarget) +-{ +- message(networkManagerOrMainMachineWindowShown(), Error, +- tr("<p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p>") +- .arg(QDir::toNativeSeparators(strTarget))); +-} +- +-bool UIMessageCenter::askAboutUserManualDownload(const QString &strMissedLocation) +-{ +- return messageOkCancel(mainWindowShown(), Question, +- tr("<p>Could not find the VirtualBox User Manual " +- "<nobr><b>%1</b>.</nobr></p><p>Do you wish to " +- "download this file from the Internet?</p>") +- .arg(strMissedLocation), +- 0, /* Auto-confirm Id */ +- tr("Download", "additions")); +-} +- +-bool UIMessageCenter::confirmUserManualDownload(const QString &strURL, qulonglong uSize) +-{ +- QLocale loc(VBoxGlobal::languageId()); +- return messageOkCancel(networkManagerOrMainWindowShown(), Question, +- tr("<p>Are you sure you want to download the VirtualBox " +- "User Manual from " +- "<nobr><a href=\"%1\">%2</a></nobr> " +- "(size %3 bytes)?</p>").arg(strURL).arg(strURL).arg(loc.toString(uSize)), +- 0, /* Auto-confirm Id */ +- tr("Download", "additions")); +-} +- +-void UIMessageCenter::warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget) +-{ +- message(networkManagerOrMainWindowShown(), Warning, +- tr("<p>The VirtualBox User Manual has been " +- "successfully downloaded from " +- "<nobr><a href=\"%1\">%2</a></nobr> " +- "and saved locally as <nobr><b>%3</b>.</nobr></p>") +- .arg(strURL).arg(strURL).arg(strTarget)); +-} +- +-void UIMessageCenter::warnAboutUserManualCantBeSaved(const QString &strURL, const QString &strTarget) +-{ +- message(networkManagerOrMainWindowShown(), Error, +- tr("<p>The VirtualBox User Manual has been " +- "successfully downloaded from " +- "<nobr><a href=\"%1\">%2</a></nobr> " +- "but can't be saved locally as <nobr><b>%3</b>.</nobr></p>" +- "<p>Please choose another location for that file.</p>") +- .arg(strURL).arg(strURL).arg(strTarget)); +-} +- +-bool UIMessageCenter::proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion) +-{ +- return messageOkCancel(mainWindowShown(), +- Question, +- tr("<p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p>" +- "<p>Do you wish to download latest one from the Internet?</p>") +- .arg(strExtPackVersion).arg(strExtPackName), +- 0, /* Auto-confirm Id */ +- tr("Download", "extension pack")); +-} +- +-bool UIMessageCenter::requestUserDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion) +-{ +- return message(mainWindowShown(), Info, +- tr("<p>You have version %1 of the <b><nobr>%2</nobr></b> installed.</p>" +- "<p>You should download and install version %3 of this extension pack from Oracle!</p>") +- .arg(strExtPackVersion).arg(strExtPackName).arg(strVBoxVersion), +- 0, /* Auto-confirm Id */ +- QIMessageBox::Ok | QIMessageBox::Default, +- 0, +- 0, +- tr("Ok", "extension pack")); +-} +- +-bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize) +-{ +- QLocale loc(VBoxGlobal::languageId()); +- return messageOkCancel(networkManagerOrMainWindowShown(), Question, +- tr("<p>Are you sure you want to download the <b><nobr>%1</nobr></b> " +- "from <nobr><a href=\"%2\">%2</a></nobr> (size %3 bytes)?</p>") +- .arg(strExtPackName, strURL, loc.toString(uSize)), +- 0, /* Auto-confirm Id */ +- tr("Download", "extension pack")); +-} +- +-bool UIMessageCenter::proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) +-{ +- return messageOkCancel(networkManagerOrMainWindowShown(), Question, +- tr("<p>The <b><nobr>%1</nobr></b> has been " +- "successfully downloaded from <nobr><a href=\"%2\">%2</a></nobr> " +- "and saved locally as <nobr><b>%3</b>.</nobr></p>" +- "<p>Do you wish to install this extension pack?</p>") +- .arg(strExtPackName, strFrom, strTo), +- 0, /* Auto-confirm Id */ +- tr ("Install", "extension pack")); +-} +- +-void UIMessageCenter::warnAboutExtentionPackCantBeSaved(const QString &strExtPackName, const QString &strFrom, const QString &strTo) +-{ +- message(networkManagerOrMainWindowShown(), Error, +- tr("<p>The <b><nobr>%1</nobr></b> has been " +- "successfully downloaded from <nobr><a href=\"%2\">%2</a></nobr> " +- "but can't be saved locally as <nobr><b>%3</b>.</nobr></p>" +- "<p>Please choose another location for that file.</p>") +- .arg(strExtPackName, strFrom, strTo)); +-} +- + void UIMessageCenter::cannotConnectRegister(QWidget *pParent, + const QString &strUrl, + const QString &strReason) +@@ -2572,162 +2418,6 @@ + formatErrorInfo(progress.GetErrorInfo())); + } + +-void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress, +- QWidget *pParent /* = NULL */) const +-{ +- AssertWrapperOk(progress); +- +- message(pParent ? pParent : mainWindowShown(), +- Error, +- tr("Failed to update Guest Additions. The Guest Additions installation image will be mounted to provide a manual installation."), +- formatErrorInfo(progress.GetErrorInfo())); +-} +- +-void UIMessageCenter::cannotOpenExtPack(const QString &strFilename, +- const CExtPackManager &extPackManager, +- QWidget *pParent) +-{ +- message(pParent ? pParent : mainWindowShown(), +- Error, +- tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename), +- formatErrorInfo(extPackManager)); +-} +- +-void UIMessageCenter::badExtPackFile(const QString &strFilename, +- const CExtPackFile &extPackFile, +- QWidget *pParent) +-{ +- message(pParent ? pParent : mainWindowShown(), +- Error, +- tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename), +- "<!--EOM-->" + extPackFile.GetWhyUnusable()); +-} +- +-void UIMessageCenter::cannotInstallExtPack(const QString &strFilename, +- const CExtPackFile &extPackFile, +- const CProgress &progress, +- QWidget *pParent) +-{ +- if (!pParent) +- pParent = mainWindowShown(); +- QString strErrInfo = !extPackFile.isOk() || progress.isNull() +- ? formatErrorInfo(extPackFile) : formatErrorInfo(progress.GetErrorInfo()); +- message(pParent, +- Error, +- tr("Failed to install the Extension Pack <b>%1</b>.").arg(strFilename), +- strErrInfo); +-} +- +-void UIMessageCenter::cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, +- const CProgress &progress, QWidget *pParent) +-{ +- if (!pParent) +- pParent = mainWindowShown(); +- QString strErrInfo = !extPackManager.isOk() || progress.isNull() +- ? formatErrorInfo(extPackManager) : formatErrorInfo(progress.GetErrorInfo()); +- message(pParent, +- Error, +- tr("Failed to uninstall the Extension Pack <b>%1</b>.").arg(strPackName), +- strErrInfo); +-} +- +-bool UIMessageCenter::confirmInstallingPackage(const QString &strPackName, const QString &strPackVersion, +- const QString &strPackDescription, QWidget *pParent) +-{ +- return messageOkCancel(pParent ? pParent : mainWindowShown(), +- Question, +- tr("<p>You are about to install a VirtualBox extension pack. " +- "Extension packs complement the functionality of VirtualBox and can contain system level software " +- "that could be potentially harmful to your system. Please review the description below and only proceed " +- "if you have obtained the extension pack from a trusted source.</p>" +- "<p><table cellpadding=0 cellspacing=0>" +- "<tr><td><b>Name: </b></td><td>%1</td></tr>" +- "<tr><td><b>Version: </b></td><td>%2</td></tr>" +- "<tr><td><b>Description: </b></td><td>%3</td></tr>" +- "</table></p>") +- .arg(strPackName).arg(strPackVersion).arg(strPackDescription), +- 0, +- tr("&Install")); +-} +- +-bool UIMessageCenter::confirmReplacePackage(const QString &strPackName, const QString &strPackVersionNew, +- const QString &strPackVersionOld, const QString &strPackDescription, +- QWidget *pParent) +-{ +- if (!pParent) +- pParent = pParent ? pParent : mainWindowShown(); /* this is boring stuff that messageOkCancel should do! */ +- +- QString strBelehrung = tr("Extension packs complement the functionality of VirtualBox and can contain " +- "system level software that could be potentially harmful to your system. " +- "Please review the description below and only proceed if you have obtained " +- "the extension pack from a trusted source."); +- +- QByteArray ba1 = strPackVersionNew.toUtf8(); +- QByteArray ba2 = strPackVersionOld.toUtf8(); +- int iVerCmp = RTStrVersionCompare(ba1.constData(), ba2.constData()); +- +- bool fRc; +- if (iVerCmp > 0) +- fRc = messageOkCancel(pParent, +- Question, +- tr("<p>An older version of the extension pack is already installed, would you like to upgrade? " +- "<p>%1</p>" +- "<p><table cellpadding=0 cellspacing=0>" +- "<tr><td><b>Name: </b></td><td>%2</td></tr>" +- "<tr><td><b>New Version: </b></td><td>%3</td></tr>" +- "<tr><td><b>Current Version: </b></td><td>%4</td></tr>" +- "<tr><td><b>Description: </b></td><td>%5</td></tr>" +- "</table></p>") +- .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), +- 0, +- tr("&Upgrade")); +- else if (iVerCmp < 0) +- fRc = messageOkCancel(pParent, +- Question, +- tr("<p>An newer version of the extension pack is already installed, would you like to downgrade? " +- "<p>%1</p>" +- "<p><table cellpadding=0 cellspacing=0>" +- "<tr><td><b>Name: </b></td><td>%2</td></tr>" +- "<tr><td><b>New Version: </b></td><td>%3</td></tr>" +- "<tr><td><b>Current Version: </b></td><td>%4</td></tr>" +- "<tr><td><b>Description: </b></td><td>%5</td></tr>" +- "</table></p>") +- .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), +- 0, +- tr("&Downgrade")); +- else +- fRc = messageOkCancel(pParent, +- Question, +- tr("<p>The extension pack is already installed with the same version, would you like reinstall it? " +- "<p>%1</p>" +- "<p><table cellpadding=0 cellspacing=0>" +- "<tr><td><b>Name: </b></td><td>%2</td></tr>" +- "<tr><td><b>Version: </b></td><td>%3</td></tr>" +- "<tr><td><b>Description: </b></td><td>%4</td></tr>" +- "</table></p>") +- .arg(strBelehrung).arg(strPackName).arg(strPackVersionOld).arg(strPackDescription), +- 0, +- tr("&Reinstall")); +- return fRc; +-} +- +-bool UIMessageCenter::confirmRemovingPackage(const QString &strPackName, QWidget *pParent) +-{ +- return messageOkCancel(pParent ? pParent : mainWindowShown(), +- Question, +- tr("<p>You are about to remove the VirtualBox extension pack <b>%1</b>.</p>" +- "<p>Are you sure you want to proceed?</p>").arg(strPackName), +- 0, +- tr("&Remove")); +-} +- +-void UIMessageCenter::notifyAboutExtPackInstalled(const QString &strPackName, QWidget *pParent) +-{ +- message(pParent ? pParent : mainWindowShown(), +- Info, +- tr("The extension pack <br><nobr><b>%1</b><nobr><br> was installed successfully.").arg(strPackName)); +-} +- + void UIMessageCenter::warnAboutIncorrectPort(QWidget *pParent) const + { + message(pParent, Error, +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-10 17:03:11.087825690 -0300 +@@ -650,27 +650,6 @@ + } + }; + +-class PerformInstallGuestToolsAction : public UIActionSimple +-{ +- Q_OBJECT; +- +-public: +- +- PerformInstallGuestToolsAction(QObject *pParent) +- : UIActionSimple(pParent, ":/guesttools_16px.png", ":/guesttools_disabled_16px.png") +- { +- retranslateUi(); +- } +- +-protected: +- +- void retranslateUi() +- { +- setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Install Guest Additions...")), gMS->shortcut(UIMachineShortcuts::InstallGuestAdditionsShortcut))); +- setStatusTip(QApplication::translate("UIActionPool", "Mount the Guest Additions installation image")); +- } +-}; +- + #ifdef VBOX_WITH_DEBUGGER_GUI + class MenuDebugAction : public UIActionMenu + { +@@ -889,7 +868,6 @@ + m_pool[UIActionIndexRuntime_Simple_NetworkAdaptersDialog] = new ShowNetworkAdaptersDialogAction(this); + m_pool[UIActionIndexRuntime_Simple_SharedFoldersDialog] = new ShowSharedFoldersDialogAction(this); + m_pool[UIActionIndexRuntime_Toggle_VRDEServer] = new ToggleVRDEServerAction(this); +- m_pool[UIActionIndexRuntime_Simple_InstallGuestTools] = new PerformInstallGuestToolsAction(this); + + #ifdef VBOX_WITH_DEBUGGER_GUI + /* 'Debug' actions: */ diff --git a/pcr/clusterit/LICENSE b/pcr/clusterit/LICENSE new file mode 100644 index 000000000..b4aaeb75c --- /dev/null +++ b/pcr/clusterit/LICENSE @@ -0,0 +1 @@ +ClusterIt is Free software, with a standard BSD-style License. You are encouraged to download this, work with it, enhance it, or whatever suits your needs. Redistribution can take place if the license stays intact. diff --git a/pcr/clusterit/PKGBUILD b/pcr/clusterit/PKGBUILD new file mode 100644 index 000000000..c325a003b --- /dev/null +++ b/pcr/clusterit/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=clusterit +pkgver=2.5 +pkgrel=1 +pkgdesc='Tools to make a cluster of computers' +arch=( + i686 + x86_64 + mips64el +) +license=BSD +url=http://www.sourceforge.net/projects/$pkgname +depends=( + libx11 + sh +) +conflicts=synce-librapi +source=( + http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + LICENSE +) +sha512sums=( + 7efb0aa55c9581151ec73405d4e69df2d4258ee4c6b254a29bab95a7b90c4d645387db0d7c884eda6d7a861ce25bea27136df4af1990e5401a1b2a3d035999fc + 65884310aad16ed4d10da24e87016710f12cb9dd8e8a6531d702a3194a18fa6b6a58b340cd98193f24c964d402b5ded1f19c9bb008d6c3957a2409d622da22d8 +) + +build() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + install -d $pkgdir/usr/share/licenses/$pkgname + install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname +} + + diff --git a/pcr/gmusicbrowser/PKGBUILD b/pcr/gmusicbrowser/PKGBUILD new file mode 100644 index 000000000..e8cec3c76 --- /dev/null +++ b/pcr/gmusicbrowser/PKGBUILD @@ -0,0 +1,45 @@ +# Maintainer: Spike29 <leguen.yannick@gmail.com> +# Contributor: jsteel <mail at jsteel dot org> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> + +pkgname=gmusicbrowser +pkgver=1.1.10 +pkgrel=3 +pkgdesc="A jukebox for large collections of mp3/ogg/flac files, written in perl" +arch=('any') +url="http://gmusicbrowser.org" +license=('GPL3') +depends=('gtk2-perl' 'hicolor-icon-theme') +optdepends=('alsa-utils: enables the ALSA backend' + 'flac123: flac support for the ALSA backend' + 'mpg321: mp3 support for the ALSA backend' + 'vorbis-tools: vorbis support for the ALSA backend' + 'mplayer: enables the mplayer backend' + 'perl-gstreamer: enables the gstreamer backend' + 'gstreamer0.10-base: vorbis support for the gstreamer backend' + 'gstreamer0.10-good-plugins: flac support for the gstreamer backend' + 'gstreamer0.10-bad-plugins: mpc support for the gstreamer backend' + 'gstreamer0.10-ugly-plugins: mp3 support for the gstreamer backend' + 'perl-gtk2-mozembed: web-based plugins support' + 'perl-gtk2-webkit: alternative web-based plugin support' + 'perl-html-parser: support for accented characters in lyrics plugin' + 'perl-locale-gettext: localization support' + 'perl-net-dbus: control gmusicbrowser through dbus and gnome hotkeys' + 'perl-gtk2-notify: show notifications using libnotify' ) +conflicts=('gmusicbrowser-devel' 'gmusicbrowser-development' 'gmusicbrowser-git' 'gmusicbrowser-shimmer-git') +options=('!libtool') +install=$pkgname.install +source=(https://github.com/shimmerproject/${pkgname}/archive/v${pkgver}.tar.gz) + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir/" DOCS="AUTHORS COPYING README NEWS INSTALL" install + + # put some images in sane locations + install -Dm644 pix/trayicon.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/gmusicbrowser.png + install -Dm644 pix/gmusicbrowser32x32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/gmusicbrowser.png + install -Dm644 pix/gmusicbrowser.png "$pkgdir"/usr/share/icons/hicolor/48x48/apps/gmusicbrowser.png + install -Dm644 pix/gmusicbrowser.png "$pkgdir"/usr/share/pixmaps/gmusicbrowser.png +} +md5sums=('25cbef3bd7c6666a036dcc337adcb387') diff --git a/pcr/gmusicbrowser/gmusicbrowser.install b/pcr/gmusicbrowser/gmusicbrowser.install new file mode 100644 index 000000000..f917ebdff --- /dev/null +++ b/pcr/gmusicbrowser/gmusicbrowser.install @@ -0,0 +1,18 @@ +post_install() { + cat << _EOF + +==> In order to play your music with gmusicbrowser, you need to install + gstreamer and its perl bindings OR mpg321/vorbis-tools/flac123/alsa-utils OR mplayer + (look at optdepends for details) + +_EOF + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/pcr/ha-glue/PKGBUILD b/pcr/ha-glue/PKGBUILD new file mode 100644 index 000000000..d170155d9 --- /dev/null +++ b/pcr/ha-glue/PKGBUILD @@ -0,0 +1,98 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=ha-glue +_pkgname=${pkgname:3} +pkgver=1.0.11 +pkgrel=2 +pkgdesc='A set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.' +arch=( + i686 + x86_64 + mips64el +) +url=http://linux-ha.org/wiki/Cluster_${_pkgname^} +license=GPL +depends=( + curl + glib2 + libaio + libtool + libxml2 + net-snmp + python2 + util-linux +) +source=( + http://hg.linux-ha.org/$_pkgname/archive/$_pkgname-$pkgver.tar.bz2 + ha-logd.service +) +sha512sums=( + 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 + 9252472a6d7a1bbad765c63becdec4064d882b1eb98abdf27833a6e06d8750f06663b2460d32a4c72d04f10a7480ef0a2093b8a18b4d1fc62a989cde54ee056a +) +install=$pkgname.install +options=( + '!libtool' + docs +) + +prepare() { + export _CLUSTER_USER=hacluster + export _CLUSTER_GROUP=haclient + _DGID=666 + _DUID=666 + + #verify the cluster user and group + if ! getent group $_CLUSTER_GROUP >/dev/null;then + msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER GROUP, EXECUTE AS ROOT:' + echo -e "# groupadd -r -g $_DGID $_CLUSTER_GROUP\n" + _EXITCODE=1 + fi + if ! getent passwd $_CLUSTER_USER >/dev/null;then + msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER USER, EXECUTE AS ROOT:' + echo -e "# useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/$_CLUSTER_USER -s /sbin/nologin -c \"cluster user\" $_CLUSTER_USER\n" + _EXITCODE=1 + fi + if [[ $_EXITCODE -eq 1 ]] ;then + return 1 + fi + + cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.ac +} + +build() { + cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver + sed -i 's/<glib\/gtypes\.h>/<glib\.h>/g' include/clplumbing/cl_uuid.h + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --enable-fatal-warnings=no\ + --libdir=/usr/lib\ + --libexecdir=/usr/lib/$pkgname\ + --localstatedir=/var\ + --sysconfdir=/etc\ + --with-daemon-group=$_CLUSTER_GROUP\ + --with-daemon-user=$_CLUSTER_USER + setarch $CARCH make +} + +package() { + cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + #python path correction + for py in `grep -r -l "\#\!\/usr\/bin\/python" $pkgdir`;do + sed -i 's:/usr/bin/python$:/usr/bin/python2:g' $py + done + for py in `grep -r -l "\#\!\/usr\/bin\/env python" $pkgdir`;do + sed -i 's:/usr/bin/env python$:/usr/bin/env python2:g' $py + done + #end python path correction + + install -d $pkgdir/usr/lib/systemd/system + install -Dm644 $srcdir/ha-logd.service $pkgdir/usr/lib/systemd/system + + msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:' + echo -e "# userdel $_CLUSTER_USER" + echo -e "# groupdel $_CLUSTER_GROUP" +} diff --git a/pcr/ha-glue/ha-glue.install b/pcr/ha-glue/ha-glue.install new file mode 100644 index 000000000..abfedb7c4 --- /dev/null +++ b/pcr/ha-glue/ha-glue.install @@ -0,0 +1,22 @@ +_CLUSTER_USER=hacluster +_CLUSTER_GROUP=haclient +_PREFIX=/usr +_PREFIXETC=/etc +_PREFIXVAR=/var +_LCRSODIR=$PREFIX/libexec/lcrso +_DGID=666 +_DUID=666 +pre_install() { + getent group $_CLUSTER_GROUP >/dev/null || groupadd -r -g $_DGID $_CLUSTER_GROUP + getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c "cluster user" ${_CLUSTER_USER} +} + +post_install() { + echo -e "\nNow you must install ha-resourceagent, ha-heartbeat and ha-pacemaker\n" + +} +post_remove() { + echo -e "\nDeleting user $_CLUSTER_USER and group $_CLUSTER_GROUP " + userdel $_CLUSTER_USER + groupdel $_CLUSTER_GROUP +} diff --git a/pcr/ha-glue/ha-logd.service b/pcr/ha-glue/ha-logd.service new file mode 100644 index 000000000..1847d8cdd --- /dev/null +++ b/pcr/ha-glue/ha-logd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Startup script logd service. +Requires=network.target remote-fs.target + +[Service] +Type=forking +ExecStart=/usr/lib/heartbeat/ha_logd + +[Install] +WantedBy=multi-user.target diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD new file mode 100644 index 000000000..788d4f435 --- /dev/null +++ b/pcr/jitsi/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be> +# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne + +pkgname=jitsi +pkgver=2.0.4506.10553 +pkgrel=6 +pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" +arch=('i686' 'x86_64') +url="http://jitsi.org" +license=('LGPL') +depends=('java-runtime') +makedepends=('apache-ant' 'java-environment') +options=(!strip !emptydirs zipman !libtool docs) +source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" + jitsi.desktop + jitsi.sh) +sha256sums=('939adbda52b5aa19592bcd5edf5c77e1bcbbcaa4d0fcdb59c6b5c9e4a10b1e7d' + '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' + '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5') + +build() +{ + cd "${srcdir}/${pkgname}" + # append the build revision to the jitsi version + sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + . /etc/profile.d/apache-ant.sh + ant rebuild +} + +package() { + cd "${srcdir}/${pkgname}" + find lib/ lib/bundle/ -maxdepth 1 -type f \ + -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; + find lib/os-specific/linux/ -maxdepth 1 -type f \ + -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \; + shopt -sq extglob + find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \ + -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \; + find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \ + -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \; + install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + + cd "resources/install/debian/" + for _file in *.{svg,xpm}; do + install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${_file}" + done +} diff --git a/~emulatorman/jitsi/jitsi.desktop b/pcr/jitsi/jitsi.desktop index dd4de82a6..dd4de82a6 100644 --- a/~emulatorman/jitsi/jitsi.desktop +++ b/pcr/jitsi/jitsi.desktop diff --git a/pcr/jitsi/jitsi.sh b/pcr/jitsi/jitsi.sh new file mode 100644 index 000000000..6e53cdbf5 --- /dev/null +++ b/pcr/jitsi/jitsi.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +CLIENTARGS="" +uname -m | grep i686 && CLIENTARGS="-client -Xmx256m" + +SCDIR=/usr/lib/jitsi +LIBPATH="$SCDIR/lib" +CLASSPATH="$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar" +FELIX_CONFIG="$LIBPATH/felix.client.run.properties" +LOG_CONFIG="$LIBPATH/logging.properties" +COMMAND=("$JAVA_HOME/bin/java" $CLIENTARGS -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator) + +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native" + +cd "$SCDIR" + +exec "${COMMAND[@]}" "$@" diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD new file mode 100644 index 000000000..538949f60 --- /dev/null +++ b/pcr/lcmc/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=lcmc +pkgver=1.5.1 +pkgrel=1 +pkgdesc='Linux Cluster Management Console' +arch=any +url=http://$pkgname.sourceforge.net/ +license=GPL +depends=( + java-runtime + libxtst +) +source=( + http://downloads.sourceforge.net/$pkgname/${pkgname^^*}-$pkgver.jar + $pkgname.desktop +) +sha512sums=( + 7f8c68ef45078bda1bf6a811affb782e1ae440fd7d9aceca6a73fb315ffb37a4483d0a8fa80fb058c6522d2053088dd9bcfcb9a9f09b8660ab200594cb38d7af + 232866f1fbb806edc8d2844527bb44ba5c568fa57da308e7457e1d1140113ad173c2c7c40f29eac6712e1e2601db85cfecdcca525eecda355b32f8a370f9f87e +) + +package() { + cd $srcdir + install -d $pkgdir/usr/bin + echo "#!/bin/bash\njava -jar /usr/lib/$pkgname/${pkgname^^}-$pkgver.jar" > $pkgdir/usr/bin/lcmc + install -d $pkgdir/usr/lib/$pkgname + install -t $pkgdir/usr/lib/$pkgname ${pkgname^^}-$pkgver.jar + for i in 16x16 32x32 48x48 64x64 128x128 256x256; do + install -d $pkgdir/usr/share/icons/hicolor/$i/apps + install -t $pkgdir/usr/share/icons/hicolor/$i/apps\ + $srcdir/images/Icons/$i/$pkgname.png + done + install -d $pkgdir/usr/share/applications + install -t $pkgdir/usr/share/applications $pkgname.desktop +} + +# vim:set ts=2 sw=2 et: + diff --git a/pcr/lcmc/lcmc.desktop b/pcr/lcmc/lcmc.desktop new file mode 100644 index 000000000..2bcd93de6 --- /dev/null +++ b/pcr/lcmc/lcmc.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.5.1 +Encoding=UTF-8 +Name=Linux Cluster Management Console +Comment=Linux Cluster Management Console +Exec=/usr/bin/lcmc +Icon=/usr/share/icons/hicolor/256x256/apps/lcmc.png +Terminal=false +Type=Application +Categories=Java;Network; diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD index 30108d4d5..543002e04 100644 --- a/pcr/miniupnpd/PKGBUILD +++ b/pcr/miniupnpd/PKGBUILD @@ -1,49 +1,41 @@ # $Id$ # Maintainer: None pkgname=miniupnpd -pkgver=1.7.20121005 -pkgrel=4 +pkgver=1.8.20130503 +pkgrel=1 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") +depends=('libnfnetlink' 'iptables>=1.4.3') +makedepends=('lsb-release') +source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" + miniupnpd.systemd) +md5sums=('484dbda7c428b2d5f3768500a48d3375' + 'f862f79b673359adc80faf0be914394f' + '2cc73f661cacb2fa374eee3d1030f428') 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 + + CONFIG_OPTIONS="--strict --ipv6" make -f Makefile.linux config.h + 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 deleted file mode 100644 index e09ac3ade..000000000 --- a/pcr/miniupnpd/miniupnpd.init +++ /dev/null @@ -1,51 +0,0 @@ -#!/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/radicale/PKGBUILD b/pcr/radicale/PKGBUILD new file mode 100644 index 000000000..b4f76f6ab --- /dev/null +++ b/pcr/radicale/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Guillaume Bouchard <guillaume.bouchard@liris.cnrs.fr> +pkgname=radicale +pkgver=0.7.1 +pkgrel=2 +pkgdesc="A Simple Calendar Server" +arch=any +url="http://www.radicale.org/" +license=('GPL3') +depends=('python') +backup=('etc/radicale/config') +source=(http://pypi.python.org/packages/source/R/Radicale/Radicale-$pkgver.tar.gz + radicale.service) + +package() { + cd "$srcdir/Radicale-$pkgver" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 + + install -D "$srcdir/Radicale-$pkgver/config" "$pkgdir/etc/radicale/config" + install -m744 -D "$srcdir/radicale.service" "$pkgdir/usr/lib/systemd/system/radicale.service" +} + +md5sums=('ab1167b1ee713a7a58d843c5921f3327' + 'dbdfedb46af4ceed0ad0db3441b5a266') diff --git a/pcr/radicale/radicale.service b/pcr/radicale/radicale.service new file mode 100644 index 000000000..293cad6e2 --- /dev/null +++ b/pcr/radicale/radicale.service @@ -0,0 +1,10 @@ +[Unit] +Description=Radicale caldav server +After=network.target + +[Service] +ExecStart=/usr/bin/radicale +ExecStop=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD new file mode 100644 index 000000000..5f469fa5f --- /dev/null +++ b/pcr/torque/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=torque +pkgver=4.2.2 +_pkgver=1065 +pkgrel=2 +pkgdesc='An open source resource manager providing control over batch jobs and distributed compute nodes.' +url=http://www.adaptivecomputing.com/products/open-source/$pkgname/ +arch=( + i686 + x86_64 + mips64el +) +license=custom +depends=( + libxml2 + openssh +) +install=$pkgname.install +options=(!libtool) +backup=( + var/spool/$pkgname/mom_priv/config + var/spool/$pkgname/serv_priv/nodes + var/spool/$pkgname/serv_priv/serverdb + var/spool/$pkgname/server_name +) +source=( + $pkgname-$pkgver.tar.gz::http://www.adaptivecomputing.com/index.php?wpfb_dl=$_pkgver + $pkgname-{node,scheduler,server}.service +) +sha512sums=( + d53af8dc05e2d1ffa699da2a79e2c82247a882d868784c38d685fc77c3bb8a334e036e835bac2988d39675c5df7a04c2b567b826df4bf6975b437a9955164ae2 + 532c007cf3fcf171d071b67438fca430cdda4ec19d5e6c51ff5388b73610817825dd4cc86866c3d8a9411b6fdee6f76c64cd764dbd2277c1e7ca48e843ff9221 + 290620b00b2bd636b47c3c60158a4e6cff06e9a764ac7fc7d4996f9be1aace58ee248a075b4c3cf84951af9013a655b29ea6adec789fe6e170df62b07b05cc85 + 2977fbd4d7b7241a2aadef4bc5575483a882a62dd65b74cfb26958530ce99030ee0c3e6c8a093d1e2ccc2bfe4ebed4f90bc7b52aaece7fd43ea2f9af08781fed +) + +build() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --disable-gui\ + --disable-gcc-warnings\ + --mandir=/usr/share/man\ + --with-default-server=localhost\ + --with-rcp=scp\ + --with-server-home=/var/spool/$pkgname\ + --with-tcl=no + mv src/resmom/Makefile src/resmom/Makefile.old + cat src/resmom/Makefile.old | sed 's/$(MOMLIBS) $(PBS_LIBS)/$(PBS_LIBS) $(MOMLIBS)/g' > src/resmom/Makefile + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + install -d $pkgdir/usr/lib/systemd/system + install -Dm644 $srcdir/*.service $pkgdir/usr/lib/systemd/system +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/torque/torque-node.service b/pcr/torque/torque-node.service new file mode 100644 index 000000000..67edef4f5 --- /dev/null +++ b/pcr/torque/torque-node.service @@ -0,0 +1,12 @@ +[Unit] +Description=TORQUE node +Wants=basic.target +After=basic.target network.target + +[Service] +Type=forking +PIDFile=/var/spool/torque/mom_priv/mom.lock +ExecStart=/usr/sbin/pbs_mom + +[Install] +WantedBy=multi-user.target diff --git a/pcr/torque/torque-scheduler.service b/pcr/torque/torque-scheduler.service new file mode 100644 index 000000000..97ec6a093 --- /dev/null +++ b/pcr/torque/torque-scheduler.service @@ -0,0 +1,12 @@ +[Unit] +Description=TORQUE scheduler +Wants=torque-server.service +After=torque-server.service + +[Service] +Type=forking +PIDFile=/var/spool/torque/sched_priv/sched.lock +ExecStart=/usr/sbin/pbs_sched + +[Install] +WantedBy=multi-user.target diff --git a/pcr/torque/torque-server.service b/pcr/torque/torque-server.service new file mode 100644 index 000000000..80fcb1860 --- /dev/null +++ b/pcr/torque/torque-server.service @@ -0,0 +1,12 @@ +[Unit] +Description=TORQUE server +Wants=basic.target +After=basic.target network.target + +[Service] +Type=forking +PIDFile=/var/spool/torque/server_priv/server.lock +ExecStart=/usr/sbin/pbs_server + +[Install] +WantedBy=multi-user.target diff --git a/pcr/torque/torque.install b/pcr/torque/torque.install new file mode 100644 index 000000000..2e90bd1ba --- /dev/null +++ b/pcr/torque/torque.install @@ -0,0 +1,9 @@ +post_install() { + pbs_server -f -t create + systemctl stop torque-server + echo 'Change the server name in /var/spool/torque/server_name to your needs. +You may add your clients to /var/spool/torque/server_priv/nodes if your are the server. +Enable torque-server.service or torque-node.service depending on whether you are the server or a node.' +} + +# vim:set ts=2 sw=2 et: diff --git a/~emulatorman/jitsi/PKGBUILD b/~emulatorman/jitsi/PKGBUILD deleted file mode 100644 index 61460bd5c..000000000 --- a/~emulatorman/jitsi/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be> -# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban - -pkgname=jitsi -pkgver=1.0.3967 -pkgrel=3 -pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" -arch=('i686' 'x86_64') -url="http://jitsi.org" -license=('LGPL') -depends=('java-runtime') -makedepends=('apache-ant' 'java-environment') -options=(!strip !emptydirs zipman !libtool docs) -source=("http://download.jitsi.org/jitsi/src/jitsi-src-1.0-build.${pkgver##*.}.zip" - jitsi.desktop - jitsi.sh) -md5sums=('0fb7aaaad551177c3037ae570ca2f2e1' - 'aad7cf1fb18ff5d7c964834ecc38aed8' - 'b36c119d2005507e38cd5cb68f4ba31a') - -build() -{ - cd ${srcdir}/${pkgname} - # append the build revision to the jitsi version - sed -i "s/0\.build\.by\.SVN/build.${pkgver##*.}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java - . /etc/profile.d/apache-ant.sh - ant rebuild -} - -package() { - cd ${srcdir}/${pkgname} - find lib/ lib/bundle/ -maxdepth 1 -type f \ - -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; - find lib/os-specific/linux/ -maxdepth 1 -type f \ - -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \; - shopt -sq extglob - find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \ - -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \; - find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \ - -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \; - install -Dm755 "$srcdir/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 "$srcdir/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - local _file - for _file in resources/install/debian/*.{svg,xpm}; do - install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${pkgname}${_file/*sip-communicator/}" - done -} diff --git a/~emulatorman/jitsi/jitsi.sh b/~emulatorman/jitsi/jitsi.sh deleted file mode 100644 index 71dba6a36..000000000 --- a/~emulatorman/jitsi/jitsi.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -CLIENTARGS="" -uname -m | grep i686 && CLIENTARGS="-client -Xmx256m" - -javabin=/usr/bin/java - -SCDIR=/usr/lib/jitsi -LIBPATH=$SCDIR/lib -CLASSPATH=$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar -FELIX_CONFIG=$LIBPATH/felix.client.run.properties -LOG_CONFIG=$LIBPATH/logging.properties -COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator" - -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native - -cd $SCDIR - -exec $COMMAND $* - |